summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-09-01 00:02:40 +0300
committerTor Lillqvist <tml@iki.fi>2013-09-01 00:04:51 +0300
commitaf5a380bc19f599307b3bc524a31c380d456249e (patch)
tree080374fb416451758983d9408905aa9db0ca6c6f
parent7bd0adc64b96d523b62ce9dda9e34aedff6b33d4 (diff)
Remove pointless comments and ASCII art
Change-Id: I387d7b301643f359f2d6a4c5f51a4dd7f5e1c296
Diffstat
-rw-r--r--cui/source/factory/dlgfact.cxx98
-rw-r--r--cui/source/factory/dlgfact.hxx129
-rw-r--r--include/svx/svxdlg.hxx134
-rw-r--r--lotuswordpro/source/filter/lwppara1.cxx5
-rw-r--r--sc/inc/scabstdlg.hxx122
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx209
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx119
-rw-r--r--sd/inc/sdabstdlg.hxx32
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx115
-rw-r--r--sd/source/ui/dlg/sddlgfact.hxx30
-rw-r--r--sw/inc/swabstdlg.hxx145
-rw-r--r--sw/source/filter/ww8/ww8par.hxx4
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx191
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx161
14 files changed, 592 insertions, 902 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 1e2f9b0802c7..38f09e71160a 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 2e7409c26fb0..8816602e5250 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 f42d3cb5b269..75a2698f9956 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 06690f8e43f8..fbc67e2912f4 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 00ac2f00eb6b..10ccbf092b08 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 3cecf6fa2470..a2f01ef83745 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,
@@ -1126,8 +1043,6 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window
return 0;
}
-
-
AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg (
Window* pParent,
const String& rTitle,
@@ -1136,23 +1051,21 @@ AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg (
const OString& sHelpId ,
int nId )
{
-ScTabBgColorDlg * pDlg=NULL;
-switch ( nId )
-{
- case RID_SCDLG_TAB_BG_COLOR :
- pDlg = new ScTabBgColorDlg( pParent, rTitle, rTabBgColorNoColorText, rDefaultColor, sHelpId );
- break;
- default:
- break;
-}
+ ScTabBgColorDlg * pDlg=NULL;
+ switch ( nId )
+ {
+ case RID_SCDLG_TAB_BG_COLOR :
+ pDlg = new ScTabBgColorDlg( pParent, rTitle, rTabBgColorNoColorText, rDefaultColor, sHelpId );
+ break;
+ default:
+ break;
+ }
-if ( pDlg )
- return new AbstractScTabBgColorDlg_Impl( pDlg );
-return 0;
+ if ( pDlg )
+ return new AbstractScTabBgColorDlg_Impl( pDlg );
+ return 0;
}
-
-
AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* pParent,
int nId,
sal_Bool bAscii,
@@ -1177,7 +1090,6 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions
return 0;
}
-
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg(SfxViewFrame* pFrame,
Window* pParent, const SfxItemSet* pCellAttrs)
{
@@ -1188,7 +1100,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg(SfxViewFram
#undef SfxTabDialog
#undef ScAbstractTabDialog_Impl
-
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame* pFrame,
Window* pParent,
const SfxItemSet& rCoreSet,
@@ -1237,8 +1148,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF
return pDlg ? new ScAbstractTabDialog_Impl( pDlg ) : NULL;
}
-
-
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* pParent,
SfxStyleSheetBase& rStyleBase,
sal_uInt16 nRscId,
@@ -1260,8 +1169,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window*
return 0;
}
-
-
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg( Window* pParent,
const SfxItemSet* pArgSet,
int nId)
@@ -1281,8 +1188,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg( Window
return 0;
}
-
-
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,
const SfxObjectShell* pDocShell, int nId )
{
@@ -1301,8 +1206,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( Window* pP
return 0;
}
-
-
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,
int nId )
{
@@ -1321,8 +1224,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Windo
return 0;
}
-
-
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Window* pParent,
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh )
{
@@ -1341,7 +1242,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Wind
return 0;
}
-
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window* pParent,
const SfxItemSet* pArgSet,int nId )
{
@@ -1363,7 +1263,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window*
#undef SfxTabDialog
#undef ScAbstractTabDialog_Impl
-
//------------------ Factories for TabPages--------------------
CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId )
{
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index d2155db8962e..94a9564c1678 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -100,26 +100,26 @@ long Class::GetResult() \
return pDlg->GetResult(); \
}
-class ScVclAbstractDialog_Impl : public VclAbstractDialog //add for ScColOrRowDlg
+class ScVclAbstractDialog_Impl : public VclAbstractDialog
{
DECL_ABSTDLG_BASE(ScVclAbstractDialog_Impl,Dialog)
};
-class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg //add for ScImportAsciiDlg
+class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg
{
DECL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl, ScImportAsciiDlg)
virtual void GetOptions( ScAsciiOptions& rOpt );
virtual void SaveParameters();
};
-class AbstractScAutoFormatDlg_Impl : public AbstractScAutoFormatDlg //add for ScAutoFormatDlg
+class AbstractScAutoFormatDlg_Impl : public AbstractScAutoFormatDlg
{
DECL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl, ScAutoFormatDlg)
virtual sal_uInt16 GetIndex() const;
virtual String GetCurrFormatName();
};
-class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg //add for ScColRowLabelDlg
+class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg
{
DECL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl,ScColRowLabelDlg)
virtual sal_Bool IsCol();
@@ -135,13 +135,13 @@ class AbstractScCondFormatManagerDlg_Impl : public AbstractScCondFormatManagerDl
virtual bool CondFormatsChanged();
};
-class AbstractScDataPilotDatabaseDlg_Impl :public AbstractScDataPilotDatabaseDlg //add for ScDataPilotDatabaseDlg
+class AbstractScDataPilotDatabaseDlg_Impl :public AbstractScDataPilotDatabaseDlg
{
DECL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl, ScDataPilotDatabaseDlg)
virtual void GetValues( ScImportSourceDesc& rDesc );
};
-class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTypeDlg //add for ScDataPilotSourceTypeDlg
+class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTypeDlg
{
DECL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl, ScDataPilotSourceTypeDlg)
virtual bool IsDatabase() const;
@@ -151,7 +151,7 @@ class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTy
virtual void AppendNamedRange(const OUString& rName);
};
-class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg //add for ScDataPilotServiceDlg
+class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg
{
DECL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl, ScDataPilotServiceDlg)
virtual String GetServiceName() const;
@@ -161,26 +161,26 @@ class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg
virtual String GetParPass() const;
};
-class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg //add for ScDeleteCellDlg
+class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg
{
DECL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl,ScDeleteCellDlg)
virtual DelCellCmd GetDelCellCmd() const;
};
//for dataform
-class AbstractScDataFormDlg_Impl : public AbstractScDataFormDlg //add for ScDataFormDlg
+class AbstractScDataFormDlg_Impl : public AbstractScDataFormDlg
{
DECL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl,ScDataFormDlg);
};
-class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg //add for ScDeleteContentsDlg
+class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg
{
DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg)
virtual void DisableObjects();
virtual sal_uInt16 GetDelContentsCmdBits() const;
};
-class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg //add for ScFillSeriesDlg
+class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg
{
DECL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl, ScFillSeriesDlg)
virtual FillDir GetFillDir() const;
@@ -193,19 +193,19 @@ class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg //add for ScF
virtual void SetEdStartValEnabled(sal_Bool bFlag=false);
};
-class AbstractScGroupDlg_Impl : public AbstractScGroupDlg //add for ScGroupDlg
+class AbstractScGroupDlg_Impl : public AbstractScGroupDlg
{
DECL_ABSTDLG_BASE( AbstractScGroupDlg_Impl, ScGroupDlg)
virtual sal_Bool GetColsChecked() const;
};
-class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg //add for ScInsertCellDlg
+class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg
{
DECL_ABSTDLG_BASE( AbstractScInsertCellDlg_Impl, ScInsertCellDlg)
virtual InsCellCmd GetInsCellCmd() const ;
};
-class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg //add for ScInsertContentsDlg
+class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg
{
DECL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl, ScInsertContentsDlg)
virtual sal_uInt16 GetInsContentsCmdBits() const;
@@ -220,7 +220,7 @@ class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg //a
virtual InsCellCmd GetMoveMode();
};
-class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg //add for ScInsertTableDlg
+class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg
{
DECL_ABSTDLG_BASE( AbstractScInsertTableDlg_Impl, ScInsertTableDlg)
virtual sal_Bool GetTablesFromFile();
@@ -233,13 +233,13 @@ class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg //add for
};
-class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg //add for ScSelEntryDlg
+class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg
{
DECL_ABSTDLG_BASE( AbstractScSelEntryDlg_Impl, ScSelEntryDlg )
virtual String GetSelectEntry() const;
};
-class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg //add for ScLinkedAreaDlg
+class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg
{
DECL_ABSTDLG2_BASE( AbstractScLinkedAreaDlg_Impl, ScLinkedAreaDlg)
@@ -253,13 +253,13 @@ class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg //add for S
virtual sal_uLong GetRefresh(); // 0 if disabled
};
-class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg //add for ScMetricInputDlg
+class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg
{
DECL_ABSTDLG_BASE( AbstractScMetricInputDlg_Impl, ScMetricInputDlg)
virtual long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const;
};
-class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScMoveTableDlg
+class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg
{
DECL_ABSTDLG_BASE( AbstractScMoveTableDlg_Impl, ScMoveTableDlg)
virtual sal_uInt16 GetSelectedDocument () const;
@@ -272,33 +272,33 @@ class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScM
virtual void EnableRenameTable (sal_Bool bFlag=true);
};
-class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg //add for ScNameCreateDlg
+class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg
{
DECL_ABSTDLG_BASE( AbstractScNameCreateDlg_Impl, ScNameCreateDlg)
virtual sal_uInt16 GetFlags() const;
};
-class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg //add for ScNamePasteDlg
+class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg
{
DECL_ABSTDLG_BASE( AbstractScNamePasteDlg_Impl, ScNamePasteDlg )
virtual std::vector<OUString> GetSelectedNames() const;
virtual bool IsAllSelected() const;
};
-class AbstractScPivotFilterDlg_Impl : public AbstractScPivotFilterDlg //add for ScPivotFilterDlg
+class AbstractScPivotFilterDlg_Impl : public AbstractScPivotFilterDlg
{
DECL_ABSTDLG_BASE( AbstractScPivotFilterDlg_Impl, ScPivotFilterDlg)
virtual const ScQueryItem& GetOutputItem();
};
-class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg //add for ScDPFunctionDlg
+class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg
{
DECL_ABSTDLG_BASE( AbstractScDPFunctionDlg_Impl, ScDPFunctionDlg)
virtual sal_uInt16 GetFuncMask() const;
virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const;
};
-class AbstractScDPSubtotalDlg_Impl : public AbstractScDPSubtotalDlg //add for ScDPSubtotalDlg
+class AbstractScDPSubtotalDlg_Impl : public AbstractScDPSubtotalDlg
{
DECL_ABSTDLG_BASE( AbstractScDPSubtotalDlg_Impl, ScDPSubtotalDlg)
virtual sal_uInt16 GetFuncMask() const;
@@ -324,7 +324,7 @@ class AbstractScDPShowDetailDlg_Impl : public AbstractScDPShowDetailDlg
virtual String GetDimensionName() const;
};
-class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg //add for ScNewScenarioDlg
+class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg
{
DECL_ABSTDLG_BASE( AbstractScNewScenarioDlg_Impl, ScNewScenarioDlg )
virtual void SetScenarioData( const OUString& rName, const OUString& rComment,
@@ -334,7 +334,7 @@ class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg //add for
Color& rColor, sal_uInt16& rFlags ) const;
};
-class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg //add for ScShowTabDlg
+class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg
{
DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg)
virtual void Insert( const String& rString, sal_Bool bSelected );
@@ -349,20 +349,19 @@ class AbstractScSortWarningDlg_Impl : public AbstractScSortWarningDlg
DECL_ABSTDLG_BASE( AbstractScSortWarningDlg_Impl, ScSortWarningDlg )
};
-
-class AbstractScStringInputDlg_Impl : public AbstractScStringInputDlg //add for ScStringInputDlg
+class AbstractScStringInputDlg_Impl : public AbstractScStringInputDlg
{
DECL_ABSTDLG_BASE( AbstractScStringInputDlg_Impl, ScStringInputDlg )
virtual void GetInputString( OUString& rString ) const;
};
-class AbstractScTabBgColorDlg_Impl : public AbstractScTabBgColorDlg //add for ScTabBgColorDlg
+class AbstractScTabBgColorDlg_Impl : public AbstractScTabBgColorDlg
{
DECL_ABSTDLG_BASE( AbstractScTabBgColorDlg_Impl, ScTabBgColorDlg )
virtual void GetSelectedColor( Color& rColor ) const;
};
-class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg //add for ScImportOptionsDlg
+class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg
{
DECL_ABSTDLG_BASE( AbstractScImportOptionsDlg_Impl, ScImportOptionsDlg)
virtual void GetImportOptions( ScImportOptions& rOptions ) const;
@@ -375,7 +374,6 @@ class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDl
virtual bool IsDateConversionSet() const;
};
-//add for ScAttrDlg , ScHFEditDlg, ScStyleDlg, ScSubTotalDlg, ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( ScAbstractTabDialog_Impl,SfxTabDialog )
@@ -397,23 +395,23 @@ class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory
public:
virtual ~ScAbstractDialogFactory_Impl() {}
- virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg
+ virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName,
SvStream* pInStream,
ScImportAsciiCall eCall);
virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent);
- virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg
+ virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent,
ScAutoFormat* pAutoFormat,
const ScAutoFormatData* pSelFormatData,
ScDocument* pDoc,
int nId);
- virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, //add for ScColRowLabelDlg
+ virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent,
int nId,
sal_Bool bCol = false,
sal_Bool bRow = false);
- virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, //add for ScColOrRowDlg
+ virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent,
const String& rStrTitle,
const String& rStrLabel,
int nId,
@@ -424,12 +422,12 @@ public:
virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
const ScAddress& rPos, int nId );
- virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ); //add for ScDataPilotDatabaseDlg
+ virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId );
virtual AbstractScDataPilotSourceTypeDlg* CreateScDataPilotSourceTypeDlg(Window* pParent,
bool bEnableExternal);
- virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg
+ virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent,
const com::sun::star::uno::Sequence<OUString>& rServices,
int nId );
virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false );
@@ -438,10 +436,10 @@ public:
virtual AbstractScDataFormDlg* CreateScDataFormDlg(Window* pParent,
ScTabViewShell* pTabViewShell);
- virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, //add for ScDeleteContentsDlg
+ virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,
sal_uInt16 nCheckDefaults = 0);
- virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg
+ virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent,
ScDocument& rDocument,
FillDir eFillDir,
FillCmd eFillCmd,
@@ -450,15 +448,15 @@ public:
double fStep,
double fMax,
sal_uInt16 nPossDir);
- virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg
+ virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent,
bool bUnGroup = false,
bool bRows = true);
- virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg
+ virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent,
int nId,
sal_Bool bDisallowCellMove = false );
- virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, //add for ScInsertContentsDlg
+ virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent,
int nId,
sal_uInt16 nCheckDefaults = 0,
const OUString* pStrTitle = NULL );
@@ -466,12 +464,12 @@ public:
virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData,
SCTAB nTabCount, bool bFromFile);
- virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg
+ virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent,
const std::vector<String> &rEntryList );
- virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent); //add for ScLinkedAreaDlg
+ virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent);
- virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg
+ virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent,
sal_uInt16 nResId, // Ableitung fuer jeden Dialog!
long nCurrent,
long nDefault,
@@ -489,9 +487,9 @@ public:
virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent,
sal_uInt16 nFlags);
- virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ); //add for ScNamePasteDlg
+ virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true );
- virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg
+ virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent,
const SfxItemSet& rArgSet, sal_uInt16 nSourceTab , int nId );
virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId,
@@ -520,26 +518,26 @@ public:
ScDPObject& rDPObj,
sal_uInt16 nOrient );
- 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 );
- virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ); //add for ScShowTabDlg
+ virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId );
- 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 );
- virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, //add for ScStringInputDlg
+ 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& sHelpId ,
int nId );
- virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg
+ virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent,
int nId,
sal_Bool bAscii = sal_True,
const ScImportOptions* pOptions = NULL,
@@ -547,34 +545,34 @@ public:
sal_Bool bMultiByte = false,
sal_Bool bOnlyDbtoolsEncodings = false,
sal_Bool bImport = sal_True );
- virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, //add for ScAttrDlg
+ virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame,
Window* pParent,
const SfxItemSet* pCellAttrs );
- 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 );
- virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg
+ virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,
SfxStyleSheetBase& rStyleBase,
sal_uInt16 nRscId,
int nId);
- virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg
+ virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent,
const SfxItemSet* pArgSet,
int nId);
- virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,//add for ScCharDlg
+ virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,
const SfxObjectShell* pDocShell, int nId );
- virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,//add for ScParagraphDlg
+ virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,
int nId );
- virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg
+ virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent,
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh );
- virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg
+ virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent,
const SfxItemSet* pArgSet,int nId );
// For TabPage
@@ -586,5 +584,4 @@ public:
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index f100c1734d46..28600632a422 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -61,20 +61,20 @@ class TabPage;
class ViewShell;
class SdCustomShowList;
-class AbstractCopyDlg : public VclAbstractDialog //add for CopyDlg
+class AbstractCopyDlg : public VclAbstractDialog
{
public:
virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0;
};
-class AbstractSdCustomShowDlg : public VclAbstractDialog //add for SdCustomShowDlg
+class AbstractSdCustomShowDlg : public VclAbstractDialog
{
public:
virtual sal_Bool IsModified() const = 0;
virtual sal_Bool IsCustomShow() const = 0;
};
-class AbstractAssistentDlg : public VclAbstractDialog //add for AssistentDlg
+class AbstractAssistentDlg : public VclAbstractDialog
{
public:
virtual SfxObjectShellLock GetDocument() = 0;
@@ -87,14 +87,14 @@ public:
virtual com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword() = 0;
};
-class AbstractSdModifyFieldDlg : public VclAbstractDialog //add for SdModifyFieldDlg
+class AbstractSdModifyFieldDlg : public VclAbstractDialog
{
public:
virtual SvxFieldData* GetField() = 0;
virtual SfxItemSet GetItemSet() = 0;
};
-class AbstractSdSnapLineDlg : public VclAbstractDialog //add for SdSnapLineDlg
+class AbstractSdSnapLineDlg : public VclAbstractDialog
{
public:
virtual void GetAttr(SfxItemSet& rOutAttrs) = 0;
@@ -105,7 +105,7 @@ public:
virtual void SetText( const OUString& rStr ) = 0;
};
-class AbstractSdInsertLayerDlg : public VclAbstractDialog //add for SdInsertLayerDlg
+class AbstractSdInsertLayerDlg : public VclAbstractDialog
{
public:
virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0;
@@ -113,13 +113,13 @@ public:
virtual void SetHelpId( const OString& rHelpId ) = 0;
};
-class AbstractSdInsertPasteDlg : public VclAbstractDialog //add for SdInsertPasteDlg
+class AbstractSdInsertPasteDlg : public VclAbstractDialog
{
public:
virtual sal_Bool IsInsertBefore() const = 0;
};
-class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog //add for SdInsertPagesObjsDlg
+class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog
{
public:
virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer
@@ -128,7 +128,7 @@ public:
virtual sal_Bool IsRemoveUnnessesaryMasterPages() const = 0;
};
-class AbstractMorphDlg : public VclAbstractDialog //add for MorphDlg
+class AbstractMorphDlg : public VclAbstractDialog
{
public:
virtual void SaveSettings() const = 0;
@@ -137,31 +137,31 @@ public:
virtual sal_Bool IsOrientationFade() const = 0;
};
-class AbstractSdStartPresDlg : public VclAbstractDialog //add for SdStartPresentationDlg
+class AbstractSdStartPresDlg : public VclAbstractDialog
{
public:
virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0;
};
-class AbstractSdPresLayoutDlg : public VclAbstractDialog //add for SdPresLayoutDlg
+class AbstractSdPresLayoutDlg : public VclAbstractDialog
{
public:
virtual void GetAttr(SfxItemSet& rOutAttrs) = 0;
};
-class AbstractSdVectorizeDlg : public VclAbstractDialog //add for SdVectorizeDlg
+class AbstractSdVectorizeDlg : public VclAbstractDialog
{
public:
virtual const GDIMetaFile& GetGDIMetaFile() const = 0;
};
-class AbstractSdPublishingDlg : public VclAbstractDialog //add for SdPublishingDlg
+class AbstractSdPublishingDlg : public VclAbstractDialog
{
public:
virtual void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ) = 0;
};
-class AbstractHeaderFooterDialog : public VclAbstractDialog // add for HeaderFooterDialog
+class AbstractHeaderFooterDialog : public VclAbstractDialog
{
public:
virtual void ApplyToAll( TabPage* pPage ) = 0;
@@ -201,12 +201,12 @@ public:
virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent,
SdDrawDocument* pDoc,
- SdPage* ) = 0; // add for MasterLayoutDialog
+ SdPage* ) = 0;
virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell,
::Window* pParent,
SdDrawDocument* pDoc,
- SdPage* pCurrentPage ) = 0; // add for HeaderFooterDialog
+ SdPage* pCurrentPage ) = 0;
virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc() = 0;
virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc() = 0;
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index ee0154eb7caf..85d26822751f 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -68,25 +68,21 @@ IMPL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractBulletDialog_Impl);
-//AbstractCopyDlg_Impl begin
void AbstractCopyDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )
{
pDlg->GetAttr( rOutAttrs );
}
-// AbstractCopyDlg_Impl end
-//AbstractSdCustomShowDlg_Impl begin
sal_Bool AbstractSdCustomShowDlg_Impl::IsModified() const
{
return pDlg->IsModified();
}
+
sal_Bool AbstractSdCustomShowDlg_Impl::IsCustomShow() const
{
return pDlg->IsCustomShow();
}
-// AbstractSdCustomShowDlg_Impl end
-// SdAbstractTabDialog_Impl begin
void SdAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
@@ -101,28 +97,28 @@ const SfxItemSet* SdAbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
+
const sal_uInt16* SdAbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
+
void SdAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
{
pDlg->SetInputSet( pInSet );
}
+
//From class Window.
void SdAbstractTabDialog_Impl::SetText( const OUString& rStr )
{
pDlg->SetText( rStr );
}
+
OUString SdAbstractTabDialog_Impl::GetText() const
{
return pDlg->GetText();
}
-//add for SdAbstractTabDialog_Impl end
-// --------------------------------------------------------------------
-
-// AbstractBulletDialog_Impl begin
void AbstractBulletDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetCurPageId( nId );
@@ -137,26 +133,26 @@ const SfxItemSet* AbstractBulletDialog_Impl::GetOutputItemSet() const
{
return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetOutputItemSet();
}
+
const sal_uInt16* AbstractBulletDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetInputRanges( pItem );
}
+
void AbstractBulletDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
{
static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetInputSet( pInSet );
}
-//From class Window.
+
void AbstractBulletDialog_Impl::SetText( const OUString& rStr )
{
static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetText( rStr );
}
+
OUString AbstractBulletDialog_Impl::GetText() const
{
return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetText();
}
-//add for AbstractBulletDialog_Impl end
-
-// --------------------------------------------------------------------
void SdPresLayoutTemplateDlg_Impl::SetCurPageId( sal_uInt16 nId )
{
@@ -193,96 +189,96 @@ OUString SdPresLayoutTemplateDlg_Impl::GetText() const
return pDlg->GetText();
}
-// --------------------------------------------------------------------
-
-//AbstractAssistentDlg_Impl begin
SfxObjectShellLock AbstractAssistentDlg_Impl::GetDocument()
{
return pDlg->GetDocument();
}
+
OutputType AbstractAssistentDlg_Impl::GetOutputMedium() const
{
return pDlg->GetOutputMedium();
}
+
sal_Bool AbstractAssistentDlg_Impl::IsSummary() const
{
return pDlg->IsSummary();
}
+
StartType AbstractAssistentDlg_Impl::GetStartType() const
{
return pDlg->GetStartType();
}
+
OUString AbstractAssistentDlg_Impl::GetDocPath() const
{
return pDlg->GetDocPath();
}
+
sal_Bool AbstractAssistentDlg_Impl::GetStartWithFlag() const
{
return pDlg->GetStartWithFlag();
}
+
sal_Bool AbstractAssistentDlg_Impl::IsDocEmpty() const
{
return pDlg->IsDocEmpty();
}
+
com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > AbstractAssistentDlg_Impl::GetPassword()
{
return pDlg->GetPassword();
}
-// AbstractAssistentDlg_Impl end
-//AbstractSdModifyFieldDlg_Impl begin
SvxFieldData* AbstractSdModifyFieldDlg_Impl::GetField()
{
return pDlg->GetField();
}
+
SfxItemSet AbstractSdModifyFieldDlg_Impl::GetItemSet()
{
return pDlg->GetItemSet();
}
-// AbstractSdModifyFieldDlg_Impl end
-//AbstractSdSnapLineDlg_Impl begin
void AbstractSdSnapLineDlg_Impl::GetAttr(SfxItemSet& rOutAttrs)
{
pDlg->GetAttr(rOutAttrs);
}
+
void AbstractSdSnapLineDlg_Impl::HideRadioGroup()
{
pDlg->HideRadioGroup();
}
+
void AbstractSdSnapLineDlg_Impl::HideDeleteBtn()
{
pDlg->HideDeleteBtn();
}
+
void AbstractSdSnapLineDlg_Impl::SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY)
{
pDlg->SetInputFields(bEnableX, bEnableY);
}
+
void AbstractSdSnapLineDlg_Impl::SetText( const OUString& rStr )
{
pDlg->SetText( rStr );
}
-// AbstractSdSnapLineDlg_Impl end
-//AbstractSdInsertLayerDlg_Impl begin
void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )
{
pDlg->GetAttr( rOutAttrs );
}
+
void AbstractSdInsertLayerDlg_Impl::SetHelpId( const OString& rHelpId )
{
pDlg->SetHelpId( rHelpId );
}
-// AbstractSdInsertLayerDlg_Impl end
-//AbstractSdInsertPasteDlg_Impl begin
sal_Bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const
{
return pDlg->IsInsertBefore();
}
-// AbstractSdInsertPasteDlg_Impl end
-//AbstractSdInsertPagesObjsDlg_Impl begin
::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow()
{
return (::Window*)pDlg;
@@ -297,75 +293,67 @@ sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsLink()
{
return pDlg->IsLink();
}
+
sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsRemoveUnnessesaryMasterPages() const
{
return pDlg->IsRemoveUnnessesaryMasterPages();
}
-// AbstractSdInsertPagesObjsDlg_Impl end
-//AbstractMorphDlg_Impl begin
void AbstractMorphDlg_Impl::SaveSettings() const
{
pDlg->SaveSettings();
}
+
sal_uInt16 AbstractMorphDlg_Impl::GetFadeSteps() const
{
return pDlg->GetFadeSteps();
}
+
sal_Bool AbstractMorphDlg_Impl::IsAttributeFade() const
{
return pDlg->IsAttributeFade();
}
+
sal_Bool AbstractMorphDlg_Impl::IsOrientationFade() const
{
return pDlg->IsOrientationFade();
}
-// AbstractMorphDlg_Impl end
-//AbstractSdStartPresDlg_Impl begin
void AbstractSdStartPresDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )
{
pDlg->GetAttr( rOutAttrs );
}
-//AbstractSdPresLayoutDlg_Impl begin
void AbstractSdPresLayoutDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )
{
pDlg->GetAttr( rOutAttrs );
}
-// AbstractSdPresLayoutDlg_Impl end
-//SfxAbstractDialog_Impl begin
const SfxItemSet* SdAbstractSfxDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
+
void SdAbstractSfxDialog_Impl::SetText( const OUString& rStr )
{
pDlg->SetText( rStr );
}
+
OUString SdAbstractSfxDialog_Impl::GetText() const
{
return pDlg->GetText();
}
-//AbstractSfxNoLayoutSingleTabDialog_Impl end
-
-//AbstractSdVectorizeDlg_Impl begin
const GDIMetaFile& AbstractSdVectorizeDlg_Impl::GetGDIMetaFile() const
{
return pDlg->GetGDIMetaFile();
}
-//AbstractSdVectorizeDlg_Impl end
-//AbstractSdPublishingDlg_Impl begin
void AbstractSdPublishingDlg_Impl::GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams )
{
pDlg->GetParameterSequence( rParams );
}
-//AbstractSdPublishingDlg_Impl end
-//AbstractHeaderFooterDialog_Impl
void AbstractHeaderFooterDialog_Impl::ApplyToAll( TabPage* pPage )
{
pDlg->ApplyToAll( pPage );
@@ -380,102 +368,77 @@ void AbstractHeaderFooterDialog_Impl::Cancel( TabPage* pPage )
{
pDlg->Cancel( pPage );
}
-//AbstractHeaderFooterDialog_Impl
//-------------- SdAbstractDialogFactory implementation--------------
-//add for BreakDlg begin
VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg(
::Window* pWindow,
::sd::DrawView* pDrView,
::sd::DrawDocShell* pShell,
sal_uLong nSumActionCount,
- sal_uLong nObjCount ) //add for BreakDlg
+ sal_uLong nObjCount )
{
return new SdVclAbstractDialog_Impl( new ::sd::BreakDlg( pWindow, pDrView, pShell, nSumActionCount, nObjCount ) );
}
-//add for BreakDlg end
-//add for CopyDlg begin
AbstractCopyDlg * SdAbstractDialogFactory_Impl::CreateCopyDlg(
::Window* pWindow, const SfxItemSet& rInAttrs,
const rtl::Reference<XColorList> &pColTab,
- ::sd::View* pView ) //add for CopyDlg
+ ::sd::View* pView )
{
return new AbstractCopyDlg_Impl( new ::sd::CopyDlg( pWindow, rInAttrs, pColTab, pView ) );
}
-//add for CopyDlg end
-//add for SdCustomShowDlg begin
-AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) //add for SdCustomShowDlg
+AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc )
{
return new AbstractSdCustomShowDlg_Impl( new SdCustomShowDlg( pWindow, rDrawDoc ) );
}
-//add for SdCustomShowDlg end
-// add for SdCharDlg begin
SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell )
{
return new SdAbstractTabDialog_Impl( new SdCharDlg( pParent, pAttr, pDocShell ) );
}
-
SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage )
{
return new SdAbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) );
}
-// add for SdCharDlg end
-//add for AssistentDlg begin
AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( ::Window* pParent, sal_Bool bAutoPilot)
{
return new AbstractAssistentDlg_Impl( new AssistentDlg( pParent, bAutoPilot ) );
}
-//add for AssistentDlg end
-//add for SdModifyFieldDlg begin
AbstractSdModifyFieldDlg * SdAbstractDialogFactory_Impl::CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet )
{
return new AbstractSdModifyFieldDlg_Impl( new SdModifyFieldDlg( pWindow, pInField, rSet ) );
}
-//add for SdModifyFieldDlg end
-//add for SdSnapLineDlg begin
AbstractSdSnapLineDlg * SdAbstractDialogFactory_Impl::CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView)
{
return new AbstractSdSnapLineDlg_Impl( new SdSnapLineDlg( pWindow, rInAttrs, pView ) );
}
-//add for SdSnapLineDlg end
-//add for SdInsertLayerDlg begin
-AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) //add for SdInsertLayerDlg
+AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr )
{
return new AbstractSdInsertLayerDlg_Impl( new SdInsertLayerDlg( pWindow, rInAttrs, bDeletable, aStr ) );
}
-//add for SdInsertLayerDlg end
-//add for SdInsertPasteDlg begin
AbstractSdInsertPasteDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPasteDlg( ::Window* pWindow )
{
return new AbstractSdInsertPasteDlg_Impl( new SdInsertPasteDlg( pWindow ) );
}
-//add for SdInsertPasteDlg end
-//add for SdInsertPagesObjsDlg begin
AbstractSdInsertPagesObjsDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName )
{
return new AbstractSdInsertPagesObjsDlg_Impl( new SdInsertPagesObjsDlg( pParent, pDoc, pSfxMedium, rFileName ) );
}
-//add for SdInsertPagesObjsDlg end
-//add for MorphDlg begin
AbstractMorphDlg * SdAbstractDialogFactory_Impl::CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2)
{
return new AbstractMorphDlg_Impl( new ::sd::MorphDlg( pParent, pObj1, pObj2 ) );
}
-//add for MorphDlg end
-// add for OutlineBulletDlg begin
SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDlg( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView )
{
return new AbstractBulletDialog_Impl( new ::sd::OutlineBulletDlg( pParent, pAttr, pView ) );
@@ -485,61 +448,47 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( :
{
return new SdAbstractTabDialog_Impl( new SdParagraphDlg( pParent, pAttr ) );
}
-// add for OutlineBulletDlg end
-// add for SdStartPresentationDlg begin
AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs,
const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList )
{
return new AbstractSdStartPresDlg_Impl( new SdStartPresentationDlg( pWindow, rInAttrs, rPageNames, pCSList ) );
}
-// add for SdStartPresentationDlg end
-// add for SdRemoteDlg begin
VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateRemoteDialog( ::Window* pWindow )
{
return new SdVclAbstractDialog_Impl( new ::sd::RemoteDialog( pWindow ) );
}
-// add for SdRemoteDlg end
-// add for SdPresLayoutTemplateDlg begin
SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool )
{
return new SdPresLayoutTemplateDlg_Impl( new SdPresLayoutTemplateDlg( pDocSh, pParent, DlgId, rStyleBase, ePO, pSSPool ) );
}
-// add for SdPresLayoutDlg begin
AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs)
{
return new AbstractSdPresLayoutDlg_Impl( new SdPresLayoutDlg( pDocShell, pWindow, rInAttrs ) );
}
-// add for SdPresLayoutDlg end
-// add for SdTabTemplateDlg begin
SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView )
{
return new SdAbstractTabDialog_Impl( new SdTabTemplateDlg( pParent, pDocShell, rStyleBase, pModel, pView ) );
}
-// add for SdTabTemplateDlg end
SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView )
{
return new SdAbstractSfxDialog_Impl( new SdActionDlg( pParent, pAttr, pView ) );
}
-// add for SdVectorizeDlg begin
AbstractSdVectorizeDlg * SdAbstractDialogFactory_Impl::CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell )
{
return new AbstractSdVectorizeDlg_Impl( new SdVectorizeDlg( pParent, rBmp, pDocShell ) );
}
-// add for SdVectorizeDlg end
-// add for SdPublishingDlg begin
AbstractSdPublishingDlg * SdAbstractDialogFactory_Impl::CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType)
{
return new AbstractSdPublishingDlg_Impl( new SdPublishingDlg( pWindow, eDocType ) );
}
-// add for SdPublishingDlg end
// Factories for TabPages
CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsContentsTabPageCreatorFunc()
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 63308bae098b..fb3b823d7fb0 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -48,22 +48,19 @@ namespace sd {
class OutlineBulletDlg;
class HeaderFooterDialog;
}
-// add for BreakDlg
+
class Dialog;
class SdVclAbstractDialog_Impl : public VclAbstractDialog
{
DECL_ABSTDLG_BASE(SdVclAbstractDialog_Impl,Dialog)
};
-// add for CopyDlg
-
class AbstractCopyDlg_Impl : public AbstractCopyDlg
{
DECL_ABSTDLG_BASE(AbstractCopyDlg_Impl,::sd::CopyDlg)
virtual void GetAttr( SfxItemSet& rOutAttrs );
};
-// add for SdCustomShowDlg
class SdCustomShowDlg;
class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg
{
@@ -72,7 +69,6 @@ class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg
virtual sal_Bool IsCustomShow() const ;
};
-//add for SdCharDlg begin
class SfxTabDialog;
class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog
{
@@ -86,10 +82,7 @@ class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog
virtual void SetText( const OUString& rStr );
virtual OUString GetText() const;
};
-//add for SdCharDlg end
-
-//add for OutlineBulletDlg begin
class SfxTabDialog;
class AbstractBulletDialog_Impl : public SfxAbstractTabDialog
{
@@ -103,7 +96,6 @@ class AbstractBulletDialog_Impl : public SfxAbstractTabDialog
virtual void SetText( const OUString& rStr );
virtual OUString GetText() const;
};
-//add for OutlineBulletDlg end
class SdPresLayoutTemplateDlg;
class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog
@@ -119,7 +111,6 @@ class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog
virtual OUString GetText() const;
};
-// add for AssistentDlg
class AssistentDlg;
class AbstractAssistentDlg_Impl : public AbstractAssistentDlg
{
@@ -134,7 +125,6 @@ class AbstractAssistentDlg_Impl : public AbstractAssistentDlg
virtual com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword();
};
-// add for SdModifyFieldDlg
class SdModifyFieldDlg;
class AbstractSdModifyFieldDlg_Impl : public AbstractSdModifyFieldDlg
{
@@ -143,7 +133,6 @@ class AbstractSdModifyFieldDlg_Impl : public AbstractSdModifyFieldDlg
virtual SfxItemSet GetItemSet();
};
-// add for SdSnapLineDlg
class SdSnapLineDlg;
class AbstractSdSnapLineDlg_Impl : public AbstractSdSnapLineDlg
{
@@ -156,7 +145,6 @@ class AbstractSdSnapLineDlg_Impl : public AbstractSdSnapLineDlg
virtual void SetText( const OUString& rStr );
};
-// add for SdInsertLayerDlg
class SdInsertLayerDlg;
class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg
{
@@ -166,7 +154,6 @@ class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg
virtual void SetHelpId( const OString& rHelpId ) ;
};
-// add for SdInsertPasteDlg
class SdInsertPasteDlg;
class AbstractSdInsertPasteDlg_Impl : public AbstractSdInsertPasteDlg
{
@@ -174,18 +161,16 @@ class AbstractSdInsertPasteDlg_Impl : public AbstractSdInsertPasteDlg
virtual sal_Bool IsInsertBefore() const;
};
-// add for SdInsertPagesObjsDlg
class SdInsertPagesObjsDlg;
class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg
{
DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg)
- virtual ::Window * GetWindow(); //this method is added for return a Window type pointer
+ virtual ::Window * GetWindow();
virtual std::vector<OUString> GetList ( const sal_uInt16 nType );
virtual sal_Bool IsLink();
virtual sal_Bool IsRemoveUnnessesaryMasterPages() const;
};
-// add for MorphDlg
class AbstractMorphDlg_Impl : public AbstractMorphDlg
{
DECL_ABSTDLG_BASE(AbstractMorphDlg_Impl,::sd::MorphDlg)
@@ -195,7 +180,6 @@ class AbstractMorphDlg_Impl : public AbstractMorphDlg
virtual sal_Bool IsOrientationFade() const ;
};
-// add for SdStartPresentationDlg
class SdStartPresentationDlg;
class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg
{
@@ -203,7 +187,6 @@ class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg
virtual void GetAttr( SfxItemSet& rOutAttrs );
};
-// add for SdPresLayoutDlg
class SdPresLayoutDlg;
class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg
{
@@ -211,7 +194,6 @@ class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg
virtual void GetAttr(SfxItemSet& rOutAttrs);
};
-// add for SdActionDlg
class SdAbstractSfxDialog_Impl : public SfxAbstractDialog
{
DECL_ABSTDLG_BASE(SdAbstractSfxDialog_Impl,SfxModalDialog)
@@ -220,7 +202,6 @@ class SdAbstractSfxDialog_Impl : public SfxAbstractDialog
virtual OUString GetText() const;
};
-// add for SdVectorizeDlg
class SdVectorizeDlg;
class AbstractSdVectorizeDlg_Impl :public AbstractSdVectorizeDlg
{
@@ -228,7 +209,6 @@ class AbstractSdVectorizeDlg_Impl :public AbstractSdVectorizeDlg
virtual const GDIMetaFile& GetGDIMetaFile() const ;
};
-// add for SdPublishingDlg
class SdPublishingDlg;
class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg
{
@@ -236,7 +216,6 @@ class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg
virtual void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams );
};
-// add for HeaderFooterDialog
class AbstractHeaderFooterDialog_Impl :public AbstractHeaderFooterDialog
{
DECL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl,::sd::HeaderFooterDialog)
@@ -244,7 +223,6 @@ class AbstractHeaderFooterDialog_Impl :public AbstractHeaderFooterDialog
virtual void Apply( TabPage* pPage );
virtual void Cancel( TabPage* pPage );
};
-//------------------------------------------------------------------------
//AbstractDialogFactory_Impl implementations
class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory
@@ -281,12 +259,12 @@ public:
virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent,
SdDrawDocument* pDoc,
- SdPage* ); // add for MasterLayoutDialog
+ SdPage* );
virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell,
::Window* pParent,
SdDrawDocument* pDoc,
- SdPage* pCurrentPage ); // add for HeaderFooterDialog
+ SdPage* pCurrentPage );
// For TabPage
virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc();
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 0e7f1785b387..b2a5fbb2b342 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -19,7 +19,6 @@
#ifndef _SW_ABSTDLG_HXX
#define _SW_ABSTDLG_HXX
-
#include <tools/solar.h>
#include <tools/string.hxx>
#include <sfx2/sfxdlg.hxx>
@@ -72,7 +71,7 @@ class SwChildWinWrapper;
struct SfxChildWinInfo;
class SwTOXMark;
struct SwDocStat;
-#include <cnttab.hxx> //add for struct CurTOXType
+#include <cnttab.hxx>
namespace com{namespace sun{namespace star{
namespace frame{
@@ -93,14 +92,14 @@ typedef void (*SwLabDlgMethod) (::com::sun::star::uno::Reference< ::com::sun::
typedef String (*GlossaryGetCurrGroup)();
typedef void (*GlossarySetActGroup)(const String& rNewGroup);
-class AbstractGlossaryDlg : public VclAbstractDialog //add for SwGlossaryDlg
+class AbstractGlossaryDlg : public VclAbstractDialog
{
public:
virtual String GetCurrGrpName() const = 0;
virtual String GetCurrShortName() const = 0;
};
-class AbstractFldInputDlg : public VclAbstractDialog //add for SwFldInputDlg
+class AbstractFldInputDlg : public VclAbstractDialog
{
public:
//from class SalFrame
@@ -108,7 +107,7 @@ public:
virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0;
};
-class AbstractInsFootNoteDlg : public VclAbstractDialog //add for SwInsFootNoteDlg
+class AbstractInsFootNoteDlg : public VclAbstractDialog
{
public:
virtual String GetFontName() = 0;
@@ -119,7 +118,7 @@ public:
virtual void SetText( const OUString& rStr ) = 0;
};
-class AbstractInsTableDlg : public VclAbstractDialog //add for SwInsTableDlg
+class AbstractInsTableDlg : public VclAbstractDialog
{
public:
virtual void GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol,
@@ -127,7 +126,7 @@ public:
SwTableAutoFmt *& prTAFmt ) = 0;
};
-class AbstractJavaEditDialog : public VclAbstractDialog //add for SwJavaEditDialog
+class AbstractJavaEditDialog : public VclAbstractDialog
{
public:
virtual OUString GetText() = 0;
@@ -137,7 +136,7 @@ public:
virtual bool IsUpdate() = 0;
};
-class AbstractMailMergeDlg : public VclAbstractDialog //add for SwMailMergeDlg
+class AbstractMailMergeDlg : public VclAbstractDialog
{
public:
virtual sal_uInt16 GetMergeType() = 0;
@@ -150,18 +149,18 @@ public:
virtual String GetPath() const = 0;
};
-class AbstractMailMergeCreateFromDlg : public VclAbstractDialog //add for SwMailMergeCreateFromDlg
+class AbstractMailMergeCreateFromDlg : public VclAbstractDialog
{
public:
virtual sal_Bool IsThisDocument() const = 0;
};
-class AbstractMailMergeFieldConnectionsDlg : public VclAbstractDialog //add for SwMailMergeFieldConnectionsDlg
+class AbstractMailMergeFieldConnectionsDlg : public VclAbstractDialog
{
public:
virtual sal_Bool IsUseExistingConnections() const = 0;
};
-class AbstractMultiTOXTabDialog : public VclAbstractDialog //add for SwMultiTOXTabDialog
+class AbstractMultiTOXTabDialog : public VclAbstractDialog
{
public:
virtual SwForm* GetForm(CurTOXType eType) = 0;
@@ -171,12 +170,12 @@ public:
virtual const SfxItemSet* GetOutputItemSet() const = 0;
};
-class AbstractEditRegionDlg : public VclAbstractDialog //add for SwEditRegionDlg
+class AbstractEditRegionDlg : public VclAbstractDialog
{
public:
virtual void SelectSection(const String& rSectionName) = 0;
};
-class AbstractInsertSectionTabDialog : public VclAbstractDialog //add for SwInsertSectionTabDialog
+class AbstractInsertSectionTabDialog : public VclAbstractDialog
{
public:
virtual void SetSectionData(SwSectionData const& rSect) = 0;
@@ -190,21 +189,21 @@ public:
virtual Window * GetWindow() = 0; //this method is added for return a Window type pointer
};
-class AbstractSwInsertAbstractDlg : public VclAbstractDialog // add for SwInsertAbstractDlg
+class AbstractSwInsertAbstractDlg : public VclAbstractDialog
{
public:
virtual sal_uInt8 GetLevel() const = 0;
virtual sal_uInt8 GetPara() const = 0;
};
-class AbstractSwAsciiFilterDlg : public VclAbstractDialog // add for SwAsciiFilterDlg
+class AbstractSwAsciiFilterDlg : public VclAbstractDialog
{
public:
virtual void FillOptions( SwAsciiOptions& rOptions ) = 0;
};
-class AbstractSwBreakDlg : public VclAbstractDialog // add for SwBreakDlg
+class AbstractSwBreakDlg : public VclAbstractDialog
{
public:
virtual String GetTemplateName() = 0;
@@ -219,7 +218,7 @@ public:
virtual sal_uInt16 GetSplitMode() = 0;
};
-class AbstractSwConvertTableDlg : public VclAbstractDialog // add for SwConvertTableDlg
+class AbstractSwConvertTableDlg : public VclAbstractDialog
{
public:
virtual void GetValues( sal_Unicode& rDelim,
@@ -227,7 +226,7 @@ public:
SwTableAutoFmt const*& prTAFmt ) = 0;
};
-class AbstractSwInsertDBColAutoPilot : public VclAbstractDialog // add for SwInsertDBColAutoPilot
+class AbstractSwInsertDBColAutoPilot : public VclAbstractDialog
{
public:
@@ -237,21 +236,21 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet) = 0;
};
-class AbstractDropDownFieldDialog : public VclAbstractDialog //add for DropDownFieldDialog
+class AbstractDropDownFieldDialog : public VclAbstractDialog
{
public:
virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow
virtual void SetWindowState( const OString & rStr ) =0;//this method inherit from SystemWindow
};
-class AbstractSwLabDlg : public SfxAbstractTabDialog //add for SwLabDlg
+class AbstractSwLabDlg : public SfxAbstractTabDialog
{
public:
virtual const OUString& GetBusinessCardStr() const = 0;
virtual Printer *GetPrt() =0;
};
-class AbstractSwSelGlossaryDlg : public VclAbstractDialog //add for SwSelGlossaryDlg
+class AbstractSwSelGlossaryDlg : public VclAbstractDialog
{
public:
virtual void InsertGlos(const String &rRegion, const String &rGlosName) = 0; // inline
@@ -259,13 +258,13 @@ public:
virtual void SelectEntryPos(sal_uInt16 nIdx) = 0; // inline
};
-class AbstractSwAutoFormatDlg : public VclAbstractDialog //add for SwAutoFormatDlg
+class AbstractSwAutoFormatDlg : public VclAbstractDialog
{
public:
virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const = 0;
};
-class AbstractSwFldDlg : public SfxAbstractTabDialog //add for SwFldDlg
+class AbstractSwFldDlg : public SfxAbstractTabDialog
{
public:
virtual void Start( sal_Bool bShow = sal_True ) = 0; //this method from sfxtabdialog
@@ -276,7 +275,7 @@ public:
virtual Window * GetWindow() = 0; //this method is added for return a Window type pointer
};
-class AbstractSwRenameXNamedDlg : public VclAbstractDialog //add for SwRenameXNamedDlg
+class AbstractSwRenameXNamedDlg : public VclAbstractDialog
{
public:
virtual void SetForbiddenChars( const String& rSet ) = 0;
@@ -285,13 +284,13 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ) = 0;
};
-class AbstractSwModalRedlineAcceptDlg : public VclAbstractDialog //add for SwModalRedlineAcceptDlg
+class AbstractSwModalRedlineAcceptDlg : public VclAbstractDialog
{
public:
virtual void AcceptAll( sal_Bool bAccept ) = 0;
};
-class AbstractMarkFloatDlg : public VclAbstractDialog //add for SwIndexMarkFloatDlg & SwAuthMarkFloatDlg
+class AbstractMarkFloatDlg : public VclAbstractDialog
{
public:
virtual void ReInitDlg(SwWrtShell& rWrtShell) = 0;
@@ -317,14 +316,12 @@ public:
virtual sal_uInt16 GetRestartPage() const = 0;
};
-
-// Swabstract fractory
class SwAbstractDialogFactory
{
public:
static SwAbstractDialogFactory* Create();
- 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
@@ -332,36 +329,34 @@ public:
virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings,
SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo) = 0;
- virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent) = 0; // add for SwInsertAbstractDlg
+ virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent) = 0;
virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh,
- SvStream* pStream ) = 0;// add for SwAsciiFilterDlg
- virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0;// add for SwInsertBookmarkDlg
+ SvStream* pStream ) = 0;
+ virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0;
- virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) = 0; // add for SwBreakDlg
- virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) = 0; //add for SwChangeDBDlg
+ virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) = 0;
+ virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) = 0;
virtual SfxAbstractTabDialog * CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
- sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) = 0; // add for SwCharDlg
- virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0; //add for SwConvertTableDlg
- virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) = 0; //add for SwCaptionDialog
+ sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) = 0;
+ virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0;
+ virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) = 0;
- virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, // add for SwInsertDBColAutoPilot
+ virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView,
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp,
const SwDBData& rData) = 0;
- virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) = 0;//add for SwFootNoteOptionDlg
+ virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) = 0;
- //add for DropDownFieldDialog
virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(Window *pParent, SwWrtShell &rSh,
SwField* pField, sal_Bool bNextButton = sal_False) = 0;
- virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) = 0; //add for SwEnvDlg
+ virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) = 0;
-
- virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
+ virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
SwNewDBMgr* pNewDBMgr, bool bLabel) = 0;
- virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;//add for SwLabDlg
+ virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;
- virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent, //add for SwParaDlg
+ virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent,
SwView& rVw,
const SfxItemSet& rCoreSet,
sal_uInt8 nDialogMode,
@@ -369,35 +364,35 @@ public:
sal_Bool bDraw = sal_False,
OString sDefPage = OString() ) = 0;
- virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName) = 0; //add for SwSelGlossaryDlg
+ virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName) = 0;
- virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) = 0; //add for SwTableHeightDlg SwSortDlg
- virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) = 0; //add for SwSplitTblDlg
+ virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) = 0;
+ virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) = 0;
- virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg
+ virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell,
sal_Bool bSetAutoFmt = sal_True,
const SwTableAutoFmt* pSelFmt = 0 ) = 0;
- virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) = 0; //add for SwWrapDlg
+ virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) = 0;
- virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) = 0; //add for SwTableWidthDlg
+ virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) = 0;
virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
- const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0; //add for SwTableTabDlg
+ const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0;
- virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) = 0; //add for SwFldDlg
- virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; //add for SwFldEditDlg
- virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent, //add for SwRenameXNamedDlg
+ virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) = 0;
+ virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0;
+ virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) = 0;
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) = 0;
- virtual VclAbstractDialog* CreateTblMergeDialog( Window* pParent, sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg
+ virtual VclAbstractDialog* CreateTblMergeDialog( Window* pParent, sal_Bool& rWithPrev ) = 0;
virtual SfxAbstractTabDialog* CreateFrmTabDialog(const OString &rDialogType,
SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
bool bNewFrm = true,
bool bFmt = false,
OString sDefPage = OString(),
- const OUString* pFmtStr = 0) = 0; //add for SwFrmDlg
+ const OUString* pFmtStr = 0) = 0;
// @param nSlot
// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
// Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane
@@ -407,60 +402,59 @@ public:
sal_uInt16 nRegion,
OString sPage = OString(),
SwWrtShell* pActShell = 0,
- bool bNew = false) = 0; //add for SwTemplateDlg
+ bool bNew = false) = 0;
virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
- SwWrtShell *pWrtShell) = 0; //add for SwGlossaryDlg
+ SwWrtShell *pWrtShell) = 0;
virtual AbstractFldInputDlg* CreateFldInputDlg(Window *pParent,
- SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0; //add for SwFldInputDlg
+ SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0;
virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(Window * pParent,
- SwWrtShell &rSh, sal_Bool bEd = sal_False) = 0; //add for SwInsFootNoteDlg
+ SwWrtShell &rSh, sal_Bool bEd = sal_False) = 0;
virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0;
- virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg
- virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) = 0; //add for SwInsTableDlg
+ virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView) = 0;
+ virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) = 0;
virtual AbstractJavaEditDialog* CreateJavaEditDialog(Window* pParent,
- SwWrtShell* pWrtSh) = 0; //add for SwJavaEditDialog
+ SwWrtShell* pWrtSh) = 0;
virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId,
Window* pParent, SwWrtShell& rSh,
const String& rSourceName,
const String& rTblName,
sal_Int32 nCommandType,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0; //add for SwMailMergeDlg
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0;
virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(Window* pParent) = 0;
- virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent) = 0; //add for SwMailMergeFieldConnectionsDlg
+ virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent) = 0;
virtual VclAbstractDialog* CreateMultiTOXMarkDlg( int nResId,
- Window* pParent, SwTOXMgr &rTOXMgr ) = 0; //add for SwMultiTOXMarkDlg
+ Window* pParent, SwTOXMgr &rTOXMgr ) = 0;
virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId,
Window* pParent,
const SfxItemSet* pSwItemSet,
- SwWrtShell &) = 0; //add for SwSvxNumBulletTabDialog, SwOutlineTabDialog
+ SwWrtShell &) = 0;
virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog(
Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX,
- sal_Bool bGlobal = sal_False) = 0; //add for SwMultiTOXTabDialog
- virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) = 0; //add for SwEditRegionDlg
+ sal_Bool bGlobal = sal_False) = 0;
+ virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) = 0;
virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog(
- Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) = 0; //add for SwInsertSectionTabDialog
+ Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) = 0;
virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg(
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
- sal_Bool bNew=sal_True) = 0; //add for SwIndexMarkFloatDlg
+ sal_Bool bNew=sal_True) = 0;
virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg(
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
- sal_Bool bNew=sal_True) = 0; //add for SwAuthMarkFloatDlg
+ sal_Bool bNew=sal_True) = 0;
virtual VclAbstractDialog * CreateIndexMarkModalDlg(
- Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) = 0; //add for SwIndexMarkModalDlg
+ Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) = 0;
virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) = 0;
- //add for static func in SwGlossaryDlg
virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc() = 0;
virtual GlossarySetActGroup SetGlossaryActGroupFunc() = 0;
@@ -473,4 +467,5 @@ protected:
};
#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 825ab3f683a8..c7009710b016 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -23,7 +23,7 @@
#include <tools/string.hxx>
#include <filter/msfilter/msdffimp.hxx>
#include <editeng/frmdir.hxx>
-#include <fltshell.hxx> // fuer den Attribut Stack
+#include <fltshell.hxx>
#include <vector>
#include <stack>
@@ -1263,7 +1263,7 @@ private:
// the very 1st Line Numbering and ignore the rest)
bool bFirstPara; // first paragraph?
- bool bFirstParaOfPage;//cs2c--xushanchuan add for bug11210
+ bool bFirstParaOfPage;
bool bParaAutoBefore;
bool bParaAutoAfter;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 8ec2ab27cd7c..e07cc8b483c2 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -34,59 +34,59 @@
#include <regionsw.hrc>
#include <wordcountdialog.hxx>
-#include "abstract.hxx" // add for SwInsertAbstractDlg
-#include "addrdlg.hxx" // add for SwAddrDlg
-#include "ascfldlg.hxx" // add for SwAsciiFilterDlg
-#include "bookmark.hxx" //add for SwInsertBookmarkDlg
-#include "break.hxx" //add for SwBreakDlg
-#include "changedb.hxx" //add for SwChangeDBDlg
-#include "chrdlg.hxx" // add for SwCharDlg
-#include "convert.hxx" //add for SwConvertTableDlg
-#include "cption.hxx" //add for SwCaptionDialog
-#include "dbinsdlg.hxx" //add for SwInsertDBColAutoPilot
-#include "docfnote.hxx" //add for SwFootNoteOptionDlg
-#include "docstdlg.hxx" //add for SwDocStatPage
-#include "DropDownFieldDialog.hxx" //add for DropDownFieldDialog
-#include "envlop.hxx" //add for SwEnvDlg
-#include "label.hxx" //add for SwLabDlg
-#include "drpcps.hxx" //add for SwDropCapsDlg
-#include "swuipardlg.hxx" //add for SwParaDlg
-#include "pattern.hxx" //add for SwBackgroundDlg
-#include "rowht.hxx" //add for SwTableHeightDlg
-#include "selglos.hxx" //add for SwSelGlossaryDlg
-#include "splittbl.hxx" //add for SwSplitTblDlg
-#include "srtdlg.hxx" //add for SwSortDlg
-#include "tautofmt.hxx" //add for SwAutoFormatDlg
-#include "tblnumfm.hxx" //add for SwNumFmtDlg
-#include "wrap.hxx" //add for SwWrapDlg
-#include "colwd.hxx" //add for SwTableWidthDlg
-#include "tabledlg.hxx" //add for SwTableTabDlg
-#include "fldtdlg.hxx" //add for SwFldDlg
-#include "fldedt.hxx" //add for SwFldEditDlg
-#include "swrenamexnameddlg.hxx" //add for SwRenameXNamedDlg
-#include "swmodalredlineacceptdlg.hxx" //add for SwModalRedlineAcceptDlg
-#include <frmdlg.hxx> //add for SwFrmDlg
-#include <tmpdlg.hxx> //add for SwTemplateDlg
-#include <glossary.hxx> //add for SwGlossaryDlg
-#include <inpdlg.hxx> //add for SwFldInputDlg
-#include <insfnote.hxx> //add for SwInsFootNoteDlg
-#include <instable.hxx> //add for SwInsTableDlg
-#include <javaedit.hxx> //add for SwJavaEditDialog
-#include <linenum.hxx> //add for SwLineNumberingDlg
-#include <titlepage.hxx> //add for SwTitlePageDlg
-#include <mailmrge.hxx> //add for SwMailMergeDlg, SwMailMergeCreateFromDlg, SwMailMergeFieldConnectionsDlg
-#include <mergetbl.hxx> //add for SwMergeTblDlg
-#include <multmrk.hxx> //add for SwMultiTOXMarkDlg
-#include <num.hxx> //add for SwSvxNumBulletTabDialog
-#include <outline.hxx> //add for SwOutlineTabDialog
-#include <column.hxx> //add for SwColumnDlg
-#include <cnttab.hxx> //add for SwMultiTOXTabDialog
-#include <swuicnttab.hxx> //add for SwMultiTOXTabDialog
-#include <regionsw.hxx> //add for SwEditRegionDlg, SwInsertSectionTabDialog
-#include <optcomp.hxx> //add for SwCompatibilityOptPage
-#include <optload.hxx> //add for SwLoadOptPage
-#include <optpage.hxx> //add for OptPage
-#include <swuiidxmrk.hxx> //add for SwIndexMarkDlg, SwAuthMarkDlg, SwIndexMarkModalDlg, SwAuthMarkModalDlg
+#include "abstract.hxx"
+#include "addrdlg.hxx"
+#include "ascfldlg.hxx"
+#include "bookmark.hxx"
+#include "break.hxx"
+#include "changedb.hxx"
+#include "chrdlg.hxx"
+#include "convert.hxx"
+#include "cption.hxx"
+#include "dbinsdlg.hxx"
+#include "docfnote.hxx"
+#include "docstdlg.hxx"
+#include "DropDownFieldDialog.hxx"
+#include "envlop.hxx"
+#include "label.hxx"
+#include "drpcps.hxx"
+#include "swuipardlg.hxx"
+#include "pattern.hxx"
+#include "rowht.hxx"
+#include "selglos.hxx"
+#include "splittbl.hxx"
+#include "srtdlg.hxx"
+#include "tautofmt.hxx"
+#include "tblnumfm.hxx"
+#include "wrap.hxx"
+#include "colwd.hxx"
+#include "tabledlg.hxx"
+#include "fldtdlg.hxx"
+#include "fldedt.hxx"
+#include "swrenamexnameddlg.hxx"
+#include "swmodalredlineacceptdlg.hxx"
+#include <frmdlg.hxx>
+#include <tmpdlg.hxx>
+#include <glossary.hxx>
+#include <inpdlg.hxx>
+#include <insfnote.hxx>
+#include <instable.hxx>
+#include <javaedit.hxx>
+#include <linenum.hxx>
+#include <titlepage.hxx>
+#include <mailmrge.hxx>
+#include <mergetbl.hxx>
+#include <multmrk.hxx>
+#include <num.hxx>
+#include <outline.hxx>
+#include <column.hxx>
+#include <cnttab.hxx>
+#include <swuicnttab.hxx>
+#include <regionsw.hxx>
+#include <optcomp.hxx>
+#include <optload.hxx>
+#include <optpage.hxx>
+#include <swuiidxmrk.hxx>
#include <svx/dialogs.hrc>
#include <mailmergewizard.hxx>
#include <mailconfigpage.hxx>
@@ -99,17 +99,17 @@ IMPL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSwAsciiFilterDlg_Impl);
IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl);
-IMPL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl); //add for SwBreakDlg
-IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for SwCharDlg, SwFootNoteOptionDlg, SwEnvDlg SwParaDlg SwTableTabDlg
-IMPL_ABSTDLG_BASE(AbstractSwConvertTableDlg_Impl); //add for SwConvertTableDlg
-IMPL_ABSTDLG_BASE(AbstractSwInsertDBColAutoPilot_Impl); //add for SwInsertDBColAutoPilot
-IMPL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl); //add for DropDownFieldDialog
-IMPL_ABSTDLG_BASE(AbstractSwLabDlg_Impl);//add for SwLabDlg
-IMPL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl);//add for SwSelGlossaryDlg
-IMPL_ABSTDLG_BASE(AbstractSwAutoFormatDlg_Impl); //add for SwAutoFormatDlg
-IMPL_ABSTDLG_BASE(AbstractSwFldDlg_Impl); //add for SwFldDlg
-IMPL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl); //add for SwRenameXNamedDlg
-IMPL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl); //add for SwModalRedlineAcceptDlg
+IMPL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwConvertTableDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwInsertDBColAutoPilot_Impl);
+IMPL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwLabDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwAutoFormatDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwFldDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractFldInputDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractInsFootNoteDlg_Impl);
@@ -177,12 +177,12 @@ sal_uInt8 AbstractSwInsertAbstractDlg_Impl::GetLevel() const
{
return pDlg->GetLevel();
}
+
sal_uInt8 AbstractSwInsertAbstractDlg_Impl::GetPara() const
{
return pDlg->GetPara();
}
-//add for SwAddrDlg, SwDropCapsDlg ,SwBackgroundDlg, SwNumFmtDlg SwWrapDlg SwFldEditDlg begin
const SfxItemSet* SwAbstractSfxDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -371,6 +371,7 @@ Window* AbstractSwFldDlg_Impl::GetWindow()
{
return (Window*)pDlg;
}
+
void AbstractSwFldDlg_Impl::ShowReferencePage()
{
pDlg->ShowReferencePage();
@@ -417,6 +418,7 @@ String AbstractInsFootNoteDlg_Impl::GetFontName()
{
return pDlg->GetFontName();
}
+
sal_Bool AbstractInsFootNoteDlg_Impl::IsEndNote()
{
return pDlg->IsEndNote();
@@ -426,6 +428,7 @@ String AbstractInsFootNoteDlg_Impl::GetStr()
{
return pDlg->GetStr();
}
+
void AbstractInsFootNoteDlg_Impl::SetHelpId( const OString& sHelpId )
{
pDlg->SetHelpId( sHelpId );
@@ -452,14 +455,17 @@ String AbstractJavaEditDialog_Impl::GetType()
{
return pDlg->GetType();
}
+
sal_Bool AbstractJavaEditDialog_Impl::IsUrl()
{
return pDlg->IsUrl();
}
+
sal_Bool AbstractJavaEditDialog_Impl::IsNew()
{
return pDlg->IsNew();
}
+
bool AbstractJavaEditDialog_Impl::IsUpdate()
{
return pDlg->IsUpdate();
@@ -484,18 +490,22 @@ uno::Reference< sdbc::XResultSet> AbstractMailMergeDlg_Impl::GetResultSet() cons
{
return pDlg->GetResultSet();
}
+
bool AbstractMailMergeDlg_Impl::IsSaveIndividualDocs() const
{
return pDlg->IsSaveIndividualDocs();
}
+
bool AbstractMailMergeDlg_Impl::IsGenerateFromDataBase() const
{
return pDlg->IsGenerateFromDataBase();
}
+
String AbstractMailMergeDlg_Impl::GetColumnName() const
{
return pDlg->GetColumnName();
}
+
String AbstractMailMergeDlg_Impl::GetPath() const
{
return pDlg->GetPath();
@@ -562,7 +572,6 @@ Window* AbstractAuthMarkFloatDlg_Impl::GetWindow()
return (Window*)pDlg;
}
-
Window* AbstractSwWordCountFloatDlg_Impl::GetWindow()
{
return (Window*)pDlg;
@@ -615,6 +624,7 @@ const String& AbstractMailMergeWizard_Impl::GetReloadDocument() const
{
return pDlg->GetReloadDocument();
}
+
sal_Bool AbstractMailMergeWizard_Impl::ShowPage( sal_uInt16 nLevel )
{
return pDlg->skipUntil(nLevel);
@@ -703,7 +713,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg(SwView&
return new VclAbstractDialog_Impl(pDlg);
}
- // add for SwCharDlg
+
SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwCharDlg(Window* pParent, SwView& pVw,
const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFmtStr)
{
@@ -736,7 +746,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( Window
return 0;
}
-AbstractSwInsertDBColAutoPilot* SwAbstractDialogFactory_Impl::CreateSwInsertDBColAutoPilot( SwView& rView, // add for SwInsertDBColAutoPilot
+AbstractSwInsertDBColAutoPilot* SwAbstractDialogFactory_Impl::CreateSwInsertDBColAutoPilot( SwView& rView,
uno::Reference< sdbc::XDataSource> rxSource,
uno::Reference<sdbcx::XColumnsSupplier> xColSupp,
const SwDBData& rData)
@@ -751,7 +761,6 @@ SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(
return new AbstractTabDialog_Impl( pDlg );
}
-//add for DropDownFieldDialog
AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog(Window *pParent,
SwWrtShell &rSh, SwField* pField, sal_Bool bNextButton)
{
@@ -761,13 +770,13 @@ AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownField
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet,
SwWrtShell* pWrtSh, Printer* pPrt,
- sal_Bool bInsert ) //add for SwEnvDlg
+ sal_Bool bInsert )
{
SfxTabDialog* pDlg = new SwEnvDlg( pParent, rSet, pWrtSh,pPrt, bInsert );
return new AbstractTabDialog_Impl( pDlg );
}
-AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
+AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
SwNewDBMgr* pNewDBMgr, bool bLabel)
{
SwLabDlg* pDlg = new SwLabDlg(pParent, rSet, pNewDBMgr, bLabel);
@@ -901,7 +910,7 @@ AbstractSwModalRedlineAcceptDlg * SwAbstractDialogFactory_Impl::CreateSwModalRed
return new AbstractSwModalRedlineAcceptDlg_Impl( pDlg );
}
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev) //add for SwMergeTblDlg
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev)
{
Dialog* pDlg = new SwMergeTblDlg( pParent, rWithPrev );
return new VclAbstractDialog_Impl( pDlg );
@@ -913,7 +922,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog(const OSt
bool bNewFrm,
bool bFmt,
OString sDefPage,
- const OUString* pFmtStr ) //add for SwFrmDlg
+ const OUString* pFmtStr )
{
SfxTabDialog* pDlg = new SwFrmDlg(pFrame, pParent, rCoreSet, bNewFrm, rDialogType, bFmt, sDefPage, pFmtStr);
return new AbstractTabDialog_Impl(pDlg);
@@ -925,7 +934,7 @@ SfxAbstractApplyTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog(
sal_uInt16 nRegion,
OString sPage,
SwWrtShell* pActShell,
- bool bNew ) //add for SwTemplateDlg
+ bool bNew )
{
SfxTabDialog* pDlg = new SwTemplateDlg( pParent, rBase, nRegion, sPage, pActShell, bNew );
return new AbstractApplyTabDialog_Impl( pDlg );
@@ -933,21 +942,21 @@ SfxAbstractApplyTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog(
AbstractGlossaryDlg* SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
- SwWrtShell *pWrtShell) //add for SwGlossaryDlg
+ SwWrtShell *pWrtShell)
{
SwGlossaryDlg* pDlg = new SwGlossaryDlg(pViewFrame, pGlosHdl, pWrtShell);
return new AbstractGlossaryDlg_Impl( pDlg );
}
AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg(Window *pParent,
- SwWrtShell &rSh, SwField* pField, bool bNextButton) //add for SwFldInputDlg
+ SwWrtShell &rSh, SwField* pField, bool bNextButton)
{
SwFldInputDlg* pDlg = new SwFldInputDlg( pParent, rSh, pField, bNextButton );
return new AbstractFldInputDlg_Impl( pDlg );
}
AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg(
- Window * pParent, SwWrtShell &rSh, sal_Bool bEd ) //add for SwInsFootNoteDlg
+ Window * pParent, SwWrtShell &rSh, sal_Bool bEd )
{
SwInsFootNoteDlg* pDlg = new SwInsFootNoteDlg(pParent, rSh, bEd);
return new AbstractInsFootNoteDlg_Impl( pDlg );
@@ -967,14 +976,14 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog(SwView&
return new VclAbstractDialog_Impl( pDlg );
}
-AbstractInsTableDlg * SwAbstractDialogFactory_Impl::CreateInsTableDlg(SwView& rView) //add for SwInsTableDlg
+AbstractInsTableDlg * SwAbstractDialogFactory_Impl::CreateInsTableDlg(SwView& rView)
{
SwInsTableDlg* pDlg = new SwInsTableDlg(rView);
return new AbstractInsTableDlg_Impl( pDlg );
}
AbstractJavaEditDialog * SwAbstractDialogFactory_Impl::CreateJavaEditDialog(
- Window* pParent, SwWrtShell* pWrtSh) //add for SwJavaEditDialog
+ Window* pParent, SwWrtShell* pWrtSh)
{
SwJavaEditDialog* pDlg = new SwJavaEditDialog(pParent, pWrtSh);
return new AbstractJavaEditDialog_Impl( pDlg );
@@ -986,7 +995,7 @@ AbstractMailMergeDlg * SwAbstractDialogFactory_Impl::CreateMailMergeDlg( int nRe
const String& rTblName,
sal_Int32 nCommandType,
const uno::Reference< sdbc::XConnection>& xConnection,
- uno::Sequence< uno::Any >* pSelection ) //add for SwMailMergeDlg
+ uno::Sequence< uno::Any >* pSelection )
{
SwMailMergeDlg* pDlg=NULL;
switch ( nResId )
@@ -1008,14 +1017,14 @@ AbstractMailMergeCreateFromDlg * SwAbstractDialogFactory_Impl::CreateMailMergeCr
return new AbstractMailMergeCreateFromDlg_Impl(pDlg);
}
-AbstractMailMergeFieldConnectionsDlg * SwAbstractDialogFactory_Impl::CreateMailMergeFieldConnectionsDlg(Window* pParent) //add for SwMailMergeFieldConnectionsDlg
+AbstractMailMergeFieldConnectionsDlg * SwAbstractDialogFactory_Impl::CreateMailMergeFieldConnectionsDlg(Window* pParent)
{
SwMailMergeFieldConnectionsDlg* pDlg = new SwMailMergeFieldConnectionsDlg( pParent );
return new AbstractMailMergeFieldConnectionsDlg_Impl( pDlg );
}
VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg( int nResId,
- Window* pParent, SwTOXMgr &rTOXMgr ) //add for SwMultiTOXMarkDlg
+ Window* pParent, SwTOXMgr &rTOXMgr )
{
Dialog* pDlg=NULL;
switch ( nResId )
@@ -1034,7 +1043,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg( int nRe
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResId,
Window* pParent,
const SfxItemSet* pSwItemSet,
- SwWrtShell & rWrtSh ) //add for SwSvxNumBulletTabDialog, SwOutlineTabDialog
+ SwWrtShell & rWrtSh )
{
SfxTabDialog* pDlg=NULL;
switch ( nResId )
@@ -1058,20 +1067,20 @@ AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialo
Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
SwTOXBase* pCurTOX, sal_uInt16 nToxType,
- sal_Bool bGlobal) //add for SwMultiTOXTabDialog
+ sal_Bool bGlobal)
{
SwMultiTOXTabDialog* pDlg = new SwMultiTOXTabDialog( pParent, rSet, rShell, pCurTOX, nToxType, bGlobal );
return new AbstractMultiTOXTabDialog_Impl( pDlg );
}
-AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) //add for SwEditRegionDlg
+AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh)
{
SwEditRegionDlg* pDlg = new SwEditRegionDlg( pParent, rWrtSh );
return new AbstractEditRegionDlg_Impl( pDlg );
}
AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSectionTabDialog(
- Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) //add for SwInsertSectionTabDialog
+ Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh)
{
SwInsertSectionTabDialog* pDlg = new SwInsertSectionTabDialog(pParent, rSet, rSh);
return new AbstractInsertSectionTabDialog_Impl(pDlg);
@@ -1082,7 +1091,7 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg(
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
- sal_Bool bNew ) //add for SwIndexMarkFloatDlg
+ sal_Bool bNew )
{
SwIndexMarkFloatDlg* pDlg = new SwIndexMarkFloatDlg(pBindings, pChild, pParent, pInfo, bNew);
return new AbstractIndexMarkFloatDlg_Impl(pDlg);
@@ -1093,7 +1102,7 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg(
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
- sal_Bool bNew) //add for SwAuthMarkFloatDlg
+ sal_Bool bNew)
{
SwAuthMarkFloatDlg* pDlg = new SwAuthMarkFloatDlg( pBindings, pChild, pParent, pInfo, bNew );
return new AbstractAuthMarkFloatDlg_Impl( pDlg );
@@ -1109,22 +1118,19 @@ AbstractSwWordCountFloatDlg * SwAbstractDialogFactory_Impl::CreateSwWordCountDia
return new AbstractSwWordCountFloatDlg_Impl( pDlg );
}
-//add for SwIndexMarkModalDlg begin
VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg(
- Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) //add for SwIndexMarkModalDlg
+ Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark )
{
Dialog* pDlg = new SwIndexMarkModalDlg( pParent, rSh, pCurTOXMark );
return new VclAbstractDialog_Impl( pDlg );
}
-//add for SwIndexMarkModalDlg end
AbstractMailMergeWizard* SwAbstractDialogFactory_Impl::CreateMailMergeWizard(
SwView& rView, SwMailMergeConfigItem& rConfigItem)
{
return new AbstractMailMergeWizard_Impl( new SwMailMergeWizard(rView, rConfigItem));
}
-//add for static func in SwGlossaryDlg
GlossaryGetCurrGroup SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc()
{
return SwGlossaryDlg::GetCurrGroup;
@@ -1135,7 +1141,6 @@ GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc()
return SwGlossaryDlg::SetActGroup;
}
-
//------------------ Factories for TabPages
CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId )
{
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 91413ce1324b..77aa49c5c2f9 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -74,7 +74,6 @@ class AbstractSwWordCountFloatDlg_Impl : public AbstractSwWordCountFloatDlg
virtual Window * GetWindow(); //this method is added for return a Window type pointer
};
-//add for SwInsertAbstractDlg begin
class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg
{
DECL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl,SwInsertAbstractDlg)
@@ -82,9 +81,6 @@ class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg
virtual sal_uInt8 GetPara() const ;
};
-//add for SwInsertAbstractDlg end
-
-// add for SwAddrDlg, SwDropCapsDlg, SwBackgroundDlg SwNumFmtDlg SwWrapDlg, SwFldEditDlg begin
class SfxNoLayoutSingleTabDialog;
class SwAbstractSfxDialog_Impl :public SfxAbstractDialog
{
@@ -93,26 +89,20 @@ class SwAbstractSfxDialog_Impl :public SfxAbstractDialog
virtual void SetText( const OUString& rStr );
virtual OUString GetText() const;
};
-// add for SwAddrDlg,SwDropCapsDlg , SwBackgroundDlg SwNumFmtDlg SwWrapDlg, SwFldEditDlg end
-// add for SwAsciiFilterDlg begin
class AbstractSwAsciiFilterDlg_Impl : public AbstractSwAsciiFilterDlg
{
DECL_ABSTDLG_BASE( AbstractSwAsciiFilterDlg_Impl,SwAsciiFilterDlg )
virtual void FillOptions( SwAsciiOptions& rOptions );
};
-// add for SwAsciiFilterDlg end
-// add for SwInsertBookmarkDlg SwChangeDBDlg, SwTableHeightDlg, SwSplitTblDlg SwSortDlg SwTableWidthDlgbegin
class VclAbstractDialog_Impl : public VclAbstractDialog
{
DECL_ABSTDLG_BASE(VclAbstractDialog_Impl,Dialog)
};
-// add for SwInsertBookmarkDlg SwChangeDBDlg, SwTableHeightDlg SwSplitTblDlg SwSortDlg SwTableWidthDlg end
-// add for SwBreakDlg begin
-class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg // add for SwBreakDlg
+class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg
{
DECL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl,SwBreakDlg)
virtual String GetTemplateName();
@@ -126,9 +116,6 @@ class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for
virtual sal_uInt16 GetSplitMode();
};
-// add for SwBreakDlg end
-
-//add for SwCharDlg , SwEnvDlg , SwFootNoteOptionDlg SwParaDlg SwTableTabDlg begin
class AbstractTabDialog_Impl : virtual public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
@@ -141,7 +128,6 @@ class AbstractTabDialog_Impl : virtual public SfxAbstractTabDialog
virtual void SetText( const OUString& rStr );
virtual OUString GetText() const;
};
-//add for SwCharDlg, SwEnvDlg ,SwFootNoteOptionDlg SwParaDlg SwTableTabDlg end
class AbstractApplyTabDialog_Impl : public AbstractTabDialog_Impl, virtual public SfxAbstractApplyTabDialog
{
@@ -156,17 +142,14 @@ private:
virtual void SetApplyHdl( const Link& rLink );
};
-//add for SwConvertTableDlg begin
-class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg // add for SwConvertTableDlg
+class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg
{
DECL_ABSTDLG_BASE( AbstractSwConvertTableDlg_Impl,SwConvertTableDlg)
virtual void GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTblFlags,
SwTableAutoFmt const*& prTAFmt);
};
-//add for SwConvertTableDlg end
-//add for SwInsertDBColAutoPilot begin
-class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPilot // add for SwInsertDBColAutoPilot
+class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPilot
{
DECL_ABSTDLG_BASE( AbstractSwInsertDBColAutoPilot_Impl,SwInsertDBColAutoPilot)
virtual void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection,
@@ -174,17 +157,13 @@ class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPil
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet);
};
-//add for SwInsertDBColAutoPilot end
-//add for DropDownFieldDialog begin
-class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog //add for DropDownFieldDialog
+class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog
{
DECL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl, sw::DropDownFieldDialog)
virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow
virtual void SetWindowState( const OString& rStr );//this method inherit from SystemWindow
};
-//add for DropDownFieldDialog end
-
class AbstractSwLabDlg_Impl : public AbstractSwLabDlg
{
@@ -200,9 +179,7 @@ class AbstractSwLabDlg_Impl : public AbstractSwLabDlg
virtual const OUString& GetBusinessCardStr() const;
virtual Printer *GetPrt();
};
-//add for SwLabDlg end
-//add for SwSelGlossaryDlg begin
class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg
{
DECL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl,SwSelGlossaryDlg)
@@ -210,19 +187,14 @@ class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg
virtual sal_uInt16 GetSelectedIdx() const; // inline
virtual void SelectEntryPos(sal_uInt16 nIdx); // inline
};
-//add for SwSelGlossaryDlg end
-//add for SwAutoFormatDlg begin
class AbstractSwAutoFormatDlg_Impl : public AbstractSwAutoFormatDlg
{
DECL_ABSTDLG_BASE(AbstractSwAutoFormatDlg_Impl,SwAutoFormatDlg )
virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const;
};
-//add for SwAutoFormatDlg end
-
-//add for SwFldDlg begin
-class AbstractSwFldDlg_Impl : public AbstractSwFldDlg //add for SwFldDlg
+class AbstractSwFldDlg_Impl : public AbstractSwFldDlg
{
DECL_ABSTDLG_BASE(AbstractSwFldDlg_Impl,SwFldDlg )
virtual void SetCurPageId( sal_uInt16 nId );
@@ -240,9 +212,7 @@ class AbstractSwFldDlg_Impl : public AbstractSwFldDlg //add for SwFldDlg
virtual void ActivateDatabasePage();
virtual Window * GetWindow(); //this method is added for return a Window type pointer
};
-//add for SwFldD end
-//add for SwRenameXNamedDlg begin
class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
{
DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg )
@@ -251,16 +221,13 @@ class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird );
};
-//add for SwRenameXNamedDlg end
-//add for SwModalRedlineAcceptDlg begin
+
class AbstractSwModalRedlineAcceptDlg_Impl : public AbstractSwModalRedlineAcceptDlg
{
DECL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl,SwModalRedlineAcceptDlg )
virtual void AcceptAll( sal_Bool bAccept );
};
-//add for SwModalRedlineAcceptDlg end
-//for SwGlossaryDlg begin
class SwGlossaryDlg;
class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg
{
@@ -268,9 +235,7 @@ class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg
virtual String GetCurrGrpName() const;
virtual String GetCurrShortName() const;
};
-//for SwGlossaryDlg end
-//for SwFldInputDlg begin
class SwFldInputDlg;
class AbstractFldInputDlg_Impl : public AbstractFldInputDlg
{
@@ -279,9 +244,7 @@ class AbstractFldInputDlg_Impl : public AbstractFldInputDlg
virtual void SetWindowState( const OString & rStr ) ;
virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const ;
};
-//for SwFldInputDlg end
-//for SwInsFootNoteDlg begin
class SwInsFootNoteDlg;
class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
{
@@ -293,9 +256,7 @@ class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
virtual void SetHelpId( const OString& sHelpId );
virtual void SetText( const OUString& rStr );
};
-//for SwInsFootNoteDlg end
-//for SwInsTableDlg begin
class SwInsTableDlg;
class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
{
@@ -304,9 +265,7 @@ class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName,
SwTableAutoFmt *& prTAFmt );
};
-//for SwInsTableDlg end
-//for SwJavaEditDialog begin
class SwJavaEditDialog;
class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
{
@@ -317,9 +276,7 @@ class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
virtual sal_Bool IsNew();
virtual bool IsUpdate();
};
-//for SwJavaEditDialog end
-//for SwMailMergeDlg begin
class SwMailMergeDlg;
class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
{
@@ -333,25 +290,21 @@ class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
virtual String GetColumnName() const;
virtual String GetPath() const;
};
-//for SwMailMergeDlg end
-//for SwMailMergeCreateFromDlg begin
+
class SwMailMergeCreateFromDlg;
class AbstractMailMergeCreateFromDlg_Impl : public AbstractMailMergeCreateFromDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeCreateFromDlg_Impl,SwMailMergeCreateFromDlg)
virtual sal_Bool IsThisDocument() const ;
};
-//for SwMailMergeCreateFromDlg end
-//for SwMailMergeFieldConnectionsDlg begin
+
class SwMailMergeFieldConnectionsDlg;
class AbstractMailMergeFieldConnectionsDlg_Impl : public AbstractMailMergeFieldConnectionsDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeFieldConnectionsDlg_Impl,SwMailMergeFieldConnectionsDlg)
virtual sal_Bool IsUseExistingConnections() const ;
};
-//for SwMailMergeFieldConnectionsDlg end
-//for SwMultiTOXTabDialog begin
class SwMultiTOXTabDialog;
class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog
{
@@ -362,26 +315,21 @@ class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog
//from SfxTabDialog
virtual const SfxItemSet* GetOutputItemSet() const;
};
-//for SwMultiTOXTabDialog end
-//for SwEditRegionDlg begin
class SwEditRegionDlg;
class AbstractEditRegionDlg_Impl : public AbstractEditRegionDlg
{
DECL_ABSTDLG_BASE(AbstractEditRegionDlg_Impl,SwEditRegionDlg)
virtual void SelectSection(const String& rSectionName);
};
-//for SwEditRegionDlg end
-//for SwInsertSectionTabDialog begin
+
class SwInsertSectionTabDialog;
class AbstractInsertSectionTabDialog_Impl : public AbstractInsertSectionTabDialog
{
DECL_ABSTDLG_BASE(AbstractInsertSectionTabDialog_Impl,SwInsertSectionTabDialog)
virtual void SetSectionData(SwSectionData const& rSect);
};
-//for SwInsertSectionTabDialog end
-//for SwIndexMarkFloatDlg begin
class SwIndexMarkFloatDlg;
class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg
{
@@ -389,9 +337,7 @@ class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg
virtual void ReInitDlg(SwWrtShell& rWrtShell);
virtual Window * GetWindow(); //this method is added for return a Window type pointer
};
-//for SwIndexMarkFloatDlg end
-//for SwAuthMarkFloatDlg begin
class SwAuthMarkFloatDlg;
class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg
{
@@ -399,7 +345,6 @@ class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg
virtual void ReInitDlg(SwWrtShell& rWrtShell);
virtual Window * GetWindow(); //this method is added for return a Window type pointer
};
-//for SwAuthMarkFloatDlg end
class SwMailMergeWizard;
class AbstractMailMergeWizard_Impl : public AbstractMailMergeWizard
@@ -430,7 +375,7 @@ class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory
public:
virtual ~SwAbstractDialogFactory_Impl() {}
- 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
@@ -439,30 +384,29 @@ public:
SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo);
virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent);
virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh,
- SvStream* pStream ); //add for SwAsciiFilterDlg
- virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId );//add for SwInsertBookmarkDlg
- virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh); // add for SwBreakDlg
- virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw); //add for SwChangeDBDlg
+ SvStream* pStream );
+ virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId );
+ virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh);
+ virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw);
virtual SfxAbstractTabDialog * CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
- sal_uInt8 nDialogMode, const OUString* pFmtStr = 0); // add for SwCharDlg
- virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable); //add for SwConvertTableDlg
- virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId); //add for SwCaptionDialog
+ sal_uInt8 nDialogMode, const OUString* pFmtStr = 0);
+ virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable);
+ virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId);
- virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, // add for SwInsertDBColAutoPilot
+ virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView,
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp,
const SwDBData& rData);
- virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh);//add for SwFootNoteOptionDlg
+ virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh);
- //add for DropDownFieldDialog
virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (Window *pParent, SwWrtShell &rSh,
SwField* pField, sal_Bool bNextButton = sal_False);
- virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ); //add for SwEnvDlg
- virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
+ virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert );
+ virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
SwNewDBMgr* pNewDBMgr, bool bLabel);
- virtual SwLabDlgMethod GetSwLabDlgStaticMethod (); //add for SwLabDlg
- virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent, //add for SwParaDlg
+ virtual SwLabDlgMethod GetSwLabDlgStaticMethod ();
+ virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent,
SwView& rVw,
const SfxItemSet& rCoreSet,
sal_uInt8 nDialogMode,
@@ -470,93 +414,92 @@ public:
sal_Bool bDraw = sal_False,
OString sDefPage = OString() );
- virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName); //add for SwSelGlossaryDlg
- virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ); //add for SwTableHeightDlg SwSortDlg
- virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ); //add for SwSplitTblDlg
+ virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName);
+ virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId );
+ virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh );
- virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg
+ virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell,
sal_Bool bSetAutoFmt = sal_True,
const SwTableAutoFmt* pSelFmt = 0 );
- virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ); //add for SwWrapDlg
+ virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId );
virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc);
virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
- const SfxItemSet* pItemSet, SwWrtShell* pSh); //add for SwTableTabDlg
- virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent); //add for SwFldDlg
- virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ); //add for SwFldEditDlg
- virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent, //add for SwRenameXNamedDlg
+ const SfxItemSet* pItemSet, SwWrtShell* pSh);
+ virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent);
+ virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId );
+ virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess);
- virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent); //add for SwModalRedlineAcceptDlg
+ virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent);
- virtual VclAbstractDialog* CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev); //add for SwMergeTblDlg
+ virtual VclAbstractDialog* CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev);
virtual SfxAbstractTabDialog* CreateFrmTabDialog( const OString &rDialogType,
SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
bool bNewFrm = true,
bool bFmt = false,
OString sDefPage = OString(),
- const OUString* pFmtStr = 0); //add for SwFrmDlg
+ const OUString* pFmtStr = 0);
virtual SfxAbstractApplyTabDialog* CreateTemplateDialog(
Window* pParent,
SfxStyleSheetBase& rBase,
sal_uInt16 nRegion,
OString sPage = OString(),
SwWrtShell* pActShell = 0,
- bool bNew = false); //add for SwTemplateDlg
+ bool bNew = false);
virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
- SwWrtShell *pWrtShell); //add for SwGlossaryDlg
+ SwWrtShell *pWrtShell);
virtual AbstractFldInputDlg* CreateFldInputDlg(Window *pParent,
- SwWrtShell &rSh, SwField* pField, bool bNextButton = false); //add for SwFldInputDlg
+ SwWrtShell &rSh, SwField* pField, bool bNextButton = false);
virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(
- Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False); //add for SwInsFootNoteDlg
+ Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False);
virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent );
- virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView); //add for SwInsRowColDlg, SwLineNumberingDlg
- virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView); //add for SwInsTableDlg
+ virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView);
+ virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView);
virtual AbstractJavaEditDialog* CreateJavaEditDialog(Window* pParent,
- SwWrtShell* pWrtSh); //add for SwJavaEditDialog
+ SwWrtShell* pWrtSh);
virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId,
Window* pParent, SwWrtShell& rSh,
const String& rSourceName,
const String& rTblName,
sal_Int32 nCommandType,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ); //add for SwMailMergeDlg
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 );
virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(Window* pParent);
- virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent); //add for SwMailMergeFieldConnectionsDlg
+ virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent);
virtual VclAbstractDialog* CreateMultiTOXMarkDlg( int nResId,
- Window* pParent, SwTOXMgr &rTOXMgr ); //add for SwMultiTOXMarkDlg
+ Window* pParent, SwTOXMgr &rTOXMgr );
virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId,
Window* pParent,
const SfxItemSet* pSwItemSet,
- SwWrtShell &); //add for SwSvxNumBulletTabDialog, SwOutlineTabDialog
+ SwWrtShell &);
virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog(
Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX,
- sal_Bool bGlobal = sal_False); //add for SwMultiTOXTabDialog
- virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh); //add for SwEditRegionDlg
+ sal_Bool bGlobal = sal_False);
+ virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh);
virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog(
- Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); //add for SwInsertSectionTabDialog
+ Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh);
virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg(
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
- sal_Bool bNew=sal_True); //add for SwIndexMarkFloatDlg
+ sal_Bool bNew=sal_True);
virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg(
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
- sal_Bool bNew=sal_True); //add for SwAuthMarkFloatDlg
+ sal_Bool bNew=sal_True);
virtual VclAbstractDialog * CreateIndexMarkModalDlg(
- Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ); //add for SwIndexMarkModalDlg
+ Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark );
virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem);
- //add for static func in SwGlossaryDlg
virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc();
virtual GlossarySetActGroup SetGlossaryActGroupFunc();
generated by cgit (git 2.34.1) at 2025-02-23 02:06:51 +0000