This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 35d064a470 Fixed typos (Abstarct -> Abstract), cleanup
35d064a470 is described below
commit 35d064a470d27ff1f4f9911194f55f6f33e19190
Author: mseidel <[email protected]>
AuthorDate: Wed Jul 30 21:04:48 2025 +0200
Fixed typos (Abstarct -> Abstract), cleanup
(cherry picked from commit 31949d5fbc6efdf22c453892eb861d254fb3db87)
---
main/sw/inc/swabstdlg.hxx | 105 ++++++++++++------------
main/sw/source/ui/app/applab.cxx | 10 +--
main/sw/source/ui/dialog/swdlgfact.cxx | 146 ++++++++++++++++-----------------
main/sw/source/ui/dialog/swdlgfact.hxx | 137 ++++++++++++++++---------------
main/sw/source/ui/dochdl/gloshdl.cxx | 122 ++++++++++++++-------------
5 files changed, 260 insertions(+), 260 deletions(-)
diff --git a/main/sw/inc/swabstdlg.hxx b/main/sw/inc/swabstdlg.hxx
index 396e74a77e..2b95b13595 100644
--- a/main/sw/inc/swabstdlg.hxx
+++ b/main/sw/inc/swabstdlg.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _SW_ABSTDLG_HXX
#define _SW_ABSTDLG_HXX
@@ -83,9 +82,9 @@ struct SwDocStat;
#include <cnttab.hxx> //add for struct CurTOXType
namespace com{namespace sun{namespace star{
- namespace frame{
- class XFrame;
- }
+ namespace frame{
+ class XFrame;
+ }
namespace sdbcx{
class XColumnsSupplier;
}
@@ -119,9 +118,9 @@ public:
class AbstractInsFootNoteDlg : public VclAbstractDialog //add for
SwInsFootNoteDlg
{
public:
- virtual String GetFontName() = 0;
- virtual sal_Bool IsEndNote() = 0;
- virtual String GetStr() = 0;
+ virtual String GetFontName() = 0;
+ virtual sal_Bool IsEndNote() = 0;
+ virtual String GetStr() = 0;
//from class Window
virtual void SetHelpId( const rtl::OString& sHelpId ) = 0;
virtual void SetText( const XubString& rStr ) = 0;
@@ -146,35 +145,35 @@ public:
class AbstractJavaEditDialog : public VclAbstractDialog //add for
SwJavaEditDialog
{
public:
- virtual String GetText() = 0;
- virtual String GetType() = 0;
- virtual sal_Bool IsUrl() = 0;
- virtual sal_Bool IsNew() = 0;
- virtual sal_Bool IsUpdate() = 0;
+ virtual String GetText() = 0;
+ virtual String GetType() = 0;
+ virtual sal_Bool IsUrl() = 0;
+ virtual sal_Bool IsNew() = 0;
+ virtual sal_Bool IsUpdate() = 0;
};
class AbstractMailMergeDlg : public VclAbstractDialog //add for SwMailMergeDlg
{
public:
virtual sal_uInt16 GetMergeType() = 0;
- virtual const ::rtl::OUString& GetSaveFilter() const = 0;
+ virtual const ::rtl::OUString& GetSaveFilter() const = 0;
virtual const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any > GetSelection() const = 0;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet> GetResultSet() const = 0;
- virtual bool IsSaveIndividualDocs() const = 0;
- virtual bool IsGenerateFromDataBase() const = 0;
- virtual String GetColumnName() const = 0;
- virtual String GetPath() const = 0;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet> GetResultSet() const = 0;
+ virtual bool IsSaveIndividualDocs() const = 0;
+ virtual bool IsGenerateFromDataBase() const = 0;
+ virtual String GetColumnName() const = 0;
+ virtual String GetPath() const = 0;
};
class AbstractMailMergeCreateFromDlg : public VclAbstractDialog //add for
SwMailMergeCreateFromDlg
{
public:
- virtual sal_Bool IsThisDocument() const = 0;
+ virtual sal_Bool IsThisDocument() const = 0;
};
class AbstractMailMergeFieldConnectionsDlg : public VclAbstractDialog //add
for SwMailMergeFieldConnectionsDlg
{
public:
- virtual sal_Bool IsUseExistingConnections() const = 0;
+ virtual sal_Bool IsUseExistingConnections() const = 0;
};
class AbstractMultiTOXTabDialog : public VclAbstractDialog //add for
SwMultiTOXTabDialog
@@ -190,18 +189,18 @@ public:
class AbstractEditRegionDlg : public VclAbstractDialog //add for
SwEditRegionDlg
{
public:
- virtual void SelectSection(const String& rSectionName) = 0;
+ virtual void SelectSection(const String& rSectionName) = 0;
};
class AbstractInsertSectionTabDialog : public VclAbstractDialog //add for
SwInsertSectionTabDialog
{
public:
- virtual void SetSectionData(SwSectionData const& rSect) = 0;
+ virtual void SetSectionData(SwSectionData const& rSect) = 0;
};
class AbstractSwWordCountDialog : public VclAbstractDialog
{
public:
- virtual void SetValues(const SwDocStat& rCurrent, const SwDocStat&
rDoc) = 0;
+ virtual void SetValues(const SwDocStat& rCurrent, const SwDocStat&
rDoc) = 0;
};
class AbstractSwInsertAbstractDlg : public VclAbstractDialog // add for
SwInsertAbstractDlg
@@ -222,15 +221,15 @@ class AbstractSwBreakDlg : public VclAbstractDialog //
add for SwBreakDlg
{
public:
virtual String GetTemplateName() = 0;
- virtual sal_uInt16 GetKind() = 0;
- virtual sal_uInt16 GetPageNumber() = 0;
+ virtual sal_uInt16 GetKind() = 0;
+ virtual sal_uInt16 GetPageNumber() = 0;
};
class AbstractSplitTableDialog : public VclAbstractDialog // add for
{
public:
- virtual sal_uInt16 GetSplitMode() = 0;
+ virtual sal_uInt16 GetSplitMode() = 0;
};
class AbstractSwConvertTableDlg : public VclAbstractDialog // add for
SwConvertTableDlg
@@ -258,14 +257,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
@@ -277,8 +276,8 @@ class AbstractSwSplitTableDlg :public VclAbstractDialog
//add for SwSplitTableDl
{
public:
virtual sal_Bool IsHorizontal() const = 0;
- virtual sal_Bool IsProportional() const = 0;
- virtual long GetCount() const = 0;
+ virtual sal_Bool IsProportional() const = 0;
+ virtual long GetCount() const = 0;
};
class AbstractSwAutoFormatDlg : public VclAbstractDialog //add for
SwAutoFormatDlg
@@ -313,10 +312,10 @@ public:
virtual void AcceptAll( sal_Bool bAccept ) = 0;
};
-class AbstractMarkFloatDlg : public VclAbstractDialog //add for
SwIndexMarkFloatDlg & SwAuthMarkFloatDlg
+class AbstractMarkFloatDlg : public VclAbstractDialog //add for
SwIndexMarkFloatDlg & SwAuthMarkFloatDlg
{
public:
- virtual void ReInitDlg(SwWrtShell& rWrtShell) = 0;
+ virtual void ReInitDlg(SwWrtShell& rWrtShell) = 0;
virtual Window * GetWindow() = 0; //this method is added for
return a Window type pointer
};
@@ -332,10 +331,10 @@ class SwMailMergeConfigItem;
class AbstractMailMergeWizard : public VclAbstractDialog2
{
public:
- virtual void SetReloadDocument(const String& rURL) = 0;
- virtual const String& GetReloadDocument() const = 0;
- virtual sal_Bool ShowPage( sal_uInt16 nLevel ) = 0;
- virtual sal_uInt16 GetRestartPage() const = 0;
+ virtual void SetReloadDocument(const String& rURL) = 0;
+ virtual const String& GetReloadDocument() const = 0;
+ virtual sal_Bool ShowPage( sal_uInt16 nLevel ) = 0;
+ virtual sal_uInt16 GetRestartPage() const = 0;
};
@@ -350,11 +349,11 @@ public:
const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
sal_uInt32
nResId
) = 0;
- virtual AbstractSwWordCountDialog* CreateSwWordCountDialog( Window*
pWindow ) = 0;
- virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg ( Window*
pParent, int nResId) = 0; // add for SwInsertAbstractDlg
+ virtual AbstractSwWordCountDialog* CreateSwWordCountDialog( Window*
pWindow ) = 0;
+ virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg (
Window* pParent, int nResId) = 0; // add for SwInsertAbstractDlg
virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window*
pParent, SwDocShell& rDocSh,
SvStream*
pStream, int nResId ) = 0;// add for SwAsciiFilterDlg
- virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent,
SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0;// add for
SwInsertBookmarkDlg
+ virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent,
SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0;// add for
SwInsertBookmarkDlg
virtual AbstractSwBreakDlg * CreateSwBreakDlg( Window *pParent,
SwWrtShell &rSh,int nResId ) = 0; // add for SwBreakDlg
virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int
nResId ) = 0; //add for SwChangeDBDlg
@@ -374,7 +373,7 @@ public:
virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const
SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_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, sal_Bool bLabel,int nResId ) =
0;
virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;//add for SwLabDlg
@@ -388,10 +387,10 @@ public:
sal_Bool bDraw = sal_False,
sal_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
+ 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 AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window*
pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg
int nResId,
@@ -411,8 +410,8 @@ public:
STAR_REFERENCE(
container::XNameAccess ) & xNameAccess, int nResId ) = 0;
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg
( Window *pParent, int nResId ) = 0; //add for SwModalRedlineAcceptDlg
- virtual VclAbstractDialog* CreateSwVclDialog( int nResId, Window*
pParent, sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg
- virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId,
+ virtual VclAbstractDialog* CreateSwVclDialog( int nResId,
Window* pParent, sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg
+ virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId,
SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
sal_Bool bNewFrm = sal_True,
@@ -420,17 +419,17 @@ public:
sal_Bool bFmt = sal_False,
sal_uInt16 nDefPage = 0,
const String* pFmtStr = 0) = 0; //add for SwFrmDlg
- // @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
- virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
+ // @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
+ virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
Window* pParent,
SfxStyleSheetBase& rBase,
sal_uInt16
nRegion,
const sal_uInt16 nSlot = 0,
SwWrtShell*
pActShell = 0,
sal_Bool
bNew = sal_False ) = 0; //add for SwTemplateDlg
- virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
+ virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell) = 0; //add for SwGlossaryDlg
@@ -488,9 +487,9 @@ public:
virtual VclAbstractDialog *
CreateIndexMarkModalDlg( int nResId,
Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) = 0;
//add for SwIndexMarkModalDlg
- virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView,
SwMailMergeConfigItem& rConfigItem) = 0;
+ virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView&
rView, SwMailMergeConfigItem& rConfigItem) = 0;
- //add for static func in SwGlossaryDlg
+ //add for static func in SwGlossaryDlg
virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc(
sal_uInt16 nId ) = 0;
virtual GlossarySetActGroup
SetGlossaryActGroupFunc( sal_uInt16 nId ) = 0;
@@ -500,3 +499,5 @@ public:
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/app/applab.cxx b/main/sw/source/ui/app/applab.cxx
index 415d56d593..2e951f19c4 100644
--- a/main/sw/source/ui/app/applab.cxx
+++ b/main/sw/source/ui/app/applab.cxx
@@ -157,7 +157,7 @@ const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const
SwLabItem& rItem,
{
aSet.Put( SvxLRSpaceItem( 0, 0, 0, 0, RES_LR_SPACE ) );
}
- const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Fly
einfuegen
+ const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Fly
einfügen
ASSERT( pFmt, "Fly not inserted" );
rSh.UnSelectFrm(); //Rahmen wurde automatisch selektiert
@@ -196,7 +196,7 @@ static sal_uInt16 nBCTitleNo = 0;
SwAbstractDialogFactory* pDialogFactory =
SwAbstractDialogFactory::Create();
DBG_ASSERT(pDialogFactory, "SwAbstractDialogFactory fail!");
- AbstarctSwLabDlg* pDlg = pDialogFactory->CreateSwLabDlg( 0, aSet,
pNewDBMgr, bLabel, DLG_LAB );
+ AbstractSwLabDlg* pDlg = pDialogFactory->CreateSwLabDlg( 0, aSet,
pNewDBMgr, bLabel, DLG_LAB );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
if ( RET_OK == pDlg->Execute() )
@@ -277,9 +277,9 @@ static sal_uInt16 nBCTitleNo = 0;
aDesc.SetUseOn(nsUseOnPage::PD_ALL); //
Seitennumerierung
- // Einstellen der Seitengroesse
+ // Einstellen der Seitengröße
rFmt.SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE,
-
rItem.lPaperWidth == 0 ? rItem.lLeft + rItem.nCols * rItem.lHDist + MINLAY :
rItem.lPaperWidth,
+
rItem.lPaperWidth == 0 ? rItem.lLeft + rItem.nCols * rItem.lHDist + MINLAY :
rItem.lPaperWidth,
rItem.bCont || rItem.lPaperHeight == 0 ? rItem.lUpper + rItem.nRows *
rItem.lVDist + MINLAY : rItem.lPaperHeight));
// Numerierungsart
@@ -303,7 +303,7 @@ static sal_uInt16 nBCTitleNo = 0;
pSh->ChgPageDesc( 0, aDesc );
- // Rahmen einfuegen
+ // Rahmen einfügen
SwFldMgr* pFldMgr = new SwFldMgr;
pFldMgr->SetEvalExpFlds(sal_False);
diff --git a/main/sw/source/ui/dialog/swdlgfact.cxx
b/main/sw/source/ui/dialog/swdlgfact.cxx
index b08b362f43..e1bae1645e 100644
--- a/main/sw/source/ui/dialog/swdlgfact.cxx
+++ b/main/sw/source/ui/dialog/swdlgfact.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
@@ -69,7 +67,7 @@
#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 "splittbl.hxx" //add for SwSplitTblDlg
#include "srtdlg.hxx" //add for SwSortDlg
#include "tautofmt.hxx" //add for SwAutoFormatDlg
#include "tblnumfm.hxx" //add for SwNumFmtDlg
@@ -120,8 +118,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
@@ -175,7 +173,7 @@ String AbstractTabDialog_Impl::GetText() const
void AbstractSwWordCountDialog_Impl::SetValues(const SwDocStat& rCurrent,
const SwDocStat& rDoc)
{
- pDlg->SetValues(rCurrent, rDoc);
+ pDlg->SetValues(rCurrent, rDoc);
}
//add for SwInsertAbstractDlg begin
@@ -216,7 +214,7 @@ void AbstractSwAsciiFilterDlg_Impl::FillOptions(
SwAsciiOptions& rOptions )
//add for SwSplitTblDlg
sal_uInt16 AbstractSplitTableDialog_Impl::GetSplitMode()
{
- return pDlg->GetSplitMode();
+ return pDlg->GetSplitMode();
}
//add for SwBreakDlg begin
String AbstractSwBreakDlg_Impl::GetTemplateName()
@@ -266,39 +264,39 @@ void
AbstractDropDownFieldDialog_Impl::SetWindowState( const ByteString& r
//add for SwLabDlg begin
-void AbstarctSwLabDlg_Impl::SetCurPageId( sal_uInt16 nId )
+void AbstractSwLabDlg_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
-const SfxItemSet* AbstarctSwLabDlg_Impl::GetOutputItemSet() const
+const SfxItemSet* AbstractSwLabDlg_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
-const sal_uInt16* AbstarctSwLabDlg_Impl::GetInputRanges(const SfxItemPool&
pItem )
+const sal_uInt16* 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();
}
@@ -307,15 +305,15 @@ Printer * AbstarctSwLabDlg_Impl::GetPrt()
//add for SwSelGlossaryDlg begin
-void AbstarctSwSelGlossaryDlg_Impl::InsertGlos(const String &rRegion, const
String &rGlosName)
+void AbstractSwSelGlossaryDlg_Impl::InsertGlos(const String &rRegion, const
String &rGlosName)
{
pDlg->InsertGlos( rRegion, rGlosName );
}
-sal_uInt16 AbstarctSwSelGlossaryDlg_Impl::GetSelectedIdx() const
+sal_uInt16 AbstractSwSelGlossaryDlg_Impl::GetSelectedIdx() const
{
return pDlg->GetSelectedIdx();
}
-void AbstarctSwSelGlossaryDlg_Impl::SelectEntryPos(sal_uInt16 nIdx)
+void AbstractSwSelGlossaryDlg_Impl::SelectEntryPos(sal_uInt16 nIdx)
{
pDlg->SelectEntryPos( nIdx );
}
@@ -511,7 +509,7 @@ sal_uInt16 AbstractMailMergeDlg_Impl::GetMergeType()
}
const ::rtl::OUString& AbstractMailMergeDlg_Impl::GetSaveFilter() const
{
- return pDlg->GetSaveFilter();
+ return pDlg->GetSaveFilter();
}
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
AbstractMailMergeDlg_Impl::GetSelection() const
@@ -524,19 +522,19 @@ uno::Reference< sdbc::XResultSet>
AbstractMailMergeDlg_Impl::GetResultSet() cons
}
bool AbstractMailMergeDlg_Impl::IsSaveIndividualDocs() const
{
- return pDlg->IsSaveIndividualDocs();
+ return pDlg->IsSaveIndividualDocs();
}
bool AbstractMailMergeDlg_Impl::IsGenerateFromDataBase() const
{
- return pDlg->IsGenerateFromDataBase();
+ return pDlg->IsGenerateFromDataBase();
}
String AbstractMailMergeDlg_Impl::GetColumnName() const
{
- return pDlg->GetColumnName();
+ return pDlg->GetColumnName();
}
String AbstractMailMergeDlg_Impl::GetPath() const
{
- return pDlg->GetPath();
+ return pDlg->GetPath();
}
// AbstractMailMergeDlg_Impl end
@@ -582,7 +580,7 @@ void AbstractEditRegionDlg_Impl::SelectSection(const
String& rSectionName)
void
AbstractInsertSectionTabDialog_Impl::SetSectionData(SwSectionData const& rSect)
{
- pDlg->SetSectionData(rSect);
+ pDlg->SetSectionData(rSect);
}
// AbstractInsertSectionTabDialog_Impl end
@@ -610,19 +608,19 @@ Window* AbstractAuthMarkFloatDlg_Impl::GetWindow()
AbstractMailMergeWizard_Impl::~AbstractMailMergeWizard_Impl()
{
- delete pDlg;
+ delete pDlg;
}
void AbstractMailMergeWizard_Impl::StartExecuteModal( const Link&
rEndDialogHdl )
{
- aEndDlgHdl = rEndDialogHdl;
- pDlg->StartExecuteModal(
- LINK( this, AbstractMailMergeWizard_Impl, EndDialogHdl ) );
+ aEndDlgHdl = rEndDialogHdl;
+ pDlg->StartExecuteModal(
+ LINK( this, AbstractMailMergeWizard_Impl, EndDialogHdl ) );
}
long AbstractMailMergeWizard_Impl::GetResult()
{
- return pDlg->GetResult();
+ return pDlg->GetResult();
}
#ifdef DBG_UTIL
@@ -631,37 +629,37 @@ IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl,
SwMailMergeWizard*, pDial
IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*,
EMPTYARG )
#endif
{
- DBG_ASSERT( pDialog == pDlg, "wrong dialog passed to EndDialogHdl!" );
+ DBG_ASSERT( pDialog == pDlg, "wrong dialog passed to EndDialogHdl!" );
- aEndDlgHdl.Call( this );
- aEndDlgHdl = Link();
+ aEndDlgHdl.Call( this );
+ aEndDlgHdl = Link();
- return 0L;
+ return 0L;
}
void AbstractMailMergeWizard_Impl::SetReloadDocument(const String& rURL)
{
- pDlg->SetReloadDocument(rURL);
+ pDlg->SetReloadDocument(rURL);
}
const String& AbstractMailMergeWizard_Impl::GetReloadDocument() const
{
- return pDlg->GetReloadDocument();
+ return pDlg->GetReloadDocument();
}
sal_Bool AbstractMailMergeWizard_Impl::ShowPage( sal_uInt16 nLevel )
{
- return pDlg->skipUntil(nLevel);
+ return pDlg->skipUntil(nLevel);
}
sal_uInt16 AbstractMailMergeWizard_Impl::GetRestartPage() const
{
- return pDlg->GetRestartPage();
+ return pDlg->GetRestartPage();
}
//-------------- SwAbstractDialogFactory implementation--------------
AbstractSwWordCountDialog*
SwAbstractDialogFactory_Impl::CreateSwWordCountDialog(Window* pParent)
{
- SwWordCountDialog* pDlg = new SwWordCountDialog( pParent );
- return new AbstractSwWordCountDialog_Impl( pDlg );
+ SwWordCountDialog* pDlg = new SwWordCountDialog( pParent );
+ return new AbstractSwWordCountDialog_Impl( pDlg );
}
//add for SwInsertAbstractDlg begin
@@ -740,8 +738,8 @@ AbstractSwAsciiFilterDlg*
SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg(
// add for SwInsertBookmarkDlg begin
VclAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg(
Window *pParent,
-
SwWrtShell
&rSh,
-
SfxRequest&
rReq,
+
SwWrtShell
&rSh,
+
SfxRequest&
rReq,
int nResId )
{
Dialog* pDlg=NULL;
@@ -829,7 +827,7 @@ SfxAbstractTabDialog *
SwAbstractDialogFactory_Impl::CreateSwCharDlg(Window* pP
// add for SwCharDlg end
//add for SwConvertTableDlg begin
-AbstractSwConvertTableDlg*
SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg (
+AbstractSwConvertTableDlg*
SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg (
SwView& rView,int nResId, bool bToTable )
{
SwConvertTableDlg* pDlg=NULL;
@@ -872,8 +870,8 @@ VclAbstractDialog *
SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( Window
//add for SwInsertDBColAutoPilot begin
AbstractSwInsertDBColAutoPilot*
SwAbstractDialogFactory_Impl::CreateSwInsertDBColAutoPilot( SwView& rView, //
add for SwInsertDBColAutoPilot
- uno::Reference< sdbc::XDataSource> rxSource,
- uno::Reference<sdbcx::XColumnsSupplier> xColSupp,
+ uno::Reference< sdbc::XDataSource> rxSource,
+ uno::Reference<sdbcx::XColumnsSupplier> xColSupp,
const SwDBData& rData, int nResId)
{
SwInsertDBColAutoPilot* pDlg=NULL;
@@ -937,7 +935,7 @@ AbstractDropDownFieldDialog *
SwAbstractDialogFactory_Impl::CreateDropDownField
//add for SwEnvDlg begin
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window*
pParent, const SfxItemSet& rSet,
-
SwWrtShell* pWrtSh, Printer*
pPrt,
+
SwWrtShell* pWrtSh, Printer*
pPrt,
sal_Bool bInsert,int nResId )
//add for SwEnvDlg
{
SfxTabDialog* pDlg=NULL;
@@ -959,7 +957,7 @@ SfxAbstractTabDialog*
SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pPa
//add for SwLabDlg begin
-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, sal_Bool bLabel,int nResId )
{
SwLabDlg* pDlg=NULL;
@@ -974,7 +972,7 @@ AbstarctSwLabDlg*
SwAbstractDialogFactory_Impl::CreateSwLabDlg ( Window* pParent
}
if ( pDlg )
- return new AbstarctSwLabDlg_Impl( pDlg );
+ return new AbstractSwLabDlg_Impl( pDlg );
return 0;
}
@@ -1042,12 +1040,12 @@ VclAbstractDialog *
SwAbstractDialogFactory_Impl::CreateVclAbstractDialog ( Wind
//add for SwSplitTblDlg begin
AbstractSplitTableDialog * SwAbstractDialogFactory_Impl::CreateSplitTblDialog
( Window *pParent, SwWrtShell &rSh )
{
- return new AbstractSplitTableDialog_Impl( new SwSplitTblDlg( pParent, rSh)
);
+ return new AbstractSplitTableDialog_Impl( new SwSplitTblDlg( pParent,
rSh) );
}
//add SwSplitTblDlg end
//add for SwSelGlossaryDlg begin
-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 )
@@ -1061,14 +1059,14 @@ AbstarctSwSelGlossaryDlg *
SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg
}
if ( pDlg )
- return new AbstarctSwSelGlossaryDlg_Impl( pDlg );
+ return new AbstractSwSelGlossaryDlg_Impl( pDlg );
return 0;
}
//add for SwSelGlossaryDlg end
//add for SwAutoFormatDlg begin
-AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg(
Window* pParent, SwWrtShell* pShell,
+AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg(
Window* pParent, SwWrtShell* pShell,
int nResId,
sal_Bool bSetAutoFmt,
const SwTableAutoFmt* pSelFmt )
@@ -1110,7 +1108,7 @@ SfxAbstractDialog *
SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pPa
//add for SwBorderDlg end
//add for SwWrapDlg begin
-SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window*
pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId )
+SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window*
pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId )
{
SfxModalDialog* pDlg=NULL;
switch ( nResId )
@@ -1150,7 +1148,7 @@ VclAbstractDialog *
SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg ( Window
//add for SwTableTabDlg begin
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(
Window* pParent, SfxItemPool& Pool,
-
const SfxItemSet* pItemSet, SwWrtShell* pSh,int
nResId )
+
const SfxItemSet* pItemSet, SwWrtShell* pSh,int
nResId )
{
SfxTabDialog* pDlg=NULL;
switch ( nResId )
@@ -1249,7 +1247,7 @@ AbstractSwModalRedlineAcceptDlg *
SwAbstractDialogFactory_Impl::CreateSwModalRed
}
//add for SwModalRedlineAcceptDlg end
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int
nResId,
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int
nResId,
Window* pParent, sal_Bool& rWithPrev ) //add for SwMergeTblDlg
{
Dialog* pDlg=NULL;
@@ -1315,8 +1313,8 @@ SfxAbstractTabDialog*
SwAbstractDialogFactory_Impl::CreateTemplateDialog( int nR
}
AbstractGlossaryDlg* SwAbstractDialogFactory_Impl::CreateGlossaryDlg( int
nResId,
-
SfxViewFrame* pViewFrame,
-
SwGlossaryHdl* pGlosHdl,
+
SfxViewFrame* pViewFrame,
+
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell) //add for SwGlossaryDlg
{
SwGlossaryDlg* pDlg=NULL;
@@ -1368,7 +1366,7 @@ AbstractInsFootNoteDlg*
SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg( int
return 0;
}
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int
nResId,
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int
nResId,
SwView& rView, sal_Bool /*bCol*/ ) //add for SwInsRowColDlg,
SwLineNumberingDlg
{
Dialog* pDlg=NULL;
@@ -1386,7 +1384,7 @@ VclAbstractDialog *
SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nRe
return 0;
}
-AbstractInsertGrfRulerDlg *
SwAbstractDialogFactory_Impl::CreateInsertGrfRulerDlg( int nResId,
+AbstractInsertGrfRulerDlg *
SwAbstractDialogFactory_Impl::CreateInsertGrfRulerDlg( int nResId,
Window * pParent ) //add for SwInsertGrfRulerDlg
{
SwInsertGrfRulerDlg* pDlg=NULL;
@@ -1492,7 +1490,7 @@ AbstractMailMergeFieldConnectionsDlg *
SwAbstractDialogFactory_Impl::CreateMailM
return 0;
}
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg( int
nResId,
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg( int
nResId,
Window* pParent, SwTOXMgr &rTOXMgr ) //add for SwMultiTOXMarkDlg
{
Dialog* pDlg=NULL;
@@ -1530,7 +1528,7 @@ SfxAbstractTabDialog*
SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResI
return new AbstractTabDialog_Impl( pDlg );
return 0;
}
-AbstractMultiTOXTabDialog *
SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog( int nResId,
+AbstractMultiTOXTabDialog *
SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog( int nResId,
Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
SwTOXBase* pCurTOX, sal_uInt16 nToxType,
@@ -1549,7 +1547,7 @@ AbstractMultiTOXTabDialog *
SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialo
return new AbstractMultiTOXTabDialog_Impl( pDlg );
return 0;
}
-AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int
nResId,
+AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int
nResId,
Window* pParent, SwWrtShell& rWrtSh ) //add for SwEditRegionDlg
{
SwEditRegionDlg* pDlg=NULL;
@@ -1565,7 +1563,7 @@ AbstractEditRegionDlg *
SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int n
return new AbstractEditRegionDlg_Impl( pDlg );
return 0;
}
-AbstractInsertSectionTabDialog *
SwAbstractDialogFactory_Impl::CreateInsertSectionTabDialog( int nResId,
+AbstractInsertSectionTabDialog *
SwAbstractDialogFactory_Impl::CreateInsertSectionTabDialog( int nResId,
Window* pParent, const SfxItemSet& rSet, SwWrtShell&
rSh) //add for SwInsertSectionTabDialog
{
SwInsertSectionTabDialog* pDlg=NULL;
@@ -1582,7 +1580,7 @@ AbstractInsertSectionTabDialog *
SwAbstractDialogFactory_Impl::CreateInsertSecti
return 0;
}
-AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg(
int nResId,
+AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg(
int nResId,
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
@@ -1604,7 +1602,7 @@ AbstractMarkFloatDlg *
SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg( in
return 0;
}
-AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg(
int nResId,
+AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg(
int nResId,
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
@@ -1626,7 +1624,7 @@ AbstractMarkFloatDlg *
SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg( int
}
//add for SwIndexMarkModalDlg begin
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg( int
nResId,
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg( int
nResId,
Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark )
//add for SwIndexMarkModalDlg
{
Dialog* pDlg=NULL;
@@ -1649,7 +1647,7 @@ VclAbstractDialog *
SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg( int n
AbstractMailMergeWizard*
SwAbstractDialogFactory_Impl::CreateMailMergeWizard(
SwView& rView, SwMailMergeConfigItem&
rConfigItem)
{
- return new AbstractMailMergeWizard_Impl( new SwMailMergeWizard(rView,
rConfigItem));
+ return new AbstractMailMergeWizard_Impl( new SwMailMergeWizard(rView,
rConfigItem));
}
//add for static func in SwGlossaryDlg
@@ -1679,8 +1677,8 @@ GlossarySetActGroup
SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc( sal_u
//------------------ Factories for TabPages
CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16
nId )
{
- CreateTabPage pRet = 0;
- switch ( nId )
+ CreateTabPage pRet = 0;
+ switch ( nId )
{
case TP_OPTCOMPATIBILITY_PAGE :
case RID_SW_TP_OPTCOMPATIBILITY_PAGE :
@@ -1737,7 +1735,7 @@ CreateTabPage
SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
break;
}
- return pRet;
+ return pRet;
}
GetTabPageRanges SwAbstractDialogFactory_Impl::GetTabPageRangesFunc(
sal_uInt16 nId )
@@ -1753,3 +1751,5 @@ GetTabPageRanges
SwAbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16
return 0;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/dialog/swdlgfact.hxx
b/main/sw/source/ui/dialog/swdlgfact.hxx
index 534f7d5104..a8cdf8848f 100644
--- a/main/sw/source/ui/dialog/swdlgfact.hxx
+++ b/main/sw/source/ui/dialog/swdlgfact.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _SW_DLGFACT_HXX
#define _SW_DLGFACT_HXX
@@ -75,8 +74,8 @@ short Class::Execute() \
class AbstractSwWordCountDialog_Impl : public AbstractSwWordCountDialog
{
- DECL_ABSTDLG_BASE(AbstractSwWordCountDialog_Impl,SwWordCountDialog)
- void SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc);
+ DECL_ABSTDLG_BASE(AbstractSwWordCountDialog_Impl,SwWordCountDialog)
+ void SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc);
};
//add for SwInsertAbstractDlg begin
@@ -95,8 +94,8 @@ class AbstractSfxDialog_Impl :public SfxAbstractDialog
{
DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog)
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual void SetText( const XubString& rStr );
- virtual String GetText() const;
+ virtual void SetText( const XubString& rStr );
+ virtual String GetText() const;
};
// add for SwAddrDlg,SwDropCapsDlg , SwBackgroundDlg SwNumFmtDlg SwWrapDlg
SwBorderDlg, SwFldEditDlg end
@@ -121,14 +120,14 @@ class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg
// add for SwBreakDlg
{
DECL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl,SwBreakDlg)
virtual String GetTemplateName();
- virtual sal_uInt16 GetKind();
- virtual sal_uInt16 GetPageNumber();
+ virtual sal_uInt16 GetKind();
+ virtual sal_uInt16 GetPageNumber();
};
class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add
for
{
- DECL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl, SwSplitTblDlg)
- virtual sal_uInt16 GetSplitMode();
+ DECL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl, SwSplitTblDlg)
+ virtual sal_uInt16 GetSplitMode();
};
// add for SwBreakDlg end
@@ -139,11 +138,11 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
virtual void SetCurPageId( sal_uInt16 nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
- virtual void SetInputSet( const SfxItemSet* pInSet );
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool&
pItem );
+ virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
- virtual void SetText( const XubString& rStr );
- virtual String GetText() const;
+ virtual void SetText( const XubString& rStr );
+ virtual String GetText() const;
};
//add for SwCharDlg, SwEnvDlg ,SwFootNoteOptionDlg SwParaDlg SwTableTabDlg end
@@ -177,25 +176,25 @@ 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( sal_uInt16 nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
- virtual void SetInputSet( const SfxItemSet* pInSet );
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool&
pItem );
+ virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
- virtual void SetText( const XubString& rStr );
- virtual String GetText() const;
+ virtual void SetText( const XubString& rStr );
+ virtual String GetText() const;
virtual const String& GetBusinessCardStr() const;
virtual Printer *GetPrt();
};
//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 sal_uInt16 GetSelectedIdx() const; // inline
virtual void SelectEntryPos(sal_uInt16 nIdx); // inline
@@ -217,11 +216,11 @@ class AbstractSwFldDlg_Impl : public AbstractSwFldDlg
//add for SwFldDlg
DECL_ABSTDLG_BASE(AbstractSwFldDlg_Impl,SwFldDlg )
virtual void SetCurPageId( sal_uInt16 nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
- virtual void SetInputSet( const SfxItemSet* pInSet );
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool&
pItem );
+ virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
- virtual void SetText( const XubString& rStr );
- virtual String GetText() const;
+ virtual void SetText( const XubString& rStr );
+ virtual String GetText() const;
virtual void Start( sal_Bool bShow =
sal_True ); //this method from SfxTabDialog
virtual void ShowPage( sal_uInt16 nId );//
this method from SfxTabDialog
virtual void Initialize(SfxChildWinInfo
*pInfo);
@@ -275,9 +274,9 @@ class SwInsFootNoteDlg;
class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
{
DECL_ABSTDLG_BASE(AbstractInsFootNoteDlg_Impl,SwInsFootNoteDlg)
- virtual String GetFontName();
- virtual sal_Bool IsEndNote();
- virtual String GetStr();
+ virtual String GetFontName();
+ virtual sal_Bool IsEndNote();
+ virtual String GetStr();
//from class Window
virtual void SetHelpId( const rtl::OString& sHelpId );
virtual void SetText( const XubString& rStr );
@@ -311,11 +310,11 @@ class SwJavaEditDialog;
class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
{
DECL_ABSTDLG_BASE(AbstractJavaEditDialog_Impl,SwJavaEditDialog)
- virtual String GetText();
- virtual String GetType();
- virtual sal_Bool IsUrl();
- virtual sal_Bool IsNew();
- virtual sal_Bool IsUpdate();
+ virtual String GetText();
+ virtual String GetType();
+ virtual sal_Bool IsUrl();
+ virtual sal_Bool IsNew();
+ virtual sal_Bool IsUpdate();
};
//for SwJavaEditDialog end
@@ -325,13 +324,13 @@ class AbstractMailMergeDlg_Impl : public
AbstractMailMergeDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl,SwMailMergeDlg)
virtual sal_uInt16 GetMergeType() ;
- virtual const ::rtl::OUString& GetSaveFilter() const;
+ virtual const ::rtl::OUString& GetSaveFilter() const;
virtual const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any > GetSelection() const ;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet> GetResultSet() const;
- virtual bool IsSaveIndividualDocs() const;
- virtual bool IsGenerateFromDataBase() const;
- virtual String GetColumnName() const;
- virtual String GetPath() const;
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet> GetResultSet() const;
+ virtual bool IsSaveIndividualDocs() const;
+ virtual bool IsGenerateFromDataBase() const;
+ virtual String GetColumnName() const;
+ virtual String GetPath() const;
};
//for SwMailMergeDlg end
//for SwMailMergeCreateFromDlg begin
@@ -339,7 +338,7 @@ class SwMailMergeCreateFromDlg;
class AbstractMailMergeCreateFromDlg_Impl : public
AbstractMailMergeCreateFromDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeCreateFromDlg_Impl,SwMailMergeCreateFromDlg)
- virtual sal_Bool IsThisDocument() const ;
+ virtual sal_Bool IsThisDocument() const ;
};
//for SwMailMergeCreateFromDlg end
//for SwMailMergeFieldConnectionsDlg begin
@@ -347,7 +346,7 @@ class SwMailMergeFieldConnectionsDlg;
class AbstractMailMergeFieldConnectionsDlg_Impl : public
AbstractMailMergeFieldConnectionsDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeFieldConnectionsDlg_Impl,SwMailMergeFieldConnectionsDlg)
- virtual sal_Bool IsUseExistingConnections() const ;
+ virtual sal_Bool IsUseExistingConnections() const ;
};
//for SwMailMergeFieldConnectionsDlg end
@@ -369,7 +368,7 @@ class SwEditRegionDlg;
class AbstractEditRegionDlg_Impl : public AbstractEditRegionDlg
{
DECL_ABSTDLG_BASE(AbstractEditRegionDlg_Impl,SwEditRegionDlg)
- virtual void SelectSection(const String& rSectionName);
+ virtual void SelectSection(const String& rSectionName);
};
//for SwEditRegionDlg end
//for SwInsertSectionTabDialog begin
@@ -377,7 +376,7 @@ class SwInsertSectionTabDialog;
class AbstractInsertSectionTabDialog_Impl : public
AbstractInsertSectionTabDialog
{
DECL_ABSTDLG_BASE(AbstractInsertSectionTabDialog_Impl,SwInsertSectionTabDialog)
- virtual void SetSectionData(SwSectionData const& rSect);
+ virtual void SetSectionData(SwSectionData const& rSect);
};
//for SwInsertSectionTabDialog end
@@ -405,21 +404,21 @@ class SwMailMergeWizard;
class AbstractMailMergeWizard_Impl : public AbstractMailMergeWizard
{
SwMailMergeWizard* pDlg;
- Link aEndDlgHdl;
+ Link aEndDlgHdl;
- DECL_LINK( EndDialogHdl, SwMailMergeWizard* );
+ DECL_LINK( EndDialogHdl, SwMailMergeWizard* );
public:
AbstractMailMergeWizard_Impl(
SwMailMergeWizard* p )
: pDlg(p)
{}
virtual ~AbstractMailMergeWizard_Impl();
- virtual void StartExecuteModal( const Link& rEndDialogHdl );
- virtual long GetResult();
+ virtual void StartExecuteModal( const Link& rEndDialogHdl );
+ virtual long GetResult();
- virtual void SetReloadDocument(const String& rURL);
- virtual const String& GetReloadDocument() const;
- virtual sal_Bool ShowPage( sal_uInt16 nLevel );
- virtual sal_uInt16 GetRestartPage() const;
+ virtual void SetReloadDocument(const String& rURL);
+ virtual const String& GetReloadDocument() const;
+ virtual sal_Bool ShowPage( sal_uInt16 nLevel );
+ virtual sal_uInt16 GetRestartPage() const;
};
//------------------------------------------------------------------------
@@ -433,11 +432,11 @@ public:
const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
sal_uInt32
nResId
);
- virtual AbstractSwWordCountDialog* CreateSwWordCountDialog(Window*
pParent);
- virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg( Window*
pParent,int nResId );
+ virtual AbstractSwWordCountDialog* CreateSwWordCountDialog(Window*
pParent);
+ virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(
Window* pParent,int nResId );
virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window*
pParent, SwDocShell& rDocSh,
SvStream*
pStream, int nResId ); //add for SwAsciiFilterDlg
- virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent,
SwWrtShell &rSh, SfxRequest& rReq, int nResId );//add for SwInsertBookmarkDlg
+ virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent,
SwWrtShell &rSh, SfxRequest& rReq, int nResId );//add for SwInsertBookmarkDlg
virtual AbstractSwBreakDlg * CreateSwBreakDlg ( Window *pParent,
SwWrtShell &rSh,int nResId ); // add for SwBreakDlg
virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int
nResId ); //add for SwChangeDBDlg
virtual SfxAbstractTabDialog * CreateSwCharDlg( Window* pParent,
SwView& pVw, const SfxItemSet& rCoreSet, int nResId, // add for SwCharDlg
@@ -454,7 +453,7 @@ public:
virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (
Window *pParent, SwWrtShell &rSh, //add for DropDownFieldDialog
SwField* pField,int nResId, sal_Bool
bNextButton = sal_False );
virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const
SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_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, sal_Bool bLabel,int nResId );
virtual SwLabDlgMethod GetSwLabDlgStaticMethod (); //add for SwLabDlg
@@ -467,9 +466,9 @@ public:
sal_Bool bDraw = sal_False,
sal_uInt16 nDefPage = 0);
- virtual AbstarctSwSelGlossaryDlg * 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
+ 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
virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window*
pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg
int nResId,
@@ -498,14 +497,14 @@ public:
sal_Bool bFmt = sal_False,
sal_uInt16 nDefPage = 0,
const String* pFmtStr = 0); //add for SwFrmDlg
- virtual SfxAbstractTabDialog* CreateTemplateDialog( int
nResId,
+ virtual SfxAbstractTabDialog* CreateTemplateDialog( int
nResId,
Window* pParent,
SfxStyleSheetBase& rBase,
sal_uInt16
nRegion,
const sal_uInt16 nSlot = 0,
SwWrtShell*
pActShell = 0,
sal_Bool
bNew = sal_False ); //add for SwTemplateDlg
- virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
+ virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell); //add for SwGlossaryDlg
@@ -550,22 +549,22 @@ public:
Window* pParent, const SfxItemSet& rSet, SwWrtShell&
rSh); //add for SwInsertSectionTabDialog
virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( int
nResId,
SfxBindings* pBindings,
-
SfxChildWindow* pChild,
-
Window *pParent,
+
SfxChildWindow* pChild,
+
Window *pParent,
SfxChildWinInfo* pInfo,
-
sal_Bool bNew=sal_True); //add for SwIndexMarkFloatDlg
+
sal_Bool bNew=sal_True); //add for SwIndexMarkFloatDlg
virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( int
nResId,
SfxBindings* pBindings,
-
SfxChildWindow* pChild,
-
Window *pParent,
+
SfxChildWindow* pChild,
+
Window *pParent,
SfxChildWinInfo* pInfo,
-
sal_Bool bNew=sal_True); //add for SwAuthMarkFloatDlg
+
sal_Bool bNew=sal_True); //add for SwAuthMarkFloatDlg
virtual VclAbstractDialog *
CreateIndexMarkModalDlg( int nResId,
Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark );
//add for SwIndexMarkModalDlg
- virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView,
SwMailMergeConfigItem& rConfigItem);
+ virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView&
rView, SwMailMergeConfigItem& rConfigItem);
- //add for static func in SwGlossaryDlg
+ //add for static func in SwGlossaryDlg
virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc(
sal_uInt16 nId );
virtual GlossarySetActGroup
SetGlossaryActGroupFunc( sal_uInt16 nId );
@@ -582,3 +581,5 @@ struct SwDialogsResMgr
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/dochdl/gloshdl.cxx
b/main/sw/source/ui/dochdl/gloshdl.cxx
index e3fd890360..9dc03eb633 100644
--- a/main/sw/source/ui/dochdl/gloshdl.cxx
+++ b/main/sw/source/ui/dochdl/gloshdl.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,24 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <hintids.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/adjitem.hxx>
@@ -83,7 +80,6 @@
using namespace ::com::sun::star;
-
const short RET_EDIT = 100;
// PUBLIC METHODES -------------------------------------------------------
@@ -105,10 +101,10 @@ SV_IMPL_REF( SwDocShell )
void SwGlossaryHdl::GlossaryDlg()
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractGlossaryDlg* pDlg = pFact->CreateGlossaryDlg( DLG_RENAME_GLOS,
pViewFrame, this, pWrtShell);
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
String sName, sShortName;
if( RET_EDIT == pDlg->Execute() )
@@ -148,10 +144,10 @@ void SwGlossaryHdl::SetCurGroup(const String &rGrp,
sal_Bool bApi, sal_Bool bAlw
sal_Bool bPathEqual = sal_False;
if(!bAlwaysCreateNew)
{
- INetURLObject aTemp( pCurGrp->GetFileName() );
- String sCurBase = aTemp.getBase();
- aTemp.removeSegment();
- const String sCurEntryPath =
aTemp.GetMainURL(INetURLObject::NO_DECODE);
+ INetURLObject aTemp( pCurGrp->GetFileName() );
+ String sCurBase = aTemp.getBase();
+ aTemp.removeSegment();
+ const String sCurEntryPath =
aTemp.GetMainURL(INetURLObject::NO_DECODE);
const SvStrings* pPathArr =
rStatGlossaries.GetPathArray();
sal_uInt16 nCurrentPath = USHRT_MAX;
for(sal_uInt16 nPath = 0; nPath < pPathArr->Count();
nPath++)
@@ -209,7 +205,7 @@ String SwGlossaryHdl::GetGroupName( sal_uInt16 nId, String*
pTitle )
if(pTitle)
{
SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sRet,
sal_False);
- if(pGroup && !pGroup->GetError())
+ if(pGroup && !pGroup->GetError())
{
*pTitle = pGroup->GetName();
if(!pTitle->Len())
@@ -219,8 +215,8 @@ String SwGlossaryHdl::GetGroupName( sal_uInt16 nId, String*
pTitle )
}
rStatGlossaries.PutGroupDoc( pGroup );
}
- else
- sRet.Erase();
+ else
+ sRet.Erase();
}
return sRet;
}
@@ -278,10 +274,10 @@ sal_Bool SwGlossaryHdl::CopyOrMove( const String&
rSourceGroupName, String& rSo
SwTextBlocks* pDestGroup = rStatGlossaries.GetGroupDoc(rDestGroupName,
sal_False);
if(pDestGroup->IsReadOnly() || (bMove && pSourceGroup->IsReadOnly()) )
return sal_False;
- /*if(pDestGroup->IsOld()&& 0!= pDestGroup->ConvertToNew())
+ /*if(pDestGroup->IsOld()&& 0!= pDestGroup->ConvertToNew())
return sal_False;
if(bMove && pSourceGroup->IsOld() && 0 != pSourceGroup->ConvertToNew())
- return sal_False;*/
+ return sal_False;*/
//Der Index muss hier ermittelt werden, weil rSourceShortName in
CopyBlock evtl veraendert wird
sal_uInt16 nDeleteIdx = pSourceGroup->GetIndex( rSourceShortName );
@@ -391,12 +387,12 @@ sal_Bool SwGlossaryHdl::HasShortName(const String&
rShortName) const
---------------------------------------------------------------------------*/
sal_Bool SwGlossaryHdl::ConvertToNew(SwTextBlocks& /*rOld*/)
{
- /*if( rOld.IsOld() )
+ /*if( rOld.IsOld() )
{
QueryBox aAsk( pWrtShell->GetView().GetWindow(), SW_RES(
MSG_UPDATE_NEW_GLOS_FMT ) );
if( aAsk.Execute() == RET_YES )
{
- if( rOld.ConvertToNew() )
+ if( rOld.ConvertToNew() )
{
InfoBox(pWrtShell->GetView().GetWindow(),
SW_RES(MSG_ERR_INSERT_GLOS)).Execute();
return sal_False;
@@ -404,8 +400,8 @@ sal_Bool SwGlossaryHdl::ConvertToNew(SwTextBlocks&
/*rOld*/)
}
else
return sal_False;
- }*/
- return sal_True;
+ }*/
+ return sal_True;
}
/*------------------------------------------------------------------------
@@ -420,8 +416,8 @@ sal_Bool SwGlossaryHdl::NewGlossary(const String& rName,
const String& rShortNam
//pTmp == 0 if the AutoText path setting is wrong
if(!pTmp)
return sal_False;
- if(!ConvertToNew(*pTmp))
- return sal_False;
+ if(!ConvertToNew(*pTmp))
+ return sal_False;
String sOnlyTxt;
String* pOnlyTxt = 0;
@@ -454,8 +450,8 @@ sal_Bool SwGlossaryHdl::DelGlossary(const String
&rShortName)
SwTextBlocks *pGlossary = pCurGrp ? pCurGrp
:
rStatGlossaries.GetGroupDoc(aCurGrp);
//pTmp == 0 if the AutoText path setting is wrong
- if(!pGlossary || !ConvertToNew(*pGlossary))
- return sal_False;
+ if(!pGlossary || !ConvertToNew(*pGlossary))
+ return sal_False;
sal_uInt16 nIdx = pGlossary->GetIndex( rShortName );
if( nIdx != (sal_uInt16) -1 )
@@ -474,14 +470,14 @@ sal_Bool SwGlossaryHdl::ExpandGlossary()
{
ASSERT(pWrtShell->CanInsert(), illegal);
SwTextBlocks *pGlossary;
- SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
- ::GlossaryGetCurrGroup fnGetCurrGroup = pFact->GetGlossaryCurrGroupFunc(
DLG_RENAME_GLOS );
- DBG_ASSERT(fnGetCurrGroup, "Dialogdiet fail!");
- String sGroupName( (*fnGetCurrGroup)() );
- if(STRING_NOTFOUND == sGroupName.Search(GLOS_DELIM))
- FindGroupName(sGroupName);
- pGlossary = rStatGlossaries.GetGroupDoc(sGroupName);
+ SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
+ ::GlossaryGetCurrGroup fnGetCurrGroup =
pFact->GetGlossaryCurrGroupFunc( DLG_RENAME_GLOS );
+ DBG_ASSERT(fnGetCurrGroup, "Dialogdiet fail!");
+ String sGroupName( (*fnGetCurrGroup)() );
+ if(STRING_NOTFOUND == sGroupName.Search(GLOS_DELIM))
+ FindGroupName(sGroupName);
+ pGlossary = rStatGlossaries.GetGroupDoc(sGroupName);
String aShortName;
@@ -504,21 +500,21 @@ sal_Bool SwGlossaryHdl::ExpandGlossary()
if(pWrtShell->IsSelection())
aShortName = pWrtShell->GetSelTxt();
}
- return pGlossary ? Expand( aShortName, &rStatGlossaries, pGlossary ) :
sal_False;
+ return pGlossary ? Expand( aShortName, &rStatGlossaries, pGlossary ) :
sal_False;
}
sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
SwGlossaries
*pGlossaries,
- SwTextBlocks *pGlossary )
+ SwTextBlocks *pGlossary
)
{
TextBlockInfoArr aFoundArr;
String aShortName( rShortName );
sal_Bool bCancel = sal_False;
- // search for text block
- //#b6633427# - don't prefer current group depending on configuration
setting
- const SvxAutoCorrCfg* pCfg = SvxAutoCorrCfg::Get();
- sal_uInt16 nFound = !pCfg->IsSearchInAllCategories() ?
pGlossary->GetIndex( aShortName ) : -1;
- // if not found then search in all groups
+ // search for text block
+ //#b6633427# - don't prefer current group depending on configuration
setting
+ const SvxAutoCorrCfg* pCfg = SvxAutoCorrCfg::Get();
+ sal_uInt16 nFound = !pCfg->IsSearchInAllCategories() ?
pGlossary->GetIndex( aShortName ) : -1;
+ // if not found then search in all groups
if( nFound == (sal_uInt16) -1 )
{
const ::utl::TransliterationWrapper& rSCmp =
GetAppCmpStrIgnore();
@@ -549,7 +545,7 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
}
}
}
- if( aFoundArr.Count() ) // einer wurde gefunden
+ if( aFoundArr.Count() ) // einer wurde gefunden
{
pGlossaries->PutGroupDoc(pGlossary);
if(1 == aFoundArr.Count())
@@ -563,7 +559,7 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
SwAbstractDialogFactory* pFact =
SwAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
- AbstarctSwSelGlossaryDlg* pDlg =
pFact->CreateSwSelGlossaryDlg( 0, aShortName, DLG_SEL_GLOS );
+ AbstractSwSelGlossaryDlg* pDlg =
pFact->CreateSwSelGlossaryDlg( 0, aShortName, DLG_SEL_GLOS );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
for(sal_uInt16 i = 0; i < aFoundArr.Count();
++i)
{
@@ -590,7 +586,7 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
}
}
- // nicht gefunden
+ // not found
if( nFound == (sal_uInt16) -1 )
{
if( !bCancel )
@@ -603,9 +599,9 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
aShortName.Erase(nMaxLen);
aShortName.AppendAscii(" ...");
}
- String aTmp( SW_RES(STR_NOGLOS));
- aTmp.SearchAndReplaceAscii("%1", aShortName);
- InfoBox( pWrtShell->GetView().GetWindow(), aTmp ).Execute();
+ String aTmp( SW_RES(STR_NOGLOS));
+ aTmp.SearchAndReplaceAscii("%1", aShortName);
+ InfoBox( pWrtShell->GetView().GetWindow(), aTmp
).Execute();
}
return sal_False;
@@ -617,9 +613,9 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
SvxMacro aEndMacro(aEmptyStr, aEmptyStr, STARBASIC);
GetMacros( aShortName, aStartMacro, aEndMacro, pGlossary );
- // StartAction darf nich vor HasSelection und DelRight stehen,
- // sonst wird der moeglich Shellwechsel verzoegert und
- // API-Programme wuerden dann haengenbleiben
+ // StartAction darf nicht vor HasSelection und DelRight stehen,
+ // sonst wird der mögliche Shellwechsel verzögert und
+ // API-Programme würden dann hängenbleiben
// ausserdem darf das Ereignismacro ebenfalls nicht in einer Action
gerufen werden
pWrtShell->StartUndo(UNDO_INSGLOSSARY);
if( aStartMacro.GetMacName().Len() )
@@ -639,7 +635,7 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
}
pWrtShell->EndUndo(UNDO_INSGLOSSARY);
- // fuer alle neuen InputFelder die Eingaben abfordern
+ // für alle neuen InputFelder die Eingaben abfordern
if( aFldLst.BuildSortLst() )
pWrtShell->UpdateInputFlds( &aFldLst );
}
@@ -666,9 +662,9 @@ sal_Bool SwGlossaryHdl::InsertGlossary(const String &rName)
SvxMacro aEndMacro(aEmptyStr, aEmptyStr, STARBASIC);
GetMacros( rName, aStartMacro, aEndMacro, pGlos );
- // StartAction darf nich vor HasSelection und DelRight stehen,
- // sonst wird der moeglich Shellwechsel verzoegert und
- // API-Programme wuerden dann haengenbleiben
+ // StartAction darf nicht vor HasSelection und DelRight stehen,
+ // sonst wird der mögliche Shellwechsel verzögert und
+ // API-Programme würden dann hängenbleiben
// ausserdem darf das Ereignismacro ebenfalls nicht in einer Action
gerufen werden
if( aStartMacro.GetMacName().Len() )
pWrtShell->ExecMacro( aStartMacro );
@@ -713,7 +709,7 @@ void SwGlossaryHdl::SetMacros(const String& rShortName,
aMacroTbl.Insert( SW_EVENT_START_INS_GLOSSARY, new
SvxMacro(*pStart));
if( pEnd )
aMacroTbl.Insert( SW_EVENT_END_INS_GLOSSARY, new
SvxMacro(*pEnd));
- sal_uInt16 nIdx = pGlos->GetIndex( rShortName );
+ sal_uInt16 nIdx = pGlos->GetIndex( rShortName );
if( !pGlos->SetMacroTable( nIdx, aMacroTbl ) && pGlos->GetError() )
ErrorHandler::HandleError( pGlos->GetError() );
@@ -724,7 +720,7 @@ void SwGlossaryHdl::SetMacros(const String& rShortName,
void SwGlossaryHdl::GetMacros( const String &rShortName,
SvxMacro&
rStart,
SvxMacro& rEnd,
- SwTextBlocks
*pGlossary )
+ SwTextBlocks
*pGlossary )
{
SwTextBlocks *pGlos = pGlossary ? pGlossary
:
pCurGrp ? pCurGrp
@@ -784,10 +780,10 @@ sal_Bool SwGlossaryHdl::Rename(const String& rOldShort,
const String& rNewShortN
:
rStatGlossaries.GetGroupDoc(aCurGrp);
if(pGlossary)
{
- if(!ConvertToNew(*pGlossary))
- return sal_False;
+ if(!ConvertToNew(*pGlossary))
+ return sal_False;
- sal_uInt16 nIdx = pGlossary->GetIndex( rOldShort );
+ sal_uInt16 nIdx = pGlossary->GetIndex( rOldShort );
sal_uInt16 nOldLongIdx = pGlossary->GetLongIndex( rNewName );
sal_uInt16 nOldIdx = pGlossary->GetIndex( rNewShortName );
@@ -853,7 +849,7 @@ sal_Bool SwGlossaryHdl::CopyToClipboard(SwWrtShell& rSh,
const String& rShortNam
SwTransferable* pTransfer = new SwTransferable( rSh );
/*??*/uno::Reference<
- datatransfer::XTransferable > xRef( pTransfer );
+ datatransfer::XTransferable > xRef( pTransfer );
int nRet = pTransfer->CopyGlossary( *pGlossary, rShortName );
if( !pCurGrp )
@@ -869,7 +865,7 @@ sal_Bool SwGlossaryHdl::ImportGlossaries( const String&
rName )
const SfxFilter* pFilter = 0;
SfxMedium* pMed = new SfxMedium( rName, STREAM_READ, sal_True,
0, 0 );
SfxFilterMatcher aMatcher( String::CreateFromAscii("swriter") );
- pMed->UseInteractionHandler( sal_True );
+ pMed->UseInteractionHandler( sal_True );
if( !aMatcher.GuessFilter( *pMed, &pFilter, sal_False ) )
{
SwTextBlocks *pGlossary;
@@ -891,3 +887,5 @@ sal_Bool SwGlossaryHdl::ImportGlossaries( const String&
rName )
}
return bRet;
}
+
+/* vim: set noet sw=4 ts=4: */
