Skip to content

C
core
Kaydet (Commit) 4bfdde8c authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert sc/source/ui/attrdlg/scdlgfact.hxx from String to OUString 

Change-Id: I63b028708f3f5e18c97b42fd891845d716cf120f
üst fbb07536
Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 69 deletions
sc/inc/scabstdlg.hxx
Dosyayı görüntüle @ 4bfdde8c
...@@ -185,19 +185,19 @@ public: ...@@ -185,19 +185,19 @@ public:
class AbstractScSelEntryDlg : public VclAbstractDialog class AbstractScSelEntryDlg : public VclAbstractDialog
{ {
public: public:
virtual String GetSelectEntry() const = 0; virtual OUString GetSelectEntry() const = 0;
}; };
class AbstractScLinkedAreaDlg : public VclAbstractDialog2 class AbstractScLinkedAreaDlg : public VclAbstractDialog2
{ {
public: public:
virtual void InitFromOldLink( const String& rFile, const String& rFilter, virtual void InitFromOldLink( const OUString& rFile, const OUString& rFilter,
const String& rOptions, const String& rSource, const OUString& rOptions, const OUString& rSource,
sal_uLong nRefresh ) = 0; sal_uLong nRefresh ) = 0;
virtual String GetURL() = 0; virtual OUString GetURL() = 0;
virtual String GetFilter() = 0; // may be empty virtual OUString GetFilter() = 0; // may be empty
virtual String GetOptions() = 0; // filter options virtual OUString GetOptions() = 0; // filter options
virtual String GetSource() = 0; // separated by ";" virtual OUString GetSource() = 0; // separated by ";"
virtual sal_uLong GetRefresh() = 0; // 0 if disabled virtual sal_uLong GetRefresh() = 0; // 0 if disabled
}; };
...@@ -269,7 +269,7 @@ public: ...@@ -269,7 +269,7 @@ public:
class AbstractScDPShowDetailDlg : public VclAbstractDialog class AbstractScDPShowDetailDlg : public VclAbstractDialog
{ {
public: public:
virtual String GetDimensionName() const = 0; virtual OUString GetDimensionName() const = 0;
}; };
class AbstractScNewScenarioDlg : public VclAbstractDialog class AbstractScNewScenarioDlg : public VclAbstractDialog
...@@ -286,10 +286,10 @@ public: ...@@ -286,10 +286,10 @@ public:
class AbstractScShowTabDlg : public VclAbstractDialog class AbstractScShowTabDlg : public VclAbstractDialog
{ {
public: public:
virtual void Insert( const String& rString, sal_Bool bSelected ) = 0; virtual void Insert( const OUString& rString, sal_Bool bSelected ) = 0;
virtual sal_uInt16 GetSelectEntryCount() const = 0; virtual sal_uInt16 GetSelectEntryCount() const = 0;
virtual void SetDescription(const String& rTitle, const String& rFixedText, const OString& nDlgHelpId, const OString& nLbHelpId ) = 0; virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& nDlgHelpId, const OString& nLbHelpId ) = 0;
virtual String GetSelectEntry(sal_uInt16 nPos) const = 0; virtual OUString GetSelectEntry(sal_uInt16 nPos) const = 0;
virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const = 0; virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const = 0;
}; };
...@@ -327,7 +327,7 @@ class ScAbstractDialogFactory ...@@ -327,7 +327,7 @@ class ScAbstractDialogFactory
public: public:
SC_DLLPUBLIC static ScAbstractDialogFactory* Create(); SC_DLLPUBLIC static ScAbstractDialogFactory* Create();
virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, OUString aDatName,
SvStream* pInStream, SvStream* pInStream,
ScImportAsciiCall eCall) = 0; ScImportAsciiCall eCall) = 0;
...@@ -344,12 +344,12 @@ public: ...@@ -344,12 +344,12 @@ public:
sal_Bool bRow = false) = 0; sal_Bool bRow = false) = 0;
virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent,
const String& rStrTitle, const OUString& rStrTitle,
const String& rStrLabel, const OUString& rStrLabel,
int nId, int nId,
sal_Bool bColDefault = sal_True ) = 0; sal_Bool bColDefault = sal_True ) = 0;
virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const String& rExtendText, const String& rCurrentText ) = 0; virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) = 0;
virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
const ScAddress& rPos, int nId ) = 0; const ScAddress& rPos, int nId ) = 0;
...@@ -376,7 +376,7 @@ public: ...@@ -376,7 +376,7 @@ public:
FillDir eFillDir, FillDir eFillDir,
FillCmd eFillCmd, FillCmd eFillCmd,
FillDateCmd eFillDateCmd, FillDateCmd eFillDateCmd,
String aStartStr, OUString aStartStr,
double fStep, double fStep,
double fMax, double fMax,
sal_uInt16 nPossDir) = 0; sal_uInt16 nPossDir) = 0;
...@@ -414,7 +414,7 @@ public: ...@@ -414,7 +414,7 @@ public:
long nLast = 100 ) = 0; long nLast = 100 ) = 0;
virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(Window * pParent, virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(Window * pParent,
const String& rDefault) = 0; const OUString& rDefault) = 0;
virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent, virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent,
sal_uInt16 nFlags) = 0; sal_uInt16 nFlags) = 0;
...@@ -450,21 +450,21 @@ public: ...@@ -450,21 +450,21 @@ public:
ScDPObject& rDPObj, ScDPObject& rDPObj,
sal_uInt16 nOrient ) = 0; sal_uInt16 nOrient ) = 0;
virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const String& rName, virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const OUString& rName,
int nId, int nId,
sal_Bool bEdit = false, sal_Bool bSheetProtected = false ) = 0; sal_Bool bEdit = false, sal_Bool bSheetProtected = false ) = 0;
virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ) = 0; virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ) = 0;
virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent, virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent,
const String& rTitle, const OUString& rTitle,
const String& rEditTitle, const OUString& rEditTitle,
const String& rDefault, const OUString& rDefault,
const OString& sHelpId, const OString& sEditHelpId, const OString& sHelpId, const OString& sEditHelpId,
int nId ) = 0; int nId ) = 0;
virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent,
const String& rTitle, //Dialog Title const OUString& rTitle, //Dialog Title
const String& rTabBgColorNoColorText, //Label for no tab color const OUString& rTabBgColorNoColorText, //Label for no tab color
const Color& rDefaultColor, //Currently selected Color const Color& rDefaultColor, //Currently selected Color
const OString& , const OString& ,
int nId ) = 0; int nId ) = 0;
......
sc/source/ui/attrdlg/scdlgfact.cxx
Dosyayı görüntüle @ 4bfdde8c
...@@ -385,34 +385,34 @@ const OUString* AbstractScInsertTableDlg_Impl::GetNextTable( sal_uInt16* pN ) ...@@ -385,34 +385,34 @@ const OUString* AbstractScInsertTableDlg_Impl::GetNextTable( sal_uInt16* pN )
return pDlg->GetNextTable( pN ); return pDlg->GetNextTable( pN );
} }
String AbstractScSelEntryDlg_Impl::GetSelectEntry() const OUString AbstractScSelEntryDlg_Impl::GetSelectEntry() const
{ {
return pDlg->GetSelectEntry(); return pDlg->GetSelectEntry();
} }
void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const String& rFile, const String& rFilter, void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const OUString& rFile, const OUString& rFilter,
const String& rOptions, const String& rSource, const OUString& rOptions, const OUString& rSource,
sal_uLong nRefresh ) sal_uLong nRefresh )
{ {
pDlg->InitFromOldLink( rFile, rFilter, rOptions, rSource, nRefresh); pDlg->InitFromOldLink( rFile, rFilter, rOptions, rSource, nRefresh);
} }
String AbstractScLinkedAreaDlg_Impl::GetURL() OUString AbstractScLinkedAreaDlg_Impl::GetURL()
{ {
return pDlg->GetURL(); return pDlg->GetURL();
} }
String AbstractScLinkedAreaDlg_Impl::GetFilter() OUString AbstractScLinkedAreaDlg_Impl::GetFilter()
{ {
return pDlg->GetFilter(); return pDlg->GetFilter();
} }
String AbstractScLinkedAreaDlg_Impl::GetOptions() OUString AbstractScLinkedAreaDlg_Impl::GetOptions()
{ {
return pDlg->GetOptions(); return pDlg->GetOptions();
} }
String AbstractScLinkedAreaDlg_Impl::GetSource() OUString AbstractScLinkedAreaDlg_Impl::GetSource()
{ {
return pDlg->GetSource(); return pDlg->GetSource();
} }
...@@ -533,7 +533,7 @@ sal_Int32 AbstractScDPDateGroupDlg_Impl::GetDatePart() const ...@@ -533,7 +533,7 @@ sal_Int32 AbstractScDPDateGroupDlg_Impl::GetDatePart() const
return pDlg->GetDatePart(); return pDlg->GetDatePart();
} }
String AbstractScDPShowDetailDlg_Impl::GetDimensionName() const OUString AbstractScDPShowDetailDlg_Impl::GetDimensionName() const
{ {
return pDlg->GetDimensionName(); return pDlg->GetDimensionName();
} }
...@@ -550,7 +550,7 @@ void AbstractScNewScenarioDlg_Impl::GetScenarioData( ...@@ -550,7 +550,7 @@ void AbstractScNewScenarioDlg_Impl::GetScenarioData(
pDlg->GetScenarioData(rName, rComment, rColor, rFlags); pDlg->GetScenarioData(rName, rComment, rColor, rFlags);
} }
void AbstractScShowTabDlg_Impl::Insert( const String& rString, sal_Bool bSelected ) void AbstractScShowTabDlg_Impl::Insert( const OUString& rString, sal_Bool bSelected )
{ {
pDlg->Insert( rString, bSelected); pDlg->Insert( rString, bSelected);
} }
...@@ -561,7 +561,7 @@ sal_uInt16 AbstractScShowTabDlg_Impl::GetSelectEntryCount() const ...@@ -561,7 +561,7 @@ sal_uInt16 AbstractScShowTabDlg_Impl::GetSelectEntryCount() const
} }
void AbstractScShowTabDlg_Impl::SetDescription( void AbstractScShowTabDlg_Impl::SetDescription(
const String& rTitle, const String& rFixedText, const OUString& rTitle, const OUString& rFixedText,
const OString& sDlgHelpId, const OString& sLbHelpId ) const OString& sDlgHelpId, const OString& sLbHelpId )
{ {
pDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId ); pDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId );
...@@ -572,7 +572,7 @@ sal_uInt16 AbstractScShowTabDlg_Impl::GetSelectEntryPos(sal_uInt16 nPos) const ...@@ -572,7 +572,7 @@ sal_uInt16 AbstractScShowTabDlg_Impl::GetSelectEntryPos(sal_uInt16 nPos) const
return pDlg->GetSelectEntryPos( nPos); return pDlg->GetSelectEntryPos( nPos);
} }
String AbstractScShowTabDlg_Impl::GetSelectEntry(sal_uInt16 nPos) const OUString AbstractScShowTabDlg_Impl::GetSelectEntry(sal_uInt16 nPos) const
{ {
return pDlg->GetSelectEntry(nPos); return pDlg->GetSelectEntry(nPos);
} }
...@@ -603,7 +603,7 @@ bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const ...@@ -603,7 +603,7 @@ bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const
} }
// =========================Factories for createdialog =================== // =========================Factories for createdialog ===================
AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( Window* pParent, String aDatName, AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( Window* pParent, OUString aDatName,
SvStream* pInStream, ScImportAsciiCall eCall ) SvStream* pInStream, ScImportAsciiCall eCall )
{ {
ScImportAsciiDlg* pDlg = new ScImportAsciiDlg( pParent, aDatName,pInStream, eCall ); ScImportAsciiDlg* pDlg = new ScImportAsciiDlg( pParent, aDatName,pInStream, eCall );
...@@ -658,8 +658,8 @@ AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg ...@@ -658,8 +658,8 @@ AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg
} }
VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* pParent, VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* pParent,
const String& rStrTitle, const OUString& rStrTitle,
const String& rStrLabel, const OUString& rStrLabel,
int nId, int nId,
sal_Bool bColDefault) sal_Bool bColDefault)
{ {
...@@ -678,7 +678,7 @@ VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* ...@@ -678,7 +678,7 @@ VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window*
return 0; return 0;
} }
AbstractScSortWarningDlg* ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const String& rExtendText, const String& rCurrentText ) AbstractScSortWarningDlg* ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const OUString& rExtendText, const OUString& rCurrentText )
{ {
ScSortWarningDlg* pDlg = new ScSortWarningDlg(pParent, rExtendText, rCurrentText ); ScSortWarningDlg* pDlg = new ScSortWarningDlg(pParent, rExtendText, rCurrentText );
return new AbstractScSortWarningDlg_Impl( pDlg ); return new AbstractScSortWarningDlg_Impl( pDlg );
...@@ -772,7 +772,7 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi ...@@ -772,7 +772,7 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi
FillDir eFillDir, FillDir eFillDir,
FillCmd eFillCmd, FillCmd eFillCmd,
FillDateCmd eFillDateCmd, FillDateCmd eFillDateCmd,
String aStartStr, OUString aStartStr,
double fStep, double fStep,
double fMax, double fMax,
sal_uInt16 nPossDir) sal_uInt16 nPossDir)
...@@ -880,7 +880,7 @@ AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg ...@@ -880,7 +880,7 @@ AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg
} }
AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(Window* pParent, AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(Window* pParent,
const String& rDefault) const OUString& rDefault)
{ {
ScMoveTableDlg * pDlg = new ScMoveTableDlg( pParent, rDefault ); ScMoveTableDlg * pDlg = new ScMoveTableDlg( pParent, rDefault );
return new AbstractScMoveTableDlg_Impl( pDlg ); return new AbstractScMoveTableDlg_Impl( pDlg );
...@@ -985,7 +985,7 @@ AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDl ...@@ -985,7 +985,7 @@ AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDl
return 0; return 0;
} }
AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg ( Window* pParent, const String& rName, AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg ( Window* pParent, const OUString& rName,
int nId, int nId,
sal_Bool bEdit , sal_Bool bSheetProtected ) sal_Bool bEdit , sal_Bool bSheetProtected )
{ {
...@@ -1022,9 +1022,9 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window ...@@ -1022,9 +1022,9 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window
} }
AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg ( Window* pParent, AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg ( Window* pParent,
const String& rTitle, const OUString& rTitle,
const String& rEditTitle, const OUString& rEditTitle,
const String& rDefault, const OUString& rDefault,
const OString& sHelpId, const OString& sEditHelpId, const OString& sHelpId, const OString& sEditHelpId,
int nId ) int nId )
{ {
...@@ -1045,8 +1045,8 @@ AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg ...@@ -1045,8 +1045,8 @@ AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg
AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg ( AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg (
Window* pParent, Window* pParent,
const String& rTitle, const OUString& rTitle,
const String& rTabBgColorNoColorText, const OUString& rTabBgColorNoColorText,
const Color& rDefaultColor, const Color& rDefaultColor,
const OString& sHelpId , const OString& sHelpId ,
int nId ) int nId )
......
sc/source/ui/attrdlg/scdlgfact.hxx
Dosyayı görüntüle @ 4bfdde8c
...@@ -236,20 +236,20 @@ class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg ...@@ -236,20 +236,20 @@ class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg
class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg
{ {
DECL_ABSTDLG_BASE( AbstractScSelEntryDlg_Impl, ScSelEntryDlg ) DECL_ABSTDLG_BASE( AbstractScSelEntryDlg_Impl, ScSelEntryDlg )
virtual String GetSelectEntry() const; virtual OUString GetSelectEntry() const;
}; };
class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg
{ {
DECL_ABSTDLG2_BASE( AbstractScLinkedAreaDlg_Impl, ScLinkedAreaDlg) DECL_ABSTDLG2_BASE( AbstractScLinkedAreaDlg_Impl, ScLinkedAreaDlg)
virtual void InitFromOldLink( const String& rFile, const String& rFilter, virtual void InitFromOldLink( const OUString& rFile, const OUString& rFilter,
const String& rOptions, const String& rSource, const OUString& rOptions, const OUString& rSource,
sal_uLong nRefresh ); sal_uLong nRefresh );
virtual String GetURL(); virtual OUString GetURL();
virtual String GetFilter(); // may be empty virtual OUString GetFilter(); // may be empty
virtual String GetOptions(); // filter options virtual OUString GetOptions(); // filter options
virtual String GetSource(); // separated by ";" virtual OUString GetSource(); // separated by ";"
virtual sal_uLong GetRefresh(); // 0 if disabled virtual sal_uLong GetRefresh(); // 0 if disabled
}; };
...@@ -321,7 +321,7 @@ class AbstractScDPDateGroupDlg_Impl : public AbstractScDPDateGroupDlg ...@@ -321,7 +321,7 @@ class AbstractScDPDateGroupDlg_Impl : public AbstractScDPDateGroupDlg
class AbstractScDPShowDetailDlg_Impl : public AbstractScDPShowDetailDlg class AbstractScDPShowDetailDlg_Impl : public AbstractScDPShowDetailDlg
{ {
DECL_ABSTDLG_BASE( AbstractScDPShowDetailDlg_Impl, ScDPShowDetailDlg) DECL_ABSTDLG_BASE( AbstractScDPShowDetailDlg_Impl, ScDPShowDetailDlg)
virtual String GetDimensionName() const; virtual OUString GetDimensionName() const;
}; };
class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg
...@@ -337,10 +337,10 @@ class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg ...@@ -337,10 +337,10 @@ class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg
class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg
{ {
DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg) DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg)
virtual void Insert( const String& rString, sal_Bool bSelected ); virtual void Insert( const OUString& rString, sal_Bool bSelected );
virtual sal_uInt16 GetSelectEntryCount() const; virtual sal_uInt16 GetSelectEntryCount() const;
virtual void SetDescription(const String& rTitle, const String& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ); virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId );
virtual String GetSelectEntry(sal_uInt16 nPos) const; virtual OUString GetSelectEntry(sal_uInt16 nPos) const;
virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const; virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const;
}; };
...@@ -395,7 +395,7 @@ class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory ...@@ -395,7 +395,7 @@ class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory
public: public:
virtual ~ScAbstractDialogFactory_Impl() {} virtual ~ScAbstractDialogFactory_Impl() {}
virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, OUString aDatName,
SvStream* pInStream, SvStream* pInStream,
ScImportAsciiCall eCall); ScImportAsciiCall eCall);
...@@ -412,12 +412,12 @@ public: ...@@ -412,12 +412,12 @@ public:
sal_Bool bRow = false); sal_Bool bRow = false);
virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent,
const String& rStrTitle, const OUString& rStrTitle,
const String& rStrLabel, const OUString& rStrLabel,
int nId, int nId,
sal_Bool bColDefault = sal_True ); sal_Bool bColDefault = sal_True );
virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const String& rExtendText, const String& rCurrentText ); virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText );
virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
const ScAddress& rPos, int nId ); const ScAddress& rPos, int nId );
...@@ -444,7 +444,7 @@ public: ...@@ -444,7 +444,7 @@ public:
FillDir eFillDir, FillDir eFillDir,
FillCmd eFillCmd, FillCmd eFillCmd,
FillDateCmd eFillDateCmd, FillDateCmd eFillDateCmd,
String aStartStr, OUString aStartStr,
double fStep, double fStep,
double fMax, double fMax,
sal_uInt16 nPossDir); sal_uInt16 nPossDir);
...@@ -482,7 +482,7 @@ public: ...@@ -482,7 +482,7 @@ public:
long nLast = 100 ); long nLast = 100 );
virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(Window * pParent, virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(Window * pParent,
const String& rDefault); const OUString& rDefault);
virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent, virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent,
sal_uInt16 nFlags); sal_uInt16 nFlags);
...@@ -518,21 +518,21 @@ public: ...@@ -518,21 +518,21 @@ public:
ScDPObject& rDPObj, ScDPObject& rDPObj,
sal_uInt16 nOrient ); sal_uInt16 nOrient );
virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const String& rName, virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const OUString& rName,
int nId, int nId,
sal_Bool bEdit = false, sal_Bool bSheetProtected = false ); sal_Bool bEdit = false, sal_Bool bSheetProtected = false );
virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ); virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId );
virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent, virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent,
const String& rTitle, const OUString& rTitle,
const String& rEditTitle, const OUString& rEditTitle,
const String& rDefault, const OUString& rDefault,
const OString& sHelpId, const OString& sEditHelpId, const OString& sHelpId, const OString& sEditHelpId,
int nId ); int nId );
virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent,
const String& rTitle, //Dialog Title const OUString& rTitle, //Dialog Title
const String& rTabBgColorNoColorText, //Label for no tab color const OUString& rTabBgColorNoColorText, //Label for no tab color
const Color& rDefaultColor, //Currently selected Color const Color& rDefaultColor, //Currently selected Color
const OString& sHelpId , const OString& sHelpId ,
int nId ); int nId );
......
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