[Libreoffice-commits] .: 3 commits - sc/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 17 12:53:15 PST 2011
sc/source/ui/attrdlg/scdlgfact.cxx | 418 ++++++++++++++++++-------------------
sc/source/ui/view/reffact.cxx | 2
sc/source/ui/view/viewfun4.cxx | 1
3 files changed, 209 insertions(+), 212 deletions(-)
New commits:
commit 8a8024dca9a1214897b9fc8e3bf5dbddf3bc8a1a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 17 20:53:09 2011 +0000
fix build breakage
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index eb12b25..df0920f 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -596,7 +596,6 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR
rViewData.SetSpellingView( NULL );
KillEditView(TRUE);
delete pEngine;
- delete pEditSel;
pDocSh->PostPaintGridAll();
rViewData.GetViewShell()->UpdateInputHandler();
pDoc->DisableIdle(bOldDis);
commit 4faf0c6c214789116deb8abe387a4c30cb6b3fb8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jan 16 23:57:12 2011 +0100
remove remove-useless-'add-for-...'-comments
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 37bfa7f..42b6d85 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.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
@@ -38,91 +38,91 @@
#include "scdlgfact.hxx"
#include "sc.hrc"
-#include "scuiasciiopt.hxx" //add for ScImportAsciiDlg
-#include "scuiautofmt.hxx" //add for ScAutoFormatDlg
-#include "corodlg.hxx" //add for ScColRowLabelDlg
-#include "crdlg.hxx" //add for ScColOrRowDlg
-#include "dapidata.hxx" //add for ScDataPilotDatabaseDlg
-#include "dapitype.hxx" //add for ScDataPilotSourceTypeDlg, ScDataPilotServiceDlg
-#include "delcldlg.hxx" //add for ScDeleteCellDlg
-#include "delcodlg.hxx" //add for ScDeleteContentsDlg
-#include "filldlg.hxx" //add for ScFillSeriesDlg
-#include "groupdlg.hxx" //add for ScGroupDlg
-#include "inscldlg.hxx" //add for ScInsertCellDlg
-#include "inscodlg.hxx" //add for ScInsertContentsDlg
-#include "instbdlg.hxx" //add for ScInsertTableDlg
-#include "lbseldlg.hxx" //add for ScSelEntryDlg
-#include "linkarea.hxx" //add for ScLinkedAreaDlg
-#include "mtrindlg.hxx" //add for ScMetricInputDlg
-#include "mvtabdlg.hxx" //add for ScMoveTableDlg
-#include "namecrea.hxx" //add for ScNameCreateDlg
-#include "namepast.hxx" //add for ScNamePasteDlg
-#include "pfiltdlg.hxx" //add for ScPivotFilterDlg
-#include "pvfundlg.hxx" //add for ScDPFunctionDlg
+#include "scuiasciiopt.hxx"
+#include "scuiautofmt.hxx"
+#include "corodlg.hxx"
+#include "crdlg.hxx"
+#include "dapidata.hxx"
+#include "dapitype.hxx"
+#include "delcldlg.hxx"
+#include "delcodlg.hxx"
+#include "filldlg.hxx"
+#include "groupdlg.hxx"
+#include "inscldlg.hxx"
+#include "inscodlg.hxx"
+#include "instbdlg.hxx"
+#include "lbseldlg.hxx"
+#include "linkarea.hxx"
+#include "mtrindlg.hxx"
+#include "mvtabdlg.hxx"
+#include "namecrea.hxx"
+#include "namepast.hxx"
+#include "pfiltdlg.hxx"
+#include "pvfundlg.hxx"
#include "dpgroupdlg.hxx"
-#include "scendlg.hxx" //add for ScNewScenarioDlg
-#include "shtabdlg.hxx" //add for ScShowTabDlg
-#include "strindlg.hxx" //add for ScStringInputDlg
-#include "tabbgcolordlg.hxx"//add for ScTabBgColorDlg
-#include "scuiimoptdlg.hxx" //add for ScImportOptionsDlg
-#include "attrdlg.hxx" //add for ScAttrDlg
-#include "hfedtdlg.hxx" //add for ScHFEditDlg
-#include "styledlg.hxx" //add for ScStyleDlg
-#include "subtdlg.hxx" //add for ScSubTotalDlg
-#include "textdlgs.hxx" //add for ScCharDlg, ScParagraphDlg
-#include "validate.hxx" //add for ScValidationDlg
-#include "validate.hrc" //add for ScValidationDlg
-#include "sortdlg.hxx" //add for ScSortDlg
+#include "scendlg.hxx"
+#include "shtabdlg.hxx"
+#include "strindlg.hxx"
+#include "tabbgcolordlg.hxx"
+#include "scuiimoptdlg.hxx"
+#include "attrdlg.hxx"
+#include "hfedtdlg.hxx"
+#include "styledlg.hxx"
+#include "subtdlg.hxx"
+#include "textdlgs.hxx"
+#include "validate.hxx"
+#include "validate.hrc"
+#include "sortdlg.hxx"
#include "textimportoptions.hxx"
-#include "opredlin.hxx" //add for ScRedlineOptionsTabPage
-#include "tpcalc.hxx" //add for ScTpCalcOptions
-#include "tpprint.hxx" //add for ScTpPrintOptions
-#include "tpstat.hxx" //add for ScDocStatPage
-#include "tpusrlst.hxx" //add for ScTpUserLists
-#include "tpview.hxx" //add for ScTpContentOptions
+#include "opredlin.hxx"
+#include "tpcalc.hxx"
+#include "tpprint.hxx"
+#include "tpstat.hxx"
+#include "tpusrlst.hxx"
+#include "tpview.hxx"
#include "tpformula.hxx"
-#include "datafdlg.hxx" //add for ScDataFormDlg
+#include "datafdlg.hxx"
#include "tpcompatibility.hxx"
// ause
#include "editutil.hxx"
#include <sfx2/layout.hxx>
-IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl); //add for ScColOrRowDlg
-IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl);//add for ScImportAsciiDlg
-IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl); //add for ScAutoFormatDlg
-IMPL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl); //add for ScColRowLabelDlg
-IMPL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl); //add for ScDataPilotDatabaseDlg
-IMPL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl); //add for ScDataPilotSourceTypeDlg
-IMPL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl); //add for ScDataPilotServiceDlg
-IMPL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl); //add for ScDeleteCellDlg
+IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl);
+IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl);
//for dataform
-IMPL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl); //add for ScDataFormDlg
-IMPL_ABSTDLG_BASE(AbstractScDeleteContentsDlg_Impl); //add for ScDeleteContentsDlg
-IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl); //add for ScFillSeriesDlg
-IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl); //add for ScGroupDlg
-IMPL_ABSTDLG_BASE(AbstractScInsertCellDlg_Impl); //add for ScInsertCellDlg
-IMPL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl); //add for ScInsertContentsDlg
-IMPL_ABSTDLG_BASE(AbstractScInsertTableDlg_Impl); //add for ScInsertTableDlg
-IMPL_ABSTDLG_BASE(AbstractScSelEntryDlg_Impl); //add for ScSelEntryDlg
-IMPL_ABSTDLG2_BASE(AbstractScLinkedAreaDlg_Impl); //add for ScLinkedAreaDlg
-IMPL_ABSTDLG_BASE(AbstractScMetricInputDlg_Impl); //add for ScMetricInputDlg
-IMPL_ABSTDLG_BASE(AbstractScMoveTableDlg_Impl); //add for ScMoveTableDlg
-IMPL_ABSTDLG_BASE(AbstractScNameCreateDlg_Impl); //add for ScNameCreateDlg
-IMPL_ABSTDLG_BASE(AbstractScNamePasteDlg_Impl); //add for ScNamePasteDlg
-IMPL_ABSTDLG_BASE(AbstractScPivotFilterDlg_Impl); //add for ScPivotFilterDlg
-IMPL_ABSTDLG_BASE(AbstractScDPFunctionDlg_Impl); //add for ScDPFunctionDlg
-IMPL_ABSTDLG_BASE(AbstractScDPSubtotalDlg_Impl); //add for ScDPSubtotalDlg
+IMPL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScDeleteContentsDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScInsertCellDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScInsertTableDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScSelEntryDlg_Impl);
+IMPL_ABSTDLG2_BASE(AbstractScLinkedAreaDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScMetricInputDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScMoveTableDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScNameCreateDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScNamePasteDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScPivotFilterDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScDPFunctionDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScDPSubtotalDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScDPNumGroupDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScDPDateGroupDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScDPShowDetailDlg_Impl); //add for ScDPShowDetailDlg
-IMPL_ABSTDLG_BASE(AbstractScNewScenarioDlg_Impl); //add for ScNewScenarioDlg
-IMPL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl); //add for ScShowTabDlg
-IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl); //add for ScStringInputDlg
-IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl); //add for ScTabBgColorDlg
-IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl); //add for ScImportOptionsDlg
+IMPL_ABSTDLG_BASE(AbstractScDPShowDetailDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScNewScenarioDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
+IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
// AbstractTabDialog_Impl begin
void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
@@ -157,7 +157,7 @@ String AbstractTabDialog_Impl::GetText() const
#if ENABLE_LAYOUT
namespace layout
{
-IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
+IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
// AbstractTabDialog_Impl begin
void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
@@ -191,7 +191,7 @@ String AbstractTabDialog_Impl::GetText() const
}
#endif /* ENABLE_LAYOUT */
-//add for AbstractTabDialog_Impl end
+
// AbstractScImportAsciiDlg_Impl begin
void AbstractScImportAsciiDlg_Impl::GetOptions( ScAsciiOptions& rOpt )
{
@@ -289,13 +289,13 @@ String AbstractScDataPilotServiceDlg_Impl::GetParPass() const
//AbstractScDataPilotServiceDlg_Impl end
//AbstractScDeleteCellDlg_Impl begin
-DelCellCmd AbstractScDeleteCellDlg_Impl::GetDelCellCmd() const //add for ScDeleteCellDlg
+DelCellCmd AbstractScDeleteCellDlg_Impl::GetDelCellCmd() const
{
return pDlg->GetDelCellCmd();
}
//AbstractScDeleteCellDlg_Impl end
-//add for AbstractScDeleteContentsDlg_Impl begin
+
void AbstractScDeleteContentsDlg_Impl::DisableObjects()
{
pDlg->DisableObjects();
@@ -304,9 +304,9 @@ USHORT AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() const
{
return pDlg->GetDelContentsCmdBits();
}
-//add for AbstractScDeleteContentsDlg_Impl end
-//add for AbstractScFillSeriesDlg_Impl begin
+
+
FillDir AbstractScFillSeriesDlg_Impl::GetFillDir() const
{
return pDlg->GetFillDir();
@@ -342,26 +342,26 @@ void AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(BOOL bFlag)
{
pDlg->SetEdStartValEnabled(bFlag);
}
-//add for AbstractScFillSeriesDlg_Impl end
-//add for AbstractScGroupDlg_Impl begin
+
+
BOOL AbstractScGroupDlg_Impl::GetColsChecked() const
{
return pDlg->GetColsChecked();
}
-//add for AbstractScGroupDlg_Impl end
-//add for AbstractScInsertCellDlg_Impl begin
+
+
InsCellCmd AbstractScInsertCellDlg_Impl::GetInsCellCmd() const
{
return pDlg->GetInsCellCmd();
}
-//add for AbstractScInsertCellDlg_Impl end
-//add for AbstractScInsertContentsDlg_Impl begin
+
+
USHORT AbstractScInsertContentsDlg_Impl::GetInsContentsCmdBits() const
{
return pDlg->GetInsContentsCmdBits();
@@ -407,10 +407,10 @@ InsCellCmd AbstractScInsertContentsDlg_Impl::GetMoveMode()
{
return pDlg->GetMoveMode();
}
-//add for AbstractScInsertContentsDlg_Impl end
-//add for AbstractScInsertTableDlg_Impl begin
+
+
BOOL AbstractScInsertTableDlg_Impl::GetTablesFromFile()
{
return pDlg->GetTablesFromFile();
@@ -440,16 +440,16 @@ const String* AbstractScInsertTableDlg_Impl::GetNextTable( USHORT* pN )
{
return pDlg->GetNextTable( pN );
}
-//add for AbstractScInsertTableDlg_Impl end
-//add for AbstractScSelEntryDlg_Impl begin
+
+
String AbstractScSelEntryDlg_Impl::GetSelectEntry() const
{
return pDlg->GetSelectEntry();
}
-//add for AbstractScSelEntryDlg_Impl end
-//add for AbstractScLinkedAreaDlg_Impl begin
+
+
void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const String& rFile, const String& rFilter,
const String& rOptions, const String& rSource,
ULONG nRefresh )
@@ -477,19 +477,19 @@ ULONG AbstractScLinkedAreaDlg_Impl::GetRefresh()
{
return pDlg->GetRefresh();
}
-//add for AbstractScLinkedAreaDlg_Impl end
-//add for AbstractScMetricInputDlg_Impl begin
+
+
long AbstractScMetricInputDlg_Impl::GetInputValue( FieldUnit eUnit ) const
{
return pDlg->GetInputValue( eUnit );
}
-//add for AbstractScMetricInputDlg_Impl end
-//add for AbstractScMoveTableDlg_Impl begin
-USHORT AbstractScMoveTableDlg_Impl::GetSelectedDocument() const //add for ScMoveTableDlg
+
+
+USHORT AbstractScMoveTableDlg_Impl::GetSelectedDocument() const
{
return pDlg->GetSelectedDocument();
}
@@ -523,32 +523,32 @@ void AbstractScMoveTableDlg_Impl::EnableRenameTable(BOOL bFlag)
return pDlg->EnableRenameTable( bFlag);
}
-//add for AbstractScMoveTableDlg_Impl end
-//add for AbstractScNameCreateDlg_Impl begin
-USHORT AbstractScNameCreateDlg_Impl::GetFlags() const //add for ScNameCreateDlg
+
+
+USHORT AbstractScNameCreateDlg_Impl::GetFlags() const
{
return pDlg->GetFlags();
}
-//add for AbstractScNameCreateDlg_Impl end
-//add for AbstractScNamePasteDlg_Impl begin
-String AbstractScNamePasteDlg_Impl::GetSelectedName() const //add for ScNamePasteDlg
+
+
+String AbstractScNamePasteDlg_Impl::GetSelectedName() const
{
return pDlg->GetSelectedName();
}
-//add for AbstractScNamePasteDlg_Impl end
-//add for AbstractScPivotFilterDlg_Impl begin
-const ScQueryItem& AbstractScPivotFilterDlg_Impl::GetOutputItem() //add for ScPivotFilterDlg
+
+
+const ScQueryItem& AbstractScPivotFilterDlg_Impl::GetOutputItem()
{
return pDlg->GetOutputItem();
}
-//add for AbstractScPivotFilterDlg_Impl end
-//add for AbstractScDPFunctionDlg_Impl begin
-USHORT AbstractScDPFunctionDlg_Impl::GetFuncMask() const //add for ScDPFunctionDlg
+
+
+USHORT AbstractScDPFunctionDlg_Impl::GetFuncMask() const
{
return pDlg->GetFuncMask();
}
@@ -556,10 +556,10 @@ USHORT AbstractScDPFunctionDlg_Impl::GetFuncMask() const //add for ScDPFunctionD
{
return pDlg->GetFieldRef();
}
-//add for AbstractScDPFunctionDlg_Impl end
-//add for AbstractScDPSubtotalDlg_Impl begin
-USHORT AbstractScDPSubtotalDlg_Impl::GetFuncMask() const //add for ScDPSubtotalDlg
+
+
+USHORT AbstractScDPSubtotalDlg_Impl::GetFuncMask() const
{
return pDlg->GetFuncMask();
}
@@ -567,7 +567,7 @@ void AbstractScDPSubtotalDlg_Impl::FillLabelData( ScDPLabelData& rLabelData ) co
{
pDlg->FillLabelData( rLabelData );
}
-//add for AbstractScDPSubtotalDlg_Impl end
+
ScDPNumGroupInfo AbstractScDPNumGroupDlg_Impl::GetGroupInfo() const
{
@@ -584,14 +584,14 @@ sal_Int32 AbstractScDPDateGroupDlg_Impl::GetDatePart() const
return pDlg->GetDatePart();
}
-//add for AbstractScDPShowDetailDlg_Impl begin
+
String AbstractScDPShowDetailDlg_Impl::GetDimensionName() const
{
return pDlg->GetDimensionName();
}
-//add for AbstractScDPShowDetailDlg_Impl end
-//add for AbstractScNewScenarioDlg_Impl begin
+
+
void AbstractScNewScenarioDlg_Impl::SetScenarioData( const String& rName, const String& rComment,
const Color& rColor, USHORT nFlags )
{
@@ -604,10 +604,10 @@ void AbstractScNewScenarioDlg_Impl::GetScenarioData( String& rName, String& rCom
pDlg->GetScenarioData( rName,rComment,rColor,rFlags);
}
-//add for AbstractScNewScenarioDlg_Impl end
-//add for AbstractScShowTabDlg_Impl begin
-void AbstractScShowTabDlg_Impl::Insert( const String& rString, BOOL bSelected ) //add for ScShowTabDlg
+
+
+void AbstractScShowTabDlg_Impl::Insert( const String& rString, BOOL bSelected )
{
pDlg->Insert( rString, bSelected);
}
@@ -630,31 +630,31 @@ String AbstractScShowTabDlg_Impl::GetSelectEntry(USHORT nPos) const
{
return pDlg->GetSelectEntry(nPos);
}
-//add for AbstractScShowTabDlg_Impl end
-//add for AbstractScStringInputDlg_Impl begin
-void AbstractScStringInputDlg_Impl::GetInputString( String& rString ) const //add for ScStringInputDlg
+
+
+void AbstractScStringInputDlg_Impl::GetInputString( String& rString ) const
{
pDlg->GetInputString( rString );
}
-//add for AbstractScStringInputDlg_Impl end
-//add for AbstractScTabBgColorDlg_Impl begin
-void AbstractScTabBgColorDlg_Impl::GetSelectedColor( Color& rColor ) const //add for ScTabBgColorDlg
+
+
+void AbstractScTabBgColorDlg_Impl::GetSelectedColor( Color& rColor ) const
{
pDlg->GetSelectedColor( rColor );
}
-//add for AbstractScTabBgColorDlg_Impl end
-//add for AbstractScImportOptionsDlg_Impl begin
-void AbstractScImportOptionsDlg_Impl::GetImportOptions( ScImportOptions& rOptions ) const //add for ScImportOptionsDlg
+
+
+void AbstractScImportOptionsDlg_Impl::GetImportOptions( ScImportOptions& rOptions ) const
{
pDlg->GetImportOptions(rOptions);
}
// add for AbstractScImportOptionsDlg_Impl end
-//add for AbstractScLangChooserDlg_Impl begin
+
LanguageType AbstractScTextImportOptionsDlg_Impl::GetLanguageType() const
{
return pDlg->getLanguageType();
@@ -665,11 +665,11 @@ bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const
return pDlg->isDateConversionSet();
}
-//add for AbstractScLangChooserDlg_Impl end
+
// =========================Factories for createdialog ===================
-//add for ScImportAsciiDlg begin
+
AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( Window* pParent, String aDatName,
SvStream* pInStream, int nId, sal_Unicode cSep )
{
@@ -704,9 +704,9 @@ AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImpor
return pDlg ? new AbstractScTextImportOptionsDlg_Impl(pDlg) : NULL;
}
-//add for ScAutoFormatDlg begin
-AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg
+
+AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window* pParent,
ScAutoFormat* pAutoFormat,
const ScAutoFormatData* pSelFormatData,
ScDocument* pDoc,
@@ -726,11 +726,11 @@ AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( W
return new AbstractScAutoFormatDlg_Impl( pDlg );
return 0;
}
-//add for ScAutoFormatDlg end
-//add for ScColRowLabelDlg begin
-AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(Window* pParent, //add for ScColRowLabelDlg
+
+
+AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(Window* pParent,
int nId,
BOOL bCol ,
BOOL bRow)
@@ -749,10 +749,10 @@ AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg
return new AbstractScColRowLabelDlg_Impl( pDlg );
return 0;
}
-//add for ScColRowLabelDlg end
-//add for ScColOrRowDlg begin
+
+
VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* pParent,
const String& rStrTitle,
@@ -774,10 +774,10 @@ VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window*
return new VclAbstractDialog_Impl( pDlg );
return 0;
}
-//add for ScColOrRowDlg end
-//add for ScSortWarningDlg begin
-VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const String& rExtendText,
+
+
+VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const String& rExtendText,
const String& rCurrentText, int nId )
{
Dialog * pDlg=NULL;
@@ -793,12 +793,12 @@ VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window
return new VclAbstractDialog_Impl( pDlg );
return 0;
}
-//add for ScSortWarningDlg end
-//add for ScDataPilotDatabaseDlg begin
+
+
AbstractScDataPilotDatabaseDlg * ScAbstractDialogFactory_Impl::CreateScDataPilotDatabaseDlg (Window* pParent ,
- int nId ) //add for ScDataPilotDatabaseDlg
+ int nId )
{
ScDataPilotDatabaseDlg * pDlg=NULL;
switch ( nId )
@@ -814,9 +814,9 @@ AbstractScDataPilotDatabaseDlg * ScAbstractDialogFactory_Impl::CreateScDataPilo
return new AbstractScDataPilotDatabaseDlg_Impl( pDlg );
return 0;
}
-//add for ScDataPilotDatabaseDlg end
-//add for ScDataPilotSourceTypeDlg begin
+
+
AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg( Window* pParent,
BOOL bEnableExternal,
int nId )
@@ -839,7 +839,7 @@ AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilo
// add for ScDataPilotSourceTypeDlg end
-//add for ScDataPilotServiceDlg begin
+
AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( Window* pParent,
const com::sun::star::uno::Sequence<rtl::OUString>& rServices,
int nId )
@@ -861,7 +861,7 @@ AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSe
// add for ScDataPilotServiceDlg end
-//add for ScDeleteCellDlg begin
+
AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg( Window* pParent, int nId,
BOOL bDisallowCellMove )
{
@@ -880,9 +880,9 @@ AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg( Wi
return 0;
}
-//add for ScDeleteCellDlg end
-//add for ScDataFormDlg begin
+
+
AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell* pTabViewShell )
{
ScDataFormDlg * pDlg=NULL;
@@ -900,10 +900,10 @@ AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg( Window
return 0;
}
-//add for ScDataFormDlg end
-//add for ScDeleteContentsDlg begin
-AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
+
+
+AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,int nId,
USHORT nCheckDefaults )
{
ScDeleteContentsDlg * pDlg=NULL;
@@ -921,10 +921,10 @@ AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContent
return 0;
}
-//add for ScDeleteContentsDlg end
-//add for ScFillSeriesDlg begin
-AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg
+
+
+AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Window* pParent,
ScDocument& rDocument,
FillDir eFillDir,
FillCmd eFillCmd,
@@ -950,9 +950,9 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi
return 0;
}
-//add for ScFillSeriesDlg end
-//add for ScGroupDlg begin
+
+
AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Window* pParent,
USHORT nResId,
int nId,
@@ -975,11 +975,11 @@ AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Wind
return 0;
}
-//add for ScGroupDlg end
-//add for ScInsertCellDlg begin
-AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg
+
+
+AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( Window* pParent,
int nId,
BOOL bDisallowCellMove )
{
@@ -998,9 +998,9 @@ AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( W
return 0;
}
-//add for ScInsertCellDlg end
-//add for ScInsertContentsDlg begin
+
+
AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( Window* pParent,
int nId,
USHORT nCheckDefaults,
@@ -1020,9 +1020,9 @@ AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertConten
return new AbstractScInsertContentsDlg_Impl( pDlg );
return 0;
}
-//add for ScInsertContentsDlg end
-//add for ScInsertTableDlg begin
+
+
AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData,
SCTAB nTabCount, bool bFromFile, int nId)
{
@@ -1040,7 +1040,7 @@ AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg
return new AbstractScInsertTableDlg_Impl( pDlg );
return 0;
}
-//add for ScInsertTableDlg end
+
// add for ScSelEntryDlg begin
AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent,
@@ -1066,7 +1066,7 @@ AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Wind
}
// add for ScSelEntryDlg end
-//add for ScLinkedAreaDlg begin
+
AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg ( Window* pParent,
int nId)
{
@@ -1084,9 +1084,9 @@ AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg (
return new AbstractScLinkedAreaDlg_Impl( pDlg );
return 0;
}
-//add for ScLinkedAreaDlg end
-//add for ScMetricInputDlg begin
+
+
AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg ( Window* pParent,
USHORT nResId, // Ableitung fuer jeden Dialog!
long nCurrent,
@@ -1117,10 +1117,10 @@ AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg
return new AbstractScMetricInputDlg_Impl( pDlg );
return 0;
}
-//add for ScMetricInputDlg end
-//add for ScMoveTableDlg begin
+
+
AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg( Window* pParent,
const String& rDefault,
int nId )
@@ -1139,10 +1139,10 @@ AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg( Wi
return new AbstractScMoveTableDlg_Impl( pDlg );
return 0;
}
-//add for ScMoveTableDlg end
-//add for ScNameCreateDlg begin
+
+
AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg ( Window * pParent, USHORT nFlags, int nId )
{
ScNameCreateDlg * pDlg=NULL;
@@ -1159,10 +1159,10 @@ AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg (
return new AbstractScNameCreateDlg_Impl( pDlg );
return 0;
}
-//add for ScNameCreateDlg end
-//add for ScNamePasteDlg begin
+
+
AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( Window * pParent, const ScRangeName* pList,
int nId , BOOL bInsList )
{
@@ -1180,9 +1180,9 @@ AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg (
return new AbstractScNamePasteDlg_Impl( pDlg );
return 0;
}
-//add for ScNamePasteDlg end
-//add for ScPivotFilterDlg begin
+
+
AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg ( Window* pParent,
const SfxItemSet& rArgSet, USHORT nSourceTab , int nId )
{
@@ -1200,10 +1200,10 @@ AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg
return new AbstractScPivotFilterDlg_Impl( pDlg );
return 0;
}
-//add for ScPivotFilterDlg end
-//add for ScDPFunctionDlg begin
+
+
AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( Window* pParent,
int nId,
const ScDPLabelDataVec& rLabelVec,
@@ -1224,9 +1224,9 @@ AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg (
return new AbstractScDPFunctionDlg_Impl( pDlg );
return 0;
}
-//add for ScDPFunctionDlg end
-//add for ScDPSubtotalDlg begin
+
+
AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( Window* pParent,
int nId,
ScDPObject& rDPObj,
@@ -1249,7 +1249,7 @@ AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg (
return new AbstractScDPSubtotalDlg_Impl( pDlg );
return 0;
}
-//add for ScDPSubtotalDlg end
+
AbstractScDPNumGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg(
Window* pParent, int nId, const ScDPNumGroupInfo& rInfo )
@@ -1268,7 +1268,7 @@ AbstractScDPDateGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg(
return 0;
}
-//add for ScDPShowDetailDlg begin
+
AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDlg (
Window* pParent, int nId, ScDPObject& rDPObj, USHORT nOrient )
{
@@ -1276,9 +1276,9 @@ AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDl
return new AbstractScDPShowDetailDlg_Impl( new ScDPShowDetailDlg( pParent, rDPObj, nOrient ) );
return 0;
}
-//add for ScDPShowDetailDlg end
-//add for ScNewScenarioDlg begin
+
+
AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg ( Window* pParent, const String& rName,
int nId,
BOOL bEdit , BOOL bSheetProtected )
@@ -1297,9 +1297,9 @@ AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg
return new AbstractScNewScenarioDlg_Impl( pDlg );
return 0;
}
-//add for ScNewScenarioDlg end
-//add for ScShowTabDlg begin
+
+
AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window* pParent, int nId )
{
ScShowTabDlg * pDlg=NULL;
@@ -1317,10 +1317,10 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window
return 0;
}
-//add for ScShowTabDlg end
-//add for ScStringInputDlg begin
+
+
AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg ( Window* pParent,
const String& rTitle,
const String& rEditTitle,
@@ -1342,9 +1342,9 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window
return new AbstractScStringInputDlg_Impl( pDlg );
return 0;
}
- //add for ScStringInputDlg end
-//add for ScTabBgColorDlg begin
+
+
AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg (
Window* pParent,
const String& rTitle,
@@ -1367,9 +1367,9 @@ if ( pDlg )
return new AbstractScTabBgColorDlg_Impl( pDlg );
return 0;
}
-//add for ScTabBgColorDlg end
-//add for ScImportOptionsDlg begin
+
+
AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* pParent,
int nId,
BOOL bAscii,
@@ -1393,13 +1393,13 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions
return new AbstractScImportOptionsDlg_Impl( pDlg );
return 0;
}
-//add for ScImportOptionsDlg end
+
#if ENABLE_LAYOUT && !LAYOUT_SFX_TABDIALOG_BROKEN
#define SfxTabDialog layout::SfxTabDialog
#define AbstractTabDialog_Impl layout::AbstractTabDialog_Impl
#endif /* ENABLE_LAYOUT */
-//add for ScAttrDlg begin
+
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFrame* pFrame,
Window* pParent,
const SfxItemSet* pCellAttrs,
@@ -1420,11 +1420,11 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFra
return 0;
}
-//add for ScAttrDlg end
+
#undef SfxTabDialog
#undef AbstractTabDialog_Impl
-//add for ScHFEditDlg begin
+
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame* pFrame,
Window* pParent,
const SfxItemSet& rCoreSet,
@@ -1446,9 +1446,9 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF
return new AbstractTabDialog_Impl( pDlg );
return 0;
}
-//add for ScHFEditDlg end
-//add for ScStyleDlg begin
+
+
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* pParent,
SfxStyleSheetBase& rStyleBase,
USHORT nRscId,
@@ -1469,9 +1469,9 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window*
return new AbstractTabDialog_Impl( pDlg );
return 0;
}
-//add for ScStyleDlg end
-//add for ScSubTotalDlg begin
+
+
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg( Window* pParent,
const SfxItemSet* pArgSet,
int nId)
@@ -1490,9 +1490,9 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg( Window
return new AbstractTabDialog_Impl( pDlg );
return 0;
}
-//add for ScSubTotalDlg end
-//add for ScCharDlg begin
+
+
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,
const SfxObjectShell* pDocShell, int nId )
{
@@ -1510,9 +1510,9 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( Window* pP
return new AbstractTabDialog_Impl( pDlg );
return 0;
}
-//add for ScCharDlg end
-//add for ScParagraphDlg begin
+
+
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,
int nId )
{
@@ -1530,9 +1530,9 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Windo
return new AbstractTabDialog_Impl( pDlg );
return 0;
}
-//add for ScParagraphDlg end
-//add for ScValidationDlg begin
+
+
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Window* pParent,
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh )
{
@@ -1550,13 +1550,13 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Wind
return new AbstractTabDialog_Impl( pDlg );
return 0;
}
-//add for ScValidationDlg end
+
#if ENABLE_LAYOUT && !LAYOUT_SFX_TABDIALOG_BROKEN
#define SfxTabDialog layout::SfxTabDialog
#define AbstractTabDialog_Impl layout::AbstractTabDialog_Impl
#endif /* ENABLE_LAYOUT */
-//add for ScSortDlg begin
+
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window* pParent,
const SfxItemSet* pArgSet,int nId )
{
@@ -1577,7 +1577,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window*
#undef SfxTabDialog
#undef AbstractTabDialog_Impl
-//add for ScSortDlg end
+
//------------------ Factories for TabPages--------------------
CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
{
commit 13f70f93cc01d453766ee19bdd7681c57c2b6ee9
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jan 16 23:47:29 2011 +0100
Remove a useless elsif statement
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index d984c94..5ca8547 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -387,8 +387,6 @@ ScValidityRefChildWin::ScValidityRefChildWin( Window* pParentP, \
DBG_ASSERT( pViewShell, "missing view shell :-(" ); \
if (pViewShell && !pWindow) \
pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \
- else if( pWindow /*&& pWindow->ISA(ScValidationDlg)*/ )
- {}//pWindow = new Window( pParentP, WB_HIDE );
if( pWindow ) m_pSavedWndParent = pWindow->GetParent();
}
More information about the Libreoffice-commits
mailing list