Kaydet (Commit) 401700a8 authored tarafından Alexander O. Anisimov's avatar Alexander O. Anisimov Kaydeden (comit) Kohei Yoshida

Remove bogus comments.

üst ef816f4d
...@@ -533,7 +533,7 @@ private: ...@@ -533,7 +533,7 @@ private:
{ return c < 128 ? pConv->getCharTableFlags(c, cLast) : 0; } { return c < 128 ? pConv->getCharTableFlags(c, cLast) : 0; }
}; };
SC_DLLPUBLIC String GetScCompilerNativeSymbol( OpCode eOp ); //CHINA001 SC_DLLPUBLIC String GetScCompilerNativeSymbol( OpCode eOp );
#endif #endif
......
...@@ -584,7 +584,7 @@ public: ...@@ -584,7 +584,7 @@ public:
static IntlWrapper* GetScIntlWrapper(); static IntlWrapper* GetScIntlWrapper();
static ::com::sun::star::lang::Locale* GetLocale(); static ::com::sun::star::lang::Locale* GetLocale();
SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration(); //CHINA001 SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration();
static ::utl::TransliterationWrapper* GetCaseTransliteration(); static ::utl::TransliterationWrapper* GetCaseTransliteration();
SC_DLLPUBLIC static LanguageType eLnge; SC_DLLPUBLIC static LanguageType eLnge;
...@@ -888,7 +888,7 @@ struct ScConsolidateParam ...@@ -888,7 +888,7 @@ struct ScConsolidateParam
}; };
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
extern ::utl::TransliterationWrapper* GetScGlobalpTransliteration();//CHINA001 extern ::utl::TransliterationWrapper* GetScGlobalpTransliteration();
extern const LocaleDataWrapper* GetScGlobalpLocaleData(); extern const LocaleDataWrapper* GetScGlobalpLocaleData();
#endif #endif
......
...@@ -622,9 +622,7 @@ ...@@ -622,9 +622,7 @@
#define SC_UNONAME_XLA1REPR "XLA1Representation" #define SC_UNONAME_XLA1REPR "XLA1Representation"
#define SC_UNONAME_REFSHEET "ReferenceSheet" #define SC_UNONAME_REFSHEET "ReferenceSheet"
// --> PB 2004-08-23 #i33095# Security Options
#define SC_UNO_LOADREADONLY "LoadReadonly" #define SC_UNO_LOADREADONLY "LoadReadonly"
// <--
#define SC_UNO_MODIFYPASSWORDINFO "ModifyPasswordInfo" #define SC_UNO_MODIFYPASSWORDINFO "ModifyPasswordInfo"
// FormulaParser // FormulaParser
......
...@@ -1109,9 +1109,7 @@ SvxViewForwarder* ScAccessibleEditObjectTextData::GetViewForwarder() ...@@ -1109,9 +1109,7 @@ SvxViewForwarder* ScAccessibleEditObjectTextData::GetViewForwarder()
{ {
if (!mpViewForwarder) if (!mpViewForwarder)
{ {
// --> OD 2005-12-21 #i49561#
mpViewForwarder = new ScEditObjectViewForwarder( mpWindow, mpEditView ); mpViewForwarder = new ScEditObjectViewForwarder( mpWindow, mpEditView );
// <--
} }
return mpViewForwarder; return mpViewForwarder;
} }
......
...@@ -249,25 +249,6 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) ...@@ -249,25 +249,6 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
switch ( rKEvt.GetKeyCode().GetCode() ) switch ( rKEvt.GetKeyCode().GetCode() )
{ {
case KEY_ESCAPE: 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 ) if ( pViewShell->IsDrawTextShell() || aSfxRequest.GetSlot() == SID_DRAW_NOTEEDIT )
{ {
// in normale Draw-Shell, wenn Objekt selektiert, sonst Zeichnen aus // in normale Draw-Shell, wenn Objekt selektiert, sonst Zeichnen aus
......
...@@ -57,10 +57,6 @@ ...@@ -57,10 +57,6 @@
/*-----------------11.01.97 10.52-------------------
Optionen Inhalte
--------------------------------------------------*/
ScTpContentOptions::ScTpContentOptions( Window* pParent, ScTpContentOptions::ScTpContentOptions( Window* pParent,
const SfxItemSet& rArgSet ) : const SfxItemSet& rArgSet ) :
SfxTabPage(pParent, ScResId( RID_SCPAGE_CONTENT ), rArgSet), SfxTabPage(pParent, ScResId( RID_SCPAGE_CONTENT ), rArgSet),
...@@ -133,26 +129,18 @@ ScTpContentOptions::ScTpContentOptions( Window* pParent, ...@@ -133,26 +129,18 @@ ScTpContentOptions::ScTpContentOptions( Window* pParent,
aGridCB .SetClickHdl( LINK( this, ScTpContentOptions, GridHdl ) ); aGridCB .SetClickHdl( LINK( this, ScTpContentOptions, GridHdl ) );
} }
/*-----------------11.01.97 10.52-------------------
--------------------------------------------------*/
ScTpContentOptions::~ScTpContentOptions() ScTpContentOptions::~ScTpContentOptions()
{ {
delete pLocalOptions; delete pLocalOptions;
} }
/*-----------------11.01.97 10.52-------------------
--------------------------------------------------*/
SfxTabPage* ScTpContentOptions::Create( Window* pParent, SfxTabPage* ScTpContentOptions::Create( Window* pParent,
const SfxItemSet& rCoreSet ) const SfxItemSet& rCoreSet )
{ {
return new ScTpContentOptions(pParent, rCoreSet); return new ScTpContentOptions(pParent, rCoreSet);
} }
/*-----------------11.01.97 10.52-------------------
--------------------------------------------------*/
BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
{ {
BOOL bRet = FALSE; BOOL bRet = FALSE;
...@@ -196,9 +184,6 @@ BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) ...@@ -196,9 +184,6 @@ BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
return bRet; return bRet;
} }
/*-----------------11.01.97 10.53-------------------
--------------------------------------------------*/
void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet ) void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
{ {
...@@ -261,9 +246,6 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet ) ...@@ -261,9 +246,6 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aHandleCB .SaveValue(); aHandleCB .SaveValue();
aBigHandleCB .SaveValue(); aBigHandleCB .SaveValue();
} }
/*-----------------11.01.97 12.45-------------------
--------------------------------------------------*/
void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet) void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
{ {
...@@ -271,9 +253,6 @@ 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)) if(SFX_ITEM_SET == rSet.GetItemState(SID_SCVIEWOPTIONS, FALSE , &pItem))
*pLocalOptions = ((const ScTpViewItem*)pItem)->GetViewOptions(); *pLocalOptions = ((const ScTpViewItem*)pItem)->GetViewOptions();
} }
/*-----------------11.01.97 12.45-------------------
--------------------------------------------------*/
int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
{ {
...@@ -281,9 +260,6 @@ int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) ...@@ -281,9 +260,6 @@ int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
FillItemSet(*pSetP); FillItemSet(*pSetP);
return SfxTabPage::LEAVE_PAGE; return SfxTabPage::LEAVE_PAGE;
} }
/*-----------------11.01.97 13.43-------------------
--------------------------------------------------*/
IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb ) IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
{ {
...@@ -301,10 +277,6 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb ) ...@@ -301,10 +277,6 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
return 0; return 0;
} }
/*-----------------11.01.97 14.25-------------------
--------------------------------------------------*/
IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn ) IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
{ {
ScViewOption eOption = VOPT_FORMULAS; ScViewOption eOption = VOPT_FORMULAS;
...@@ -335,9 +307,6 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn ) ...@@ -335,9 +307,6 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
return 0; return 0;
} }
/*-----------------11.01.97 13.13-------------------
--------------------------------------------------*/
void ScTpContentOptions::InitGridOpt() void ScTpContentOptions::InitGridOpt()
{ {
...@@ -407,9 +376,6 @@ void ScTpContentOptions::InitGridOpt() ...@@ -407,9 +376,6 @@ void ScTpContentOptions::InitGridOpt()
else else
aColorLB.SelectEntryPos( aColorLB.InsertEntry( aCol, aName ) ); aColorLB.SelectEntryPos( aColorLB.InsertEntry( aCol, aName ) );
} }
/*-----------------11.01.97 13.40-------------------
--------------------------------------------------*/
IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox ) IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox )
{ {
...@@ -419,9 +385,6 @@ IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox ) ...@@ -419,9 +385,6 @@ IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox )
pLocalOptions->SetOption( VOPT_GRID, bChecked ); pLocalOptions->SetOption( VOPT_GRID, bChecked );
return 0; return 0;
} }
/*-----------------11.01.97 10.53-------------------
--------------------------------------------------*/
ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent,
const SfxItemSet& rArgSet ) : const SfxItemSet& rArgSet ) :
...@@ -485,16 +448,10 @@ ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, ...@@ -485,16 +448,10 @@ ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent,
} }
} }
/*-----------------11.01.97 10.53-------------------
--------------------------------------------------*/
ScTpLayoutOptions::~ScTpLayoutOptions() ScTpLayoutOptions::~ScTpLayoutOptions()
{ {
} }
/*-----------------11.01.97 10.53-------------------
--------------------------------------------------*/
SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, SfxTabPage* ScTpLayoutOptions::Create( Window* pParent,
const SfxItemSet& rCoreSet ) const SfxItemSet& rCoreSet )
...@@ -506,9 +463,6 @@ SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, ...@@ -506,9 +463,6 @@ SfxTabPage* ScTpLayoutOptions::Create( Window* pParent,
pNew->SetDocument(pDocSh->GetDocument()); pNew->SetDocument(pDocSh->GetDocument());
return pNew; return pNew;
} }
/*-----------------11.01.97 10.53-------------------
--------------------------------------------------*/
BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
{ {
...@@ -601,9 +555,6 @@ BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) ...@@ -601,9 +555,6 @@ BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
return bRet; return bRet;
} }
/*-----------------11.01.97 10.53-------------------
--------------------------------------------------*/
void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
{ {
...@@ -697,16 +648,9 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) ...@@ -697,16 +648,9 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
aRequestRB.SaveValue(); aRequestRB.SaveValue();
} }
/*-----------------11.01.97 12.46-------------------
--------------------------------------------------*/
void ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ ) void ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ )
{ {
} }
/*-----------------11.01.97 12.46-------------------
--------------------------------------------------*/
int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
{ {
...@@ -715,11 +659,6 @@ int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) ...@@ -715,11 +659,6 @@ int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
return SfxTabPage::LEAVE_PAGE; return SfxTabPage::LEAVE_PAGE;
} }
/*-----------------13.01.97 14.44-------------------
Metric des Deftabstops umschalten
--------------------------------------------------*/
IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG) IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG)
{ {
const USHORT nMPos = aUnitLB.GetSelectEntryPos(); const USHORT nMPos = aUnitLB.GetSelectEntryPos();
...@@ -734,9 +673,7 @@ IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG) ...@@ -734,9 +673,7 @@ IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG)
return 0; return 0;
} }
/*-----------------11.01.97 15.30-------------------
--------------------------------------------------*/
IMPL_LINK( ScTpLayoutOptions, AlignHdl, CheckBox*, pBox ) IMPL_LINK( ScTpLayoutOptions, AlignHdl, CheckBox*, pBox )
{ {
aAlignLB.Enable(pBox->IsChecked()); aAlignLB.Enable(pBox->IsChecked());
......
...@@ -85,9 +85,7 @@ const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() ...@@ -85,9 +85,7 @@ const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap()
{MAP_CHAR_LEN(SC_UNO_UPDTEMPL), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_UPDTEMPL), 0, &getBooleanCppuType(), 0, 0},
/*Stampit enable/disable print cancel */ /*Stampit enable/disable print cancel */
{MAP_CHAR_LEN(SC_UNO_ALLOWPRINTJOBCANCEL), 0, &getBooleanCppuType(), 0, 0}, {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_LOADREADONLY), 0, &getBooleanCppuType(), 0, 0},
// <--
{MAP_CHAR_LEN(SC_UNO_SHAREDOC), 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}, {MAP_CHAR_LEN(SC_UNO_MODIFYPASSWORDINFO), 0, &getCppuType((uno::Sequence< beans::PropertyValue >*)0), 0, 0},
{0,0,0,0,0,0} {0,0,0,0,0,0}
......
...@@ -338,10 +338,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -338,10 +338,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
case SID_DATA_FORM: case SID_DATA_FORM:
{ {
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); 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); 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(); pDlg->Execute();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment