[Libreoffice-commits] core.git: cui/source include/svx lotuswordpro/source sc/inc sc/source sd/inc sd/source sw/inc sw/source
Tor Lillqvist
tml at iki.fi
Sat Aug 31 14:06:16 PDT 2013
cui/source/factory/dlgfact.cxx | 98 +++++++--------
cui/source/factory/dlgfact.hxx | 129 +++++--------------
include/svx/svxdlg.hxx | 134 +++++++++-----------
lotuswordpro/source/filter/lwppara1.cxx | 5
sc/inc/scabstdlg.hxx | 122 +++++++++---------
sc/source/ui/attrdlg/scdlgfact.cxx | 209 ++++++++------------------------
sc/source/ui/attrdlg/scdlgfact.hxx | 119 ++++++++----------
sd/inc/sdabstdlg.hxx | 32 ++--
sd/source/ui/dlg/sddlgfact.cxx | 115 ++++-------------
sd/source/ui/dlg/sddlgfact.hxx | 30 ----
sw/inc/swabstdlg.hxx | 145 ++++++++++------------
sw/source/filter/ww8/ww8par.hxx | 4
sw/source/ui/dialog/swdlgfact.cxx | 191 +++++++++++++++--------------
sw/source/ui/dialog/swdlgfact.hxx | 161 +++++++-----------------
14 files changed, 592 insertions(+), 902 deletions(-)
New commits:
commit af5a380bc19f599307b3bc524a31c380d456249e
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun Sep 1 00:02:40 2013 +0300
Remove pointless comments and ASCII art
Change-Id: I387d7b301643f359f2d6a4c5f51a4dd7f5e1c296
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 1e2f9b0..38f09e7 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "align.hxx" //add for SvxAlignmentTabPage
+#include "align.hxx"
#include "dlgfact.hxx"
#include <sfx2/basedlgs.hxx>
@@ -38,46 +38,46 @@
#include "treeopt.hxx"
#include "internationaloptions.hxx"
#include "labdlg.hxx"
-#include "hangulhanjadlg.hxx" //add for HangulHanjaConversionDialog
-#include "showcols.hxx" //add for FmShowColsDialog
-#include "zoom.hxx" //add for SvxZoomDialog
-#include "cuigaldlg.hxx" //add for Gallery 6 Dialogs and 1 TabPage
-#include "cuiimapwnd.hxx" //add for URLDlg
-#include "hlmarkwn.hxx" //add for SvxHlinkDlgMarkWnd
-#include "srchxtra.hxx" //add for SvxSearchFormatDialog
-#include "transfrm.hxx" //add for SvxTransformTabDialog
-#include "bbdlg.hxx" //add for SvxBorderBackgroundDlg
-#include "cuisrchdlg.hxx" //add for SvxJSearchOptionsDialog
-#include "cuitbxform.hxx" //add for FmInputRecordNoDialog
-#include "optdict.hxx" //add for SvxNewDictionaryDialog
-#include "dlgname.hxx" //add for SvxNameDialog & SvxMessDialog
-#include "multipat.hxx" //add for SvxMultiPathDialog
-#include "multifil.hxx" //add for SvxMultiFileDialog
-#include "cuihyperdlg.hxx" //add for SvxHpLinkDlg
-#include "cuifmsearch.hxx" //add for FmSearchDialog
-#include "cuigrfflt.hxx" //add for GraphicFilterDialog
-#include "cuitabarea.hxx" //add for SvxAreaTabDialog
-#include "cuitabline.hxx" //add for SvxLineTabDialog
-#include "measure.hxx" //add for SvxMeasureDialog
-#include "connect.hxx" //add for SvxConnectionDialog
-#include "dbregister.hxx" // add for DatabaseRegistrationDialog
-#include "cuioptgenrl.hxx" //add for SvxGeneralTabPage
+#include "hangulhanjadlg.hxx"
+#include "showcols.hxx"
+#include "zoom.hxx"
+#include "cuigaldlg.hxx"
+#include "cuiimapwnd.hxx"
+#include "hlmarkwn.hxx"
+#include "srchxtra.hxx"
+#include "transfrm.hxx"
+#include "bbdlg.hxx"
+#include "cuisrchdlg.hxx"
+#include "cuitbxform.hxx"
+#include "optdict.hxx"
+#include "dlgname.hxx"
+#include "multipat.hxx"
+#include "multifil.hxx"
+#include "cuihyperdlg.hxx"
+#include "cuifmsearch.hxx"
+#include "cuigrfflt.hxx"
+#include "cuitabarea.hxx"
+#include "cuitabline.hxx"
+#include "measure.hxx"
+#include "connect.hxx"
+#include "dbregister.hxx"
+#include "cuioptgenrl.hxx"
#include "optasian.hxx"
#include "insdlg.hxx"
#include "pastedlg.hxx"
#include "linkdlg.hxx"
#include "SpellDialog.hxx"
-#include "cfg.hxx" //add for SvxConfigDialog
-#include "numpages.hxx" // add for
-#include "paragrph.hxx" //add for
-#include "tabstpge.hxx" // add for
-#include "textattr.hxx" // add for SvxTextAttrPage
-#include "backgrnd.hxx" //add for SvxBackgroundTabPage
-#include "border.hxx" //add for SvxBorderTabPage
-#include "chardlg.hxx" //add for SvxCharNamePage,SvxCharEffectsPage,SvxCharPositionPage,SvxCharTwoLinesPage
-#include "page.hxx" //add for SvxPageDescPage
-#include "postdlg.hxx" //add for SvxPostItDialog
-#include "grfpage.hxx" //add for SvxGrfCropPage
+#include "cfg.hxx"
+#include "numpages.hxx"
+#include "paragrph.hxx"
+#include "tabstpge.hxx"
+#include "textattr.hxx"
+#include "backgrnd.hxx"
+#include "border.hxx"
+#include "chardlg.hxx"
+#include "page.hxx"
+#include "postdlg.hxx"
+#include "grfpage.hxx"
#include "scriptdlg.hxx" // for ScriptOrgDialog
#include "selector.hxx" // for SvxScriptSelectorDialog
#include "macropg.hxx" // for SvxMacroAssignDlg
@@ -1184,7 +1184,7 @@ AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( W
FmShowColsDialog* pDlg = new FmShowColsDialog( pParent);
return new AbstractFmShowColsDialog_Impl( pDlg );
}
-AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog
+AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( Window* pParent,
const SfxItemSet& rCoreSet)
{
SvxZoomDialog* pDlg = new SvxZoomDialog( pParent, rCoreSet);
@@ -1206,7 +1206,7 @@ VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgre
return new VclAbstractRefreshableDialog_Impl( pDlg );
}
-AbstractSearchProgress * AbstractDialogFactory_Impl::CreateSearchProgressDialog( Window* pParent, //add for SearchProgress
+AbstractSearchProgress * AbstractDialogFactory_Impl::CreateSearchProgressDialog( Window* pParent,
const INetURLObject& rStartURL )
{
SearchProgress* pDlg = new SearchProgress( pParent, rStartURL);
@@ -1248,7 +1248,7 @@ void AbstractScriptSelectorDialog_Impl::SetRunLabel()
return;
}
-VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window* pParent, //add for SvxScriptOrgDialog
+VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window* pParent,
const OUString& rLanguage)
{
Dialog* pDlg=NULL;
@@ -1260,21 +1260,21 @@ VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window
return 0;
}
-AbstractTitleDialog * AbstractDialogFactory_Impl::CreateTitleDialog( Window* pParent, //add for TitleDialog
+AbstractTitleDialog * AbstractDialogFactory_Impl::CreateTitleDialog( Window* pParent,
const String& rOldText)
{
TitleDialog* pDlg = new TitleDialog( pParent, rOldText);
return new AbstractTitleDialog_Impl( pDlg );
}
-AbstractGalleryIdDialog * AbstractDialogFactory_Impl::CreateGalleryIdDialog( Window* pParent, //add for SvxZoomDialog
+AbstractGalleryIdDialog * AbstractDialogFactory_Impl::CreateGalleryIdDialog( Window* pParent,
GalleryTheme* pThm )
{
GalleryIdDialog* pDlg = new GalleryIdDialog( pParent, pThm);
return new AbstractGalleryIdDialog_Impl( pDlg );
}
-VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog( Window* pParent, //add for GalleryThemeProperties
+VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog( Window* pParent,
ExchangeData* pData,
SfxItemSet* pItemSet)
{
@@ -1282,7 +1282,7 @@ VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDia
return new VclAbstractDialog2_Impl( pDlg );
}
-AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( Window* pParent, //add for URLDlg
+AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( Window* pParent,
const String& rURL, const String& rAltText, const String& rDescription,
const String& rTarget, const String& rName,
TargetList& rTargetList )
@@ -1482,7 +1482,7 @@ AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialo
return new AbstractSvxMultiFileDialog_Impl( pDlg );
}
-AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* pParent, //add for SvxMultiFileDialog
+AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* pParent,
SfxBindings* pBindings,
sal_uInt32 nResId)
{
@@ -1501,7 +1501,7 @@ AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* p
return 0;
}
-AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
+AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window* pParent,
const OUString& strInitialText,
const ::std::vector< OUString >& _rContexts,
sal_Int16 nInitialContext,
@@ -1513,7 +1513,7 @@ AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window
return 0;
}
-AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss
+AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (Window* pParent,
const Graphic& rGraphic,
RECT_POINT eLightSource,
sal_uInt32)
@@ -1553,14 +1553,14 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmo
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
-AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize
+AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (Window* pParent,
const Graphic& rGraphic, sal_uInt8 nGreyThreshold, sal_Bool bInvert, sal_uInt32 )
{
GraphicFilterDialog* pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert );
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
-AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic
+AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (Window* pParent,
const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight,
sal_Bool bEnhanceEdges, sal_uInt32 nResId)
{
@@ -1783,7 +1783,7 @@ CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorF
DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc()
{
- return SvxPostItDialog::GetRanges; //add for SvxPostItDialog
+ return SvxPostItDialog::GetRanges;
}
GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nId )
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 2e7409c..8816602 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -80,7 +80,6 @@ short Class::Execute() \
return pDlg->Execute(); \
}
-//for GalleryThemeProperties begin
class VclAbstractDialog2_Impl : public VclAbstractDialog2
{
Dialog* m_pDlg;
@@ -93,21 +92,18 @@ public:
private:
DECL_LINK( EndDialogHdl, Dialog* );
};
-//for GalleryThemeProperties end
class CuiVclAbstractDialog_Impl : public VclAbstractDialog
{
DECL_ABSTDLG_BASE(CuiVclAbstractDialog_Impl,Dialog)
};
-//for ActualizeProgress begin
class VclAbstractRefreshableDialog_Impl : public VclAbstractRefreshableDialog
{
DECL_ABSTDLG_BASE(VclAbstractRefreshableDialog_Impl,Dialog)
virtual void Update() ;
virtual void Sync() ;
};
-//for ActualizeProgress end
class CuiAbstractSfxDialog_Impl : public SfxAbstractDialog
{
@@ -132,7 +128,6 @@ class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog
virtual OUString GetText() const;
};
-//for SvxDistributeDialog begin
class SvxDistributeDialog;
class AbstractSvxDistributeDialog_Impl: public AbstractSvxDistributeDialog
{
@@ -141,9 +136,7 @@ public:
virtual SvxDistributeHorizontal GetDistributeHor() const;
virtual SvxDistributeVertical GetDistributeVer() const;
};
-//for SvxDistributeDialog end
-// for HangulHanjaConversionDialog begin
class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConversionDialog
{
DECL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl,HangulHanjaConversionDialog)
@@ -181,7 +174,6 @@ class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog
virtual Window* GetWindow();
};
-
class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog
{
DECL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl,SvxHyphenWordDialog)
@@ -190,17 +182,13 @@ class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog
virtual Window* GetWindow();
};
-// for FmShowColsDialog begin
class FmShowColsDialog;
class AbstractFmShowColsDialog_Impl : public AbstractFmShowColsDialog
{
DECL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl,FmShowColsDialog)
virtual void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols);
};
-//for FmShowColsDialog end
-
-//for SvxZoomDialog begin
class SvxZoomDialog;
class AbstractSvxZoomDialog_Impl : public AbstractSvxZoomDialog
{
@@ -210,9 +198,7 @@ class AbstractSvxZoomDialog_Impl : public AbstractSvxZoomDialog
virtual const SfxItemSet* GetOutputItemSet() const ;
};
-//for SvxZoomDialog end
-//for SvxSpellDialog begin
namespace svx{ class SpellDialog;}
class AbstractSpellDialog_Impl : public AbstractSpellDialog
{
@@ -224,8 +210,7 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog
virtual Window* GetWindow();
virtual SfxBindings& GetBindings();
};
-//for SvxSpellDialog end
-//for SearchProgress begin
+
class SearchProgress;
class AbstractSearchProgress_Impl : public AbstractSearchProgress
{
@@ -237,9 +222,7 @@ class AbstractSearchProgress_Impl : public AbstractSearchProgress
virtual PLinkStub GetLinkStubCleanUpHdl() ;
};
-//for SearchProgress end
-//for TakeProgress begin
class TakeProgress;
class AbstractTakeProgress_Impl : public AbstractTakeProgress
{
@@ -250,9 +233,7 @@ class AbstractTakeProgress_Impl : public AbstractTakeProgress
virtual PLinkStub GetLinkStubCleanUpHdl() ;
};
-//for TakeProgress end
-//for TitleDialog begin
class TitleDialog;
class AbstractTitleDialog_Impl : public AbstractTitleDialog
{
@@ -260,9 +241,7 @@ class AbstractTitleDialog_Impl : public AbstractTitleDialog
virtual String GetTitle() const ;
};
-//for TitleDialog end
-//for SvxScriptSelectorDialog begin
class SvxScriptSelectorDialog;
class AbstractScriptSelectorDialog_Impl : public AbstractScriptSelectorDialog
{
@@ -274,7 +253,6 @@ class AbstractScriptSelectorDialog_Impl : public AbstractScriptSelectorDialog
virtual void SetRunLabel();
};
-//for GalleryIdDialog begin
class GalleryIdDialog;
class AbstractGalleryIdDialog_Impl : public AbstractGalleryIdDialog
{
@@ -282,9 +260,7 @@ class AbstractGalleryIdDialog_Impl : public AbstractGalleryIdDialog
virtual sal_uLong GetId() const ;
};
-//for GalleryIdDialog end
-//for URLDlg start
class URLDlg;
class AbstractURLDlg_Impl :public AbstractURLDlg
{
@@ -295,9 +271,7 @@ class AbstractURLDlg_Impl :public AbstractURLDlg
virtual String GetTarget() const;
virtual String GetName() const;
};
-//for URLDlg end
-//for SvxHlinkDlgMarkWnd begin
class SvxHlinkDlgMarkWnd;
class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd
{
@@ -314,9 +288,7 @@ class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd
virtual sal_uInt16 SetError( sal_uInt16 nError) ;
};
-//for SvxHlinkDlgMarkWnd end
-//for SvxSearchSimilarityDialog begin
class SvxSearchSimilarityDialog;
class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarityDialog
{
@@ -326,16 +298,13 @@ class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarity
virtual sal_uInt16 GetLonger();
virtual sal_Bool IsRelaxed();
};
-//for SvxSearchSimilarityDialog end
-//for SvxJSearchOptionsDialog end
class SvxJSearchOptionsDialog;
class AbstractSvxJSearchOptionsDialog_Impl :public AbstractSvxJSearchOptionsDialog
{
DECL_ABSTDLG_BASE(AbstractSvxJSearchOptionsDialog_Impl,SvxJSearchOptionsDialog)
virtual sal_Int32 GetTransliterationFlags() const;
};
-//for SvxJSearchOptionsDialog end
class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
{
@@ -349,6 +318,7 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
virtual void SetText( const OUString& rStr );
virtual OUString GetText() const;
};
+
class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
{
DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog)
@@ -362,7 +332,6 @@ class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
virtual OUString GetText() const;
};
-//for FmInputRecordNoDialog end
class FmInputRecordNoDialog;
class AbstractFmInputRecordNoDialog_Impl :public AbstractFmInputRecordNoDialog
{
@@ -370,18 +339,14 @@ class AbstractFmInputRecordNoDialog_Impl :public AbstractFmInputRecordNoDialog
virtual void SetValue(long nNew) ;
virtual long GetValue() const ;
};
-//for FmInputRecordNoDialog end
-//for SvxNewDictionaryDialog end
class SvxNewDictionaryDialog;
class AbstractSvxNewDictionaryDialog_Impl :public AbstractSvxNewDictionaryDialog
{
DECL_ABSTDLG_BASE(AbstractSvxNewDictionaryDialog_Impl,SvxNewDictionaryDialog)
virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetNewDictionary();
};
-//for SvxNewDictionaryDialog end
-//for SvxNameDialog end
class SvxNameDialog;
class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
{
@@ -396,12 +361,7 @@ private:
Link aCheckNameHdl;
DECL_LINK(CheckNameHdl, void *);
};
-//for SvxNameDialog end
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
-// predefines
class SvxObjectNameDialog;
class SvxObjectTitleDescDialog;
@@ -423,18 +383,13 @@ class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDi
virtual void GetDescription(OUString& rName);
};
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-//for SvxMessDialog end
class SvxMessDialog;
class AbstractSvxMessDialog_Impl :public AbstractSvxMessDialog
{
DECL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl,SvxMessDialog)
virtual void SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt );
};
-//for SvxMessDialog end
-//for SvxMultiPathDialog end
class SvxMultiPathDialog;
class AbstractSvxMultiPathDialog_Impl :public AbstractSvxMultiPathDialog
{
@@ -444,9 +399,7 @@ class AbstractSvxMultiPathDialog_Impl :public AbstractSvxMultiPathDialog
virtual void EnableRadioButtonMode();
virtual void SetTitle( const String& rNewTitle );
};
-//for SvxMultiPathDialog end
-//for SvxMultiFileDialog begin
class SvxMultiFileDialog;
class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog
{
@@ -463,9 +416,7 @@ class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog
virtual void SetHelpId( const OString& ) ;
};
-//for SvxMultiFileDialog end
-//for SvxHpLinkDlg begin
class SvxHpLinkDlg;
class AbstractSvxHpLinkDlg_Impl :public AbstractSvxHpLinkDlg
{
@@ -473,9 +424,7 @@ class AbstractSvxHpLinkDlg_Impl :public AbstractSvxHpLinkDlg
virtual Window* GetWindow();
virtual sal_Bool QueryClose();
};
-//for SvxHpLinkDlg end
-//for FmSearchDialog begin
class FmSearchDialog;
class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog
{
@@ -484,18 +433,14 @@ class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog
virtual void SetCanceledNotFoundHdl(const Link& lnk);
virtual void SetActiveField(const String& strField);
};
-//for FmSearchDialog end
-//for GraphicFilterDialog begin
class GraphicFilterDialog;
class AbstractGraphicFilterDialog_Impl :public AbstractGraphicFilterDialog
{
DECL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl,GraphicFilterDialog)
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
};
-//for GraphicFilterDialog end
-// add for SvxAreaTabDialog begin
class SvxAreaTabDialog;
class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog
{
@@ -509,7 +454,6 @@ class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog
virtual void SetText( const OUString& rStr );
virtual OUString GetText() const;
};
-// add for SvxAreaTabDialog end
class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog
{
@@ -536,8 +480,6 @@ public:
DECL_ABSTDLG_BASE(AbstractLinksDialog_Impl, SvBaseLinksDlg )
};
-
-//add for SvxPostItDialog begin
class SvxPostItDialog;
class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
{
@@ -561,9 +503,7 @@ private:
DECL_LINK(NextHdl, void *);
DECL_LINK(PrevHdl, void *);
};
-//add for SvxPostItDialog end
-//for PasswordToOpenModifyDialog begin
class PasswordToOpenModifyDialog;
class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenModifyDialog
{
@@ -573,10 +513,7 @@ class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenMod
virtual OUString GetPasswordToModify() const;
virtual bool IsRecommendToOpenReadonly() const;
};
-//for PasswordToOpenModifyDialog end
-
-//------------------------------------------------------------------------
//AbstractDialogFactory_Impl implementations
class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory
{
@@ -591,8 +528,8 @@ public:
const SfxItemSet& rAttr,
const SdrView* pView,
sal_uInt32 nResId );
- virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
- const SfxItemSet& rAttr,
+ virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent,
+ const SfxItemSet& rAttr,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
sal_uInt32 nResId
);
@@ -612,7 +549,7 @@ public:
virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent,
const SfxItemSet* pAttrSet,
SdrView* pView,
- SdrModel* pModel=0 ); //add for SvxTextTabDialog
+ SdrModel* pModel=0 );
virtual SfxAbstractTabDialog* CreateTabItemDialog( Window* pParent,
const SfxItemSet& rSet,
sal_uInt32 nResId);
@@ -631,7 +568,7 @@ public:
virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent );
virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML, sfx2::SvBaseLink* p=0 );
- virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog
+ virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,
editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection );
virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus,
const String &rWord, sal_Int16 nLanguage );
@@ -641,17 +578,17 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen,
SvxSpellWrapper* pWrapper );
- virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ); //add for FmShowColsDialog
- virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog
+ virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent );
+ virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent,
const SfxItemSet& rCoreSet);
- virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg
+ virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent,
const SfxItemSet& rCoreSet,
sal_Bool bEnableSelector = sal_False) ;
- virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog
+ virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pView,
sal_uInt16 nAnchorTypes = 0) ;
- virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, //add for SchTransformTabDialog
+ virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView,
sal_uInt32 nResId,
@@ -666,18 +603,18 @@ public:
virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent,
const INetURLObject& rStartURL);
virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent );
- virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, //add for TitleDialog
+ virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent,
const String& rOldText);
- virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, //add for SvxZoomDialog
+ virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent,
GalleryTheme* pThm);
- virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent, //add for GalleryThemeProperties
+ virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent,
ExchangeData* pData,
SfxItemSet* pItemSet);
- virtual AbstractURLDlg * CreateURLDialog( Window* pParent, //add for URLDlg
+ virtual AbstractURLDlg * CreateURLDialog( Window* pParent,
const String& rURL, const String& rAltText, const String& rDescription,
const String& rTarget, const String& rName,
TargetList& rTargetList );
- virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ); //add for SvxHlinkDlgMarkWnd
+ virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId );
virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent,
SearchAttrItemList& rLst,
@@ -686,7 +623,7 @@ public:
sal_Bool bRelax,
sal_uInt16 nOther,
sal_uInt16 nShorter,
- sal_uInt16 nLonger); //add for SvxSearchSimilarityDialog
+ sal_uInt16 nLonger);
virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent,
const SfxItemSet& rOptionsSet,
sal_Int32 nInitialFlags);
@@ -696,7 +633,7 @@ public:
virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent,
const String& rName,
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
- sal_uInt32 nResId);//add for SvxEditDictionaryDialog
+ sal_uInt32 nResId);
virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent,
const String& rName, const String& rDesc );
// #i68101#
@@ -705,41 +642,41 @@ public:
virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
const String& rText, const String& rDesc,
- Image* pImg = NULL ); //add for SvxMessDialog
- virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ); //add for SvxMultiPathDialog
- virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ); //add for SvxMultiFileDialog
- virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxHpLink
+ Image* pImg = NULL );
+ virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False );
+ virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False );
+ virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent,
SfxBindings* pBindings,
sal_uInt32 nResId);
- virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
+ virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent,
const OUString& strInitialText,
const ::std::vector< OUString >& _rContexts,
sal_Int16 nInitialContext,
const Link& lnkContextSupplier);
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent,
const Graphic& rGraphic, RECT_POINT eLightSource,
sal_uInt32 nResId);
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent,
const Graphic& rGraphic, sal_uInt16 nCount,
sal_uInt32 nResId);
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent, //add for GraphicFilterSolarize
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent,
const Graphic& rGraphic, double nRadius,
sal_uInt32 nResId);
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSmooth
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent,
const Graphic& rGraphic, sal_uInt8 nGreyThreshold,
sal_Bool bInvert, sal_uInt32 nResId);
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent,
const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight,
sal_Bool bEnhanceEdges, sal_uInt32 nResId);
- virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
+ virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
- const SdrView* pSdrView = NULL ); //add for SvxAreaTabDialog
- virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add for SvxLineTabDialog
+ const SdrView* pSdrView = NULL );
+ virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr,
SdrModel* pModel,
const SdrObject* pObj = NULL,
sal_Bool bHasObj = sal_True );
- virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
+ virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent,
const SfxItemSet& rCoreSet,
sal_Bool bPrevNext = sal_False );
@@ -748,7 +685,7 @@ public:
virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc();
virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId );
- virtual DialogGetRanges GetDialogGetRangesFunc(); //add for SvxPostItDialog
+ virtual DialogGetRanges GetDialogGetRangesFunc();
virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage );
virtual AbstractScriptSelectorDialog*
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index f42d3cb..75a2698 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -26,9 +26,9 @@ class SdrModel;
class SdrView;
#include <svx/dstribut_enum.hxx>
-#include <svx/rectenum.hxx> //add for enum RECT_POINT
-#include <com/sun/star/container/XIndexContainer.hpp> //add for FmShowColsDialog
-#include <com/sun/star/container/XNameReplace.hpp> //add for SvxMacroAssignDlg
+#include <svx/rectenum.hxx>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/container/XNameReplace.hpp>
#include "svx/svxdllapi.h"
#include <vector>
@@ -40,7 +40,8 @@ namespace linguistic2{
class XThesaurus;
class XHyphenator;
}}}}
-class SvxSpellWrapper; //add for SvxSpellCheckDialog
+
+class SvxSpellWrapper;
typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
typedef sal_uInt16* (*DialogGetRanges)();
@@ -58,20 +59,20 @@ typedef ::std::vector< OUString > TargetList;
namespace svx{ class SpellDialogChildWindow;}
-class AbstractSvxDistributeDialog :public VclAbstractDialog //add for SvxDistributeDialog
+class AbstractSvxDistributeDialog :public VclAbstractDialog
{
public:
virtual SvxDistributeHorizontal GetDistributeHor() const = 0;
virtual SvxDistributeVertical GetDistributeVer() const = 0;
};
-class AbstractFmShowColsDialog : public VclAbstractDialog //add for FmShowColsDialog
+class AbstractFmShowColsDialog : public VclAbstractDialog
{
public:
virtual void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols)= 0;
};
-class AbstractSvxZoomDialog : public VclAbstractDialog //add for SvxZoomDialog
+class AbstractSvxZoomDialog : public VclAbstractDialog
{
public:
virtual void SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) = 0;
@@ -91,7 +92,7 @@ class AbstractSpellDialog : public VclAbstractDialog //
typedef long (*PLinkStub)( void*, void* );
-class AbstractSearchProgress :public VclAbstractRefreshableDialog //add for SearchProgress
+class AbstractSearchProgress :public VclAbstractRefreshableDialog
{
public:
virtual void SetFileType( const String& rType ) = 0;
@@ -99,26 +100,26 @@ public:
virtual PLinkStub GetLinkStubCleanUpHdl() = 0;
};
-class AbstractTakeProgress :public VclAbstractRefreshableDialog //add for TakeProgress
+class AbstractTakeProgress :public VclAbstractRefreshableDialog
{
public:
virtual void SetFile( const INetURLObject& rURL ) = 0;
virtual PLinkStub GetLinkStubCleanUpHdl() = 0;
};
-class AbstractTitleDialog :public VclAbstractDialog //add for TitleDialog
+class AbstractTitleDialog :public VclAbstractDialog
{
public:
virtual String GetTitle() const =0;
};
-class AbstractGalleryIdDialog :public VclAbstractDialog //add for GalleryIdDialog
+class AbstractGalleryIdDialog :public VclAbstractDialog
{
public:
virtual sal_uIntPtr GetId() const =0;
};
-class AbstractURLDlg :public VclAbstractDialog //add for URLDlg
+class AbstractURLDlg :public VclAbstractDialog
{
public:
virtual String GetURL() const = 0;
@@ -128,7 +129,7 @@ public:
virtual String GetName() const = 0;
};
-class AbstractSvxHlinkDlgMarkWnd :public VclAbstractDialog //add for SvxHlinkDlgMarkWnd
+class AbstractSvxHlinkDlgMarkWnd :public VclAbstractDialog
{
public:
virtual sal_Bool MoveTo ( Point aNewPos )const = 0;
@@ -152,7 +153,7 @@ public:
virtual OUString GetText() const =0 ;
};
-class AbstractSvxSearchSimilarityDialog :public VclAbstractDialog //add for SvxSearchSimilarityDialog
+class AbstractSvxSearchSimilarityDialog :public VclAbstractDialog
{
public:
virtual sal_uInt16 GetOther() =0 ;
@@ -161,26 +162,26 @@ public:
virtual sal_Bool IsRelaxed() =0 ;
};
-class AbstractSvxJSearchOptionsDialog :public VclAbstractDialog //add for SvxJSearchOptionsDialog
+class AbstractSvxJSearchOptionsDialog :public VclAbstractDialog
{
public:
virtual sal_Int32 GetTransliterationFlags() const = 0;
};
-class AbstractFmInputRecordNoDialog :public VclAbstractDialog //add for FmInputRecordNoDialog
+class AbstractFmInputRecordNoDialog :public VclAbstractDialog
{
public:
virtual void SetValue(long dNew) = 0;
virtual long GetValue() const = 0;
};
-class AbstractSvxNewDictionaryDialog :public VclAbstractDialog //add for SvxNewDictionaryDialog
+class AbstractSvxNewDictionaryDialog :public VclAbstractDialog
{
public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetNewDictionary() = 0;
};
-class AbstractSvxNameDialog :public VclAbstractDialog //add for SvxNameDialog
+class AbstractSvxNameDialog :public VclAbstractDialog
{
public:
virtual void GetName( OUString& rName ) = 0;
@@ -191,9 +192,6 @@ public:
virtual void SetText( const OUString& rStr ) = 0;
};
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
-
class AbstractSvxObjectNameDialog :public VclAbstractDialog
{
public:
@@ -208,15 +206,13 @@ public:
virtual void GetDescription(OUString& rDescription) = 0;
};
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-class AbstractSvxMessDialog :public VclAbstractDialog //add for SvxMessDialog
+class AbstractSvxMessDialog :public VclAbstractDialog
{
public:
virtual void SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt ) = 0;
};
-class AbstractSvxMultiPathDialog :public VclAbstractDialog //add for SvxMultiPathDialog
+class AbstractSvxMultiPathDialog :public VclAbstractDialog
{
public:
virtual String GetPath() const = 0;
@@ -225,7 +221,7 @@ public:
virtual void SetTitle( const String& rNewTitle ) = 0;
};
-class AbstractSvxMultiFileDialog :public AbstractSvxMultiPathDialog //add for SvxMultiFileDialog
+class AbstractSvxMultiFileDialog :public AbstractSvxMultiPathDialog
{
public:
virtual String GetFiles() const = 0;
@@ -236,27 +232,28 @@ public:
virtual void SetHelpId( const OString& ) = 0;
};
-class AbstractSvxHpLinkDlg : public VclAbstractDialog //add for SvxHpLinkDlg
+class AbstractSvxHpLinkDlg : public VclAbstractDialog
{
public:
virtual Window* GetWindow() = 0;
virtual sal_Bool QueryClose() = 0;
};
-class AbstractFmSearchDialog :public VclAbstractDialog //add for FmSearchDialog
+class AbstractFmSearchDialog :public VclAbstractDialog
{
public:
virtual void SetFoundHandler(const Link& lnk) = 0;
virtual void SetCanceledNotFoundHdl(const Link& lnk)=0;
virtual void SetActiveField(const String& strField)=0;
};
-class AbstractGraphicFilterDialog :public VclAbstractDialog //add for GraphicFilterDialog
+
+class AbstractGraphicFilterDialog :public VclAbstractDialog
{
public:
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0;
};
-class AbstractSvxAreaTabDialog :public SfxAbstractTabDialog //add for SvxAreaTabDialog
+class AbstractSvxAreaTabDialog :public SfxAbstractTabDialog
{
};
@@ -265,15 +262,14 @@ class AbstractSvxTransformTabDialog : public SfxAbstractTabDialog
public:
virtual void SetValidateFramePosLink( const Link& rLink ) = 0;
};
+
class AbstractSvxCaptionDialog : public SfxAbstractTabDialog
{
public:
virtual void SetValidateFramePosLink( const Link& rLink ) = 0;
};
-//-------------------------------------------------------------
-
-class AbstractSvxPostItDialog :public VclAbstractDialog //add for SvxPostItDialog
+class AbstractSvxPostItDialog :public VclAbstractDialog
{
public:
virtual void SetText( const OUString& rStr ) = 0; //From class Window
@@ -291,8 +287,6 @@ public:
virtual Window * GetWindow() = 0;
};
-//-------------------------------------------------------------
-
class SvxAbstractSplittTableDialog : public VclAbstractDialog
{
public:
@@ -301,8 +295,6 @@ public:
virtual long GetCount() const = 0;
};
-//-------------------------------------------------------------
-
class SvxAbstractNewTableDialog : public VclAbstractDialog
{
public:
@@ -317,8 +309,6 @@ public:
virtual sal_uInt16 getInsertCount() const = 0;
};
-//-------------------------------------------------------------
-
class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory, public EditAbstractDialogFactory
{
public:
@@ -330,11 +320,11 @@ public:
virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent,
const SfxItemSet* pAttrSet,
SdrView* pView,
- SdrModel* pModel=0 ) = 0 ; //add for SvxTextTabDialog
+ SdrModel* pModel=0 ) = 0 ;
virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent,
const SdrView* pView,
- sal_uInt16 nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog
+ sal_uInt16 nAnchorTypes = 0 ) = 0;
virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent,
const SfxItemSet& rAttr,
@@ -343,50 +333,50 @@ public:
virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0;
- virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog
+ virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent,
const SfxItemSet& rCoreSet )=0;
virtual AbstractSpellDialog * CreateSvxSpellDialog(Window* pParent,
SfxBindings* pBindings,
svx::SpellDialogChildWindow* pSpellChildWindow )=0;
- virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, //add for ActualizeProgress
+ virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent,
GalleryTheme* pThm ) = 0;
- virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, //add for SearchProgress
+ virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent,
const INetURLObject& rStartURL ) = 0;
virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ) = 0;
- virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, //add for TitleDialog
+ virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent,
const String& rOldText ) = 0;
- virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, //add for SvxZoomDialog
+ virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent,
GalleryTheme* pThm ) = 0;
- virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent, //add for GalleryThemeProperties
+ virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent,
ExchangeData* pData,
SfxItemSet* pItemSet ) = 0;
virtual AbstractURLDlg * CreateURLDialog( Window* pParent,
const String& rURL, const String& rAltText, const String& rDescription,
const String& rTarget, const String& rName,
TargetList& rTargetList ) = 0;
- virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ) =0; //add for SvxHlinkDlgMarkWnd
+ virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ) =0;
- virtual SfxAbstractTabDialog* CreateTabItemDialog( Window* pParent, //add for SvxSearchFormatDialog
+ virtual SfxAbstractTabDialog* CreateTabItemDialog( Window* pParent,
const SfxItemSet& rSet,
sal_uInt32 nResId) = 0;
- virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, //add for SvxSearchAttributeDialog
+ virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent,
SearchAttrItemList& rLst,
const sal_uInt16* pWhRanges)=0;
- virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, //add for SvxSearchSimilarityDialog
+ virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent,
sal_Bool bRelax,
sal_uInt16 nOther,
sal_uInt16 nShorter,
sal_uInt16 nLonger ) = 0;
- virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg
+ virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent,
const SfxItemSet& rCoreSet,
sal_Bool bEnableSelector = sal_False) = 0;
- virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog
+ virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pView,
sal_uInt16 nAnchorTypes = 0) = 0;
- virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, //add for SchTransformTabDialog
+ virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView,
sal_uInt32 nResId,
@@ -401,9 +391,9 @@ public:
virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent,
const String& rName,
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
- sal_uInt32 nResId) = 0;//add for SvxEditDictionaryDialog
+ sal_uInt32 nResId) = 0;
virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent,
- const String& rName, const String& rDesc ) = 0; //add for SvxNameDialog
+ const String& rName, const String& rDesc ) = 0;
// #i68101#
virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName ) = 0;
@@ -411,35 +401,35 @@ public:
virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
const String& rText, const String& rDesc,
- Image* pImg = NULL ) = 0; //add for SvxMessDialog
+ Image* pImg = NULL ) = 0;
- virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ; //add for SvxMultiPathDialog
- virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ; //add for SvxMultiFileDialog
- virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxMultiFileDialog
+ virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ;
+ virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ;
+ virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent,
SfxBindings* pBindings,
sal_uInt32 nResId)=0;
- virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
+ virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent,
const OUString& strInitialText,
const ::std::vector< OUString >& _rContexts,
sal_Int16 nInitialContext,
const Link& lnkContextSupplier)=0;
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent,
const Graphic& rGraphic,
RECT_POINT eLightSource, sal_uInt32 nResId )=0;
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent,
const Graphic& rGraphic,
sal_uInt16 nCount,
sal_uInt32 nResId)=0;
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent, //add for GraphicFilterSmooth
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent,
const Graphic& rGraphic,
double nRadius, sal_uInt32 nResId)=0;
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent,
const Graphic& rGraphic,
sal_uInt8 nGreyThreshold, sal_Bool bInvert, sal_uInt32 nResId)=0;
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent,
const Graphic& rGraphic,
sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges, sal_uInt32 nResId)=0;
- virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
+ virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
const SdrView* pSdrView = NULL ) = 0 ;
@@ -448,23 +438,23 @@ public:
const SdrObject* pObj = NULL,
sal_Bool bHasObj = sal_True )=0;
virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0;
- virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
+ virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent,
const SfxItemSet& rAttr,
const SdrView* pView,
sal_uInt32 nResId
)=0;
- virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
+ virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent,
const SfxItemSet& rAttr,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
sal_uInt32 nResId
)=0;
- virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
+ virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent,
const SfxItemSet& rCoreSet,
sal_Bool bPrevNext = sal_False) = 0;
virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage ) = 0;
- virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() = 0; // add for SvxDistributePage
- virtual DialogGetRanges GetDialogGetRangesFunc() = 0; //add for SvxPostItDialog
+ virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() = 0;
+ virtual DialogGetRanges GetDialogGetRangesFunc() = 0;
virtual AbstractScriptSelectorDialog*
CreateScriptSelectorDialog(
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index 06690f8..fbc67e2 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -290,7 +290,6 @@ void LwpPara::GetParaNumber(sal_uInt16 nPosition, ParaNumbering* pParaNumbering)
/**
* @short override alignment
*/
-//override style, add by 1-24
void LwpPara::OverrideAlignment(LwpAlignmentOverride* base,LwpAlignmentOverride* over,XFParaStyle* pOverStyle)
{
if (base)//the latter two parameter never be null
@@ -410,7 +409,6 @@ void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyl
delete m_pBreaks;
m_pBreaks = pFinalBreaks.release();
-//add by 1/31
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
if (m_pBreaks->IsKeepWithNext())
{
@@ -431,7 +429,7 @@ void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyl
if (m_pBreaks->IsColumnBreakBefore())
{
XFParaStyle* pStyle = new XFParaStyle();
- pStyle->SetBreaks(enumXFBreakAftColumn);//tmp after, should change when layout read,note by 1/31
+ pStyle->SetBreaks(enumXFBreakAftColumn);//tmp after, should change when layout read
m_BefColumnBreakName = pXFStyleManager->AddStyle(pStyle)->GetStyleName();
}
if (m_pBreaks->IsColumnBreakAfter())
@@ -440,7 +438,6 @@ void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyl
pStyle->SetBreaks(enumXFBreakAftColumn);
m_AftColumnBreakName = pXFStyleManager->AddStyle(pStyle)->GetStyleName();
}
-//add end
// pParaStyle->ApplyBreaks(pOverStyle, &aFinalBreaks);
}
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 00ac2f0..10ccbf0 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -55,21 +55,21 @@ namespace com { namespace sun { namespace star { namespace sheet {
struct DataPilotFieldReference;
} } } }
-class AbstractScImportAsciiDlg : public VclAbstractDialog //add for ScImportAsciiDlg
+class AbstractScImportAsciiDlg : public VclAbstractDialog
{
public:
virtual void GetOptions( ScAsciiOptions& rOpt ) = 0;
virtual void SaveParameters() = 0;
};
-class AbstractScAutoFormatDlg : public VclAbstractDialog //add for ScAutoFormatDlg
+class AbstractScAutoFormatDlg : public VclAbstractDialog
{
public:
virtual sal_uInt16 GetIndex() const = 0 ;
virtual String GetCurrFormatName() = 0;
};
-class AbstractScColRowLabelDlg : public VclAbstractDialog //add for ScColRowLabelDlg
+class AbstractScColRowLabelDlg : public VclAbstractDialog
{
public:
virtual sal_Bool IsCol() = 0;
@@ -84,13 +84,13 @@ public:
virtual bool CondFormatsChanged() = 0;
};
-class AbstractScDataPilotDatabaseDlg :public VclAbstractDialog //add for ScDataPilotDatabaseDlg
+class AbstractScDataPilotDatabaseDlg :public VclAbstractDialog
{
public:
virtual void GetValues( ScImportSourceDesc& rDesc ) = 0;
};
-class AbstractScDataPilotSourceTypeDlg : public VclAbstractDialog //add for ScDataPilotSourceTypeDlg
+class AbstractScDataPilotSourceTypeDlg : public VclAbstractDialog
{
public:
virtual bool IsDatabase() const = 0;
@@ -100,7 +100,7 @@ public:
virtual void AppendNamedRange(const OUString& rName) = 0;
};
-class AbstractScDataPilotServiceDlg : public VclAbstractDialog //add for ScDataPilotServiceDlg
+class AbstractScDataPilotServiceDlg : public VclAbstractDialog
{
public:
virtual String GetServiceName() const = 0;
@@ -110,26 +110,26 @@ public:
virtual String GetParPass() const = 0;
};
-class AbstractScDeleteCellDlg : public VclAbstractDialog //add for ScDeleteCellDlg
+class AbstractScDeleteCellDlg : public VclAbstractDialog
{
public:
virtual DelCellCmd GetDelCellCmd() const = 0;
};
//for dataform
-class AbstractScDataFormDlg : public VclAbstractDialog //add for ScDeleteCellDlg
+class AbstractScDataFormDlg : public VclAbstractDialog
{
};
-class AbstractScDeleteContentsDlg: public VclAbstractDialog //add for ScDeleteContentsDlg
+class AbstractScDeleteContentsDlg: public VclAbstractDialog
{
public:
virtual void DisableObjects() = 0 ;
virtual sal_uInt16 GetDelContentsCmdBits() const = 0;
};
-class AbstractScFillSeriesDlg: public VclAbstractDialog //add for ScFillSeriesDlg
+class AbstractScFillSeriesDlg: public VclAbstractDialog
{
public:
virtual FillDir GetFillDir() const = 0;
@@ -142,19 +142,19 @@ public:
virtual void SetEdStartValEnabled(sal_Bool bFlag=false) = 0;
};
-class AbstractScGroupDlg : public VclAbstractDialog //add for ScGroupDlg
+class AbstractScGroupDlg : public VclAbstractDialog
{
public:
virtual sal_Bool GetColsChecked() const = 0;
};
-class AbstractScInsertCellDlg : public VclAbstractDialog //add for ScInsertCellDlg
+class AbstractScInsertCellDlg : public VclAbstractDialog
{
public:
virtual InsCellCmd GetInsCellCmd() const = 0;
};
-class AbstractScInsertContentsDlg : public VclAbstractDialog //add for ScInsertContentsDlg
+class AbstractScInsertContentsDlg : public VclAbstractDialog
{
public:
virtual sal_uInt16 GetInsContentsCmdBits() const = 0;
@@ -169,7 +169,7 @@ public:
virtual InsCellCmd GetMoveMode() = 0;
};
-class AbstractScInsertTableDlg : public VclAbstractDialog //add for ScInsertTableDlg
+class AbstractScInsertTableDlg : public VclAbstractDialog
{
public:
virtual sal_Bool GetTablesFromFile() = 0;
@@ -182,13 +182,13 @@ public:
};
-class AbstractScSelEntryDlg : public VclAbstractDialog //add for ScSelEntryDlg
+class AbstractScSelEntryDlg : public VclAbstractDialog
{
public:
virtual String GetSelectEntry() const = 0;
};
-class AbstractScLinkedAreaDlg : public VclAbstractDialog2 //add for ScLinkedAreaDlg
+class AbstractScLinkedAreaDlg : public VclAbstractDialog2
{
public:
virtual void InitFromOldLink( const String& rFile, const String& rFilter,
@@ -201,13 +201,13 @@ public:
virtual sal_uLong GetRefresh() = 0; // 0 if disabled
};
-class AbstractScMetricInputDlg : public VclAbstractDialog //add for ScMetricInputDlg
+class AbstractScMetricInputDlg : public VclAbstractDialog
{
public:
virtual long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const = 0;
};
-class AbstractScMoveTableDlg : public VclAbstractDialog //add for ScMoveTableDlg
+class AbstractScMoveTableDlg : public VclAbstractDialog
{
public:
virtual sal_uInt16 GetSelectedDocument () const = 0;
@@ -226,27 +226,27 @@ public:
virtual sal_uInt16 GetFlags() const = 0;
};
-class AbstractScNamePasteDlg : public VclAbstractDialog //add for ScNamePasteDlg
+class AbstractScNamePasteDlg : public VclAbstractDialog
{
public:
virtual std::vector<OUString> GetSelectedNames() const = 0;
virtual bool IsAllSelected() const = 0;
};
-class AbstractScPivotFilterDlg : public VclAbstractDialog //add for ScPivotFilterDlg
+class AbstractScPivotFilterDlg : public VclAbstractDialog
{
public:
virtual const ScQueryItem& GetOutputItem() = 0;
};
-class AbstractScDPFunctionDlg : public VclAbstractDialog //add for ScDPFunctionDlg
+class AbstractScDPFunctionDlg : public VclAbstractDialog
{
public:
virtual sal_uInt16 GetFuncMask() const = 0;
virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const = 0;
};
-class AbstractScDPSubtotalDlg : public VclAbstractDialog //add for ScDPSubtotalDlg
+class AbstractScDPSubtotalDlg : public VclAbstractDialog
{
public:
virtual sal_uInt16 GetFuncMask() const = 0;
@@ -266,13 +266,13 @@ public:
virtual sal_Int32 GetDatePart() const = 0;
};
-class AbstractScDPShowDetailDlg : public VclAbstractDialog //add for ScDPShowDetailDlg
+class AbstractScDPShowDetailDlg : public VclAbstractDialog
{
public:
virtual String GetDimensionName() const = 0;
};
-class AbstractScNewScenarioDlg : public VclAbstractDialog //add for ScNewScenarioDlg
+class AbstractScNewScenarioDlg : public VclAbstractDialog
{
public:
@@ -283,7 +283,7 @@ public:
Color& rColor, sal_uInt16& rFlags ) const = 0;
};
-class AbstractScShowTabDlg : public VclAbstractDialog //add for ScShowTabDlg
+class AbstractScShowTabDlg : public VclAbstractDialog
{
public:
virtual void Insert( const String& rString, sal_Bool bSelected ) = 0;
@@ -293,29 +293,29 @@ public:
virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const = 0;
};
-class AbstractScSortWarningDlg : public VclAbstractDialog //add for ScSortWarningDlg
+class AbstractScSortWarningDlg : public VclAbstractDialog
{
};
-class AbstractScStringInputDlg : public VclAbstractDialog //add for ScStringInputDlg
+class AbstractScStringInputDlg : public VclAbstractDialog
{
public:
virtual void GetInputString( OUString& rString ) const = 0;
};
-class AbstractScTabBgColorDlg : public VclAbstractDialog //add for ScTabBgColorDlg
+class AbstractScTabBgColorDlg : public VclAbstractDialog
{
public:
virtual void GetSelectedColor( Color& rColor ) const = 0;
};
-class AbstractScImportOptionsDlg : public VclAbstractDialog //add for ScImportOptionsDlg
+class AbstractScImportOptionsDlg : public VclAbstractDialog
{
public:
virtual void GetImportOptions( ScImportOptions& rOptions ) const = 0;
};
-class AbstractScTextImportOptionsDlg : public VclAbstractDialog //add for ScLangChooserDlg
+class AbstractScTextImportOptionsDlg : public VclAbstractDialog
{
public:
virtual LanguageType GetLanguageType() const = 0;
@@ -327,51 +327,51 @@ class ScAbstractDialogFactory
public:
SC_DLLPUBLIC static ScAbstractDialogFactory* Create();
- virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg
+ virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName,
SvStream* pInStream,
ScImportAsciiCall eCall) = 0;
virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent) = 0;
- virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg
+ virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent,
ScAutoFormat* pAutoFormat,
const ScAutoFormatData* pSelFormatData,
ScDocument* pDoc,
int nId) = 0;
- virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, //add for ScColRowLabelDlg
+ virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent,
int nId,
sal_Bool bCol = false,
sal_Bool bRow = false) = 0;
- virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, //add for ScColOrRowDlg
+ virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent,
const String& rStrTitle,
const String& rStrLabel,
int nId,
sal_Bool bColDefault = sal_True ) = 0;
- virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const String& rExtendText, const String& rCurrentText ) = 0; //add for ScSortWarningDlg
+ virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const String& rExtendText, const String& rCurrentText ) = 0;
virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
const ScAddress& rPos, int nId ) = 0;
- virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg
+ virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0;
virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg(Window* pParent,
bool bEnableExternal) = 0;
- virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg
+ virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent,
const com::sun::star::uno::Sequence<OUString>& rServices,
int nId ) = 0;
- virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false) = 0 ; //add for ScDeleteCellDlg
+ virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false) = 0 ;
//for dataform
virtual AbstractScDataFormDlg * CreateScDataFormDlg(Window* pParent,
ScTabViewShell* pTabViewShell) = 0;
- virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, //add for ScDeleteContentsDlg
+ virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,
sal_uInt16 nCheckDefaults = 0) = 0;
- virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg
+ virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent,
ScDocument& rDocument,
FillDir eFillDir,
FillCmd eFillCmd,
@@ -381,15 +381,15 @@ public:
double fMax,
sal_uInt16 nPossDir) = 0;
- virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg
+ virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent,
bool bUnGroup = false,
bool bRows = true ) = 0;
- virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg
+ virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent,
int nId,
sal_Bool bDisallowCellMove = false ) = 0;
- virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, //add for ScInsertContentsDlg
+ virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent,
int nId,
sal_uInt16 nCheckDefaults = 0,
const OUString* pStrTitle = NULL ) = 0;
@@ -397,11 +397,11 @@ public:
virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData,
SCTAB nTabCount, bool bFromFile) = 0;
- virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg
+ virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent,
const std::vector<String> &rEntryList ) = 0;
- virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent) = 0; //add for ScLinkedAreaDlg
+ virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent) = 0;
- virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg
+ virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent,
sal_uInt16 nResId, // derivative for every dialog!
long nCurrent,
long nDefault,
@@ -419,9 +419,9 @@ public:
virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent,
sal_uInt16 nFlags) = 0;
- virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ) = 0; // add for ScNamePasteDlg
+ virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ) = 0;
- virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg
+ virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent,
const SfxItemSet& rArgSet, sal_uInt16 nSourceTab , int nId ) = 0;
virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId,
@@ -450,26 +450,26 @@ public:
ScDPObject& rDPObj,
sal_uInt16 nOrient ) = 0;
- virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const String& rName, //add for ScNewScenarioDlg
+ virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const String& rName,
int nId,
sal_Bool bEdit = false, sal_Bool bSheetProtected = false ) = 0;
- virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ) = 0; //add for ScShowTabDlg
+ virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ) = 0;
- virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent, //add for ScStringInputDlg
+ virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent,
const String& rTitle,
const String& rEditTitle,
const String& rDefault,
const OString& sHelpId, const OString& sEditHelpId,
int nId ) = 0;
- virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, //add for ScTabBgColorDlg
+ virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent,
const String& rTitle, //Dialog Title
const String& rTabBgColorNoColorText, //Label for no tab color
const Color& rDefaultColor, //Currently selected Color
const OString& ,
int nId ) = 0;
- virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg
+ virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent,
int nId,
sal_Bool bAscii = sal_True,
const ScImportOptions* pOptions = NULL,
@@ -478,34 +478,34 @@ public:
sal_Bool bOnlyDbtoolsEncodings = false,
sal_Bool bImport = sal_True ) = 0;
- virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, //add for ScAttrDlg
+ virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame,
Window* pParent,
const SfxItemSet* pCellAttrs ) = 0;
- virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, //add for ScHFEditDlg
+ virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame,
Window* pParent,
const SfxItemSet& rCoreSet,
const OUString& rPageStyle,
sal_uInt16 nResId = RID_SCDLG_HFEDIT ) = 0;
- virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg
+ virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,
SfxStyleSheetBase& rStyleBase,
sal_uInt16 nRscId,
int nId) = 0;
- virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg
+ virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent,
const SfxItemSet* pArgSet,
int nId) = 0;
- virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,//add for ScCharDlg
+ virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,
const SfxObjectShell* pDocShell, int nId ) = 0;
- virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,//add for ScParagraphDlg
+ virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,
int nId ) = 0;
- virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg
+ virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent,
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ) = 0;
- virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg
+ virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent,
const SfxItemSet* pArgSet,int nId ) = 0;
// for tabpage
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 3cecf6f..a2f01ef 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#undef SC_DLLIMPLEMENTATION
#include "scdlgfact.hxx"
@@ -116,7 +115,6 @@ IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
IMPL_ABSTDLG_BASE(ScAbstractTabDialog_Impl);
-// ScAbstractTabDialog_Impl begin
void ScAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
@@ -141,6 +139,7 @@ void ScAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
{
pDlg->SetInputSet( pInSet );
}
+
//From class Window.
void ScAbstractTabDialog_Impl::SetText( const OUString& rStr )
{
@@ -151,7 +150,6 @@ OUString ScAbstractTabDialog_Impl::GetText() const
return pDlg->GetText();
}
-// AbstractScImportAsciiDlg_Impl begin
void AbstractScImportAsciiDlg_Impl::GetOptions( ScAsciiOptions& rOpt )
{
pDlg->GetOptions( rOpt );
@@ -162,9 +160,6 @@ void AbstractScImportAsciiDlg_Impl::SaveParameters()
pDlg->SaveParameters();
}
-// AbstractScImportAsciiDlg_Impl end
-
-//AbstractScAutoFormatDlg_Impl begin
sal_uInt16 AbstractScAutoFormatDlg_Impl::GetIndex() const
{
return pDlg->GetIndex();
@@ -175,35 +170,21 @@ String AbstractScAutoFormatDlg_Impl::GetCurrFormatName()
return pDlg->GetCurrFormatName();
}
-//AbstractScAutoFormatDlg_Impl end
-
-
-
-//AbstractScColRowLabelDlg_Impl begin
sal_Bool AbstractScColRowLabelDlg_Impl::IsCol()
{
return pDlg->IsCol();
}
+
sal_Bool AbstractScColRowLabelDlg_Impl::IsRow()
{
return pDlg->IsRow();
}
-//AbstractScColRowLabelDlg_Impl end
-
-
-//AbstractScDataPilotDatabaseDlg_Impl begin
-
-
void AbstractScDataPilotDatabaseDlg_Impl::GetValues( ScImportSourceDesc& rDesc )
{
pDlg->GetValues(rDesc);
}
-//AbstractScDataPilotDatabaseDlg_Impl end
-
-//AbstractScDataPilotSourceTypeDlg_Impl begin
-
bool AbstractScDataPilotSourceTypeDlg_Impl::IsDatabase() const
{
return pDlg->IsDatabase();
@@ -229,10 +210,6 @@ void AbstractScDataPilotSourceTypeDlg_Impl::AppendNamedRange(const OUString& rNa
pDlg->AppendNamedRange(rName);
}
-//AbstractScDataPilotSourceTypeDlg_Impl end
-
-
-// AbstractScDataPilotServiceDlg_Impl begin
String AbstractScDataPilotServiceDlg_Impl::GetServiceName() const
{
return pDlg->GetServiceName();
@@ -242,40 +219,37 @@ String AbstractScDataPilotServiceDlg_Impl::GetParSource() const
{
return pDlg->GetParSource();
}
+
String AbstractScDataPilotServiceDlg_Impl::GetParName() const
{
return pDlg->GetParName();
}
+
String AbstractScDataPilotServiceDlg_Impl::GetParUser() const
{
return pDlg->GetParUser();
}
+
String AbstractScDataPilotServiceDlg_Impl::GetParPass() const
{
return pDlg->GetParPass();
}
-//AbstractScDataPilotServiceDlg_Impl end
-
-//AbstractScDeleteCellDlg_Impl begin
DelCellCmd AbstractScDeleteCellDlg_Impl::GetDelCellCmd() const
{
return pDlg->GetDelCellCmd();
}
-//AbstractScDeleteCellDlg_Impl end
-
void AbstractScDeleteContentsDlg_Impl::DisableObjects()
{
pDlg->DisableObjects();
}
+
sal_uInt16 AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() const
{
return pDlg->GetDelContentsCmdBits();
}
-
-
FillDir AbstractScFillSeriesDlg_Impl::GetFillDir() const
{
return pDlg->GetFillDir();
@@ -295,60 +269,57 @@ double AbstractScFillSeriesDlg_Impl::GetStart() const
{
return pDlg->GetStart();
}
+
double AbstractScFillSeriesDlg_Impl::GetStep() const
{
return pDlg->GetStep();
}
+
double AbstractScFillSeriesDlg_Impl::GetMax() const
{
return pDlg->GetMax();
}
+
String AbstractScFillSeriesDlg_Impl::GetStartStr() const
{
return pDlg->GetStartStr();
}
+
void AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(sal_Bool bFlag)
{
pDlg->SetEdStartValEnabled(bFlag);
}
-
-
sal_Bool AbstractScGroupDlg_Impl::GetColsChecked() const
{
return pDlg->GetColsChecked();
}
-
-
-
InsCellCmd AbstractScInsertCellDlg_Impl::GetInsCellCmd() const
{
return pDlg->GetInsCellCmd();
}
-
-
-
-
sal_uInt16 AbstractScInsertContentsDlg_Impl::GetInsContentsCmdBits() const
{
return pDlg->GetInsContentsCmdBits();
}
-
sal_uInt16 AbstractScInsertContentsDlg_Impl::GetFormulaCmdBits() const
{
return pDlg->GetFormulaCmdBits();
}
+
sal_Bool AbstractScInsertContentsDlg_Impl::IsSkipEmptyCells() const
{
return pDlg->IsSkipEmptyCells();
}
+
sal_Bool AbstractScInsertContentsDlg_Impl::IsLink() const
{
return pDlg->IsLink();
}
+
void AbstractScInsertContentsDlg_Impl::SetFillMode( sal_Bool bSet )
{
pDlg->SetFillMode( bSet );
@@ -363,10 +334,12 @@ sal_Bool AbstractScInsertContentsDlg_Impl::IsTranspose() const
{
return pDlg->IsTranspose();
}
+
void AbstractScInsertContentsDlg_Impl::SetChangeTrack( sal_Bool bSet )
{
pDlg->SetChangeTrack( bSet );
}
+
void AbstractScInsertContentsDlg_Impl::SetCellShiftDisabled( int nDisable )
{
pDlg->SetCellShiftDisabled( nDisable );
@@ -377,48 +350,46 @@ InsCellCmd AbstractScInsertContentsDlg_Impl::GetMoveMode()
return pDlg->GetMoveMode();
}
-
-
-
sal_Bool AbstractScInsertTableDlg_Impl::GetTablesFromFile()
{
return pDlg->GetTablesFromFile();
}
-sal_Bool AbstractScInsertTableDlg_Impl::GetTablesAsLink()
+sal_Bool AbstractScInsertTableDlg_Impl::GetTablesAsLink()
{
return pDlg->GetTablesAsLink();
}
-const String* AbstractScInsertTableDlg_Impl::GetFirstTable( sal_uInt16* pN )
+
+const String* AbstractScInsertTableDlg_Impl::GetFirstTable( sal_uInt16* pN )
{
return pDlg->GetFirstTable( pN );
}
-ScDocShell* AbstractScInsertTableDlg_Impl::GetDocShellTables()
+
+ScDocShell* AbstractScInsertTableDlg_Impl::GetDocShellTables()
{
return pDlg->GetDocShellTables();
}
-sal_Bool AbstractScInsertTableDlg_Impl::IsTableBefore()
+
+sal_Bool AbstractScInsertTableDlg_Impl::IsTableBefore()
{
return pDlg->IsTableBefore();
}
-sal_uInt16 AbstractScInsertTableDlg_Impl::GetTableCount()
+
+sal_uInt16 AbstractScInsertTableDlg_Impl::GetTableCount()
{
return pDlg->GetTableCount();
}
-const String* AbstractScInsertTableDlg_Impl::GetNextTable( sal_uInt16* pN )
+
+const String* AbstractScInsertTableDlg_Impl::GetNextTable( sal_uInt16* pN )
{
return pDlg->GetNextTable( pN );
}
-
-
String AbstractScSelEntryDlg_Impl::GetSelectEntry() const
{
return pDlg->GetSelectEntry();
}
-
-
void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const String& rFile, const String& rFilter,
const String& rOptions, const String& rSource,
sal_uLong nRefresh )
@@ -430,24 +401,27 @@ String AbstractScLinkedAreaDlg_Impl::GetURL()
{
return pDlg->GetURL();
}
+
String AbstractScLinkedAreaDlg_Impl::GetFilter()
{
return pDlg->GetFilter();
}
+
String AbstractScLinkedAreaDlg_Impl::GetOptions()
{
return pDlg->GetOptions();
}
+
String AbstractScLinkedAreaDlg_Impl::GetSource()
{
return pDlg->GetSource();
}
+
sal_uLong AbstractScLinkedAreaDlg_Impl::GetRefresh()
{
return pDlg->GetRefresh();
}
-
ScConditionalFormatList* AbstractScCondFormatManagerDlg_Impl::GetConditionalFormatList()
{
return pDlg->GetConditionalFormatList();
@@ -458,15 +432,12 @@ bool AbstractScCondFormatManagerDlg_Impl::CondFormatsChanged()
return pDlg->CondFormatsChanged();
}
-
long AbstractScMetricInputDlg_Impl::GetInputValue( FieldUnit eUnit ) const
{
return pDlg->GetInputValue( eUnit );
}
-
-
sal_uInt16 AbstractScMoveTableDlg_Impl::GetSelectedDocument() const
{
return pDlg->GetSelectedDocument();
@@ -476,81 +447,77 @@ sal_uInt16 AbstractScMoveTableDlg_Impl::GetSelectedTable() const
{
return pDlg->GetSelectedTable();
}
+
bool AbstractScMoveTableDlg_Impl::GetCopyTable() const
{
return pDlg->GetCopyTable();
}
+
bool AbstractScMoveTableDlg_Impl::GetRenameTable() const
{
return pDlg->GetRenameTable();
}
+
void AbstractScMoveTableDlg_Impl::GetTabNameString( OUString& rString ) const
{
pDlg->GetTabNameString( rString );
}
+
void AbstractScMoveTableDlg_Impl::SetForceCopyTable()
{
return pDlg->SetForceCopyTable();
}
+
void AbstractScMoveTableDlg_Impl::EnableCopyTable(sal_Bool bFlag)
{
return pDlg->EnableCopyTable( bFlag);
}
+
void AbstractScMoveTableDlg_Impl::EnableRenameTable(sal_Bool bFlag)
{
return pDlg->EnableRenameTable( bFlag);
}
-
-
-
sal_uInt16 AbstractScNameCreateDlg_Impl::GetFlags() const
{
return pDlg->GetFlags();
}
-
-
std::vector<OUString> AbstractScNamePasteDlg_Impl::GetSelectedNames() const
{
return pDlg->GetSelectedNames();
}
-
bool AbstractScNamePasteDlg_Impl::IsAllSelected() const
{
return pDlg->IsAllSelected();
}
-
const ScQueryItem& AbstractScPivotFilterDlg_Impl::GetOutputItem()
{
return pDlg->GetOutputItem();
}
-
-
sal_uInt16 AbstractScDPFunctionDlg_Impl::GetFuncMask() const
{
return pDlg->GetFuncMask();
}
+
::com::sun::star::sheet::DataPilotFieldReference AbstractScDPFunctionDlg_Impl::GetFieldRef() const
{
return pDlg->GetFieldRef();
}
-
-
sal_uInt16 AbstractScDPSubtotalDlg_Impl::GetFuncMask() const
{
return pDlg->GetFuncMask();
}
+
void AbstractScDPSubtotalDlg_Impl::FillLabelData( ScDPLabelData& rLabelData ) const
{
pDlg->FillLabelData( rLabelData );
}
-
ScDPNumGroupInfo AbstractScDPNumGroupDlg_Impl::GetGroupInfo() const
{
return pDlg->GetGroupInfo();
@@ -566,7 +533,6 @@ sal_Int32 AbstractScDPDateGroupDlg_Impl::GetDatePart() const
return pDlg->GetDatePart();
}
-
String AbstractScDPShowDetailDlg_Impl::GetDimensionName() const
{
return pDlg->GetDimensionName();
@@ -593,44 +559,38 @@ sal_uInt16 AbstractScShowTabDlg_Impl::GetSelectEntryCount() const
{
return pDlg->GetSelectEntryCount();
}
+
void AbstractScShowTabDlg_Impl::SetDescription(
const String& rTitle, const String& rFixedText,
const OString& sDlgHelpId, const OString& sLbHelpId )
{
pDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId );
}
+
sal_uInt16 AbstractScShowTabDlg_Impl::GetSelectEntryPos(sal_uInt16 nPos) const
{
return pDlg->GetSelectEntryPos( nPos);
}
+
String AbstractScShowTabDlg_Impl::GetSelectEntry(sal_uInt16 nPos) const
{
return pDlg->GetSelectEntry(nPos);
}
-
-
void AbstractScStringInputDlg_Impl::GetInputString( OUString& rString ) const
{
pDlg->GetInputString( rString );
}
-
-
void AbstractScTabBgColorDlg_Impl::GetSelectedColor( Color& rColor ) const
{
pDlg->GetSelectedColor( rColor );
}
-
-
-
void AbstractScImportOptionsDlg_Impl::GetImportOptions( ScImportOptions& rOptions ) const
{
pDlg->GetImportOptions(rOptions);
}
-// add for AbstractScImportOptionsDlg_Impl end
-
LanguageType AbstractScTextImportOptionsDlg_Impl::GetLanguageType() const
{
@@ -642,18 +602,13 @@ bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const
return pDlg->isDateConversionSet();
}
-
-
// =========================Factories for createdialog ===================
-
-
AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( Window* pParent, String aDatName,
SvStream* pInStream, ScImportAsciiCall eCall )
{
ScImportAsciiDlg* pDlg = new ScImportAsciiDlg( pParent, aDatName,pInStream, eCall );
return new AbstractScImportAsciiDlg_Impl( pDlg );
}
-// ScImportAsciiDlg end
AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg(Window* pParent)
{
@@ -682,9 +637,6 @@ AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( W
return 0;
}
-
-
-
AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(Window* pParent,
int nId,
sal_Bool bCol ,
@@ -705,10 +657,6 @@ AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg
return 0;
}
-
-
-
-
VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* pParent,
const String& rStrTitle,
const String& rStrLabel,
@@ -736,7 +684,6 @@ AbstractScSortWarningDlg* ScAbstractDialogFactory_Impl::CreateScSortWarningDlg(
return new AbstractScSortWarningDlg_Impl( pDlg );
}
-
AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
const ScAddress& rPos, int nId )
{
@@ -799,9 +746,6 @@ AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSe
return 0;
}
-// add for ScDataPilotServiceDlg end
-
-
AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(Window* pParent,
bool bDisallowCellMove)
{
@@ -823,9 +767,6 @@ AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContent
return new AbstractScDeleteContentsDlg_Impl( pDlg );
}
-
-
-
AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Window* pParent,
ScDocument& rDocument,
FillDir eFillDir,
@@ -867,9 +808,6 @@ AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( W
return 0;
}
-
-
-
AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( Window* pParent,
int nId,
sal_uInt16 nCheckDefaults,
@@ -897,14 +835,12 @@ AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg(
return new AbstractScInsertTableDlg_Impl( pDlg );
}
-// add for ScSelEntryDlg begin
AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent,
const std::vector<String> &rEntryList )
{
ScSelEntryDlg * pDlg = new ScSelEntryDlg( pParent, rEntryList );
return new AbstractScSelEntryDlg_Impl( pDlg );
}
-// add for ScSelEntryDlg end
AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg(Window* pParent)
{
@@ -943,9 +879,6 @@ AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg
return 0;
}
-
-
-
AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(Window* pParent,
const String& rDefault)
{
@@ -965,7 +898,6 @@ AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( Wi
return new AbstractScNamePasteDlg_Impl( pDlg );
}
-
AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg ( Window* pParent,
const SfxItemSet& rArgSet, sal_uInt16 nSourceTab , int nId )
{
@@ -984,9 +916,6 @@ AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg
return 0;
}
-
-
-
AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( Window* pParent,
int nId,
const ScDPLabelDataVector& rLabelVec,
@@ -1008,8 +937,6 @@ AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg (
return 0;
}
-
-
AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( Window* pParent,
int nId,
ScDPObject& rDPObj,
@@ -1033,7 +960,6 @@ AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg (
return 0;
}
-
AbstractScDPNumGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg(
Window* pParent, int nId, const ScDPNumGroupInfo& rInfo )
{
@@ -1051,7 +977,6 @@ AbstractScDPDateGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg(
return 0;
}
-
AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDlg (
Window* pParent, int nId, ScDPObject& rDPObj, sal_uInt16 nOrient )
{
@@ -1060,8 +985,6 @@ AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDl
return 0;
}
-
-
AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg ( Window* pParent, const String& rName,
int nId,
sal_Bool bEdit , sal_Bool bSheetProtected )
@@ -1081,8 +1004,6 @@ AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg
return 0;
}
-
-
AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window* pParent, int nId )
{
ScShowTabDlg * pDlg=NULL;
@@ -1100,11 +1021,7 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window
return 0;
}
-
-
-
-
- AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg ( Window* pParent,
+AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg ( Window* pParent,
const String& rTitle,
const String& rEditTitle,
const String& rDefault,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list