diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 2a41d35313e8..535b221488dd 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -550,15 +550,12 @@ void SchAttribTabDlg::PageCreated(USHORT nId, SfxTabPage &rPage) case RID_SVXPAGE_CHAR_NAME: - //CHINA001 ((SvxCharNamePage&)rPage). - //CHINA001 SetFontList(SvxFontListItem(m_pViewElementListProvider->getFontList())); - aSet.Put (SvxFontListItem(m_pViewElementListProvider->getFontList(), SID_ATTR_CHAR_FONTLIST)); //CHINA001 - rPage.PageCreated(aSet); //CHINA001 + aSet.Put (SvxFontListItem(m_pViewElementListProvider->getFontList(), SID_ATTR_CHAR_FONTLIST)); + rPage.PageCreated(aSet); break; case RID_SVXPAGE_CHAR_EFFECTS: - //CHINA001 ((SvxCharEffectsPage&) rPage).DisableControls( DISABLE_CASEMAP ); - aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP)); //CHINA001 + aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP)); rPage.PageCreated(aSet); break; diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 48879bcdec93..a8fba9574049 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -1914,7 +1914,7 @@ sal_uInt32 ScFunctionCategory::getNumber() const //------------------------------------------------------------------------ -utl::TransliterationWrapper* ScGlobal::GetpTransliteration() //add by CHINA001 +utl::TransliterationWrapper* ScGlobal::GetpTransliteration() { if ( !pTransliteration ) { diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index a6796739c841..ca22d6d694a6 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -49,7 +49,6 @@ #include "reffact.hxx" #include "scresid.hxx" #include "pvglob.hxx" -//CHINA001 #include "pvfundlg.hxx" #include "globstr.hrc" #include "pivot.hrc" #include "dpobject.hxx" @@ -57,8 +56,8 @@ #include "dpshttab.hxx" #include "scmod.hxx" -#include "sc.hrc" //CHINA001 -#include "scabstdlg.hxx" //CHINA001 +#include "sc.hrc" +#include "scabstdlg.hxx" using namespace com::sun::star; using ::rtl::OUString; using ::std::vector; @@ -1008,7 +1007,7 @@ void ScDPLayoutDlg::NotifyDoubleClick( ScDPFieldType eType, size_t nFieldIndex ) if( ScDPLabelData* pData = GetLabelData( (*pArr)[nFieldIndex]->mnCol, &nArrPos ) ) { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001 + DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); switch ( eType ) { diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 96c9f120f5b1..58e153387e09 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -108,9 +108,9 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b aComment.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ", " )); aComment += String( ScResId( STR_ON ) ); aComment += ' '; - aComment += ScGlobal::GetpLocaleData()->getDate( Date() );//CHINA001 aComment += ScGlobal::pLocaleData->getDate( Date() ); + aComment += ScGlobal::GetpLocaleData()->getDate( Date() ); aComment.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ", " )); - aComment += ScGlobal::GetpLocaleData()->getTime( Time() );//CHINA001 aComment += ScGlobal::pLocaleData->getTime( Time() ); + aComment += ScGlobal::GetpLocaleData()->getTime( Time() ); aEdComment .SetText( aComment ); aEdName .SetText( rName ); diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 171daa0ca882..e29e33e8fd64 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -101,7 +101,7 @@ sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList ) xub_StrLen nCount = rList.GetTokenCount('\t'); for ( xub_StrLen i=0; iisEqual( aStr, rList.GetToken(i,'\t') ) )//CHINA001 if ( ScGlobal::GetpTransliteration()->isEqual( aStr, rList.GetToken(i,'\t') ) ) + if ( ScGlobal::GetpTransliteration()->isEqual( aStr, rList.GetToken(i,'\t') ) ) c = (sal_Unicode)rList.GetToken(i+1,'\t').ToInt32(); } if (!c && aStr.Len()) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 1ee02badefe1..7271929c5401 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -49,13 +49,13 @@ #include "validate.hrc" #include "validate.hxx" #include "compiler.hxx" -#include "formula/opcode.hxx" //CHINA001 -//Added by PengYunQuan for Validity Cell Range Picker // ============================================================================ @@ -69,9 +69,6 @@ static USHORT pValueRanges[] = // ============================================================================ -//Modified by PengYunQuan for Validity Cell Range Picker { AddTabPage( TP_VALIDATION_VALUES, ScTPValidationValue::Create, 0 ); AddTabPage( TP_VALIDATION_INPUTHELP, ScTPValidationHelp::Create, 0 ); @@ -89,20 +85,18 @@ ScValidationDlg::ScValidationDlg( Window* pParent, FreeResource(); } -//Added by PengYunQuan for Validity Cell Range Picker ScValidationDlg::~ScValidationDlg() { - //Added by PengYunQuan for Validity Cell Range Picker } @@ -343,21 +332,16 @@ ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rAr maStrValue( ScResId( SCSTR_VALID_VALUE ) ), maStrRange( ScResId( SCSTR_VALID_RANGE ) ), maStrList ( ScResId( SCSTR_VALID_LIST ) ), -//Added by PengYunQuan for Validity Cell Range Picker + m_btnRef( this, ScResId( RB_VALIDITY_REF ) ) { Init(); FreeResource(); // list separator in formulas - //CHINA001 const String& rListSep = ScCompiler::pSymbolTableNative[ ocSep ]; - String aListSep = ::GetScCompilerNativeSymbol( ocSep ); //CHINA001 + String aListSep = ::GetScCompilerNativeSymbol( ocSep ); DBG_ASSERT( aListSep.Len() == 1, "ScTPValidationValue::ScTPValidationValue - list separator error" ); mcFmlaSep = aListSep.Len() ? aListSep.GetChar( 0 ) : ';'; - //Added by PengYunQuan for Validity Cell Range Picker + m_btnRef.Hide(); // cell range picker } ScTPValidationValue::~ScTPValidationValue() @@ -369,13 +353,13 @@ void ScTPValidationValue::Init() maLbAllow.SetSelectHdl( LINK( this, ScTPValidationValue, SelectHdl ) ); maLbValue.SetSelectHdl( LINK( this, ScTPValidationValue, SelectHdl ) ); maCbShow.SetClickHdl( LINK( this, ScTPValidationValue, CheckHdl ) ); - //Added by PengYunQuan for Validity Cell Range Picker maLbAllow.SelectEntryPos( SC_VALIDDLG_ALLOW_ANY ); maLbValue.SelectEntryPos( SC_VALIDDLG_DATA_EQUAL ); @@ -493,7 +477,6 @@ void ScTPValidationValue::SetSecondFormula( const String& rFmlaStr ) maEdMax.SetText( rFmlaStr ); } -//Added by PengYunQuan for Validity Cell Range Picker // ---------------------------------------------------------------------------- @@ -630,7 +613,7 @@ IMPL_LINK( ScTPValidationValue, SelectHdl, ListBox*, EMPTYARG ) bool bRange = (nLbPos == SC_VALIDDLG_ALLOW_RANGE); bool bList = (nLbPos == SC_VALIDDLG_ALLOW_LIST); - maCbAllow.Enable( bEnable ); // Leerzellen + maCbAllow.Enable( bEnable ); // Empty cell maFtValue.Enable( bEnable ); maLbValue.Enable( bEnable ); maFtMin.Enable( bEnable ); @@ -673,9 +656,7 @@ IMPL_LINK( ScTPValidationValue, SelectHdl, ListBox*, EMPTYARG ) maFtMax.Show( bShowMax ); maEdMax.Show( bShowMax ); maFtHint.Show( bRange ); - //Added by PengYunQuan for Validity Cell Range Picker + m_btnRef.Show( bRange ); // cell range picker return 0; } @@ -719,8 +700,6 @@ __EXPORT ScTPValidationHelp::~ScTPValidationHelp() void ScTPValidationHelp::Init() { - //aLb.SetSelectHdl( LINK( this, ScTPValidationHelp, SelectHdl ) ); - aTsbHelp.EnableTriState( FALSE ); } @@ -908,7 +887,6 @@ IMPL_LINK( ScTPValidationError, ClickSearchHdl, PushButton*, EMPTYARG ) return( 0L ); } -//Added by PengYunQuan for Validity Cell Range Picker