diff options
Diffstat (limited to 'sc/source')
112 files changed, 1183 insertions, 1824 deletions
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 8b2f48d8a2cc..2bb5922242cb 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -642,10 +642,10 @@ void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) // static void ScDocumentPool::StyleDeleted( ScStyleSheet* pStyle ) { - USHORT nCount = GetItemCount(ATTR_PATTERN); - for (USHORT i=0; i<nCount; i++) + sal_uInt32 nCount = GetItemCount2(ATTR_PATTERN); + for (sal_uInt32 i=0; i<nCount; i++) { - ScPatternAttr* pPattern = (ScPatternAttr*)GetItem(ATTR_PATTERN, i); + ScPatternAttr* pPattern = (ScPatternAttr*)GetItem2(ATTR_PATTERN, i); if ( pPattern && pPattern->GetStyleSheet() == pStyle ) pPattern->StyleToName(); } @@ -658,10 +658,12 @@ void ScDocumentPool::CellStyleCreated( const String& rName ) // Calling StyleSheetChanged isn't enough because the pool may still contain items // for undo or clipboard content. - sal_uInt16 nCount = GetItemCount(ATTR_PATTERN); - for (sal_uInt16 i=0; i<nCount; i++) + sal_uInt32 nCount = GetItemCount2(ATTR_PATTERN); + for (sal_uInt32 i=0; i<nCount; i++) { - ScPatternAttr* pPattern = (ScPatternAttr*)GetItem(ATTR_PATTERN, i); + ScPatternAttr *const pPattern = + const_cast<ScPatternAttr*>( + static_cast<ScPatternAttr const*>(GetItem2(ATTR_PATTERN, i))); if ( pPattern && pPattern->GetStyleSheet() == NULL ) { const String* pStyleName = pPattern->GetStyleName(); diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index abef7d53c2af..37b3c830bb30 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -694,14 +694,14 @@ void ScDocument::UpdateFontCharSet() CharSet eSysSet = gsl_getSystemTextEncoding(); if ( eSrcSet != eSysSet || bUpdateOld ) { - USHORT nCount,i; + sal_uInt32 nCount,i; SvxFontItem* pItem; ScDocumentPool* pPool = xPoolHelper->GetDocPool(); - nCount = pPool->GetItemCount(ATTR_FONT); + nCount = pPool->GetItemCount2(ATTR_FONT); for (i=0; i<nCount; i++) { - pItem = (SvxFontItem*)pPool->GetItem(ATTR_FONT, i); + pItem = (SvxFontItem*)pPool->GetItem2(ATTR_FONT, i); if ( pItem && ( pItem->GetCharSet() == eSrcSet || ( bUpdateOld && pItem->GetCharSet() != RTL_TEXTENCODING_SYMBOL ) ) ) pItem->GetCharSet() = eSysSet; @@ -710,10 +710,10 @@ void ScDocument::UpdateFontCharSet() if ( pDrawLayer ) { SfxItemPool& rDrawPool = pDrawLayer->GetItemPool(); - nCount = rDrawPool.GetItemCount(EE_CHAR_FONTINFO); + nCount = rDrawPool.GetItemCount2(EE_CHAR_FONTINFO); for (i=0; i<nCount; i++) { - pItem = (SvxFontItem*)rDrawPool.GetItem(EE_CHAR_FONTINFO, i); + pItem = (SvxFontItem*)rDrawPool.GetItem2(EE_CHAR_FONTINFO, i); if ( pItem && ( pItem->GetCharSet() == eSrcSet || ( bUpdateOld && pItem->GetCharSet() != RTL_TEXTENCODING_SYMBOL ) ) ) pItem->GetCharSet() = eSysSet; diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 0025d05a997c..3711b1b68603 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4197,10 +4197,10 @@ bool ScDocument::HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, ScDocumentPool* pPool = xPoolHelper->GetDocPool(); BOOL bAnyItem = FALSE; - USHORT nRotCount = pPool->GetItemCount( ATTR_ROTATE_VALUE ); - for (USHORT nItem=0; nItem<nRotCount; nItem++) + sal_uInt32 nRotCount = pPool->GetItemCount2( ATTR_ROTATE_VALUE ); + for (sal_uInt32 nItem=0; nItem<nRotCount; nItem++) { - const SfxPoolItem* pItem = pPool->GetItem( ATTR_ROTATE_VALUE, nItem ); + const SfxPoolItem* pItem = pPool->GetItem2( ATTR_ROTATE_VALUE, nItem ); if ( pItem ) { // 90 or 270 degrees is former SvxOrientationItem - only look for other values @@ -4225,10 +4225,10 @@ bool ScDocument::HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, ScDocumentPool* pPool = xPoolHelper->GetDocPool(); BOOL bHasRtl = FALSE; - USHORT nDirCount = pPool->GetItemCount( ATTR_WRITINGDIR ); - for (USHORT nItem=0; nItem<nDirCount; nItem++) + sal_uInt32 nDirCount = pPool->GetItemCount2( ATTR_WRITINGDIR ); + for (sal_uInt32 nItem=0; nItem<nDirCount; nItem++) { - const SfxPoolItem* pItem = pPool->GetItem( ATTR_WRITINGDIR, nItem ); + const SfxPoolItem* pItem = pPool->GetItem2( ATTR_WRITINGDIR, nItem ); if ( pItem && ((const SvxFrameDirectionItem*)pItem)->GetValue() == FRMDIR_HORI_RIGHT_TOP ) { bHasRtl = TRUE; @@ -4939,11 +4939,11 @@ void ScDocument::UpdStlShtPtrsFrmNms() ScDocumentPool* pPool = xPoolHelper->GetDocPool(); - USHORT nCount = pPool->GetItemCount(ATTR_PATTERN); + sal_uInt32 nCount = pPool->GetItemCount2(ATTR_PATTERN); ScPatternAttr* pPattern; - for (USHORT i=0; i<nCount; i++) + for (sal_uInt32 i=0; i<nCount; i++) { - pPattern = (ScPatternAttr*)pPool->GetItem(ATTR_PATTERN, i); + pPattern = (ScPatternAttr*)pPool->GetItem2(ATTR_PATTERN, i); if (pPattern) pPattern->UpdateStyleSheet(); } @@ -4957,11 +4957,11 @@ void ScDocument::StylesToNames() ScDocumentPool* pPool = xPoolHelper->GetDocPool(); - USHORT nCount = pPool->GetItemCount(ATTR_PATTERN); + sal_uInt32 nCount = pPool->GetItemCount2(ATTR_PATTERN); ScPatternAttr* pPattern; - for (USHORT i=0; i<nCount; i++) + for (sal_uInt32 i=0; i<nCount; i++) { - pPattern = (ScPatternAttr*)pPool->GetItem(ATTR_PATTERN, i); + pPattern = (ScPatternAttr*)pPool->GetItem2(ATTR_PATTERN, i); if (pPattern) pPattern->StyleToName(); } diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 99da4979a1b6..12b4bb27950d 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -272,9 +272,9 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX // Attribut im Dokument ueberhaupt verwendet? BOOL bAnyItem = FALSE; - USHORT nRotCount = pPool->GetItemCount( ATTR_ROTATE_VALUE ); - for (USHORT nItem=0; nItem<nRotCount; nItem++) - if (pPool->GetItem( ATTR_ROTATE_VALUE, nItem )) + sal_uInt32 nRotCount = pPool->GetItemCount2( ATTR_ROTATE_VALUE ); + for (sal_uInt32 nItem=0; nItem<nRotCount; nItem++) + if (pPool->GetItem2( ATTR_ROTATE_VALUE, nItem )) { bAnyItem = TRUE; break; diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 48879bcdec93..10aacc678d74 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -1123,7 +1123,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) @@ -1413,7 +1413,6 @@ ScFuncDesc::ScFuncDesc() : nFIndex (0), nCategory (0), nArgCount (0), - nHelpId (0), bIncomplete (false), bHasSuppressedArgs(false) {} @@ -1455,7 +1454,7 @@ void ScFuncDesc::Clear() nFIndex = 0; nCategory = 0; - nHelpId = 0; + sHelpId = ""; bIncomplete = false; bHasSuppressedArgs = false; } @@ -1689,9 +1688,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/data/table1.cxx b/sc/source/core/data/table1.cxx index baaabd3a8c8f..e534bb9dfb78 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" +// INCLUDE --------------------------------------------------------------- + #include "scitems.hxx" #include <svx/algitem.hxx> #include <unotools/textsearch.hxx> 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 <rtl/ustring.hxx> - +#include <rtl/string.hxx> // ============================================================================ @@ -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 07b79c11b373..aadd3e101d02 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -83,7 +83,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<reflection::XIdlMethod>& rFunc, const uno::Any& rO, long nAC, const ScAddInArgDesc* pAD, @@ -98,7 +98,7 @@ ScUnoAddInFuncData::ScUnoAddInFuncData( const String& rNam, const String& rLoc, nArgCount( nAC ), nCallerPos( nCP ), nCategory( nCat ), - nHelpId( nHelp ), + sHelpId( sHelp ), bCompInitialized( FALSE ) { if ( nArgCount ) @@ -608,7 +608,7 @@ void ScUnoAddInCollection::ReadConfiguration() } } - USHORT nHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); + rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); uno::Reference<reflection::XIdlMethod> xFunc; // remains empty uno::Any aObject; // also empty @@ -617,7 +617,7 @@ void ScUnoAddInCollection::ReadConfiguration() ScUnoAddInFuncData* pData = new ScUnoAddInFuncData( aFuncName, aLocalName, aDescription, - nCategory, nHelpId, + nCategory, sHelpId, xFunc, aObject, nVisibleCount, pVisibleArgs, nCallerPos ); @@ -936,7 +936,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& xAddIn->getProgrammaticCategoryName( aFuncU ) ) ); - USHORT nHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); + rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); rtl::OUString aLocalU; try @@ -1015,7 +1015,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& ppFuncData[nFuncPos+nOld] = new ScUnoAddInFuncData( aFuncName, aLocalName, aDescription, - nCategory, nHelpId, + nCategory, sHelpId, xFunc, aObject, nVisibleCount, pVisibleArgs, nCallerPos ); @@ -1338,7 +1338,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/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index fc3d9bf51be2..58ee1b06f7f7 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -175,25 +175,9 @@ void ScChartPositioner::GlueState() const BYTE nOccu = 1; const BYTE nFree = 2; const BYTE nGlue = 3; -#ifdef WIN - // we hate 16bit, don't we? - BYTE huge* p; - BYTE huge* pA = (BYTE huge*) SvMemAlloc( nCR ); - if ( nCR > (ULONG)((USHORT)~0) ) - { // in 32k Bloecken initialisieren - ULONG j; - for ( j=0; j<nCR; j+=0x8000 ) - { - memset( pA+j, nHole, Min( (ULONG)0x8000, nCR-j ) ); - } - } - else - memset( pA, nHole, nCR * sizeof(BYTE) ); -#else BYTE* p; BYTE* pA = new BYTE[ nCR ]; memset( pA, 0, nCR * sizeof(BYTE) ); -#endif SCCOL nCol, nCol1, nCol2; SCROW nRow, nRow1, nRow2; @@ -285,11 +269,7 @@ void ScChartPositioner::GlueState() eGlue = SC_CHARTGLUE_NONE; } -#ifdef WIN - SvMemFree( pA ); -#else delete [] pA; -#endif } void ScChartPositioner::CheckColRowHeaders() @@ -524,9 +504,6 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows, nRowCount( nChartRows ) { DBG_ASSERT( nColCount && nRowCount, "ScChartPositionMap without dimension" ); -#ifdef WIN -#error ScChartPositionMap not implemented for 16-bit dumdums -#endif ScAddress* pPos; SCCOL nCol; diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 1e4c02967152..fcc7a24e7a42 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2967,10 +2967,6 @@ void ScInterpreter::ScMin( BOOL bTextAsZero ) PushDouble(nMin); } -#if defined(WIN) && defined(MSC) -#pragma optimize("",off) -#endif - void ScInterpreter::ScMax( BOOL bTextAsZero ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMax" ); @@ -3091,10 +3087,6 @@ void ScInterpreter::ScMax( BOOL bTextAsZero ) else PushDouble(nMax); } -#if defined(WIN) && defined(MSC) -#pragma optimize("",on) -#endif - double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero ) { @@ -5780,10 +5772,6 @@ void ScInterpreter::ScVLookup() CalculateLookup(FALSE); } -#if defined(WIN) && defined(MSC) -#pragma optimize("",off) -#endif - void ScInterpreter::ScSubTotal() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSubTotal" ); @@ -5823,10 +5811,6 @@ void ScInterpreter::ScSubTotal() PushDouble( nVal ); } } -#if defined(WIN) && defined(MSC) -#pragma optimize("",on) -#endif - ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField ) { diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index dac5f0c99ac5..404eaf763a51 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -682,10 +682,6 @@ void ScInterpreter::ScNPV() } } -#if defined(WIN) && defined(MSC) -#pragma optimize("",off) -#endif - void ScInterpreter::ScIRR() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIRR" ); @@ -752,10 +748,6 @@ void ScInterpreter::ScIRR() else PushError( errNoConvergence); } -#if defined(WIN) && defined(MSC) -#pragma optimize("",on) -#endif - void ScInterpreter::ScMIRR() { // range_of_values ; rate_invest ; rate_reinvest diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index 458629979172..f20b63efe7ba 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -222,7 +222,7 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) else { if( IsDocumentEncrypted() ) - Add( new XclExpFilePass( GetRoot() ) ); + Add( new XclExpFileEncryption( GetRoot() ) ); Add( new XclExpInterfaceHdr( nCodePage ) ); Add( new XclExpUInt16Record( EXC_ID_MMS, 0 ) ); Add( new XclExpInterfaceEnd ); diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 3a43a23cd624..90ac8011a4bf 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -31,6 +31,8 @@ #include <sfx2/docfile.hxx> #include <sfx2/objsh.hxx> #include <sfx2/app.hxx> +#include <sfx2/frame.hxx> +#include <sfx2/request.hxx> #include <sot/storage.hxx> #include <sot/exchange.hxx> #include <tools/globname.hxx> @@ -99,10 +101,17 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument SfxItemSet* pItemSet = rMedium.GetItemSet(); if( pItemSet ) { - if( const SfxStringItem* pItem = static_cast< const SfxStringItem* >( pItemSet->GetItem( SID_FILE_NAME ) ) ) - aMediaDesc[ MediaDescriptor::PROP_URL() ] <<= ::rtl::OUString( pItem->GetValue() ); - if( const SfxStringItem* pItem = static_cast< const SfxStringItem* >( pItemSet->GetItem( SID_PASSWORD ) ) ) - aMediaDesc[ MediaDescriptor::PROP_PASSWORD() ] <<= ::rtl::OUString( pItem->GetValue() ); + SFX_ITEMSET_ARG( pItemSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False); + if( pFileNameItem ) + aMediaDesc[ MediaDescriptor::PROP_URL() ] <<= ::rtl::OUString( pFileNameItem->GetValue() ); + + SFX_ITEMSET_ARG( pItemSet, pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False); + if( pPasswordItem ) + aMediaDesc[ MediaDescriptor::PROP_PASSWORD() ] <<= ::rtl::OUString( pPasswordItem->GetValue() ); + + SFX_ITEMSET_ARG( pItemSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False); + if( pEncryptionDataItem ) + aMediaDesc[ MediaDescriptor::PROP_ENCRYPTIONDATA() ] = pEncryptionDataItem->GetValue(); } aMediaDesc[ MediaDescriptor::PROP_INPUTSTREAM() ] <<= rMedium.GetInputStream(); aMediaDesc[ MediaDescriptor::PROP_INTERACTIONHANDLER() ] <<= rMedium.GetInteractionHandler(); diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 209d24ac043d..059f5ba7426b 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -87,7 +87,7 @@ #include "excimp8.hxx" #include "excform.hxx" -#if defined( WNT ) || defined( WIN ) +#if defined( WNT ) #include <math.h> #else #include <stdlib.h> diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 50e07ae1f2ed..4632a10a088e 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -28,7 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" +#include <rtl/random.h> #include <sfx2/docfile.hxx> +#include <sfx2/request.hxx> +#include <sfx2/frame.hxx> #include <sfx2/sfxsids.hrc> #include <unotools/saveopt.hxx> #include <svl/itemset.hxx> @@ -51,6 +54,8 @@ #include "document.hxx" #include "scextopt.hxx" +using namespace ::com::sun::star; + // Global data ================================================================ XclExpRootData::XclExpRootData( XclBiff eBiff, SfxMedium& rMedium, @@ -241,23 +246,66 @@ bool XclExpRoot::IsDocumentEncrypted() const if (pDocProt && pDocProt->isProtected() && pDocProt->isOptionEnabled(ScDocProtection::STRUCTURE)) return true; - if (GetPassword().Len() > 0) + if ( GetEncryptionData().getLength() > 0 ) // Password is entered directly into the save dialog. return true; return false; } -String XclExpRoot::GetPassword() const +uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( const ::rtl::OUString& aPass ) const { - if( SfxItemSet* pItemSet = GetMedium().GetItemSet() ) + uno::Sequence< beans::NamedValue > aEncryptionData; + + if ( aPass.getLength() > 0 && aPass.getLength() < 16 ) { - const SfxPoolItem* pItem = 0; - if( pItemSet->GetItemState( SID_PASSWORD, TRUE, &pItem ) == SFX_ITEM_SET ) - if( const SfxStringItem* pStrItem = dynamic_cast< const SfxStringItem* >( pItem ) ) - return pStrItem->GetValue(); + TimeValue aTime; + osl_getSystemTime( &aTime ); + rtlRandomPool aRandomPool = rtl_random_createPool (); + rtl_random_addBytes ( aRandomPool, &aTime, 8 ); + + sal_uInt8 pnDocId[16]; + rtl_random_getBytes( aRandomPool, pnDocId, 16 ); + + rtl_random_destroyPool( aRandomPool ); + + sal_uInt16 pnPasswd[16]; + memset( pnPasswd, 0, sizeof( pnPasswd ) ); + for (xub_StrLen nChar = 0; nChar < aPass.getLength(); ++nChar ) + pnPasswd[nChar] = aPass.getStr()[nChar]; + + ::msfilter::MSCodec_Std97 aCodec; + aCodec.InitKey( pnPasswd, pnDocId ); + aEncryptionData = aCodec.GetEncryptionData(); } - return String::EmptyString(); + + return aEncryptionData; +} + +uno::Sequence< beans::NamedValue > XclExpRoot::GetEncryptionData() const +{ + uno::Sequence< beans::NamedValue > aEncryptionData; + SFX_ITEMSET_ARG( GetMedium().GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False ); + if ( pEncryptionDataItem ) + pEncryptionDataItem->GetValue() >>= aEncryptionData; + else + { + // try to get the encryption data from the password + SFX_ITEMSET_ARG( GetMedium().GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False ); + if ( pPasswordItem && pPasswordItem->GetValue().Len() ) + aEncryptionData = GenerateEncryptionData( pPasswordItem->GetValue() ); + } + + return aEncryptionData; +} + +uno::Sequence< beans::NamedValue > XclExpRoot::GenerateDefaultEncryptionData() const +{ + uno::Sequence< beans::NamedValue > aEncryptionData; + if ( GetDefaultPassword().Len() > 0 ) + aEncryptionData = GenerateEncryptionData( GetDefaultPassword() ); + + return aEncryptionData; } XclExpRootData::XclExpLinkMgrRef XclExpRoot::GetLocalLinkMgrRef() const diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index f828079c8735..356b0d8bab42 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -32,6 +32,7 @@ #include <utility> #include <rtl/ustring.hxx> +#include <rtl/random.h> #include <sax/fshelper.hxx> #include <unotools/streamwrap.hxx> @@ -65,6 +66,7 @@ using ::utl::OStreamWrapper; using ::std::vector; using namespace formula; +using namespace ::com::sun::star; // ============================================================================ @@ -484,17 +486,16 @@ void XclExpStream::WriteRawZeroBytes( sal_Size nBytes ) // ============================================================================ -XclExpBiff8Encrypter::XclExpBiff8Encrypter( const XclExpRoot& rRoot, const sal_uInt8 nDocId[16], - const sal_uInt8 nSalt[16] ) : +XclExpBiff8Encrypter::XclExpBiff8Encrypter( const XclExpRoot& rRoot ) : mrRoot(rRoot), mnOldPos(STREAM_SEEK_TO_END), mbValid(false) { - String aPass = rRoot.GetPassword(); - if (aPass.Len() == 0) + uno::Sequence< beans::NamedValue > aEncryptionData = rRoot.GetEncryptionData(); + if ( aEncryptionData.getLength() == 0 ) // Empty password. Get the default biff8 password. - aPass = rRoot.GetDefaultPassword(); - Init(aPass, nDocId, nSalt); + aEncryptionData = rRoot.GenerateDefaultEncryptionData(); + Init( aEncryptionData ); } XclExpBiff8Encrypter::~XclExpBiff8Encrypter() @@ -506,9 +507,22 @@ bool XclExpBiff8Encrypter::IsValid() const return mbValid; } -void XclExpBiff8Encrypter::GetSaltDigest( sal_uInt8 nSaltDigest[16] ) const +void XclExpBiff8Encrypter::GetSaltDigest( sal_uInt8 pnSaltDigest[16] ) const { - memcpy(nSaltDigest, mnSaltDigest, 16); + if ( sizeof( mpnSaltDigest ) == 16 ) + memcpy( pnSaltDigest, mpnSaltDigest, 16 ); +} + +void XclExpBiff8Encrypter::GetSalt( sal_uInt8 pnSalt[16] ) const +{ + if ( sizeof( mpnSalt ) == 16 ) + memcpy( pnSalt, mpnSalt, 16 ); +} + +void XclExpBiff8Encrypter::GetDocId( sal_uInt8 pnDocId[16] ) const +{ + if ( sizeof( mpnDocId ) == 16 ) + memcpy( pnDocId, mpnDocId, 16 ); } void XclExpBiff8Encrypter::Encrypt( SvStream& rStrm, sal_uInt8 nData ) @@ -565,36 +579,32 @@ void XclExpBiff8Encrypter::Encrypt( SvStream& rStrm, sal_Int32 nData ) Encrypt(rStrm, static_cast<sal_uInt32>(nData)); } -void XclExpBiff8Encrypter::Init( const String& aPass, const sal_uInt8 nDocId[16], - const sal_uInt8 nSalt[16] ) +void XclExpBiff8Encrypter::Init( const uno::Sequence< beans::NamedValue >& aEncryptionData ) { - memset(mnSaltDigest, 0, sizeof(mnSaltDigest)); + mbValid = false; - xub_StrLen nLen = aPass.Len(); - bool bValid = (0 < nLen) && (nLen < 16); - if ( bValid ) + if ( maCodec.InitCodec( aEncryptionData ) ) { - // transform String to sal_uInt16 array - memset(mnPassw, 0, sizeof(mnPassw)); - for (xub_StrLen nChar = 0; nChar < nLen; ++nChar) - mnPassw[nChar] = static_cast<sal_uInt16>(aPass.GetChar(nChar)); + maCodec.GetDocId( mpnDocId ); - // copy document ID - memcpy(mnDocId, nDocId, sizeof(mnDocId)); + // generate the salt here + TimeValue aTime; + osl_getSystemTime( &aTime ); + rtlRandomPool aRandomPool = rtl_random_createPool (); + rtl_random_addBytes( aRandomPool, &aTime, 8 ); + rtl_random_getBytes( aRandomPool, mpnSalt, 16 ); + rtl_random_destroyPool( aRandomPool ); - // init codec - maCodec.InitKey(mnPassw, mnDocId); + memset( mpnSaltDigest, 0, sizeof( mpnSaltDigest ) ); // generate salt hash. ::msfilter::MSCodec_Std97 aCodec; - aCodec.InitKey(mnPassw, mnDocId); - aCodec.CreateSaltDigest(nSalt, mnSaltDigest); + aCodec.InitCodec( aEncryptionData ); + aCodec.CreateSaltDigest( mpnSalt, mpnSaltDigest ); // verify to make sure it's in good shape. - bValid = maCodec.VerifyKey(nSalt, mnSaltDigest); + mbValid = maCodec.VerifyKey( mpnSalt, mpnSaltDigest ); } - - mbValid = bValid; } sal_uInt32 XclExpBiff8Encrypter::GetBlockPos( sal_Size nStrmPos ) const diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index fb1eb9a3bf44..b210d18f479c 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -1118,7 +1118,7 @@ ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm ) // request and verify a password (decrypter implements IDocPasswordVerifier) if( xDecr.is() ) - rStrm.GetRoot().RequestPassword( *xDecr ); + rStrm.GetRoot().RequestEncryptionData( *xDecr ); // return error code (success, wrong password, etc.) return xDecr.is() ? xDecr->GetError() : EXC_ENCR_ERROR_UNSUPP_CRYPT; diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 98db9dcb4471..534d40fa5cd5 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -28,6 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" +#include <comphelper/docpasswordhelper.hxx> +#include <comphelper/sequenceashashmap.hxx> + #include "xistream.hxx" #include "xlstring.hxx" #include "xiroot.hxx" @@ -38,6 +41,8 @@ using ::rtl::OString; using ::rtl::OUString; using ::rtl::OUStringToOString; +using namespace ::com::sun::star; + // ============================================================================ // Decryption // ============================================================================ @@ -69,9 +74,16 @@ XclImpDecrypterRef XclImpDecrypter::Clone() const return xNewDecr; } -::comphelper::DocPasswordVerifierResult XclImpDecrypter::verifyPassword( const OUString& rPassword ) +::comphelper::DocPasswordVerifierResult XclImpDecrypter::verifyPassword( const ::rtl::OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) +{ + o_rEncryptionData = OnVerifyPassword( rPassword ); + mnError = o_rEncryptionData.getLength() ? ERRCODE_NONE : ERRCODE_ABORT; + return o_rEncryptionData.getLength() ? ::comphelper::DocPasswordVerifierResult_OK : ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD; +} + +::comphelper::DocPasswordVerifierResult XclImpDecrypter::verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData ) { - bool bValid = OnVerify( rPassword ); + bool bValid = OnVerifyEncryptionData( rEncryptionData ); mnError = bValid ? ERRCODE_NONE : ERRCODE_ABORT; return bValid ? ::comphelper::DocPasswordVerifierResult_OK : ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD; } @@ -110,7 +122,6 @@ sal_uInt16 XclImpDecrypter::Read( SvStream& rStrm, void* pData, sal_uInt16 nByte // ---------------------------------------------------------------------------- XclImpBiff5Decrypter::XclImpBiff5Decrypter( sal_uInt16 nKey, sal_uInt16 nHash ) : - maPassword( 16 ), mnKey( nKey ), mnHash( nHash ) { @@ -118,12 +129,12 @@ XclImpBiff5Decrypter::XclImpBiff5Decrypter( sal_uInt16 nKey, sal_uInt16 nHash ) XclImpBiff5Decrypter::XclImpBiff5Decrypter( const XclImpBiff5Decrypter& rSrc ) : XclImpDecrypter( rSrc ), - maPassword( rSrc.maPassword ), + maEncryptionData( rSrc.maEncryptionData ), mnKey( rSrc.mnKey ), mnHash( rSrc.mnHash ) { if( IsValid() ) - maCodec.InitKey( &maPassword.front() ); + maCodec.InitCodec( maEncryptionData ); } XclImpBiff5Decrypter* XclImpBiff5Decrypter::OnClone() const @@ -131,24 +142,59 @@ XclImpBiff5Decrypter* XclImpBiff5Decrypter::OnClone() const return new XclImpBiff5Decrypter( *this ); } -bool XclImpBiff5Decrypter::OnVerify( const OUString& rPassword ) +uno::Sequence< beans::NamedValue > XclImpBiff5Decrypter::OnVerifyPassword( const ::rtl::OUString& rPassword ) { + maEncryptionData.realloc( 0 ); + /* Convert password to a byte string. TODO: this needs some finetuning according to the spec... */ OString aBytePassword = OUStringToOString( rPassword, osl_getThreadTextEncoding() ); sal_Int32 nLen = aBytePassword.getLength(); if( (0 < nLen) && (nLen < 16) ) { - // copy byte string to sal_uInt8 array - maPassword.clear(); - maPassword.resize( 16, 0 ); - memcpy( &maPassword.front(), aBytePassword.getStr(), static_cast< size_t >( nLen ) ); + // init codec + maCodec.InitKey( (sal_uInt8*)aBytePassword.getStr() ); + + if ( maCodec.VerifyKey( mnKey, mnHash ) ) + { + maEncryptionData = maCodec.GetEncryptionData(); + + // since the export uses Std97 encryption always we have to request it here + ::std::vector< sal_uInt16 > aPassVect( 16 ); + ::std::vector< sal_uInt16 >::iterator aIt = aPassVect.begin(); + for( sal_Int32 nInd = 0; nInd < nLen; ++nInd, ++aIt ) + *aIt = static_cast< sal_uInt16 >( rPassword.getStr()[nInd] ); + + uno::Sequence< sal_Int8 > aDocId = ::comphelper::DocPasswordHelper::GenerateRandomByteSequence( 16 ); + OSL_ENSURE( aDocId.getLength() == 16, "Unexpected length of the senquence!" ); + + ::msfilter::MSCodec_Std97 aCodec97; + aCodec97.InitKey( &aPassVect.front(), (sal_uInt8*)aDocId.getConstArray() ); + + // merge the EncryptionData, there should be no conflicts + ::comphelper::SequenceAsHashMap aEncryptionHash( maEncryptionData ); + aEncryptionHash.update( ::comphelper::SequenceAsHashMap( aCodec97.GetEncryptionData() ) ); + aEncryptionHash >> maEncryptionData; + } + } + + return maEncryptionData; +} +bool XclImpBiff5Decrypter::OnVerifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData ) +{ + maEncryptionData.realloc( 0 ); + + if( rEncryptionData.getLength() ) + { // init codec - maCodec.InitKey( &maPassword.front() ); - return maCodec.VerifyKey( mnKey, mnHash ); + maCodec.InitCodec( rEncryptionData ); + + if ( maCodec.VerifyKey( mnKey, mnHash ) ) + maEncryptionData = rEncryptionData; } - return false; + + return maEncryptionData.getLength(); } void XclImpBiff5Decrypter::OnUpdate( sal_Size /*nOldStrmPos*/, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) @@ -168,7 +214,6 @@ sal_uInt16 XclImpBiff5Decrypter::OnRead( SvStream& rStrm, sal_uInt8* pnData, sal XclImpBiff8Decrypter::XclImpBiff8Decrypter( sal_uInt8 pnSalt[ 16 ], sal_uInt8 pnVerifier[ 16 ], sal_uInt8 pnVerifierHash[ 16 ] ) : - maPassword( 16, 0 ), maSalt( pnSalt, pnSalt + 16 ), maVerifier( pnVerifier, pnVerifier + 16 ), maVerifierHash( pnVerifierHash, pnVerifierHash + 16 ) @@ -177,13 +222,13 @@ XclImpBiff8Decrypter::XclImpBiff8Decrypter( sal_uInt8 pnSalt[ 16 ], XclImpBiff8Decrypter::XclImpBiff8Decrypter( const XclImpBiff8Decrypter& rSrc ) : XclImpDecrypter( rSrc ), - maPassword( rSrc.maPassword ), + maEncryptionData( rSrc.maEncryptionData ), maSalt( rSrc.maSalt ), maVerifier( rSrc.maVerifier ), maVerifierHash( rSrc.maVerifierHash ) { if( IsValid() ) - maCodec.InitKey( &maPassword.front(), &maSalt.front() ); + maCodec.InitCodec( maEncryptionData ); } XclImpBiff8Decrypter* XclImpBiff8Decrypter::OnClone() const @@ -191,25 +236,44 @@ XclImpBiff8Decrypter* XclImpBiff8Decrypter::OnClone() const return new XclImpBiff8Decrypter( *this ); } -bool XclImpBiff8Decrypter::OnVerify( const OUString& rPassword ) +uno::Sequence< beans::NamedValue > XclImpBiff8Decrypter::OnVerifyPassword( const ::rtl::OUString& rPassword ) { + maEncryptionData.realloc( 0 ); + sal_Int32 nLen = rPassword.getLength(); if( (0 < nLen) && (nLen < 16) ) { // copy string to sal_uInt16 array - maPassword.clear(); - maPassword.resize( 16, 0 ); + ::std::vector< sal_uInt16 > aPassVect( 16 ); const sal_Unicode* pcChar = rPassword.getStr(); const sal_Unicode* pcCharEnd = pcChar + nLen; - ::std::vector< sal_uInt16 >::iterator aIt = maPassword.begin(); + ::std::vector< sal_uInt16 >::iterator aIt = aPassVect.begin(); for( ; pcChar < pcCharEnd; ++pcChar, ++aIt ) *aIt = static_cast< sal_uInt16 >( *pcChar ); // init codec - maCodec.InitKey( &maPassword.front(), &maSalt.front() ); - return maCodec.VerifyKey( &maVerifier.front(), &maVerifierHash.front() ); + maCodec.InitKey( &aPassVect.front(), &maSalt.front() ); + if ( maCodec.VerifyKey( &maVerifier.front(), &maVerifierHash.front() ) ) + maEncryptionData = maCodec.GetEncryptionData(); + } + + return maEncryptionData; +} + +bool XclImpBiff8Decrypter::OnVerifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData ) +{ + maEncryptionData.realloc( 0 ); + + if( rEncryptionData.getLength() ) + { + // init codec + maCodec.InitCodec( rEncryptionData ); + + if ( maCodec.VerifyKey( &maVerifier.front(), &maVerifierHash.front() ) ) + maEncryptionData = rEncryptionData; } - return false; + + return maEncryptionData.getLength(); } void XclImpBiff8Decrypter::OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 /*nRecSize*/ ) diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 2b2180db5e6a..c6d6c5b9246a 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -71,6 +71,8 @@ using ::com::sun::star::frame::XFrame; using ::com::sun::star::frame::XFramesSupplier; using ::com::sun::star::lang::XMultiServiceFactory; +using namespace ::com::sun::star; + // Global data ================================================================ #ifdef DBG_UTIL @@ -240,11 +242,11 @@ sal_Int32 XclRoot::GetHmmFromPixelY( double fPixelY ) const return static_cast< sal_Int32 >( fPixelY * mrData.mfScreenPixelY + 0.5 ); } -String XclRoot::RequestPassword( ::comphelper::IDocPasswordVerifier& rVerifier ) const +uno::Sequence< beans::NamedValue > XclRoot::RequestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const { ::std::vector< OUString > aDefaultPasswords; aDefaultPasswords.push_back( mrData.maDefPassword ); - return ScfApiHelper::QueryPasswordForMedium( mrData.mrMedium, rVerifier, &aDefaultPasswords ); + return ScfApiHelper::QueryEncryptionDataForMedium( mrData.mrMedium, rVerifier, &aDefaultPasswords ); } bool XclRoot::HasVbaStorage() const diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index eeef52aed550..185923b28277 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -38,6 +38,8 @@ #include <tools/urlobj.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> +#include <sfx2/request.hxx> +#include <sfx2/frame.hxx> #include <sfx2/sfxsids.hrc> #include <svl/stritem.hxx> #include <svl/itemset.hxx> @@ -59,6 +61,8 @@ using ::com::sun::star::lang::XServiceName; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::task::PasswordRequestMode_PASSWORD_ENTER; +using namespace ::com::sun::star; + // Static helper functions ==================================================== OUString ScfApiHelper::GetServiceName( Reference< XInterface > xInt ) @@ -136,25 +140,33 @@ Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs( return CreateInstanceWithArgs( ::comphelper::getProcessServiceFactory(), rServiceName, rArgs ); } -String ScfApiHelper::QueryPasswordForMedium( SfxMedium& rMedium, +uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( SfxMedium& rMedium, ::comphelper::IDocPasswordVerifier& rVerifier, const ::std::vector< OUString >* pDefaultPasswords ) { - OUString aMediaPassword; - SfxItemSet* pItemSet = rMedium.GetItemSet(); - const SfxPoolItem *pPasswordItem; - if( pItemSet && (SFX_ITEM_SET == pItemSet->GetItemState( SID_PASSWORD, TRUE, &pPasswordItem )) ) - aMediaPassword = static_cast< const SfxStringItem* >( pPasswordItem )->GetValue(); + uno::Sequence< beans::NamedValue > aEncryptionData; + SFX_ITEMSET_ARG( rMedium.GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False); + if ( pEncryptionDataItem ) + pEncryptionDataItem->GetValue() >>= aEncryptionData; + + ::rtl::OUString aPassword; + SFX_ITEMSET_ARG( rMedium.GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False); + if ( pPasswordItem ) + aPassword = pPasswordItem->GetValue(); + OUString aDocName = INetURLObject( rMedium.GetOrigURL() ).GetName( INetURLObject::DECODE_WITH_CHARSET ); bool bIsDefaultPassword = false; - OUString aPassword = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword( - rVerifier, aMediaPassword, rMedium.GetInteractionHandler(), aDocName, + aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword( + rVerifier, aEncryptionData, aPassword, rMedium.GetInteractionHandler(), aDocName, ::comphelper::DocPasswordRequestType_MS, pDefaultPasswords, &bIsDefaultPassword ); - if( !bIsDefaultPassword && (aPassword.getLength() > 0) && pItemSet ) - pItemSet->Put( SfxStringItem( SID_PASSWORD, aPassword ) ); + rMedium.GetItemSet()->ClearItem( SID_PASSWORD ); + rMedium.GetItemSet()->ClearItem( SID_ENCRYPTIONDATA ); + + if( !bIsDefaultPassword && (aEncryptionData.getLength() > 0) ) + rMedium.GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) ) ); - return aPassword; + return aEncryptionData; } // Property sets ============================================================== diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 8c204f1cef35..699a4e28720a 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -33,6 +33,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/beans/NamedValue.hpp> #include <tools/color.hxx> #include <comphelper/types.hxx> #include "ftools.hxx" @@ -106,9 +107,9 @@ public: const ::rtl::OUString& rServiceName, const UnoAnySequence& rArgs ); - /** Opens a password dialog and returns the entered password. - @return The entered password or an empty string on 'Cancel' or any error. */ - static String QueryPasswordForMedium( SfxMedium& rMedium, + /** Opens a password dialog and returns the encryption data. + @return The encryption data or an empty sequence on 'Cancel' or any error. */ + static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > QueryEncryptionDataForMedium( SfxMedium& rMedium, ::comphelper::IDocPasswordVerifier& rVerifier, const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0 ); }; diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 201562fa752c..8afbe946d2f7 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -478,11 +478,11 @@ public: // ============================================================================ -class XclExpFilePass : public XclExpRecord +class XclExpFileEncryption : public XclExpRecord { public: - explicit XclExpFilePass( const XclExpRoot& rRoot ); - virtual ~XclExpFilePass(); + explicit XclExpFileEncryption( const XclExpRoot& rRoot ); + virtual ~XclExpFileEncryption(); private: virtual void WriteBody( XclExpStream& rStrm ); diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index 980590f9d4ff..ba51abdef1a2 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -28,6 +28,8 @@ #ifndef SC_XEROOT_HXX #define SC_XEROOT_HXX +#include <com/sun/star/beans/NamedValue.hpp> + #include "xlroot.hxx" // Forward declarations of objects in public use ============================== @@ -158,7 +160,9 @@ public: bool IsDocumentEncrypted() const; - String GetPassword() const; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const ::rtl::OUString& aPass ) const; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData() const; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateDefaultEncryptionData() const; private: diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 3308827441dd..38acef2783e8 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -30,6 +30,8 @@ #ifndef SC_XESTREAM_HXX #define SC_XESTREAM_HXX +#include <com/sun/star/beans/NamedValue.hpp> + #include <map> #include <stack> #include <string> @@ -216,13 +218,14 @@ private: class XclExpBiff8Encrypter { public: - explicit XclExpBiff8Encrypter( const XclExpRoot& rRoot, const sal_uInt8 nDocId[16], - const sal_uInt8 nSalt[16] ); + explicit XclExpBiff8Encrypter( const XclExpRoot& rRoot ); ~XclExpBiff8Encrypter(); bool IsValid() const; - void GetSaltDigest( sal_uInt8 nSaltDigest[16] ) const; + void GetSaltDigest( sal_uInt8 pnSaltDigest[16] ) const; + void GetSalt( sal_uInt8 pnSalt[16] ) const; + void GetDocId( sal_uInt8 pnDocId[16] ) const; void Encrypt( SvStream& rStrm, sal_uInt8 nData ); void Encrypt( SvStream& rStrm, sal_uInt16 nData ); @@ -238,17 +241,16 @@ public: void EncryptBytes( SvStream& rStrm, ::std::vector<sal_uInt8>& aBytes ); private: - void Init( const String& aPass, const sal_uInt8 nDocId[16], - const sal_uInt8 nSalt[16] ); + void Init( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ); sal_uInt32 GetBlockPos( sal_Size nStrmPos ) const; sal_uInt16 GetOffsetInBlock( sal_Size nStrmPos ) const; private: ::msfilter::MSCodec_Std97 maCodec; /// Crypto algorithm implementation. - sal_uInt16 mnPassw[16]; /// Cached password data for copy construction. - sal_uInt8 mnDocId[16]; /// Cached document ID for copy construction. - sal_uInt8 mnSaltDigest[16]; + sal_uInt8 mpnDocId[16]; + sal_uInt8 mpnSalt[16]; + sal_uInt8 mpnSaltDigest[16]; const XclExpRoot& mrRoot; sal_Size mnOldPos; /// Last known stream position diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 9b27077d78e7..4aec7c337a32 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -64,10 +64,9 @@ public: /** Creates a (ref-counted) copy of this decrypter object. */ XclImpDecrypterRef Clone() const; - /** Implementation of the ::comphelper::IDocPasswordVerifier interface, - calls the new virtual function implVerify(). */ - virtual ::comphelper::DocPasswordVerifierResult - verifyPassword( const ::rtl::OUString& rPassword ); + /** Implementation of the ::comphelper::IDocPasswordVerifier interface */ + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Updates the decrypter on start of a new record or after seeking stream. */ void Update( SvStream& rStrm, sal_uInt16 nRecSize ); @@ -84,7 +83,10 @@ private: virtual XclImpDecrypter* OnClone() const = 0; /** Derived classes implement password verification and initialization of the decoder. */ - virtual bool OnVerify( const ::rtl::OUString& rPassword ) = 0; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + OnVerifyPassword( const ::rtl::OUString& rPassword ) = 0; + virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) = 0; + /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) = 0; /** Implementation of the decryption. */ @@ -111,7 +113,9 @@ private: /** Implementation of cloning this object. */ virtual XclImpBiff5Decrypter* OnClone() const; /** Implements password verification and initialization of the decoder. */ - virtual bool OnVerify( const ::rtl::OUString& rPassword ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + OnVerifyPassword( const ::rtl::OUString& rPassword ); + virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ); /** Implementation of the decryption. */ @@ -119,7 +123,7 @@ private: private: ::msfilter::MSCodec_XorXLS95 maCodec; /// Crypto algorithm implementation. - ::std::vector< sal_uInt8 > maPassword; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > maEncryptionData; sal_uInt16 mnKey; sal_uInt16 mnHash; }; @@ -140,7 +144,9 @@ private: /** Implementation of cloning this object. */ virtual XclImpBiff8Decrypter* OnClone() const; /** Implements password verification and initialization of the decoder. */ - virtual bool OnVerify( const ::rtl::OUString& rPassword ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + OnVerifyPassword( const ::rtl::OUString& rPassword ); + virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ); /** Implementation of the decryption. */ @@ -153,7 +159,7 @@ private: private: ::msfilter::MSCodec_Std97 maCodec; /// Crypto algorithm implementation. - ::std::vector< sal_uInt16 > maPassword; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > maEncryptionData; ::std::vector< sal_uInt8 > maSalt; ::std::vector< sal_uInt8 > maVerifier; ::std::vector< sal_uInt8 > maVerifierHash; diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index 2f029c74baa9..44ded449cd76 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -28,6 +28,8 @@ #ifndef SC_XLROOT_HXX #define SC_XLROOT_HXX +#include <com/sun/star/beans/NamedValue.hpp> + #include <i18npool/lang.h> #include <sot/storage.hxx> #include "xlconst.hxx" @@ -196,7 +198,8 @@ public: /** Returns the default password used for stream encryption. */ inline const String& GetDefaultPassword() const { return mrData.maDefPassword; } /** Requests and verifies a password from the medium or the user. */ - String RequestPassword( ::comphelper::IDocPasswordVerifier& rVerifier ) const; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + RequestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const; /** Returns the OLE2 root storage of the imported/exported file. @return Pointer to root storage or 0, if the file is a simple stream. */ diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx index 2f6f81b7279c..33b3c8e30b97 100644 --- a/sc/source/filter/lotus/lotimpop.cxx +++ b/sc/source/filter/lotus/lotimpop.cxx @@ -48,7 +48,7 @@ #include "lotattr.hxx" -static NAMESPACE_VOS( OMutex ) aLotImpSemaphore; +static vos:: OMutex aLotImpSemaphore; ImportLotus::ImportLotus( SvStream& aStream, ScDocument* pDoc, CharSet eQ ) : diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index 4ab0c8bb3b14..058898d16547 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.cxx @@ -73,7 +73,7 @@ #include <string.h> #include <math.h> #include <ctype.h> -#if defined( MAC ) || defined( ICC ) +#if defined( ICC ) #include <stdlib.h> #endif diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index df6bdcbbe671..209bbc83f6c3 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1251,27 +1251,18 @@ void XclDelta::SaveXml( XclExpXmlStream& rStrm ) // ============================================================================ -XclExpFilePass::XclExpFilePass( const XclExpRoot& rRoot ) : +XclExpFileEncryption::XclExpFileEncryption( const XclExpRoot& rRoot ) : XclExpRecord(0x002F, 54), mrRoot(rRoot) { } -XclExpFilePass::~XclExpFilePass() +XclExpFileEncryption::~XclExpFileEncryption() { } -void XclExpFilePass::WriteBody( XclExpStream& rStrm ) +void XclExpFileEncryption::WriteBody( XclExpStream& rStrm ) { - static const sal_uInt8 nDocId[] = { - 0x17, 0xf7, 0x01, 0x08, 0xea, 0xad, 0x30, 0x5c, - 0x1a, 0x95, 0xa5, 0x75, 0xd6, 0x79, 0xcd, 0x8d }; - - - static const sal_uInt8 nSalt[] = { - 0xa4, 0x5b, 0xf7, 0xe9, 0x9f, 0x55, 0x21, 0xc5, - 0xc5, 0x56, 0xa8, 0x0d, 0x39, 0x05, 0x3a, 0xb4 }; - // 0x0000 - neither standard nor strong encryption // 0x0001 - standard or strong encryption rStrm << static_cast<sal_uInt16>(0x0001); @@ -1281,13 +1272,17 @@ void XclExpFilePass::WriteBody( XclExpStream& rStrm ) sal_uInt16 nStdEnc = 0x0001; rStrm << nStdEnc << nStdEnc; - sal_uInt8 nSaltHash[16]; - XclExpEncrypterRef xEnc( new XclExpBiff8Encrypter(mrRoot, nDocId, nSalt) ); - xEnc->GetSaltDigest(nSaltHash); - - rStrm.Write(nDocId, 16); - rStrm.Write(nSalt, 16); - rStrm.Write(nSaltHash, 16); + sal_uInt8 pnDocId[16]; + sal_uInt8 pnSalt[16]; + sal_uInt8 pnSaltHash[16]; + XclExpEncrypterRef xEnc( new XclExpBiff8Encrypter(mrRoot) ); + xEnc->GetDocId(pnDocId); + xEnc->GetSalt(pnSalt); + xEnc->GetSaltDigest(pnSaltHash); + + rStrm.Write(pnDocId, 16); + rStrm.Write(pnSalt, 16); + rStrm.Write(pnSaltHash, 16); rStrm.SetEncrypter(xEnc); } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 1d3cd65f9920..ddd6dbb3ce24 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -4401,10 +4401,10 @@ XMLNumberFormatAttributesExportHelper* ScXMLExport::GetNumberFormatAttributesExp void ScXMLExport::CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uInt16 nAttrib) { const SfxPoolItem* pItem; - sal_uInt16 nItems(pPool->GetItemCount( nAttrib )); - for( sal_uInt16 i = 0; i < nItems; ++i ) + sal_uInt32 nItems(pPool->GetItemCount2( nAttrib )); + for( sal_uInt32 i = 0; i < nItems; ++i ) { - if( 0 != (pItem = pPool->GetItem( nAttrib, i ) ) ) + if( 0 != (pItem = pPool->GetItem2( nAttrib, i ) ) ) { const SvXMLAttrContainerItem *pUnknown((const SvXMLAttrContainerItem *)pItem); if( (pUnknown->GetAttrCount() > 0) ) diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx index 5cbb2604581f..50fe06e9629c 100644 --- a/sc/source/filter/xml/xmlfonte.cxx +++ b/sc/source/filter/xml/xmlfonte.cxx @@ -70,10 +70,10 @@ void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 sal::static_int_cast<sal_Int16>(pFont->GetPitch()), pFont->GetCharSet() ); } - sal_uInt16 nItems(pItemPool->GetItemCount( nWhichId )); - for( sal_uInt16 j = 0; j < nItems; ++j ) + sal_uInt32 nItems(pItemPool->GetItemCount2( nWhichId )); + for( sal_uInt32 j = 0; j < nItems; ++j ) { - if( 0 != (pItem = pItemPool->GetItem( nWhichId, j ) ) ) + if( 0 != (pItem = pItemPool->GetItem2( nWhichId, j ) ) ) { const SvxFontItem *pFont((const SvxFontItem *)pItem); Add( pFont->GetFamilyName(), pFont->GetStyleName(), @@ -113,11 +113,11 @@ ScXMLFontAutoStylePool_Impl::ScXMLFontAutoStylePool_Impl( for (sal_uInt8 j = 0; j < 4; ++j) { sal_uInt16 nPageWhichId(aPageWhichIds[j]); - sal_uInt16 nPageHFItems(rPagePool.GetItemCount(nPageWhichId)); + sal_uInt32 nPageHFItems(rPagePool.GetItemCount2(nPageWhichId)); const ScPageHFItem* pPageItem; - for (sal_uInt16 k = 0; k < nPageHFItems; ++k) + for (sal_uInt32 k = 0; k < nPageHFItems; ++k) { - if (0 != (pPageItem = static_cast<const ScPageHFItem*>(rPagePool.GetItem(nPageWhichId, k)))) + if (0 != (pPageItem = static_cast<const ScPageHFItem*>(rPagePool.GetItem2(nPageWhichId, k)))) { const EditTextObject* pLeftArea(pPageItem->GetLeftArea()); if (pLeftArea) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 2cabe7f9f2d6..b028a0a153ce 100644..100755 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -757,7 +757,11 @@ ScTextWnd::ScTextWnd( Window* pParent ) aTextFont.SetColor (aTxtColor); aTextFont.SetWeight ( WEIGHT_NORMAL ); - SetSizePixel ( Size(1,TBX_WINDOW_HEIGHT) ); + Size aSize(1,TBX_WINDOW_HEIGHT); + Size aMinEditSize( Edit::GetMinimumEditSize() ); + if( aMinEditSize.Height() > aSize.Height() ) + aSize.Height() = aMinEditSize.Height(); + SetSizePixel ( aSize ); SetBackground ( aBgColor ); SetLineColor ( COL_BLACK ); SetMapMode ( MAP_TWIP ); diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index a1b8f05d2918..8051399d06fa 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -361,59 +361,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 272852efcf71..f7a02e1577f7 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -372,68 +372,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 ); - 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 ); - - // Einfuege-/Ueberschreibmodus - rStatusBar.InsertItem( SID_ATTR_INSERT, - SvxInsertStatusBarControl::GetDefItemWidth(rStatusBar), - SIB_CENTER ); - 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 ); - - // Dokument geaendert - rStatusBar.InsertItem( SID_DOC_MODIFIED, - SvxModifyControl::GetDefItemWidth(rStatusBar)); - - // signatures - rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); - rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); - - - 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 ); - - // Ma"sstab - rStatusBar.InsertItem( SID_ATTR_ZOOM, - SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar), - SIB_CENTER ); - 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 ); -} - -#undef TEXT_WIDTH - -//------------------------------------------------------------------ // // von der Applikation verschoben: // diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 73a5f1a1c4ee..812b43645fc4 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -599,9 +599,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 { @@ -1284,14 +1284,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; @@ -1309,14 +1309,14 @@ AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg ( const String& rTitle, const String& rTabBgColorNoColorText, const Color& rDefaultColor, - ULONG nHelpId , + const rtl::OString& sHelpId , int nId ) { ScTabBgColorDlg * pDlg=NULL; switch ( nId ) { case RID_SCDLG_TAB_BG_COLOR : - pDlg = new ScTabBgColorDlg( pParent, rTitle, rTabBgColorNoColorText, rDefaultColor, nHelpId ); + pDlg = new ScTabBgColorDlg( pParent, rTitle, rTabBgColorNoColorText, rDefaultColor, sHelpId ); break; default: break; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index cd0f79dd1598..b121e82cb58d 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -326,7 +326,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; }; @@ -524,14 +524,14 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - ULONG nHelpId , + const rtl::OString& sHelpId, const rtl::OString& sEditHelpId, int nId ); virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, //add for ScStringInputDlg const String& rTitle, //Dialog Title const String& rTabBgColorNoColorText, //Label for no tab color const Color& rDefaultColor, //Currently selected Color - ULONG nHelpId , + const rtl::OString& sHelpId , int nId ); virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg 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 5226c22629c6..4dad5dcb3cee 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 ) ; @@ -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 359c8a92d8e5..763f03fe82bf 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 ; @@ -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? Zurckkopieren : Zurckkopieren */ @@ -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/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 171daa0ca882..42f2a2d86933 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -46,13 +46,8 @@ #include <com/sun/star/uno/Sequence.hxx> #include "miscuno.hxx" - //! TODO make dynamic -#ifdef WIN -const SCSIZE ASCIIDLG_MAXROWS = 10000; -#else const SCSIZE ASCIIDLG_MAXROWS = MAXROWCOUNT; -#endif using namespace rtl; 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 ; //<!--Modified by PengYunQuan for Validity Cell Range Picker //Pos = MAP_APPFONT ( 80 , 14 ) ; @@ -113,6 +115,7 @@ TabPage TP_VALIDATION_VALUES }; ListBox LB_VALUE { + HelpID = "sc:ListBox:TP_VALIDATION_VALUES:LB_VALUE"; Border = TRUE ; //<!--Modified by PengYunQuan for Validity Cell Range Picker //Pos = MAP_APPFONT ( 80 , 56 ) ; @@ -145,6 +148,7 @@ TabPage TP_VALIDATION_VALUES }; Edit EDT_MIN { + HelpID = "sc:Edit:TP_VALIDATION_VALUES:EDT_MIN"; Border = TRUE ; //<!--Modified by PengYunQuan for Validity Cell Range Picker //Pos = MAP_APPFONT ( 80 , 74 ) ; @@ -156,6 +160,7 @@ TabPage TP_VALIDATION_VALUES }; MultiLineEdit EDT_LIST { + HelpID = "sc:MultiLineEdit:TP_VALIDATION_VALUES:EDT_LIST"; Border = TRUE ; //<!--Modified by PengYunQuan for Validity Cell Range Picker //Pos = MAP_APPFONT ( 80 , 74 ) ; @@ -177,6 +182,7 @@ TabPage TP_VALIDATION_VALUES }; Edit EDT_MAX { + HelpID = "sc:Edit:TP_VALIDATION_VALUES:EDT_MAX"; Border = TRUE ; //<!--Modified by PengYunQuan for Validity Cell Range Picker //Pos = MAP_APPFONT ( 80 , 90 ) ; @@ -188,6 +194,7 @@ TabPage TP_VALIDATION_VALUES }; CheckBox TSB_ALLOW_BLANKS { + HelpID = "sc:CheckBox:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS"; //<!--Modified by PengYunQuan for Validity Cell Range Picker //Pos = MAP_APPFONT ( 80 , 30 ) ; Pos = MAP_APPFONT ( 80 - OFFSET_X , 30 ) ; @@ -198,6 +205,7 @@ TabPage TP_VALIDATION_VALUES }; CheckBox CB_SHOWLIST { + HelpID = "sc:CheckBox:TP_VALIDATION_VALUES:CB_SHOWLIST"; //<!--Modified by PengYunQuan for Validity Cell Range Picker //Pos = MAP_APPFONT ( 80 , 44 ) ; Pos = MAP_APPFONT ( 80 - OFFSET_X , 44 ) ; @@ -208,6 +216,7 @@ TabPage TP_VALIDATION_VALUES }; CheckBox CB_SORTLIST { + HelpID = "sc:CheckBox:TP_VALIDATION_VALUES:CB_SORTLIST"; //<!--Modified by PengYunQuan for Validity Cell Range Picker //Pos = MAP_APPFONT ( 90 , 58 ) ; Pos = MAP_APPFONT ( 90 - OFFSET_X , 58 ) ; @@ -226,6 +235,7 @@ TabPage TP_VALIDATION_VALUES //<!--Added by PengYunQuan for Validity Cell Range Picker ImageButton RB_VALIDITY_REF { + HelpID = "sc:ImageButton:TP_VALIDATION_VALUES:RB_VALIDITY_REF"; Pos = MAP_APPFONT ( 142 , 73 ) ; Size = MAP_APPFONT ( 13 , 14 ) ; TabStop = TRUE ; @@ -236,12 +246,14 @@ TabPage TP_VALIDATION_VALUES TabPage TP_VALIDATION_INPUTHELP { + HelpID = "sc:TabPage:TP_VALIDATION_INPUTHELP"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; Text = "Eingabehilfe" ; TriStateBox TSB_HELP { + HelpID = "sc:TriStateBox:TP_VALIDATION_INPUTHELP:TSB_HELP"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 248 , 10 ) ; TabStop = TRUE ; @@ -267,6 +279,7 @@ TabPage TP_VALIDATION_INPUTHELP }; Edit EDT_TITLE { + HelpID = "sc:Edit:TP_VALIDATION_INPUTHELP:EDT_TITLE"; Border = TRUE ; Pos = MAP_APPFONT ( 80 , 33 ) ; Size = MAP_APPFONT ( 171 , 12 ) ; @@ -274,6 +287,7 @@ TabPage TP_VALIDATION_INPUTHELP }; MultiLineEdit EDT_INPUTHELP { + HelpID = "sc:MultiLineEdit:TP_VALIDATION_INPUTHELP:EDT_INPUTHELP"; Border = TRUE ; Pos = MAP_APPFONT ( 80 , 51 ) ; Size = MAP_APPFONT ( 171 , 128 ) ; @@ -285,6 +299,7 @@ TabPage TP_VALIDATION_INPUTHELP TabPage TP_VALIDATION_ERROR { + HelpID = "sc:TabPage:TP_VALIDATION_ERROR"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; @@ -296,6 +311,7 @@ TabPage TP_VALIDATION_ERROR }; TriStateBox TSB_SHOW { + HelpID = "sc:TriStateBox:TP_VALIDATION_ERROR:TSB_SHOW"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 248 , 10 ) ; TabStop = TRUE ; @@ -303,6 +319,7 @@ TabPage TP_VALIDATION_ERROR }; MultiLineEdit EDT_ERROR { + HelpID = "sc:MultiLineEdit:TP_VALIDATION_ERROR:EDT_ERROR"; Border = TRUE ; Pos = MAP_APPFONT ( 80 , 69 ) ; Size = MAP_APPFONT ( 171 , 110 ) ; @@ -312,6 +329,7 @@ TabPage TP_VALIDATION_ERROR }; Edit EDT_TITLE { + HelpID = "sc:Edit:TP_VALIDATION_ERROR:EDT_TITLE"; Border = TRUE ; Pos = MAP_APPFONT ( 80 , 51 ) ; Size = MAP_APPFONT ( 171 , 12 ) ; @@ -337,6 +355,7 @@ TabPage TP_VALIDATION_ERROR }; ListBox LB_ACTION { + HelpID = "sc:ListBox:TP_VALIDATION_ERROR:LB_ACTION"; Border = TRUE ; Pos = MAP_APPFONT ( 80 , 33 ) ; Size = MAP_APPFONT ( 107 , 76 ) ; @@ -353,6 +372,7 @@ TabPage TP_VALIDATION_ERROR }; PushButton BTN_SEARCH { + HelpID = "sc:PushButton:TP_VALIDATION_ERROR:BTN_SEARCH"; Pos = MAP_APPFONT ( 191 , 32 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; TabStop = TRUE ; diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 02dbc7546a38..038d0a72e824 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2810,7 +2810,7 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ ) if (bRecord) { SvShorts theTabs; - theTabs.Insert(nTab,theTabs.Count()); + theTabs.push_back(nTab); rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDeleteTab( &rDocShell, theTabs, pUndoDoc, pUndoData )); } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index d50ce6f21c9c..bba756b397cb 100755..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 <sfx2/fcontnr.hxx> #include <editeng/eeitem.hxx> - +#include <sfx2/objface.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/docfile.hxx> @@ -1188,7 +1188,7 @@ BOOL ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, BOOL bJustQuer _pParent ? _pParent : GetActiveDialogParent(), &aText ); pDlg->SetText( aTitle ); pDlg->SetMinLen( 1 ); - pDlg->SetHelpId( SID_CHG_PROTECT ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(SID_CHG_PROTECT)->GetCommand() ); pDlg->SetEditHelpId( HID_CHG_PROTECT ); if ( !bProtected ) pDlg->ShowExtras( SHOWEXTRAS_CONFIRM ); diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 84979e3dbcdf..013511ab0acb 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -891,8 +891,8 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec { SvShorts aSrcList; SvShorts aDestList; - aSrcList.Insert(nSrcTab,0); - aDestList.Insert(nDestTab,0); + aSrcList.push_front(nSrcTab); + aDestList.push_front(nDestTab); GetUndoManager()->AddUndoAction( new ScUndoCopyTab( this, aSrcList, aDestList ) ); } @@ -950,8 +950,8 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec { SvShorts aSrcList; SvShorts aDestList; - aSrcList.Insert(nSrcTab,0); - aDestList.Insert(nDestTab,0); + aSrcList.push_front(nSrcTab); + aDestList.push_front(nDestTab); GetUndoManager()->AddUndoAction( new ScUndoMoveTab( this, aSrcList, aDestList ) ); } diff --git a/sc/source/ui/docshell/makefile.mk b/sc/source/ui/docshell/makefile.mk index 99a7495b6b49..af45c63c2cdf 100644 --- a/sc/source/ui/docshell/makefile.mk +++ b/sc/source/ui/docshell/makefile.mk @@ -98,6 +98,7 @@ EXCEPTIONSFILES= \ $(SLO)$/docsh.obj \ $(SLO)$/docsh3.obj \ $(SLO)$/docsh4.obj \ + $(SLO)$/docsh5.obj \ $(SLO)$/docsh8.obj \ $(SLO)$/externalrefmgr.obj \ $(SLO)$/dbdocimp.obj \ diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src index 65e98eea7b2c..3fc8699c9dbf 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" ; \ };\ @@ -119,14 +119,14 @@ {\ RadioCheck = TRUE ; \ Identifier = SID_ANCHOR_PAGE ; \ - HelpId = SID_ANCHOR_PAGE ; \ + HelpId = CMD_SID_ANCHOR_PAGE ; \ Text [ en-US ] = "To P~age" ; \ };\ MenuItem\ {\ RadioCheck = TRUE ; \ Identifier = SID_ANCHOR_CELL ; \ - HelpId = SID_ANCHOR_CELL ; \ + HelpId = CMD_SID_ANCHOR_CELL ; \ Text [ en-US ] = "To ~Cell" ; \ };\ };\ @@ -137,7 +137,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..297e8fa38651 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -54,7 +54,8 @@ #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include <svx/svdundo.hxx> - +#include <sfx2/msgpool.hxx> +#include <scmod.hxx> // BM/IHA -- #include <cppuhelper/component_context.hxx> @@ -261,12 +262,11 @@ 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(); 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/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx index 340e71faa71c..ef7e0d675162 100644 --- a/sc/source/ui/drawfunc/futext2.cxx +++ b/sc/source/ui/drawfunc/futext2.cxx @@ -129,10 +129,6 @@ //#define _GRAPH_HXX #define _SOUND_HXX -#if defined WIN -#define _MENUBTN_HXX -#endif - //svtools #define _SCRWIN_HXX #define _RULER_HXX diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index 82649044b38c..4b417b28e59b 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 fr die selektierten Textobjekte festlegen : Textattribute fr 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? Originalgre : Originalgre */\ 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 ] = " ";\ @@ -341,7 +341,7 @@ {\ RadioCheck = TRUE ; \ Identifier = SID_ANCHOR_PAGE ; \ - HelpId = SID_ANCHOR_PAGE ; \ + HelpId = CMD_SID_ANCHOR_PAGE ; \ Text [ en-US ] = "To P~age" ; \ Text [ x-comment ] = " ";\ };\ @@ -349,7 +349,7 @@ {\ RadioCheck = TRUE ; \ Identifier = SID_ANCHOR_CELL ; \ - HelpId = SID_ANCHOR_CELL ; \ + HelpId = CMD_SID_ANCHOR_CELL ; \ Text [ en-US ] = "To ~Cell" ; \ Text [ x-comment ] = " ";\ };\ @@ -362,7 +362,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN ; \ - HelpId = SID_OBJECT_ALIGN ; \ + HelpId = CMD_SID_OBJECT_ALIGN ; \ Text [ en-US ] = "A~lignment" ; \ SubMenu = Menu\ {\ @@ -412,150 +412,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 // @@ -564,504 +420,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 // @@ -1069,182 +427,6 @@ 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 --------------------------------------------------------------------- // @@ -1415,36 +597,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/formdlg/dwfunctr.src b/sc/source/ui/formdlg/dwfunctr.src index 6f8a054dd6ff..d9e77c96c8dc 100644 --- a/sc/source/ui/formdlg/dwfunctr.src +++ b/sc/source/ui/formdlg/dwfunctr.src @@ -45,6 +45,7 @@ DockingWindow FID_FUNCTION_BOX HelpId = HID_FUNCTION_BOX ; ListBox CB_CAT { + HelpID = "sc:ListBox:FID_FUNCTION_BOX:CB_CAT"; Border = TRUE ; Pos = MAP_APPFONT ( 20 , 4 ) ; Size = MAP_APPFONT ( 56 , 80 ) ; @@ -72,6 +73,7 @@ DockingWindow FID_FUNCTION_BOX }; ListBox DDLB_FUNC { + HelpID = "sc:ListBox:FID_FUNCTION_BOX:DDLB_FUNC"; Border = TRUE ; Pos = MAP_APPFONT ( 103 , 4 ) ; Size = MAP_APPFONT ( 56 , 80 ) ; @@ -82,6 +84,7 @@ DockingWindow FID_FUNCTION_BOX }; ListBox LB_FUNC { + HelpID = "sc:ListBox:FID_FUNCTION_BOX:LB_FUNC"; Border = TRUE ; Pos = MAP_APPFONT ( 3 , 19 ) ; Size = MAP_APPFONT ( 72 , 90 ) ; @@ -103,6 +106,7 @@ DockingWindow FID_FUNCTION_BOX }; ImageButton IMB_INSERT { + HelpID = "sc:ImageButton:FID_FUNCTION_BOX:IMB_INSERT"; Pos = MAP_APPFONT ( 3 , 4 ) ; Size = MAP_APPFONT ( 13 , 13 ) ; TabStop = TRUE ; 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/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 338609ae0e4d..e7ca3da290b0 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -44,7 +44,7 @@ public: const String& rTitle, const String& rTabBgColorNoColorText, const Color& rDefaultColor, - ULONG nHelpId ); + const rtl::OString& nHelpId ); ~ScTabBgColorDlg(); void GetSelectedColor( Color& rColor ) const; @@ -67,7 +67,7 @@ private: HelpButton aBtnHelp; Color aTabBgColor; const String aTabBgColorNoColorText; - ULONG mnHelpId; + rtl::OString msHelpId; void FillColorValueSets_Impl(); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 6f59b64c52fc..d2cc5a7390cf 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -179,7 +179,7 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP pTPView->SetRejectAllClickHdl( LINK( this, ScAcceptChgDlg,RejectAllHandle)); pTPView->SetAcceptAllClickHdl( LINK(this, ScAcceptChgDlg, AcceptAllHandle)); pTheView->SetCalcView(); - pTheView->SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); + pTheView->SetStyle(pTheView->GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); pTheView->SetExpandingHdl( LINK(this, ScAcceptChgDlg, ExpandingHandle)); pTheView->SetSelectHdl( LINK(this, ScAcceptChgDlg, SelectHandle)); pTheView->SetDeselectHdl( LINK(this, ScAcceptChgDlg, SelectHandle)); diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src index 4baa9f3d388c..269746cf0fa1 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 ) ; @@ -60,6 +60,7 @@ ModelessDialog RID_SCDLG_CHANGES }; Edit ED_ASSIGN { + HelpID = "sc:Edit:RID_SCDLG_CHANGES:ED_ASSIGN"; Hide = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 119 ) ; @@ -68,6 +69,7 @@ ModelessDialog RID_SCDLG_CHANGES }; ImageButton RB_ASSIGN { + HelpID = "sc:ImageButton:RID_SCDLG_CHANGES:RB_ASSIGN"; Hide = TRUE ; Pos = MAP_APPFONT ( 142 , 118 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 32b3376da9a7..4c544954b2bc 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -690,7 +690,7 @@ ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pActiveWin(NULL) { m_aHelper.SetWindow(/*this*/&m_rWindow); - 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. diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 89f818e21928..5ff5ca570ee4 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -514,7 +514,7 @@ ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocume aHeader += maStrTitleDate; maLbConflicts.InsertHeaderEntry( aHeader, HEADERBAR_APPEND, HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER ); - maLbConflicts.SetWindowBits( WB_HASLINES | WB_CLIPCHILDREN | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL ); + maLbConflicts.SetStyle( maLbConflicts.GetStyle() | WB_HASLINES | WB_CLIPCHILDREN | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL ); maLbConflicts.SetSelectionMode( MULTIPLE_SELECTION ); maLbConflicts.SetHighlightRange(); diff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.src index 1facf85da95b..1bdec57067f4 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.src +++ b/sc/source/ui/miscdlgs/conflictsdlg.src @@ -52,12 +52,14 @@ ModalDialog RID_SCDLG_CONFLICTS }; PushButton BTN_KEEPMINE { + HelpID = "sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE"; Pos = MAP_APPFONT ( 72 , 145 ) ; Size = MAP_APPFONT ( 76 , 14 ) ; Text [ en-US ] = "Keep ~Mine" ; }; PushButton BTN_KEEPOTHER { + HelpID = "sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER"; Pos = MAP_APPFONT ( 190 , 145 ) ; Size = MAP_APPFONT ( 76 , 14 ) ; Text [ en-US ] = "Keep ~Other" ; @@ -69,12 +71,14 @@ ModalDialog RID_SCDLG_CONFLICTS }; PushButton BTN_KEEPALLMINE { + HelpID = "sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE"; Pos = MAP_APPFONT ( 6 , 172 ) ; Size = MAP_APPFONT ( 104 , 14 ) ; Text [ en-US ] = "~Keep All Mine" ; }; PushButton BTN_KEEPALLOTHERS { + HelpID = "sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS"; Pos = MAP_APPFONT ( 116 , 172 ) ; Size = MAP_APPFONT ( 104 , 14 ) ; Text [ en-US ] = "Keep ~All Others" ; diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src index a244a3e2a44e..dd32eb9b4012 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 ) ; @@ -38,6 +38,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES // Dieser Dialog hat einen Cancel-Button ! CheckBox CB_HIGHLIGHT { + HelpID = "sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; TabStop = TRUE ; @@ -51,6 +52,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES }; CheckBox CB_HIGHLIGHT_ACCEPT { + HelpID = "sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT"; Pos = MAP_APPFONT ( 12 , 118 ) ; Size = MAP_APPFONT ( 246 , 10 ) ; TabStop = TRUE ; @@ -58,6 +60,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES }; CheckBox CB_HIGHLIGHT_REJECT { + HelpID = "sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT"; Pos = MAP_APPFONT ( 12 , 132 ) ; Size = MAP_APPFONT ( 246 , 10 ) ; TabStop = TRUE ; @@ -84,6 +87,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES }; Edit ED_ASSIGN { + HelpID = "sc:Edit:RID_SCDLG_HIGHLIGHT_CHANGES:ED_ASSIGN"; Hide = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 119 ) ; @@ -92,6 +96,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES }; ImageButton RB_ASSIGN { + HelpID = "sc:ImageButton:RID_SCDLG_HIGHLIGHT_CHANGES:RB_ASSIGN"; Hide = TRUE ; Pos = MAP_APPFONT ( 142 , 118 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; diff --git a/sc/source/ui/miscdlgs/instbdlg.src b/sc/source/ui/miscdlgs/instbdlg.src index 6f64c0de1d62..86b291547284 100644 --- a/sc/source/ui/miscdlgs/instbdlg.src +++ b/sc/source/ui/miscdlgs/instbdlg.src @@ -28,6 +28,7 @@ #include "instbdlg.hrc" ModalDialog RID_SCDLG_INSERT_TABLE { + HelpID = "sc:ModalDialog:RID_SCDLG_INSERT_TABLE"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 274 , 190 ) ; @@ -59,6 +60,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE }; RadioButton RB_BEFORE { + HelpID = "sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEFORE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 197 , 10 ) ; TabStop = TRUE ; @@ -66,6 +68,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE }; RadioButton RB_BEHIND { + HelpID = "sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEHIND"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 197 , 10 ) ; TabStop = TRUE ; @@ -79,6 +82,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE }; RadioButton RB_NEW { + HelpID = "sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_NEW"; Pos = MAP_APPFONT ( 12 , 55 ) ; Size = MAP_APPFONT ( 197 , 10 ) ; Text [ en-US ] = "~New sheet" ; @@ -91,6 +95,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE }; NumericField NF_COUNT { + HelpID = "sc:NumericField:RID_SCDLG_INSERT_TABLE:NF_COUNT"; Border = TRUE ; Pos = MAP_APPFONT ( 72 , 66 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -109,18 +114,21 @@ ModalDialog RID_SCDLG_INSERT_TABLE }; Edit ED_TABNAME { + HelpID = "sc:Edit:RID_SCDLG_INSERT_TABLE:ED_TABNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 72 , 82 ) ; Size = MAP_APPFONT ( 137 , 12 ) ; }; RadioButton RB_FROMFILE { + HelpID = "sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_FROMFILE"; Pos = MAP_APPFONT ( 12 , 100 ) ; Size = MAP_APPFONT ( 197 , 10 ) ; Text [ en-US ] = "~From file" ; }; MultiListBox LB_TABLES { + HelpID = "sc:MultiListBox:RID_SCDLG_INSERT_TABLE:LB_TABLES"; SimpleMode = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 20 , 113 ) ; @@ -129,12 +137,14 @@ ModalDialog RID_SCDLG_INSERT_TABLE }; PushButton BTN_BROWSE { + HelpID = "sc:PushButton:RID_SCDLG_INSERT_TABLE:BTN_BROWSE"; Pos = MAP_APPFONT ( 149 , 113 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Browse..." ; }; CheckBox CB_LINK { + HelpID = "sc:CheckBox:RID_SCDLG_INSERT_TABLE:CB_LINK"; Pos = MAP_APPFONT ( 149 , 131 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? Ver~knpfen : Ver~knpfen */ diff --git a/sc/source/ui/miscdlgs/linkarea.src b/sc/source/ui/miscdlgs/linkarea.src index 715d3fd20766..11780c2995fe 100644 --- a/sc/source/ui/miscdlgs/linkarea.src +++ b/sc/source/ui/miscdlgs/linkarea.src @@ -29,6 +29,7 @@ ModalDialog RID_SCDLG_LINKAREA { + HelpID = "sc:ModalDialog:RID_SCDLG_LINKAREA"; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; @@ -58,6 +59,7 @@ ModalDialog RID_SCDLG_LINKAREA }; ComboBox CB_URL { + HelpID = "sc:ComboBox:RID_SCDLG_LINKAREA:CB_URL"; Pos = MAP_APPFONT ( 12 , 15 ) ; Size = MAP_APPFONT ( 174 , 80 ) ; TabStop = TRUE ; @@ -65,6 +67,7 @@ ModalDialog RID_SCDLG_LINKAREA }; PushButton BTN_BROWSE { + HelpID = "sc:PushButton:RID_SCDLG_LINKAREA:BTN_BROWSE"; Pos = MAP_APPFONT ( 190 , 14 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~..." ; @@ -84,6 +87,7 @@ ModalDialog RID_SCDLG_LINKAREA }; MultiListBox LB_RANGES { + HelpID = "sc:MultiListBox:RID_SCDLG_LINKAREA:LB_RANGES"; SimpleMode = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 74 ) ; @@ -92,6 +96,7 @@ ModalDialog RID_SCDLG_LINKAREA }; CheckBox BTN_RELOAD { + HelpID = "sc:CheckBox:RID_SCDLG_LINKAREA:BTN_RELOAD"; Pos = MAP_APPFONT ( 12 , 168 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -99,6 +104,7 @@ ModalDialog RID_SCDLG_LINKAREA }; NumericField NF_DELAY { + HelpID = "sc:NumericField:RID_SCDLG_LINKAREA:NF_DELAY"; Border = TRUE ; Pos = MAP_APPFONT ( 113 , 166 ) ; Size = MAP_APPFONT ( 32 , 12 ) ; diff --git a/sc/source/ui/miscdlgs/protectiondlg.src b/sc/source/ui/miscdlgs/protectiondlg.src index 6b62efb4c784..f46cb6700ded 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.src +++ b/sc/source/ui/miscdlgs/protectiondlg.src @@ -29,6 +29,7 @@ ModalDialog RID_SCDLG_TABPROTECTION { + HelpID = "sc:ModalDialog:RID_SCDLG_TABPROTECTION"; Text [ en-US ] = "Protect Sheet" ; Size = MAP_APPFONT ( 220 , 135 ) ; Moveable = TRUE ; @@ -53,6 +54,7 @@ ModalDialog RID_SCDLG_TABPROTECTION CheckBox BTN_PROTECT { + HelpID = "sc:CheckBox:RID_SCDLG_TABPROTECTION:BTN_PROTECT"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 150 , 10 ); @@ -69,6 +71,7 @@ ModalDialog RID_SCDLG_TABPROTECTION Edit ED_PASSWORD1 { + HelpID = "sc:Edit:RID_SCDLG_TABPROTECTION:ED_PASSWORD1"; Border = TRUE; PassWord = TRUE; Pos = MAP_APPFONT ( 56, 22 ); @@ -85,6 +88,7 @@ ModalDialog RID_SCDLG_TABPROTECTION Edit ED_PASSWORD2 { + HelpID = "sc:Edit:RID_SCDLG_TABPROTECTION:ED_PASSWORD2"; Border = TRUE; PassWord = TRUE; Pos = MAP_APPFONT ( 56, 39 ); diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src index 794af9d43ebd..daf563201587 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.src +++ b/sc/source/ui/miscdlgs/retypepassdlg.src @@ -30,6 +30,7 @@ ModalDialog RID_SCDLG_RETYPEPASS { + HelpID = "sc:ModalDialog:RID_SCDLG_RETYPEPASS"; Text [ en-US ] = "Re-type Password" ; Size = MAP_APPFONT ( 260 , 165 ) ; Moveable = TRUE ; @@ -82,6 +83,7 @@ ModalDialog RID_SCDLG_RETYPEPASS PushButton BTN_RETYPE_DOC { + HelpID = "sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_DOC"; Pos = MAP_APPFONT ( 158, 59 ); Size = MAP_APPFONT ( 30, 14 ); @@ -114,6 +116,7 @@ ModalDialog RID_SCDLG_RETYPEPASS PushButton BTN_RETYPE_SHEET1 { + HelpID = "sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET1"; Pos = MAP_APPFONT ( 158, 94 ); Size = MAP_APPFONT ( 30, 14 ); @@ -138,6 +141,7 @@ ModalDialog RID_SCDLG_RETYPEPASS PushButton BTN_RETYPE_SHEET2 { + HelpID = "sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET2"; Pos = MAP_APPFONT ( 158, 110 ); Size = MAP_APPFONT ( 30, 14 ); @@ -162,6 +166,7 @@ ModalDialog RID_SCDLG_RETYPEPASS PushButton BTN_RETYPE_SHEET3 { + HelpID = "sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET3"; Pos = MAP_APPFONT ( 158, 126 ); Size = MAP_APPFONT ( 30, 14 ); @@ -186,6 +191,7 @@ ModalDialog RID_SCDLG_RETYPEPASS PushButton BTN_RETYPE_SHEET4 { + HelpID = "sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET4"; Pos = MAP_APPFONT ( 158, 142 ); Size = MAP_APPFONT ( 30, 14 ); @@ -229,6 +235,7 @@ ModalDialog RID_SCDLG_RETYPEPASS ModalDialog RID_SCDLG_RETYPEPASS_INPUT { + HelpID = "sc:ModalDialog:RID_SCDLG_RETYPEPASS_INPUT"; Text [ en-US ] = "Re-type Password" ; Size = MAP_APPFONT ( 230 , 110 ) ; Moveable = TRUE ; @@ -255,6 +262,7 @@ ModalDialog RID_SCDLG_RETYPEPASS_INPUT RadioButton BTN_RETYPE_PASSWORD { + HelpID = "sc:RadioButton:RID_SCDLG_RETYPEPASS_INPUT:BTN_RETYPE_PASSWORD"; Pos = MAP_APPFONT ( 11, 10 ); Size = MAP_APPFONT ( 150, 10 ); @@ -271,6 +279,7 @@ ModalDialog RID_SCDLG_RETYPEPASS_INPUT Edit ED_PASSWORD1 { + HelpID = "sc:Edit:RID_SCDLG_RETYPEPASS_INPUT:ED_PASSWORD1"; Border = TRUE; PassWord = TRUE; Pos = MAP_APPFONT ( 65, 29 ); @@ -287,6 +296,7 @@ ModalDialog RID_SCDLG_RETYPEPASS_INPUT Edit ED_PASSWORD2 { + HelpID = "sc:Edit:RID_SCDLG_RETYPEPASS_INPUT:ED_PASSWORD2"; Border = TRUE; PassWord = TRUE; Pos = MAP_APPFONT ( 65, 44 ); @@ -295,6 +305,7 @@ ModalDialog RID_SCDLG_RETYPEPASS_INPUT CheckBox BTN_MATCH_OLD_PASSWORD { + HelpID = "sc:CheckBox:RID_SCDLG_RETYPEPASS_INPUT:BTN_MATCH_OLD_PASSWORD"; Pos = MAP_APPFONT ( 20, 65 ); Size = MAP_APPFONT ( 150, 10 ); @@ -303,6 +314,7 @@ ModalDialog RID_SCDLG_RETYPEPASS_INPUT RadioButton BTN_REMOVE_PASSWORD { + HelpID = "sc:RadioButton:RID_SCDLG_RETYPEPASS_INPUT:BTN_REMOVE_PASSWORD"; Pos = MAP_APPFONT ( 11, 90 ); Size = MAP_APPFONT ( 150, 10 ); 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..2accd0300bbd 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" ; @@ -38,6 +38,7 @@ ModalDialog RID_SCDLG_SHAREDOCUMENT Closeable = TRUE ; CheckBox CB_SHARE { + HelpID = "sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 192 , 8 ) ; Text [ en-US ] = "Share this spreadsheet with other users" ; diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 7e57ebbe5d60..99f3ba5ad444 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -62,12 +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 ); - SetHelpId( nDlgHelpId ); - aLb.SetHelpId( 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 418a88b3cbea..d165c2362d7e 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -145,7 +145,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, maBtnEdit.SetClickHdl( LINK( this, ScSolverOptionsDialog, ButtonHdl ) ); - maLbSettings.SetWindowBits( WB_CLIPCHILDREN|WB_FORCE_MAKEVISIBLE ); + maLbSettings.SetStyle( maLbSettings.GetStyle()|WB_CLIPCHILDREN|WB_FORCE_MAKEVISIBLE ); maLbSettings.SetHelpId( HID_SC_SOLVEROPTIONS_LB ); maLbSettings.SetHighlightRange(); diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index b8dc2e13538e..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,30 +64,12 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ) { - 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 ) - aEdInput.SetHelpId( HID_SC_APPEND_NAME ); - else if ( nHelpId == FID_TAB_RENAME ) - aEdInput.SetHelpId( HID_SC_RENAME_NAME ); - else if ( nHelpId == HID_SC_ADD_AUTOFMT ) - aEdInput.SetHelpId( HID_SC_AUTOFMT_NAME ); - else if ( nHelpId == HID_SC_REN_AFMT_DLG ) - aEdInput.SetHelpId( HID_SC_REN_AFMT_NAME ); - else if ( nHelpId == SID_RENAME_OBJECT ) - aEdInput.SetHelpId( HID_SC_RENAME_OBJECT ); - // #i68101# - else if ( nHelpId == SID_TITLE_DESCRIPTION_OBJECT ) - aEdInput.SetHelpId( HID_SC_TITLE_DESCRIPTION_OBJECT ); - else - DBG_ERRORFILE( "unknown ID" ); - + aEdInput.SetHelpId( sEditHelpId ); //------------- FreeResource(); } diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 463c06d76712..1c929ea93f99 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -59,7 +59,7 @@ ScTabBgColorDlg::ScTabBgColorDlg( Window* pParent, const String& rTitle, const String& rTabBgColorNoColorText, const Color& rDefaultColor, - ULONG nHelpId ) : + const rtl::OString& sHelpId ) : ModalDialog ( pParent, ScResId( RID_SCDLG_TAB_BG_COLOR ) ), aBorderWin ( this, ScResId( TAB_BG_COLOR_CT_BORDER ) ), aTabBgColorSet ( &aBorderWin, ScResId( TAB_BG_COLOR_SET_BGDCOLOR ), this ), @@ -68,10 +68,10 @@ ScTabBgColorDlg::ScTabBgColorDlg( Window* pParent, aBtnHelp ( this, ScResId( BTN_HELP ) ), aTabBgColor ( rDefaultColor ), aTabBgColorNoColorText ( rTabBgColorNoColorText ), - mnHelpId ( nHelpId ) + msHelpId ( sHelpId ) { - SetHelpId( nHelpId ); + SetHelpId( sHelpId ); this->SetText( rTitle ); this->SetStyle(GetStyle() | WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL | WB_SYSTEMWINDOW | WB_STANDALONE | WB_HIDE); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index a417621bb303..0b991bb83220 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -145,6 +145,8 @@ ScContentTree::ScContentTree( Window* pParent, const ResId& rResId ) : SetNodeDefaultImages(); SetDoubleClickHdl( LINK( this, ScContentTree, ContentDoubleClickHdl ) ); + + SetStyle( GetStyle() | WB_QUICK_SEARCH ); } ScContentTree::~ScContentTree() @@ -1327,11 +1329,11 @@ BOOL ScContentTree::LoadFile( const String& rUrl ) void ScContentTree::InitWindowBits( BOOL bButtons ) { - WinBits nFlags = WB_CLIPCHILDREN|WB_HSCROLL; + WinBits nFlags = GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL; if (bButtons) nFlags |= WB_HASBUTTONS|WB_HASBUTTONSATROOT; - SetWindowBits( nFlags ); + SetStyle( nFlags ); } void ScContentTree::SetRootType( USHORT nNew ) diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src index 1445636e8cc6..a0892545f2eb 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 ; }; }; }; @@ -489,6 +489,7 @@ TabPage RID_HFBASE /* #i84123# list box needs own help id, which is set in the derived tab pages ListBox LB_DEFINED { + HelpID = "sc:ListBox:RID_HFBASE:LB_DEFINED"; Border = TRUE ; Pos = MAP_APPFONT ( 90 , 100 ) ; Size = MAP_APPFONT ( 130 , 80 ) ; diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src index d0f95c3d9f6b..070da19e8076 100644 --- a/sc/source/ui/pagedlg/pagedlg.src +++ b/sc/source/ui/pagedlg/pagedlg.src @@ -59,6 +59,7 @@ ModelessDialog RID_SCDLG_AREAS }; ListBox LB_PRINTAREA { + HelpID = "sc:ListBox:RID_SCDLG_AREAS:LB_PRINTAREA"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 90 , 60 ) ; @@ -73,12 +74,14 @@ ModelessDialog RID_SCDLG_AREAS }; Edit ED_PRINTAREA { + HelpID = "sc:Edit:RID_SCDLG_AREAS:ED_PRINTAREA"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 14 ) ; Size = MAP_APPFONT ( 131 , 12 ) ; }; ImageButton RB_PRINTAREA { + HelpID = "sc:ImageButton:RID_SCDLG_AREAS:RB_PRINTAREA"; Pos = MAP_APPFONT ( 239 , 13 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -92,6 +95,7 @@ ModelessDialog RID_SCDLG_AREAS }; ListBox LB_REPEATROW { + HelpID = "sc:ListBox:RID_SCDLG_AREAS:LB_REPEATROW"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 43 ) ; Size = MAP_APPFONT ( 90 , 60 ) ; @@ -104,12 +108,14 @@ ModelessDialog RID_SCDLG_AREAS }; Edit ED_REPEATROW { + HelpID = "sc:Edit:RID_SCDLG_AREAS:ED_REPEATROW"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 43 ) ; Size = MAP_APPFONT ( 131 , 12 ) ; }; ImageButton RB_REPEATROW { + HelpID = "sc:ImageButton:RID_SCDLG_AREAS:RB_REPEATROW"; Pos = MAP_APPFONT ( 239 , 42 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -123,6 +129,7 @@ ModelessDialog RID_SCDLG_AREAS }; ListBox LB_REPEATCOL { + HelpID = "sc:ListBox:RID_SCDLG_AREAS:LB_REPEATCOL"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 72 ) ; Size = MAP_APPFONT ( 90 , 60 ) ; @@ -135,12 +142,14 @@ ModelessDialog RID_SCDLG_AREAS }; Edit ED_REPEATCOL { + HelpID = "sc:Edit:RID_SCDLG_AREAS:ED_REPEATCOL"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 72 ) ; Size = MAP_APPFONT ( 131 , 12 ) ; }; ImageButton RB_REPEATCOL { + HelpID = "sc:ImageButton:RID_SCDLG_AREAS:RB_REPEATCOL"; Pos = MAP_APPFONT ( 239 , 71 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -156,6 +165,7 @@ TabPage RID_SCPAGE_TABLE Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox BTN_HEADER { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_HEADER"; Pos = MAP_APPFONT ( 12 , 73 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; Text [ en-US ] = "~Column and row headers" ; @@ -163,6 +173,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_GRID { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_GRID"; Pos = MAP_APPFONT ( 12 , 87 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; Text [ en-US ] = "~Grid" ; @@ -170,6 +181,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_NOTES { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_NOTES"; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; Text [ en-US ] = "~Comments" ; @@ -177,6 +189,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_OBJECTS { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_OBJECTS"; Pos = MAP_APPFONT ( 12 , 115 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; Text [ en-US ] = "~Objects/graphics" ; @@ -184,6 +197,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_CHARTS { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_CHARTS"; Pos = MAP_APPFONT ( 160 , 73 ) ; Size = MAP_APPFONT ( 91 , 10 ) ; Text [ en-US ] = "Ch~arts" ; @@ -191,6 +205,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_DRAWINGS { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_DRAWINGS"; Pos = MAP_APPFONT ( 160 , 87 ) ; Size = MAP_APPFONT ( 91 , 10 ) ; Text [ en-US ] = "~Drawing objects" ; @@ -198,6 +213,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_FORMULAS { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_FORMULAS"; Pos = MAP_APPFONT ( 160 , 101 ) ; Size = MAP_APPFONT ( 91 , 10 ) ; Text [ en-US ] = "~Formulas" ; @@ -205,6 +221,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_NULLVALS { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_NULLVALS"; Pos = MAP_APPFONT ( 160 , 115 ) ; Size = MAP_APPFONT ( 91 , 10 ) ; Text [ en-US ] = "Zero ~values" ; @@ -218,6 +235,7 @@ TabPage RID_SCPAGE_TABLE }; RadioButton BTN_TOPDOWN { + HelpID = "sc:RadioButton:RID_SCPAGE_TABLE:BTN_TOPDOWN"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; Text [ en-US ] = "~Top to bottom, then right" ; @@ -225,6 +243,7 @@ TabPage RID_SCPAGE_TABLE }; RadioButton BTN_LEFTRIGHT { + HelpID = "sc:RadioButton:RID_SCPAGE_TABLE:BTN_LEFTRIGHT"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; Text [ en-US ] = "~Left to right, then down" ; @@ -257,6 +276,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_PAGENO { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_PAGENO"; Pos = MAP_APPFONT ( 12 , 46 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "First ~page number" ; @@ -264,6 +284,7 @@ TabPage RID_SCPAGE_TABLE }; NumericField ED_PAGENO { + HelpID = "sc:NumericField:RID_SCPAGE_TABLE:ED_PAGENO"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 44 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -288,6 +309,7 @@ TabPage RID_SCPAGE_TABLE }; ListBox LB_SCALEMODE { + HelpID = "sc:ListBox:RID_SCPAGE_TABLE:LB_SCALEMODE"; Border = TRUE; Pos = MAP_APPFONT( 12, 155 ); Size = MAP_APPFONT( 124, 60 ); @@ -301,6 +323,7 @@ TabPage RID_SCPAGE_TABLE }; MetricField ED_SCALEALL { + HelpID = "sc:MetricField:RID_SCPAGE_TABLE:ED_SCALEALL"; Border = TRUE ; Pos = MAP_APPFONT ( 218 , 155 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -317,6 +340,7 @@ TabPage RID_SCPAGE_TABLE }; NumericField ED_SCALEPAGEWIDTH { + HelpID = "sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEWIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 218 , 144 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -330,6 +354,7 @@ TabPage RID_SCPAGE_TABLE }; NumericField ED_SCALEPAGEHEIGHT { + HelpID = "sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEHEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 218 , 160 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -343,6 +368,7 @@ TabPage RID_SCPAGE_TABLE }; NumericField ED_SCALEPAGENUM { + HelpID = "sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGENUM"; Border = TRUE ; Pos = MAP_APPFONT ( 218 , 155 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; diff --git a/sc/source/ui/src/attrdlg.src b/sc/source/ui/src/attrdlg.src index ae130f7e8a96..af14f7362cb3 100644 --- a/sc/source/ui/src/attrdlg.src +++ b/sc/source/ui/src/attrdlg.src @@ -109,6 +109,7 @@ TabPage RID_SCPAGE_PROTECTION Size = MAP_APPFONT ( 260 , 185 ) ; TriStateBox BTN_PROTECTED { + HelpID = "sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_PROTECTED"; Pos = MAP_APPFONT ( 22 , 28 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "~Protected" ; @@ -116,6 +117,7 @@ TabPage RID_SCPAGE_PROTECTION }; TriStateBox BTN_HIDE_FORMULAR { + HelpID = "sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_FORMULAR"; Pos = MAP_APPFONT ( 22 , 42 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Hide ~formula" ; @@ -123,6 +125,7 @@ TabPage RID_SCPAGE_PROTECTION }; TriStateBox BTN_HIDE_ALL { + HelpID = "sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_ALL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Hide ~all" ; @@ -143,6 +146,7 @@ TabPage RID_SCPAGE_PROTECTION }; TriStateBox BTN_HIDE_PRINT { + HelpID = "sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_PRINT"; Pos = MAP_APPFONT ( 12 , 87 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Hide ~when printing" ; diff --git a/sc/source/ui/src/autofmt.src b/sc/source/ui/src/autofmt.src index cb56f6ac85a4..2288c96a257c 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 */ @@ -40,6 +40,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT Closeable = FALSE ; ListBox LB_FORMAT { + HelpID = "sc:ListBox:RID_SCDLG_AUTOFORMAT:LB_FORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 70 , 101 ) ; @@ -59,6 +60,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT }; CheckBox BTN_ADJUST { + HelpID = "sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_ADJUST"; Hide = TRUE ; Pos = MAP_APPFONT ( 172 , 146 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; @@ -68,6 +70,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT }; CheckBox BTN_BORDER { + HelpID = "sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_BORDER"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 146 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; @@ -76,6 +79,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT }; CheckBox BTN_FONT { + HelpID = "sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_FONT"; Hide = TRUE ; Pos = MAP_APPFONT ( 93 , 132 ) ; Size = MAP_APPFONT ( 73 , 10 ) ; @@ -84,6 +88,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT }; CheckBox BTN_PATTERN { + HelpID = "sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_PATTERN"; Hide = TRUE ; Pos = MAP_APPFONT ( 93 , 146 ) ; Size = MAP_APPFONT ( 73 , 10 ) ; @@ -92,6 +97,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT }; CheckBox BTN_ALIGNMENT { + HelpID = "sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_ALIGNMENT"; Hide = TRUE ; Pos = MAP_APPFONT ( 172 , 132 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; @@ -100,6 +106,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT }; CheckBox BTN_NUMFORMAT { + HelpID = "sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_NUMFORMAT"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 132 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; @@ -128,6 +135,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT }; MoreButton BTN_MORE { + HelpID = "sc:MoreButton:RID_SCDLG_AUTOFORMAT:BTN_MORE"; Pos = MAP_APPFONT ( 256 , 101 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -136,6 +144,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT }; PushButton BTN_ADD { + HelpID = "sc:PushButton:RID_SCDLG_AUTOFORMAT:BTN_ADD"; Pos = MAP_APPFONT ( 256 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Einfgen... : ~Einfgen... */ @@ -144,6 +153,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT }; PushButton BTN_REMOVE { + HelpID = "sc:PushButton:RID_SCDLG_AUTOFORMAT:BTN_REMOVE"; Pos = MAP_APPFONT ( 256 , 81 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Lschen : ~Lschen */ diff --git a/sc/source/ui/src/condfrmt.src b/sc/source/ui/src/condfrmt.src index 3018cc867e0d..4cd79a2ffc3d 100644 --- a/sc/source/ui/src/condfrmt.src +++ b/sc/source/ui/src/condfrmt.src @@ -37,6 +37,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT Hide = TRUE ; CheckBox CBX_COND1 { + HelpID = "sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND1"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 248 , 10 ) ; TabStop = TRUE ; @@ -44,6 +45,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ListBox LB_COND1_1 { + HelpID = "sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_1"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 19 ) ; Size = MAP_APPFONT ( 48 , 40 ) ; @@ -57,6 +59,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ListBox LB_COND1_2 { + HelpID = "sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_2"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 19 ) ; Size = MAP_APPFONT ( 62 , 88 ) ; @@ -76,6 +79,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; Edit EDT_COND1_1 { + HelpID = "sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND1_1"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 19 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; @@ -83,6 +87,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ImageButton RB_COND1_1 { + HelpID = "sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND1_1"; Pos = MAP_APPFONT ( 167 , 18 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -97,6 +102,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; Edit EDT_COND1_2 { + HelpID = "sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND1_2"; Border = TRUE ; Pos = MAP_APPFONT ( 199 , 19 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; @@ -104,6 +110,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ImageButton RB_COND1_2 { + HelpID = "sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND1_2"; Pos = MAP_APPFONT ( 242 , 18 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -118,6 +125,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ListBox LB_COND1_TEMPLATE { + HelpID = "sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_TEMPLATE"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 35 ) ; Size = MAP_APPFONT ( 62 , 80 ) ; @@ -127,6 +135,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; PushButton BTN_COND1_NEW { + HelpID = "sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND1_NEW"; Pos = MAP_APPFONT ( 124 , 34 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -139,6 +148,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; CheckBox CBX_COND2 { + HelpID = "sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND2"; Pos = MAP_APPFONT ( 6 , 60 ) ; Size = MAP_APPFONT ( 248 , 10 ) ; TabStop = TRUE ; @@ -146,6 +156,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ListBox LB_COND2_1 { + HelpID = "sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_1"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 73 ) ; Size = MAP_APPFONT ( 48 , 40 ) ; @@ -159,6 +170,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ListBox LB_COND2_2 { + HelpID = "sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_2"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 73 ) ; Size = MAP_APPFONT ( 62 , 88 ) ; @@ -178,6 +190,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; Edit EDT_COND2_1 { + HelpID = "sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND2_1"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 73 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; @@ -185,6 +198,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ImageButton RB_COND2_1 { + HelpID = "sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND2_1"; Pos = MAP_APPFONT ( 167 , 72 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -199,6 +213,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; Edit EDT_COND2_2 { + HelpID = "sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND2_2"; Border = TRUE ; Pos = MAP_APPFONT ( 199 , 73 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; @@ -206,6 +221,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ImageButton RB_COND2_2 { + HelpID = "sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND2_2"; Pos = MAP_APPFONT ( 242 , 72 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -220,6 +236,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ListBox LB_COND2_TEMPLATE { + HelpID = "sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_TEMPLATE"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 89 ) ; Size = MAP_APPFONT ( 62 , 80 ) ; @@ -229,6 +246,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; PushButton BTN_COND2_NEW { + HelpID = "sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND2_NEW"; Pos = MAP_APPFONT ( 124 , 88 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -241,6 +259,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; CheckBox CBX_COND3 { + HelpID = "sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND3"; Pos = MAP_APPFONT ( 6 , 114 ) ; Size = MAP_APPFONT ( 248 , 10 ) ; TabStop = TRUE ; @@ -248,6 +267,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ListBox LB_COND3_1 { + HelpID = "sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_1"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 127 ) ; Size = MAP_APPFONT ( 48 , 40 ) ; @@ -261,6 +281,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ListBox LB_COND3_2 { + HelpID = "sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_2"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 127 ) ; Size = MAP_APPFONT ( 62 , 88 ) ; @@ -280,6 +301,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; Edit EDT_COND3_1 { + HelpID = "sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND3_1"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 127 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; @@ -287,6 +309,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ImageButton RB_COND3_1 { + HelpID = "sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND3_1"; Pos = MAP_APPFONT ( 167 , 126 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -301,6 +324,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; Edit EDT_COND3_2 { + HelpID = "sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND3_2"; Border = TRUE ; Pos = MAP_APPFONT ( 199 , 127 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; @@ -308,6 +332,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ImageButton RB_COND3_2 { + HelpID = "sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND3_2"; Pos = MAP_APPFONT ( 242 , 126 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -322,6 +347,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; ListBox LB_COND3_TEMPLATE { + HelpID = "sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_TEMPLATE"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 143 ) ; Size = MAP_APPFONT ( 62 , 80 ) ; @@ -331,6 +357,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; PushButton BTN_COND3_NEW { + HelpID = "sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND3_NEW"; Pos = MAP_APPFONT ( 124 , 142 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sc/source/ui/src/crnrdlg.src b/sc/source/ui/src/crnrdlg.src index b16a3506bf7b..7dac2b7e6b81 100644 --- a/sc/source/ui/src/crnrdlg.src +++ b/sc/source/ui/src/crnrdlg.src @@ -42,6 +42,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES }; ListBox LB_RANGE { + HelpID = "sc:ListBox:RID_SCDLG_COLROWNAMERANGES:LB_RANGE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 179 , 85 ) ; TabStop = TRUE ; @@ -50,6 +51,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES }; Edit ED_AREA { + HelpID = "sc:Edit:RID_SCDLG_COLROWNAMERANGES:ED_AREA"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 105 ) ; Size = MAP_APPFONT ( 165 , 12 ) ; @@ -57,6 +59,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES }; ImageButton RB_AREA { + HelpID = "sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_AREA"; Pos = MAP_APPFONT ( 179 , 104 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -64,6 +67,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES }; RadioButton BTN_COLHEAD { + HelpID = "sc:RadioButton:RID_SCDLG_COLROWNAMERANGES:BTN_COLHEAD"; Pos = MAP_APPFONT ( 20 , 121 ) ; Size = MAP_APPFONT ( 171 , 10 ) ; TabStop = TRUE ; @@ -71,6 +75,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES }; RadioButton BTN_ROWHEAD { + HelpID = "sc:RadioButton:RID_SCDLG_COLROWNAMERANGES:BTN_ROWHEAD"; Pos = MAP_APPFONT ( 20 , 135 ) ; Size = MAP_APPFONT ( 171 , 10 ) ; TabStop = TRUE ; @@ -84,6 +89,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES }; Edit ED_DATA { + HelpID = "sc:Edit:RID_SCDLG_COLROWNAMERANGES:ED_DATA"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 162 ) ; Size = MAP_APPFONT ( 165 , 12 ) ; @@ -91,6 +97,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES }; ImageButton RB_DATA { + HelpID = "sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_DATA"; Pos = MAP_APPFONT ( 179 , 161 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -110,6 +117,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES }; PushButton BTN_ADD { + HelpID = "sc:PushButton:RID_SCDLG_COLROWNAMERANGES:BTN_ADD"; Pos = MAP_APPFONT ( 200 , 104 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add" ; @@ -118,6 +126,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES }; PushButton BTN_REMOVE { + HelpID = "sc:PushButton:RID_SCDLG_COLROWNAMERANGES:BTN_REMOVE"; Pos = MAP_APPFONT ( 200 , 122 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete" ; diff --git a/sc/source/ui/src/dbnamdlg.src b/sc/source/ui/src/dbnamdlg.src index 50152d95d9d5..fa1c589c88f0 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 ) ; @@ -43,6 +43,7 @@ ModelessDialog RID_SCDLG_DBNAMES }; ComboBox ED_NAME { + HelpID = "sc:ComboBox:RID_SCDLG_DBNAMES:ED_NAME"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 145 , 92 ) ; TabStop = TRUE ; @@ -56,6 +57,7 @@ ModelessDialog RID_SCDLG_DBNAMES }; Edit ED_DBAREA { + HelpID = "sc:Edit:RID_SCDLG_DBNAMES:ED_DBAREA"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 123 ) ; Size = MAP_APPFONT ( 131 , 12 ) ; @@ -63,6 +65,7 @@ ModelessDialog RID_SCDLG_DBNAMES }; ImageButton RB_DBAREA { + HelpID = "sc:ImageButton:RID_SCDLG_DBNAMES:RB_DBAREA"; Pos = MAP_APPFONT ( 145 , 122 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -77,6 +80,7 @@ ModelessDialog RID_SCDLG_DBNAMES }; CheckBox BTN_HEADER { + HelpID = "sc:CheckBox:RID_SCDLG_DBNAMES:BTN_HEADER"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 153 ) ; Size = MAP_APPFONT ( 145 , 10 ) ; @@ -85,6 +89,7 @@ ModelessDialog RID_SCDLG_DBNAMES }; CheckBox BTN_SIZE { + HelpID = "sc:CheckBox:RID_SCDLG_DBNAMES:BTN_SIZE"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 167 ) ; Size = MAP_APPFONT ( 145 , 10 ) ; @@ -93,6 +98,7 @@ ModelessDialog RID_SCDLG_DBNAMES }; CheckBox BTN_FORMAT { + HelpID = "sc:CheckBox:RID_SCDLG_DBNAMES:BTN_FORMAT"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 181 ) ; Size = MAP_APPFONT ( 145 , 10 ) ; @@ -101,6 +107,7 @@ ModelessDialog RID_SCDLG_DBNAMES }; CheckBox BTN_STRIPDATA { + HelpID = "sc:CheckBox:RID_SCDLG_DBNAMES:BTN_STRIPDATA"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 195 ) ; Size = MAP_APPFONT ( 145 , 10 ) ; @@ -135,6 +142,7 @@ ModelessDialog RID_SCDLG_DBNAMES }; PushButton BTN_ADD { + HelpID = "sc:PushButton:RID_SCDLG_DBNAMES:BTN_ADD"; Pos = MAP_APPFONT ( 166 , 74 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add" ; @@ -143,6 +151,7 @@ ModelessDialog RID_SCDLG_DBNAMES }; PushButton BTN_REMOVE { + HelpID = "sc:PushButton:RID_SCDLG_DBNAMES:BTN_REMOVE"; Pos = MAP_APPFONT ( 166 , 92 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete" ; @@ -156,6 +165,7 @@ ModelessDialog RID_SCDLG_DBNAMES }; MoreButton BTN_MORE { + HelpID = "sc:MoreButton:RID_SCDLG_DBNAMES:BTN_MORE"; Pos = MAP_APPFONT ( 166 , 122 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src index 52ce38db1516..eed896330b0e 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 ) ; @@ -61,6 +61,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_OP1 { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_OP1"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 40 , 46 ) ; @@ -74,6 +75,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_OP2 { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_OP2"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 41 ) ; Size = MAP_APPFONT ( 40 , 46 ) ; @@ -87,6 +89,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_OP3 { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_OP3"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 57 ) ; Size = MAP_APPFONT ( 40 , 46 ) ; @@ -100,6 +103,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_OP4 { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_OP4"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 73 ) ; Size = MAP_APPFONT ( 40 , 46 ) ; @@ -113,6 +117,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_FIELD1 { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_FIELD1"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 25 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -121,6 +126,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_FIELD2 { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_FIELD2"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 41 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -129,6 +135,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_FIELD3 { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_FIELD3"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 57 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -137,6 +144,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_FIELD4 { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_FIELD4"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 73 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -145,6 +153,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_COND1 { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COND1"; Border = TRUE ; Pos = MAP_APPFONT ( 122 , 25 ) ; Size = MAP_APPFONT ( 75 , 145 ) ; @@ -172,6 +181,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_COND2 { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COND2"; Border = TRUE ; Pos = MAP_APPFONT ( 122 , 41 ) ; Size = MAP_APPFONT ( 75 , 145 ) ; @@ -199,6 +209,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_COND3 { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COND3"; Border = TRUE ; Pos = MAP_APPFONT ( 122 , 57 ) ; Size = MAP_APPFONT ( 75 , 145 ) ; @@ -226,6 +237,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_COND4 { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COND4"; Border = TRUE ; Pos = MAP_APPFONT ( 122 , 73 ) ; Size = MAP_APPFONT ( 75 , 145 ) ; @@ -253,6 +265,7 @@ ModelessDialog RID_SCDLG_FILTER }; ComboBox ED_VAL1 { + HelpID = "sc:ComboBox:RID_SCDLG_FILTER:ED_VAL1"; Pos = MAP_APPFONT ( 201 , 25 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; TabStop = TRUE ; @@ -260,6 +273,7 @@ ModelessDialog RID_SCDLG_FILTER }; ComboBox ED_VAL2 { + HelpID = "sc:ComboBox:RID_SCDLG_FILTER:ED_VAL2"; Pos = MAP_APPFONT ( 201 , 41 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; TabStop = TRUE ; @@ -267,6 +281,7 @@ ModelessDialog RID_SCDLG_FILTER }; ComboBox ED_VAL3 { + HelpID = "sc:ComboBox:RID_SCDLG_FILTER:ED_VAL3"; Pos = MAP_APPFONT ( 201 , 57 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; TabStop = TRUE ; @@ -274,6 +289,7 @@ ModelessDialog RID_SCDLG_FILTER }; ComboBox ED_VAL4 { + HelpID = "sc:ComboBox:RID_SCDLG_FILTER:ED_VAL4"; Pos = MAP_APPFONT ( 201 , 73 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; TabStop = TRUE ; @@ -295,6 +311,7 @@ ModelessDialog RID_SCDLG_FILTER }; CheckBox BTN_CASE { + HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_CASE"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 130 ) ; Size = MAP_APPFONT ( 128 , 10 ) ; @@ -303,6 +320,7 @@ ModelessDialog RID_SCDLG_FILTER }; CheckBox BTN_REGEXP { + HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_REGEXP"; Hide = TRUE ; Pos = MAP_APPFONT ( 142 , 130 ) ; Size = MAP_APPFONT ( 94 , 10 ) ; @@ -311,6 +329,7 @@ ModelessDialog RID_SCDLG_FILTER }; CheckBox BTN_HEADER { + HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_HEADER"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 144 ) ; Size = MAP_APPFONT ( 128 , 10 ) ; @@ -319,6 +338,7 @@ ModelessDialog RID_SCDLG_FILTER }; CheckBox BTN_UNIQUE { + HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_UNIQUE"; Hide = TRUE ; Pos = MAP_APPFONT ( 142 , 144 ) ; Size = MAP_APPFONT ( 94 , 10 ) ; @@ -327,6 +347,7 @@ ModelessDialog RID_SCDLG_FILTER }; CheckBox BTN_COPY_RESULT { + HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_COPY_RESULT"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 158 ) ; Size = MAP_APPFONT ( 128 , 10 ) ; @@ -335,6 +356,7 @@ ModelessDialog RID_SCDLG_FILTER }; CheckBox BTN_DEST_PERS { + HelpID = "sc:CheckBox:RID_SCDLG_FILTER:BTN_DEST_PERS"; Hide = TRUE ; Pos = MAP_APPFONT ( 142 , 158 ) ; Size = MAP_APPFONT ( 94 , 10 ) ; @@ -343,6 +365,7 @@ ModelessDialog RID_SCDLG_FILTER }; ListBox LB_COPY_AREA { + HelpID = "sc:ListBox:RID_SCDLG_FILTER:LB_COPY_AREA"; Border = TRUE ; Hide = TRUE ; Pos = MAP_APPFONT ( 21 , 170 ) ; @@ -352,6 +375,7 @@ ModelessDialog RID_SCDLG_FILTER }; Edit ED_COPY_AREA { + HelpID = "sc:Edit:RID_SCDLG_FILTER:ED_COPY_AREA"; Border = TRUE ; Hide = TRUE ; Pos = MAP_APPFONT ( 136 , 170 ) ; @@ -360,6 +384,7 @@ ModelessDialog RID_SCDLG_FILTER }; ImageButton RB_COPY_AREA { + HelpID = "sc:ImageButton:RID_SCDLG_FILTER:RB_COPY_AREA"; Pos = MAP_APPFONT ( 248 , 169 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -407,6 +432,7 @@ ModelessDialog RID_SCDLG_FILTER }; MoreButton BTN_MORE { + HelpID = "sc:MoreButton:RID_SCDLG_FILTER:BTN_MORE"; Pos = MAP_APPFONT ( 6 , 101 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -423,7 +449,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 ) ; @@ -438,6 +464,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; ListBox LB_CRITERIA_AREA { + HelpID = "sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_CRITERIA_AREA"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 90 , 90 ) ; @@ -446,6 +473,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; Edit ED_CRITERIA_AREA { + HelpID = "sc:Edit:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 14 ) ; Size = MAP_APPFONT ( 99 , 12 ) ; @@ -453,6 +481,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; ImageButton RB_CRITERIA_AREA { + HelpID = "sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA"; Pos = MAP_APPFONT ( 201 , 13 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -460,6 +489,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; CheckBox BTN_CASE { + HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_CASE"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 43 ) ; Size = MAP_APPFONT ( 128 , 10 ) ; @@ -468,6 +498,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; CheckBox BTN_REGEXP { + HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_REGEXP"; Hide = TRUE ; Pos = MAP_APPFONT ( 142 , 43 ) ; Size = MAP_APPFONT ( 74 , 10 ) ; @@ -476,6 +507,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; CheckBox BTN_HEADER { + HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_HEADER"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 57 ) ; Size = MAP_APPFONT ( 128 , 10 ) ; @@ -484,6 +516,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; CheckBox BTN_UNIQUE { + HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_UNIQUE"; Hide = TRUE ; Pos = MAP_APPFONT ( 142 , 57 ) ; Size = MAP_APPFONT ( 74 , 10 ) ; @@ -492,6 +525,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; CheckBox BTN_COPY_RESULT { + HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_COPY_RESULT"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 71 ) ; Size = MAP_APPFONT ( 128 , 10 ) ; @@ -500,6 +534,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; CheckBox BTN_DEST_PERS { + HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_DEST_PERS"; Hide = TRUE ; Pos = MAP_APPFONT ( 142 , 71 ) ; Size = MAP_APPFONT ( 74 , 10 ) ; @@ -508,6 +543,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; ListBox LB_COPY_AREA { + HelpID = "sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_COPY_AREA"; Border = TRUE ; Hide = TRUE ; Pos = MAP_APPFONT ( 20 , 83 ) ; @@ -517,6 +553,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; Edit ED_COPY_AREA { + HelpID = "sc:Edit:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA"; Border = TRUE ; Hide = TRUE ; Pos = MAP_APPFONT ( 100 , 83 ) ; @@ -525,6 +562,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; ImageButton RB_COPY_AREA { + HelpID = "sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA"; Pos = MAP_APPFONT ( 201 , 82 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -573,6 +611,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER }; MoreButton BTN_MORE { + HelpID = "sc:MoreButton:RID_SCDLG_SPEC_FILTER:BTN_MORE"; Pos = MAP_APPFONT ( 223 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -617,6 +656,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; ListBox LB_OP1 { + HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP1"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 41 ) ; Size = MAP_APPFONT ( 40 , 46 ) ; @@ -630,6 +670,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; ListBox LB_OP2 { + HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP2"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 57 ) ; Size = MAP_APPFONT ( 40 , 46 ) ; @@ -643,6 +684,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; ListBox LB_FIELD1 { + HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD1"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 25 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -651,6 +693,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; ListBox LB_FIELD2 { + HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD2"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 41 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -659,6 +702,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; ListBox LB_FIELD3 { + HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD3"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 57 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -667,6 +711,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; ListBox LB_COND1 { + HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND1"; Border = TRUE ; Pos = MAP_APPFONT ( 122 , 25 ) ; Size = MAP_APPFONT ( 47 , 65 ) ; @@ -684,6 +729,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; ListBox LB_COND2 { + HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND2"; Border = TRUE ; Pos = MAP_APPFONT ( 122 , 41 ) ; Size = MAP_APPFONT ( 47 , 65 ) ; @@ -701,6 +747,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; ListBox LB_COND3 { + HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND3"; Border = TRUE ; Pos = MAP_APPFONT ( 122 , 57 ) ; Size = MAP_APPFONT ( 47 , 65 ) ; @@ -718,6 +765,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; ComboBox ED_VAL1 { + HelpID = "sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL1"; Pos = MAP_APPFONT ( 173 , 25 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; TabStop = TRUE ; @@ -725,6 +773,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; ComboBox ED_VAL2 { + HelpID = "sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL2"; Pos = MAP_APPFONT ( 173 , 41 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; TabStop = TRUE ; @@ -732,6 +781,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; ComboBox ED_VAL3 { + HelpID = "sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL3"; Pos = MAP_APPFONT ( 173 , 57 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; TabStop = TRUE ; @@ -745,6 +795,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; CheckBox BTN_CASE { + HelpID = "sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_CASE"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 86 ) ; Size = MAP_APPFONT ( 221 , 10 ) ; @@ -753,6 +804,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; CheckBox BTN_REGEXP { + HelpID = "sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_REGEXP"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 100 ) ; Size = MAP_APPFONT ( 221 , 10 ) ; @@ -761,6 +813,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; CheckBox BTN_UNIQUE { + HelpID = "sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_UNIQUE"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 114 ) ; Size = MAP_APPFONT ( 221 , 10 ) ; @@ -810,6 +863,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; MoreButton BTN_MORE { + HelpID = "sc:MoreButton:RID_SCDLG_PIVOTFILTER:BTN_MORE"; Pos = MAP_APPFONT ( 242 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; 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 lschen : Die Selektion in die Zwischenablage kopieren und lschen */\ };\ 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? Einfgen : Einfgen */\ Text [ en-US ] = "~Paste" ; \ /* ### ACHTUNG: Neuer Text in Resource? Den Inhalt der Zwischenablage einfgen : Den Inhalt der Zwischenablage einfgen */\ @@ -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? Zeilenhhe... : Zeilenhhe... */ 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 Zeilenhhe... : Optimale Zeilenhhe... */ Text [ en-US ] = "Optimal ~Row Height..." ; /* ### ACHTUNG: Neuer Text in Resource? Optimale Zeilenhhe einstellen : Optimale Zeilenhhe 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 einfgen : Zeilen einfgen */ Text [ en-US ] = "~Insert Rows" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Zeilen einfgen : Ganze Zeilen einfgen */ @@ -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 lschen : Zeilen lschen */ Text [ en-US ] = "~Delete Rows" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Zeilen lschen : Ganze Zeilen lschen */ @@ -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? Ausgewhlte Inhalte lschen (Formeln, Formate etc.) : Ausgewhlte Inhalte lschen (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 einfgen : Spalten einfgen */ Text [ en-US ] = "~Insert Columns" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Spalten einfgen : Ganze Spalten einfgen */ @@ -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 lschen : Spalten lschen */ Text [ en-US ] = "~Delete Columns" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Spalten lschen : Ganze Spalten lschen */ @@ -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? Ausgewhlte Inhalte lschen (Formeln, Formate etc.) : Ausgewhlte Inhalte lschen (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 6d4761c8589c..c40207e5eaf8 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" ; @@ -57,6 +57,7 @@ ModalDialog RID_SCDLG_DELCELL }; RadioButton BTN_DELCOLS { + HelpID = "sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELCOLS"; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; Text [ en-US ] = "Delete entire ~column(s)" ; @@ -64,6 +65,7 @@ ModalDialog RID_SCDLG_DELCELL }; RadioButton BTN_DELROWS { + HelpID = "sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELROWS"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; Text [ en-US ] = "Delete entire ~row(s)" ; @@ -71,6 +73,7 @@ ModalDialog RID_SCDLG_DELCELL }; RadioButton BTN_CELLSLEFT { + HelpID = "sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSLEFT"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; Text [ en-US ] = "Shift cells ~left" ; @@ -78,6 +81,7 @@ ModalDialog RID_SCDLG_DELCELL }; RadioButton BTN_CELLSUP { + HelpID = "sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSUP"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; Text [ en-US ] = "Shift cells ~up" ; @@ -93,7 +97,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" ; @@ -120,6 +124,7 @@ ModalDialog RID_SCDLG_INSCELL }; RadioButton BTN_INSCOLS { + HelpID = "sc:RadioButton:RID_SCDLG_INSCELL:BTN_INSCOLS"; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; Text [ en-US ] = "Entire ~column" ; @@ -127,6 +132,7 @@ ModalDialog RID_SCDLG_INSCELL }; RadioButton BTN_INSROWS { + HelpID = "sc:RadioButton:RID_SCDLG_INSCELL:BTN_INSROWS"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; Text [ en-US ] = "Entire ro~w" ; @@ -134,6 +140,7 @@ ModalDialog RID_SCDLG_INSCELL }; RadioButton BTN_CELLSRIGHT { + HelpID = "sc:RadioButton:RID_SCDLG_INSCELL:BTN_CELLSRIGHT"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; Text [ en-US ] = "Shift cells ~right" ; @@ -141,6 +148,7 @@ ModalDialog RID_SCDLG_INSCELL }; RadioButton BTN_CELLSDOWN { + HelpID = "sc:RadioButton:RID_SCDLG_INSCELL:BTN_CELLSDOWN"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; Text [ en-US ] = "Shift cells ~down" ; @@ -157,7 +165,7 @@ ModalDialog RID_SCDLG_INSCELL 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" ; @@ -184,6 +192,7 @@ ModalDialog RID_SCDLG_DELCONT }; CheckBox BTN_DELALL { + HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELALL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "Delete ~all" ; @@ -191,6 +200,7 @@ ModalDialog RID_SCDLG_DELCONT }; CheckBox BTN_DELSTRINGS { + HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELSTRINGS"; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "~Text" ; @@ -198,6 +208,7 @@ ModalDialog RID_SCDLG_DELCONT }; CheckBox BTN_DELNUMBERS { + HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELNUMBERS"; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "~Numbers" ; @@ -205,6 +216,7 @@ ModalDialog RID_SCDLG_DELCONT }; CheckBox BTN_DELDATETIME { + HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELDATETIME"; Pos = MAP_APPFONT ( 12 , 58 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "~Date & time" ; @@ -212,6 +224,7 @@ ModalDialog RID_SCDLG_DELCONT }; CheckBox BTN_DELFORMULAS { + HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELFORMULAS"; Pos = MAP_APPFONT ( 12 , 72 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "~Formulas" ; @@ -219,6 +232,7 @@ ModalDialog RID_SCDLG_DELCONT }; CheckBox BTN_DELATTRS { + HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELATTRS"; Pos = MAP_APPFONT ( 12 , 100 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "For~mats" ; @@ -226,6 +240,7 @@ ModalDialog RID_SCDLG_DELCONT }; CheckBox BTN_DELNOTES { + HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELNOTES"; Pos = MAP_APPFONT ( 12 , 86 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "~Comments" ; @@ -233,6 +248,7 @@ ModalDialog RID_SCDLG_DELCONT }; CheckBox BTN_DELOBJECTS { + HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELOBJECTS"; Pos = MAP_APPFONT ( 12 , 114 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "~Objects" ; @@ -250,7 +266,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" ; @@ -277,6 +293,7 @@ ModalDialog RID_SCDLG_INSCONT }; CheckBox BTN_INSALL { + HelpID = "sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSALL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "~Paste all" ; @@ -284,6 +301,7 @@ ModalDialog RID_SCDLG_INSCONT }; CheckBox BTN_INSSTRINGS { + HelpID = "sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSSTRINGS"; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "Te~xt" ; @@ -291,6 +309,7 @@ ModalDialog RID_SCDLG_INSCONT }; CheckBox BTN_INSNUMBERS { + HelpID = "sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSNUMBERS"; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "~Numbers" ; @@ -298,6 +317,7 @@ ModalDialog RID_SCDLG_INSCONT }; CheckBox BTN_INSDATETIME { + HelpID = "sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSDATETIME"; Pos = MAP_APPFONT ( 12 , 58 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "~Date & time" ; @@ -305,6 +325,7 @@ ModalDialog RID_SCDLG_INSCONT }; CheckBox BTN_INSFORMULAS { + HelpID = "sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSFORMULAS"; Pos = MAP_APPFONT ( 12 , 72 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "~Formulas" ; @@ -312,6 +333,7 @@ ModalDialog RID_SCDLG_INSCONT }; CheckBox BTN_INSATTRS { + HelpID = "sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSATTRS"; Pos = MAP_APPFONT ( 12 , 100 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "For~mats" ; @@ -319,6 +341,7 @@ ModalDialog RID_SCDLG_INSCONT }; CheckBox BTN_INSOBJECTS { + HelpID = "sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSOBJECTS"; Pos = MAP_APPFONT ( 12 , 114 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "~Objects" ; @@ -326,6 +349,7 @@ ModalDialog RID_SCDLG_INSCONT }; CheckBox BTN_INSNOTES { + HelpID = "sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSNOTES"; Pos = MAP_APPFONT ( 12 , 86 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "~Comments" ; @@ -339,30 +363,35 @@ ModalDialog RID_SCDLG_INSCONT }; RadioButton BTN_OP_NOOP { + HelpID = "sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_NOOP"; Pos = MAP_APPFONT ( 111 , 14 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "Non~e" ; }; RadioButton BTN_OP_ADD { + HelpID = "sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_ADD"; Pos = MAP_APPFONT ( 111 , 30 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "~Add" ; }; RadioButton BTN_OP_SUB { + HelpID = "sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_SUB"; Pos = MAP_APPFONT ( 111 , 44 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "~Subtract" ; }; RadioButton BTN_OP_MUL { + HelpID = "sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_MUL"; Pos = MAP_APPFONT ( 111 , 58 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "Multipl~y" ; }; RadioButton BTN_OP_DIV { + HelpID = "sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_DIV"; Pos = MAP_APPFONT ( 111 , 72 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "Di~vide" ; @@ -375,18 +404,21 @@ ModalDialog RID_SCDLG_INSCONT }; CheckBox BTN_SKIP_EMPTY { + HelpID = "sc:CheckBox:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY"; Pos = MAP_APPFONT ( 12 , 141 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "S~kip empty cells" ; }; CheckBox BTN_TRANSPOSE { + HelpID = "sc:CheckBox:RID_SCDLG_INSCONT:BTN_TRANSPOSE"; Pos = MAP_APPFONT ( 12 , 155 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "~Transpose" ; }; CheckBox BTN_LINK { + HelpID = "sc:CheckBox:RID_SCDLG_INSCONT:BTN_LINK"; Pos = MAP_APPFONT ( 12 , 169 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "~Link" ; @@ -399,18 +431,21 @@ ModalDialog RID_SCDLG_INSCONT }; RadioButton BTN_MV_NONE { + HelpID = "sc:RadioButton:RID_SCDLG_INSCONT:BTN_MV_NONE"; Pos = MAP_APPFONT ( 111 , 141 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "Don't sh~ift" ; }; RadioButton BTN_MV_DOWN { + HelpID = "sc:RadioButton:RID_SCDLG_INSCONT:BTN_MV_DOWN"; Pos = MAP_APPFONT ( 111 , 155 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "Do~wn" ; }; RadioButton BTN_MV_RIGHT { + HelpID = "sc:RadioButton:RID_SCDLG_INSCONT:BTN_MV_RIGHT"; Pos = MAP_APPFONT ( 111 , 169 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; Text [ en-US ] = "~Right" ; @@ -435,7 +470,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" ; @@ -468,6 +503,7 @@ ModalDialog RID_SCDLG_MOVETAB }; ListBox LB_DEST { + HelpID = "sc:ListBox:RID_SCDLG_MOVETAB:LB_DEST"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 100 , 60 ) ; @@ -482,6 +518,7 @@ ModalDialog RID_SCDLG_MOVETAB }; ListBox LB_INSERT { + HelpID = "sc:ListBox:RID_SCDLG_MOVETAB:LB_INSERT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 46 ) ; Size = MAP_APPFONT ( 100 , 62 ) ; @@ -489,6 +526,7 @@ ModalDialog RID_SCDLG_MOVETAB }; CheckBox BTN_COPY { + HelpID = "sc:CheckBox:RID_SCDLG_MOVETAB:BTN_COPY"; Pos = MAP_APPFONT ( 6 , 114 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "~Copy" ; @@ -501,6 +539,7 @@ ModalDialog RID_SCDLG_MOVETAB }; ModalDialog RID_SCDLG_STRINPUT { + HelpID = "sc:ModalDialog:RID_SCDLG_STRINPUT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 178 , 63 ) ; @@ -527,6 +566,7 @@ ModalDialog RID_SCDLG_STRINPUT }; Edit ED_INPUT { + HelpID = "sc:Edit:RID_SCDLG_STRINPUT:ED_INPUT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 110 , 12 ) ; @@ -540,6 +580,7 @@ ModalDialog RID_SCDLG_STRINPUT }; ModalDialog RID_SCDLG_TAB_BG_COLOR { + HelpID = "sc:ModalDialog:RID_SCDLG_TAB_BG_COLOR"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 118 , 167 ) ; @@ -585,6 +626,7 @@ ModalDialog RID_SCDLG_TAB_BG_COLOR /* ModalDialog RID_SCDLG_TAB_BG_COLOR { + HelpID = "sc:ModalDialog:RID_SCDLG_TAB_BG_COLOR"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 180 , 150 ) ; @@ -631,6 +673,7 @@ ModalDialog RID_SCDLG_TAB_BG_COLOR /* ModalDialog RID_SCDLG_MTRINPUT { + HelpID = "sc:ModalDialog:RID_SCDLG_MTRINPUT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 190 , 63 ) ; @@ -673,6 +716,7 @@ ModalDialog RID_SCDLG_MTRINPUT }; CheckBox BTN_DEFVAL { + HelpID = "sc:CheckBox:RID_SCDLG_MTRINPUT:BTN_DEFVAL"; // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen TabStop = TRUE ; Pos = MAP_APPFONT ( 70 , 24 ) ; @@ -686,7 +730,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 ) ; @@ -719,6 +763,7 @@ ModalDialog RID_SCDLG_COL_MAN }; MetricField ED_VALUE { + HelpID = "sc:MetricField:RID_SCDLG_COL_MAN:ED_VALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 6 ) ; Size = MAP_APPFONT ( 70 , 12 ) ; @@ -728,6 +773,7 @@ ModalDialog RID_SCDLG_COL_MAN }; CheckBox BTN_DEFVAL { + HelpID = "sc:CheckBox:RID_SCDLG_COL_MAN:BTN_DEFVAL"; // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen TabStop = TRUE ; Pos = MAP_APPFONT ( 70 , 24 ) ; @@ -740,7 +786,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 ) ; @@ -773,6 +819,7 @@ ModalDialog RID_SCDLG_COL_OPT }; MetricField ED_VALUE { + HelpID = "sc:MetricField:RID_SCDLG_COL_OPT:ED_VALUE"; // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen Border = TRUE ; Pos = MAP_APPFONT ( 70 , 6 ) ; @@ -783,6 +830,7 @@ ModalDialog RID_SCDLG_COL_OPT }; CheckBox BTN_DEFVAL { + HelpID = "sc:CheckBox:RID_SCDLG_COL_OPT:BTN_DEFVAL"; // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen TabStop = TRUE ; Pos = MAP_APPFONT ( 70 , 24 ) ; @@ -795,7 +843,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 ) ; @@ -828,6 +876,7 @@ ModalDialog RID_SCDLG_ROW_MAN }; MetricField ED_VALUE { + HelpID = "sc:MetricField:RID_SCDLG_ROW_MAN:ED_VALUE"; // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen Border = TRUE ; Pos = MAP_APPFONT ( 70 , 6 ) ; @@ -838,6 +887,7 @@ ModalDialog RID_SCDLG_ROW_MAN }; CheckBox BTN_DEFVAL { + HelpID = "sc:CheckBox:RID_SCDLG_ROW_MAN:BTN_DEFVAL"; // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen TabStop = TRUE ; Pos = MAP_APPFONT ( 70 , 24 ) ; @@ -850,7 +900,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 ) ; @@ -883,6 +933,7 @@ ModalDialog RID_SCDLG_ROW_OPT }; MetricField ED_VALUE { + HelpID = "sc:MetricField:RID_SCDLG_ROW_OPT:ED_VALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 6 ) ; Size = MAP_APPFONT ( 70 , 12 ) ; @@ -892,6 +943,7 @@ ModalDialog RID_SCDLG_ROW_OPT }; CheckBox BTN_DEFVAL { + HelpID = "sc:CheckBox:RID_SCDLG_ROW_OPT:BTN_DEFVAL"; // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen TabStop = TRUE ; Pos = MAP_APPFONT ( 70 , 24 ) ; @@ -906,7 +958,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 ) ; @@ -951,7 +1003,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 ) ; @@ -979,6 +1031,7 @@ ModalDialog RID_SCDLG_SHOW_TAB }; MultiListBox LB_ENTRYLIST { + HelpID = "sc:MultiListBox:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST"; SimpleMode = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 19 ) ; @@ -998,7 +1051,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" ; @@ -1006,6 +1059,7 @@ ModalDialog RID_SCDLG_FILLSERIES Closeable = FALSE ; RadioButton BTN_DAY { + HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DAY"; Pos = MAP_APPFONT ( 159 , 14 ) ; Size = MAP_APPFONT ( 66 , 10 ) ; Text [ en-US ] = "Da~y" ; @@ -1013,6 +1067,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; RadioButton BTN_DAY_OF_WEEK { + HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DAY_OF_WEEK"; Pos = MAP_APPFONT ( 159 , 28 ) ; Size = MAP_APPFONT ( 66 , 10 ) ; Text [ en-US ] = "~Weekday" ; @@ -1020,6 +1075,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; RadioButton BTN_MONTH { + HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_MONTH"; Pos = MAP_APPFONT ( 159 , 42 ) ; Size = MAP_APPFONT ( 66 , 10 ) ; Text [ en-US ] = "~Month" ; @@ -1027,6 +1083,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; RadioButton BTN_YEAR { + HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_YEAR"; Pos = MAP_APPFONT ( 159 , 56 ) ; Size = MAP_APPFONT ( 66 , 10 ) ; Text [ en-US ] = "Y~ear" ; @@ -1040,6 +1097,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; RadioButton BTN_RIGHT { + HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_RIGHT"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 51 , 10 ) ; Text [ en-US ] = "~Right" ; @@ -1047,6 +1105,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; RadioButton BTN_LEFT { + HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_LEFT"; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 51 , 10 ) ; Text [ en-US ] = "~Left" ; @@ -1054,6 +1113,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; RadioButton BTN_TOP { + HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_TOP"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 51 , 10 ) ; Text [ en-US ] = "~Up" ; @@ -1061,6 +1121,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; RadioButton BTN_BOTTOM { + HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_BOTTOM"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 51 , 10 ) ; Text [ en-US ] = "~Down" ; @@ -1074,6 +1135,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; RadioButton BTN_ARITHMETIC { + HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_ARITHMETIC"; Pos = MAP_APPFONT ( 78 , 14 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; Text [ en-US ] = "Li~near" ; @@ -1081,6 +1143,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; RadioButton BTN_GEOMETRIC { + HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_GEOMETRIC"; Pos = MAP_APPFONT ( 78 , 28 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; Text [ en-US ] = "~Growth" ; @@ -1088,6 +1151,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; RadioButton BTN_DATE { + HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DATE"; Pos = MAP_APPFONT ( 78 , 42 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; Text [ en-US ] = "Da~te" ; @@ -1095,6 +1159,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; RadioButton BTN_AUTOFILL { + HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_AUTOFILL"; Pos = MAP_APPFONT ( 78 , 56 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; Text [ en-US ] = "~AutoFill" ; @@ -1124,6 +1189,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; Edit ED_START_VALUES { + HelpID = "sc:Edit:RID_SCDLG_FILLSERIES:ED_START_VALUES"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 72 ) ; Size = MAP_APPFONT ( 58 , 12 ) ; @@ -1137,6 +1203,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; Edit ED_END_VALUES { + HelpID = "sc:Edit:RID_SCDLG_FILLSERIES:ED_END_VALUES"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 88 ) ; Size = MAP_APPFONT ( 58 , 12 ) ; @@ -1150,6 +1217,7 @@ ModalDialog RID_SCDLG_FILLSERIES }; Edit ED_INCREMENT { + HelpID = "sc:Edit:RID_SCDLG_FILLSERIES:ED_INCREMENT"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 104 ) ; Size = MAP_APPFONT ( 58 , 12 ) ; @@ -1190,6 +1258,7 @@ ModalDialog RID_SCDLG_FILLSERIES ModalDialog RID_SCDLG_GROUP { + HelpID = "sc:ModalDialog:RID_SCDLG_GROUP"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 148 , 63 ) ; @@ -1250,13 +1319,14 @@ 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 ModalDialog RID_SCDLG_COLORROW { + HelpID = "sc:ModalDialog:RID_SCDLG_COLORROW"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 148 , 63 ) ; @@ -1283,6 +1353,7 @@ ModalDialog RID_SCDLG_COLORROW }; RadioButton BTN_GROUP_ROWS { + HelpID = "sc:RadioButton:RID_SCDLG_COLORROW:BTN_GROUP_ROWS"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 71 , 10 ) ; TXT_ROWS @@ -1290,6 +1361,7 @@ ModalDialog RID_SCDLG_COLORROW }; RadioButton BTN_GROUP_COLS { + HelpID = "sc:RadioButton:RID_SCDLG_COLORROW:BTN_GROUP_COLS"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 71 , 10 ) ; TXT_COLS @@ -1306,11 +1378,12 @@ 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 { + HelpID = "sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_TOP"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 93 , 10 ) ; TabStop = TRUE ; @@ -1318,6 +1391,7 @@ ModalDialog RID_SCDLG_NAMES_CREATE }; CheckBox BTN_LEFT { + HelpID = "sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_LEFT"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 93 , 10 ) ; TabStop = TRUE ; @@ -1325,6 +1399,7 @@ ModalDialog RID_SCDLG_NAMES_CREATE }; CheckBox BTN_BOTTOM { + HelpID = "sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_BOTTOM"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 93 , 10 ) ; TabStop = TRUE ; @@ -1332,6 +1407,7 @@ ModalDialog RID_SCDLG_NAMES_CREATE }; CheckBox BTN_RIGHT { + HelpID = "sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_RIGHT"; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 93 , 10 ) ; TabStop = TRUE ; @@ -1368,7 +1444,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 ; @@ -1380,6 +1456,7 @@ ModalDialog RID_SCDLG_NAMES_PASTE }; ListBox LB_ENTRYLIST { + HelpID = "sc:ListBox:RID_SCDLG_NAMES_PASTE:LB_ENTRYLIST"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 160 , 65 ) ; @@ -1408,6 +1485,7 @@ ModalDialog RID_SCDLG_NAMES_PASTE }; PushButton BTN_ADD { + HelpID = "sc:PushButton:RID_SCDLG_NAMES_PASTE:BTN_ADD"; Pos = MAP_APPFONT ( 172 , 66 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -1418,18 +1496,21 @@ ModalDialog RID_SCDLG_NAMES_PASTE ModalDialog RID_SCDLG_CHARTCOLROW { + HelpID = "sc:ModalDialog:RID_SCDLG_CHARTCOLROW"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 191 , 63 ) ; Moveable = TRUE ; CheckBox 1 { + HelpID = "sc:CheckBox:RID_SCDLG_CHARTCOLROW:1"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; Text [ en-US ] = "First ~column as label" ; }; CheckBox 2 { + HelpID = "sc:CheckBox:RID_SCDLG_CHARTCOLROW:2"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; Text [ en-US ] = "First ~row as label" ; diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src index 38e1271b2959..f5fa0d822b12 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 ) ; @@ -56,6 +56,7 @@ ModelessDialog RID_SCDLG_NAMES }; PushButton BTN_ADD { + HelpID = "sc:PushButton:RID_SCDLG_NAMES:BTN_ADD"; Pos = MAP_APPFONT ( 166 , 74 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? Hinzu~fgen : Hinzu~fgen */ @@ -65,6 +66,7 @@ ModelessDialog RID_SCDLG_NAMES }; PushButton BTN_REMOVE { + HelpID = "sc:PushButton:RID_SCDLG_NAMES:BTN_REMOVE"; Pos = MAP_APPFONT ( 166 , 92 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Lschen : ~Lschen */ @@ -79,6 +81,7 @@ ModelessDialog RID_SCDLG_NAMES }; ComboBox ED_NAME { + HelpID = "sc:ComboBox:RID_SCDLG_NAMES:ED_NAME"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 145 , 92 ) ; TabStop = TRUE ; @@ -93,6 +96,7 @@ ModelessDialog RID_SCDLG_NAMES }; Edit ED_ASSIGN { + HelpID = "sc:Edit:RID_SCDLG_NAMES:ED_ASSIGN"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 123 ) ; Size = MAP_APPFONT ( 131 , 12 ) ; @@ -100,6 +104,7 @@ ModelessDialog RID_SCDLG_NAMES }; ImageButton RB_ASSIGN { + HelpID = "sc:ImageButton:RID_SCDLG_NAMES:RB_ASSIGN"; Pos = MAP_APPFONT ( 145 , 122 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -107,6 +112,7 @@ ModelessDialog RID_SCDLG_NAMES }; MoreButton BTN_MORE { + HelpID = "sc:MoreButton:RID_SCDLG_NAMES:BTN_MORE"; Pos = MAP_APPFONT ( 166 , 122 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -121,6 +127,7 @@ ModelessDialog RID_SCDLG_NAMES }; CheckBox BTN_PRINTAREA { + HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA"; Pos = MAP_APPFONT ( 12 , 153 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "~Print range" ; @@ -128,6 +135,7 @@ ModelessDialog RID_SCDLG_NAMES }; CheckBox BTN_CRITERIA { + HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA"; Pos = MAP_APPFONT ( 12 , 167 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "~Filter" ; @@ -135,6 +143,7 @@ ModelessDialog RID_SCDLG_NAMES }; CheckBox BTN_ROWHEADER { + HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER"; Pos = MAP_APPFONT ( 75 , 167 ) ; Size = MAP_APPFONT ( 82 , 10 ) ; Text [ en-US ] = "Repeat ~row" ; @@ -142,6 +151,7 @@ ModelessDialog RID_SCDLG_NAMES }; CheckBox BTN_COLHEADER { + HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER"; Pos = MAP_APPFONT ( 75 , 153 ) ; Size = MAP_APPFONT ( 82 , 10 ) ; Text [ en-US ] = "Repeat ~column" ; diff --git a/sc/source/ui/src/opredlin.src b/sc/source/ui/src/opredlin.src index a8c2daf4892a..8cabbca238f6 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" ; @@ -66,6 +66,7 @@ TabPage RID_SCPAGE_OPREDLINE }; ListBox CLB_CONTENT { + HelpID = "sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_CONTENT"; Pos = MAP_APPFONT ( 90 , 14 ) ; Size = MAP_APPFONT ( 120 , 86 ) ; TabStop = TRUE ; @@ -73,6 +74,7 @@ TabPage RID_SCPAGE_OPREDLINE }; ListBox CLB_REMOVE { + HelpID = "sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_REMOVE"; Pos = MAP_APPFONT ( 90 , 30 ) ; Size = MAP_APPFONT ( 120 , 86 ) ; TabStop = TRUE ; @@ -80,6 +82,7 @@ TabPage RID_SCPAGE_OPREDLINE }; ListBox CLB_INSERT { + HelpID = "sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_INSERT"; Pos = MAP_APPFONT ( 90 , 46 ) ; Size = MAP_APPFONT ( 120 , 86 ) ; TabStop = TRUE ; @@ -87,6 +90,7 @@ TabPage RID_SCPAGE_OPREDLINE }; ListBox CLB_MOVE { + HelpID = "sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_MOVE"; Pos = MAP_APPFONT ( 90 , 62 ) ; Size = MAP_APPFONT ( 120 , 86 ) ; TabStop = TRUE ; diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src index 4c64e312bc2d..9bcc3c71f4f7 100644 --- a/sc/source/ui/src/optdlg.src +++ b/sc/source/ui/src/optdlg.src @@ -41,6 +41,7 @@ TabPage RID_SCPAGE_CALC Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox BTN_ITERATE { + HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_ITERATE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "~Iterations" ; @@ -60,6 +61,7 @@ TabPage RID_SCPAGE_CALC }; NumericField ED_STEPS { + HelpID = "sc:NumericField:RID_SCPAGE_CALC:ED_STEPS"; Border = TRUE ; Pos = MAP_APPFONT ( 82 , 26 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; @@ -70,6 +72,7 @@ TabPage RID_SCPAGE_CALC }; Edit ED_EPS { + HelpID = "sc:Edit:RID_SCPAGE_CALC:ED_EPS"; Border = TRUE ; Pos = MAP_APPFONT ( 82 , 42 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; @@ -82,6 +85,7 @@ TabPage RID_SCPAGE_CALC }; RadioButton BTN_DATESTD { + HelpID = "sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESTD"; Pos = MAP_APPFONT ( 139 , 14 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "12/30/1899 (defa~ult)" ; @@ -89,6 +93,7 @@ TabPage RID_SCPAGE_CALC }; RadioButton BTN_DATESC10 { + HelpID = "sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESC10"; Pos = MAP_APPFONT ( 139 , 28 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? 01.01.1900 ( Star~Calc 1.0 ) : StarCa~lc 1.0 */ @@ -97,6 +102,7 @@ TabPage RID_SCPAGE_CALC }; RadioButton BTN_DATE1904 { + HelpID = "sc:RadioButton:RID_SCPAGE_CALC:BTN_DATE1904"; Pos = MAP_APPFONT ( 139 , 42 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~01.01.1904 : ~1904 */ @@ -121,36 +127,42 @@ TabPage RID_SCPAGE_CALC }; CheckBox BTN_CASE { + HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_CASE"; Pos = MAP_APPFONT ( 12 , 77 ) ; Size = MAP_APPFONT ( 130 , 10 ) ; Text [ en-US ] = "Case se~nsitive" ; }; CheckBox BTN_CALC { + HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_CALC"; Pos = MAP_APPFONT ( 12 , 91 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "~Precision as shown" ; }; CheckBox BTN_MATCH { + HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_MATCH"; Pos = MAP_APPFONT ( 12 , 105 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "Search criteria = and <> must apply to ~whole cells" ; }; CheckBox BTN_REGEX { + HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_REGEX"; Pos = MAP_APPFONT ( 12 , 119 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "~Enable regular expressions in formulas" ; }; CheckBox BTN_LOOKUP { + HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_LOOKUP"; Pos = MAP_APPFONT ( 12 , 133 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "~Automatically find column and row labels " ; }; CheckBox BTN_GENERAL_PREC { + HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_GENERAL_PREC"; Pos = MAP_APPFONT ( 12 , 147 ) ; Size = MAP_APPFONT ( 148 , 10 ) ; Text [ en-US ] = "Limit decimals for general number format" ; @@ -164,6 +176,7 @@ TabPage RID_SCPAGE_CALC }; NumericField ED_PREC { + HelpID = "sc:NumericField:RID_SCPAGE_CALC:ED_PREC"; Border = TRUE ; Pos = MAP_APPFONT ( 226 , 146 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; @@ -194,6 +207,7 @@ TabPage RID_SCPAGE_USERLISTS }; ListBox LB_LISTS { + HelpID = "sc:ListBox:RID_SCPAGE_USERLISTS:LB_LISTS"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 15 ) ; Size = MAP_APPFONT ( 93 , 148 ) ; @@ -207,6 +221,7 @@ TabPage RID_SCPAGE_USERLISTS }; MultiLineEdit ED_ENTRIES { + HelpID = "sc:MultiLineEdit:RID_SCPAGE_USERLISTS:ED_ENTRIES"; Border = TRUE ; Pos = MAP_APPFONT ( 105 , 15 ) ; Size = MAP_APPFONT ( 93 , 148 ) ; @@ -215,6 +230,7 @@ TabPage RID_SCPAGE_USERLISTS }; Edit ED_COPYFROM { + HelpID = "sc:Edit:RID_SCPAGE_USERLISTS:ED_COPYFROM"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 167 ) ; Size = MAP_APPFONT ( 128 , 12 ) ; @@ -228,12 +244,14 @@ TabPage RID_SCPAGE_USERLISTS }; PushButton BTN_NEW { + HelpID = "sc:PushButton:RID_SCPAGE_USERLISTS:BTN_NEW"; Pos = MAP_APPFONT ( 204 , 15 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~New" ; }; PushButton BTN_ADD { + HelpID = "sc:PushButton:RID_SCPAGE_USERLISTS:BTN_ADD"; Pos = MAP_APPFONT ( 204 , 36 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Hinzufgen : ~Hinzufgen */ @@ -242,6 +260,7 @@ TabPage RID_SCPAGE_USERLISTS }; PushButton BTN_REMOVE { + HelpID = "sc:PushButton:RID_SCPAGE_USERLISTS:BTN_REMOVE"; Pos = MAP_APPFONT ( 204 , 54 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Lschen : ~Lschen */ @@ -249,6 +268,7 @@ TabPage RID_SCPAGE_USERLISTS }; PushButton BTN_COPY { + HelpID = "sc:PushButton:RID_SCPAGE_USERLISTS:BTN_COPY"; Pos = MAP_APPFONT ( 204 , 166 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Copy" ; @@ -297,6 +317,7 @@ TabPage RID_SCPAGE_CONTENT }; CheckBox CB_GRID { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_GRID"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "~Grid lines" ; @@ -309,6 +330,7 @@ TabPage RID_SCPAGE_CONTENT }; ListBox LB_COLOR { + HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 54 , 26 ) ; Size = MAP_APPFONT ( 70 , 86 ) ; @@ -317,24 +339,28 @@ TabPage RID_SCPAGE_CONTENT }; CheckBox CB_PAGEBREAKS { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_PAGEBREAKS"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "~Page breaks" ; }; CheckBox CB_GUIDELINE { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_GUIDELINE"; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "Guides ~while moving"; }; CheckBox CB_HANDLES { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_HANDLES"; Pos = MAP_APPFONT ( 12 , 70 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "~Simple handles"; }; CheckBox CB_BIGHANDLES { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_BIGHANDLES"; Pos = MAP_APPFONT ( 12 , 84 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "~Large handles"; @@ -352,42 +378,49 @@ TabPage RID_SCPAGE_CONTENT }; CheckBox CB_FORMULA { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_FORMULA"; Pos = MAP_APPFONT ( 139 , 14 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "~Formulas" ; }; CheckBox CB_NIL { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_NIL"; Pos = MAP_APPFONT ( 139 , 27 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "Zero val~ues" ; }; CheckBox CB_ANNOT { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_ANNOT"; Pos = MAP_APPFONT ( 139 , 40 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "~Comment indicator" ; }; CheckBox CB_VALUE { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_VALUE"; Pos = MAP_APPFONT ( 139 , 53 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "Value h~ighlighting" ; }; CheckBox CB_ANCHOR { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_ANCHOR"; Pos = MAP_APPFONT ( 139 , 66 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "~Anchor" ; }; CheckBox CB_CLIP { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_CLIP"; Pos = MAP_APPFONT ( 139 , 79 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "Te~xt overflow" ; }; CheckBox CB_RFIND { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_RFIND"; Pos = MAP_APPFONT ( 139 , 92 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "Show references in color" ; @@ -406,6 +439,7 @@ TabPage RID_SCPAGE_CONTENT }; ListBox LB_OBJGRF { + HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_OBJGRF"; Pos = MAP_APPFONT ( 84 , 111 ) ; Size = MAP_APPFONT ( 40 , 46 ) ; Border = TRUE ; @@ -424,6 +458,7 @@ TabPage RID_SCPAGE_CONTENT }; ListBox LB_DIAGRAM { + HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_DIAGRAM"; Pos = MAP_APPFONT ( 84 , 127 ) ; Size = MAP_APPFONT ( 40 , 46 ) ; Border = TRUE ; @@ -443,6 +478,7 @@ TabPage RID_SCPAGE_CONTENT }; ListBox LB_DRAW { + HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_DRAW"; Pos = MAP_APPFONT ( 84 , 143 ) ; Size = MAP_APPFONT ( 40 , 46 ) ; Border = TRUE ; @@ -462,6 +498,7 @@ TabPage RID_SCPAGE_CONTENT }; CheckBox CB_SYNCZOOM { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_SYNCZOOM"; Pos = MAP_APPFONT ( 12 , 171 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "S~ynchronize sheets" ; @@ -479,30 +516,35 @@ TabPage RID_SCPAGE_CONTENT }; CheckBox CB_ROWCOLHEADER { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_ROWCOLHEADER"; Pos = MAP_APPFONT ( 139 , 119 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "Colu~mn/row headers" ; }; CheckBox CB_HSCROLL { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_HSCROLL"; Pos = MAP_APPFONT ( 139 , 132 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "Hori~zontal scroll bar" ; }; CheckBox CB_VSCROLL { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_VSCROLL"; Pos = MAP_APPFONT ( 139 , 145 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "~Vertical scroll bar" ; }; CheckBox CB_TBLREG { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_TBLREG"; Pos = MAP_APPFONT ( 139 , 158 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "Sh~eet tabs" ; }; CheckBox CB_OUTLINE { + HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_OUTLINE"; Pos = MAP_APPFONT ( 139 , 171 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "~Outline symbols" ; @@ -537,6 +579,7 @@ TabPage RID_SCPAGE_LAYOUT }; ListBox LB_UNIT { + HelpID = "sc:ListBox:RID_SCPAGE_LAYOUT:LB_UNIT"; Border = TRUE ; Pos = MAP_APPFONT ( 72 , 14 ) ; Size = MAP_APPFONT ( 46 , 52 ) ; @@ -565,6 +608,7 @@ TabPage RID_SCPAGE_LAYOUT }; MetricField MF_TAB { + HelpID = "sc:MetricField:RID_SCPAGE_LAYOUT:MF_TAB"; Border = TRUE ; Pos = MAP_APPFONT ( 72 , 30 ) ; Size = MAP_APPFONT ( 46 , 12 ) ; @@ -598,6 +642,7 @@ TabPage RID_SCPAGE_LAYOUT }; RadioButton RB_ALWAYS { + HelpID = "sc:RadioButton:RID_SCPAGE_LAYOUT:RB_ALWAYS"; Pos = MAP_APPFONT ( 139 , 25 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; TabStop = TRUE ; @@ -605,6 +650,7 @@ TabPage RID_SCPAGE_LAYOUT }; RadioButton RB_REQUEST { + HelpID = "sc:RadioButton:RID_SCPAGE_LAYOUT:RB_REQUEST"; Pos = MAP_APPFONT ( 139 , 39 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; TabStop = TRUE ; @@ -612,6 +658,7 @@ TabPage RID_SCPAGE_LAYOUT }; RadioButton RB_NEVER { + HelpID = "sc:RadioButton:RID_SCPAGE_LAYOUT:RB_NEVER"; Pos = MAP_APPFONT ( 139 , 53 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; TabStop = TRUE ; @@ -625,12 +672,14 @@ TabPage RID_SCPAGE_LAYOUT }; CheckBox CB_ALIGN { + HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_ALIGN"; Pos = MAP_APPFONT ( 12 , 82 ) ; Size = MAP_APPFONT ( 175 , 10 ) ; Text [ en-US ] = "Press Enter to ~move selection" ; }; ListBox LB_ALIGN { + HelpID = "sc:ListBox:RID_SCPAGE_LAYOUT:LB_ALIGN"; Pos = MAP_APPFONT ( 191 , 80 ) ; Size = MAP_APPFONT ( 60 , 60 ) ; Border = TRUE ; @@ -646,36 +695,42 @@ TabPage RID_SCPAGE_LAYOUT }; CheckBox CB_EDITMODE { + HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_EDITMODE"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "Press Enter to switch to ~edit mode" ; }; CheckBox CB_FORMAT { + HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_FORMAT"; Pos = MAP_APPFONT ( 12 , 110 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "Expand ~formatting" ; }; CheckBox CB_EXPREF { + HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_EXPREF"; Pos = MAP_APPFONT ( 12 , 124 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "Expand ~references when new columns/rows are inserted" ; }; CheckBox CB_MARKHDR { + HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_MARKHDR"; Pos = MAP_APPFONT ( 12 , 138 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "Highlight sele~ction in column/row headers" ; }; CheckBox CB_TEXTFMT { + HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_TEXTFMT"; Pos = MAP_APPFONT ( 12 , 152 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "Use printer metrics for text formatting"; }; CheckBox CB_REPLWARN { + HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_REPLWARN"; Pos = MAP_APPFONT ( 12 , 166 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "Show overwrite ~warning when pasting data"; @@ -703,6 +758,7 @@ TabPage RID_SCPAGE_PRINT }; CheckBox BTN_SKIPEMPTYPAGES { + HelpID = "sc:CheckBox:RID_SCPAGE_PRINT:BTN_SKIPEMPTYPAGES"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "~Suppress output of empty pages"; @@ -715,6 +771,7 @@ TabPage RID_SCPAGE_PRINT }; CheckBox BTN_SELECTEDSHEETS { + HelpID = "sc:CheckBox:RID_SCPAGE_PRINT:BTN_SELECTEDSHEETS"; Pos = MAP_APPFONT ( 12 , 41 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "~Print only selected sheets"; diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src index 2fc5cf3a3c54..4928c4d7dfa8 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 ) ; @@ -46,6 +46,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; Edit ED_OBJECTIVECELL { + HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_OBJECTIVECELL"; Border = TRUE ; Pos = MAP_APPFONT ( 67 , 6 ) ; Size = MAP_APPFONT ( 130 , 12 ) ; @@ -53,6 +54,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_OBJECTIVECELL { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_OBJECTIVECELL"; Pos = MAP_APPFONT ( 199 , 5 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -67,6 +69,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; RadioButton RB_MAX { + HelpID = "sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MAX"; Pos = MAP_APPFONT ( 67 , 24 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "Maximum" ; @@ -74,6 +77,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; RadioButton RB_MIN { + HelpID = "sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MIN"; Pos = MAP_APPFONT ( 67 , 38 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "Minimum" ; @@ -81,6 +85,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; RadioButton RB_VALUE { + HelpID = "sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_VALUE"; Pos = MAP_APPFONT ( 67 , 52 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; Text [ en-US ] = "Value of" ; @@ -88,6 +93,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; Edit ED_TARGET { + HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_TARGET"; Border = TRUE ; Pos = MAP_APPFONT ( 128 , 50 ) ; Size = MAP_APPFONT ( 69 , 12 ) ; @@ -95,6 +101,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_TARGET { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_TARGET"; Pos = MAP_APPFONT ( 199 , 49 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -109,6 +116,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; Edit ED_VARIABLECELLS { + HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_VARIABLECELLS"; Border = TRUE ; Pos = MAP_APPFONT ( 67 , 66 ) ; Size = MAP_APPFONT ( 130 , 12 ) ; @@ -116,6 +124,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_VARIABLECELLS { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_VARIABLECELLS"; Pos = MAP_APPFONT ( 199 , 65 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -150,6 +159,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER Edit ED_LEFT1 { + HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT1"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 114 ) ; Size = MAP_APPFONT ( 53 , 12 ) ; @@ -157,6 +167,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_LEFT1 { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT1"; Pos = MAP_APPFONT ( 67 , 113 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -164,6 +175,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ListBox LB_OP1 { + HelpID = "sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP1"; Border = TRUE ; Pos = MAP_APPFONT ( 84 , 114 ) ; Size = MAP_APPFONT ( 38 , 56 ) ; @@ -180,6 +192,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; Edit ED_RIGHT1 { + HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT1"; Border = TRUE ; Pos = MAP_APPFONT ( 128 , 114 ) ; Size = MAP_APPFONT ( 53 , 12 ) ; @@ -187,6 +200,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_RIGHT1 { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT1"; Pos = MAP_APPFONT ( 183 , 113 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -194,6 +208,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_DELETE1 { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE1"; Pos = MAP_APPFONT ( 199 , 113 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = TRUE ; @@ -203,6 +218,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER Edit ED_LEFT2 { + HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT2"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 129 ) ; Size = MAP_APPFONT ( 53 , 12 ) ; @@ -210,6 +226,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_LEFT2 { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT2"; Pos = MAP_APPFONT ( 67 , 128 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -217,6 +234,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ListBox LB_OP2 { + HelpID = "sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP2"; Border = TRUE ; Pos = MAP_APPFONT ( 84 , 129 ) ; Size = MAP_APPFONT ( 38 , 56 ) ; @@ -233,6 +251,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; Edit ED_RIGHT2 { + HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT2"; Border = TRUE ; Pos = MAP_APPFONT ( 128 , 129 ) ; Size = MAP_APPFONT ( 53 , 12 ) ; @@ -240,6 +259,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_RIGHT2 { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT2"; Pos = MAP_APPFONT ( 183 , 128 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -247,6 +267,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_DELETE2 { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE2"; Pos = MAP_APPFONT ( 199 , 128 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = TRUE ; @@ -256,6 +277,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER Edit ED_LEFT3 { + HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT3"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 144 ) ; Size = MAP_APPFONT ( 53 , 12 ) ; @@ -263,6 +285,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_LEFT3 { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT3"; Pos = MAP_APPFONT ( 67 , 143 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -270,6 +293,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ListBox LB_OP3 { + HelpID = "sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP3"; Border = TRUE ; Pos = MAP_APPFONT ( 84 , 144 ) ; Size = MAP_APPFONT ( 38 , 56 ) ; @@ -286,6 +310,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; Edit ED_RIGHT3 { + HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT3"; Border = TRUE ; Pos = MAP_APPFONT ( 128 , 144 ) ; Size = MAP_APPFONT ( 53 , 12 ) ; @@ -293,6 +318,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_RIGHT3 { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT3"; Pos = MAP_APPFONT ( 183 , 143 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -300,6 +326,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_DELETE3 { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE3"; Pos = MAP_APPFONT ( 199 , 143 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = TRUE ; @@ -309,6 +336,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER Edit ED_LEFT4 { + HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT4"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 159 ) ; Size = MAP_APPFONT ( 53 , 12 ) ; @@ -316,6 +344,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_LEFT4 { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT4"; Pos = MAP_APPFONT ( 67 , 158 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -323,6 +352,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ListBox LB_OP4 { + HelpID = "sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP4"; Border = TRUE ; Pos = MAP_APPFONT ( 84 , 159 ) ; Size = MAP_APPFONT ( 38 , 56 ) ; @@ -339,6 +369,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; Edit ED_RIGHT4 { + HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT4"; Border = TRUE ; Pos = MAP_APPFONT ( 128 , 159 ) ; Size = MAP_APPFONT ( 53 , 12 ) ; @@ -346,6 +377,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_RIGHT4 { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT4"; Pos = MAP_APPFONT ( 183 , 158 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -353,6 +385,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; ImageButton IB_DELETE4 { + HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE4"; Pos = MAP_APPFONT ( 199 , 158 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = TRUE ; @@ -375,6 +408,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER PushButton BTN_OPTIONS { + HelpID = "sc:PushButton:RID_SCDLG_OPTSOLVER:BTN_OPTIONS"; Pos = MAP_APPFONT ( 6 , 190 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -395,6 +429,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER }; PushButton BTN_SOLVE { + HelpID = "sc:PushButton:RID_SCDLG_OPTSOLVER:BTN_SOLVE"; Pos = MAP_APPFONT ( 174 , 190 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src index 9753aa1590e3..a466823581bf 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,49 +151,49 @@ 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" ; }; MenuItem { Identifier = FID_TAB_EVENTS ; - HelpId = FID_TAB_EVENTS ; + HelpId = CMD_FID_TAB_EVENTS ; Text [ en-US ] = "Sheet E~vents..." ; }; //------------------------------ @@ -202,7 +202,7 @@ Menu RID_POPUP_TAB MenuItem { Identifier = FID_TAB_MENU_SET_TAB_BG_COLOR ; - HelpId = FID_TAB_MENU_SET_TAB_BG_COLOR ; + HelpId = CMD_FID_TAB_MENU_SET_TAB_BG_COLOR ; Text [ en-US ] = "~Tab Color..." ; }; }; @@ -220,25 +220,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" ; }; }; @@ -256,32 +256,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" ; }; }; @@ -300,7 +300,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" ; }; //------------------------------ @@ -324,7 +324,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 = @@ -348,7 +348,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 @@ -370,13 +370,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" ; }; }; @@ -412,37 +412,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" ; }; }; @@ -460,7 +460,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" ; }; //------------------------------ @@ -469,7 +469,7 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = FID_CELL_FORMAT ; - HelpId = FID_CELL_FORMAT ; + HelpId = CMD_FID_CELL_FORMAT ; Text [ en-US ] = "~Format Cells..." ; }; //------------------------------ @@ -478,25 +478,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" ; }; //------------------------------ @@ -505,19 +505,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" ; }; //------------------------------ @@ -526,7 +526,7 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = SID_FORMATPAGE ; - HelpId = SID_FORMATPAGE ; + HelpId = CMD_SID_FORMATPAGE ; Text [ en-US ] = "Page Format..." ; }; //------------------------------ @@ -535,7 +535,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/simpref.src b/sc/source/ui/src/simpref.src index 03f41c1a56aa..09e04c76ac14 100644 --- a/sc/source/ui/src/simpref.src +++ b/sc/source/ui/src/simpref.src @@ -44,6 +44,7 @@ ModelessDialog RID_SCDLG_SIMPLEREF }; Edit ED_ASSIGN { + HelpID = "sc:Edit:RID_SCDLG_SIMPLEREF:ED_ASSIGN"; Border = TRUE ; Pos = MAP_APPFONT ( 48 , 6 ) ; Size = MAP_APPFONT ( 90 , 12 ) ; @@ -52,6 +53,7 @@ ModelessDialog RID_SCDLG_SIMPLEREF }; ImageButton RB_ASSIGN { + HelpID = "sc:ImageButton:RID_SCDLG_SIMPLEREF:RB_ASSIGN"; Pos = MAP_APPFONT ( 142 , 5 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; diff --git a/sc/source/ui/src/solveroptions.src b/sc/source/ui/src/solveroptions.src index 0a3432344f35..dd1195effc64 100644 --- a/sc/source/ui/src/solveroptions.src +++ b/sc/source/ui/src/solveroptions.src @@ -42,6 +42,7 @@ ModalDialog RID_SCDLG_SOLVEROPTIONS }; ListBox LB_ENGINE { + HelpID = "sc:ListBox:RID_SCDLG_SOLVEROPTIONS:LB_ENGINE"; Border = TRUE ; Pos = MAP_APPFONT ( 67 , 6 ) ; Size = MAP_APPFONT ( 145 , 90 ) ; @@ -63,6 +64,7 @@ ModalDialog RID_SCDLG_SOLVEROPTIONS }; PushButton BTN_EDIT { + HelpID = "sc:PushButton:RID_SCDLG_SOLVEROPTIONS:BTN_EDIT"; Pos = MAP_APPFONT ( 6 , 108 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -112,6 +114,7 @@ ModalDialog RID_SCDLG_SOLVER_INTEGER }; NumericField NF_VALUE { + HelpID = "sc:NumericField:RID_SCDLG_SOLVER_INTEGER:NF_VALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 27 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -161,6 +164,7 @@ ModalDialog RID_SCDLG_SOLVER_DOUBLE }; Edit ED_VALUE { + HelpID = "sc:Edit:RID_SCDLG_SOLVER_DOUBLE:ED_VALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 27 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; diff --git a/sc/source/ui/src/solvrdlg.src b/sc/source/ui/src/solvrdlg.src index 6a8a3d955644..8956e513734a 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 ) ; @@ -44,6 +44,7 @@ ModelessDialog RID_SCDLG_SOLVER }; Edit ED_FORMULACELL { + HelpID = "sc:Edit:RID_SCDLG_SOLVER:ED_FORMULACELL"; Border = TRUE ; Pos = MAP_APPFONT ( 64 , 14 ) ; Size = MAP_APPFONT ( 79 , 12 ) ; @@ -51,6 +52,7 @@ ModelessDialog RID_SCDLG_SOLVER }; ImageButton RB_FORMULACELL { + HelpID = "sc:ImageButton:RID_SCDLG_SOLVER:RB_FORMULACELL"; Pos = MAP_APPFONT ( 145 , 13 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -64,6 +66,7 @@ ModelessDialog RID_SCDLG_SOLVER }; Edit ED_TARGETVAL { + HelpID = "sc:Edit:RID_SCDLG_SOLVER:ED_TARGETVAL"; Border = TRUE ; Pos = MAP_APPFONT ( 64 , 30 ) ; Size = MAP_APPFONT ( 93 , 12 ) ; @@ -77,6 +80,7 @@ ModelessDialog RID_SCDLG_SOLVER }; Edit ED_VARCELL { + HelpID = "sc:Edit:RID_SCDLG_SOLVER:ED_VARCELL"; Border = TRUE ; Pos = MAP_APPFONT ( 64 , 46 ) ; Size = MAP_APPFONT ( 79 , 12 ) ; @@ -84,6 +88,7 @@ ModelessDialog RID_SCDLG_SOLVER }; ImageButton RB_VARCELL { + HelpID = "sc:ImageButton:RID_SCDLG_SOLVER:RB_VARCELL"; Pos = MAP_APPFONT ( 145 , 45 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; diff --git a/sc/source/ui/src/sortdlg.src b/sc/source/ui/src/sortdlg.src index 3aca09211edd..a6b02c729f29 100644 --- a/sc/source/ui/src/sortdlg.src +++ b/sc/source/ui/src/sortdlg.src @@ -33,6 +33,7 @@ TabPage RID_SCPAGE_SORT_FIELDS Size = MAP_APPFONT ( 260 , 185 ) ; ListBox LB_SORT1 { + HelpID = "sc: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 = "sc: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 = "sc: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 = "sc: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 = "sc: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 = "sc: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 = "sc: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 = "sc: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 = "sc: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 = "sc: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 = "sc: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 = "sc: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_COPYRESULT { + HelpID = "sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_COPYRESULT"; Pos = MAP_APPFONT ( 12 , 48 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "~Copy sort results to:" ; @@ -160,6 +173,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; ListBox LB_OUTAREA { + HelpID = "sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_OUTAREA"; Border = TRUE ; Pos = MAP_APPFONT ( 20 , 59 ) ; Size = MAP_APPFONT ( 93 , 90 ) ; @@ -168,6 +182,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; Edit ED_OUTAREA { + HelpID = "sc:Edit:RID_SCPAGE_SORT_OPTIONS:ED_OUTAREA"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 119 , 59 ) ; @@ -176,6 +191,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; CheckBox BTN_SORT_USER { + HelpID = "sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER"; Pos = MAP_APPFONT ( 12 , 75 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "Custom sort ~order" ; @@ -183,6 +199,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; ListBox LB_SORT_USER { + HelpID = "sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 20 , 86 ) ; @@ -198,6 +215,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; ListBox LB_LANGUAGE { + HelpID = "sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_LANGUAGE"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 115 ) ; Size = MAP_APPFONT ( 101 , 90 ) ; @@ -213,6 +231,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; ListBox LB_ALGORITHM { + HelpID = "sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_ALGORITHM"; Border = TRUE ; Pos = MAP_APPFONT ( 119 , 115 ) ; Size = MAP_APPFONT ( 132 , 90 ) ; @@ -227,6 +246,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; RadioButton BTN_TOP_DOWN { + HelpID = "sc:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_TOP_DOWN"; Pos = MAP_APPFONT ( 12 , 144 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "~Top to bottom (sort rows)" ; @@ -234,6 +254,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; RadioButton BTN_LEFT_RIGHT { + HelpID = "sc:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_LEFT_RIGHT"; Pos = MAP_APPFONT ( 12 , 158 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "L~eft to right (sort columns)" ; @@ -303,6 +324,7 @@ TabDialog RID_SCDLG_SORT ModalDialog RID_SCDLG_SORT_WARNING { + HelpID = "sc:ModalDialog:RID_SCDLG_SORT_WARNING"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 180 , 91 ) ; @@ -325,6 +347,7 @@ ModalDialog RID_SCDLG_SORT_WARNING }; PushButton BTN_EXTSORT { + HelpID = "sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_EXTSORT"; Pos = MAP_APPFONT ( 6 , 39 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; TabStop = TRUE ; @@ -333,6 +356,7 @@ ModalDialog RID_SCDLG_SORT_WARNING }; PushButton BTN_CURSORT { + HelpID = "sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_CURSORT"; Pos = MAP_APPFONT ( 70 , 39 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; TabStop = TRUE ; diff --git a/sc/source/ui/src/subtdlg.src b/sc/source/ui/src/subtdlg.src index c0bcfba1b07b..4a7504ce2b15 100644 --- a/sc/source/ui/src/subtdlg.src +++ b/sc/source/ui/src/subtdlg.src @@ -41,6 +41,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS }; CheckBox BTN_PAGEBREAK { + HelpID = "sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "~Page break between groups" ; @@ -48,6 +49,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS }; CheckBox BTN_CASE { + HelpID = "sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_CASE"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Gro-/Kleinschreibung beachten : ~Gro-/Kleinschreibung beachten */ @@ -56,6 +58,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS }; CheckBox BTN_SORT { + HelpID = "sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_SORT"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "Pre-~sort area according to groups" ; @@ -63,6 +66,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS }; CheckBox BTN_FORMATS { + HelpID = "sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_FORMATS"; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Formate einschlieen : ~Formate einschlieen */ @@ -71,6 +75,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS }; CheckBox BTN_USERDEF { + HelpID = "sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_USERDEF"; Pos = MAP_APPFONT ( 12 , 115 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "C~ustom sort order" ; @@ -78,6 +83,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS }; ListBox LB_USERDEF { + HelpID = "sc:ListBox:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF"; Border = TRUE ; Pos = MAP_APPFONT ( 20 , 127 ) ; Size = MAP_APPFONT ( 231 , 90 ) ; @@ -86,6 +92,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS }; RadioButton BTN_ASCENDING { + HelpID = "sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING"; Pos = MAP_APPFONT ( 12 , 69 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "~Ascending" ; @@ -93,6 +100,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS }; RadioButton BTN_DESCENDING { + HelpID = "sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING"; Pos = MAP_APPFONT ( 12 , 83 ) ; Size = MAP_APPFONT ( 239 , 10 ) ; Text [ en-US ] = "D~escending" ; diff --git a/sc/source/ui/src/tabopdlg.src b/sc/source/ui/src/tabopdlg.src index 25af654f4147..1bda4236942c 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 ) ; @@ -44,12 +44,14 @@ ModelessDialog RID_SCDLG_TABOP }; Edit ED_FORMULARANGE { + HelpID = "sc:Edit:RID_SCDLG_TABOP:ED_FORMULARANGE"; Border = TRUE ; Pos = MAP_APPFONT ( 82 , 14 ) ; Size = MAP_APPFONT ( 79 , 12 ) ; }; ImageButton RB_FORMULARANGE { + HelpID = "sc:ImageButton:RID_SCDLG_TABOP:RB_FORMULARANGE"; Pos = MAP_APPFONT ( 163 , 13 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -63,12 +65,14 @@ ModelessDialog RID_SCDLG_TABOP }; Edit ED_ROWCELL { + HelpID = "sc:Edit:RID_SCDLG_TABOP:ED_ROWCELL"; Border = TRUE ; Pos = MAP_APPFONT ( 82 , 30 ) ; Size = MAP_APPFONT ( 79 , 12 ) ; }; ImageButton RB_ROWCELL { + HelpID = "sc:ImageButton:RID_SCDLG_TABOP:RB_ROWCELL"; Pos = MAP_APPFONT ( 163 , 29 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -82,12 +86,14 @@ ModelessDialog RID_SCDLG_TABOP }; Edit ED_COLCELL { + HelpID = "sc:Edit:RID_SCDLG_TABOP:ED_COLCELL"; Border = TRUE ; Pos = MAP_APPFONT ( 82 , 46 ) ; Size = MAP_APPFONT ( 79 , 12 ) ; }; ImageButton RB_COLCELL { + HelpID = "sc:ImageButton:RID_SCDLG_TABOP:RB_COLCELL"; Pos = MAP_APPFONT ( 163 , 45 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; 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? Einfgen : Einfgen */ - 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 einfgen : Zellen einfgen */ - 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 einfgen : Objekt einfgen */ - 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/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 70845f6c0bc9..d9acc34bf28c 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -252,11 +252,11 @@ void ScUndoInsertTables::Undo() SvShorts TheTabs; for(int i=0;i<pNameList->Count();i++) { - TheTabs.Insert( sal::static_int_cast<short>(nTab+i), TheTabs.Count() ); + TheTabs.push_back( sal::static_int_cast<short>(nTab+i) ); } pViewShell->DeleteTables( TheTabs, FALSE ); - TheTabs.Remove(0,TheTabs.Count()); + TheTabs.clear(); bDrawIsInUndo = FALSE; pDocShell->SetInUndo( FALSE ); //! EndUndo @@ -310,15 +310,14 @@ ScUndoDeleteTab::ScUndoDeleteTab( ScDocShell* pNewDocShell,const SvShorts &aTab, ScDocument* pUndoDocument, ScRefUndoData* pRefData ) : ScMoveUndo( pNewDocShell, pUndoDocument, pRefData, SC_UNDO_REFLAST ) { - for(int i=0;i<aTab.Count();i++) - theTabs.Insert(aTab[sal::static_int_cast<USHORT>(i)],theTabs.Count()); + theTabs=aTab; SetChangeTrack(); } ScUndoDeleteTab::~ScUndoDeleteTab() { - theTabs.Remove(0,theTabs.Count()); + theTabs.clear(); } String ScUndoDeleteTab::GetComment() const @@ -335,7 +334,7 @@ void ScUndoDeleteTab::SetChangeTrack() nStartChangeAction = pChangeTrack->GetActionMax() + 1; nEndChangeAction = 0; ScRange aRange( 0, 0, 0, MAXCOL, MAXROW, 0 ); - for ( int i = 0; i < theTabs.Count(); i++ ) + for ( size_t i = 0; i < theTabs.size(); i++ ) { aRange.aStart.SetTab( theTabs[sal::static_int_cast<USHORT>(i)] ); aRange.aEnd.SetTab( theTabs[sal::static_int_cast<USHORT>(i)] ); @@ -358,13 +357,13 @@ SCTAB lcl_GetVisibleTabBefore( ScDocument& rDoc, SCTAB nTab ) void ScUndoDeleteTab::Undo() { BeginUndo(); - int i=0; + size_t i=0; ScDocument* pDoc = pDocShell->GetDocument(); BOOL bLink = FALSE; String aName; - for(i=0;i<theTabs.Count();i++) + for(i=0;i<theTabs.size();i++) { SCTAB nTab = theTabs[sal::static_int_cast<USHORT>(i)]; pRefUndoDoc->GetName( nTab, aName ); @@ -422,7 +421,7 @@ void ScUndoDeleteTab::Undo() if ( pChangeTrack ) pChangeTrack->Undo( nStartChangeAction, nEndChangeAction ); - for(i=0;i<theTabs.Count();i++) + for(i=0;i<theTabs.size();i++) { pDocShell->Broadcast( ScTablesHint( SC_TAB_INSERTED, theTabs[sal::static_int_cast<USHORT>(i)]) ); } @@ -436,7 +435,7 @@ void ScUndoDeleteTab::Undo() // nicht ShowTable wegen SetTabNo(..., TRUE): ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) - pViewShell->SetTabNo( lcl_GetVisibleTabBefore( *pDoc, theTabs[0] ), TRUE ); + pViewShell->SetTabNo( lcl_GetVisibleTabBefore( *pDoc, theTabs.front() ), TRUE ); // EndUndo(); } @@ -444,7 +443,7 @@ void ScUndoDeleteTab::Undo() void ScUndoDeleteTab::Redo() { ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - pViewShell->SetTabNo( lcl_GetVisibleTabBefore( *pDocShell->GetDocument(), theTabs[0] ) ); + pViewShell->SetTabNo( lcl_GetVisibleTabBefore( *pDocShell->GetDocument(), theTabs.front() ) ); RedoSdrUndoAction( pDrawUndo ); // Draw Redo first @@ -548,18 +547,14 @@ ScUndoMoveTab::ScUndoMoveTab( ScDocShell* pNewDocShell, const SvShorts &aNewTab) : ScSimpleUndo( pNewDocShell ) { - int i; - for(i=0;i<aOldTab.Count();i++) - theOldTabs.Insert(aOldTab[sal::static_int_cast<USHORT>(i)],theOldTabs.Count()); - - for(i=0;i<aNewTab.Count();i++) - theNewTabs.Insert(aNewTab[sal::static_int_cast<USHORT>(i)],theNewTabs.Count()); + theOldTabs=aOldTab; + theNewTabs=aNewTab; } ScUndoMoveTab::~ScUndoMoveTab() { - theNewTabs.Remove(0,theNewTabs.Count()); - theOldTabs.Remove(0,theOldTabs.Count()); + theNewTabs.clear(); + theOldTabs.clear(); } String ScUndoMoveTab::GetComment() const @@ -574,11 +569,11 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const if (bUndo) // UnDo { - for(int i=theNewTabs.Count()-1;i>=0;i--) + for (size_t i = theNewTabs.size(); i > 0; i--) { - SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; - SCTAB nOldTab = theOldTabs[sal::static_int_cast<USHORT>(i)]; - if (nDestTab > MAXTAB) // angehaengt ? + SCTAB nDestTab = theNewTabs[i - 1]; + SCTAB nOldTab = theOldTabs[i - 1]; + if (nDestTab > MAXTAB) // append ? nDestTab = pDoc->GetTableCount() - 1; pDoc->MoveTab( nDestTab, nOldTab ); @@ -588,12 +583,12 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const } else { - for(int i=0;i<theNewTabs.Count();i++) + for(size_t i=0;i<theNewTabs.size();i++) { - SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; - SCTAB nNewTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; - SCTAB nOldTab = theOldTabs[sal::static_int_cast<USHORT>(i)]; - if (nDestTab > MAXTAB) // angehaengt ? + SCTAB nDestTab = theNewTabs[i]; + SCTAB nNewTab = theNewTabs[i]; + SCTAB nOldTab = theOldTabs[i]; + if (nDestTab > MAXTAB) // append ? nDestTab = pDoc->GetTableCount() - 1; pDoc->MoveTab( nOldTab, nNewTab ); @@ -621,7 +616,7 @@ void ScUndoMoveTab::Redo() void ScUndoMoveTab::Repeat(SfxRepeatTarget& /* rTarget */) { - // kein Repeat ! ? ! + // No Repeat ! ? ! } BOOL ScUndoMoveTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const @@ -632,7 +627,7 @@ BOOL ScUndoMoveTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const //---------------------------------------------------------------------------------- // -// Tabelle kopieren +// Copy table // ScUndoCopyTab::ScUndoCopyTab( ScDocShell* pNewDocShell, @@ -643,12 +638,8 @@ ScUndoCopyTab::ScUndoCopyTab( ScDocShell* pNewDocShell, { pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() ); - int i; - for(i=0;i<aOldTab.Count();i++) - theOldTabs.Insert(aOldTab[sal::static_int_cast<USHORT>(i)],theOldTabs.Count()); - - for(i=0;i<aNewTab.Count();i++) - theNewTabs.Insert(aNewTab[sal::static_int_cast<USHORT>(i)],theNewTabs.Count()); + theOldTabs=aOldTab; + theNewTabs=aNewTab; } ScUndoCopyTab::~ScUndoCopyTab() @@ -666,7 +657,7 @@ void ScUndoCopyTab::DoChange() const ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) - pViewShell->SetTabNo(theOldTabs[0],TRUE); + pViewShell->SetTabNo(theOldTabs.front(),TRUE); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator @@ -681,10 +672,9 @@ void ScUndoCopyTab::Undo() DoSdrUndoAction( pDrawUndo, pDoc ); // before the sheets are deleted - int i; - for(i=theNewTabs.Count()-1;i>=0;i--) + for (size_t i = theNewTabs.size(); i > 0; i--) { - SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; + SCTAB nDestTab = theNewTabs[i - 1]; if (nDestTab > MAXTAB) // append? nDestTab = pDoc->GetTableCount() - 1; @@ -696,9 +686,9 @@ void ScUndoCopyTab::Undo() // ScTablesHint broadcasts after all sheets have been deleted, // so sheets and draw pages are in sync! - for(i=theNewTabs.Count()-1;i>=0;i--) + for (size_t i = theNewTabs.size(); i > 0; i--) { - SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; + SCTAB nDestTab = theNewTabs[i - 1]; if (nDestTab > MAXTAB) // append? nDestTab = pDoc->GetTableCount() - 1; @@ -714,12 +704,12 @@ void ScUndoCopyTab::Redo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); SCTAB nDestTab = 0; - for(int i=0;i<theNewTabs.Count();i++) + for(size_t i=0;i<theNewTabs.size();i++) { - nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; - SCTAB nNewTab = theNewTabs[sal::static_int_cast<USHORT>(i)]; - SCTAB nOldTab = theOldTabs[sal::static_int_cast<USHORT>(i)]; - if (nDestTab > MAXTAB) // angehaengt ? + nDestTab = theNewTabs[i]; + SCTAB nNewTab = theNewTabs[i]; + SCTAB nOldTab = theOldTabs[i]; + if (nDestTab > MAXTAB) // append ? nDestTab = pDoc->GetTableCount() - 1; bDrawIsInUndo = TRUE; diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 8b20d9849f47..437c220ba1c3 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -184,21 +184,6 @@ SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREAD //------------------------------------------------------------------------ -static void lcl_WriteInfo( registry::XRegistryKey* pRegistryKey, - const rtl::OUString& rImplementationName, - const uno::Sequence< rtl::OUString >& rServices ) - throw( registry::InvalidRegistryException ) -{ - rtl::OUString aImpl(rtl::OUString::createFromAscii( "/" )); - aImpl += rImplementationName; - aImpl += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - uno::Reference<registry::XRegistryKey> xNewKey(pRegistryKey->createKey(aImpl)); - - const rtl::OUString* pArray = rServices.getConstArray(); - for( sal_Int32 i = 0; i < rServices.getLength(); i++ ) - xNewKey->createKey( pArray[i]); -} - extern "C" { SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( @@ -207,111 +192,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * /* pServiceManager */, registry::XRegistryKey * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - lcl_WriteInfo( pRegistryKey, - ScSpreadsheetSettings::getImplementationName_Static(), - ScSpreadsheetSettings::getSupportedServiceNames_Static() ); - - lcl_WriteInfo( pRegistryKey, - ScRecentFunctionsObj::getImplementationName_Static(), - ScRecentFunctionsObj::getSupportedServiceNames_Static() ); - - lcl_WriteInfo( pRegistryKey, - ScFunctionListObj::getImplementationName_Static(), - ScFunctionListObj::getSupportedServiceNames_Static() ); - - lcl_WriteInfo( pRegistryKey, - ScAutoFormatsObj::getImplementationName_Static(), - ScAutoFormatsObj::getSupportedServiceNames_Static() ); - - lcl_WriteInfo( pRegistryKey, - ScFunctionAccess::getImplementationName_Static(), - ScFunctionAccess::getSupportedServiceNames_Static() ); - - lcl_WriteInfo( pRegistryKey, - ScFilterOptionsObj::getImplementationName_Static(), - ScFilterOptionsObj::getSupportedServiceNames_Static() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLImport_getImplementationName(), - ScXMLImport_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLImport_Meta_getImplementationName(), - ScXMLImport_Meta_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLImport_Styles_getImplementationName(), - ScXMLImport_Styles_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLImport_Content_getImplementationName(), - ScXMLImport_Content_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLImport_Settings_getImplementationName(), - ScXMLImport_Settings_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLOOoExport_getImplementationName(), - ScXMLOOoExport_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLOOoExport_Meta_getImplementationName(), - ScXMLOOoExport_Meta_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLOOoExport_Styles_getImplementationName(), - ScXMLOOoExport_Styles_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLOOoExport_Content_getImplementationName(), - ScXMLOOoExport_Content_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLOOoExport_Settings_getImplementationName(), - ScXMLOOoExport_Settings_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLOasisExport_getImplementationName(), - ScXMLOasisExport_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLOasisExport_Meta_getImplementationName(), - ScXMLOasisExport_Meta_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLOasisExport_Styles_getImplementationName(), - ScXMLOasisExport_Styles_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLOasisExport_Content_getImplementationName(), - ScXMLOasisExport_Content_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScXMLOasisExport_Settings_getImplementationName(), - ScXMLOasisExport_Settings_getSupportedServiceNames() ); - - lcl_WriteInfo( pRegistryKey, - ScDocument_getImplementationName(), - ScDocument_getSupportedServiceNames() ); - - return sal_True; - } - catch (registry::InvalidRegistryException&) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index f3f76685e5cb..c0faf59fa51b 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -377,7 +377,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const rtl::OUString& aPr if (pEntry->nWID) { ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool(); - const SfxPoolItem* pItem = pPool->GetItem( pEntry->nWID, SFX_ITEMS_STATICDEFAULT ); + const SfxPoolItem* pItem = pPool->GetItem2( pEntry->nWID, SFX_ITEMS_DEFAULT ); if (pItem) pItem->QueryValue( aRet, pEntry->nMemberId ); } diff --git a/sc/source/ui/unoobj/detreg.cxx b/sc/source/ui/unoobj/detreg.cxx index 498d0fc886ec..e1e77e5deac9 100644 --- a/sc/source/ui/unoobj/detreg.cxx +++ b/sc/source/ui/unoobj/detreg.cxx @@ -49,27 +49,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */ , - void* pRegistryKey ) -{ - Reference< ::registry::XRegistryKey > - xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ; - - OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") ); - OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ); - - // Eigentliche Implementierung und ihre Services registrieren - sal_Int32 i; - Reference< ::registry::XRegistryKey > xNewKey(xKey->createKey( aDelimiter + ScFilterDetect::impl_getStaticImplementationName() + - aUnoServices )); - - Sequence< OUString > aServices(ScFilterDetect::impl_getStaticSupportedServiceNames()); - for(i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - return sal_True; -} - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /* pRegistryKey */ ) diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index dbe92cee96a5..828ec8f09297 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1288,6 +1288,8 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec rBookmarks.clear(); } + if ( pDrawView ) + pDrawView->HideSdrPage(); delete pDrawView; } diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx index 2b1f14cf154a..7e986338e7d1 100644 --- a/sc/source/ui/vba/service.cxx +++ b/sc/source/ui/vba/service.cxx @@ -84,41 +84,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) - { - OSL_TRACE("In component_writeInfo"); -#if 0 - // Component registration - if ( component_writeInfoHelper( pServiceManager, pRegistryKey, - range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) ) - { - // Singleton registration - try - { - registry::XRegistryKey * pKey = - reinterpret_cast< registry::XRegistryKey * >(pRegistryKey); - - Reference< registry::XRegistryKey >xKey = pKey->createKey( - rtl::OUString::createFromAscii( ("ooo.vba.Globals/UNO/SINGLETONS/ooo.vba.theGlobals") ) ); - xKey->setStringValue( ::rtl::OUString::createFromAscii( - ("ooo.vba.Globals") ) ); - return sal_True; - } - catch( uno::Exception& /*e*/ ) - { - //recomp & friends will detect false returned and fail - } - } - return sal_False; -#else - // Component registration - return component_writeInfoHelper( pServiceManager, pRegistryKey, - range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl, textframe::serviceDecl ); -#endif - - } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index 07af90f797aa..84868b5377de 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -126,10 +126,6 @@ //#define _GRAPH_HXX #define _SOUND_HXX -#if defined WIN -#define _MENUBTN_HXX -#endif - //svtools #define _SCRWIN_HXX #define _RULER_HXX diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index c291d01d71c2..ea06c1fe6c0c 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -44,7 +44,7 @@ #include <svl/ptitem.hxx> #include <svl/stritem.hxx> #include <tools/urlobj.hxx> - +#include <sfx2/objface.hxx> #include <vcl/msgbox.hxx> #include <vcl/vclenum.hxx> @@ -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,7 +1015,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_UNPROTECTDOC) ); pDlg->SetMinLen( 0 ); - pDlg->SetHelpId( FID_PROTECT_DOC ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_DOC)->GetCommand() ); pDlg->SetEditHelpId( HID_PASSWD_DOC ); if (pDlg->Execute() == RET_OK) @@ -1038,7 +1038,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_PROTECTDOC) ); pDlg->SetMinLen( 0 ); - pDlg->SetHelpId( FID_PROTECT_DOC ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_DOC)->GetCommand() ); pDlg->SetEditHelpId( HID_PASSWD_DOC ); pDlg->ShowExtras( SHOWEXTRAS_CONFIRM ); @@ -1089,7 +1089,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) auto_ptr<SfxPasswordDialog> 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) @@ -1161,7 +1161,7 @@ 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->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_TABLE)->GetCommand() ); pDlg->SetEditHelpId( HID_PASSWD_TABLE ); if (pDlg->Execute() == RET_OK) @@ -1183,7 +1183,7 @@ 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->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_TABLE)->GetCommand() ); pDlg->SetEditHelpId( HID_PASSWD_TABLE ); pDlg->ShowExtras( SHOWEXTRAS_CONFIRM ); 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: diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 20a10f149a3a..37c1b0ab1e84 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -39,6 +39,7 @@ #include <svl/stritem.hxx> #include <svl/whiter.hxx> #include <vcl/msgbox.hxx> +#include <sfx2/objface.hxx> #include <svx/svxdlg.hxx> #include <editeng/colritem.hxx> @@ -59,6 +60,7 @@ #include "tabbgcolor.hxx" #include "tabbgcolordlg.hxx" +#include "sccommands.h" using ::boost::scoped_ptr; using namespace com::sun::star; @@ -419,26 +421,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 @@ -446,7 +445,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 ) @@ -649,7 +648,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) { if(rMark.GetTableSelect(i) &&!pDoc->IsTabProtected(i)) { - TheTabs.Insert(i,TheTabs.Count()); + TheTabs.push_back(i); bTabFlag=TRUE; if(nNewTab==i) nNewTab++; } @@ -659,7 +658,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) pViewData->SetTabNo(nNewTab); DeleteTables(TheTabs); - TheTabs.Remove(0,TheTabs.Count()); + TheTabs.clear(); rReq.Done(); } } @@ -755,7 +754,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) String(ScResId(SCSTR_SET_TAB_BG_COLOR)), String(ScResId(SCSTR_NO_TAB_BG_COLOR)), aTabBgColor, - nSlot,RID_SCDLG_TAB_BG_COLOR); + CMD_FID_TAB_SET_TAB_BG_COLOR, + RID_SCDLG_TAB_BG_COLOR); while ( !bDone && nRet == RET_OK ) { nRet = pDlg->Execute(); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index a125cbea6f50..e73eabff4237 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2148,8 +2148,7 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScDocument* pDoc = pDocSh->GetDocument(); BOOL bVbaEnabled = pDoc ? pDoc->IsInVBAMode() : FALSE; - SCTAB nNewTab = TheTabs[0]; - int i; + SCTAB nNewTab = TheTabs.front(); WaitObject aWait( GetFrameWin() ); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; @@ -2169,9 +2168,9 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) // pUndoDoc->InitUndo( pDoc, 0, nCount-1 ); // incl. Ref. String aOldName; - for(i=0;i<TheTabs.Count();i++) + for (size_t i = 0; i < TheTabs.size(); i++) { - SCTAB nTab = TheTabs[sal::static_int_cast<USHORT>(i)]; + SCTAB nTab = TheTabs[i]; if (i==0) pUndoDoc->InitUndo( pDoc, nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags else @@ -2219,11 +2218,11 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) BOOL bDelDone = FALSE; - for(i=TheTabs.Count()-1;i>=0;i--) + for (size_t i = TheTabs.size(); i > 0; i--) { String sCodeName; - BOOL bHasCodeName = pDoc->GetCodeName( TheTabs[sal::static_int_cast<USHORT>(i)], sCodeName ); - if (pDoc->DeleteTab( TheTabs[sal::static_int_cast<USHORT>(i)], pUndoDoc )) + BOOL bHasCodeName = pDoc->GetCodeName( TheTabs[i-1], sCodeName ); + if (pDoc->DeleteTab( TheTabs[i-1], pUndoDoc )) { bDelDone = TRUE; if( bVbaEnabled ) @@ -2233,7 +2232,7 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) VBA_DeleteModule( *pDocSh, sCodeName ); } } - pDocSh->Broadcast( ScTablesHint( SC_TAB_DELETED, TheTabs[sal::static_int_cast<USHORT>(i)] ) ); + pDocSh->Broadcast( ScTablesHint( SC_TAB_DELETED, TheTabs[i-1] ) ); } } if (bRecord) @@ -2583,13 +2582,13 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) { String aTabName; pDoc->GetName( i, aTabName); - TheTabs.Insert(i,TheTabs.Count()); + TheTabs.push_back(i); for(SCTAB j=i+1;j<nTabCount;j++) { if((!pDoc->IsVisible(j))&&(pDoc->IsScenario(j))) { pDoc->GetName( j, aTabName); - TheTabs.Insert(j,TheTabs.Count()); + TheTabs.push_back(j); i=j; } else break; @@ -2609,7 +2608,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) if(nDestTab==SC_TAB_APPEND) nDestTab=pDestDoc->GetTableCount(); SCTAB nDestTab1=nDestTab; - for( USHORT j=0; j<TheTabs.Count(); j++, nDestTab1++ ) + for( size_t j=0; j<TheTabs.size(); j++, nDestTab1++ ) { // #63304# insert sheets first and update all references String aName; pDoc->GetName( TheTabs[j], aName ); @@ -2623,7 +2622,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) if ( nErrVal > 0 ) { nDestTab1 = nDestTab; - for(USHORT i=0;i<TheTabs.Count();i++) + for(size_t i=0;i<TheTabs.size();i++) { nErrVal = pDestDoc->TransferTab( pDoc, TheTabs[i], nDestTab1, FALSE ); // no insert @@ -2661,7 +2660,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) pDestDoc->GetName(nDestTab, sName); pDestShell->GetUndoManager()->AddUndoAction( new ScUndoImportTab( pDestShell, nDestTab, - static_cast<SCTAB>(TheTabs.Count()), FALSE)); + static_cast<SCTAB>(TheTabs.size()), FALSE)); } else @@ -2714,7 +2713,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) if ( pDestDoc->IsChartListenerCollectionNeedsUpdate() ) pDestDoc->UpdateChartListenerCollection(); - pDestDoc->DeleteTab(static_cast<SCTAB>(TheTabs.Count())); // alte erste Tabelle + pDestDoc->DeleteTab(static_cast<SCTAB>(TheTabs.size())); // first old table //? pDestDoc->SelectTable(0, TRUE); // neue erste Tabelle selektieren if (pDestViewSh) pDestViewSh->TabChanged(); // Pages auf dem Drawing-Layer @@ -2730,12 +2729,12 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) pDestShell->PostPaintGridAll(); } - TheTabs.Remove(0,TheTabs.Count()); + TheTabs.clear(); pDestShell->SetDocumentModified(); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); } - else // innerhalb des Dokuments + else // within the documents { ScMarkData& rMark = GetViewData()->GetMarkData(); @@ -2804,7 +2803,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) pDoc->SetVisible(nDestTab1,bVisible ); } - TheTabs.Insert(nMovTab,TheTabs.Count()); + TheTabs.push_back(nMovTab); if(!bCopy) { @@ -2814,7 +2813,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) } } - TheDestTabs.Insert(nDestTab1,TheDestTabs.Count()); + TheDestTabs.push_back(nDestTab1); delete pString; } diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 24fab9ac2eba..3104b7ed8b8f 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -34,10 +34,6 @@ #define _SV_NOXSOUND -#ifdef WIN - #define _MENUBTN_HXX -#endif - #define _BASE_DLGS_HXX #define _BIGINT_HXX #define _CACHESTR_HXX |