diff options
Diffstat (limited to 'sc/source/ui/dbgui')
49 files changed, 1286 insertions, 1286 deletions
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index f101809552c9..19aa38fbac58 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,35 +51,35 @@ static const sal_Char __FAR_DATA pStrMrg[] = "MRG"; // ============================================================================ ScAsciiOptions::ScAsciiOptions() : - bFixedLen ( FALSE ), - aFieldSeps ( ';' ), - bMergeFieldSeps ( FALSE ), + bFixedLen ( FALSE ), + aFieldSeps ( ';' ), + bMergeFieldSeps ( FALSE ), bQuotedFieldAsText(false), bDetectSpecialNumber(false), - cTextSep ( cDefaultTextSep ), - eCharSet ( gsl_getSystemTextEncoding() ), + cTextSep ( cDefaultTextSep ), + eCharSet ( gsl_getSystemTextEncoding() ), eLang ( LANGUAGE_SYSTEM ), - bCharSetSystem ( FALSE ), - nStartRow ( 1 ), - nInfoCount ( 0 ), + bCharSetSystem ( FALSE ), + nStartRow ( 1 ), + nInfoCount ( 0 ), pColStart ( NULL ), - pColFormat ( NULL ) + pColFormat ( NULL ) { } ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) : - bFixedLen ( rOpt.bFixedLen ), - aFieldSeps ( rOpt.aFieldSeps ), - bMergeFieldSeps ( rOpt.bMergeFieldSeps ), + bFixedLen ( rOpt.bFixedLen ), + aFieldSeps ( rOpt.aFieldSeps ), + bMergeFieldSeps ( rOpt.bMergeFieldSeps ), bQuotedFieldAsText(rOpt.bQuotedFieldAsText), bDetectSpecialNumber(rOpt.bDetectSpecialNumber), - cTextSep ( rOpt.cTextSep ), - eCharSet ( rOpt.eCharSet ), + cTextSep ( rOpt.cTextSep ), + eCharSet ( rOpt.eCharSet ), eLang ( rOpt.eLang ), - bCharSetSystem ( rOpt.bCharSetSystem ), - nStartRow ( rOpt.nStartRow ), - nInfoCount ( rOpt.nInfoCount ) + bCharSetSystem ( rOpt.bCharSetSystem ), + nStartRow ( rOpt.nStartRow ), + nInfoCount ( rOpt.nInfoCount ) { if (nInfoCount) { @@ -152,18 +152,18 @@ void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec ) } -ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy ) +ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy ) { SetColInfo( rCpy.nInfoCount, rCpy.pColStart, rCpy.pColFormat ); - bFixedLen = rCpy.bFixedLen; - aFieldSeps = rCpy.aFieldSeps; - bMergeFieldSeps = rCpy.bMergeFieldSeps; + bFixedLen = rCpy.bFixedLen; + aFieldSeps = rCpy.aFieldSeps; + bMergeFieldSeps = rCpy.bMergeFieldSeps; bQuotedFieldAsText = rCpy.bQuotedFieldAsText; - cTextSep = rCpy.cTextSep; - eCharSet = rCpy.eCharSet; - bCharSetSystem = rCpy.bCharSetSystem; - nStartRow = rCpy.nStartRow; + cTextSep = rCpy.cTextSep; + eCharSet = rCpy.eCharSet; + bCharSetSystem = rCpy.bCharSetSystem; + nStartRow = rCpy.nStartRow; return *this; } @@ -171,15 +171,15 @@ ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy ) BOOL ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const { - if ( bFixedLen == rCmp.bFixedLen && - aFieldSeps == rCmp.aFieldSeps && + if ( bFixedLen == rCmp.bFixedLen && + aFieldSeps == rCmp.aFieldSeps && bMergeFieldSeps == rCmp.bMergeFieldSeps && bQuotedFieldAsText == rCmp.bQuotedFieldAsText && - cTextSep == rCmp.cTextSep && - eCharSet == rCmp.eCharSet && + cTextSep == rCmp.cTextSep && + eCharSet == rCmp.eCharSet && bCharSetSystem == rCmp.bCharSetSystem && - nStartRow == rCmp.nStartRow && - nInfoCount == rCmp.nInfoCount ) + nStartRow == rCmp.nStartRow && + nInfoCount == rCmp.nInfoCount ) { DBG_ASSERT( !nInfoCount || (pColStart && pColFormat && rCmp.pColStart && rCmp.pColFormat), "0-Zeiger in ScAsciiOptions" ); @@ -194,8 +194,8 @@ BOOL ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const } // -// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) -// darum ab Version 336 Komma stattdessen +// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) +// darum ab Version 336 Komma stattdessen // @@ -207,7 +207,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) xub_StrLen i; // - // Feld-Trenner + // Feld-Trenner // if ( nCount >= 1 ) @@ -234,7 +234,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) } // - // Text-Trenner + // Text-Trenner // if ( nCount >= 2 ) @@ -245,7 +245,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) } // - // Zeichensatz + // Zeichensatz // if ( nCount >= 3 ) @@ -255,7 +255,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) } // - // Startzeile + // Startzeile // if ( nCount >= 4 ) @@ -265,7 +265,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) } // - // Spalten-Infos + // Spalten-Infos // if ( nCount >= 5 ) @@ -295,7 +295,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) // Language if (nCount >= 6) - { + { aToken = rString.GetToken(5, ','); eLang = static_cast<LanguageType>(aToken.ToInt32()); } @@ -321,7 +321,7 @@ String ScAsciiOptions::WriteToString() const String aOutStr; // - // Feld-Trenner + // Feld-Trenner // if ( bFixedLen ) @@ -344,34 +344,34 @@ String ScAsciiOptions::WriteToString() const } } - aOutStr += ','; // Token-Ende + aOutStr += ','; // Token-Ende // - // Text-Trenner + // Text-Trenner // aOutStr += String::CreateFromInt32(cTextSep); - aOutStr += ','; // Token-Ende + aOutStr += ','; // Token-Ende // - // Zeichensatz + // Zeichensatz // - if ( bCharSetSystem ) // force "SYSTEM" + if ( bCharSetSystem ) // force "SYSTEM" aOutStr += ScGlobal::GetCharsetString( RTL_TEXTENCODING_DONTKNOW ); else aOutStr += ScGlobal::GetCharsetString( eCharSet ); - aOutStr += ','; // Token-Ende + aOutStr += ','; // Token-Ende // - // Startzeile + // Startzeile // aOutStr += String::CreateFromInt32(nStartRow); - aOutStr += ','; // Token-Ende + aOutStr += ','; // Token-Ende // - // Spalten-Infos + // Spalten-Infos // DBG_ASSERT( !nInfoCount || (pColStart && pColFormat), "0-Zeiger in ScAsciiOptions" ); diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc index 7bf6d42d6e2f..a251127ce586 100644 --- a/sc/source/ui/dbgui/asciiopt.hrc +++ b/sc/source/ui/dbgui/asciiopt.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,16 +26,16 @@ ************************************************************************/ #include "sc.hrc" //#define RID_SCDLG_ASCII 256 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 3 -#define FL_FIELDOPT 4 -#define FT_CHARSET 5 -#define LB_CHARSET 6 -#define FT_CUSTOMLANG 7 -#define LB_CUSTOMLANG 8 -#define FT_AT_ROW 9 +#define FL_FIELDOPT 4 +#define FT_CHARSET 5 +#define LB_CHARSET 6 +#define FT_CUSTOMLANG 7 +#define LB_CUSTOMLANG 8 +#define FT_AT_ROW 9 #define NF_AT_ROW 10 #define FL_SEPOPT 11 @@ -60,12 +60,12 @@ #define LB_TYPE1 28 #define CTR_TABLEBOX 29 #define STR_TEXTTOCOLUMNS 30 - - - - - - - - - + + + + + + + + + diff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.src index 9efbfe0f557f..1744ae4635bd 100644 --- a/sc/source/ui/dbgui/asciiopt.src +++ b/sc/source/ui/dbgui/asciiopt.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 7e2bafd2c42b..602241485a41 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ #define INFOBOX(id) InfoBox(this, ScGlobal::GetRscString(id)).Execute() //============================================================================ -// class ScAreaData +// class ScAreaData class ScAreaData { @@ -72,68 +72,68 @@ public: bIsDbArea = bDb; } - String aStrName; - String aStrArea; - BOOL bIsDbArea; + String aStrName; + String aStrArea; + BOOL bIsDbArea; }; //============================================================================ -// class ScConsolidateDialog +// class ScConsolidateDialog ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ) + const SfxItemSet& rArgSet ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_CONSOLIDATE ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_CONSOLIDATE ), // - aFtFunc ( this, ScResId( FT_FUNC ) ), - aLbFunc ( this, ScResId( LB_FUNC ) ), + aFtFunc ( this, ScResId( FT_FUNC ) ), + aLbFunc ( this, ScResId( LB_FUNC ) ), - aFtConsAreas ( this, ScResId( FT_CONSAREAS ) ), - aLbConsAreas ( this, ScResId( LB_CONSAREAS ) ), + aFtConsAreas ( this, ScResId( FT_CONSAREAS ) ), + aLbConsAreas ( this, ScResId( LB_CONSAREAS ) ), - aLbDataArea ( this, ScResId( LB_DATA_AREA ) ), - aFtDataArea ( this, ScResId( FT_DATA_AREA ) ), + aLbDataArea ( this, ScResId( LB_DATA_AREA ) ), + aFtDataArea ( this, ScResId( FT_DATA_AREA ) ), aEdDataArea ( this, this, ScResId( ED_DATA_AREA ) ), - aRbDataArea ( this, ScResId( RB_DATA_AREA ), &aEdDataArea, this ), + aRbDataArea ( this, ScResId( RB_DATA_AREA ), &aEdDataArea, this ), - aLbDestArea ( this, ScResId( LB_DEST_AREA ) ), - aFtDestArea ( this, ScResId( FT_DEST_AREA ) ), + aLbDestArea ( this, ScResId( LB_DEST_AREA ) ), + aFtDestArea ( this, ScResId( FT_DEST_AREA ) ), aEdDestArea ( this, this, ScResId( ED_DEST_AREA ) ), - aRbDestArea ( this, ScResId( RB_DEST_AREA ), &aEdDestArea, this), + aRbDestArea ( this, ScResId( RB_DEST_AREA ), &aEdDestArea, this), aFlConsBy ( this, ScResId( FL_CONSBY ) ), - aBtnByRow ( this, ScResId( BTN_BYROW ) ), - aBtnByCol ( this, ScResId( BTN_BYCOL) ), + aBtnByRow ( this, ScResId( BTN_BYROW ) ), + aBtnByCol ( this, ScResId( BTN_BYCOL) ), aFlSep ( this, ScResId( FL_SEP ) ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), - aBtnRefs ( this, ScResId( BTN_REFS ) ), + aBtnRefs ( this, ScResId( BTN_REFS ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnAdd ( this, ScResId( BTN_ADD ) ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnAdd ( this, ScResId( BTN_ADD ) ), + aBtnRemove ( this, ScResId( BTN_REMOVE ) ), + aBtnMore ( this, ScResId( BTN_MORE ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), // - theConsData ( ((const ScConsolidateItem&) + theConsData ( ((const ScConsolidateItem&) rArgSet.Get( rArgSet.GetPool()-> GetWhich( SID_CONSOLIDATE ) ) ).GetData() ), - pViewData ( ((ScTabViewShell*)SfxViewShell::Current())-> + pViewData ( ((ScTabViewShell*)SfxViewShell::Current())-> GetViewData() ), - pDoc ( ((ScTabViewShell*)SfxViewShell::Current())-> + pDoc ( ((ScTabViewShell*)SfxViewShell::Current())-> GetViewData()->GetDocument() ), - pRangeUtil ( new ScRangeUtil ), - pAreaData ( NULL ), - nAreaDataCount ( 0 ), - nWhichCons ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) ), + pRangeUtil ( new ScRangeUtil ), + pAreaData ( NULL ), + nAreaDataCount ( 0 ), + nWhichCons ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) ), - pRefInputEdit ( &aEdDataArea ) + pRefInputEdit ( &aEdDataArea ) { Init(); FreeResource(); @@ -158,19 +158,19 @@ void ScConsolidateDlg::Init() String aStr; USHORT i=0; - aEdDataArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) ); - aEdDestArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) ); + aEdDataArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) ); + aEdDestArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) ); aLbDataArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) ); aLbDestArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) ); - aEdDataArea .SetModifyHdl ( LINK( this, ScConsolidateDlg, ModifyHdl ) ); - aEdDestArea .SetModifyHdl ( LINK( this, ScConsolidateDlg, ModifyHdl ) ); - aLbConsAreas.SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) ); - aLbDataArea .SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) ); - aLbDestArea .SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) ); - aBtnOk .SetClickHdl ( LINK( this, ScConsolidateDlg, OkHdl ) ); - aBtnCancel .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) ); - aBtnAdd .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) ); - aBtnRemove .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) ); + aEdDataArea .SetModifyHdl ( LINK( this, ScConsolidateDlg, ModifyHdl ) ); + aEdDestArea .SetModifyHdl ( LINK( this, ScConsolidateDlg, ModifyHdl ) ); + aLbConsAreas.SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) ); + aLbDataArea .SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) ); + aLbDestArea .SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) ); + aBtnOk .SetClickHdl ( LINK( this, ScConsolidateDlg, OkHdl ) ); + aBtnCancel .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) ); + aBtnAdd .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) ); + aBtnRemove .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) ); aBtnMore.AddWindow( &aFlConsBy ); aBtnMore.AddWindow( &aBtnByRow ); @@ -223,10 +223,10 @@ void ScConsolidateDlg::Init() ScRangeName* pRangeNames = pDoc->GetRangeName(); ScDBCollection* pDbNames = pDoc->GetDBCollection(); const USHORT nRangeCount = pRangeNames ? pRangeNames->GetCount() : 0; - const USHORT nDbCount = pDbNames ? pDbNames ->GetCount() : 0; + const USHORT nDbCount = pDbNames ? pDbNames ->GetCount() : 0; nAreaDataCount = nRangeCount+nDbCount; - pAreaData = NULL; + pAreaData = NULL; if ( nAreaDataCount > 0 ) { @@ -275,7 +275,7 @@ void ScConsolidateDlg::FillAreaLists() { aLbDataArea.InsertEntry( pAreaData[i].aStrName, i+1 ); -// if ( !pAreaData[i].bIsDbArea ) +// if ( !pAreaData[i].bIsDbArea ) aLbDestArea.InsertEntry( pAreaData[i].aStrName, i+1 ); } } @@ -294,8 +294,8 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) if ( rRef.aStart != rRef.aEnd ) RefInputStart( pRefInputEdit ); - String aStr; - USHORT nFmt = SCR_ABS_3D; //!!! nCurTab fehlt noch + String aStr; + USHORT nFmt = SCR_ABS_3D; //!!! nCurTab fehlt noch const formula::FormulaGrammar::AddressConvention eConv = pDocP->GetAddressConvention(); if ( rRef.aStart.Tab() != rRef.aEnd.Tab() ) @@ -358,9 +358,9 @@ BOOL ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd ) ((pEd != &aEdDataArea) && (pEd != &aEdDestArea)) ) return FALSE; - SCTAB nTab = pViewData->GetTabNo(); - BOOL bEditOk = FALSE; - String theCompleteStr; + SCTAB nTab = pViewData->GetTabNo(); + BOOL bEditOk = FALSE; + String theCompleteStr; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if ( pEd == &aEdDataArea ) @@ -416,16 +416,16 @@ IMPL_LINK( ScConsolidateDlg, OkHdl, void*, EMPTYARG ) if ( nDataAreaCount > 0 ) { ScRefAddress aDestAddress; - SCTAB nTab = pViewData->GetTabNo(); - String aDestPosStr( aEdDestArea.GetText() ); + SCTAB nTab = pViewData->GetTabNo(); + String aDestPosStr( aEdDestArea.GetText() ); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if ( pRangeUtil->IsAbsPos( aDestPosStr, pDoc, nTab, NULL, &aDestAddress, eConv ) ) { - ScConsolidateParam theOutParam( theConsData ); - ScArea** ppDataAreas = new ScArea*[nDataAreaCount]; - ScArea* pArea; - USHORT i=0; + ScConsolidateParam theOutParam( theConsData ); + ScArea** ppDataAreas = new ScArea*[nDataAreaCount]; + ScArea* pArea; + USHORT i=0; for ( i=0; i<nDataAreaCount; i++ ) { @@ -435,13 +435,13 @@ IMPL_LINK( ScConsolidateDlg, OkHdl, void*, EMPTYARG ) ppDataAreas[i] = pArea; } - theOutParam.nCol = aDestAddress.Col(); - theOutParam.nRow = aDestAddress.Row(); - theOutParam.nTab = aDestAddress.Tab(); - theOutParam.eFunction = LbPosToFunc( aLbFunc.GetSelectEntryPos() ); - theOutParam.bByCol = aBtnByCol.IsChecked(); - theOutParam.bByRow = aBtnByRow.IsChecked(); - theOutParam.bReferenceData = aBtnRefs.IsChecked(); + theOutParam.nCol = aDestAddress.Col(); + theOutParam.nRow = aDestAddress.Row(); + theOutParam.nTab = aDestAddress.Tab(); + theOutParam.eFunction = LbPosToFunc( aLbFunc.GetSelectEntryPos() ); + theOutParam.bByCol = aBtnByCol.IsChecked(); + theOutParam.bByRow = aBtnByRow.IsChecked(); + theOutParam.bReferenceData = aBtnRefs.IsChecked(); theOutParam.SetAreas( ppDataAreas, nDataAreaCount ); for ( i=0; i<nDataAreaCount; i++ ) @@ -479,9 +479,9 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn ) { if ( aEdDataArea.GetText().Len() > 0 ) { - String aNewEntry( aEdDataArea.GetText() ); - ScArea** ppAreas = NULL; - USHORT nAreaCount = 0; + String aNewEntry( aEdDataArea.GetText() ); + ScArea** ppAreas = NULL; + USHORT nAreaCount = 0; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if ( pRangeUtil->IsAbsTabArea( aNewEntry, pDoc, &ppAreas, &nAreaCount, TRUE, eConv ) ) @@ -550,8 +550,8 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb ) } else if ( (pLb == &aLbDataArea) || (pLb == &aLbDestArea) ) { - Edit* pEd = (pLb == &aLbDataArea) ? &aEdDataArea : &aEdDestArea; - USHORT nSelPos = pLb->GetSelectEntryPos(); + Edit* pEd = (pLb == &aLbDataArea) ? &aEdDataArea : &aEdDestArea; + USHORT nSelPos = pLb->GetSelectEntryPos(); if ( pRangeUtil && (nSelPos > 0) @@ -614,16 +614,16 @@ ScSubTotalFunc ScConsolidateDlg::LbPosToFunc( USHORT nPos ) { switch ( nPos ) { - case 2: return SUBTOTAL_FUNC_AVE; - case 6: return SUBTOTAL_FUNC_CNT; - case 1: return SUBTOTAL_FUNC_CNT2; - case 3: return SUBTOTAL_FUNC_MAX; - case 4: return SUBTOTAL_FUNC_MIN; - case 5: return SUBTOTAL_FUNC_PROD; - case 7: return SUBTOTAL_FUNC_STD; - case 8: return SUBTOTAL_FUNC_STDP; - case 9: return SUBTOTAL_FUNC_VAR; - case 10: return SUBTOTAL_FUNC_VARP; + case 2: return SUBTOTAL_FUNC_AVE; + case 6: return SUBTOTAL_FUNC_CNT; + case 1: return SUBTOTAL_FUNC_CNT2; + case 3: return SUBTOTAL_FUNC_MAX; + case 4: return SUBTOTAL_FUNC_MIN; + case 5: return SUBTOTAL_FUNC_PROD; + case 7: return SUBTOTAL_FUNC_STD; + case 8: return SUBTOTAL_FUNC_STDP; + case 9: return SUBTOTAL_FUNC_VAR; + case 10: return SUBTOTAL_FUNC_VARP; case 0: default: return SUBTOTAL_FUNC_SUM; @@ -637,16 +637,16 @@ USHORT ScConsolidateDlg::FuncToLbPos( ScSubTotalFunc eFunc ) { switch ( eFunc ) { - case SUBTOTAL_FUNC_AVE: return 2; - case SUBTOTAL_FUNC_CNT: return 6; - case SUBTOTAL_FUNC_CNT2: return 1; - case SUBTOTAL_FUNC_MAX: return 3; - case SUBTOTAL_FUNC_MIN: return 4; - case SUBTOTAL_FUNC_PROD: return 5; - case SUBTOTAL_FUNC_STD: return 7; - case SUBTOTAL_FUNC_STDP: return 8; - case SUBTOTAL_FUNC_VAR: return 9; - case SUBTOTAL_FUNC_VARP: return 10; + case SUBTOTAL_FUNC_AVE: return 2; + case SUBTOTAL_FUNC_CNT: return 6; + case SUBTOTAL_FUNC_CNT2: return 1; + case SUBTOTAL_FUNC_MAX: return 3; + case SUBTOTAL_FUNC_MIN: return 4; + case SUBTOTAL_FUNC_PROD: return 5; + case SUBTOTAL_FUNC_STD: return 7; + case SUBTOTAL_FUNC_STDP: return 8; + case SUBTOTAL_FUNC_VAR: return 9; + case SUBTOTAL_FUNC_VARP: return 10; case SUBTOTAL_FUNC_NONE: case SUBTOTAL_FUNC_SUM: default: diff --git a/sc/source/ui/dbgui/consdlg.hrc b/sc/source/ui/dbgui/consdlg.hrc index 6f9f6708c388..f1f6c26fad8b 100644 --- a/sc/source/ui/dbgui/consdlg.hrc +++ b/sc/source/ui/dbgui/consdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #include "sc.hrc" -#define BTN_OK 1 +#define BTN_OK 1 #define BTN_CANCEL 2 #define BTN_HELP 3 #define BTN_MORE 4 diff --git a/sc/source/ui/dbgui/consdlg.src b/sc/source/ui/dbgui/consdlg.src index 5226c22629c6..56748a0c58c1 100644 --- a/sc/source/ui/dbgui/consdlg.src +++ b/sc/source/ui/dbgui/consdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 3455fa72c1fd..f69410eac2a8 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index a18bbb7e2607..da1e5c2e2432 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 84d5ad6bee1b..5f53e24d0dc6 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx index 5215f3f9a799..39ab20af9df8 100644 --- a/sc/source/ui/dbgui/csvsplits.cxx +++ b/sc/source/ui/dbgui/csvsplits.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index e7d3071da1f3..7a4e5ec25f35 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index ab2159af2f93..34996739b1fd 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,18 +52,18 @@ using namespace com::sun::star; #include "sc.hrc" #include "dapitype.hrc" #include "miscuno.hxx" -#include "dpsdbtab.hxx" // ScImportSourceDesc +#include "dpsdbtab.hxx" // ScImportSourceDesc //------------------------------------------------------------------------- -#define DP_SERVICE_DBCONTEXT "com.sun.star.sdb.DatabaseContext" -#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" +#define DP_SERVICE_DBCONTEXT "com.sun.star.sdb.DatabaseContext" +#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" -// entries in the "type" ListBox -#define DP_TYPELIST_TABLE 0 -#define DP_TYPELIST_QUERY 1 -#define DP_TYPELIST_SQL 2 -#define DP_TYPELIST_SQLNAT 3 +// entries in the "type" ListBox +#define DP_TYPELIST_TABLE 0 +#define DP_TYPELIST_QUERY 1 +#define DP_TYPELIST_SQL 2 +#define DP_TYPELIST_SQLNAT 3 //------------------------------------------------------------------------- @@ -83,11 +83,11 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) : { FreeResource(); - WaitObject aWait( this ); // initializing the database service the first time takes a while + WaitObject aWait( this ); // initializing the database service the first time takes a while try { - // get database names + // get database names uno::Reference<container::XNameAccess> xContext( comphelper::getProcessServiceFactory()->createInstance( @@ -158,11 +158,11 @@ void ScDataPilotDatabaseDlg::FillObjects() USHORT nSelect = aLbType.GetSelectEntryPos(); if ( nSelect > DP_TYPELIST_QUERY ) - return; // only tables and queries + return; // only tables and queries try { - // open connection (for tables or queries) + // open connection (for tables or queries) uno::Reference<container::XNameAccess> xContext( comphelper::getProcessServiceFactory()->createInstance( @@ -185,30 +185,30 @@ void ScDataPilotDatabaseDlg::FillObjects() uno::Sequence<rtl::OUString> aNames; if ( nSelect == DP_TYPELIST_TABLE ) { - // get all tables + // get all tables uno::Reference<sdbcx::XTablesSupplier> xTablesSupp( xConnection, uno::UNO_QUERY ); if ( !xTablesSupp.is() ) return; - uno::Reference<container::XNameAccess> xTables = xTablesSupp->getTables(); + uno::Reference<container::XNameAccess> xTables = xTablesSupp->getTables(); if ( !xTables.is() ) return; aNames = xTables->getElementNames(); } else { - // get all queries + // get all queries uno::Reference<sdb::XQueriesSupplier> xQueriesSupp( xConnection, uno::UNO_QUERY ); if ( !xQueriesSupp.is() ) return; - uno::Reference<container::XNameAccess> xQueries = xQueriesSupp->getQueries(); + uno::Reference<container::XNameAccess> xQueries = xQueriesSupp->getQueries(); if ( !xQueries.is() ) return; aNames = xQueries->getElementNames(); } - - // fill list + + // fill list long nCount = aNames.getLength(); const rtl::OUString* pArray = aNames.getConstArray(); @@ -220,7 +220,7 @@ void ScDataPilotDatabaseDlg::FillObjects() } catch(uno::Exception&) { - // #71604# this may happen if an invalid database is selected -> no DBG_ERROR + // #71604# this may happen if an invalid database is selected -> no DBG_ERROR DBG_WARNING("exception in database"); } } diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index b9ca10fef09e..b4943d265ffd 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,14 +86,14 @@ ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent, aFlFrame ( this, ScResId( FL_FRAME ) ), aFtService ( this, ScResId( FT_SERVICE ) ), aLbService ( this, ScResId( LB_SERVICE ) ), - aFtSource ( this, ScResId( FT_SOURCE ) ), - aEdSource ( this, ScResId( ED_SOURCE ) ), - aFtName ( this, ScResId( FT_NAME ) ), - aEdName ( this, ScResId( ED_NAME ) ), - aFtUser ( this, ScResId( FT_USER ) ), - aEdUser ( this, ScResId( ED_USER ) ), - aFtPasswd ( this, ScResId( FT_PASSWD ) ), - aEdPasswd ( this, ScResId( ED_PASSWD ) ), + aFtSource ( this, ScResId( FT_SOURCE ) ), + aEdSource ( this, ScResId( ED_SOURCE ) ), + aFtName ( this, ScResId( FT_NAME ) ), + aEdName ( this, ScResId( ED_NAME ) ), + aFtUser ( this, ScResId( FT_USER ) ), + aEdUser ( this, ScResId( ED_USER ) ), + aFtPasswd ( this, ScResId( FT_PASSWD ) ), + aEdPasswd ( this, ScResId( ED_PASSWD ) ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ) diff --git a/sc/source/ui/dbgui/dapitype.hrc b/sc/source/ui/dbgui/dapitype.hrc index efbabe64fa04..c7800ca66840 100644 --- a/sc/source/ui/dbgui/dapitype.hrc +++ b/sc/source/ui/dbgui/dapitype.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,29 +25,29 @@ * ************************************************************************/ -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 -#define BTN_SELECTION 4 -#define BTN_DATABASE 5 -#define BTN_EXTERNAL 6 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 3 +#define BTN_SELECTION 4 +#define BTN_DATABASE 5 +#define BTN_EXTERNAL 6 #define FL_FRAME 7 -#define FT_SERVICE 8 -#define LB_SERVICE 9 -#define FT_SOURCE 10 -#define ED_SOURCE 11 -#define FT_NAME 12 -#define ED_NAME 13 -#define FT_USER 14 -#define ED_USER 15 -#define FT_PASSWD 16 -#define ED_PASSWD 17 +#define FT_SERVICE 8 +#define LB_SERVICE 9 +#define FT_SOURCE 10 +#define ED_SOURCE 11 +#define FT_NAME 12 +#define ED_NAME 13 +#define FT_USER 14 +#define ED_USER 15 +#define FT_PASSWD 16 +#define ED_PASSWD 17 -#define FT_DATABASE 18 -#define LB_DATABASE 19 -#define FT_OBJECT 20 -#define CB_OBJECT 21 -#define FT_OBJTYPE 22 -#define LB_OBJTYPE 23 +#define FT_DATABASE 18 +#define LB_DATABASE 19 +#define FT_OBJECT 20 +#define CB_OBJECT 21 +#define FT_OBJTYPE 22 +#define LB_OBJTYPE 23 diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src index 5cf1dacad819..7453f4af4121 100644 --- a/sc/source/ui/dbgui/dapitype.src +++ b/sc/source/ui/dbgui/dapitype.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 1782e4245b1d..e9bd5a888cd6 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #include "scresid.hxx" #include "globstr.hrc" #include "dbnamdlg.hrc" -#include "rangenam.hxx" // IsNameValid +#include "rangenam.hxx" // IsNameValid #define _DBNAMDLG_CXX #include "dbnamdlg.hxx" @@ -51,12 +51,12 @@ //============================================================================ -#define ABS_SREF SCA_VALID \ +#define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE -#define ABS_DREF ABS_SREF \ +#define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D -#define ABS_DREF3D ABS_DREF | SCA_TAB_3D +#define ABS_SREF3D ABS_SREF | SCA_TAB_3D +#define ABS_DREF3D ABS_DREF | SCA_TAB_3D //---------------------------------------------------------------------------- @@ -68,7 +68,7 @@ static DBSaveData* pSaveObj = NULL; #define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute() //============================================================================ -// class DBSaveData +// class DBSaveData class DBSaveData { @@ -83,19 +83,19 @@ public: void Restore(); private: - Edit& rEdAssign; - CheckBox& rBtnHeader; - CheckBox& rBtnSize; - CheckBox& rBtnFormat; - CheckBox& rBtnStrip; - ScRange& rCurArea; - String aStr; - ScRange aArea; - BOOL bHeader:1; - BOOL bSize:1; - BOOL bFormat:1; - BOOL bStrip:1; - BOOL bDirty:1; + Edit& rEdAssign; + CheckBox& rBtnHeader; + CheckBox& rBtnSize; + CheckBox& rBtnFormat; + CheckBox& rBtnStrip; + ScRange& rCurArea; + String aStr; + ScRange aArea; + BOOL bHeader:1; + BOOL bSize:1; + BOOL bFormat:1; + BOOL bStrip:1; + BOOL bDirty:1; }; @@ -109,7 +109,7 @@ void DBSaveData::Save() bHeader = rBtnHeader.IsChecked(); bSize = rBtnSize.IsChecked(); bFormat = rBtnFormat.IsChecked(); - bStrip = rBtnStrip.IsChecked(); + bStrip = rBtnStrip.IsChecked(); bDirty = TRUE; } @@ -132,55 +132,55 @@ void DBSaveData::Restore() //============================================================================ -// class ScDbNameDlg +// class ScDbNameDlg //---------------------------------------------------------------------------- ScDbNameDlg::ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData ) + ScViewData* ptrViewData ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_DBNAMES ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_DBNAMES ), // aFlName ( this, ScResId( FL_NAME ) ), - aEdName ( this, ScResId( ED_NAME ) ), + aEdName ( this, ScResId( ED_NAME ) ), aFlAssign ( this, ScResId( FL_ASSIGN ) ), aEdAssign ( this, this, ScResId( ED_DBAREA ) ), - aRbAssign ( this, ScResId( RB_DBAREA ), &aEdAssign, this ), + aRbAssign ( this, ScResId( RB_DBAREA ), &aEdAssign, this ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), - aBtnHeader ( this, ScResId( BTN_HEADER ) ), - aBtnDoSize ( this, ScResId( BTN_SIZE ) ), - aBtnKeepFmt ( this, ScResId( BTN_FORMAT ) ), - aBtnStripData ( this, ScResId( BTN_STRIPDATA ) ), - aFTSource ( this, ScResId( FT_SOURCE ) ), - aFTOperations ( this, ScResId( FT_OPERATIONS ) ), - - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnAdd ( this, ScResId( BTN_ADD ) ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), - - aStrAdd ( ScResId( STR_ADD ) ), - aStrModify ( ScResId( STR_MODIFY ) ), - aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), - aStrInvalid ( ScResId( STR_DB_INVALID ) ), + aBtnHeader ( this, ScResId( BTN_HEADER ) ), + aBtnDoSize ( this, ScResId( BTN_SIZE ) ), + aBtnKeepFmt ( this, ScResId( BTN_FORMAT ) ), + aBtnStripData ( this, ScResId( BTN_STRIPDATA ) ), + aFTSource ( this, ScResId( FT_SOURCE ) ), + aFTOperations ( this, ScResId( FT_OPERATIONS ) ), + + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnAdd ( this, ScResId( BTN_ADD ) ), + aBtnRemove ( this, ScResId( BTN_REMOVE ) ), + aBtnMore ( this, ScResId( BTN_MORE ) ), + + aStrAdd ( ScResId( STR_ADD ) ), + aStrModify ( ScResId( STR_MODIFY ) ), + aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), + aStrInvalid ( ScResId( STR_DB_INVALID ) ), // - pViewData ( ptrViewData ), - pDoc ( ptrViewData->GetDocument() ), - bRefInputMode ( FALSE ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData->GetDocument() ), + bRefInputMode ( FALSE ), aAddrDetails ( pDoc->GetAddressConvention(), 0, 0 ), - aLocalDbCol ( *(pDoc->GetDBCollection()) ) + aLocalDbCol ( *(pDoc->GetDBCollection()) ) { // WB_NOLABEL can't be set in resource... aFTSource.SetStyle( aFTSource.GetStyle() | WB_NOLABEL ); aFTOperations.SetStyle( aFTOperations.GetStyle() | WB_NOLABEL ); - // damit die Strings in der Resource bei den FixedTexten bleiben koennen: - aStrSource = aFTSource.GetText(); - aStrOperations = aFTOperations.GetText(); + // damit die Strings in der Resource bei den FixedTexten bleiben koennen: + aStrSource = aFTSource.GetText(); + aStrOperations = aFTOperations.GetText(); pSaveObj = new DBSaveData( aEdAssign, aBtnHeader, aBtnDoSize, aBtnKeepFmt, aBtnStripData, theCurArea ); @@ -209,7 +209,7 @@ __EXPORT ScDbNameDlg::~ScDbNameDlg() void ScDbNameDlg::Init() { - aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen + aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen aBtnMore.AddWindow( &aFlOptions ); aBtnMore.AddWindow( &aBtnHeader ); @@ -219,29 +219,29 @@ void ScDbNameDlg::Init() aBtnMore.AddWindow( &aFTSource ); aBtnMore.AddWindow( &aFTOperations ); - String theAreaStr; - SCCOL nStartCol = 0; - SCROW nStartRow = 0; - SCTAB nStartTab = 0; - SCCOL nEndCol = 0; - SCROW nEndRow = 0; - SCTAB nEndTab = 0; - - aBtnOk.SetClickHdl ( LINK( this, ScDbNameDlg, OkBtnHdl ) ); - aBtnCancel.SetClickHdl ( LINK( this, ScDbNameDlg, CancelBtnHdl ) ); - aBtnAdd.SetClickHdl ( LINK( this, ScDbNameDlg, AddBtnHdl ) ); - aBtnRemove.SetClickHdl ( LINK( this, ScDbNameDlg, RemoveBtnHdl ) ); - aEdName.SetModifyHdl ( LINK( this, ScDbNameDlg, NameModifyHdl ) ); - aEdAssign.SetModifyHdl ( LINK( this, ScDbNameDlg, AssModifyHdl ) ); + String theAreaStr; + SCCOL nStartCol = 0; + SCROW nStartRow = 0; + SCTAB nStartTab = 0; + SCCOL nEndCol = 0; + SCROW nEndRow = 0; + SCTAB nEndTab = 0; + + aBtnOk.SetClickHdl ( LINK( this, ScDbNameDlg, OkBtnHdl ) ); + aBtnCancel.SetClickHdl ( LINK( this, ScDbNameDlg, CancelBtnHdl ) ); + aBtnAdd.SetClickHdl ( LINK( this, ScDbNameDlg, AddBtnHdl ) ); + aBtnRemove.SetClickHdl ( LINK( this, ScDbNameDlg, RemoveBtnHdl ) ); + aEdName.SetModifyHdl ( LINK( this, ScDbNameDlg, NameModifyHdl ) ); + aEdAssign.SetModifyHdl ( LINK( this, ScDbNameDlg, AssModifyHdl ) ); UpdateNames(); if ( pViewData && pDoc ) { - ScDBCollection* pDBColl = pDoc->GetDBCollection(); - ScDBData* pDBData = NULL; + ScDBCollection* pDBColl = pDoc->GetDBCollection(); + ScDBData* pDBData = NULL; pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab, - nEndCol, nEndRow, nEndTab ); + nEndCol, nEndRow, nEndTab ); theCurArea = ScRange( ScAddress( nStartCol, nStartRow, nStartTab ), ScAddress( nEndCol, nEndRow, nEndTab ) ); @@ -254,9 +254,9 @@ void ScDbNameDlg::Init() pDBData = pDBColl->GetDBAtCursor( nStartCol, nStartRow, nStartTab, TRUE ); if ( pDBData ) { - String theDbName; - ScAddress& rStart = theCurArea.aStart; - ScAddress& rEnd = theCurArea.aEnd; + String theDbName; + ScAddress& rStart = theCurArea.aStart; + ScAddress& rEnd = theCurArea.aEnd; SCCOL nCol1; SCCOL nCol2; SCROW nRow1; @@ -353,9 +353,9 @@ void ScDbNameDlg::SetActive() { aEdAssign.GrabFocus(); - // kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen - // (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder angezeigt) - // (der ausgewaehlte DB-Name hat sich auch nicht veraendert) + // kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen + // (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder angezeigt) + // (der ausgewaehlte DB-Name hat sich auch nicht veraendert) RefInputDone(); } @@ -364,7 +364,7 @@ void ScDbNameDlg::SetActive() void ScDbNameDlg::UpdateNames() { - USHORT nNameCount = aLocalDbCol.GetCount(); + USHORT nNameCount = aLocalDbCol.GetCount(); aEdName.SetUpdateMode( FALSE ); //----------------------------------------------------------- @@ -373,8 +373,8 @@ void ScDbNameDlg::UpdateNames() if ( nNameCount > 0 ) { - ScDBData* pDbData = NULL; - String aString; + ScDBData* pDbData = NULL; + String aString; for ( USHORT i=0; i<nNameCount; i++ ) { @@ -402,9 +402,9 @@ void ScDbNameDlg::UpdateNames() void ScDbNameDlg::UpdateDBData( const String& rStrName ) { - String theArea; - USHORT nAt; - ScDBData* pData; + String theArea; + USHORT nAt; + ScDBData* pData; aLocalDbCol.SearchName( rStrName, nAt ); pData = (ScDBData*)(aLocalDbCol.At( nAt )); @@ -413,13 +413,13 @@ void ScDbNameDlg::UpdateDBData( const String& rStrName ) { SCCOL nColStart = 0; SCROW nRowStart = 0; - SCCOL nColEnd = 0; - SCROW nRowEnd = 0; - SCTAB nTab = 0; + SCCOL nColEnd = 0; + SCROW nRowEnd = 0; + SCTAB nTab = 0; pData->GetArea( nTab, nColStart, nRowStart, nColEnd, nRowEnd ); theCurArea = ScRange( ScAddress( nColStart, nRowStart, nTab ), - ScAddress( nColEnd, nRowEnd, nTab ) ); + ScAddress( nColEnd, nRowEnd, nTab ) ); theCurArea.Format( theArea, ABS_DREF3D, pDoc, aAddrDetails ); aEdAssign.SetText( theArea ); aBtnAdd.SetText( aStrModify ); @@ -481,8 +481,8 @@ IMPL_LINK_INLINE_END( ScDbNameDlg, CancelBtnHdl, void *, EMPTYARG ) IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) { - String aNewName = aEdName.GetText(); - String aNewArea = aEdAssign.GetText(); + String aNewName = aEdName.GetText(); + String aNewArea = aEdAssign.GetText(); aNewName.EraseLeadingChars( ' ' ); aNewName.EraseTrailingChars( ' ' ); @@ -491,7 +491,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) { if ( ScRangeData::IsNameValid( aNewName, pDoc ) ) { - // weil jetzt editiert werden kann, muss erst geparst werden + // weil jetzt editiert werden kann, muss erst geparst werden ScRange aTmpRange; String aText = aEdAssign.GetText(); if ( aTmpRange.ParseAny( aText, pDoc, aAddrDetails ) & SCA_VALID ) @@ -506,7 +506,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) pOldEntry = aLocalDbCol[nFoundAt]; if (pOldEntry) { - // Bereich veraendern + // Bereich veraendern pOldEntry->MoveTo( aStart.Tab(), aStart.Col(), aStart.Row(), aEnd.Col(), aEnd.Row() ); @@ -518,7 +518,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) } else { - // neuen Bereich einfuegen + // neuen Bereich einfuegen ScDBData* pNewEntry = new ScDBData( aNewName, aStart.Tab(), aStart.Col(), aStart.Row(), @@ -540,11 +540,11 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) aBtnAdd.Disable(); aBtnRemove.Disable(); aEdAssign.SetText( EMPTY_STRING ); - aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen + aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen aBtnDoSize.Check( FALSE ); aBtnKeepFmt.Check( FALSE ); aBtnStripData.Check( FALSE ); - SetInfoStrings( NULL ); // leer + SetInfoStrings( NULL ); // leer theCurArea = ScRange(); bSaved=TRUE; pSaveObj->Save(); @@ -571,13 +571,13 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG ) { - USHORT nRemoveAt = 0; + USHORT nRemoveAt = 0; const String aStrEntry = aEdName.GetText(); if ( aLocalDbCol.SearchName( aStrEntry, nRemoveAt ) ) { String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY ); - String aMsg = aStrDelMsg.GetToken( 0, '#' ); + String aMsg = aStrDelMsg.GetToken( 0, '#' ); aMsg += aStrEntry; aMsg += aStrDelMsg.GetToken( 1, '#' ); @@ -607,11 +607,11 @@ IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG ) aBtnRemove.Disable(); aEdAssign.SetText( EMPTY_STRING ); theCurArea = ScRange(); - aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen + aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen aBtnDoSize.Check( FALSE ); aBtnKeepFmt.Check( FALSE ); aBtnStripData.Check( FALSE ); - SetInfoStrings( NULL ); // leer + SetInfoStrings( NULL ); // leer bSaved=FALSE; pSaveObj->Restore(); NameModifyHdl( 0 ); @@ -624,29 +624,29 @@ IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG ) IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG ) { - String theName = aEdName.GetText(); - BOOL bNameFound = (COMBOBOX_ENTRY_NOTFOUND + String theName = aEdName.GetText(); + BOOL bNameFound = (COMBOBOX_ENTRY_NOTFOUND != aEdName.GetEntryPos( theName )); if ( theName.Len() == 0 ) { if ( aBtnAdd.GetText() != aStrAdd ) aBtnAdd.SetText( aStrAdd ); - aBtnAdd .Disable(); - aBtnRemove .Disable(); + aBtnAdd .Disable(); + aBtnRemove .Disable(); aFlAssign .Disable(); - aBtnHeader .Disable(); - aBtnDoSize .Disable(); - aBtnKeepFmt .Disable(); + aBtnHeader .Disable(); + aBtnDoSize .Disable(); + aBtnKeepFmt .Disable(); aBtnStripData.Disable(); - aFTSource .Disable(); + aFTSource .Disable(); aFTOperations.Disable(); - aEdAssign .Disable(); - aRbAssign .Disable(); + aEdAssign .Disable(); + aRbAssign .Disable(); //bSaved=FALSE; //pSaveObj->Restore(); //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg bRefInputMode = FALSE; } else @@ -709,7 +709,7 @@ IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG ) IMPL_LINK( ScDbNameDlg, AssModifyHdl, void *, EMPTYARG ) { - // hier parsen fuer Save() etc. + // hier parsen fuer Save() etc. ScRange aTmpRange; String aText = aEdAssign.GetText(); diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index e665b215c0e9..d206783c358a 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/dpgroupdlg.hrc b/sc/source/ui/dbgui/dpgroupdlg.hrc index 5a4797489ddf..a75edbb32345 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.hrc +++ b/sc/source/ui/dbgui/dpgroupdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/dpgroupdlg.src b/sc/source/ui/dbgui/dpgroupdlg.src index f9a5ac589af5..ba2aaec3edc1 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.src +++ b/sc/source/ui/dbgui/dpgroupdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/expftext.cxx b/sc/source/ui/dbgui/expftext.cxx index b05d9c193638..01a66100d226 100644 --- a/sc/source/ui/dbgui/expftext.cxx +++ b/sc/source/ui/dbgui/expftext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,16 +35,16 @@ #include <vcl/help.hxx> /************************************************************************* -#* Member: ScExpandedFixedText Datum:18.09.97 +#* Member: ScExpandedFixedText Datum:18.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: MD_Test +#* Klasse: MD_Test #* -#* Funktion: Konstruktor der Klasse SvxCtrDial +#* Funktion: Konstruktor der Klasse SvxCtrDial #* -#* Input: Parent- Window, Resource ID +#* Input: Parent- Window, Resource ID #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -56,25 +56,25 @@ ScExpandedFixedText::ScExpandedFixedText( Window* pParent, } /************************************************************************* -#* Member: RequestHelp Datum:18.09.97 +#* Member: RequestHelp Datum:18.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScExpandedFixedText +#* Klasse: ScExpandedFixedText #* -#* Funktion: Die Methode wird gerufen, um Hilfe fuer das Fenster -#* anzuzeigen. Zeigt das Fenster einen gekuerzten Text -#* an, so wird selbiger in voller Laenge angezeigt. +#* Funktion: Die Methode wird gerufen, um Hilfe fuer das Fenster +#* anzuzeigen. Zeigt das Fenster einen gekuerzten Text +#* an, so wird selbiger in voller Laenge angezeigt. #* -#* Input: HelpEvent +#* Input: HelpEvent #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ScExpandedFixedText::RequestHelp(const HelpEvent& rEvt) { - String aTxtStr = GetText(); - long nTxtWidth = GetTextWidth(aTxtStr); + String aTxtStr = GetText(); + long nTxtWidth = GetTextWidth(aTxtStr); if ( ( rEvt.GetMode() & HELPMODE_QUICK ) == HELPMODE_QUICK && nTxtWidth > GetSizePixel().Width()) { diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index 8c181959f049..2aa99870587f 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -275,14 +275,14 @@ void ScDPFieldWindow::DrawField( void ScDPFieldWindow::Redraw() { - VirtualDevice aVirDev; + VirtualDevice aVirDev; // #i97623# VirtualDevice is always LTR while other windows derive direction from parent aVirDev.EnableRTL( IsRTLEnabled() ); aVirDev.SetMapMode( MAP_PIXEL ); - Point aPos0; - Size aSize( GetSizePixel() ); - Font aFont( GetFont() ); // Font vom Window + Point aPos0; + Size aSize( GetSizePixel() ); + Font aFont( GetFont() ); // Font vom Window aFont.SetTransparent( TRUE ); aVirDev.SetFont( aFont ); aVirDev.SetOutputSizePixel( aSize ); diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index b95535f91717..d33a6743111b 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,41 +58,41 @@ // DEFINE -------------------------------------------------------------------- -#define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \ +#define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString(rid) ).Execute() //============================================================================ -// class ScFilterDlg +// class ScFilterDlg //---------------------------------------------------------------------------- ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ) + const SfxItemSet& rArgSet ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_FILTER ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_FILTER ), // aFlCriteria ( this, ScResId( FL_CRITERIA ) ), - aLbConnect1 ( this, ScResId( LB_OP1 ) ), - aLbField1 ( this, ScResId( LB_FIELD1 ) ), - aLbCond1 ( this, ScResId( LB_COND1 ) ), - aEdVal1 ( this, ScResId( ED_VAL1 ) ), - aLbConnect2 ( this, ScResId( LB_OP2 ) ), - aLbField2 ( this, ScResId( LB_FIELD2 ) ), - aLbCond2 ( this, ScResId( LB_COND2 ) ), - aEdVal2 ( this, ScResId( ED_VAL2 ) ), - aLbConnect3 ( this, ScResId( LB_OP3 ) ), - aLbField3 ( this, ScResId( LB_FIELD3 ) ), - aLbCond3 ( this, ScResId( LB_COND3 ) ), - aEdVal3 ( this, ScResId( ED_VAL3 ) ), - aLbConnect4 ( this, ScResId( LB_OP4 ) ), - aLbField4 ( this, ScResId( LB_FIELD4 ) ), - aLbCond4 ( this, ScResId( LB_COND4 ) ), - aEdVal4 ( this, ScResId( ED_VAL4 ) ), - aFtConnect ( this, ScResId( FT_OP ) ), - aFtField ( this, ScResId( FT_FIELD ) ), - aFtCond ( this, ScResId( FT_COND ) ), - aFtVal ( this, ScResId( FT_VAL ) ), + aLbConnect1 ( this, ScResId( LB_OP1 ) ), + aLbField1 ( this, ScResId( LB_FIELD1 ) ), + aLbCond1 ( this, ScResId( LB_COND1 ) ), + aEdVal1 ( this, ScResId( ED_VAL1 ) ), + aLbConnect2 ( this, ScResId( LB_OP2 ) ), + aLbField2 ( this, ScResId( LB_FIELD2 ) ), + aLbCond2 ( this, ScResId( LB_COND2 ) ), + aEdVal2 ( this, ScResId( ED_VAL2 ) ), + aLbConnect3 ( this, ScResId( LB_OP3 ) ), + aLbField3 ( this, ScResId( LB_FIELD3 ) ), + aLbCond3 ( this, ScResId( LB_COND3 ) ), + aEdVal3 ( this, ScResId( ED_VAL3 ) ), + aLbConnect4 ( this, ScResId( LB_OP4 ) ), + aLbField4 ( this, ScResId( LB_FIELD4 ) ), + aLbCond4 ( this, ScResId( LB_COND4 ) ), + aEdVal4 ( this, ScResId( ED_VAL4 ) ), + aFtConnect ( this, ScResId( FT_OP ) ), + aFtField ( this, ScResId( FT_FIELD ) ), + aFtCond ( this, ScResId( FT_COND ) ), + aFtVal ( this, ScResId( FT_VAL ) ), aFlSeparator ( this, ScResId( FL_SEPARATOR ) ), aScrollBar ( this, ScResId( LB_SCROLL ) ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), @@ -101,28 +101,28 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), _INIT_COMMON_FILTER_RSCOBJS - aStrEmpty ( ScResId( SCSTR_EMPTY ) ), - aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ), - aStrRow ( ScResId( SCSTR_ROW ) ), - aStrColumn ( ScResId( SCSTR_COLUMN ) ), + aStrEmpty ( ScResId( SCSTR_EMPTY ) ), + aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ), + aStrRow ( ScResId( SCSTR_ROW ) ), + aStrColumn ( ScResId( SCSTR_COLUMN ) ), // - pOptionsMgr ( NULL ), - nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), - theQueryData ( ((const ScQueryItem&) + pOptionsMgr ( NULL ), + nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), + theQueryData ( ((const ScQueryItem&) rArgSet.Get( nWhichQuery )).GetQueryData() ), - pOutItem ( NULL ), - pViewData ( NULL ), - pDoc ( NULL ), - nSrcTab ( 0 ), - nFieldCount ( 0 ), - bRefInputMode ( FALSE ), - pTimer ( NULL ) + pOutItem ( NULL ), + pViewData ( NULL ), + pDoc ( NULL ), + nSrcTab ( 0 ), + nFieldCount ( 0 ), + bRefInputMode ( FALSE ), + pTimer ( NULL ) { for (USHORT i=0; i<=MAXCOL; i++) pEntryLists[i] = NULL; for (SCSIZE i=0;i<MAXQUERY;i++) { - bRefreshExceptQuery[i]=FALSE; + bRefreshExceptQuery[i]=FALSE; } aBtnMore.SetMoreText( String(ScResId( SCSTR_MOREBTN_MOREOPTIONS )) ); aBtnMore.SetLessText( String(ScResId( SCSTR_MOREBTN_FEWEROPTIONS )) ); @@ -159,16 +159,16 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) const ScQueryItem& rQueryItem = (const ScQueryItem&) rArgSet.Get( nWhichQuery ); - aBtnOk.SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) ); - aBtnCancel.SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) ); - aBtnMore.SetClickHdl ( LINK( this, ScFilterDlg, MoreClickHdl ) ); - aBtnHeader.SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) ); - aBtnCase.SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) ); + aBtnOk.SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) ); + aBtnCancel.SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) ); + aBtnMore.SetClickHdl ( LINK( this, ScFilterDlg, MoreClickHdl ) ); + aBtnHeader.SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) ); + aBtnCase.SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) ); // - aLbField1.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); - aLbField2.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); - aLbField3.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); - aLbField4.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); + aLbField1.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); + aLbField2.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); + aLbField3.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); + aLbField4.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); aLbConnect1.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); aLbConnect2.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); aLbConnect3.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); @@ -179,23 +179,23 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) aLbCond3.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); aLbCond4.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); - pViewData = rQueryItem.GetViewData(); - pDoc = pViewData ? pViewData->GetDocument() : NULL; - nSrcTab = pViewData ? pViewData->GetTabNo() : static_cast<SCTAB>(0); + pViewData = rQueryItem.GetViewData(); + pDoc = pViewData ? pViewData->GetDocument() : NULL; + nSrcTab = pViewData ? pViewData->GetTabNo() : static_cast<SCTAB>(0); // fuer leichteren Zugriff: - aFieldLbArr [0] = &aLbField1; - aFieldLbArr [1] = &aLbField2; - aFieldLbArr [2] = &aLbField3; - aFieldLbArr [3] = &aLbField4; - aValueEdArr [0] = &aEdVal1; - aValueEdArr [1] = &aEdVal2; - aValueEdArr [2] = &aEdVal3; - aValueEdArr [3] = &aEdVal4; - aCondLbArr [0] = &aLbCond1; - aCondLbArr [1] = &aLbCond2; - aCondLbArr [2] = &aLbCond3; - aCondLbArr [3] = &aLbCond4; + aFieldLbArr [0] = &aLbField1; + aFieldLbArr [1] = &aLbField2; + aFieldLbArr [2] = &aLbField3; + aFieldLbArr [3] = &aLbField4; + aValueEdArr [0] = &aEdVal1; + aValueEdArr [1] = &aEdVal2; + aValueEdArr [2] = &aEdVal3; + aValueEdArr [3] = &aEdVal4; + aCondLbArr [0] = &aLbCond1; + aCondLbArr [1] = &aLbCond2; + aCondLbArr [2] = &aLbCond3; + aCondLbArr [3] = &aLbCond4; aConnLbArr [0] = &aLbConnect1; aConnLbArr [1] = &aLbConnect2; aConnLbArr [2] = &aLbConnect3; @@ -203,7 +203,7 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) // Optionen initialisieren lassen: - pOptionsMgr = new ScFilterOptionsMgr( + pOptionsMgr = new ScFilterOptionsMgr( this, pViewData, theQueryData, @@ -229,14 +229,14 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) for ( SCSIZE i=0; i<4; i++ ) { - String aValStr; - USHORT nCondPos = 0; - USHORT nFieldSelPos = 0; + String aValStr; + USHORT nCondPos = 0; + USHORT nFieldSelPos = 0; ScQueryEntry& rEntry = theQueryData.GetEntry(i); if ( rEntry.bDoQuery ) { - nCondPos = (USHORT)rEntry.eOp; + nCondPos = (USHORT)rEntry.eOp; nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) ); if ( rEntry.nVal == SC_EMPTYFIELDS && !rEntry.bQueryByString && *rEntry.pStr == EMPTY_STRING ) { @@ -272,31 +272,31 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) aScrollBar.SetRange( Range( 0, 4 ) ); aScrollBar.SetLineSize( 1 ); - aLbConnect1.Hide(); + aLbConnect1.Hide(); // Disable/Enable Logik: (aLbField1.GetSelectEntryPos() != 0) && (aLbField2.GetSelectEntryPos() != 0) - ? aLbConnect2.SelectEntryPos( (USHORT)theQueryData.GetEntry(1).eConnect ) + ? aLbConnect2.SelectEntryPos( (USHORT)theQueryData.GetEntry(1).eConnect ) : aLbConnect2.SetNoSelection(); (aLbField2.GetSelectEntryPos() != 0) && (aLbField3.GetSelectEntryPos() != 0) - ? aLbConnect3.SelectEntryPos( (USHORT)theQueryData.GetEntry(2).eConnect ) + ? aLbConnect3.SelectEntryPos( (USHORT)theQueryData.GetEntry(2).eConnect ) : aLbConnect3.SetNoSelection(); (aLbField3.GetSelectEntryPos() != 0) && (aLbField4.GetSelectEntryPos() != 0) - ? aLbConnect4.SelectEntryPos( (USHORT)theQueryData.GetEntry(3).eConnect ) + ? aLbConnect4.SelectEntryPos( (USHORT)theQueryData.GetEntry(3).eConnect ) : aLbConnect4.SetNoSelection(); if ( aLbField1.GetSelectEntryPos() == 0 ) { - aLbConnect2.Disable(); + aLbConnect2.Disable(); aLbField2.Disable(); aLbCond2.Disable(); aEdVal2.Disable(); } - else if ( aLbConnect2.GetSelectEntryCount() == 0 ) + else if ( aLbConnect2.GetSelectEntryCount() == 0 ) { aLbField2.Disable(); aLbCond2.Disable(); @@ -305,12 +305,12 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) if ( aLbField2.GetSelectEntryPos() == 0 ) { - aLbConnect3.Disable(); + aLbConnect3.Disable(); aLbField3.Disable(); aLbCond3.Disable(); aEdVal3.Disable(); } - else if ( aLbConnect3.GetSelectEntryCount() == 0 ) + else if ( aLbConnect3.GetSelectEntryCount() == 0 ) { aLbField3.Disable(); aLbCond3.Disable(); @@ -318,12 +318,12 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) } if ( aLbField3.GetSelectEntryPos() == 0 ) { - aLbConnect4.Disable(); + aLbConnect4.Disable(); aLbField4.Disable(); aLbCond4.Disable(); aEdVal4.Disable(); } - else if ( aLbConnect4.GetSelectEntryCount() == 0 ) + else if ( aLbConnect4.GetSelectEntryCount() == 0 ) { aLbField4.Disable(); aLbCond4.Disable(); @@ -333,9 +333,9 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) if(pDoc!=NULL && pDoc->GetChangeTrack()!=NULL) aBtnCopyResult.Disable(); // Modal-Modus einschalten -// SetDispatcherLock( TRUE ); +// SetDispatcherLock( TRUE ); //@BugID 54702 Enablen/Disablen nur noch in Basisklasse -// SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg +// SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg } @@ -356,7 +356,7 @@ BOOL __EXPORT ScFilterDlg::Close() void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { - if ( bRefInputMode ) // Nur moeglich, wenn im Referenz-Editmodus + if ( bRefInputMode ) // Nur moeglich, wenn im Referenz-Editmodus { if ( rRef.aStart != rRef.aEnd ) RefInputStart( &aEdCopyArea ); @@ -398,13 +398,13 @@ void ScFilterDlg::FillFieldLists() if ( pDoc ) { - String aFieldName; - SCTAB nTab = nSrcTab; - SCCOL nFirstCol = theQueryData.nCol1; - SCROW nFirstRow = theQueryData.nRow1; - SCCOL nMaxCol = theQueryData.nCol2; - SCCOL col = 0; - USHORT i=1; + String aFieldName; + SCTAB nTab = nSrcTab; + SCCOL nFirstCol = theQueryData.nCol1; + SCROW nFirstRow = theQueryData.nRow1; + SCCOL nMaxCol = theQueryData.nCol2; + SCCOL col = 0; + USHORT i=1; for ( col=nFirstCol; col<=nMaxCol; col++ ) { @@ -432,10 +432,10 @@ void ScFilterDlg::UpdateValueList( USHORT nList ) { if ( pDoc && nList>0 && nList<=4 ) { - ComboBox* pValList = aValueEdArr[nList-1]; - USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos(); - USHORT nListPos = 0; - String aCurValue = pValList->GetText(); + ComboBox* pValList = aValueEdArr[nList-1]; + USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos(); + USHORT nListPos = 0; + String aCurValue = pValList->GetText(); pValList->Clear(); pValList->InsertEntry( aStrNotEmpty, 0 ); @@ -444,26 +444,26 @@ void ScFilterDlg::UpdateValueList( USHORT nList ) if ( nFieldSelPos ) { - WaitObject aWaiter( this ); // auch wenn nur die ListBox gefuellt wird + WaitObject aWaiter( this ); // auch wenn nur die ListBox gefuellt wird SCCOL nColumn = theQueryData.nCol1 + static_cast<SCCOL>(nFieldSelPos) - 1; if (!pEntryLists[nColumn]) { USHORT nOffset = GetSliderPos(); - SCTAB nTab = nSrcTab; + SCTAB nTab = nSrcTab; SCROW nFirstRow = theQueryData.nRow1; SCROW nLastRow = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2; mbHasDates[nOffset+nList-1] = false; - // erstmal ohne die erste Zeile + // erstmal ohne die erste Zeile pEntryLists[nColumn] = new TypedScStrCollection( 128, 128 ); pEntryLists[nColumn]->SetCaseSensitive( aBtnCase.IsChecked() ); pDoc->GetFilterEntriesArea( nColumn, nFirstRow+1, nLastRow, nTab, *pEntryLists[nColumn], mbHasDates[nOffset+nList-1] ); - // Eintrag fuer die erste Zeile - //! Eintrag (pHdrEntry) ohne Collection erzeugen? + // Eintrag fuer die erste Zeile + //! Eintrag (pHdrEntry) ohne Collection erzeugen? nHeaderPos[nColumn] = USHRT_MAX; TypedScStrCollection aHdrColl( 1, 1 ); @@ -481,7 +481,7 @@ void ScFilterDlg::UpdateValueList( USHORT nList ) "Header-Eintrag nicht wiedergefunden" ); } else - delete pNewEntry; // war schon drin + delete pNewEntry; // war schon drin } } @@ -505,7 +505,7 @@ void ScFilterDlg::UpdateValueList( USHORT nList ) void ScFilterDlg::UpdateHdrInValueList( USHORT nList ) { - //! GetText / SetText ?? + //! GetText / SetText ?? if ( pDoc && nList>0 && nList<=4 ) { @@ -519,7 +519,7 @@ void ScFilterDlg::UpdateHdrInValueList( USHORT nList ) if ( nPos != USHRT_MAX ) { ComboBox* pValList = aValueEdArr[nList-1]; - USHORT nListPos = nPos + 2; // nach "leer" und "nicht leer" + USHORT nListPos = nPos + 2; // nach "leer" und "nicht leer" TypedStrData* pHdrEntry = (*pEntryLists[nColumn])[nPos]; if ( pHdrEntry ) @@ -528,12 +528,12 @@ void ScFilterDlg::UpdateHdrInValueList( USHORT nList ) BOOL bWasThere = ( pValList->GetEntry(nListPos) == aHdrStr ); BOOL bInclude = !aBtnHeader.IsChecked(); - if (bInclude) // Eintrag aufnehmen + if (bInclude) // Eintrag aufnehmen { if (!bWasThere) pValList->InsertEntry(aHdrStr, nListPos); } - else // Eintrag weglassen + else // Eintrag weglassen { if (bWasThere) pValList->RemoveEntry(nListPos); @@ -582,8 +582,8 @@ USHORT ScFilterDlg::GetFieldSelPos( SCCOL nField ) ScQueryItem* ScFilterDlg::GetOutputItem() { - ScAddress theCopyPos; - ScQueryParam theParam( theQueryData ); + ScAddress theCopyPos; + ScQueryParam theParam( theQueryData ); BOOL bCopyPosOk = FALSE; if ( aBtnCopyResult.IsChecked() ) @@ -601,26 +601,26 @@ ScQueryItem* ScFilterDlg::GetOutputItem() if ( aBtnCopyResult.IsChecked() && bCopyPosOk ) { theParam.bInplace = FALSE; - theParam.nDestTab = theCopyPos.Tab(); - theParam.nDestCol = theCopyPos.Col(); - theParam.nDestRow = theCopyPos.Row(); + theParam.nDestTab = theCopyPos.Tab(); + theParam.nDestCol = theCopyPos.Col(); + theParam.nDestRow = theCopyPos.Row(); } else { theParam.bInplace = TRUE; - theParam.nDestTab = 0; - theParam.nDestCol = 0; - theParam.nDestRow = 0; + theParam.nDestTab = 0; + theParam.nDestCol = 0; + theParam.nDestRow = 0; } - theParam.bHasHeader = aBtnHeader.IsChecked(); - theParam.bByRow = TRUE; - theParam.bDuplicate = !aBtnUnique.IsChecked(); - theParam.bCaseSens = aBtnCase.IsChecked(); - theParam.bRegExp = aBtnRegExp.IsChecked(); - theParam.bDestPers = aBtnDestPers.IsChecked(); + theParam.bHasHeader = aBtnHeader.IsChecked(); + theParam.bByRow = TRUE; + theParam.bDuplicate = !aBtnUnique.IsChecked(); + theParam.bCaseSens = aBtnCase.IsChecked(); + theParam.bRegExp = aBtnRegExp.IsChecked(); + theParam.bDestPers = aBtnDestPers.IsChecked(); - // nur die drei eingestellten - alles andere zuruecksetzen + // nur die drei eingestellten - alles andere zuruecksetzen DELETEZ( pOutItem ); pOutItem = new ScQueryItem( nWhichQuery, &theParam ); @@ -690,7 +690,7 @@ IMPL_LINK( ScFilterDlg, MoreClickHdl, MoreButton*, EMPTYARG ) pTimer->Stop(); bRefInputMode = FALSE; //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg } return 0; } @@ -728,7 +728,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) aLbCond1.Enable(); aEdVal1.Enable(); - USHORT nConnect1 = aLbConnect1.GetSelectEntryPos(); + USHORT nConnect1 = aLbConnect1.GetSelectEntryPos(); USHORT nQE = nOffset; theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect1; bRefreshExceptQuery[nQE]=TRUE; @@ -740,7 +740,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) aLbCond2.Enable(); aEdVal2.Enable(); - USHORT nConnect2 = aLbConnect2.GetSelectEntryPos(); + USHORT nConnect2 = aLbConnect2.GetSelectEntryPos(); USHORT nQE = 1+nOffset; theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect2; bRefreshExceptQuery[nQE]=TRUE; @@ -751,7 +751,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) aLbCond3.Enable(); aEdVal3.Enable(); - USHORT nConnect3 = aLbConnect3.GetSelectEntryPos(); + USHORT nConnect3 = aLbConnect3.GetSelectEntryPos(); USHORT nQE = 2+nOffset; theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect3; bRefreshExceptQuery[nQE]=TRUE; @@ -763,7 +763,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) aLbCond4.Enable(); aEdVal4.Enable(); - USHORT nConnect4 = aLbConnect4.GetSelectEntryPos(); + USHORT nConnect4 = aLbConnect4.GetSelectEntryPos(); USHORT nQE = 3+nOffset; theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect4; bRefreshExceptQuery[nQE]=TRUE; @@ -802,7 +802,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) for (USHORT i= nOffset; i< MAXQUERY; i++) { theQueryData.GetEntry(i).bDoQuery = FALSE; - bRefreshExceptQuery[i]=FALSE; + bRefreshExceptQuery[i]=FALSE; theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0); } bRefreshExceptQuery[nOffset] =TRUE; @@ -815,7 +815,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) aLbConnect2.Enable(); } theQueryData.GetEntry(nOffset).bDoQuery = TRUE; - USHORT nField = pLb->GetSelectEntryPos(); + USHORT nField = pLb->GetSelectEntryPos(); theQueryData.GetEntry(nOffset).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; } } @@ -846,10 +846,10 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) for (USHORT i= nTemp; i< MAXQUERY; i++) { theQueryData.GetEntry(i).bDoQuery = FALSE; - bRefreshExceptQuery[i]=FALSE; + bRefreshExceptQuery[i]=FALSE; theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0); } - bRefreshExceptQuery[nTemp]=TRUE; + bRefreshExceptQuery[nTemp]=TRUE; } else { @@ -858,7 +858,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) { aLbConnect3.Enable(); } - USHORT nField = pLb->GetSelectEntryPos(); + USHORT nField = pLb->GetSelectEntryPos(); USHORT nQ=1+nOffset; theQueryData.GetEntry(nQ).bDoQuery = TRUE; theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; @@ -883,10 +883,10 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) for (USHORT i= nTemp; i< MAXQUERY; i++) { theQueryData.GetEntry(i).bDoQuery = FALSE; - bRefreshExceptQuery[i]=FALSE; + bRefreshExceptQuery[i]=FALSE; theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0); } - bRefreshExceptQuery[nTemp]=TRUE; + bRefreshExceptQuery[nTemp]=TRUE; } else { @@ -895,8 +895,8 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) { aLbConnect4.Enable(); } - - USHORT nField = pLb->GetSelectEntryPos(); + + USHORT nField = pLb->GetSelectEntryPos(); USHORT nQ=2+nOffset; theQueryData.GetEntry(nQ).bDoQuery = TRUE; theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; @@ -912,15 +912,15 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) for (USHORT i= nTemp; i< MAXQUERY; i++) { theQueryData.GetEntry(i).bDoQuery = FALSE; - bRefreshExceptQuery[i]=FALSE; + bRefreshExceptQuery[i]=FALSE; theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0); } - bRefreshExceptQuery[nTemp]=TRUE; + bRefreshExceptQuery[nTemp]=TRUE; } else { UpdateValueList( 4 ); - USHORT nField = pLb->GetSelectEntryPos(); + USHORT nField = pLb->GetSelectEntryPos(); USHORT nQ=3+nOffset; theQueryData.GetEntry(nQ).bDoQuery = TRUE; theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; @@ -941,7 +941,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) USHORT nQ=2+nOffset; theQueryData.GetEntry(nQ).eOp=(ScQueryOp)pLb->GetSelectEntryPos(); } - else + else { USHORT nQ=3+nOffset; theQueryData.GetEntry(nQ).eOp=(ScQueryOp)pLb->GetSelectEntryPos(); @@ -955,13 +955,13 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { - // Spaltenkoepfe: - // FeldListen: Spaltexx <-> Spaltenkopf-String - // WertListen: Spaltenkopf-Wert entfaellt. - // Gross-/Kleinschreibung: - // WertListen: komplett neu + // Spaltenkoepfe: + // FeldListen: Spaltexx <-> Spaltenkopf-String + // WertListen: Spaltenkopf-Wert entfaellt. + // Gross-/Kleinschreibung: + // WertListen: komplett neu - if ( pBox == &aBtnHeader ) // Feldlisten und Wertlisten + if ( pBox == &aBtnHeader ) // Feldlisten und Wertlisten { USHORT nCurSel1 = aLbField1.GetSelectEntryPos(); USHORT nCurSel2 = aLbField2.GetSelectEntryPos(); @@ -979,12 +979,12 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) UpdateHdrInValueList( 4 ); } - if ( pBox == &aBtnCase ) // Wertlisten komplett + if ( pBox == &aBtnCase ) // Wertlisten komplett { for (USHORT i=0; i<=MAXCOL; i++) DELETEZ( pEntryLists[i] ); - UpdateValueList( 1 ); // aktueller Text wird gemerkt + UpdateValueList( 1 ); // aktueller Text wird gemerkt UpdateValueList( 2 ); UpdateValueList( 3 ); UpdateValueList( 4 ); @@ -1003,9 +1003,9 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) USHORT nQE =i + nOffset; if ( pEd ) { - String aStrVal = pEd->GetText(); - ListBox* pLbCond = &aLbCond1; - ListBox* pLbField = &aLbField1; + String aStrVal = pEd->GetText(); + ListBox* pLbCond = &aLbCond1; + ListBox* pLbField = &aLbField1; if ( pEd == &aEdVal2 ) { pLbCond = &aLbCond2; @@ -1056,21 +1056,21 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) } else { - *rEntry.pStr = aStrVal; - rEntry.nVal = 0; + *rEntry.pStr = aStrVal; + rEntry.nVal = 0; rEntry.bQueryByString = TRUE; } - USHORT nField = pLbField->GetSelectEntryPos(); + USHORT nField = pLbField->GetSelectEntryPos(); rEntry.nField = nField ? (theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0); - + ScQueryOp eOp = (ScQueryOp)pLbCond->GetSelectEntryPos(); - rEntry.eOp = eOp; + rEntry.eOp = eOp; rEntry.bQueryByDate = mbHasDates[nQE]; } - } + } return 0; } @@ -1091,23 +1091,23 @@ USHORT ScFilterDlg::GetSliderPos() return (USHORT) aScrollBar.GetThumbPos(); } void ScFilterDlg::RefreshEditRow( USHORT nOffset ) -{ - if (nOffset==0) +{ + if (nOffset==0) aConnLbArr[0]->Hide(); else - aConnLbArr[0]->Show(); + aConnLbArr[0]->Show(); for ( USHORT i=0; i<4; i++ ) { - String aValStr; - USHORT nCondPos = 0; - USHORT nFieldSelPos = 0; + String aValStr; + USHORT nCondPos = 0; + USHORT nFieldSelPos = 0; USHORT nQE = i+nOffset; ScQueryEntry& rEntry = theQueryData.GetEntry( nQE); if ( rEntry.bDoQuery || bRefreshExceptQuery[nQE] ) { - nCondPos = (USHORT)rEntry.eOp; + nCondPos = (USHORT)rEntry.eOp; if(rEntry.bDoQuery) nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) ); @@ -1156,9 +1156,9 @@ void ScFilterDlg::RefreshEditRow( USHORT nOffset ) else aConnLbArr[i]->SetNoSelection(); } - + } - else + else { if (nOffset==0) { @@ -1166,7 +1166,7 @@ void ScFilterDlg::RefreshEditRow( USHORT nOffset ) { aConnLbArr[i+1]->SetNoSelection(); aConnLbArr[i+1]->Disable(); - } + } } else { @@ -1179,7 +1179,7 @@ void ScFilterDlg::RefreshEditRow( USHORT nOffset ) aFieldLbArr[i]->Disable(); aCondLbArr[i]->Disable(); aValueEdArr[i]->Disable(); - } + } aFieldLbArr[i]->SelectEntryPos( nFieldSelPos ); aCondLbArr [i]->SelectEntryPos( nCondPos ); aValueEdArr[i]->SetText( aValStr ); diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index d6b331494667..894e1ae80bd9 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,44 +52,44 @@ //---------------------------------------------------------------------------- ScFilterOptionsMgr::ScFilterOptionsMgr( - Dialog* ptrDlg, - ScViewData* ptrViewData, - const ScQueryParam& refQueryData, - MoreButton& refBtnMore, - CheckBox& refBtnCase, - CheckBox& refBtnRegExp, - CheckBox& refBtnHeader, - CheckBox& refBtnUnique, - CheckBox& refBtnCopyResult, - CheckBox& refBtnDestPers, - ListBox& refLbCopyArea, - Edit& refEdCopyArea, - formula::RefButton& refRbCopyArea, - FixedText& refFtDbAreaLabel, - FixedInfo& refFtDbArea, + Dialog* ptrDlg, + ScViewData* ptrViewData, + const ScQueryParam& refQueryData, + MoreButton& refBtnMore, + CheckBox& refBtnCase, + CheckBox& refBtnRegExp, + CheckBox& refBtnHeader, + CheckBox& refBtnUnique, + CheckBox& refBtnCopyResult, + CheckBox& refBtnDestPers, + ListBox& refLbCopyArea, + Edit& refEdCopyArea, + formula::RefButton& refRbCopyArea, + FixedText& refFtDbAreaLabel, + FixedInfo& refFtDbArea, FixedLine& refFlOptions, - const String& refStrNoName, - const String& refStrUndefined ) - - : pDlg ( ptrDlg ), - pViewData ( ptrViewData ), - pDoc ( ptrViewData ? ptrViewData->GetDocument() : NULL ), - rBtnMore ( refBtnMore ), - rBtnCase ( refBtnCase ), - rBtnRegExp ( refBtnRegExp ), - rBtnHeader ( refBtnHeader ), - rBtnUnique ( refBtnUnique ), - rBtnCopyResult ( refBtnCopyResult ), - rBtnDestPers ( refBtnDestPers ), - rLbCopyPos ( refLbCopyArea ), - rEdCopyPos ( refEdCopyArea ), - rRbCopyPos ( refRbCopyArea ), - rFtDbAreaLabel ( refFtDbAreaLabel ), - rFtDbArea ( refFtDbArea ), + const String& refStrNoName, + const String& refStrUndefined ) + + : pDlg ( ptrDlg ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData ? ptrViewData->GetDocument() : NULL ), + rBtnMore ( refBtnMore ), + rBtnCase ( refBtnCase ), + rBtnRegExp ( refBtnRegExp ), + rBtnHeader ( refBtnHeader ), + rBtnUnique ( refBtnUnique ), + rBtnCopyResult ( refBtnCopyResult ), + rBtnDestPers ( refBtnDestPers ), + rLbCopyPos ( refLbCopyArea ), + rEdCopyPos ( refEdCopyArea ), + rRbCopyPos ( refRbCopyArea ), + rFtDbAreaLabel ( refFtDbAreaLabel ), + rFtDbArea ( refFtDbArea ), rFlOptions ( refFlOptions ), - rStrNoName ( refStrNoName ), - rStrUndefined ( refStrUndefined ), - rQueryData ( refQueryData ) + rStrNoName ( refStrNoName ), + rStrUndefined ( refStrUndefined ), + rQueryData ( refQueryData ) { Init(); } @@ -113,8 +113,8 @@ void ScFilterOptionsMgr::Init() { DBG_ASSERT( pViewData && pDoc, "Init failed :-/" ); - rLbCopyPos.SetSelectHdl ( LINK( this, ScFilterOptionsMgr, LbPosSelHdl ) ); - rEdCopyPos.SetModifyHdl ( LINK( this, ScFilterOptionsMgr, EdPosModifyHdl ) ); + rLbCopyPos.SetSelectHdl ( LINK( this, ScFilterOptionsMgr, LbPosSelHdl ) ); + rEdCopyPos.SetModifyHdl ( LINK( this, ScFilterOptionsMgr, EdPosModifyHdl ) ); rBtnCopyResult.SetClickHdl( LINK( this, ScFilterOptionsMgr, BtnCopyResultHdl ) ); rBtnMore.AddWindow( &rBtnCase ); @@ -130,23 +130,23 @@ void ScFilterOptionsMgr::Init() rBtnMore.AddWindow( &rFtDbArea ); rBtnMore.AddWindow( &rFlOptions ); - rBtnCase .Check( rQueryData.bCaseSens ); - rBtnHeader .Check( rQueryData.bHasHeader ); - rBtnRegExp .Check( rQueryData.bRegExp ); - rBtnUnique .Check( !rQueryData.bDuplicate ); + rBtnCase .Check( rQueryData.bCaseSens ); + rBtnHeader .Check( rQueryData.bHasHeader ); + rBtnRegExp .Check( rQueryData.bRegExp ); + rBtnUnique .Check( !rQueryData.bDuplicate ); if ( pViewData && pDoc ) { - String theAreaStr; - ScRange theCurArea ( ScAddress( rQueryData.nCol1, + String theAreaStr; + ScRange theCurArea ( ScAddress( rQueryData.nCol1, rQueryData.nRow1, pViewData->GetTabNo() ), ScAddress( rQueryData.nCol2, rQueryData.nRow2, pViewData->GetTabNo() ) ); - ScDBCollection* pDBColl = pDoc->GetDBCollection(); - String theDbArea; - String theDbName = rStrNoName; + ScDBCollection* pDBColl = pDoc->GetDBCollection(); + String theDbArea; + String theDbName = rStrNoName; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc, eConv ); @@ -168,7 +168,7 @@ void ScFilterOptionsMgr::Init() rLbCopyPos.SetEntryData( nInsert, new String( aRefStr ) ); } - rBtnDestPers.Check( TRUE ); // beim Aufruf immer an + rBtnDestPers.Check( TRUE ); // beim Aufruf immer an rLbCopyPos.SelectEntryPos( 0 ); rEdCopyPos.SetText( EMPTY_STRING ); @@ -181,9 +181,9 @@ void ScFilterOptionsMgr::Init() if ( pDBColl ) { - ScAddress& rStart = theCurArea.aStart; - ScAddress& rEnd = theCurArea.aEnd; - ScDBData* pDBData = pDBColl->GetDBAtArea( rStart.Tab(), + ScAddress& rStart = theCurArea.aStart; + ScAddress& rEnd = theCurArea.aEnd; + ScDBData* pDBData = pDBColl->GetDBAtArea( rStart.Tab(), rStart.Col(), rStart.Row(), rEnd.Col(), rEnd.Row() ); if ( pDBData ) @@ -282,15 +282,15 @@ IMPL_LINK( ScFilterOptionsMgr, EdPosModifyHdl, Edit*, pEd ) { if ( pEd == &rEdCopyPos ) { - String theCurPosStr = pEd->GetText(); - USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); + String theCurPosStr = pEd->GetText(); + USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); if ( SCA_VALID == (nResult & SCA_VALID) ) { - String* pStr = NULL; - BOOL bFound = FALSE; - USHORT i = 0; - USHORT nCount = rLbCopyPos.GetEntryCount(); + String* pStr = NULL; + BOOL bFound = FALSE; + USHORT i = 0; + USHORT nCount = rLbCopyPos.GetEntryCount(); for ( i=2; i<nCount && !bFound; i++ ) { diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx index 641ce7dc6374..b7a614e9224f 100644 --- a/sc/source/ui/dbgui/imoptdlg.cxx +++ b/sc/source/ui/dbgui/imoptdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ static const sal_Char pStrFix[] = "FIX"; //------------------------------------------------------------------------ -// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) -// darum ab Version 336 Komma stattdessen +// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) +// darum ab Version 336 Komma stattdessen ScImportOptions::ScImportOptions( const String& rStr ) @@ -55,8 +55,8 @@ ScImportOptions::ScImportOptions( const String& rStr ) else nFieldSepCode = (sal_Unicode) aToken.ToInt32(); nTextSepCode = (sal_Unicode) rStr.GetToken(1,',').ToInt32(); - aStrFont = rStr.GetToken(2,','); - eCharSet = ScGlobal::GetCharsetValue(aStrFont); + aStrFont = rStr.GetToken(2,','); + eCharSet = ScGlobal::GetCharsetValue(aStrFont); bSaveAsShown = (rStr.GetToken( 3, ',' ).ToInt32() ? TRUE : FALSE); } } @@ -65,7 +65,7 @@ ScImportOptions::ScImportOptions( const String& rStr ) String ScImportOptions::BuildString() const { - String aResult; + String aResult; if( bFixedWidth ) aResult.AppendAscii( pStrFix ); diff --git a/sc/source/ui/dbgui/imoptdlg.hrc b/sc/source/ui/dbgui/imoptdlg.hrc index 5fd9256e8009..b6f1bf5555d2 100644 --- a/sc/source/ui/dbgui/imoptdlg.hrc +++ b/sc/source/ui/dbgui/imoptdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,16 +28,16 @@ //#define RID_SCDLG_IMPORTOPT 2256 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 -#define FT_FIELDSEP 4 -#define ED_FIELDSEP 5 -#define FT_TEXTSEP 6 -#define ED_TEXTSEP 7 -#define FT_FONT 8 -#define DDLB_FONT 9 -#define LB_FONT 10 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 3 +#define FT_FIELDSEP 4 +#define ED_FIELDSEP 5 +#define FT_TEXTSEP 6 +#define ED_TEXTSEP 7 +#define FT_FONT 8 +#define DDLB_FONT 9 +#define LB_FONT 10 #define FL_FIELDOPT 11 #define CB_FIXEDWIDTH 12 #define CB_SAVESHOWN 13 diff --git a/sc/source/ui/dbgui/imoptdlg.src b/sc/source/ui/dbgui/imoptdlg.src index 914f2d1fb027..af38520aadb3 100644 --- a/sc/source/ui/dbgui/imoptdlg.src +++ b/sc/source/ui/dbgui/imoptdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ ModalDialog RID_SCDLG_IMPORTOPT CheckBox CB_SAVESHOWN { Pos = MAP_APPFONT( 12, 66 ); - Size = MAP_APPFONT( 172, 10 ); + Size = MAP_APPFONT( 172, 10 ); TabStop = TRUE; Hide = TRUE; Text [ en-US ] = "Save cell content as ~shown"; diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src index cd59bf3b099d..7f8eab69f716 100644 --- a/sc/source/ui/dbgui/outline.src +++ b/sc/source/ui/dbgui/outline.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index dfbf7e8989fa..5108b69b2d1f 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,54 +57,54 @@ //================================================================== -ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, - const SfxItemSet& rArgSet, - SCTAB nSourceTab ) +ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, + const SfxItemSet& rArgSet, + SCTAB nSourceTab ) - : ModalDialog ( pParent, ScResId( RID_SCDLG_PIVOTFILTER ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_PIVOTFILTER ) ), // aFlCriteria ( this, ScResId( FL_CRITERIA ) ), - aLbField1 ( this, ScResId( LB_FIELD1 ) ), - aLbCond1 ( this, ScResId( LB_COND1 ) ), - aEdVal1 ( this, ScResId( ED_VAL1 ) ), - aLbConnect1 ( this, ScResId( LB_OP1 ) ), - aLbField2 ( this, ScResId( LB_FIELD2 ) ), - aLbCond2 ( this, ScResId( LB_COND2 ) ), - aEdVal2 ( this, ScResId( ED_VAL2 ) ), - aLbConnect2 ( this, ScResId( LB_OP2 ) ), - aLbField3 ( this, ScResId( LB_FIELD3 ) ), - aLbCond3 ( this, ScResId( LB_COND3 ) ), - aEdVal3 ( this, ScResId( ED_VAL3 ) ), - aFtConnect ( this, ScResId( FT_OP ) ), - aFtField ( this, ScResId( FT_FIELD ) ), - aFtCond ( this, ScResId( FT_COND ) ), - aFtVal ( this, ScResId( FT_VAL ) ), + aLbField1 ( this, ScResId( LB_FIELD1 ) ), + aLbCond1 ( this, ScResId( LB_COND1 ) ), + aEdVal1 ( this, ScResId( ED_VAL1 ) ), + aLbConnect1 ( this, ScResId( LB_OP1 ) ), + aLbField2 ( this, ScResId( LB_FIELD2 ) ), + aLbCond2 ( this, ScResId( LB_COND2 ) ), + aEdVal2 ( this, ScResId( ED_VAL2 ) ), + aLbConnect2 ( this, ScResId( LB_OP2 ) ), + aLbField3 ( this, ScResId( LB_FIELD3 ) ), + aLbCond3 ( this, ScResId( LB_COND3 ) ), + aEdVal3 ( this, ScResId( ED_VAL3 ) ), + aFtConnect ( this, ScResId( FT_OP ) ), + aFtField ( this, ScResId( FT_FIELD ) ), + aFtCond ( this, ScResId( FT_COND ) ), + aFtVal ( this, ScResId( FT_VAL ) ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), - aBtnCase ( this, ScResId( BTN_CASE ) ), - aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), - aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), - aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), - aFtDbArea ( this, ScResId( FT_DBAREA ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), - aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), - aStrNone ( ScResId( SCSTR_NONE ) ), - aStrEmpty ( ScResId( SCSTR_EMPTY ) ), - aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ), - aStrRow ( ScResId( SCSTR_ROW ) ), - aStrColumn ( ScResId( SCSTR_COLUMN ) ), + aBtnCase ( this, ScResId( BTN_CASE ) ), + aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), + aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), + aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), + aFtDbArea ( this, ScResId( FT_DBAREA ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnMore ( this, ScResId( BTN_MORE ) ), + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), + aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), + aStrNone ( ScResId( SCSTR_NONE ) ), + aStrEmpty ( ScResId( SCSTR_EMPTY ) ), + aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ), + aStrRow ( ScResId( SCSTR_ROW ) ), + aStrColumn ( ScResId( SCSTR_COLUMN ) ), // - nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), - theQueryData ( ((const ScQueryItem&) + nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), + theQueryData ( ((const ScQueryItem&) rArgSet.Get( nWhichQuery )).GetQueryData() ), - pOutItem ( NULL ), - pViewData ( NULL ), - pDoc ( NULL ), - nSrcTab ( nSourceTab ), // ist nicht im QueryParam - nFieldCount ( 0 ) + pOutItem ( NULL ), + pViewData ( NULL ), + pDoc ( NULL ), + nSrcTab ( nSourceTab ), // ist nicht im QueryParam + nFieldCount ( 0 ) { for (USHORT i=0; i<=MAXCOL; i++) pEntryLists[i] = NULL; @@ -131,11 +131,11 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) const ScQueryItem& rQueryItem = (const ScQueryItem&) rArgSet.Get( nWhichQuery ); - aBtnCase.SetClickHdl ( LINK( this, ScPivotFilterDlg, CheckBoxHdl ) ); + aBtnCase.SetClickHdl ( LINK( this, ScPivotFilterDlg, CheckBoxHdl ) ); - aLbField1.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); - aLbField2.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); - aLbField3.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); + aLbField1.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); + aLbField2.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); + aLbField3.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); aLbConnect1.SetSelectHdl( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); aLbConnect2.SetSelectHdl( LINK( this, ScPivotFilterDlg, LbSelectHdl ) ); @@ -146,36 +146,36 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) aBtnMore.AddWindow( &aFtDbArea ); aBtnMore.AddWindow( &aFlOptions ); - aBtnCase .Check( theQueryData.bCaseSens ); - aBtnRegExp .Check( theQueryData.bRegExp ); - aBtnUnique .Check( !theQueryData.bDuplicate ); + aBtnCase .Check( theQueryData.bCaseSens ); + aBtnRegExp .Check( theQueryData.bRegExp ); + aBtnUnique .Check( !theQueryData.bDuplicate ); - pViewData = rQueryItem.GetViewData(); - pDoc = pViewData ? pViewData->GetDocument() : NULL; + pViewData = rQueryItem.GetViewData(); + pDoc = pViewData ? pViewData->GetDocument() : NULL; // fuer leichteren Zugriff: - aFieldLbArr [0] = &aLbField1; - aFieldLbArr [1] = &aLbField2; - aFieldLbArr [2] = &aLbField3; - aValueEdArr [0] = &aEdVal1; - aValueEdArr [1] = &aEdVal2; - aValueEdArr [2] = &aEdVal3; - aCondLbArr [0] = &aLbCond1; - aCondLbArr [1] = &aLbCond2; - aCondLbArr [2] = &aLbCond3; + aFieldLbArr [0] = &aLbField1; + aFieldLbArr [1] = &aLbField2; + aFieldLbArr [2] = &aLbField3; + aValueEdArr [0] = &aEdVal1; + aValueEdArr [1] = &aEdVal2; + aValueEdArr [2] = &aEdVal3; + aCondLbArr [0] = &aLbCond1; + aCondLbArr [1] = &aLbCond2; + aCondLbArr [2] = &aLbCond3; if ( pViewData && pDoc ) { - String theAreaStr; - ScRange theCurArea ( ScAddress( theQueryData.nCol1, + String theAreaStr; + ScRange theCurArea ( ScAddress( theQueryData.nCol1, theQueryData.nRow1, nSrcTab ), ScAddress( theQueryData.nCol2, theQueryData.nRow2, nSrcTab ) ); - ScDBCollection* pDBColl = pDoc->GetDBCollection(); - String theDbArea; - String theDbName = aStrNoName; + ScDBCollection* pDBColl = pDoc->GetDBCollection(); + String theDbArea; + String theDbName = aStrNoName; /* * Ueberpruefen, ob es sich bei dem uebergebenen @@ -186,9 +186,9 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) if ( pDBColl ) { - ScAddress& rStart = theCurArea.aStart; - ScAddress& rEnd = theCurArea.aEnd; - ScDBData* pDBData = pDBColl->GetDBAtArea( rStart.Tab(), + ScAddress& rStart = theCurArea.aStart; + ScAddress& rEnd = theCurArea.aEnd; + ScDBData* pDBData = pDBColl->GetDBAtArea( rStart.Tab(), rStart.Col(), rStart.Row(), rEnd.Col(), rEnd.Row() ); if ( pDBData ) @@ -215,7 +215,7 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) { ScQueryEntry& rEntry = theQueryData.GetEntry(i); - String aValStr = *rEntry.pStr; + String aValStr = *rEntry.pStr; if (!rEntry.bQueryByString && aValStr == EMPTY_STRING) { if (rEntry.nVal == SC_EMPTYFIELDS) @@ -223,8 +223,8 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) else if (rEntry.nVal == SC_NONEMPTYFIELDS) aValStr = aStrNotEmpty; } - USHORT nCondPos = (USHORT)rEntry.eOp; - USHORT nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) ); + USHORT nCondPos = (USHORT)rEntry.eOp; + USHORT nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) ); aFieldLbArr[i]->SelectEntryPos( nFieldSelPos ); aCondLbArr [i]->SelectEntryPos( nCondPos ); @@ -297,13 +297,13 @@ void ScPivotFilterDlg::FillFieldLists() if ( pDoc ) { - String aFieldName; - SCTAB nTab = nSrcTab; - SCCOL nFirstCol = theQueryData.nCol1; - SCROW nFirstRow = theQueryData.nRow1; - SCCOL nMaxCol = theQueryData.nCol2; - SCCOL col = 0; - USHORT i=1; + String aFieldName; + SCTAB nTab = nSrcTab; + SCCOL nFirstCol = theQueryData.nCol1; + SCROW nFirstRow = theQueryData.nRow1; + SCCOL nMaxCol = theQueryData.nCol2; + SCCOL col = 0; + USHORT i=1; for ( col=nFirstCol; col<=nMaxCol; col++ ) { @@ -329,10 +329,10 @@ void ScPivotFilterDlg::UpdateValueList( USHORT nList ) { if ( pDoc && nList>0 && nList<=3 ) { - ComboBox* pValList = aValueEdArr[nList-1]; - USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos(); - USHORT nListPos = 0; - String aCurValue = pValList->GetText(); + ComboBox* pValList = aValueEdArr[nList-1]; + USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos(); + USHORT nListPos = 0; + String aCurValue = pValList->GetText(); pValList->Clear(); pValList->InsertEntry( aStrNotEmpty, 0 ); @@ -346,9 +346,9 @@ void ScPivotFilterDlg::UpdateValueList( USHORT nList ) { WaitObject aWaiter( this ); - SCTAB nTab = nSrcTab; - SCROW nFirstRow = theQueryData.nRow1; - SCROW nLastRow = theQueryData.nRow2; + SCTAB nTab = nSrcTab; + SCROW nFirstRow = theQueryData.nRow1; + SCROW nLastRow = theQueryData.nRow2; nFirstRow++; bool bHasDates = false; @@ -401,14 +401,14 @@ USHORT ScPivotFilterDlg::GetFieldSelPos( SCCOL nField ) const ScQueryItem& ScPivotFilterDlg::GetOutputItem() { - ScQueryParam theParam( theQueryData ); - USHORT nConnect1 = aLbConnect1.GetSelectEntryPos(); - USHORT nConnect2 = aLbConnect2.GetSelectEntryPos(); + ScQueryParam theParam( theQueryData ); + USHORT nConnect1 = aLbConnect1.GetSelectEntryPos(); + USHORT nConnect2 = aLbConnect2.GetSelectEntryPos(); for ( SCSIZE i=0; i<3; i++ ) { - USHORT nField = aFieldLbArr[i]->GetSelectEntryPos(); - ScQueryOp eOp = (ScQueryOp)aCondLbArr[i]->GetSelectEntryPos(); + USHORT nField = aFieldLbArr[i]->GetSelectEntryPos(); + ScQueryOp eOp = (ScQueryOp)aCondLbArr[i]->GetSelectEntryPos(); BOOL bDoThis = (aFieldLbArr[i]->GetSelectEntryPos() != 0); theParam.GetEntry(i).bDoQuery = bDoThis; @@ -426,26 +426,26 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() */ if ( aStrVal == aStrEmpty ) { - *rEntry.pStr = EMPTY_STRING; - rEntry.nVal = SC_EMPTYFIELDS; + *rEntry.pStr = EMPTY_STRING; + rEntry.nVal = SC_EMPTYFIELDS; rEntry.bQueryByString = FALSE; } else if ( aStrVal == aStrNotEmpty ) { - *rEntry.pStr = EMPTY_STRING; - rEntry.nVal = SC_NONEMPTYFIELDS; + *rEntry.pStr = EMPTY_STRING; + rEntry.nVal = SC_NONEMPTYFIELDS; rEntry.bQueryByString = FALSE; } else { - *rEntry.pStr = aStrVal; - rEntry.nVal = 0; + *rEntry.pStr = aStrVal; + rEntry.nVal = 0; rEntry.bQueryByString = TRUE; } - rEntry.nField = nField ? (theQueryData.nCol1 + + rEntry.nField = nField ? (theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0); - rEntry.eOp = eOp; + rEntry.eOp = eOp; } } @@ -457,13 +457,13 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() : SC_AND; theParam.bInplace = FALSE; - theParam.nDestTab = 0; // Woher kommen diese Werte? - theParam.nDestCol = 0; - theParam.nDestRow = 0; + theParam.nDestTab = 0; // Woher kommen diese Werte? + theParam.nDestCol = 0; + theParam.nDestRow = 0; - theParam.bDuplicate = !aBtnUnique.IsChecked(); - theParam.bCaseSens = aBtnCase.IsChecked(); - theParam.bRegExp = aBtnRegExp.IsChecked(); + theParam.bDuplicate = !aBtnUnique.IsChecked(); + theParam.bCaseSens = aBtnCase.IsChecked(); + theParam.bRegExp = aBtnRegExp.IsChecked(); if ( pOutItem ) DELETEZ( pOutItem ); pOutItem = new ScQueryItem( nWhichQuery, &theParam ); @@ -570,9 +570,9 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb ) IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { - // bei Gross-/Kleinschreibung die Werte-Listen aktualisieren + // bei Gross-/Kleinschreibung die Werte-Listen aktualisieren - if ( pBox == &aBtnCase ) // Wertlisten + if ( pBox == &aBtnCase ) // Wertlisten { for (USHORT i=0; i<=MAXCOL; i++) DELETEZ( pEntryLists[i] ); @@ -597,11 +597,11 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) { if ( pEd ) { - String aStrVal = pEd->GetText(); - ListBox* pLb = &aLbCond1; + String aStrVal = pEd->GetText(); + ListBox* pLb = &aLbCond1; if ( pEd == &aEdVal2 ) pLb = &aLbCond2; - else if ( pEd == &aEdVal3 ) pLb = &aLbCond3; + else if ( pEd == &aEdVal3 ) pLb = &aLbCond3; // wenn einer der Sonderwerte leer/nicht-leer // gewaehlt wird, so macht nur der =-Operator Sinn: diff --git a/sc/source/ui/dbgui/pivot.hrc b/sc/source/ui/dbgui/pivot.hrc index 1a97d4c75b52..097b0931ff3a 100644 --- a/sc/source/ui/dbgui/pivot.hrc +++ b/sc/source/ui/dbgui/pivot.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ ************************************************************************/ #include "sc.hrc" // ->RID_SCDLG_PIVOT_LAYOUT -#define BTN_OK 1 +#define BTN_OK 1 #define BTN_CANCEL 2 #define BTN_HELP 3 #define BTN_MORE 4 @@ -67,15 +67,15 @@ #define RB_INAREA 41 #define ED_INAREA 42 -#define PIVOTSTR_SUM 1 -#define PIVOTSTR_COUNT 2 -#define PIVOTSTR_AVG 3 -#define PIVOTSTR_MAX 4 -#define PIVOTSTR_MIN 5 -#define PIVOTSTR_PROD 6 -#define PIVOTSTR_COUNT2 7 -#define PIVOTSTR_DEV 8 -#define PIVOTSTR_DEV2 9 -#define PIVOTSTR_VAR 10 -#define PIVOTSTR_VAR2 11 +#define PIVOTSTR_SUM 1 +#define PIVOTSTR_COUNT 2 +#define PIVOTSTR_AVG 3 +#define PIVOTSTR_MAX 4 +#define PIVOTSTR_MIN 5 +#define PIVOTSTR_PROD 6 +#define PIVOTSTR_COUNT2 7 +#define PIVOTSTR_DEV 8 +#define PIVOTSTR_DEV2 9 +#define PIVOTSTR_VAR 10 +#define PIVOTSTR_VAR2 11 diff --git a/sc/source/ui/dbgui/pivot.src b/sc/source/ui/dbgui/pivot.src index 359c8a92d8e5..7e7fe2491ced 100644 --- a/sc/source/ui/dbgui/pivot.src +++ b/sc/source/ui/dbgui/pivot.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 4e834fb95935..ca4fbafb1400 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -833,7 +833,7 @@ short ScDPShowDetailDlg::Execute() String ScDPShowDetailDlg::GetDimensionName() const { - // Look up the internal dimension name which may be different from the + // Look up the internal dimension name which may be different from the // displayed field name. String aSelectedName = maLbDims.GetSelectEntry(); DimNameIndexMap::const_iterator itr = maNameIndexMap.find(aSelectedName); diff --git a/sc/source/ui/dbgui/pvfundlg.hrc b/sc/source/ui/dbgui/pvfundlg.hrc index c9b6f562a9e1..4e155cadf1b9 100644 --- a/sc/source/ui/dbgui/pvfundlg.hrc +++ b/sc/source/ui/dbgui/pvfundlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ #define FT_HIERARCHY 10 #define FT_DIMS 11 -#define CB_SHOWALL 1 +#define CB_SHOWALL 1 #define CB_LAYOUT_EMPTY 2 #define CB_SHOW 3 diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src index ed00f6a65fa5..b3ff8cab02bf 100644 --- a/sc/source/ui/dbgui/pvfundlg.src +++ b/sc/source/ui/dbgui/pvfundlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/pvglob.hxx b/sc/source/ui/dbgui/pvglob.hxx index 2ad61405aae8..33e192afc4b3 100644 --- a/sc/source/ui/dbgui/pvglob.hxx +++ b/sc/source/ui/dbgui/pvglob.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index 3b26d1c836f6..9757259181b7 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ PointerStyle lclGetPointerForField( ScDPFieldType eType ) ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, const ScDPObject& rDPObject, bool bNewOutput ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_PIVOT_LAYOUT ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_PIVOT_LAYOUT ), aFlLayout ( this, ScResId( FL_LAYOUT ) ), aFtPage ( this, ScResId( FT_PAGE ) ), aWndPage ( this, ScResId( WND_PAGE ), TYPE_PAGE, &aFtPage ), @@ -117,49 +117,49 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar aFtData ( this, ScResId( FT_DATA ) ), aWndData ( this, ScResId( WND_DATA ), TYPE_DATA, &aFtData ), aWndSelect ( this, ScResId( WND_SELECT ), TYPE_SELECT, String(ScResId(STR_SELECT)) ), - aSlider ( this, ScResId( WND_HSCROLL ) ), - aFtInfo ( this, ScResId( FT_INFO ) ), + aSlider ( this, ScResId( WND_HSCROLL ) ), + aFtInfo ( this, ScResId( FT_INFO ) ), aFlAreas ( this, ScResId( FL_OUTPUT ) ), - aFtInArea ( this, ScResId( FT_INAREA) ), - aEdInPos ( this, ScResId( ED_INAREA) ), - aRbInPos ( this, ScResId( RB_INAREA ), &aEdInPos, this ), + aFtInArea ( this, ScResId( FT_INAREA) ), + aEdInPos ( this, ScResId( ED_INAREA) ), + aRbInPos ( this, ScResId( RB_INAREA ), &aEdInPos, this ), - aLbOutPos ( this, ScResId( LB_OUTAREA ) ), - aFtOutArea ( this, ScResId( FT_OUTAREA ) ), + aLbOutPos ( this, ScResId( LB_OUTAREA ) ), + aFtOutArea ( this, ScResId( FT_OUTAREA ) ), aEdOutPos ( this, this, ScResId( ED_OUTAREA ) ), - aRbOutPos ( this, ScResId( RB_OUTAREA ), &aEdOutPos, this ), + aRbOutPos ( this, ScResId( RB_OUTAREA ), &aEdOutPos, this ), aBtnIgnEmptyRows( this, ScResId( BTN_IGNEMPTYROWS ) ), - aBtnDetectCat ( this, ScResId( BTN_DETECTCAT ) ), - aBtnTotalCol ( this, ScResId( BTN_TOTALCOL ) ), - aBtnTotalRow ( this, ScResId( BTN_TOTALROW ) ), + aBtnDetectCat ( this, ScResId( BTN_DETECTCAT ) ), + aBtnTotalCol ( this, ScResId( BTN_TOTALCOL ) ), + aBtnTotalRow ( this, ScResId( BTN_TOTALROW ) ), aBtnFilter ( this, ScResId( BTN_FILTER ) ), aBtnDrillDown ( this, ScResId( BTN_DRILLDOWN ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), aBtnRemove ( this, ScResId( BTN_REMOVE ) ), aBtnOptions ( this, ScResId( BTN_OPTIONS ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), + aBtnMore ( this, ScResId( BTN_MORE ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), - aStrNewTable ( ScResId( SCSTR_NEWTABLE ) ), + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), + aStrNewTable ( ScResId( SCSTR_NEWTABLE ) ), - bIsDrag ( FALSE ), + bIsDrag ( FALSE ), pEditActive ( NULL ), eLastActiveType ( TYPE_SELECT ), - nOffset ( 0 ), + nOffset ( 0 ), // xDlgDPObject ( new ScDPObject( rDPObject ) ), - pViewData ( ((ScTabViewShell*)SfxViewShell::Current())-> + pViewData ( ((ScTabViewShell*)SfxViewShell::Current())-> GetViewData() ), - pDoc ( ((ScTabViewShell*)SfxViewShell::Current())-> + pDoc ( ((ScTabViewShell*)SfxViewShell::Current())-> GetViewData()->GetDocument() ), - bRefInputMode ( FALSE ) + bRefInputMode ( FALSE ) { xDlgDPObject->SetAlive( TRUE ); // needed to get structure information xDlgDPObject->FillOldParam( thePivotData, FALSE ); @@ -264,7 +264,7 @@ void __EXPORT ScDPLayoutDlg::Init(bool bNewOutput) aLbOutPos .SetSelectHdl( LINK( this, ScDPLayoutDlg, SelAreaHdl ) ); aEdOutPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdModifyHdl ) ); - aEdInPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdInModifyHdl ) ); + aEdInPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdInModifyHdl ) ); aBtnOk .SetClickHdl ( LINK( this, ScDPLayoutDlg, OkHdl ) ); aBtnCancel.SetClickHdl ( LINK( this, ScDPLayoutDlg, CancelHdl ) ); Link aLink = LINK( this, ScDPLayoutDlg, GetFocusHdl ); @@ -291,7 +291,7 @@ void __EXPORT ScDPLayoutDlg::Init(bool bNewOutput) String aRefStr; while ( aIter.Next( aName, aRange ) ) { - if ( !aIter.WasDBName() ) // hier keine DB-Bereiche ! + if ( !aIter.WasDBName() ) // hier keine DB-Bereiche ! { USHORT nInsert = aLbOutPos.InsertEntry( aName ); @@ -330,8 +330,8 @@ void __EXPORT ScDPLayoutDlg::Init(bool bNewOutput) aBtnIgnEmptyRows.Check( thePivotData.bIgnoreEmptyRows ); aBtnDetectCat .Check( thePivotData.bDetectCategories ); - aBtnTotalCol .Check( thePivotData.bMakeTotalCol ); - aBtnTotalRow .Check( thePivotData.bMakeTotalRow ); + aBtnTotalCol .Check( thePivotData.bMakeTotalCol ); + aBtnTotalRow .Check( thePivotData.bMakeTotalRow ); if( const ScDPSaveData* pSaveData = xDlgDPObject->GetSaveData() ) { @@ -352,10 +352,10 @@ void __EXPORT ScDPLayoutDlg::Init(bool bNewOutput) InitFocus(); -// SetDispatcherLock( TRUE ); // Modal-Modus einschalten +// SetDispatcherLock( TRUE ); // Modal-Modus einschalten //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg } @@ -1011,7 +1011,7 @@ PointerStyle ScDPLayoutDlg::NotifyMouseMove( const Point& rAt ) PointerStyle ScDPLayoutDlg::NotifyMouseButtonDown( ScDPFieldType eType, size_t nFieldIndex ) { - bIsDrag = TRUE; + bIsDrag = TRUE; eDnDFromType = eType; nDnDFromIndex = nFieldIndex; return lclGetPointerForField( eType ); @@ -1211,7 +1211,7 @@ BOOL ScDPLayoutDlg::Contains( ScDPFuncDataVec* pArr, SCsCOL nCol, size_t& nAt ) if ( !pArr ) return FALSE; - BOOL bFound = FALSE; + BOOL bFound = FALSE; size_t i = 0; while ( (i<pArr->size()) && ((*pArr)[i].get() != NULL) && !bFound ) @@ -1331,16 +1331,16 @@ String ScDPLayoutDlg::GetFuncString( USHORT& rFuncMask, BOOL bIsValue ) rFuncMask = PIVOT_FUNC_COUNT; } } - else if ( rFuncMask == PIVOT_FUNC_SUM ) aStr = FSTR(PIVOTSTR_SUM); - else if ( rFuncMask == PIVOT_FUNC_COUNT ) aStr = FSTR(PIVOTSTR_COUNT); - else if ( rFuncMask == PIVOT_FUNC_AVERAGE ) aStr = FSTR(PIVOTSTR_AVG); - else if ( rFuncMask == PIVOT_FUNC_MAX ) aStr = FSTR(PIVOTSTR_MAX); - else if ( rFuncMask == PIVOT_FUNC_MIN ) aStr = FSTR(PIVOTSTR_MIN); - else if ( rFuncMask == PIVOT_FUNC_PRODUCT ) aStr = FSTR(PIVOTSTR_PROD); + else if ( rFuncMask == PIVOT_FUNC_SUM ) aStr = FSTR(PIVOTSTR_SUM); + else if ( rFuncMask == PIVOT_FUNC_COUNT ) aStr = FSTR(PIVOTSTR_COUNT); + else if ( rFuncMask == PIVOT_FUNC_AVERAGE ) aStr = FSTR(PIVOTSTR_AVG); + else if ( rFuncMask == PIVOT_FUNC_MAX ) aStr = FSTR(PIVOTSTR_MAX); + else if ( rFuncMask == PIVOT_FUNC_MIN ) aStr = FSTR(PIVOTSTR_MIN); + else if ( rFuncMask == PIVOT_FUNC_PRODUCT ) aStr = FSTR(PIVOTSTR_PROD); else if ( rFuncMask == PIVOT_FUNC_COUNT_NUM ) aStr = FSTR(PIVOTSTR_COUNT2); - else if ( rFuncMask == PIVOT_FUNC_STD_DEV ) aStr = FSTR(PIVOTSTR_DEV); + else if ( rFuncMask == PIVOT_FUNC_STD_DEV ) aStr = FSTR(PIVOTSTR_DEV); else if ( rFuncMask == PIVOT_FUNC_STD_DEVP ) aStr = FSTR(PIVOTSTR_DEV2); - else if ( rFuncMask == PIVOT_FUNC_STD_VAR ) aStr = FSTR(PIVOTSTR_VAR); + else if ( rFuncMask == PIVOT_FUNC_STD_VAR ) aStr = FSTR(PIVOTSTR_VAR); else if ( rFuncMask == PIVOT_FUNC_STD_VARP ) aStr = FSTR(PIVOTSTR_VAR2); else { @@ -1390,10 +1390,10 @@ void ScDPLayoutDlg::CalcWndSizes() aSlider.SetPosSizePixel( aSliderPos, aSliderSize ); aRectPage = Rectangle( aWndPage.GetPosPixel(), aWndPage.GetSizePixel() ); - aRectRow = Rectangle( aWndRow.GetPosPixel(), aWndRow.GetSizePixel() ); - aRectCol = Rectangle( aWndCol.GetPosPixel(), aWndCol.GetSizePixel() ); - aRectData = Rectangle( aWndData.GetPosPixel(), aWndData.GetSizePixel() ); - aRectSelect = Rectangle( aWndSelect.GetPosPixel(), aWndSelect.GetSizePixel() ); + aRectRow = Rectangle( aWndRow.GetPosPixel(), aWndRow.GetSizePixel() ); + aRectCol = Rectangle( aWndCol.GetPosPixel(), aWndCol.GetSizePixel() ); + aRectData = Rectangle( aWndData.GetPosPixel(), aWndData.GetSizePixel() ); + aRectSelect = Rectangle( aWndSelect.GetPosPixel(), aWndSelect.GetSizePixel() ); } @@ -1401,8 +1401,8 @@ void ScDPLayoutDlg::CalcWndSizes() BOOL ScDPLayoutDlg::GetPivotArrays( PivotField* pPageArr, PivotField* pColArr, - PivotField* pRowArr, - PivotField* pDataArr, + PivotField* pRowArr, + PivotField* pDataArr, USHORT& rPageCount, USHORT& rColCount, USHORT& rRowCount, @@ -1432,7 +1432,7 @@ BOOL ScDPLayoutDlg::GetPivotArrays( PivotField* pPageArr, else if ( rColCount < aColArr.size() ) pColArr[rColCount++].nCol = PIVOT_DATA_FIELD; else - bFit = FALSE; // kein Platz fuer Datenfeld + bFit = FALSE; // kein Platz fuer Datenfeld return bFit; } @@ -1557,10 +1557,10 @@ IMPL_LINK( ScDPLayoutDlg, ClickHdl, PushButton *, pBtn ) IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) { - String aOutPosStr( aEdOutPos.GetText() ); - ScAddress aAdrDest; - BOOL bToNewTable = (aLbOutPos.GetSelectEntryPos() == 1); - USHORT nResult = !bToNewTable ? aAdrDest.Parse( aOutPosStr, pDoc, pDoc->GetAddressConvention() ) : 0; + String aOutPosStr( aEdOutPos.GetText() ); + ScAddress aAdrDest; + BOOL bToNewTable = (aLbOutPos.GetSelectEntryPos() == 1); + USHORT nResult = !bToNewTable ? aAdrDest.Parse( aOutPosStr, pDoc, pDoc->GetAddressConvention() ) : 0; if ( bToNewTable || ( (aOutPosStr.Len() > 0) && (SCA_VALID == (nResult & SCA_VALID)) ) ) @@ -1568,11 +1568,11 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) //@BugID 54702 Enablen/Disablen nur noch in Basisklasse //SFX_APPWINDOW->Enable(); - ScPivotParam theOutParam; + ScPivotParam theOutParam; PivotPageFieldArr aPageFieldArr; - PivotFieldArr aColFieldArr; - PivotFieldArr aRowFieldArr; - PivotFieldArr aDataFieldArr; + PivotFieldArr aColFieldArr; + PivotFieldArr aRowFieldArr; + PivotFieldArr aDataFieldArr; USHORT nPageCount; USHORT nColCount; USHORT nRowCount; @@ -1584,7 +1584,7 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) { ScDPSaveData* pOldSaveData = xDlgDPObject->GetSaveData(); - ScRange aOutRange( aAdrDest ); // bToNewTable is passed separately + ScRange aOutRange( aAdrDest ); // bToNewTable is passed separately ScDPSaveData aSaveData; aSaveData.SetIgnoreEmptyRows( aBtnIgnEmptyRows.IsChecked() ); @@ -1676,15 +1676,15 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) USHORT nWhichPivot = SC_MOD()->GetPool().GetWhich( SID_PIVOT_TABLE ); ScPivotItem aOutItem( nWhichPivot, &aSaveData, &aOutRange, bToNewTable ); - bRefInputMode = FALSE; // to allow deselecting when switching sheets + bRefInputMode = FALSE; // to allow deselecting when switching sheets SetDispatcherLock( FALSE ); SwitchToDocument(); - // #95513# don't hide the dialog before executing the slot, instead it is used as - // parent for message boxes in ScTabViewShell::GetDialogParent + // #95513# don't hide the dialog before executing the slot, instead it is used as + // parent for message boxes in ScTabViewShell::GetDialogParent - const SfxPoolItem* pRet = GetBindings().GetDispatcher()->Execute( + const SfxPoolItem* pRet = GetBindings().GetDispatcher()->Execute( SID_PIVOT_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aOutItem, 0L, 0L ); bool bSuccess = true; @@ -1698,7 +1698,7 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) // Table successfully inserted. Close(); else - { + { // Table insertion failed. Keep the dialog open. bRefInputMode = true; SetDispatcherLock(true); @@ -1760,7 +1760,7 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG ) { bRefInputMode = FALSE; //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg } return 0; } @@ -1770,15 +1770,15 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG ) IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, Edit *, EMPTYARG ) { - String theCurPosStr = aEdOutPos.GetText(); - USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); + String theCurPosStr = aEdOutPos.GetText(); + USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); if ( SCA_VALID == (nResult & SCA_VALID) ) { - String* pStr = NULL; - BOOL bFound = FALSE; - USHORT i = 0; - USHORT nCount = aLbOutPos.GetEntryCount(); + String* pStr = NULL; + BOOL bFound = FALSE; + USHORT i = 0; + USHORT nCount = aLbOutPos.GetEntryCount(); for ( i=2; i<nCount && !bFound; i++ ) { @@ -1806,8 +1806,8 @@ IMPL_LINK( ScDPLayoutDlg, EdInModifyHdl, Edit *, EMPTYARG ) IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG ) { - String aString; - USHORT nSelPos = aLbOutPos.GetSelectEntryPos(); + String aString; + USHORT nSelPos = aLbOutPos.GetSelectEntryPos(); if ( nSelPos > 1 ) { diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 916bb0db8a34..113274a25688 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,30 +54,30 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL bEdit, BOOL bSheetProtected) - : ModalDialog ( pParent, ScResId( RID_SCDLG_NEWSCENARIO ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_NEWSCENARIO ) ), aFlName ( this, ScResId( FL_NAME )), - aEdName ( this, ScResId( ED_NAME ) ), + aEdName ( this, ScResId( ED_NAME ) ), aFlComment ( this, ScResId( FL_COMMENT ) ), - aEdComment ( this, ScResId( ED_COMMENT ) ), + aEdComment ( this, ScResId( ED_COMMENT ) ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), - aCbShowFrame ( this, ScResId( CB_SHOWFRAME ) ), - aLbColor ( this, ScResId( LB_COLOR ) ), - //aCbPrintFrame ( this, ScResId( CB_PRINTFRAME ) ), - aCbTwoWay ( this, ScResId( CB_TWOWAY ) ), - //aCbAttrib ( this, ScResId( CB_ATTRIB ) ), - //aCbValue ( this, ScResId( CB_VALUE ) ), - aCbCopyAll ( this, ScResId( CB_COPYALL ) ), + aCbShowFrame ( this, ScResId( CB_SHOWFRAME ) ), + aLbColor ( this, ScResId( LB_COLOR ) ), + //aCbPrintFrame ( this, ScResId( CB_PRINTFRAME ) ), + aCbTwoWay ( this, ScResId( CB_TWOWAY ) ), + //aCbAttrib ( this, ScResId( CB_ATTRIB ) ), + //aCbValue ( this, ScResId( CB_VALUE ) ), + aCbCopyAll ( this, ScResId( CB_COPYALL ) ), aCbProtect ( this, ScResId( CB_PROTECT ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), aDefScenarioName( rName ), - bIsEdit ( bEdit ) + bIsEdit ( bEdit ) { if (bIsEdit) SetText(String(ScResId(STR_EDIT))); - SfxObjectShell* pDocSh = SfxObjectShell::Current(); + SfxObjectShell* pDocSh = SfxObjectShell::Current(); if ( pDocSh ) { const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE ); @@ -113,9 +113,9 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b aComment.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ", " )); aComment += ScGlobal::GetpLocaleData()->getTime( Time() ); - aEdComment .SetText( aComment ); - aEdName .SetText( rName ); - aBtnOk .SetClickHdl( LINK( this, ScNewScenarioDlg, OkHdl ) ); + aEdComment .SetText( aComment ); + aEdName .SetText( rName ); + aBtnOk .SetClickHdl( LINK( this, ScNewScenarioDlg, OkHdl ) ); aCbShowFrame.SetClickHdl( LINK( this, ScNewScenarioDlg, EnableHdl ) ); FreeResource(); @@ -137,7 +137,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b if (bSheetProtected) aCbProtect.Enable(FALSE); - //! die drei funktionieren noch nicht... + //! die drei funktionieren noch nicht... /* aCbPrintFrame.Enable(FALSE); aCbAttrib.Enable(FALSE); @@ -157,7 +157,7 @@ void ScNewScenarioDlg::GetScenarioData( String& rName, String& rComment, Color& rColor, USHORT& rFlags ) const { rComment = aEdComment.GetText(); - rName = aEdName.GetText(); + rName = aEdName.GetText(); if ( rName.Len() == 0 ) rName = aDefScenarioName; @@ -198,7 +198,7 @@ void ScNewScenarioDlg::SetScenarioData( const String& rName, const String& rComm aCbTwoWay.Check ( (nFlags & SC_SCENARIO_TWOWAY) != 0 ); //aCbAttrib.Check ( (nFlags & SC_SCENARIO_ATTRIB) != 0 ); //aCbValue.Check ( (nFlags & SC_SCENARIO_VALUE) != 0 ); - // CopyAll nicht + // CopyAll nicht aCbProtect.Check ( (nFlags & SC_SCENARIO_PROTECT) != 0 ); } @@ -206,8 +206,8 @@ void ScNewScenarioDlg::SetScenarioData( const String& rName, const String& rComm IMPL_LINK( ScNewScenarioDlg, OkHdl, OKButton *, EMPTYARG ) { - String aName ( aEdName.GetText() ); - ScDocument* pDoc = ((ScTabViewShell*)SfxViewShell::Current())-> + String aName ( aEdName.GetText() ); + ScDocument* pDoc = ((ScTabViewShell*)SfxViewShell::Current())-> GetViewData()->GetDocument(); aName.EraseLeadingChars( ' ' ); @@ -230,7 +230,7 @@ IMPL_LINK( ScNewScenarioDlg, OkHdl, OKButton *, EMPTYARG ) EndDialog( RET_OK ); return 0; - //! beim Editieren testen, ob eine andere Tabelle den Namen hat! + //! beim Editieren testen, ob eine andere Tabelle den Namen hat! } //------------------------------------------------------------------------ diff --git a/sc/source/ui/dbgui/scendlg.hrc b/sc/source/ui/dbgui/scendlg.hrc index 83818773bf5a..fe01da8ffb48 100644 --- a/sc/source/ui/dbgui/scendlg.hrc +++ b/sc/source/ui/dbgui/scendlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/scendlg.src b/sc/source/ui/dbgui/scendlg.src index 40cfeb01b8ff..7e08ec7816cf 100644 --- a/sc/source/ui/dbgui/scendlg.src +++ b/sc/source/ui/dbgui/scendlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 67817a140af2..1fe0fcc9e91f 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ void lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect ) if ( (sal_Unicode)rList.GetToken(i+1,'\t').ToInt32() == cSelect ) aStr = rList.GetToken(i,'\t'); if (!aStr.Len()) - aStr = cSelect; // Ascii + aStr = cSelect; // Ascii rCombo.SetText(aStr); } @@ -118,8 +118,8 @@ sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList ) return c; } -static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparators, - bool &bMergeDelimiters, bool& bQuotedAsText, bool& bDetectSpecialNum, +static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparators, + bool &bMergeDelimiters, bool& bQuotedAsText, bool& bDetectSpecialNum, bool &bFixedWidth, sal_Int32 &nFromRow, sal_Int32 &nCharSet, sal_Int32& nLanguage ) { @@ -157,7 +157,7 @@ static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparato if( pProperties[5].hasValue() ) pProperties[5] >>= nCharSet; - + if ( pProperties[6].hasValue() ) pProperties[6] >>= bQuotedAsText; @@ -168,7 +168,7 @@ static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparato pProperties[8] >>= nLanguage; } -static void save_Separators( +static void save_Separators( String maSeparators, String maTxtSep, bool bMergeDelimiters, bool bQuotedAsText, bool bDetectSpecialNum, bool bFixedWidth, sal_Int32 nFromRow, sal_Int32 nCharSet, sal_Int32 nLanguage ) { @@ -208,7 +208,7 @@ static void save_Separators( ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, SvStream* pInStream, sal_Unicode /*cSep*/ ) : - ModalDialog ( pParent, ScResId( RID_SCDLG_ASCII ) ), + ModalDialog ( pParent, ScResId( RID_SCDLG_ASCII ) ), mpDatStream ( pInStream ), mnStreamPos( pInStream ? pInStream->Tell() : 0 ), @@ -216,46 +216,46 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, mnRowPosCount(0), aFlFieldOpt ( this, ScResId( FL_FIELDOPT ) ), - aFtCharSet ( this, ScResId( FT_CHARSET ) ), - aLbCharSet ( this, ScResId( LB_CHARSET ) ), + aFtCharSet ( this, ScResId( FT_CHARSET ) ), + aLbCharSet ( this, ScResId( LB_CHARSET ) ), aFtCustomLang( this, ScResId( FT_CUSTOMLANG ) ), - aLbCustomLang( this, ScResId( LB_CUSTOMLANG ) ), + aLbCustomLang( this, ScResId( LB_CUSTOMLANG ) ), - aFtRow ( this, ScResId( FT_AT_ROW ) ), - aNfRow ( this, ScResId( NF_AT_ROW ) ), + aFtRow ( this, ScResId( FT_AT_ROW ) ), + aNfRow ( this, ScResId( NF_AT_ROW ) ), aFlSepOpt ( this, ScResId( FL_SEPOPT ) ), - aRbFixed ( this, ScResId( RB_FIXED ) ), + aRbFixed ( this, ScResId( RB_FIXED ) ), aRbSeparated( this, ScResId( RB_SEPARATED ) ), - aCkbTab ( this, ScResId( CKB_TAB ) ), + aCkbTab ( this, ScResId( CKB_TAB ) ), aCkbSemicolon(this, ScResId( CKB_SEMICOLON ) ), - aCkbComma ( this, ScResId( CKB_COMMA ) ), - aCkbSpace ( this, ScResId( CKB_SPACE ) ), - aCkbOther ( this, ScResId( CKB_OTHER ) ), - aEdOther ( this, ScResId( ED_OTHER ) ), - aCkbAsOnce ( this, ScResId( CB_ASONCE) ), - aFlOtherOpt ( this, ScResId( FL_OTHER_OPTIONS ) ), + aCkbComma ( this, ScResId( CKB_COMMA ) ), + aCkbSpace ( this, ScResId( CKB_SPACE ) ), + aCkbOther ( this, ScResId( CKB_OTHER ) ), + aEdOther ( this, ScResId( ED_OTHER ) ), + aCkbAsOnce ( this, ScResId( CB_ASONCE) ), + aFlOtherOpt ( this, ScResId( FL_OTHER_OPTIONS ) ), - aFtTextSep ( this, ScResId( FT_TEXTSEP ) ), - aCbTextSep ( this, ScResId( CB_TEXTSEP ) ), + aFtTextSep ( this, ScResId( FT_TEXTSEP ) ), + aCbTextSep ( this, ScResId( CB_TEXTSEP ) ), aCkbQuotedAsText( this, ScResId(CB_QUOTED_AS_TEXT) ), aCkbDetectNumber( this, ScResId(CB_DETECT_SPECIAL_NUMBER) ), aFlWidth ( this, ScResId( FL_WIDTH ) ), - aFtType ( this, ScResId( FT_TYPE ) ), - aLbType ( this, ScResId( LB_TYPE1 ) ), + aFtType ( this, ScResId( FT_TYPE ) ), + aLbType ( this, ScResId( LB_TYPE1 ) ), maTableBox ( this, ScResId( CTR_TABLEBOX ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), aCharSetUser( ScResId( SCSTR_CHARSET_USER ) ), - aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ), - aFldSepList ( ScResId( SCSTR_FIELDSEP ) ), + aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ), + aFldSepList ( ScResId( SCSTR_FIELDSEP ) ), aTextSepList( ScResId( SCSTR_TEXTSEP ) ), mcTextSep ( ScAsciiOptions::cDefaultTextSep ), maStrTextToColumns( ScResId( STR_TEXTTOCOLUMNS ) ), @@ -286,7 +286,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, sal_Int32 nLanguage = 0; if (mbFileImport) // load separators only when importing csv files. - load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters, + load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters, bQuotedFieldAsText, bDetectSpecialNum, bFixedWidth, nFromRow, nCharSet, nLanguage); maFieldSeparators = String(sFieldSeparators); @@ -317,7 +317,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, aEdOther.SetText( aEdOther.GetText() + OUString( aSep[i] ) ); } } - + // Get Separators from the dialog maFieldSeparators = GetSeparators(); @@ -330,7 +330,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, mpDatStream->StartReadingUnicodeText(); ULONG nUniPos = mpDatStream->Tell(); if ( nUniPos > 0 ) - bPreselectUnicode = TRUE; // read 0xfeff/0xfffe + bPreselectUnicode = TRUE; // read 0xfeff/0xfffe else { UINT16 n; @@ -484,10 +484,10 @@ bool ScImportAsciiDlg::GetLine( ULONG nLine, String &rText ) mnStreamPos = mpDatStream->Tell(); } - // #107455# If the file content isn't unicode, ReadUniStringLine - // may try to seek beyond the file's end and cause a CANTSEEK error - // (depending on the stream type). The error code has to be cleared, - // or further read operations (including non-unicode) will fail. + // #107455# If the file content isn't unicode, ReadUniStringLine + // may try to seek beyond the file's end and cause a CANTSEEK error + // (depending on the stream type). The error code has to be cleared, + // or further read operations (including non-unicode) will fail. if ( mpDatStream->GetError() == ERRCODE_IO_CANTSEEK ) mpDatStream->ResetError(); @@ -540,10 +540,10 @@ void ScImportAsciiDlg::SaveParameters() // We save parameters only for file import. return; - save_Separators( maFieldSeparators, aCbTextSep.GetText(), aCkbAsOnce.IsChecked(), - aCkbQuotedAsText.IsChecked(), aCkbDetectNumber.IsChecked(), - aRbFixed.IsChecked(), - static_cast<sal_Int32>(aNfRow.GetValue()), + save_Separators( maFieldSeparators, aCbTextSep.GetText(), aCkbAsOnce.IsChecked(), + aCkbQuotedAsText.IsChecked(), aCkbDetectNumber.IsChecked(), + aRbFixed.IsChecked(), + static_cast<sal_Int32>(aNfRow.GetValue()), static_cast<sal_Int32>(aLbCharSet.GetSelectEntryPos()), static_cast<sal_Int32>(aLbCustomLang.GetSelectLanguage()) ); } diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 547983af83fe..67d874a0a271 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,23 +45,23 @@ class ScDelimiterTable { public: ScDelimiterTable( const String& rDelTab ) - : theDelTab ( rDelTab ), - cSep ( '\t' ), - nCount ( rDelTab.GetTokenCount('\t') ), - nIter ( 0 ) + : theDelTab ( rDelTab ), + cSep ( '\t' ), + nCount ( rDelTab.GetTokenCount('\t') ), + nIter ( 0 ) {} - USHORT GetCode( const String& rDelimiter ) const; - String GetDelimiter( sal_Unicode nCode ) const; + USHORT GetCode( const String& rDelimiter ) const; + String GetDelimiter( sal_Unicode nCode ) const; - String FirstDel() { nIter = 0; return theDelTab.GetToken( nIter, cSep ); } - String NextDel() { nIter +=2; return theDelTab.GetToken( nIter, cSep ); } + String FirstDel() { nIter = 0; return theDelTab.GetToken( nIter, cSep ); } + String NextDel() { nIter +=2; return theDelTab.GetToken( nIter, cSep ); } private: - const String theDelTab; - const sal_Unicode cSep; - const xub_StrLen nCount; - xub_StrLen nIter; + const String theDelTab; + const sal_Unicode cSep; + const xub_StrLen nCount; + xub_StrLen nIter; }; //------------------------------------------------------------------------ @@ -125,18 +125,18 @@ ScImportOptionsDlg::ScImportOptionsDlg( BOOL bOnlyDbtoolsEncodings, BOOL bImport ) - : ModalDialog ( pParent, ScResId( RID_SCDLG_IMPORTOPT ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_IMPORTOPT ) ), aFlFieldOpt ( this, ScResId( FL_FIELDOPT ) ), - aFtFont ( this, ScResId( FT_FONT ) ), + aFtFont ( this, ScResId( FT_FONT ) ), aLbFont ( this, ScResId( bAscii ? DDLB_FONT : LB_FONT ) ), - aFtFieldSep ( this, ScResId( FT_FIELDSEP ) ), - aEdFieldSep ( this, ScResId( ED_FIELDSEP ) ), - aFtTextSep ( this, ScResId( FT_TEXTSEP ) ), - aEdTextSep ( this, ScResId( ED_TEXTSEP ) ), + aFtFieldSep ( this, ScResId( FT_FIELDSEP ) ), + aEdFieldSep ( this, ScResId( ED_FIELDSEP ) ), + aFtTextSep ( this, ScResId( FT_TEXTSEP ) ), + aEdTextSep ( this, ScResId( ED_TEXTSEP ) ), aCbFixed ( this, ScResId( CB_FIXEDWIDTH ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), aCbShown ( this, ScResId( CB_SAVESHOWN ) ) { // im Ctor-Initializer nicht moeglich (MSC kann das nicht): @@ -278,7 +278,7 @@ USHORT ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const if ( !aStr.Len() ) { - nCode = 0; // kein Trennzeichen + nCode = 0; // kein Trennzeichen } else { diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index d66ff75d7530..2d8c43b88ae8 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,19 +62,19 @@ //============================================================================ -// class ScSpecialFilterDialog +// class ScSpecialFilterDialog //---------------------------------------------------------------------------- ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ) + const SfxItemSet& rArgSet ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SPEC_FILTER ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SPEC_FILTER ), // - aLbFilterArea ( this, ScResId( LB_CRITERIA_AREA ) ), - aFtFilterArea ( this, ScResId( FT_CRITERIA_AREA ) ), + aLbFilterArea ( this, ScResId( LB_CRITERIA_AREA ) ), + aFtFilterArea ( this, ScResId( FT_CRITERIA_AREA ) ), aEdFilterArea ( this, this, ScResId( ED_CRITERIA_AREA ) ), - aRbFilterArea ( this, ScResId( RB_CRITERIA_AREA ), &aEdFilterArea, this ), + aRbFilterArea ( this, ScResId( RB_CRITERIA_AREA ), &aEdFilterArea, this ), // aFlOptions ( this, ScResId( FL_OPTIONS ) ), _INIT_COMMON_FILTER_RSCOBJS @@ -83,16 +83,16 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi aBtnHelp ( this, ScResId( BTN_HELP ) ), aBtnMore ( this, ScResId( BTN_MORE ) ), // - pOptionsMgr ( NULL ), - nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), - theQueryData ( ((const ScQueryItem&) + pOptionsMgr ( NULL ), + nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), + theQueryData ( ((const ScQueryItem&) rArgSet.Get( nWhichQuery )).GetQueryData() ), - pOutItem ( NULL ), - pViewData ( NULL ), - pDoc ( NULL ), - pRefInputEdit ( NULL ), - bRefInputMode ( FALSE ), - pTimer ( NULL ) + pOutItem ( NULL ), + pViewData ( NULL ), + pDoc ( NULL ), + pRefInputEdit ( NULL ), + bRefInputMode ( FALSE ), + pTimer ( NULL ) { Init( rArgSet ); aEdFilterArea.GrabFocus(); @@ -135,22 +135,22 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) const ScQueryItem& rQueryItem = (const ScQueryItem&) rArgSet.Get( nWhichQuery ); - aBtnOk.SetClickHdl ( LINK( this, ScSpecialFilterDlg, EndDlgHdl ) ); - aBtnCancel.SetClickHdl ( LINK( this, ScSpecialFilterDlg, EndDlgHdl ) ); - aLbFilterArea.SetSelectHdl ( LINK( this, ScSpecialFilterDlg, FilterAreaSelHdl ) ); - aEdFilterArea.SetModifyHdl ( LINK( this, ScSpecialFilterDlg, FilterAreaModHdl ) ); + aBtnOk.SetClickHdl ( LINK( this, ScSpecialFilterDlg, EndDlgHdl ) ); + aBtnCancel.SetClickHdl ( LINK( this, ScSpecialFilterDlg, EndDlgHdl ) ); + aLbFilterArea.SetSelectHdl ( LINK( this, ScSpecialFilterDlg, FilterAreaSelHdl ) ); + aEdFilterArea.SetModifyHdl ( LINK( this, ScSpecialFilterDlg, FilterAreaModHdl ) ); - pViewData = rQueryItem.GetViewData(); - pDoc = pViewData ? pViewData->GetDocument() : NULL; + pViewData = rQueryItem.GetViewData(); + pDoc = pViewData ? pViewData->GetDocument() : NULL; - aEdFilterArea.SetText( EMPTY_STRING ); // may be overwritten below + aEdFilterArea.SetText( EMPTY_STRING ); // may be overwritten below if ( pViewData && pDoc ) { if(pDoc->GetChangeTrack()!=NULL) aBtnCopyResult.Disable(); - ScRangeName* pRangeNames = pDoc->GetRangeName(); - const USHORT nCount = pRangeNames ? pRangeNames->GetCount() : 0; + ScRangeName* pRangeNames = pDoc->GetRangeName(); + const USHORT nCount = pRangeNames ? pRangeNames->GetCount() : 0; /* * Aus den RangeNames des Dokumentes werden nun die @@ -162,9 +162,9 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) if ( nCount > 0 ) { - String aString; + String aString; ScRangeData* pData = NULL; - USHORT nInsert = 0; + USHORT nInsert = 0; for ( USHORT i=0; i<nCount; i++ ) { @@ -183,7 +183,7 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) } } - // is there a stored source range? + // is there a stored source range? ScRange aAdvSource; if (rQueryItem.GetAdvancedQuerySource(aAdvSource)) @@ -198,7 +198,7 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) // Optionen initialisieren lassen: - pOptionsMgr = new ScFilterOptionsMgr( + pOptionsMgr = new ScFilterOptionsMgr( this, pViewData, theQueryData, @@ -218,14 +218,14 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) aStrNoName, aStrUndefined ); - // #35206# Spezialfilter braucht immer Spaltenkoepfe + // #35206# Spezialfilter braucht immer Spaltenkoepfe aBtnHeader.Check(TRUE); aBtnHeader.Disable(); // Modal-Modus einschalten -// SetDispatcherLock( TRUE ); +// SetDispatcherLock( TRUE ); //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg + //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg } @@ -246,7 +246,7 @@ BOOL __EXPORT ScSpecialFilterDlg::Close() void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { - if ( bRefInputMode && pRefInputEdit ) // Nur moeglich, wenn im Referenz-Editmodus + if ( bRefInputMode && pRefInputEdit ) // Nur moeglich, wenn im Referenz-Editmodus { if ( rRef.aStart != rRef.aEnd ) RefInputStart( pRefInputEdit ); @@ -320,13 +320,13 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) if ( (pBtn == &aBtnOk) && pDoc && pViewData ) { - String theCopyStr( aEdCopyArea.GetText() ); - String theAreaStr( aEdFilterArea.GetText() ); - ScQueryParam theOutParam( theQueryData ); - ScAddress theAdrCopy; - BOOL bEditInputOk = TRUE; - BOOL bQueryOk = FALSE; - ScRange theFilterArea; + String theCopyStr( aEdCopyArea.GetText() ); + String theAreaStr( aEdFilterArea.GetText() ); + ScQueryParam theOutParam( theQueryData ); + ScAddress theAdrCopy; + BOOL bEditInputOk = TRUE; + BOOL bQueryOk = FALSE; + ScRange theFilterArea; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if ( aBtnCopyResult.IsChecked() ) @@ -369,7 +369,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) * ein ScQueryParam zu erzeugen: */ - USHORT nResult = theFilterArea.Parse( theAreaStr, pDoc, eConv ); + USHORT nResult = theFilterArea.Parse( theAreaStr, pDoc, eConv ); if ( SCA_VALID == (nResult & SCA_VALID) ) { @@ -378,23 +378,23 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) if ( aBtnCopyResult.IsChecked() ) { - theOutParam.bInplace = FALSE; - theOutParam.nDestTab = theAdrCopy.Tab(); - theOutParam.nDestCol = theAdrCopy.Col(); - theOutParam.nDestRow = theAdrCopy.Row(); + theOutParam.bInplace = FALSE; + theOutParam.nDestTab = theAdrCopy.Tab(); + theOutParam.nDestCol = theAdrCopy.Col(); + theOutParam.nDestRow = theAdrCopy.Row(); } else { - theOutParam.bInplace = TRUE; - theOutParam.nDestTab = 0; - theOutParam.nDestCol = 0; - theOutParam.nDestRow = 0; + theOutParam.bInplace = TRUE; + theOutParam.nDestTab = 0; + theOutParam.nDestCol = 0; + theOutParam.nDestRow = 0; } theOutParam.bHasHeader = aBtnHeader.IsChecked(); - theOutParam.bByRow = TRUE; + theOutParam.bByRow = TRUE; theOutParam.bCaseSens = aBtnCase.IsChecked(); - theOutParam.bRegExp = aBtnRegExp.IsChecked(); + theOutParam.bRegExp = aBtnRegExp.IsChecked(); theOutParam.bDuplicate = !aBtnUnique.IsChecked(); theOutParam.bDestPers = aBtnDestPers.IsChecked(); @@ -406,14 +406,14 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) rStart.Tab(), theOutParam ); - // an der DB-Collection koennen nur MAXQUERY Filter-Eintraege - // gespeichert werden + // an der DB-Collection koennen nur MAXQUERY Filter-Eintraege + // gespeichert werden if ( bQueryOk && theOutParam.GetEntryCount() > MAXQUERY && theOutParam.GetEntry(MAXQUERY).bDoQuery ) { - bQueryOk = FALSE; // zu viele - //! andere Fehlermeldung ?? + bQueryOk = FALSE; // zu viele + //! andere Fehlermeldung ?? } } } @@ -437,7 +437,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) { Close(); } - return 0; + return 0; } @@ -478,8 +478,8 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) { if ( pLb == &aLbFilterArea ) { - String aString; - USHORT nSelPos = aLbFilterArea.GetSelectEntryPos(); + String aString; + USHORT nSelPos = aLbFilterArea.GetSelectEntryPos(); if ( nSelPos > 0 ) aString = *(String*)aLbFilterArea.GetEntryData( nSelPos ); @@ -499,15 +499,15 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd ) { if ( pDoc && pViewData ) { - String theCurAreaStr = pEd->GetText(); - USHORT nResult = ScRange().Parse( theCurAreaStr, pDoc ); + String theCurAreaStr = pEd->GetText(); + USHORT nResult = ScRange().Parse( theCurAreaStr, pDoc ); if ( SCA_VALID == (nResult & SCA_VALID) ) { - String* pStr = NULL; - BOOL bFound = FALSE; - USHORT i = 0; - USHORT nCount = aLbFilterArea.GetEntryCount(); + String* pStr = NULL; + BOOL bFound = FALSE; + USHORT i = 0; + USHORT nCount = aLbFilterArea.GetEntryCount(); for ( i=1; i<nCount && !bFound; i++ ) { diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 0fbbe991e327..878922312e5d 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,24 +42,24 @@ #include <layout/layout-pre.hxx> #endif -ScSortDlg::ScSortDlg( Window* pParent, +ScSortDlg::ScSortDlg( Window* pParent, const SfxItemSet* pArgSet ) : SfxTabDialog( pParent, ScResId( RID_SCDLG_SORT ), pArgSet ), - bIsHeaders ( FALSE ), - bIsByRows ( FALSE ) + bIsHeaders ( FALSE ), + bIsByRows ( FALSE ) { #if LAYOUT_SFX_TABDIALOG_BROKEN - AddTabPage( TP_FIELDS, ScTabPageSortFields::Create, 0 ); - AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 ); + AddTabPage( TP_FIELDS, ScTabPageSortFields::Create, 0 ); + AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 ); #else String fields = rtl::OUString::createFromAscii ("fields"); AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, FALSE, TAB_APPEND); String options = rtl::OUString::createFromAscii ("options"); - AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND); -#endif + AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND); +#endif FreeResource(); } @@ -68,7 +68,7 @@ __EXPORT ScSortDlg::~ScSortDlg() } //================================================================== -ScSortWarningDlg::ScSortWarningDlg( Window* pParent, +ScSortWarningDlg::ScSortWarningDlg( Window* pParent, const String& rExtendText, const String& rCurrentText ): ModalDialog ( pParent, ScResId( RID_SCDLG_SORT_WARNING ) ), @@ -83,7 +83,7 @@ ScSortWarningDlg::ScSortWarningDlg( Window* pParent, sTextName.SearchAndReplaceAscii("%2", rCurrentText); aFtText.SetText( sTextName ); - aBtnExtSort .SetClickHdl( LINK( this, ScSortWarningDlg, BtnHdl ) ); + aBtnExtSort .SetClickHdl( LINK( this, ScSortWarningDlg, BtnHdl ) ); aBtnCurSort .SetClickHdl( LINK( this, ScSortWarningDlg, BtnHdl ) ); FreeResource(); diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index 172e887cf51e..97f7e2e8d005 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,12 +41,12 @@ //================================================================== -ScSubTotalDlg::ScSubTotalDlg( Window* pParent, - const SfxItemSet* pArgSet ) : +ScSubTotalDlg::ScSubTotalDlg( Window* pParent, + const SfxItemSet* pArgSet ) : SfxTabDialog( pParent, ScResId( RID_SCDLG_SUBTOTALS ), pArgSet ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ) + aBtnRemove ( this, ScResId( BTN_REMOVE ) ) { AddTabPage( PAGE_GROUP1, ScTpSubTotalGroup1::Create, 0 ); AddTabPage( PAGE_GROUP2, ScTpSubTotalGroup2::Create, 0 ); diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index 99253d6cc5a1..9dd22f0aee57 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ ScTextImportOptionsDlg::ScTextImportOptionsDlg(Window* pParent) : maBtnCancel(this, ScResId(BTN_CANCEL)), maBtnHelp(this, ScResId(BTN_HELP)), maFlChooseLang(this, ScResId(FL_CHOOSE_LANG)), - maRbAutomatic(this, ScResId(RB_AUTOMATIC)), + maRbAutomatic(this, ScResId(RB_AUTOMATIC)), maRbCustom(this, ScResId(RB_CUSTOM)), maLbCustomLang(this, ScResId(LB_CUSTOM_LANG)), maFlOption(this, ScResId(FL_OPTION)), diff --git a/sc/source/ui/dbgui/textimportoptions.src b/sc/source/ui/dbgui/textimportoptions.src index 69e2d69b3142..eacd8f008a46 100644 --- a/sc/source/ui/dbgui/textimportoptions.src +++ b/sc/source/ui/dbgui/textimportoptions.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS Pos = MAP_APPFONT( 6, 3 ) ; Size = MAP_APPFONT( 165, 14 ) ; - Text [ en-US ] = "Select the language to use for import" ; + Text [ en-US ] = "Select the language to use for import" ; }; RadioButton RB_AUTOMATIC @@ -71,7 +71,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS Size = MAP_APPFONT( 159, 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Automatic" ; + Text [ en-US ] = "Automatic" ; }; RadioButton RB_CUSTOM @@ -80,7 +80,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS Size = MAP_APPFONT( 159, 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Custom" ; + Text [ en-US ] = "Custom" ; }; ListBox LB_CUSTOM_LANG diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 7a54da38da03..6d5f6dc5c8d1 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ static USHORT pSortRanges[] = * * virtual BOOL HasExchangeSupport() const; -> return TRUE; * virtual void ActivatePage(const SfxItemSet &); - * virtual int DeactivatePage(SfxItemSet * = 0); + * virtual int DeactivatePage(SfxItemSet * = 0); * * muss noch geaendert werden! */ @@ -95,41 +95,41 @@ static USHORT pSortRanges[] = //======================================================================== // Sortierkriterien-Tabpage: -ScTabPageSortFields::ScTabPageSortFields( Window* pParent, +ScTabPageSortFields::ScTabPageSortFields( Window* pParent, const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( RID_SCPAGE_SORT_FIELDS ), rArgSet ), // aFlSort1 ( this, ScResId( FL_SORT1 ) ), - aLbSort1 ( this, ScResId( LB_SORT1 ) ), + aLbSort1 ( this, ScResId( LB_SORT1 ) ), aBtnUp1 ( this, ScResId( BTN_UP1 ) ), - aBtnDown1 ( this, ScResId( BTN_DOWN1 ) ), + aBtnDown1 ( this, ScResId( BTN_DOWN1 ) ), // aFlSort2 ( this, ScResId( FL_SORT2 ) ), - aLbSort2 ( this, ScResId( LB_SORT2 ) ), + aLbSort2 ( this, ScResId( LB_SORT2 ) ), aBtnUp2 ( this, ScResId( BTN_UP2 ) ), - aBtnDown2 ( this, ScResId( BTN_DOWN2 ) ), + aBtnDown2 ( this, ScResId( BTN_DOWN2 ) ), // aFlSort3 ( this, ScResId( FL_SORT3 ) ), - aLbSort3 ( this, ScResId( LB_SORT3 ) ), + aLbSort3 ( this, ScResId( LB_SORT3 ) ), aBtnUp3 ( this, ScResId( BTN_UP3 ) ), - aBtnDown3 ( this, ScResId( BTN_DOWN3 ) ), + aBtnDown3 ( this, ScResId( BTN_DOWN3 ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), - aStrColumn ( ScResId( SCSTR_COLUMN ) ), - aStrRow ( ScResId( SCSTR_ROW ) ), + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), + aStrColumn ( ScResId( SCSTR_COLUMN ) ), + aStrRow ( ScResId( SCSTR_ROW ) ), // - nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), - pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ), - pViewData ( NULL ), - rSortData ( ((const ScSortItem&) + nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), + pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ), + pViewData ( NULL ), + rSortData ( ((const ScSortItem&) rArgSet.Get( nWhichSort )). GetSortData() ), - nFieldCount ( 0 ), - bHasHeader ( FALSE ), - bSortByRows ( FALSE ) + nFieldCount ( 0 ), + bHasHeader ( FALSE ), + bSortByRows ( FALSE ) { Init(); FreeResource(); @@ -164,15 +164,15 @@ void ScTabPageSortFields::Init() aLbSort2.Clear(); aLbSort3.Clear(); - aSortLbArr[0] = &aLbSort1; - aSortLbArr[1] = &aLbSort2; - aSortLbArr[2] = &aLbSort3; - aDirBtnArr[0][0] = &aBtnUp1; - aDirBtnArr[0][1] = &aBtnDown1; - aDirBtnArr[1][0] = &aBtnUp2; - aDirBtnArr[1][1] = &aBtnDown2; - aDirBtnArr[2][0] = &aBtnUp3; - aDirBtnArr[2][1] = &aBtnDown3; + aSortLbArr[0] = &aLbSort1; + aSortLbArr[1] = &aLbSort2; + aSortLbArr[2] = &aLbSort3; + aDirBtnArr[0][0] = &aBtnUp1; + aDirBtnArr[0][1] = &aBtnDown1; + aDirBtnArr[1][0] = &aBtnUp2; + aDirBtnArr[1][1] = &aBtnDown2; + aDirBtnArr[2][0] = &aBtnUp3; + aDirBtnArr[2][1] = &aBtnDown3; aFlArr[0] = &aFlSort1; aFlArr[1] = &aFlSort2; aFlArr[2] = &aFlSort3; @@ -187,8 +187,8 @@ USHORT* __EXPORT ScTabPageSortFields::GetRanges() // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTabPageSortFields( pParent, rArgSet ) ); } @@ -198,7 +198,7 @@ SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent, void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) { bSortByRows = rSortData.bByRow; - bHasHeader = rSortData.bHasHeader; + bHasHeader = rSortData.bHasHeader; if ( aLbSort1.GetEntryCount() == 0 ) FillFieldLists(); @@ -215,13 +215,13 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) GetFieldSelPos( rSortData.nField[i] ) ); (rSortData.bAscending[i]) - ? aDirBtnArr[i][0]->Check() // Up - : aDirBtnArr[i][1]->Check(); // Down + ? aDirBtnArr[i][0]->Check() // Up + : aDirBtnArr[i][1]->Check(); // Down } else { aSortLbArr[i]->SelectEntryPos( 0 ); // "keiner" selektieren - aDirBtnArr[i][0]->Check(); // Up + aDirBtnArr[i][0]->Check(); // Up } } @@ -242,7 +242,7 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) else if( nCol > rSortData.nCol2 ) nCol = rSortData.nCol2; - USHORT nSort1Pos = nCol - rSortData.nCol1+1; + USHORT nSort1Pos = nCol - rSortData.nCol1+1; aLbSort1.SelectEntryPos( nSort1Pos ); aLbSort2.SelectEntryPos( 0 ); aLbSort3.SelectEntryPos( 0 ); @@ -274,9 +274,9 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) theSortData = ((const ScSortItem*)pItem)->GetSortData(); } - USHORT nSort1Pos = aLbSort1.GetSelectEntryPos(); - USHORT nSort2Pos = aLbSort2.GetSelectEntryPos(); - USHORT nSort3Pos = aLbSort3.GetSelectEntryPos(); + USHORT nSort1Pos = aLbSort1.GetSelectEntryPos(); + USHORT nSort2Pos = aLbSort2.GetSelectEntryPos(); + USHORT nSort3Pos = aLbSort3.GetSelectEntryPos(); DBG_ASSERT( (nSort1Pos <= SC_MAXFIELDS) && (nSort2Pos <= SC_MAXFIELDS) @@ -315,7 +315,7 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) theSortData.bAscending[0] = aBtnUp1.IsChecked(); theSortData.bAscending[1] = aBtnUp2.IsChecked(); theSortData.bAscending[2] = aBtnUp3.IsChecked(); - // bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert + // bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert } else { @@ -341,11 +341,11 @@ void __EXPORT ScTabPageSortFields::ActivatePage() if ( bHasHeader != pDlg->GetHeaders() || bSortByRows != pDlg->GetByRows() ) { - USHORT nCurSel1 = aLbSort1.GetSelectEntryPos(); - USHORT nCurSel2 = aLbSort2.GetSelectEntryPos(); - USHORT nCurSel3 = aLbSort3.GetSelectEntryPos(); + USHORT nCurSel1 = aLbSort1.GetSelectEntryPos(); + USHORT nCurSel2 = aLbSort2.GetSelectEntryPos(); + USHORT nCurSel3 = aLbSort3.GetSelectEntryPos(); - bHasHeader = pDlg->GetHeaders(); + bHasHeader = pDlg->GetHeaders(); bSortByRows = pDlg->GetByRows(); FillFieldLists(); aLbSort1.SelectEntryPos( nCurSel1 ); @@ -382,7 +382,7 @@ void ScTabPageSortFields::DisableField( USHORT nField ) if ( nField<=2 ) { - aSortLbArr[nField] ->Disable(); + aSortLbArr[nField] ->Disable(); aDirBtnArr[nField][0]->Disable(); aDirBtnArr[nField][1]->Disable(); aFlArr[nField] ->Disable(); @@ -397,7 +397,7 @@ void ScTabPageSortFields::EnableField( USHORT nField ) if ( nField<=2 ) { - aSortLbArr[nField] ->Enable(); + aSortLbArr[nField] ->Enable(); aDirBtnArr[nField][0]->Enable(); aDirBtnArr[nField][1]->Enable(); aFlArr[nField] ->Enable(); @@ -421,23 +421,23 @@ void ScTabPageSortFields::FillFieldLists() aLbSort2.InsertEntry( aStrUndefined, 0 ); aLbSort3.InsertEntry( aStrUndefined, 0 ); - SCCOL nFirstSortCol = rSortData.nCol1; - SCROW nFirstSortRow = rSortData.nRow1; - SCTAB nTab = pViewData->GetTabNo(); - USHORT i = 1; + SCCOL nFirstSortCol = rSortData.nCol1; + SCROW nFirstSortRow = rSortData.nRow1; + SCTAB nTab = pViewData->GetTabNo(); + USHORT i = 1; if ( bSortByRows ) { - String aFieldName; - SCCOL nMaxCol = rSortData.nCol2; - SCCOL col; + String aFieldName; + SCCOL nMaxCol = rSortData.nCol2; + SCCOL col; for ( col=nFirstSortCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ ) { pDoc->GetString( col, nFirstSortRow, nTab, aFieldName ); if ( !bHasHeader || (aFieldName.Len() == 0) ) { - aFieldName = aStrColumn; + aFieldName = aStrColumn; aFieldName += ' '; aFieldName += ScColToAlpha( col ); } @@ -450,16 +450,16 @@ void ScTabPageSortFields::FillFieldLists() } else { - String aFieldName; - SCROW nMaxRow = rSortData.nRow2; - SCROW row; + String aFieldName; + SCROW nMaxRow = rSortData.nRow2; + SCROW row; for ( row=nFirstSortRow; row<=nMaxRow && i<SC_MAXFIELDS; row++ ) { pDoc->GetString( nFirstSortCol, row, nTab, aFieldName ); if ( !bHasHeader || (aFieldName.Len() == 0) ) { - aFieldName = aStrRow; + aFieldName = aStrRow; aFieldName += ' '; aFieldName += String::CreateFromInt32( row+1 ); } @@ -479,8 +479,8 @@ void ScTabPageSortFields::FillFieldLists() USHORT ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField ) { - USHORT nFieldPos = 0; - BOOL bFound = FALSE; + USHORT nFieldPos = 0; + BOOL bFound = FALSE; for ( USHORT n=1; n<nFieldCount && !bFound; n++ ) { @@ -554,50 +554,50 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) #endif /* ENABLE_LAYOUT_EXPERIMENTAL */ -ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, - const SfxItemSet& rArgSet ) +ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, + const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( RID_SCPAGE_SORT_OPTIONS ), rArgSet ), // - aBtnCase ( this, ScResId( BTN_CASESENSITIVE ) ), - aBtnHeader ( this, ScResId( BTN_LABEL ) ), - aBtnFormats ( this, ScResId( BTN_FORMATS ) ), + aBtnCase ( this, ScResId( BTN_CASESENSITIVE ) ), + aBtnHeader ( this, ScResId( BTN_LABEL ) ), + aBtnFormats ( this, ScResId( BTN_FORMATS ) ), aBtnNaturalSort ( this, ScResId( BTN_NATURALSORT ) ), aBtnCopyResult ( this, ScResId( BTN_COPYRESULT ) ), - aLbOutPos ( this, ScResId( LB_OUTAREA ) ), - aEdOutPos ( this, ScResId( ED_OUTAREA ) ), - aBtnSortUser ( this, ScResId( BTN_SORT_USER ) ), - aLbSortUser ( this, ScResId( LB_SORT_USER ) ), + aLbOutPos ( this, ScResId( LB_OUTAREA ) ), + aEdOutPos ( this, ScResId( ED_OUTAREA ) ), + aBtnSortUser ( this, ScResId( BTN_SORT_USER ) ), + aLbSortUser ( this, ScResId( LB_SORT_USER ) ), aFtLanguage ( this, ScResId( FT_LANGUAGE ) ), - aLbLanguage ( this, ScResId( LB_LANGUAGE ) ), + aLbLanguage ( this, ScResId( LB_LANGUAGE ) ), aFtAlgorithm ( this, ScResId( FT_ALGORITHM ) ), - aLbAlgorithm ( this, ScResId( LB_ALGORITHM ) ), - aLineDirection ( this, ScResId( FL_DIRECTION ) ), - aBtnTopDown ( this, ScResId( BTN_TOP_DOWN ) ), - aBtnLeftRight ( this, ScResId( BTN_LEFT_RIGHT ) ), -// aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ), -// aFtArea ( this, ScResId( FT_AREA ) ), + aLbAlgorithm ( this, ScResId( LB_ALGORITHM ) ), + aLineDirection ( this, ScResId( FL_DIRECTION ) ), + aBtnTopDown ( this, ScResId( BTN_TOP_DOWN ) ), + aBtnLeftRight ( this, ScResId( BTN_LEFT_RIGHT ) ), +// aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ), +// aFtArea ( this, ScResId( FT_AREA ) ), // #if ENABLE_LAYOUT_EXPERIMENTAL #undef this #undef ScResId #define ScResId(x) this, #x #endif /* ENABLE_LAYOUT_EXPERIMENTAL */ - aStrRowLabel ( ScResId( STR_ROW_LABEL ) ), - aStrColLabel ( ScResId( STR_COL_LABEL ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), - aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), + aStrRowLabel ( ScResId( STR_ROW_LABEL ) ), + aStrColLabel ( ScResId( STR_COL_LABEL ) ), + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), + aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), // - nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), - rSortData ( ((const ScSortItem&) + nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), + rSortData ( ((const ScSortItem&) rArgSet.Get( nWhichSort )).GetSortData() ), - pViewData ( NULL ), - pDoc ( NULL ), - pDlg ( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ), - pColRes ( NULL ), - pColWrap ( NULL ) + pViewData ( NULL ), + pDoc ( NULL ), + pDlg ( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ), + pColRes ( NULL ), + pColWrap ( NULL ) { Init(); FreeResource(); @@ -614,44 +614,44 @@ __EXPORT ScTabPageSortOptions::~ScTabPageSortOptions() delete (String*)aLbOutPos.GetEntryData( i ); delete pColRes; - delete pColWrap; //! not if from document + delete pColWrap; //! not if from document } // ----------------------------------------------------------------------- void ScTabPageSortOptions::Init() { -// aStrAreaLabel = aFtAreaLabel.GetText(); -// aStrAreaLabel.Append( (sal_Unicode) ' ' ); +// aStrAreaLabel = aFtAreaLabel.GetText(); +// aStrAreaLabel.Append( (sal_Unicode) ' ' ); - // CollatorRessource has user-visible names for sort algorithms + // CollatorRessource has user-visible names for sort algorithms pColRes = new CollatorRessource(); - //! use CollatorWrapper from document? + //! use CollatorWrapper from document? pColWrap = new CollatorWrapper( comphelper::getProcessServiceFactory() ); - const ScSortItem& rSortItem = (const ScSortItem&) + const ScSortItem& rSortItem = (const ScSortItem&) GetItemSet().Get( nWhichSort ); - aLbOutPos.SetSelectHdl ( LINK( this, ScTabPageSortOptions, SelOutPosHdl ) ); + aLbOutPos.SetSelectHdl ( LINK( this, ScTabPageSortOptions, SelOutPosHdl ) ); aBtnCopyResult.SetClickHdl( LINK( this, ScTabPageSortOptions, EnableHdl ) ); aBtnSortUser.SetClickHdl ( LINK( this, ScTabPageSortOptions, EnableHdl ) ); - aBtnTopDown.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) ); + aBtnTopDown.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) ); aBtnLeftRight.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) ); aLbLanguage.SetSelectHdl ( LINK( this, ScTabPageSortOptions, FillAlgorHdl ) ); pViewData = rSortItem.GetViewData(); - pDoc = pViewData ? pViewData->GetDocument() : NULL; + pDoc = pViewData ? pViewData->GetDocument() : NULL; DBG_ASSERT( pViewData, "ViewData not found! :-/" ); if ( pViewData && pDoc ) { - String theArea; - ScDBCollection* pDBColl = pDoc->GetDBCollection(); - String theDbArea; - String theDbName = aStrNoName; - const SCTAB nCurTab = pViewData->GetTabNo(); + String theArea; + ScDBCollection* pDBColl = pDoc->GetDBCollection(); + String theDbArea; + String theDbName = aStrNoName; + const SCTAB nCurTab = pViewData->GetTabNo(); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); aLbOutPos.Clear(); @@ -709,7 +709,7 @@ void ScTabPageSortOptions::Init() FillUserSortListBox(); - // get available languages + // get available languages aLbLanguage.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE ); aLbLanguage.InsertLanguage( LANGUAGE_SYSTEM ); @@ -728,8 +728,8 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges() #undef SfxTabPage #endif /* ENABLE_LAYOUT_EXPERIMENTAL */ SfxTabPage* __EXPORT ScTabPageSortOptions::Create( - Window* pParent, - const SfxItemSet& rArgSet ) + Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTabPageSortOptions( pParent, rArgSet ) ); } @@ -751,10 +751,10 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) aLbSortUser.SelectEntryPos( 0 ); } - aBtnCase.Check ( rSortData.bCaseSens ); - aBtnFormats.Check ( rSortData.bIncludePattern ); - aBtnHeader.Check ( rSortData.bHasHeader ); - aBtnNaturalSort.Check ( rSortData.bNaturalSort ); + aBtnCase.Check ( rSortData.bCaseSens ); + aBtnFormats.Check ( rSortData.bIncludePattern ); + aBtnHeader.Check ( rSortData.bHasHeader ); + aBtnNaturalSort.Check ( rSortData.bNaturalSort ); if ( rSortData.bByRow ) { @@ -771,7 +771,7 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) if ( eLang == LANGUAGE_DONTKNOW ) eLang = LANGUAGE_SYSTEM; aLbLanguage.SelectLanguage( eLang ); - FillAlgorHdl( &aLbLanguage ); // get algorithms, select default + FillAlgorHdl( &aLbLanguage ); // get algorithms, select default if ( rSortData.aCollatorAlgorithm.Len() ) aLbAlgorithm.SelectEntry( pColRes->GetTranslation( rSortData.aCollatorAlgorithm ) ); @@ -817,17 +817,17 @@ BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) theSortData = ((const ScSortItem*)pItem)->GetSortData(); } - theSortData.bByRow = aBtnTopDown.IsChecked(); - theSortData.bHasHeader = aBtnHeader.IsChecked(); - theSortData.bCaseSens = aBtnCase.IsChecked(); - theSortData.bNaturalSort = aBtnNaturalSort.IsChecked(); + theSortData.bByRow = aBtnTopDown.IsChecked(); + theSortData.bHasHeader = aBtnHeader.IsChecked(); + theSortData.bCaseSens = aBtnCase.IsChecked(); + theSortData.bNaturalSort = aBtnNaturalSort.IsChecked(); theSortData.bIncludePattern = aBtnFormats.IsChecked(); - theSortData.bInplace = !aBtnCopyResult.IsChecked(); - theSortData.nDestCol = theOutPos.Col(); - theSortData.nDestRow = theOutPos.Row(); - theSortData.nDestTab = theOutPos.Tab(); - theSortData.bUserDef = aBtnSortUser.IsChecked(); - theSortData.nUserIndex = (aBtnSortUser.IsChecked()) + theSortData.bInplace = !aBtnCopyResult.IsChecked(); + theSortData.nDestCol = theOutPos.Col(); + theSortData.nDestRow = theOutPos.Row(); + theSortData.nDestTab = theOutPos.Tab(); + theSortData.bUserDef = aBtnSortUser.IsChecked(); + theSortData.nUserIndex = (aBtnSortUser.IsChecked()) ? aLbSortUser.GetSelectEntryPos() : 0; @@ -885,17 +885,17 @@ int __EXPORT ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) if ( aBtnCopyResult.IsChecked() ) { - String thePosStr = aEdOutPos.GetText(); - ScAddress thePos; - xub_StrLen nColonPos = thePosStr.Search( ':' ); + String thePosStr = aEdOutPos.GetText(); + ScAddress thePos; + xub_StrLen nColonPos = thePosStr.Search( ':' ); if ( STRING_NOTFOUND != nColonPos ) thePosStr.Erase( nColonPos ); if ( pViewData ) { - // visible table is default for input without table - // must be changed to GetRefTabNo when sorting has RefInput! + // visible table is default for input without table + // must be changed to GetRefTabNo when sorting has RefInput! thePos.SetTab( pViewData->GetTabNo() ); } @@ -987,8 +987,8 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) { if ( pLb == &aLbOutPos ) { - String aString; - USHORT nSelPos = aLbOutPos.GetSelectEntryPos(); + String aString; + USHORT nSelPos = aLbOutPos.GetSelectEntryPos(); if ( nSelPos > 0 ) aString = *(String*)aLbOutPos.GetEntryData( nSelPos ); @@ -1019,15 +1019,15 @@ void __EXPORT ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) { if ( pEd == &aEdOutPos ) { - String theCurPosStr = aEdOutPos.GetText(); - USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); + String theCurPosStr = aEdOutPos.GetText(); + USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); if ( SCA_VALID == (nResult & SCA_VALID) ) { - String* pStr = NULL; - BOOL bFound = FALSE; - USHORT i = 0; - USHORT nCount = aLbOutPos.GetEntryCount(); + String* pStr = NULL; + BOOL bFound = FALSE; + USHORT i = 0; + USHORT nCount = aLbOutPos.GetEntryCount(); for ( i=2; i<nCount && !bFound; i++ ) { @@ -1053,11 +1053,11 @@ IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG ) LanguageType eLang = aLbLanguage.GetSelectLanguage(); if ( eLang == LANGUAGE_SYSTEM ) { - // for LANGUAGE_SYSTEM no algorithm can be selected because - // it wouldn't necessarily exist for other languages - // -> leave list box empty if LANGUAGE_SYSTEM is selected + // for LANGUAGE_SYSTEM no algorithm can be selected because + // it wouldn't necessarily exist for other languages + // -> leave list box empty if LANGUAGE_SYSTEM is selected aFtAlgorithm.Enable( FALSE ); // nothing to select - aLbAlgorithm.Enable( FALSE ); // nothing to select + aLbAlgorithm.Enable( FALSE ); // nothing to select } else { @@ -1072,9 +1072,9 @@ IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG ) String sUser = pColRes->GetTranslation( sAlg ); aLbAlgorithm.InsertEntry( sUser, LISTBOX_APPEND ); } - aLbAlgorithm.SelectEntryPos( 0 ); // first entry is default + aLbAlgorithm.SelectEntryPos( 0 ); // first entry is default aFtAlgorithm.Enable( nCount > 1 ); // enable only if there is a choice - aLbAlgorithm.Enable( nCount > 1 ); // enable only if there is a choice + aLbAlgorithm.Enable( nCount > 1 ); // enable only if there is a choice } aLbAlgorithm.SetUpdateMode( TRUE ); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index b4d6519d3388..cceac3df79e5 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,26 +60,26 @@ static USHORT pSubTotalsRanges[] = ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, USHORT nResId, const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( nResId ), rArgSet ), // - aFtGroup ( this, ScResId( FT_GROUP ) ), - aLbGroup ( this, ScResId( LB_GROUP ) ), - aFtColumns ( this, ScResId( FT_COLUMNS ) ), - aLbColumns ( this, ScResId( WND_COLUMNS ) ), - aFtFunctions ( this, ScResId( FT_FUNCTIONS ) ), - aLbFunctions ( this, ScResId( LB_FUNCTIONS ) ), - aStrNone ( ScResId( SCSTR_NONE ) ), - aStrColumn ( ScResId( SCSTR_COLUMN ) ), + aFtGroup ( this, ScResId( FT_GROUP ) ), + aLbGroup ( this, ScResId( LB_GROUP ) ), + aFtColumns ( this, ScResId( FT_COLUMNS ) ), + aLbColumns ( this, ScResId( WND_COLUMNS ) ), + aFtFunctions ( this, ScResId( FT_FUNCTIONS ) ), + aLbFunctions ( this, ScResId( LB_FUNCTIONS ) ), + aStrNone ( ScResId( SCSTR_NONE ) ), + aStrColumn ( ScResId( SCSTR_COLUMN ) ), // - pViewData ( NULL ), - pDoc ( NULL ), + pViewData ( NULL ), + pDoc ( NULL ), nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ), - rSubTotalData ( ((const ScSubTotalItem&) + rSubTotalData ( ((const ScSubTotalItem&) rArgSet.Get( nWhichSubTotals )). GetSubTotalData() ), - nFieldCount ( 0 ) + nFieldCount ( 0 ) { // Font is correctly initialized by SvTreeListBox ctor aLbColumns.SetSelectionMode( SINGLE_SELECTION ); @@ -95,7 +95,7 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, USHORT nResId, __EXPORT ScTpSubTotalGroup::~ScTpSubTotalGroup() { - USHORT nCount = (USHORT)aLbColumns.GetEntryCount(); + USHORT nCount = (USHORT)aLbColumns.GetEntryCount(); if ( nCount > 0 ) { @@ -118,15 +118,15 @@ void ScTpSubTotalGroup::Init() const ScSubTotalItem& rSubTotalItem = (const ScSubTotalItem&) GetItemSet().Get( nWhichSubTotals ); - pViewData = rSubTotalItem.GetViewData(); - pDoc = ( pViewData ) ? pViewData->GetDocument() : NULL; + pViewData = rSubTotalItem.GetViewData(); + pDoc = ( pViewData ) ? pViewData->GetDocument() : NULL; DBG_ASSERT( pViewData && pDoc, "ViewData or Document not found :-(" ); - aLbGroup.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); - aLbColumns.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); - aLbColumns.SetCheckButtonHdl ( LINK( this, ScTpSubTotalGroup, CheckHdl ) ); - aLbFunctions.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); + aLbGroup.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); + aLbColumns.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); + aLbColumns.SetCheckButtonHdl ( LINK( this, ScTpSubTotalGroup, CheckHdl ) ); + aLbFunctions.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); nFieldArr[0] = 0; FillListBoxes(); @@ -141,8 +141,8 @@ USHORT* __EXPORT ScTpSubTotalGroup::GetRanges() // ----------------------------------------------------------------------- -BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo, - const SfxItemSet& rArgSet ) +BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo, + const SfxItemSet& rArgSet ) { USHORT nGroupIdx = 0; @@ -169,16 +169,16 @@ BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo, if ( theSubTotalData.bGroupActive[nGroupIdx] ) { - SCCOL nField = theSubTotalData.nField[nGroupIdx]; - SCCOL nSubTotals = theSubTotalData.nSubTotals[nGroupIdx]; - SCCOL* pSubTotals = theSubTotalData.pSubTotals[nGroupIdx]; - ScSubTotalFunc* pFunctions = theSubTotalData.pFunctions[nGroupIdx]; + SCCOL nField = theSubTotalData.nField[nGroupIdx]; + SCCOL nSubTotals = theSubTotalData.nSubTotals[nGroupIdx]; + SCCOL* pSubTotals = theSubTotalData.pSubTotals[nGroupIdx]; + ScSubTotalFunc* pFunctions = theSubTotalData.pFunctions[nGroupIdx]; aLbGroup.SelectEntryPos( GetFieldSelPos( nField )+1 ); for ( USHORT i=0; i<nSubTotals; i++ ) { - USHORT nCheckPos = GetFieldSelPos( pSubTotals[i] ); + USHORT nCheckPos = GetFieldSelPos( pSubTotals[i] ); USHORT* pFunction = (USHORT*)aLbColumns.GetEntryData( nCheckPos ); aLbColumns.CheckEntryPos( nCheckPos ); @@ -198,8 +198,8 @@ BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo, // ----------------------------------------------------------------------- -BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo, - SfxItemSet& rArgSet ) +BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo, + SfxItemSet& rArgSet ) { USHORT nGroupIdx = 0; @@ -221,7 +221,7 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo, //---------------------------------------------------------- - ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt + ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt SfxTabDialog* pDlg = GetTabDialog(); if ( pDlg ) { @@ -231,26 +231,26 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo, theSubTotalData = ((const ScSubTotalItem*)pItem)->GetSubTotalData(); } - ScSubTotalFunc* pFunctions = NULL; - SCCOL* pSubTotals = NULL; - USHORT nGroup = aLbGroup.GetSelectEntryPos(); - USHORT nEntryCount = (USHORT)aLbColumns.GetEntryCount(); - USHORT nCheckCount = aLbColumns.GetCheckedEntryCount(); + ScSubTotalFunc* pFunctions = NULL; + SCCOL* pSubTotals = NULL; + USHORT nGroup = aLbGroup.GetSelectEntryPos(); + USHORT nEntryCount = (USHORT)aLbColumns.GetEntryCount(); + USHORT nCheckCount = aLbColumns.GetCheckedEntryCount(); - theSubTotalData.nCol1 = rSubTotalData.nCol1; - theSubTotalData.nRow1 = rSubTotalData.nRow1; - theSubTotalData.nCol2 = rSubTotalData.nCol2; - theSubTotalData.nRow2 = rSubTotalData.nRow2; + theSubTotalData.nCol1 = rSubTotalData.nCol1; + theSubTotalData.nRow1 = rSubTotalData.nRow1; + theSubTotalData.nCol2 = rSubTotalData.nCol2; + theSubTotalData.nRow2 = rSubTotalData.nRow2; theSubTotalData.bGroupActive[nGroupIdx] = (nGroup != 0); - theSubTotalData.nField[nGroupIdx] = (nGroup != 0) + theSubTotalData.nField[nGroupIdx] = (nGroup != 0) ? nFieldArr[nGroup-1] : static_cast<SCCOL>(0); if ( nEntryCount>0 && nCheckCount>0 && nGroup!=0 ) { - USHORT nFunction = 0; + USHORT nFunction = 0; - pSubTotals = new SCCOL [nCheckCount]; + pSubTotals = new SCCOL [nCheckCount]; pFunctions = new ScSubTotalFunc [nCheckCount]; for ( USHORT i=0, nCheck=0; i<nEntryCount; i++ ) @@ -265,7 +265,7 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo, nCheck++; } } - theSubTotalData.SetSubTotals( nGroupNo, // Gruppen-Nr. + theSubTotalData.SetSubTotals( nGroupNo, // Gruppen-Nr. pSubTotals, pFunctions, nCheckCount ); // Anzahl der Array-Elemente @@ -288,13 +288,13 @@ void ScTpSubTotalGroup::FillListBoxes() if ( pViewData && pDoc ) { - SCCOL nFirstCol = rSubTotalData.nCol1; - SCROW nFirstRow = rSubTotalData.nRow1; - SCTAB nTab = pViewData->GetTabNo(); - SCCOL nMaxCol = rSubTotalData.nCol2; - SCCOL col; - USHORT i=0; - String aFieldName; + SCCOL nFirstCol = rSubTotalData.nCol1; + SCROW nFirstRow = rSubTotalData.nRow1; + SCTAB nTab = pViewData->GetTabNo(); + SCCOL nMaxCol = rSubTotalData.nCol2; + SCCOL col; + USHORT i=0; + String aFieldName; aLbGroup.Clear(); aLbColumns.Clear(); @@ -325,8 +325,8 @@ void ScTpSubTotalGroup::FillListBoxes() USHORT ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField ) { - USHORT nFieldPos = 0; - BOOL bFound = FALSE; + USHORT nFieldPos = 0; + BOOL bFound = FALSE; for ( USHORT n=0; n<nFieldCount && !bFound; n++ ) { @@ -346,18 +346,18 @@ ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( USHORT nPos ) { switch ( nPos ) { -// case 0: return SUBTOTAL_FUNC_NONE; - case 2: return SUBTOTAL_FUNC_AVE; - case 6: return SUBTOTAL_FUNC_CNT; - case 1: return SUBTOTAL_FUNC_CNT2; - case 3: return SUBTOTAL_FUNC_MAX; - case 4: return SUBTOTAL_FUNC_MIN; - case 5: return SUBTOTAL_FUNC_PROD; - case 7: return SUBTOTAL_FUNC_STD; - case 8: return SUBTOTAL_FUNC_STDP; - case 0: return SUBTOTAL_FUNC_SUM; - case 9: return SUBTOTAL_FUNC_VAR; - case 10: return SUBTOTAL_FUNC_VARP; +// case 0: return SUBTOTAL_FUNC_NONE; + case 2: return SUBTOTAL_FUNC_AVE; + case 6: return SUBTOTAL_FUNC_CNT; + case 1: return SUBTOTAL_FUNC_CNT2; + case 3: return SUBTOTAL_FUNC_MAX; + case 4: return SUBTOTAL_FUNC_MIN; + case 5: return SUBTOTAL_FUNC_PROD; + case 7: return SUBTOTAL_FUNC_STD; + case 8: return SUBTOTAL_FUNC_STDP; + case 0: return SUBTOTAL_FUNC_SUM; + case 9: return SUBTOTAL_FUNC_VAR; + case 10: return SUBTOTAL_FUNC_VARP; default: DBG_ERROR( "ScTpSubTotalGroup::LbPosToFunc" ); return SUBTOTAL_FUNC_NONE; @@ -370,18 +370,18 @@ USHORT ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) { switch ( eFunc ) { -// case SUBTOTAL_FUNC_NONE: return 0; - case SUBTOTAL_FUNC_AVE: return 2; - case SUBTOTAL_FUNC_CNT: return 6; - case SUBTOTAL_FUNC_CNT2: return 1; - case SUBTOTAL_FUNC_MAX: return 3; - case SUBTOTAL_FUNC_MIN: return 4; - case SUBTOTAL_FUNC_PROD: return 5; - case SUBTOTAL_FUNC_STD: return 7; - case SUBTOTAL_FUNC_STDP: return 8; - case SUBTOTAL_FUNC_SUM: return 0; - case SUBTOTAL_FUNC_VAR: return 9; - case SUBTOTAL_FUNC_VARP: return 10; +// case SUBTOTAL_FUNC_NONE: return 0; + case SUBTOTAL_FUNC_AVE: return 2; + case SUBTOTAL_FUNC_CNT: return 6; + case SUBTOTAL_FUNC_CNT2: return 1; + case SUBTOTAL_FUNC_MAX: return 3; + case SUBTOTAL_FUNC_MIN: return 4; + case SUBTOTAL_FUNC_PROD: return 5; + case SUBTOTAL_FUNC_STD: return 7; + case SUBTOTAL_FUNC_STDP: return 8; + case SUBTOTAL_FUNC_SUM: return 0; + case SUBTOTAL_FUNC_VAR: return 9; + case SUBTOTAL_FUNC_VARP: return 10; default: DBG_ERROR( "ScTpSubTotalGroup::FuncToLbPos" ); return 0; @@ -397,9 +397,9 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb ) if ( (aLbColumns.GetEntryCount() > 0) && (aLbColumns.GetSelectionCount() > 0) ) { - USHORT nFunction = aLbFunctions.GetSelectEntryPos(); - USHORT nColumn = aLbColumns.GetSelectEntryPos(); - USHORT* pFunction = (USHORT*)aLbColumns.GetEntryData( nColumn ); + USHORT nFunction = aLbFunctions.GetSelectEntryPos(); + USHORT nColumn = aLbColumns.GetSelectEntryPos(); + USHORT* pFunction = (USHORT*)aLbColumns.GetEntryData( nColumn ); DBG_ASSERT( pFunction, "EntryData nicht gefunden!" ); if ( !pFunction ) @@ -412,7 +412,7 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb ) else if ( pLb == &aLbFunctions ) { *pFunction = nFunction; -// aLbColumns.CheckEntryPos( nColumn, (nFunction != 0) );//XXX +// aLbColumns.CheckEntryPos( nColumn, (nFunction != 0) );//XXX aLbColumns.CheckEntryPos( nColumn, TRUE ); } } @@ -439,20 +439,20 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) //======================================================================== // Abgeleitete Gruppen-TabPages: -SfxTabPage* __EXPORT ScTpSubTotalGroup1::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTpSubTotalGroup1::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup1( pParent, rArgSet ) ); } // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTpSubTotalGroup2::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTpSubTotalGroup2::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup2( pParent, rArgSet ) ); } // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTpSubTotalGroup3::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTpSubTotalGroup3::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup3( pParent, rArgSet ) ); } // ----------------------------------------------------------------------- @@ -497,28 +497,28 @@ BOOL __EXPORT ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FI //======================================================================== // Optionen-Tabpage: -ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, - const SfxItemSet& rArgSet ) +ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, + const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( RID_SCPAGE_SUBT_OPTIONS ), rArgSet ), // aFlGroup ( this, ScResId( FL_GROUP ) ), - aBtnPagebreak ( this, ScResId( BTN_PAGEBREAK ) ), - aBtnCase ( this, ScResId( BTN_CASE ) ), - aBtnSort ( this, ScResId( BTN_SORT ) ), + aBtnPagebreak ( this, ScResId( BTN_PAGEBREAK ) ), + aBtnCase ( this, ScResId( BTN_CASE ) ), + aBtnSort ( this, ScResId( BTN_SORT ) ), aFlSort ( this, ScResId( FL_SORT ) ), - aBtnAscending ( this, ScResId( BTN_ASCENDING ) ), - aBtnDescending ( this, ScResId( BTN_DESCENDING ) ), - aBtnFormats ( this, ScResId( BTN_FORMATS ) ), - aBtnUserDef ( this, ScResId( BTN_USERDEF ) ), - aLbUserDef ( this, ScResId( LB_USERDEF ) ), + aBtnAscending ( this, ScResId( BTN_ASCENDING ) ), + aBtnDescending ( this, ScResId( BTN_DESCENDING ) ), + aBtnFormats ( this, ScResId( BTN_FORMATS ) ), + aBtnUserDef ( this, ScResId( BTN_USERDEF ) ), + aLbUserDef ( this, ScResId( LB_USERDEF ) ), // - pViewData ( NULL ), - pDoc ( NULL ), + pViewData ( NULL ), + pDoc ( NULL ), nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ), - rSubTotalData ( ((const ScSubTotalItem&) + rSubTotalData ( ((const ScSubTotalItem&) rArgSet.Get( nWhichSubTotals )). GetSubTotalData() ) { @@ -539,21 +539,21 @@ void ScTpSubTotalOptions::Init() const ScSubTotalItem& rSubTotalItem = (const ScSubTotalItem&) GetItemSet().Get( nWhichSubTotals ); - pViewData = rSubTotalItem.GetViewData(); - pDoc = ( pViewData ) ? pViewData->GetDocument() : NULL; + pViewData = rSubTotalItem.GetViewData(); + pDoc = ( pViewData ) ? pViewData->GetDocument() : NULL; DBG_ASSERT( pViewData && pDoc, "ViewData oder Document nicht gefunden!" ); - aBtnSort.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); - aBtnUserDef.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); + aBtnSort.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); + aBtnUserDef.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); FillUserSortListBox(); } // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTpSubTotalOptions::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTpSubTotalOptions::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalOptions( pParent, rArgSet ) ); } @@ -563,9 +563,9 @@ SfxTabPage* __EXPORT ScTpSubTotalOptions::Create( Window* pParent void __EXPORT ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) { aBtnPagebreak.Check ( rSubTotalData.bPagebreak ); - aBtnCase.Check ( rSubTotalData.bCaseSens ); - aBtnFormats.Check ( rSubTotalData.bIncludePattern ); - aBtnSort.Check ( rSubTotalData.bDoSort ); + aBtnCase.Check ( rSubTotalData.bCaseSens ); + aBtnFormats.Check ( rSubTotalData.bIncludePattern ); + aBtnSort.Check ( rSubTotalData.bDoSort ); aBtnAscending.Check ( rSubTotalData.bAscending ); aBtnDescending.Check( !rSubTotalData.bAscending ); @@ -589,7 +589,7 @@ void __EXPORT ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) BOOL __EXPORT ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) { - ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt + ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt SfxTabDialog* pDlg = GetTabDialog(); if ( pDlg ) { @@ -599,14 +599,14 @@ BOOL __EXPORT ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) theSubTotalData = ((const ScSubTotalItem*)pItem)->GetSubTotalData(); } - theSubTotalData.bPagebreak = aBtnPagebreak.IsChecked(); - theSubTotalData.bReplace = TRUE; - theSubTotalData.bCaseSens = aBtnCase.IsChecked(); + theSubTotalData.bPagebreak = aBtnPagebreak.IsChecked(); + theSubTotalData.bReplace = TRUE; + theSubTotalData.bCaseSens = aBtnCase.IsChecked(); theSubTotalData.bIncludePattern = aBtnFormats.IsChecked(); - theSubTotalData.bDoSort = aBtnSort.IsChecked(); - theSubTotalData.bAscending = aBtnAscending.IsChecked(); - theSubTotalData.bUserDef = aBtnUserDef.IsChecked(); - theSubTotalData.nUserIndex = (aBtnUserDef.IsChecked()) + theSubTotalData.bDoSort = aBtnSort.IsChecked(); + theSubTotalData.bAscending = aBtnAscending.IsChecked(); + theSubTotalData.bUserDef = aBtnUserDef.IsChecked(); + theSubTotalData.nUserIndex = (aBtnUserDef.IsChecked()) ? aLbUserDef.GetSelectEntryPos() : 0; @@ -641,10 +641,10 @@ IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox ) if ( aBtnSort.IsChecked() ) { aFlSort .Enable(); - aBtnFormats .Enable(); - aBtnUserDef .Enable(); - aBtnAscending .Enable(); - aBtnDescending .Enable(); + aBtnFormats .Enable(); + aBtnUserDef .Enable(); + aBtnAscending .Enable(); + aBtnDescending .Enable(); if ( aBtnUserDef.IsChecked() ) aLbUserDef.Enable(); @@ -652,11 +652,11 @@ IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox ) else { aFlSort .Disable(); - aBtnFormats .Disable(); - aBtnUserDef .Disable(); - aBtnAscending .Disable(); - aBtnDescending .Disable(); - aLbUserDef .Disable(); + aBtnFormats .Disable(); + aBtnUserDef .Disable(); + aBtnAscending .Disable(); + aBtnDescending .Disable(); + aLbUserDef .Disable(); } } else if ( pBox == &aBtnUserDef ) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 6eed9ab7fee0..9ec9740e1208 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ #include "formula/opcode.hxx" // cell range picker -#include "tabvwsh.hxx" +#include "tabvwsh.hxx" #include <sfx2/viewfrm.hxx> #include <sfx2/childwin.hxx> #include "reffact.hxx" @@ -62,7 +62,7 @@ static USHORT pValueRanges[] = { - FID_VALID_MODE, FID_VALID_ERRTEXT, + FID_VALID_MODE, FID_VALID_ERRTEXT, FID_VALID_LISTTYPE, FID_VALID_LISTTYPE, 0 }; @@ -70,7 +70,7 @@ static USHORT pValueRanges[] = // ============================================================================ -ScValidationDlg::ScValidationDlg( Window* pParent, +ScValidationDlg::ScValidationDlg( Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/ @@ -90,12 +90,12 @@ void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pD { if ( rRange.aStart != rRange.aEnd ) if ( ScValidationDlg *pValidationDlg = GetValidationDlg() ) - if( m_pRefEdit ) + if( m_pRefEdit ) pValidationDlg->RefInputStart( m_pRefEdit ); if ( m_pRefEdit ) { - String aStr; + String aStr; rRange.Format( aStr, SCR_ABS_3D, pDoc ); m_pRefEdit->SetRefString( aStr ); } @@ -104,15 +104,15 @@ void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pD void ScTPValidationValue:: SetActiveHdl() { if ( m_pRefEdit ) m_pRefEdit->GrabFocus(); - + if ( ScValidationDlg *pValidationDlg = GetValidationDlg() ) - if( m_pRefEdit ) + if( m_pRefEdit ) { pValidationDlg->RefInputDone(); } } -void ScTPValidationValue::RefInputStartPreHdl( ScRefEdit* pEdit, ScRefButton* pButton ) +void ScTPValidationValue::RefInputStartPreHdl( ScRefEdit* pEdit, ScRefButton* pButton ) { if ( ScValidationDlg *pValidationDlg = GetValidationDlg() ) { @@ -131,9 +131,9 @@ void ScTPValidationValue::RefInputStartPreHdl( ScRefEdit* pEdit, ScRe } } -void ScTPValidationValue::RefInputDonePreHdl() +void ScTPValidationValue::RefInputDonePreHdl() { - + if( m_pRefEdit && m_pRefEdit->GetParent()!= this ) { if( Window *pPreWnd = m_pRefEdit==&maEdMax?&maFtMax:(m_pRefEdit==&maEdMin?&maFtMin:NULL) ) @@ -146,19 +146,19 @@ void ScTPValidationValue::RefInputDonePreHdl() m_btnRef.SetParent( m_pRefEdit ); //if Edit SetParent but button not, the tab order will be incorrect, need button to setparent to anthor window and restore parent later in order to restore the tab order } - + if( m_btnRef.GetParent()!=this ) m_btnRef.SetParent( this ); } -void ScTPValidationValue::RefInputDonePostHdl() +void ScTPValidationValue::RefInputDonePostHdl() { - - + + if( m_pRefEdit && !m_pRefEdit->HasFocus() ) m_pRefEdit->GrabFocus(); } - + BOOL ScValidationDlg::Close() { @@ -483,7 +483,7 @@ ScValidationDlg * ScTPValidationValue::GetValidationDlg() if( Window *pParent = GetParent() ) do{ if ( dynamic_cast<ScValidationDlg*>( pParent ) ) - return static_cast< ScValidationDlg * >( pParent ); + return static_cast< ScValidationDlg * >( pParent ); }while ( NULL != ( pParent = pParent->GetParent() ) ); return NULL; } @@ -566,7 +566,7 @@ void ScTPValidationValue::TidyListBoxes() pWnd = GetChild(0); - while( std::find( alstOrder.begin(), alstOrder.end(), pWnd ) != alstOrder.end() && NULL != ( pWnd = pWnd->GetWindow( WINDOW_NEXT) ) ) ; + while( std::find( alstOrder.begin(), alstOrder.end(), pWnd ) != alstOrder.end() && NULL != ( pWnd = pWnd->GetWindow( WINDOW_NEXT) ) ) ; if ( pWnd ) { @@ -583,7 +583,7 @@ void ScTPValidationValue::TidyListBoxes() IMPL_LINK( ScTPValidationValue, EditSetFocusHdl, Edit *, EMPTYARG) { USHORT nPos=maLbAllow.GetSelectEntryPos(); - + if ( nPos == SC_VALIDDLG_ALLOW_RANGE ) { SetupRefDlg(); @@ -594,7 +594,7 @@ IMPL_LINK( ScTPValidationValue, EditSetFocusHdl, Edit *, EMPTYARG) IMPL_LINK( ScTPValidationValue, KillFocusHdl, Window *, pWnd ) { - if( pWnd == m_pRefEdit || pWnd == &m_btnRef ) + if( pWnd == m_pRefEdit || pWnd == &m_btnRef ) if( ScValidationDlg *pValidationDlg = GetValidationDlg() ) if ( (pValidationDlg->IsActive() || pValidationDlg->IsChildFocus() ) && !pValidationDlg->IsRefInputting() ) if( ( !m_pRefEdit || !m_pRefEdit->HasFocus()) && !m_btnRef.HasFocus() ) @@ -672,18 +672,18 @@ IMPL_LINK( ScTPValidationValue, CheckHdl, CheckBox*, EMPTYARG ) //======================================================================== // Input Help Page -ScTPValidationHelp::ScTPValidationHelp( Window* pParent, +ScTPValidationHelp::ScTPValidationHelp( Window* pParent, const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( TP_VALIDATION_INPUTHELP ), rArgSet ), - aTsbHelp ( this, ScResId( TSB_HELP ) ), + aTsbHelp ( this, ScResId( TSB_HELP ) ), aFlContent ( this, ScResId( FL_CONTENT ) ), - aFtTitle ( this, ScResId( FT_TITLE ) ), - aEdtTitle ( this, ScResId( EDT_TITLE ) ), - aFtInputHelp ( this, ScResId( FT_INPUTHELP ) ), - aEdInputHelp ( this, ScResId( EDT_INPUTHELP ) ), + aFtTitle ( this, ScResId( FT_TITLE ) ), + aEdtTitle ( this, ScResId( EDT_TITLE ) ), + aFtInputHelp ( this, ScResId( FT_INPUTHELP ) ), + aEdInputHelp ( this, ScResId( EDT_INPUTHELP ) ), mrArgSet ( rArgSet ) { @@ -713,8 +713,8 @@ USHORT* __EXPORT ScTPValidationHelp::GetRanges() // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTPValidationHelp::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTPValidationHelp::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTPValidationHelp( pParent, rArgSet ) ); } @@ -756,21 +756,21 @@ BOOL __EXPORT ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) //======================================================================== // Error Alert Page -ScTPValidationError::ScTPValidationError( Window* pParent, +ScTPValidationError::ScTPValidationError( Window* pParent, const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( TP_VALIDATION_ERROR ), rArgSet ), - aTsbShow ( this, ScResId( TSB_SHOW ) ), + aTsbShow ( this, ScResId( TSB_SHOW ) ), aFlContent ( this, ScResId( FL_CONTENT ) ), - aFtAction ( this, ScResId( FT_ACTION ) ), - aLbAction ( this, ScResId( LB_ACTION ) ), - aBtnSearch ( this, ScResId( BTN_SEARCH ) ), - aFtTitle ( this, ScResId( FT_TITLE ) ), - aEdtTitle ( this, ScResId( EDT_TITLE ) ), - aFtError ( this, ScResId( FT_ERROR ) ), - aEdError ( this, ScResId( EDT_ERROR ) ), + aFtAction ( this, ScResId( FT_ACTION ) ), + aLbAction ( this, ScResId( LB_ACTION ) ), + aBtnSearch ( this, ScResId( BTN_SEARCH ) ), + aFtTitle ( this, ScResId( FT_TITLE ) ), + aEdtTitle ( this, ScResId( EDT_TITLE ) ), + aFtError ( this, ScResId( FT_ERROR ) ), + aEdError ( this, ScResId( EDT_ERROR ) ), mrArgSet ( rArgSet ) { @@ -806,8 +806,8 @@ USHORT* __EXPORT ScTPValidationError::GetRanges() // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTPValidationError::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTPValidationError::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTPValidationError( pParent, rArgSet ) ); } @@ -948,12 +948,12 @@ bool ScValidationDlg::RemoveRefDlg( BOOL bRestoreModal /* = TRUE */ ) } if ( !m_bOwnRefHdlr ) return false; - if( LeaveRefStatus() && LeaveRefMode() ) + if( LeaveRefStatus() && LeaveRefMode() ) { m_bOwnRefHdlr = false; if( bRestoreModal ) - SetModal( TRUE ); + SetModal( TRUE ); } if ( SfxChildWindow* pWnd = pTabVwSh->GetViewFrame()->GetChildWindow( SID_VALIDITY_REFERENCE ) ) @@ -969,7 +969,7 @@ void ScTPValidationValue::ScRefButtonEx::Click() { if( ScTPValidationValue *pParent = dynamic_cast< ScTPValidationValue*>( GetParent() ) ) pParent->OnClick( this ); - + ScRefButton::Click(); } @@ -990,7 +990,7 @@ BOOL ScValidationDlg::IsChildFocus() } -bool ScValidationDlg::IsAlive() +bool ScValidationDlg::IsAlive() { return SC_MOD()->IsAliveRefDlg( SLOTID, this ); } diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src index c861fbc200cb..67207cdfaba2 100644 --- a/sc/source/ui/dbgui/validate.src +++ b/sc/source/ui/dbgui/validate.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ TabDialog TAB_DLG_VALIDATION Text [ en-US ] = "Validity" ; }; //<!--Added by PengYunQuan for Validity Cell Range Picker -#define OFFSET_X 30 +#define OFFSET_X 30 //-->Added by PengYunQuan for Validity Cell Range Picker TabPage TP_VALIDATION_VALUES { @@ -121,7 +121,7 @@ TabPage TP_VALIDATION_VALUES Size = MAP_APPFONT ( 90 , 90 ) ; TabStop = TRUE ; DropDown = TRUE ; - // Reihenfolge entspricht enum ScConditionMode + // Reihenfolge entspricht enum ScConditionMode StringList [ en-US ] = { < "equal" ; SC_VALIDDLG_DATA_EQUAL ; > ; @@ -342,7 +342,7 @@ TabPage TP_VALIDATION_ERROR Size = MAP_APPFONT ( 107 , 76 ) ; TabStop = TRUE ; DropDown = TRUE ; - // Reihenfolge entspricht enum ScValidErrorStyle + // Reihenfolge entspricht enum ScValidErrorStyle StringList [ en-US ] = { < "Stop" ; Default ; > ; |