Skip to content

C
core
Kaydet (Commit) af5a380b authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Remove pointless comments and ASCII art 

Change-Id: I387d7b301643f359f2d6a4c5f51a4dd7f5e1c296
üst 7bd0adc6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 97 deletions
cui/source/factory/dlgfact.cxx
Dosyayı görüntüle @ af5a380b
......@@ -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 )
......
cui/source/factory/dlgfact.hxx
Dosyayı görüntüle @ af5a380b
This diff is collapsed.
include/svx/svxdlg.hxx
Dosyayı görüntüle @ af5a380b
This diff is collapsed.
lotuswordpro/source/filter/lwppara1.cxx
Dosyayı görüntüle @ af5a380b
......@@ -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);
}
......
sc/inc/scabstdlg.hxx
Dosyayı görüntüle @ af5a380b
This diff is collapsed.
sd/inc/sdabstdlg.hxx
Dosyayı görüntüle @ af5a380b
......@@ -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;
......
sd/source/ui/dlg/sddlgfact.cxx
Dosyayı görüntüle @ af5a380b
This diff is collapsed.
sd/source/ui/dlg/sddlgfact.hxx
Dosyayı görüntüle @ af5a380b
......@@ -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();
......
sw/inc/swabstdlg.hxx
Dosyayı görüntüle @ af5a380b
This diff is collapsed.
sw/source/filter/ww8/ww8par.hxx
Dosyayı görüntüle @ af5a380b
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment