diff options
-rw-r--r-- | sc/inc/compiler.hxx | 2 | ||||
-rw-r--r-- | sc/inc/global.hxx | 4 | ||||
-rw-r--r-- | sc/inc/unonames.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleText.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fudraw.cxx | 19 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpview.cxx | 63 | ||||
-rw-r--r-- | sc/source/ui/unoobj/confuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 4 |
8 files changed, 5 insertions, 93 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 1229042f5ff0..327623271d15 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -533,7 +533,7 @@ private: { return c < 128 ? pConv->getCharTableFlags(c, cLast) : 0; } }; -SC_DLLPUBLIC String GetScCompilerNativeSymbol( OpCode eOp ); //CHINA001 +SC_DLLPUBLIC String GetScCompilerNativeSymbol( OpCode eOp ); #endif diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 49ab758b7d0b..75bfd6b567d4 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -584,7 +584,7 @@ public: static IntlWrapper* GetScIntlWrapper(); static ::com::sun::star::lang::Locale* GetLocale(); - SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration(); //CHINA001 + SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration(); static ::utl::TransliterationWrapper* GetCaseTransliteration(); SC_DLLPUBLIC static LanguageType eLnge; @@ -888,7 +888,7 @@ struct ScConsolidateParam }; // ----------------------------------------------------------------------- -extern ::utl::TransliterationWrapper* GetScGlobalpTransliteration();//CHINA001 +extern ::utl::TransliterationWrapper* GetScGlobalpTransliteration(); extern const LocaleDataWrapper* GetScGlobalpLocaleData(); #endif diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index 6400802422ec..8be91e745bc4 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -622,9 +622,7 @@ #define SC_UNONAME_XLA1REPR "XLA1Representation" #define SC_UNONAME_REFSHEET "ReferenceSheet" -// --> PB 2004-08-23 #i33095# Security Options #define SC_UNO_LOADREADONLY "LoadReadonly" -// <-- #define SC_UNO_MODIFYPASSWORDINFO "ModifyPasswordInfo" // FormulaParser diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index a4c470093398..eed5f3a3864a 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -1109,9 +1109,7 @@ SvxViewForwarder* ScAccessibleEditObjectTextData::GetViewForwarder() { if (!mpViewForwarder) { - // --> OD 2005-12-21 #i49561# mpViewForwarder = new ScEditObjectViewForwarder( mpWindow, mpEditView ); - // <-- } return mpViewForwarder; } diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 70342cc10e24..db719ce4d901 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -249,25 +249,6 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) switch ( rKEvt.GetKeyCode().GetCode() ) { case KEY_ESCAPE: - - /* 18.12.95: TextShell beibehalten nicht mehr gewuenscht... - * - * if ( pView->IsAction() ) - * { - * pView->BrkAction(); - * pWindow->ReleaseMouse(); - * bReturn = TRUE; - * } - * else if ( pView->IsTextEdit() ) - * { - * pView->EndTextEdit(); - * pView->SetCreateMode(); - * pViewShell->GetScDrawView()->InvalidateDrawTextAttrs(); - * bReturn = TRUE; - * } - * else - */ - if ( pViewShell->IsDrawTextShell() || aSfxRequest.GetSlot() == SID_DRAW_NOTEEDIT ) { // in normale Draw-Shell, wenn Objekt selektiert, sonst Zeichnen aus diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 7c49d6d2d54c..d408fb093bc5 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -57,10 +57,6 @@ -/*-----------------11.01.97 10.52------------------- - Optionen Inhalte ---------------------------------------------------*/ - ScTpContentOptions::ScTpContentOptions( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage(pParent, ScResId( RID_SCPAGE_CONTENT ), rArgSet), @@ -133,26 +129,18 @@ ScTpContentOptions::ScTpContentOptions( Window* pParent, aGridCB .SetClickHdl( LINK( this, ScTpContentOptions, GridHdl ) ); } -/*-----------------11.01.97 10.52------------------- - ---------------------------------------------------*/ ScTpContentOptions::~ScTpContentOptions() { delete pLocalOptions; } -/*-----------------11.01.97 10.52------------------- - ---------------------------------------------------*/ SfxTabPage* ScTpContentOptions::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return new ScTpContentOptions(pParent, rCoreSet); } -/*-----------------11.01.97 10.52------------------- ---------------------------------------------------*/ BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) { BOOL bRet = FALSE; @@ -196,9 +184,6 @@ BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) return bRet; } -/*-----------------11.01.97 10.53------------------- - ---------------------------------------------------*/ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet ) { @@ -261,9 +246,6 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet ) aHandleCB .SaveValue(); aBigHandleCB .SaveValue(); } -/*-----------------11.01.97 12.45------------------- - ---------------------------------------------------*/ void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet) { @@ -271,9 +253,6 @@ void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet) if(SFX_ITEM_SET == rSet.GetItemState(SID_SCVIEWOPTIONS, FALSE , &pItem)) *pLocalOptions = ((const ScTpViewItem*)pItem)->GetViewOptions(); } -/*-----------------11.01.97 12.45------------------- - ---------------------------------------------------*/ int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) { @@ -281,9 +260,6 @@ int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) FillItemSet(*pSetP); return SfxTabPage::LEAVE_PAGE; } -/*-----------------11.01.97 13.43------------------- - ---------------------------------------------------*/ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb ) { @@ -301,10 +277,6 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb ) return 0; } -/*-----------------11.01.97 14.25------------------- - ---------------------------------------------------*/ - IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn ) { ScViewOption eOption = VOPT_FORMULAS; @@ -335,9 +307,6 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn ) return 0; } -/*-----------------11.01.97 13.13------------------- - ---------------------------------------------------*/ void ScTpContentOptions::InitGridOpt() { @@ -407,9 +376,6 @@ void ScTpContentOptions::InitGridOpt() else aColorLB.SelectEntryPos( aColorLB.InsertEntry( aCol, aName ) ); } -/*-----------------11.01.97 13.40------------------- - ---------------------------------------------------*/ IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox ) { @@ -419,9 +385,6 @@ IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox ) pLocalOptions->SetOption( VOPT_GRID, bChecked ); return 0; } -/*-----------------11.01.97 10.53------------------- - ---------------------------------------------------*/ ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, const SfxItemSet& rArgSet ) : @@ -485,16 +448,10 @@ ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, } } -/*-----------------11.01.97 10.53------------------- - ---------------------------------------------------*/ ScTpLayoutOptions::~ScTpLayoutOptions() { } -/*-----------------11.01.97 10.53------------------- - ---------------------------------------------------*/ SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, const SfxItemSet& rCoreSet ) @@ -506,9 +463,6 @@ SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, pNew->SetDocument(pDocSh->GetDocument()); return pNew; } -/*-----------------11.01.97 10.53------------------- - ---------------------------------------------------*/ BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) { @@ -601,9 +555,6 @@ BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) return bRet; } -/*-----------------11.01.97 10.53------------------- - ---------------------------------------------------*/ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) { @@ -697,16 +648,9 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) aRequestRB.SaveValue(); } -/*-----------------11.01.97 12.46------------------- - ---------------------------------------------------*/ - void ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ ) { } -/*-----------------11.01.97 12.46------------------- - ---------------------------------------------------*/ int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) { @@ -715,11 +659,6 @@ int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) return SfxTabPage::LEAVE_PAGE; } - -/*-----------------13.01.97 14.44------------------- - Metric des Deftabstops umschalten ---------------------------------------------------*/ - IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG) { const USHORT nMPos = aUnitLB.GetSelectEntryPos(); @@ -734,9 +673,7 @@ IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG) return 0; } -/*-----------------11.01.97 15.30------------------- ---------------------------------------------------*/ IMPL_LINK( ScTpLayoutOptions, AlignHdl, CheckBox*, pBox ) { aAlignLB.Enable(pBox->IsChecked()); diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index a00d65061007..1aea9fc443b8 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -85,9 +85,7 @@ const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() {MAP_CHAR_LEN(SC_UNO_UPDTEMPL), 0, &getBooleanCppuType(), 0, 0}, /*Stampit enable/disable print cancel */ {MAP_CHAR_LEN(SC_UNO_ALLOWPRINTJOBCANCEL), 0, &getBooleanCppuType(), 0, 0}, - // --> PB 2004-08-25 #i33095# Security Options {MAP_CHAR_LEN(SC_UNO_LOADREADONLY), 0, &getBooleanCppuType(), 0, 0}, - // <-- {MAP_CHAR_LEN(SC_UNO_SHAREDOC), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_MODIFYPASSWORDINFO), 0, &getCppuType((uno::Sequence< beans::PropertyValue >*)0), 0, 0}, {0,0,0,0,0,0} diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index ef7356da697f..05d409cbf0fd 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -338,10 +338,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) case SID_DATA_FORM: { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001 + DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); AbstractScDataFormDlg* pDlg = pFact->CreateScDataFormDlg( pTabViewShell->GetDialogParent(),RID_SCDLG_DATAFORM, pTabViewShell); - DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialog create fail!"); pDlg->Execute(); |