You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2024/12/03 20:12:13 UTC
(openoffice) branch AOO42X updated: Cleanup
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 a3c68e918f Cleanup
a3c68e918f is described below
commit a3c68e918f5b76a6e409902eb09fd67692d0e4e9
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Dec 3 21:11:13 2024 +0100
Cleanup
(cherry picked from commit bfc1a96ad254f4d1f8080556364c123470d844c7)
---
main/sw/source/ui/uiview/viewcoll.cxx | 19 ++----
main/sw/source/ui/uiview/viewdlg.cxx | 21 ++----
main/sw/source/ui/uiview/viewdlg2.cxx | 122 +++++++++++++++-------------------
main/sw/source/ui/uiview/viewfunc.hxx | 22 +++---
4 files changed, 77 insertions(+), 107 deletions(-)
diff --git a/main/sw/source/ui/uiview/viewcoll.cxx b/main/sw/source/ui/uiview/viewcoll.cxx
index 4530af1a8f..cdda55231e 100644
--- a/main/sw/source/ui/uiview/viewcoll.cxx
+++ b/main/sw/source/ui/uiview/viewcoll.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,25 +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 "cmdid.h"
#include "uiitems.hxx"
#include <tools/list.hxx>
@@ -35,13 +31,11 @@
#include <svl/stritem.hxx>
#include <rsc/rscsfx.hxx>
-
#include "errhdl.hxx"
#include "view.hxx"
#include "wrtsh.hxx"
#include "basesh.hxx"
-
void SwView::ExecColl(SfxRequest &rReq)
{
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -65,7 +59,7 @@ void SwView::ExecColl(SfxRequest &rReq)
GetWrtShell().GetCurPageStyle(sal_False) )
{
SfxStringItem aName(SID_STYLE_APPLY,
- ((SfxStringItem*)pItem)->GetValue());
+ ((SfxStringItem*)pItem)->GetValue());
SfxUInt16Item aFamItem( SID_STYLE_FAMILY,
SFX_STYLE_FAMILY_PAGE);
SwPtrItem aShell(FN_PARAM_WRTSHELL, GetWrtShellPtr());
@@ -90,5 +84,4 @@ void SwView::ExecColl(SfxRequest &rReq)
}
}
-
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/uiview/viewdlg.cxx b/main/sw/source/ui/uiview/viewdlg.cxx
index f059162ca2..3f549306aa 100644
--- a/main/sw/source/ui/uiview/viewdlg.cxx
+++ b/main/sw/source/ui/uiview/viewdlg.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,32 +7,27 @@
* 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 <sfx2/viewfrm.hxx>
#include <editeng/tstpitem.hxx>
#include <svl/stritem.hxx>
#include <sfx2/request.hxx>
-
#include "view.hxx"
#include "wrtsh.hxx"
#include "basesh.hxx"
@@ -43,11 +38,10 @@
#include "pagedesc.hxx"
-
void SwView::ExecDlg(SfxRequest &rReq)
{
ModalDialog *pDialog = 0;
- //Damit aus dem Basic keine Dialoge fuer Hintergrund-Views aufgerufen werden:
+ // Damit aus dem Basic keine Dialoge für Hintergrund-Views aufgerufen werden:
const SfxPoolItem* pItem = 0;
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -65,7 +59,7 @@ void SwView::ExecDlg(SfxRequest &rReq)
sal_uInt16 nOldValue = pWrtShell->GetPageOffset();
sal_uInt16 nPage, nLogPage;
pWrtShell->GetPageNum( nPage, nLogPage,
- pWrtShell->IsCrsrVisible(), sal_False);
+ pWrtShell->IsCrsrVisible(), sal_False);
if(nValue != nOldValue || nValue != nLogPage)
{
@@ -90,5 +84,4 @@ void SwView::ExecDlg(SfxRequest &rReq)
}
}
-
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/uiview/viewdlg2.cxx b/main/sw/source/ui/uiview/viewdlg2.cxx
index f463626a3f..5e550974d6 100644
--- a/main/sw/source/ui/uiview/viewdlg2.cxx
+++ b/main/sw/source/ui/uiview/viewdlg2.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 <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/objface.hxx>
@@ -56,10 +53,6 @@ extern String* pOldTabCat;
extern String* pOldFrmCat;
extern String* pOldDrwCat;
-/* -----------------06.11.98 13:45-------------------
- *
- * --------------------------------------------------*/
-
void SwView::ExecDlgExt(SfxRequest &rReq)
{
Window *pMDI = &GetViewFrame()->GetWindow();
@@ -68,11 +61,11 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
{
case FN_INSERT_CAPTION:
{
- SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
+ SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
- VclAbstractDialog* pDialog = pFact->CreateSwCaptionDialog( pMDI, *this, DLG_CAPTION );
- DBG_ASSERT(pDialog, "Dialogdiet fail!");
+ VclAbstractDialog* pDialog = pFact->CreateSwCaptionDialog( pMDI, *this, DLG_CAPTION );
+ DBG_ASSERT(pDialog, "Dialogdiet fail!");
if ( pDialog )
{
pDialog->Execute();
@@ -80,16 +73,15 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
}
break;
}
- case FN_EDIT_FOOTNOTE:
+ case FN_EDIT_FOOTNOTE:
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
- AbstractInsFootNoteDlg* pDlg = pFact->CreateInsFootNoteDlg( DLG_INS_FOOTNOTE,
- pMDI, *pWrtShell, sal_True );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
+ AbstractInsFootNoteDlg* pDlg = pFact->CreateInsFootNoteDlg( DLG_INS_FOOTNOTE, pMDI, *pWrtShell, sal_True );
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
- pDlg->SetHelpId(GetStaticInterface()->GetSlot(FN_EDIT_FOOTNOTE)->GetCommand());
- pDlg->SetText( SW_RESSTR(STR_EDIT_FOOTNOTE) );
+ pDlg->SetHelpId(GetStaticInterface()->GetSlot(FN_EDIT_FOOTNOTE)->GetCommand());
+ pDlg->SetText( SW_RESSTR(STR_EDIT_FOOTNOTE) );
pDlg->Execute();
delete pDlg;
break;
@@ -97,10 +89,6 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
}
}
-/* -----------------06.11.98 14:53-------------------
- *
- * --------------------------------------------------*/
-
void SwView::AutoCaption(const sal_uInt16 nType, const SvGlobalName *pOleId)
{
SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
@@ -114,10 +102,6 @@ void SwView::AutoCaption(const sal_uInt16 nType, const SvGlobalName *pOleId)
}
}
-/* -----------------06.11.98 12:58-------------------
- *
- * --------------------------------------------------*/
-
void SwView::InsertCaption(const InsCaptionOpt *pOpt)
{
if (!pOpt)
@@ -127,26 +111,26 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt)
// Existiert Pool-Vorlage gleichen Namens?
SwWrtShell &rSh = GetWrtShell();
- if(rName.Len())
- {
- sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
- if( USHRT_MAX != nPoolId )
- rSh.GetTxtCollFromPool(nPoolId);
- // Pool-Vorlage existiert nicht: Existiert sie am Dokument?
- else if( !rSh.GetParaStyle(rName) )
- {
- // Sie existiert auch nicht am Dokument: erzeugen
- SwTxtFmtColl* pDerivedFrom = rSh.GetTxtCollFromPool(RES_POOLCOLL_LABEL);
- rSh.MakeTxtFmtColl(rName, pDerivedFrom);
- }
- }
+ if(rName.Len())
+ {
+ sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
+ if( USHRT_MAX != nPoolId )
+ rSh.GetTxtCollFromPool(nPoolId);
+ // Pool-Vorlage existiert nicht: Existiert sie am Dokument?
+ else if( !rSh.GetParaStyle(rName) )
+ {
+ // Sie existiert auch nicht am Dokument: erzeugen
+ SwTxtFmtColl* pDerivedFrom = rSh.GetTxtCollFromPool(RES_POOLCOLL_LABEL);
+ rSh.MakeTxtFmtColl(rName, pDerivedFrom);
+ }
+ }
SelectionType eType = rSh.GetSelectionType();
if (eType & nsSelectionType::SEL_OLE)
eType = nsSelectionType::SEL_GRF;
// SwLabelType
- const SwLabelType eT = eType & nsSelectionType::SEL_TBL ? LTYPE_TABLE :
+ const SwLabelType eT = eType & nsSelectionType::SEL_TBL ? LTYPE_TABLE :
eType & nsSelectionType::SEL_FRM ? LTYPE_FLY :
eType == nsSelectionType::SEL_TXT ? LTYPE_FLY :
eType & nsSelectionType::SEL_DRW ? LTYPE_DRAW :
@@ -155,7 +139,7 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt)
SwFldMgr aMgr(&rSh);
SwSetExpFieldType* pFldType =
(SwSetExpFieldType*)aMgr.GetFldType(RES_SETEXPFLD, rName);
- if (!pFldType && rName.Len() )
+ if (!pFldType && rName.Len() )
{
// Neuen Feldtypen erzeugen
SwSetExpFieldType aSwSetExpFieldType(rSh.GetDoc(), rName, nsSwGetSetExpType::GSE_SEQ);
@@ -168,39 +152,39 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt)
if (pFldType)
{
pFldType->SetDelimiter(pOpt->GetSeparator());
- pFldType->SetOutlineLvl( static_cast< sal_uInt8 >(pOpt->GetLevel()) );
+ pFldType->SetOutlineLvl( static_cast< sal_uInt8 >(pOpt->GetLevel()) );
}
}
- sal_uInt16 nID = USHRT_MAX;
+ sal_uInt16 nID = USHRT_MAX;
SwFieldType* pType = 0;
const sal_uInt16 nCount = aMgr.GetFldTypeCount();
- if( rName.Len() )
- {
- for (sal_uInt16 i = 0; i < nCount; ++i)
- {
- pType = aMgr.GetFldType(USHRT_MAX, i);
- String aTmpName( pType->GetName() );
- if (aTmpName == rName && pType->Which() == RES_SETEXPFLD)
- {
- nID = i;
- break;
- }
- }
- }
+ if( rName.Len() )
+ {
+ for (sal_uInt16 i = 0; i < nCount; ++i)
+ {
+ pType = aMgr.GetFldType(USHRT_MAX, i);
+ String aTmpName( pType->GetName() );
+ if (aTmpName == rName && pType->Which() == RES_SETEXPFLD)
+ {
+ nID = i;
+ break;
+ }
+ }
+ }
rSh.StartAllAction();
- GetWrtShell().InsertLabel( eT,
- pOpt->GetCaption(),
- !pOpt->IgnoreSeqOpts() ? aEmptyStr : pOpt->GetSeparator(),
- pOpt->GetNumSeparator(),
+ GetWrtShell().InsertLabel( eT,
+ pOpt->GetCaption(),
+ !pOpt->IgnoreSeqOpts() ? aEmptyStr : pOpt->GetSeparator(),
+ pOpt->GetNumSeparator(),
!pOpt->GetPos(),
nID,
- pOpt->GetCharacterStyle(),
- pOpt->CopyAttributes() );
+ pOpt->GetCharacterStyle(),
+ pOpt->CopyAttributes() );
// Nummernformat setzen
- if(pType)
- ((SwSetExpFieldType*)pType)->SetSeqFormat(pOpt->GetNumType());
+ if(pType)
+ ((SwSetExpFieldType*)pType)->SetSeqFormat(pOpt->GetNumType());
rSh.UpdateExpFlds( sal_True );
@@ -234,4 +218,4 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt)
}
}
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/uiview/viewfunc.hxx b/main/sw/source/ui/uiview/viewfunc.hxx
index b2fc719697..89017d363c 100644
--- a/main/sw/source/ui/uiview/viewfunc.hxx
+++ b/main/sw/source/ui/uiview/viewfunc.hxx
@@ -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,19 +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.
- *
+ *
*************************************************************/
-
#ifndef _VIEWFUNC_HXX
#define _VIEWFUNC_HXX
#include <tools/solar.h>
@@ -47,16 +46,17 @@ void ViewResizePixel( const Window &rRef,
const Size &rSize,
const Size &rEditSz,
const sal_Bool bInner,
- SwScrollbar& rVScrollbar,
- SwScrollbar& rHScrollbar,
+ SwScrollbar& rVScrollbar,
+ SwScrollbar& rHScrollbar,
ImageButton* pPageUpBtn,
ImageButton* pPageDownBtn,
ImageButton* pNaviBtn,
- Window& rScrollBarBox,
+ Window& rScrollBarBox,
SvxRuler* pVLineal = 0,
SvxRuler* pHLineal = 0,
- sal_Bool bWebView = sal_False,
- sal_Bool bVRulerRight = sal_False );
-
+ sal_Bool bWebView = sal_False,
+ sal_Bool bVRulerRight = sal_False );
#endif
+
+/* vim: set noet sw=4 ts=4: */