From c70749b0ae94c606f87398b36f7a8a4aa4ae9fb1 Mon Sep 17 00:00:00 2001
From: Christoph Herzog <rho...@googlemail.com>
Date: Mon, 7 Feb 2011 21:20:16 +0100
Subject: [PATCH] Corrected typo in names of four swriter classes
Checked for the misspelled names via ./g grep, built master before and
after the changes and no error occurred. So hopefully it is ok.
patch under LGPLv3+/MPL.
Christoph
>From c70749b0ae94c606f87398b36f7a8a4aa4ae9fb1 Mon Sep 17 00:00:00 2001
From: Christoph Herzog <rho...@googlemail.com>
Date: Mon, 7 Feb 2011 21:20:16 +0100
Subject: [PATCH] Corrected typo in names of four swriter classes
Classes
AbstarctSwLabDlg
AbstarctSwLabDlg_Impl
AbstarctSwSelGlossaryDlg
AbstarctSwSelGlossaryDlg_Impl
were changed to:
AbstractSwLabDlg
AbstractSwLabDlg_Impl
AbstrarctSwSelGlossaryDlg
AbstractSwSelGlossaryDlg_Impl
---
sw/inc/swabstdlg.hxx | 8 ++++----
sw/source/ui/app/applab.cxx | 2 +-
sw/source/ui/dialog/swdlgfact.cxx | 34 +++++++++++++++++-----------------
sw/source/ui/dialog/swdlgfact.hxx | 12 ++++++------
sw/source/ui/dochdl/gloshdl.cxx | 2 +-
5 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 57609db..e864213 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -256,14 +256,14 @@ public:
virtual void SetWindowState( const ByteString& rStr ) =0;//this method inherit from SystemWindow
};
-class AbstarctSwLabDlg : public SfxAbstractTabDialog //add for SwLabDlg
+class AbstractSwLabDlg : public SfxAbstractTabDialog //add for SwLabDlg
{
public:
virtual const String& GetBusinessCardStr() const = 0;
virtual Printer *GetPrt() =0;
};
-class AbstarctSwSelGlossaryDlg : public VclAbstractDialog //add for SwSelGlossaryDlg
+class AbstractSwSelGlossaryDlg : public VclAbstractDialog //add for SwSelGlossaryDlg
{
public:
virtual void InsertGlos(const String &rRegion, const String &rGlosName) = 0; // inline
@@ -372,7 +372,7 @@ public:
virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert,int nResId ) = 0; //add for SwEnvDlg
- virtual AbstarctSwLabDlg* CreateSwLabDlg ( Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
+ virtual AbstractSwLabDlg* CreateSwLabDlg ( Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
SwNewDBMgr* pNewDBMgr, BOOL bLabel,int nResId ) = 0;
virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;//add for SwLabDlg
@@ -386,7 +386,7 @@ public:
BOOL bDraw = FALSE,
UINT16 nDefPage = 0) = 0;
- virtual AbstarctSwSelGlossaryDlg * CreateSwSelGlossaryDlg ( Window * pParent, const String &rShortName, int nResId ) = 0; //add for SwSelGlossaryDlg
+ virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg ( Window * pParent, const String &rShortName, int nResId ) = 0; //add for SwSelGlossaryDlg
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
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index b86ac51..186d93c 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -189,7 +189,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
SwAbstractDialogFactory* pDialogFactory = SwAbstractDialogFactory::Create();
OSL_ENSURE(pDialogFactory, "SwAbstractDialogFactory fail!");
- AbstarctSwLabDlg* pDlg = pDialogFactory->CreateSwLabDlg( 0, aSet, pNewDBMgr, bLabel, DLG_LAB );
+ AbstractSwLabDlg* pDlg = pDialogFactory->CreateSwLabDlg( 0, aSet, pNewDBMgr, bLabel, DLG_LAB );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if ( RET_OK == pDlg->Execute() )
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index c0b05c8..d943911 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -123,8 +123,8 @@ IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for SwCharDlg, SwFootNoteOption
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(AbstarctSwLabDlg_Impl);//add for SwLabDlg
-IMPL_ABSTDLG_BASE(AbstarctSwSelGlossaryDlg_Impl);//add for SwSelGlossaryDlg
+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
@@ -255,57 +255,57 @@ void AbstractDropDownFieldDialog_Impl::SetWindowState( const ByteString& r
pDlg->SetWindowState(rStr);
}
-void AbstarctSwLabDlg_Impl::SetCurPageId( USHORT nId )
+void AbstractSwLabDlg_Impl::SetCurPageId( USHORT nId )
{
pDlg->SetCurPageId( nId );
}
-const SfxItemSet* AbstarctSwLabDlg_Impl::GetOutputItemSet() const
+const SfxItemSet* AbstractSwLabDlg_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
-const USHORT* AbstarctSwLabDlg_Impl::GetInputRanges(const SfxItemPool& pItem )
+const USHORT* AbstractSwLabDlg_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
-void AbstarctSwLabDlg_Impl::SetInputSet( const SfxItemSet* pInSet )
+void AbstractSwLabDlg_Impl::SetInputSet( const SfxItemSet* pInSet )
{
pDlg->SetInputSet( pInSet );
}
-void AbstarctSwLabDlg_Impl::SetText( const XubString& rStr )
+void AbstractSwLabDlg_Impl::SetText( const XubString& rStr )
{
pDlg->SetText( rStr );
}
-String AbstarctSwLabDlg_Impl::GetText() const
+String AbstractSwLabDlg_Impl::GetText() const
{
return pDlg->GetText();
}
-const String& AbstarctSwLabDlg_Impl::GetBusinessCardStr() const
+const String& AbstractSwLabDlg_Impl::GetBusinessCardStr() const
{
return pDlg->GetBusinessCardStr();
}
-Printer * AbstarctSwLabDlg_Impl::GetPrt()
+Printer * AbstractSwLabDlg_Impl::GetPrt()
{
return pDlg->GetPrt();
}
-void AbstarctSwSelGlossaryDlg_Impl::InsertGlos(const String &rRegion, const String &rGlosName)
+void AbstractSwSelGlossaryDlg_Impl::InsertGlos(const String &rRegion, const String &rGlosName)
{
pDlg->InsertGlos( rRegion, rGlosName );
}
-USHORT AbstarctSwSelGlossaryDlg_Impl::GetSelectedIdx() const
+USHORT AbstractSwSelGlossaryDlg_Impl::GetSelectedIdx() const
{
return pDlg->GetSelectedIdx();
}
-void AbstarctSwSelGlossaryDlg_Impl::SelectEntryPos(USHORT nIdx)
+void AbstractSwSelGlossaryDlg_Impl::SelectEntryPos(USHORT nIdx)
{
pDlg->SelectEntryPos( nIdx );
}
@@ -887,7 +887,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pPa
return 0;
}
-AbstarctSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg ( Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
+AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg ( Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
SwNewDBMgr* pNewDBMgr, BOOL bLabel,int nResId )
{
SwLabDlg* pDlg=NULL;
@@ -902,7 +902,7 @@ AbstarctSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg ( Window* pParent
}
if ( pDlg )
- return new AbstarctSwLabDlg_Impl( pDlg );
+ return new AbstractSwLabDlg_Impl( pDlg );
return 0;
}
@@ -968,7 +968,7 @@ AbstractSplitTableDialog * SwAbstractDialogFactory_Impl::CreateSplitTblDialog (
return new AbstractSplitTableDialog_Impl( new SwSplitTblDlg( pParent, rSh) );
}
-AbstarctSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg ( Window * pParent, const String &rShortName, int nResId )
+AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg ( Window * pParent, const String &rShortName, int nResId )
{
SwSelGlossaryDlg* pDlg=NULL;
switch ( nResId )
@@ -982,7 +982,7 @@ AbstarctSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg
}
if ( pDlg )
- return new AbstarctSwSelGlossaryDlg_Impl( pDlg );
+ return new AbstractSwSelGlossaryDlg_Impl( pDlg );
return 0;
}
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 9811b09..29cf162 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -181,9 +181,9 @@ class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog //ad
//add for DropDownFieldDialog end
-class AbstarctSwLabDlg_Impl : public AbstarctSwLabDlg
+class AbstractSwLabDlg_Impl : public AbstractSwLabDlg
{
- DECL_ABSTDLG_BASE(AbstarctSwLabDlg_Impl,SwLabDlg)
+ DECL_ABSTDLG_BASE(AbstractSwLabDlg_Impl,SwLabDlg)
virtual void SetCurPageId( USHORT nId );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
@@ -197,9 +197,9 @@ class AbstarctSwLabDlg_Impl : public AbstarctSwLabDlg
//add for SwLabDlg end
//add for SwSelGlossaryDlg begin
-class AbstarctSwSelGlossaryDlg_Impl : public AbstarctSwSelGlossaryDlg
+class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg
{
- DECL_ABSTDLG_BASE(AbstarctSwSelGlossaryDlg_Impl,SwSelGlossaryDlg)
+ DECL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl,SwSelGlossaryDlg)
virtual void InsertGlos(const String &rRegion, const String &rGlosName); // inline
virtual USHORT GetSelectedIdx() const; // inline
virtual void SelectEntryPos(USHORT nIdx); // inline
@@ -454,7 +454,7 @@ public:
virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog ( Window *pParent, SwWrtShell &rSh, //add for DropDownFieldDialog
SwField* pField,int nResId, BOOL bNextButton = FALSE );
virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert,int nResId ); //add for SwEnvDlg
- virtual AbstarctSwLabDlg* CreateSwLabDlg ( Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
+ virtual AbstractSwLabDlg* CreateSwLabDlg ( Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
SwNewDBMgr* pNewDBMgr, BOOL bLabel,int nResId );
virtual SwLabDlgMethod GetSwLabDlgStaticMethod (); //add for SwLabDlg
@@ -467,7 +467,7 @@ public:
BOOL bDraw = FALSE,
UINT16 nDefPage = 0);
- virtual AbstarctSwSelGlossaryDlg * CreateSwSelGlossaryDlg ( Window * pParent, const String &rShortName, int nResId ); //add for SwSelGlossaryDlg
+ virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg ( Window * pParent, const String &rShortName, int nResId ); //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
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 83b8472..ca39ce1 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -489,7 +489,7 @@ BOOL SwGlossaryHdl::Expand( const String& rShortName,
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- AbstarctSwSelGlossaryDlg* pDlg = pFact->CreateSwSelGlossaryDlg( 0, aShortName, DLG_SEL_GLOS );
+ AbstractSwSelGlossaryDlg* pDlg = pFact->CreateSwSelGlossaryDlg( 0, aShortName, DLG_SEL_GLOS );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
for(USHORT i = 0; i < aFoundArr.Count(); ++i)
{
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
