diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 21:01:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 09:41:00 -0600 |
| commit | a27462189d1d6a3d22be23a5eee603edca5d8ea3 (patch) | |
| tree | 065df066de07f3d7194178352f3449702bc34bd5 /sw/source/ui | |
| parent | 150420cbff39967e9376cab05b6af45b642edae8 (diff) | |
Remove visual noise from sw
Conflicts:
sw/inc/unodraw.hxx
sw/inc/unoframe.hxx
sw/sdi/swriter.sdi
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unoparagraph.cxx
sw/source/filter/ww8/rtfexportfilter.cxx
sw/source/ui/inc/unotxvw.hxx
sw/source/ui/lingu/hyp.cxx
sw/source/ui/lingu/sdrhhcwrap.cxx
sw/source/ui/uno/swdetect.hxx
Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908
Reviewed-on: https://gerrit.libreoffice.org/8322
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui')
383 files changed, 93 insertions, 1101 deletions
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index a7863ce2668a..fbded3791dce 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -284,9 +284,9 @@ String STR_DOC_STAT Text [ en-US ] = "Statistics" ; }; - // ---------------------------- + // Statusbar-titles - // ---------------------------- + String STR_STATSTR_W4WREAD { diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index 67519b0ad7f9..50acd4ada9e2 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cstdarg> #include <hintids.hxx> @@ -407,7 +406,6 @@ void SwModule::InsertEnv( SfxRequest& rReq ) sal_False, &nPos ); - pSh->ChgPageDesc( nPos, *pDesc); pSh->ChgCurPageDesc(*pDesc); diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index a031f86e9cca..60ad48006403 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -91,7 +91,6 @@ #include <com/sun/star/sdbc/XDataSource.hpp> #include <swabstdlg.hxx> - #include <vcl/status.hxx> #include "salhelper/simplereferenceobject.hxx" @@ -101,7 +100,6 @@ using namespace ::com::sun::star; - // Slotmaps for the application's methods // here are the SlotID's being included @@ -869,8 +867,6 @@ const SwMasterUsrPref *SwModule::GetUsrPref(sal_Bool bWeb) const return bWeb ? pWebUsrPref : pUsrPref; } - - void NewXForms( SfxRequest& rReq ) { // copied & excerpted from SwModule::InsertLab(..) diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 829e3df9c305..4118e705b98c 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cstdarg> #include <hintids.hxx> @@ -249,7 +248,6 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) rFmt.SetFmtAttr(SwFmtFooter(sal_Bool(sal_False))); aDesc.ChgFooterShare(sal_False); - aDesc.SetUseOn(nsUseOnPage::PD_ALL); // Site numbering // Set page size diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 2e4636d8890a..3658dfa6c0d1 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -19,7 +19,6 @@ #include <cmdid.h> - #include <com/sun/star/i18n/ScriptType.hpp> #include <hintids.hxx> @@ -257,7 +256,6 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SfxBindings *pBindings = pAppView ? &pAppView->GetViewFrame()->GetBindings() : NULL; - // Interpret the page Documentview if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_DOCDISP, false, &pItem )) { @@ -410,7 +408,6 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) aViewOpt.SetCursorInProtectedArea(((const SfxBoolItem*)pItem)->GetValue()); } - // set elements for the current view and shell ApplyUsrPref( aViewOpt, pAppView, bTextDialog? VIEWOPT_DEST_TEXT : VIEWOPT_DEST_WEB); } diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 1994054386be..875e91cc965b 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> @@ -116,7 +115,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; using namespace ::com::sun::star::container; - SFX_IMPL_INTERFACE( SwDocShell, SfxObjectShell, SW_RES(0) ) { } @@ -753,7 +751,6 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) return !IsError( nErrno ); } - // Hands off // do not yet activate, must deliver TRUE sal_Bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor ) @@ -833,7 +830,6 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, EnableSetModified( sal_True ); } - void SwDocShell::SetVisArea( const Rectangle &rRect ) { Rectangle aRect( rRect ); @@ -858,7 +854,6 @@ void SwDocShell::SetVisArea( const Rectangle &rRect ) SfxObjectShell::SetVisArea( aRect ); } - Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const { if ( nAspect == ASPECT_THUMBNAIL ) @@ -930,7 +925,6 @@ sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates ) return nState; } - void SwDocShell::GetState(SfxItemSet& rSet) { SfxWhichIter aIter(rSet); @@ -1079,7 +1073,6 @@ SfxStyleSheetBasePool* SwDocShell::GetStyleSheetPool() return mxBasePool.get(); } - void SwDocShell::SetView(SwView* pVw) { if ( 0 != (pView = pVw) ) @@ -1088,7 +1081,6 @@ void SwDocShell::SetView(SwView* pVw) pWrtShell = 0; } - void SwDocShell::PrepareReload() { ::DelAllGrfCacheEntries( pDoc ); @@ -1181,7 +1173,6 @@ void SwDocShell::CalcLayoutForOLEObjects() } } - // #i42634# Overwrites SfxObjectShell::UpdateLinks // This new function is necessary to trigger update of links in docs // read by the binary filter: @@ -1264,19 +1255,16 @@ const ::sfx2::IXmlIdRegistry* SwDocShell::GetXmlIdRegistry() const return pDoc ? &pDoc->GetXmlIdRegistry() : 0; } - bool SwDocShell::IsChangeRecording() const { return (pWrtShell->GetRedlineMode() & nsRedlineMode_t::REDLINE_ON) != 0; } - bool SwDocShell::HasChangeRecordProtection() const { return pWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength() > 0; } - void SwDocShell::SetChangeRecording( bool bActivate ) { sal_uInt16 nOn = bActivate ? nsRedlineMode_t::REDLINE_ON : 0; @@ -1284,7 +1272,6 @@ void SwDocShell::SetChangeRecording( bool bActivate ) pWrtShell->SetRedlineModeAndCheckInsMode( (nMode & ~nsRedlineMode_t::REDLINE_ON) | nOn); } - bool SwDocShell::SetProtectionPassword( const OUString &rNewPassword ) { const SfxAllItemSet aSet( GetPool() ); @@ -1318,7 +1305,6 @@ bool SwDocShell::SetProtectionPassword( const OUString &rNewPassword ) return bRes; } - bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) { bool bRes = false; diff --git a/sw/source/ui/app/docshdrw.cxx b/sw/source/ui/app/docshdrw.cxx index c9319cb5579d..12f31e8006ed 100644 --- a/sw/source/ui/app/docshdrw.cxx +++ b/sw/source/ui/app/docshdrw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <svx/svxids.hrc> #include <svl/stritem.hxx> diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 99558f62c1e0..968ec591f168 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <svx/dialogs.hrc> @@ -105,7 +104,6 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) else if( ISA( SwGlobalDocShell ) ) GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); // Globaldokument - if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) SwTransferable::InitOle( this, *pDoc ); @@ -608,7 +606,6 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium ) return bRet; } - void SwDocShell::SubInitNew() { OSL_ENSURE( !mxBasePool.is(), "who hasn't destroyed their Pool?" ); diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 5927ef04d4de..b52bcd971f01 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svl/smplhint.hxx> #include <hintids.hxx> #include <svl/itemiter.hxx> @@ -287,7 +286,6 @@ static const SwNumRule* lcl_FindNumRule( SwDoc& rDoc, return pRule; } - static sal_uInt16 lcl_FindName(const SwPoolFmtList& rLst, SfxStyleFamily eFam, const OUString& rName) { @@ -399,7 +397,6 @@ SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument, nHelpId = UCHAR_MAX; } - SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg) : SfxStyleSheetBase(rOrg), pCharFmt(rOrg.pCharFmt), @@ -413,7 +410,6 @@ SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg) : { } - SwDocStyleSheet::~SwDocStyleSheet() { } @@ -703,7 +699,6 @@ bool SwDocStyleSheet::HasParentSupport() const return bRet; } - bool SwDocStyleSheet::HasClearParentSupport() const { bool bRet = false; @@ -880,7 +875,6 @@ OUString SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) return SfxStyleSheetBase::GetDescription(eUnit); } - OUString SwDocStyleSheet::GetDescription() { return GetDescription(SFX_MAPUNIT_CM); @@ -1609,7 +1603,6 @@ static void lcl_DeleteInfoStyles( sal_uInt16 nFamily, std::vector<void*>& rArr, } break; - case SFX_STYLE_FAMILY_PSEUDO: { std::deque<SwNumRule*> aDelArr; @@ -1977,7 +1970,6 @@ bool SwDocStyleSheet::IsUsed() const return rDoc.IsUsed( *pMod ); } - sal_uLong SwDocStyleSheet::GetHelpId( OUString& rFile ) { sal_uInt16 nId = 0; @@ -2077,7 +2069,6 @@ sal_uLong SwDocStyleSheet::GetHelpId( OUString& rFile ) return nId; } - void SwDocStyleSheet::SetHelpId( const OUString& r, sal_uLong nId ) { sal_uInt8 nFileId = static_cast< sal_uInt8 >(rDoc.SetDocPattern( r )); @@ -2148,14 +2139,12 @@ SfxStyleSheetBase& SwDocStyleSheetPool::Make( const OUString& rName, return *mxStyleSheet.get(); } - SfxStyleSheetBase* SwDocStyleSheetPool::Create( const SfxStyleSheetBase& /*rOrg*/) { OSL_ENSURE(!this , "Create im SW-Stylesheet-Pool geht nicht" ); return NULL; } - SfxStyleSheetBase* SwDocStyleSheetPool::Create( const OUString &, SfxStyleFamily, sal_uInt16 ) { @@ -2327,7 +2316,6 @@ void SwDocStyleSheetPool::Remove( SfxStyleSheetBase* pStyle) Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *pStyle ) ); } - bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam, const OUString &rStyle, const OUString &rParent ) { diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx index 304862f8da62..98b2e4b623b7 100644 --- a/sw/source/ui/app/mainwn.cxx +++ b/sw/source/ui/app/mainwn.cxx @@ -48,7 +48,6 @@ static SwProgress *lcl_SwFindProgress( SwDocShell *pDocShell ) return 0; } - void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue, SwDocShell *pDocShell ) { @@ -79,7 +78,6 @@ void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue, } } - void SetProgressState( long nPosition, SwDocShell *pDocShell ) { if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() ) @@ -90,7 +88,6 @@ void SetProgressState( long nPosition, SwDocShell *pDocShell ) } } - void EndProgress( SwDocShell *pDocShell ) { if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() ) @@ -121,7 +118,6 @@ void EndProgress( SwDocShell *pDocShell ) } } - void SetProgressText( sal_uInt16 nId, SwDocShell *pDocShell ) { if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() ) @@ -132,7 +128,6 @@ void SetProgressText( sal_uInt16 nId, SwDocShell *pDocShell ) } } - void RescheduleProgress( SwDocShell *pDocShell ) { if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() ) diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index 7469e6cdb0e1..a0401dd70c5b 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <boost/scoped_ptr.hpp> #include <hintids.hxx> @@ -69,7 +68,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::view; using namespace ::com::sun::star::lang; - static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, SwViewShell* pSh ) { // in FrameSets the actual visibility can differ from the ViewOption's setting diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index e5231a6368c3..115ab46da5cf 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -143,7 +143,6 @@ bool bNoInterrupt = false; using namespace com::sun::star; - TYPEINIT1( SwModule, SfxModule ); using namespace ::com::sun::star; @@ -268,7 +267,6 @@ void SwDLL::RegisterInterfaces() SwPagePreview::RegisterInterface( pMod ); SwSrcView::RegisterInterface( pMod ); - SwBaseShell::RegisterInterface(pMod); SwTextShell::RegisterInterface(pMod); SwTableShell::RegisterInterface(pMod); @@ -407,8 +405,6 @@ void SwDLL::RegisterControls() ::sfx2::TaskPaneWrapper::RegisterChildWindow(0, pMod); } - - /************************************************************************* |* |* Load Module (only dummy for linking of the DLL) diff --git a/sw/source/ui/app/swwait.cxx b/sw/source/ui/app/swwait.cxx index 9ac290efffdf..f25f27209b1b 100644 --- a/sw/source/ui/app/swwait.cxx +++ b/sw/source/ui/app/swwait.cxx @@ -24,7 +24,6 @@ #include <sfx2/dispatch.hxx> #include <vcl/window.hxx> - SwWait::SwWait( SwDocShell &rDocShell, const bool bLockUnlockDispatcher ) diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx index df8f5ecb089c..d3d1936aea04 100644 --- a/sw/source/ui/cctrl/actctrl.cxx +++ b/sw/source/ui/cctrl/actctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/string.hxx> #include <vcl/builder.hxx> #include "actctrl.hxx" @@ -27,7 +26,6 @@ void NumEditAction::Action() aActionLink.Call( this ); } - bool NumEditAction::Notify( NotifyEvent& rNEvt ) { bool nHandled = false; diff --git a/sw/source/ui/cctrl/popbox.cxx b/sw/source/ui/cctrl/popbox.cxx index ba4bd707c36b..4ebf98d738df 100644 --- a/sw/source/ui/cctrl/popbox.cxx +++ b/sw/source/ui/cctrl/popbox.cxx @@ -60,5 +60,4 @@ sal_Int8 SwHelpToolBox::ExecuteDrop( const ExecuteDropEvent& rEvt ) return ((SwNavigationPI*)GetParent())->ExecuteDrop( rEvt ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx index f3b9e09d1651..66092eab9da5 100644 --- a/sw/source/ui/cctrl/swlbox.cxx +++ b/sw/source/ui/cctrl/swlbox.cxx @@ -22,7 +22,6 @@ #include <swtypes.hxx> #include <swlbox.hxx> - // Description: ListboxElement SwBoxEntry::SwBoxEntry() : bModified(sal_False), diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index e345a6f78a13..19a77d549dd0 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -155,7 +155,6 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) m_pPageNumBox->SetClickHdl(LINK(this,SwBreakDlg,PageNumHdl)); m_pPageNumEdit->SetModifyHdl(LINK(this,SwBreakDlg,PageNumModifyHdl)); - // Insert page description to Listbox const sal_uInt16 nCount = rSh.GetPageDescCnt(); sal_uInt16 i; diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx index 51ed002e0e46..726c66974f13 100644 --- a/sw/source/ui/chrdlg/ccoll.cxx +++ b/sw/source/ui/chrdlg/ccoll.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "cmdid.h" #include "swmodule.hxx" #include "view.hxx" @@ -100,7 +99,6 @@ OUString GetCommandContextByIndex( sal_Int16 nIndex ) // Globals ****************************************************************** - const CommandStruct SwCondCollItem::aCmds[] = { { PARA_IN_TABLEHEAD, 0 }, @@ -133,14 +131,12 @@ const CommandStruct SwCondCollItem::aCmds[] = { PARA_IN_LIST, 9 } }; - TYPEINIT1_AUTOFACTORY(SwCondCollItem, SfxPoolItem) /**************************************************************************** Item for the transport of the condition table ****************************************************************************/ - SwCondCollItem::SwCondCollItem(sal_uInt16 _nWhich ) : SfxPoolItem(_nWhich) { diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 084b7c7521df..220023a1404b 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -307,5 +307,4 @@ IMPL_LINK_NOARG(SwCharURLPage, EventHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 2e2c83bfb463..a525fafe1b36 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -50,7 +50,6 @@ #include "chrdlg.hrc" - using namespace css; using namespace css::uno; using namespace css::lang; @@ -187,7 +186,6 @@ void SwDropCapsPict::InitPrinter( void ) Create Default-String from character-count (A, AB, ABC, ...) ****************************************************************************/ - OUString GetDefaultString(sal_uInt16 nChars) { OUString aStr; @@ -668,7 +666,6 @@ void SwDropCapsPage::Reset(const SfxItemSet &rSet) Page: CheckBox's Click-Handler ****************************************************************************/ - IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl) { sal_Bool bChecked = m_pDropCapsBox->IsChecked(); @@ -703,7 +700,6 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl) Page: CheckBox's Click-Handler ****************************************************************************/ - IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl) { m_pDropCapsField->Enable( !m_pWholeWordCB->IsChecked() ); @@ -720,7 +716,6 @@ IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl) Page: SpinFields' Modify-Handler ****************************************************************************/ - IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) { OUString sPreview; @@ -780,7 +775,6 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) Page: Template-Box' Select-Handler. *****************************************************************************/ - IMPL_LINK_NOARG_INLINE_START(SwDropCapsPage, SelectHdl) { m_pPict->UpdatePaintSettings(); @@ -841,7 +835,4 @@ void SwDropCapsPage::FillSet( SfxItemSet &rSet ) } } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index d3526c205c95..b1febbde90c3 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -33,7 +33,6 @@ #include <app.hrc> - // Globals ****************************************************************** static sal_uInt16 aPageRg[] = { @@ -301,5 +300,4 @@ IMPL_LINK( SwParagraphNumTabPage, StyleHdl_Impl, ListBox*, pBox ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 5be8280731a1..761e7f780e5d 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -157,12 +157,10 @@ SwParaDlg::SwParaDlg(Window *pParent, SetCurPageId(sDefPage); } - SwParaDlg::~SwParaDlg() { } - void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) { SwWrtShell& rSh = rView.GetWrtShell(); @@ -245,6 +243,4 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index d0d6091905bc..2cf644655bea 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -126,7 +126,6 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) Page: Dtor ****************************************************************************/ - SwCondCollPage::~SwCondCollPage() { for(sal_uInt16 i = 0; i < m_pFilterLB->GetEntryCount(); ++i) @@ -134,7 +133,6 @@ SwCondCollPage::~SwCondCollPage() } - int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) { if( _pSet ) @@ -147,7 +145,6 @@ int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) Page: Factory ****************************************************************************/ - SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet) { return new SwCondCollPage(pParent, rSet); @@ -157,7 +154,6 @@ SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet) Page: FillItemSet-Overload ****************************************************************************/ - sal_Bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) { sal_Bool bModified = sal_True; @@ -175,7 +171,6 @@ sal_Bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) Page: Reset-Overload ****************************************************************************/ - void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) { if(bNewTemplate) diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx index a87f40e89e4d..76e1a0907b2f 100644 --- a/sw/source/ui/config/caption.cxx +++ b/sw/source/ui/config/caption.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/diagnose.h> #include "numrule.hxx" @@ -72,8 +71,6 @@ bool InsCaptionOpt::operator==( const InsCaptionOpt& rOpt ) const aOleId == rOpt.aOleId); // So that identical Ole-IDs can't be added multiple // times, don't compare against anything else. - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx index 1e5437a81679..7272f6c7000f 100644 --- a/sw/source/ui/config/cfgitems.cxx +++ b/sw/source/ui/config/cfgitems.cxx @@ -22,7 +22,6 @@ #include <svx/svxids.hrc> #include <editeng/svxenum.hxx> - #include "viewopt.hxx" #include "swtypes.hxx" #include "cmdid.h" @@ -309,7 +308,6 @@ void SwShadowCursorItem::operator=( const SwShadowCursorItem& rCpy ) SetMode( rCpy.GetMode() ); } - void SwShadowCursorItem::FillViewOptions( SwViewOption& rVOpt ) const { rVOpt.SetShadowCursor( bOn ); @@ -357,6 +355,4 @@ bool SwTestItem::operator==( const SfxPoolItem& rAttr ) const #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/ui/config/dbconfig.cxx index ac732a81811d..19f802df42d5 100644 --- a/sw/source/ui/config/dbconfig.cxx +++ b/sw/source/ui/config/dbconfig.cxx @@ -117,5 +117,4 @@ const SwDBData& SwDBConfig::GetBibliographySource() void SwDBConfig::Commit() {} void SwDBConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx index 8fc5e8c8dd64..35d84ab36034 100644 --- a/sw/source/ui/config/fontcfg.cxx +++ b/sw/source/ui/config/fontcfg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <fontcfg.hxx> #include <i18nlangtag/mslangid.hxx> #include <vcl/outdev.hxx> diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 4d7a3d0a16b2..b2aebf9d3a2b 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -107,7 +107,6 @@ class SwAuthenticationSettingsDialog : public SfxModalDialog DECL_LINK( CheckBoxHdl_Impl, CheckBox*); DECL_LINK(RadioButtonHdl_Impl, void *); - public: SwAuthenticationSettingsDialog(SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem); ~SwAuthenticationSettingsDialog(); @@ -230,7 +229,6 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare m_sCompleted = m_pResult1->GetText(); m_sFailed = m_pResult2->GetText(); - SfxImageManager* pManager = SfxImageManager::GetImageManager( SW_MOD() ); m_aFailedImg = pManager->GetImage(FN_FORMULA_CANCEL); m_aCompletedImg = pManager->GetImage(FN_FORMULA_APPLY); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index c03f5ee71b04..838fe3c8825c 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -436,7 +436,6 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) ::FillCharStyleListBox( *m_pCharStyleLB, pSh->GetView().GetDocShell(), true, true ); } - nCount = pMgr->GetFormatCount(TYP_SEQFLD, false); for ( i = 0; i < nCount; ++i ) { diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 4b4340d66076..cd88ff2ed640 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -66,7 +66,6 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> - using namespace ::com::sun::star; /*-------------------------------------------------------- @@ -235,7 +234,6 @@ sal_Bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) aElem.bVertRulerRight = m_pVRulerRightCBox->IsChecked(); aElem.bSmoothScroll = m_pSmoothCBox->IsChecked(); - sal_Bool bRet = !pOldAttr || aElem != *pOldAttr; if(bRet) bRet = 0 != rSet.Put(aElem); @@ -885,7 +883,6 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) nListHeight = (sal_Int32)rFontHeightList.GetHeight(); bListHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); - pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_LABEL); bLabelDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); const SvxFontItem& rFontCP = !nFontGroup ? pColl->GetFont() : @@ -1056,7 +1053,6 @@ IMPL_LINK( SwStdFontTabPage, LoseFocusHdl, ComboBox*, pBox ) return 0; } - void SwStdFontTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt16Item, SID_FONTMODE_TYPE, false); @@ -1333,7 +1329,6 @@ SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new SwShdwCrsrOptionsTabPage( pParent, rSet ); } - void SwShdwCrsrOptionsTabPage::PageCreated( SfxAllItemSet aSet ) { SFX_ITEMSET_ARG (&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL,false); @@ -1341,7 +1336,6 @@ void SwShdwCrsrOptionsTabPage::PageCreated( SfxAllItemSet aSet ) SetWrtShell(pWrtSh->GetValue()); } - sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) { SwShadowCursorItem aOpt; @@ -2221,8 +2215,6 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) rExampleWin.Invalidate(); } - - SwCompareOptionsTabPage::SwCompareOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent,"OptComparison","modules/swriter/ui/optcomparison.ui", rSet ) { @@ -2441,9 +2433,6 @@ IMPL_LINK_NOARG_INLINE_START(SwTestTabPage, AutoClickHdl) } IMPL_LINK_NOARG_INLINE_END(SwTestTabPage, AutoClickHdl) - #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx index ca075300dfbe..ac3251b0d145 100644 --- a/sw/source/ui/config/prtopt.cxx +++ b/sw/source/ui/config/prtopt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/configmgr.hxx> #include <prtopt.hxx> #include <osl/diagnose.h> @@ -26,7 +25,6 @@ #include <unomid.h> - using namespace utl; using namespace com::sun::star::uno; @@ -130,7 +128,6 @@ SwPrintOptions::~SwPrintOptions() { } - void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} void SwPrintOptions::Commit() @@ -175,7 +172,4 @@ void SwPrintOptions::Commit() PutProperties(aNames, aValues); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index aa6fb9f8087f..8871d2b15bc7 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <svl/urihelper.hxx> #include <osl/thread.h> @@ -40,7 +39,6 @@ using namespace ::com::sun::star; - #define VERSION_30B ((sal_uInt16)250) #define VERSION_31B ((sal_uInt16)326) #define VERSION_40A ((sal_uInt16)364) @@ -49,7 +47,6 @@ using namespace ::com::sun::star; #define CHAPTER_FILENAME "chapter.cfg" - // SwNumRulesWithName ---------------------------------------------------- // PUBLIC METHODES ------------------------------------------------------- /*------------------------------------------------------------------------ diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx index e848580314c2..7c47d4518486 100644 --- a/sw/source/ui/config/usrpref.cxx +++ b/sw/source/ui/config/usrpref.cxx @@ -37,8 +37,6 @@ using namespace utl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - - void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy) { *((SwViewOption*)this) = rCopy; @@ -100,7 +98,6 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames() "Update/Field", // 17 "Update/Chart" // 18 - }; const int nCount = bWeb ? 12 : 19; Sequence<OUString> aNames(nCount); @@ -592,5 +589,4 @@ void SwWebColorConfig::Load() } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 83ef2e8a3412..688e99829e64 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -250,7 +250,6 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt) #endif } - SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt ) { // #114856# Formular view @@ -292,7 +291,6 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt ) return *this; } - SwViewOption::~SwViewOption() { } diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index f91e22d17f3c..4037f748d740 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -416,7 +416,6 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton) } xStore->storeAsURL(sTmpName, Sequence< PropertyValue >()); - uno::Reference<XNamingService> xNaming(m_xDBContext, UNO_QUERY); xNaming->registerObject( sFind, xNewInstance ); //now insert the new source into the ListBox diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index c9d8cf152956..7d8205a72582 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -27,7 +27,6 @@ #include <swdbdata.hxx> #include "sharedconnection.hxx" - namespace com{namespace sun{namespace star{ namespace container{ class XNameAccess; diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index cdb0354d8881..1f4f99cd8c20 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -41,7 +41,6 @@ #include <helpid.h> #include <unomid.h> - using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index bd5b36392a18..199e67ed6eb7 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -158,7 +158,6 @@ struct _DB_Column } }; - struct _DB_ColumnConfigData { SwInsDBColumns aDBColumns; @@ -1026,7 +1025,6 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, sal_Bool bIsAutoUpdateCells = rSh.IsAutoUpdateCells(); rSh.SetAutoUpdateCells( sal_False ); - if( m_pCbTableHeadon->IsChecked() ) { for( n = 0; n < nCols; ++n ) @@ -1230,7 +1228,6 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, GetFldType( 0, RES_DBNEXTSETFLD ), OUString("1"), aEmptyOUStr, aDBData ); - bool bSetCrsr = true; sal_uInt16 n = 0, nCols = aColArr.size(); ::sw::mark::IMark* pMark = NULL; @@ -1256,7 +1253,6 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, if(bBreak) break; - for( n = 0; n < nCols; ++n ) { _DB_Column* pDBCol = &aColArr[ n ]; @@ -1733,7 +1729,6 @@ void SwInsertDBColAutoPilot::Load() pInsDBColumn->nUsrNumFmt = rNFmtr.GetEntryKey( pInsDBColumn->sUsrNumFmt, pInsDBColumn->eUsrNumFmtLng ); - pNewData->aDBColumns.insert(pInsDBColumn); } sal_Int32 n = 0; diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 8023f22a128d..2905c6799529 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -155,7 +155,6 @@ const sal_Char cDataSourceName[] = "DataSourceName"; const sal_Char cSelection[] = "Selection"; const sal_Char cActiveConnection[] = "ActiveConnection"; - // Use nameless namespace to avoid to rubbish the global namespace namespace @@ -1820,7 +1819,6 @@ sal_Bool SwNewDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& r return bRet; } - // reads the column data at the current position sal_Bool SwNewDBMgr::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage, OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/) @@ -2067,7 +2065,6 @@ sal_uInt32 SwNewDBMgr::GetSelectedRecordId( return nRet; } - // close all data sources - after fields were updated void SwNewDBMgr::CloseAll(sal_Bool bIncludingMerge) { @@ -2674,7 +2671,6 @@ uno::Reference<XResultSet> SwNewDBMgr::createCursor(const OUString& _sDataSource return xResultSet; } - // merge all data into one resulting document and return the number of merged documents sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig, SwView& rSourceView ) @@ -2759,13 +2755,11 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig, bool bPageStylesWithHeaderFooter = rMaster.GetHeader().IsActive() || rMaster.GetFooter().IsActive(); - // copy compatibility options lcl_CopyCompatibilityOptions( rSourceShell, *pTargetShell); // #72821# copy dynamic defaults lcl_CopyDynamicDefaults( *rSourceShell.GetDoc(), *pTargetShell->GetDoc() ); - long nStartRow, nEndRow; sal_uLong nDocNo = 1; sal_Int32 nDocCount = 0; diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index cb2e0f5579fd..7eb15a02c677 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sot/formats.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx index fd45bbca5f06..8247f5c8bfe0 100644 --- a/sw/source/ui/dbui/dbui.cxx +++ b/sw/source/ui/dbui/dbui.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "wrtsh.hxx" #include "dbui.hrc" diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index 8ddda2de4f6a..48761c615d2b 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -125,7 +125,6 @@ struct SwSendMailDialog_Impl uno::Reference< mail::XMailService > xConnectedInMailService; Timer aRemoveTimer; - SwSendMailDialog_Impl() : nCurrentDescriptor(0), nDocumentCount(0) @@ -307,7 +306,6 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf m_aStopPB.SetClickHdl(LINK( this, SwSendMailDialog, StopHdl_Impl)); m_aClosePB.SetClickHdl(LINK( this, SwSendMailDialog, CloseHdl_Impl)); - Size aLBSize(m_aStatusLB.GetSizePixel()); m_aStatusHB.SetSizePixel(aLBSize); Size aHeadSize(m_aStatusHB.CalcWindowSizePixel()); @@ -665,5 +663,4 @@ void SwSendMailDialog::AllMailsSent() m_aStopPB.Enable(false); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index c25d09ce3c4b..26e60f2537f4 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; - namespace SwMailMergeHelper { @@ -167,7 +166,6 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer( return xSmtpServer; } - } //namespace SwBoldFixedInfo::SwBoldFixedInfo(Window* pParent, const ResId& rResId) : diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 25880d41e879..cd3cb79f4c0d 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1367,7 +1367,6 @@ void AddressMultiLineEdit::SetText( const OUString& rStr ) } } - // Insert the new entry in front of the entry at the beginning of the selection void AddressMultiLineEdit::InsertNewEntry( const OUString& rStr ) { diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 4451bae26997..e46c1203d2e3 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -296,5 +296,4 @@ public: }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx index 05fa5155ae9a..ad8a2393adec 100644 --- a/sw/source/ui/dbui/mmconfigitem.cxx +++ b/sw/source/ui/dbui/mmconfigitem.cxx @@ -149,7 +149,6 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem sal_Bool bIsGreetingLineInMail_LastUserSetting; sal_Bool bIsGreetingLine_LastUserSetting; - const Sequence< OUString>& GetPropertyNames(); public: @@ -503,7 +502,7 @@ void SwMailMergeConfigItem_Impl::Commit() { switch(nProp) { - case 0: pValues[nProp] <<= bIsOutputToLetter; break;// + case 0: pValues[nProp] <<= bIsOutputToLetter; break; case 1: pValues[nProp] <<= bIncludeCountry; break; case 2: pValues[nProp] <<= sExcludeCountry; break; case 3: pValues[nProp] <<= GetAddressBlocks(sal_True); break; @@ -1239,7 +1238,6 @@ Sequence< OUString> SwMailMergeConfigItem::GetColumnAssignment( return aRet; } - // returns the name that is assigned as e-mail column of the current data base OUString SwMailMergeConfigItem::GetAssignedColumn(sal_uInt32 nColumn) const { diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index f869b14bfa5f..feed6f6aeb04 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -145,7 +145,6 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton) xFltMgr->setCurrentFilter( pFlt->GetUIName() ) ; } - pFlt = aIter.Next(); } diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index 41c0df0f9c98..88381a2429b5 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -57,5 +57,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 5b2752825c5d..037da8c6e999 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -302,7 +302,6 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent) m_aPrevSetIB.SetClickHdl(aDataLink); m_aNextSetIB.SetClickHdl(aDataLink); - SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem(); m_aGreetingLineCB.Check(rConfig.IsGreetingLine(sal_False)); m_aPersonalizedCB.Check(rConfig.IsIndividualGreeting(sal_False)); diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index f5216a8a86b7..93d3abdf0a9d 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -158,5 +158,4 @@ public: }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 71df56b64526..3dd2016cf303 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -334,7 +334,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( const OUString* pAssignment = aAssignment.getConstArray(); if(aAssignment.getLength() > MM_PART_COUNTRY && !aAssignment[MM_PART_COUNTRY].isEmpty()) sCountryColumn = aAssignment[MM_PART_COUNTRY]; - // + OUString sHideParagraphsExpression; SwAddressIterator aIter(aBlocks[0]); while(aIter.HasMore()) diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 3ff1f0d3d21c..10c772eb81c2 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -98,5 +98,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx index 3c6e9b6c6e06..d9624e862f2e 100644 --- a/sw/source/ui/dbui/mmmergepage.hxx +++ b/sw/source/ui/dbui/mmmergepage.hxx @@ -55,8 +55,6 @@ public: }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index b18aa7a0473c..8a5c7756e035 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -110,7 +110,6 @@ class SwMailMergeOutputPage : public svt::OWizardPage OUString m_sCC; OUString m_sBCC; - DECL_LINK(OutputTypeHdl_Impl, RadioButton*); DECL_LINK(CopyToHdl_Impl, PushButton*); DECL_LINK(SaveStartHdl_Impl, PushButton* ); @@ -142,7 +141,6 @@ struct SwMailDescriptor OUString sBodyMimeType; OUString sBodyContent; - OUString sCC; OUString sBCC; }; @@ -221,5 +219,4 @@ public: }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 2265b3b19054..aae6621816c0 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -58,5 +58,4 @@ IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index 75f7077109d9..218d158c4422 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <swabstdlg.hxx> - #include <mmpreparemergepage.hrc> #include <unomid.h> diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx index 4a89e6c04f7c..34b7c8ce2873 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.hxx +++ b/sw/source/ui/dbui/mmpreparemergepage.hxx @@ -44,7 +44,6 @@ class SwMailMergePrepareMergePage : public svt::OWizardPage FixedInfo m_aEditFI; PushButton m_aEditPB; - SwMailMergeWizard* m_pWizard; DECL_LINK(EditDocumentHdl_Impl, void *); @@ -62,5 +61,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx index 3f513397769b..9fdc6a3ce930 100644 --- a/sw/source/ui/dbui/swdbtoolsclient.cxx +++ b/sw/source/ui/dbui/swdbtoolsclient.cxx @@ -34,9 +34,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdb; -//==================================================================== //= SwDbtoolsClient -//==================================================================== + namespace { diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx index d99365d1573f..a9a7c503a3e3 100644 --- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <SwSpellDialogChildWindow.hxx> #include <vcl/msgbox.hxx> #include <editeng/svxacorr.hxx> @@ -49,7 +48,6 @@ #include <dialog.hrc> #include <cmdid.h> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -58,7 +56,6 @@ using namespace ::com::sun::star::beans; SFX_IMPL_CHILDWINDOW_WITHID(SwSpellDialogChildWindow, FN_SPELL_GRAMMAR_DIALOG) - #define SPELL_START_BODY 0 // body text area #define SPELL_START_OTHER 1 // frame, footnote, header, footer #define SPELL_START_DRAWTEXT 2 // started in a draw text object @@ -169,7 +166,6 @@ SwSpellDialogChildWindow::~SwSpellDialogChildWindow () delete m_pSpellState; } - SfxChildWinInfo SwSpellDialogChildWindow::GetInfo (void) const { SfxChildWinInfo aInfo = svx::SpellDialogChildWindow::GetInfo(); @@ -177,7 +173,6 @@ SfxChildWinInfo SwSpellDialogChildWindow::GetInfo (void) const return aInfo; } - svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck) { svx::SpellPortions aRet; diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index ef45dbaf969a..10615365e400 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -41,7 +41,6 @@ #include "vcl/metric.hxx" - using namespace ::com::sun::star; const sal_Unicode cDialogExtraDataClose = '}'; @@ -209,7 +208,6 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, delete pPrt; } - } else { @@ -236,12 +234,10 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, m_pCR_RB->SaveValue(); } - SwAsciiFilterDlg::~SwAsciiFilterDlg() { } - void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions ) { sal_uLong nCCode = m_pCharSetLB->GetSelectTextEncoding(); @@ -388,5 +384,4 @@ IMPL_LINK( SwAsciiFilterDlg, LineEndHdl, RadioButton*, pBtn ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index d66984a6c4f8..28f390506b93 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -71,7 +71,6 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) } - SwDocStatPage::~SwDocStatPage() { } diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 6ccdf87274f5..0adc59500e23 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -106,7 +106,6 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) return aItem; } - bool SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh, SvxMacroItem*& rpINetItem ) { diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx index a7f0fdb7e84b..4085c67717f9 100644 --- a/sw/source/ui/dialog/regionsw.cxx +++ b/sw/source/ui/dialog/regionsw.cxx @@ -156,7 +156,6 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) pSet->GetItemState(FN_PARAM_3, true, &pItem)) aSub = ((const SfxStringItem *)pItem)->GetValue(); - if(!aFile.isEmpty() || !aSub.isEmpty()) { OUString sLinkFileName = OUString(sfx2::cTokenSeparator); diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 0b5e06c74349..6cf39d75ecb6 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -719,7 +719,6 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg(SwView& return new VclAbstractDialog_Impl(pDlg); } - SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFmtStr) { diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 12c3b0e1856b..55eb36eb93c1 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -368,7 +368,6 @@ public: virtual sal_uInt16 GetRestartPage() const; }; -//------------------------------------------------------------------------ //AbstractDialogFactory_Impl implementations class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory { diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 597fc6020489..a5a5f4e05270 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -184,7 +184,6 @@ public: { m_TempPasswd = rPasswd; } }; - SectRepr::SectRepr( sal_uInt16 nPos, SwSection& rSect ) : m_SectionData( rSect ) , m_Brush( RES_BACKGROUND ) @@ -237,7 +236,6 @@ void SectRepr::SetFile( const OUString& rFile ) } } - void SectRepr::SetFilter( const OUString& rFilter ) { OUString sNewFile; @@ -282,7 +280,6 @@ void SectRepr::SetSubRegion(const OUString& rSubRegion) } } - OUString SectRepr::GetFile() const { OUString sLinkFile( m_SectionData.GetLinkFileName() ); @@ -303,7 +300,6 @@ OUString SectRepr::GetFile() const return sLinkFile; } - OUString SectRepr::GetSubRegion() const { OUString sLinkFile( m_SectionData.GetLinkFileName() ); @@ -1837,8 +1833,6 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil return 0; } - - // numbering format conversion: // ListBox - format - enum-value // 0 - A, B, C, ... - 0 diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index fc584fc37e11..9190766c50ea 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star; - const short RET_EDIT = 100; // PUBLIC METHODS ------------------------------------------------------- @@ -73,7 +72,6 @@ struct TextBlockInfo_Impl typedef boost::ptr_vector<TextBlockInfo_Impl> TextBlockInfoArr; SV_IMPL_REF( SwDocShell ) - // Dialog for edit templates void SwGlossaryHdl::GlossaryDlg() { @@ -256,7 +254,6 @@ sal_Bool SwGlossaryHdl::DelGroup(const OUString &rGrpName) return sal_False; } - // ask for number of autotexts sal_uInt16 SwGlossaryHdl::GetGlossaryCnt() { @@ -674,7 +671,6 @@ sal_Bool SwGlossaryHdl::Rename(const OUString& rOldShort, const OUString& rNewSh return bRet; } - sal_Bool SwGlossaryHdl::IsReadOnly( const OUString* pGrpNm ) const { SwTextBlocks *pGlossary = 0; @@ -692,7 +688,6 @@ sal_Bool SwGlossaryHdl::IsReadOnly( const OUString* pGrpNm ) const return bRet; } - sal_Bool SwGlossaryHdl::IsOld() const { SwTextBlocks *pGlossary = pCurGrp ? pCurGrp diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 22d183c949d9..085115cdf1fd 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -125,7 +125,6 @@ extern bool bFrmDrag; extern bool bDDINetAttr; extern bool bExecuteDrag; - #define OLESIZE 11905 - 2 * lMinBorder, 6 * MM50 #define SWTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001 @@ -268,7 +267,6 @@ SwTransferable::~SwTransferable() delete pTargetURL; delete pBkmk; - eBufferType = TRNSFR_NONE; Application::GetSolarMutex().release(); @@ -692,7 +690,6 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream, } break; - case SWTRANSFER_OBJECTTYPE_DDE: { xStream->SetBufferSize( 1024 ); @@ -1279,7 +1276,6 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, OSL_ENSURE( pPt, "EXCHG_OUT_ACTION_MOVE_PRIVATE: what should happen here?" ); break; - case EXCHG_IN_ACTION_MOVE: case EXCHG_IN_ACTION_COPY: case EXCHG_IN_ACTION_LINK: @@ -2111,7 +2107,6 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData, pTyp = rWrtShell.InsertFldType( aType ); } - SwDDEFieldType* pDDETyp = (SwDDEFieldType*)pTyp; OUString aExpand; diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx index 9eed5b537e4c..4d8215efd400 100644 --- a/sw/source/ui/docvw/AnnotationWin.cxx +++ b/sw/source/ui/docvw/AnnotationWin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <AnnotationWin.hxx> #include <AnnotationMenuButton.hxx> @@ -54,7 +53,6 @@ #include <boost/scoped_ptr.hpp> - namespace sw { namespace annotation { SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin, diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 048b18a57636..b68c59a194d8 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -123,7 +123,6 @@ namespace } } - SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, const SwPageFrm* pPageFrm, bool bHeader ) : MenuButton( pEditWin, WB_DIALOGCONTROL ), SwFrameControl( pEditWin, pPageFrm ), @@ -415,7 +414,6 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot ) if ( m_bIsHeader ) pHFFmt = const_cast< SwFrmFmt* >( rMaster.GetHeader().GetHeaderFmt() ); - SfxItemPool* pPool = pHFFmt->GetAttrSet().GetPool(); SfxItemSet aSet( *pPool, RES_BACKGROUND, RES_BACKGROUND, diff --git a/sw/source/ui/docvw/OverlayRanges.cxx b/sw/source/ui/docvw/OverlayRanges.cxx index 3f470a124330..7b44a9b3bdb9 100755 --- a/sw/source/ui/docvw/OverlayRanges.cxx +++ b/sw/source/ui/docvw/OverlayRanges.cxx @@ -29,8 +29,6 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> -////////////////////////////////////////////////////////////////////////////// - namespace { // combine ranges geometrically to a single, ORed polygon @@ -158,7 +156,6 @@ namespace sw } } - void OverlayRanges::ShowSolidBorder() { if ( !mbShowSolidBorder ) diff --git a/sw/source/ui/docvw/OverlayRanges.hxx b/sw/source/ui/docvw/OverlayRanges.hxx index 34708c2e27a4..ccbe668211aa 100755 --- a/sw/source/ui/docvw/OverlayRanges.hxx +++ b/sw/source/ui/docvw/OverlayRanges.hxx @@ -27,8 +27,6 @@ class SwView; -////////////////////////////////////////////////////////////////////////////// - namespace sw { namespace overlay @@ -75,8 +73,6 @@ namespace sw } // end of namespace overlay } // end of namespace sw -////////////////////////////////////////////////////////////////////////////// - #endif //_SW_OVERLAY_OVERLAYRANGES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index 22f333b60a59..82f078c445db 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PostItMgr.hxx" #include <postithelper.hxx> @@ -61,7 +60,6 @@ #include <sfx2/event.hxx> #include <svl/srchitem.hxx> - #include <svl/languageoptions.hxx> #include <svtools/langtab.hxx> #include <svl/smplhint.hxx> @@ -796,7 +794,6 @@ void SwPostItMgr::LayoutPostIts() CheckForRemovedPostIts(); } - // notes scrollbar is otherwise not drawn correctly for some cases // scrollbar area is enough if (bUpdate) @@ -1252,7 +1249,6 @@ void SwPostItMgr::Hide() } } - void SwPostItMgr::Show() { for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i) @@ -1486,7 +1482,6 @@ Rectangle SwPostItMgr::GetTopScrollRect(const unsigned long aPage) const return Rectangle(aPointTop,aSize); } - //IMPORTANT: if you change the rects here, also change SwPageFrm::PaintNotesSidebar() bool SwPostItMgr::ScrollbarHit(const unsigned long aPage,const Point &aPoint) { @@ -1569,7 +1564,6 @@ void SwPostItMgr::CorrectPositions() } } - bool SwPostItMgr::ShowNotes() const { // we only want to see notes if Options - Writer - View - Notes is ticked diff --git a/sw/source/ui/docvw/ShadowOverlayObject.cxx b/sw/source/ui/docvw/ShadowOverlayObject.cxx index 1440c8d8ed98..efb1a5d68e27 100644 --- a/sw/source/ui/docvw/ShadowOverlayObject.cxx +++ b/sw/source/ui/docvw/ShadowOverlayObject.cxx @@ -31,7 +31,7 @@ namespace sw { namespace sidebarwindows { // helper SwPostItShadowPrimitive -// + // Used to allow view-dependent primitive definition. For that purpose, the // initially created primitive (this one) always has to be view-independent, // but the decomposition is made view-dependent. Very simple primitive which diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx index 54cc3b2653f3..a6d39d067b9f 100644 --- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx @@ -34,7 +34,6 @@ namespace sw { namespace sidebarwindows { - // declaration and implementation of <SvxEditSource> // for <::accessibiliy::AccessibleTextHelper> instance class SidebarTextEditSource : public SvxEditSource, diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index 742c116e09b1..f05fd724c485 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <SidebarWin.hxx> #include <SidebarWinAcc.hxx> #include <PostItMgr.hxx> @@ -325,7 +324,6 @@ void SwSidebarWin::InitControls() mpMetadataDate->SetSettings(aSettings); } - SwDocShell* aShell = mrView.GetDocShell(); mpOutliner = new Outliner(&aShell->GetPool(),OUTLINERMODE_TEXTOBJECT); aShell->GetDoc()->SetCalcFieldValueHdl( mpOutliner ); @@ -954,7 +952,6 @@ void SwSidebarWin::DeactivatePostIt() if ( !Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) GetOutlinerView()->SetBackgroundColor(COL_TRANSPARENT); - if ( !IsProtected() && Engine()->GetEditEngine().GetText().isEmpty() ) { mnEventId = Application::PostUserEvent( LINK( this, SwSidebarWin, DeleteHdl), 0 ); @@ -1124,7 +1121,6 @@ IMPL_LINK_NOARG(SwSidebarWin, DeleteHdl) return 0; } - void SwSidebarWin::ResetAttributes() { mpOutlinerView->RemoveAttribsKeepLanguages(true); diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx index dd3bdf287812..da9d0fb9cc4e 100644 --- a/sw/source/ui/docvw/edtdd.cxx +++ b/sw/source/ui/docvw/edtdd.cxx @@ -19,7 +19,6 @@ #include <hintids.hxx> - #include <svx/svdview.hxx> #include <editeng/outliner.hxx> #include <svx/svdobj.hxx> @@ -58,7 +57,6 @@ void SwEditWin::StartDDTimer() bDDTimerStarted = true; } - void SwEditWin::StopDDTimer(SwWrtShell *pSh, const Point &rPt) { m_aTimer.Stop(); @@ -154,7 +152,6 @@ void SwEditWin::DragFinished() m_bIsInDrag = sal_False; } - void SwEditWin::DropCleanup() { SwWrtShell &rSh = m_rView.GetWrtShell(); @@ -183,7 +180,6 @@ void SwEditWin::CleanupDropUserMarker() } } - //exhibition hack (MA,MBA) void SwView::SelectShellForDrop() { @@ -234,7 +230,6 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt ) nUserOpt, m_nDropFormat, nEventAction, 0, &rEvt.maDropEvent.Transferable ); - TransferableDataHelper aData( rEvt.maDropEvent.Transferable ); nRet = rEvt.mnAction; if( !SwTransferable::PasteData( aData, rSh, m_nDropAction, m_nDropFormat, @@ -247,7 +242,6 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } - sal_uInt16 SwEditWin::GetDropDestination( const Point& rPixPnt, SdrObject ** ppObj ) { SwWrtShell &rSh = m_rView.GetWrtShell(); @@ -481,7 +475,6 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) return DND_ACTION_NONE; } - IMPL_LINK_NOARG(SwEditWin, DDHandler) { bDDTimerStarted = false; diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index ad0f5927803a..10794255f42b 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -699,8 +699,6 @@ void SwEditWin::StopInsFrm() m_nInsFrmColCount = 1; } - - sal_Bool SwEditWin::IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr ) const { const SvtCTLOptions& rCTLOptions = SW_MOD()->GetCTLOptions(); @@ -773,18 +771,18 @@ static sal_uInt16 lcl_isNonDefaultLanguage(LanguageType eBufferLanguage, SwView& // wants to use the language reported from the system, // except if we knew that it was explicitly switched (thus // the check for "bInputLangeSwitched"). - // + // The language reported by the system could be just the // system default language that the user is not even aware // of, because no language selection tool is installed at // all. In this case the OOo language should get preference // as it might have been selected by the user explicitly. - // + // Usually this case happens if the OOo language is // different to the system language but the system keyboard // is still suitable for the OOo language (e.g. writing // English texts with a German keyboard). - // + // For non-latin keyboards overwriting the attribute is // still valid. We do this for kyrillic and greek ATM. In // future versions of OOo this should be replaced by a @@ -834,9 +832,8 @@ void SwEditWin::FlushInBuffer() uno::Reference < i18n::XExtendedInputSequenceChecker > xISC = pCheckIt->xCheck; if ( xISC.is() && IsInputSequenceCheckingRequired( m_aInBuffer, *rSh.GetCrsr() ) ) { - // + // apply (Thai) input sequence checking/correction - // rSh.Push(); // push current cursor to stack @@ -2583,7 +2580,6 @@ KEYINPUT_CHECKTABLE_INSDEL: case KS_CellTopSmall: rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_TOP, pModOpt->GetTblVMove() ); break; case KS_CellBottomSmall: rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_BOTTOM, pModOpt->GetTblVMove() ); break; - case KS_InsDel_ColLeftBig: rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_LEFT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHInsert() ); break; case KS_InsDel_ColRightBig: rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_RIGHT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHInsert() ); break; case KS_InsDel_ColLeftSmall: rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_LEFT, pModOpt->GetTblHInsert() ); break; @@ -2861,7 +2857,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) // Is the cursor in a part like similar to the one we clicked on? For example, // if the cursor is in a header and we click on an empty header... don't change anything to // keep consistent behaviour due to header edit mode (and the same for the footer as well). - // + // Otherwise, we hide the header/footer control if a separator is shown, and vice versa. if ( !( bWasInHeader && eControl == Header ) && !( bWasInFooter && eControl == Footer ) ) @@ -2903,7 +2899,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) } } - if ( IsChainMode() ) { SetChainMode( sal_False ); @@ -6001,7 +5996,6 @@ void SwEditWin::ShowAutoTextCorrectQuickHelp( m_pQuickHlpData->FillStrArr( rSh, rWord ); } - if( !m_pQuickHlpData->m_aHelpStrings.empty() ) { m_pQuickHlpData->SortAndFilter(rWord); diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index 81413b89351c..f2779a03262e 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -95,7 +95,6 @@ static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, sal_Bool bBallo return sBuf.makeStringAndClear(); } - void SwEditWin::RequestHelp(const HelpEvent &rEvt) { SwWrtShell &rSh = m_rView.GetWrtShell(); diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx index 36ea5e4d49f2..a860d484df12 100644 --- a/sw/source/ui/docvw/edtwin3.cxx +++ b/sw/source/ui/docvw/edtwin3.cxx @@ -35,8 +35,6 @@ #include <frmatr.hxx> #include <editeng/frmdiritem.hxx> - - // Core-Notify void ScrollMDI( SwViewShell* pVwSh, const SwRect &rRect, sal_uInt16 nRangeX, sal_uInt16 nRangeY) diff --git a/sw/source/ui/docvw/frmsidebarwincontainer.cxx b/sw/source/ui/docvw/frmsidebarwincontainer.cxx index cf64e176528f..3760f9778446 100644 --- a/sw/source/ui/docvw/frmsidebarwincontainer.cxx +++ b/sw/source/ui/docvw/frmsidebarwincontainer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <frmsidebarwincontainer.hxx> #include <map> diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx index 024f3f2b6faa..bbed8b0a7589 100644 --- a/sw/source/ui/docvw/romenu.cxx +++ b/sw/source/ui/docvw/romenu.cxx @@ -80,7 +80,6 @@ void SwReadOnlyPopup::Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher &rD delete _pItem; } - SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) : PopupMenu( SW_RES(MN_READONLY_POPUP) ), rView ( rV ), diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index bae8278ca52f..65c6f25c02c5 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -72,13 +72,12 @@ static void lcl_Highlight(const OUString& rSource, SwTextPortions& aPortionList) const sal_Unicode cLF = 0x0a; const sal_Unicode cCR = 0x0d; - const sal_uInt16 nStrLen = rSource.getLength(); sal_uInt16 nInsert = 0; // number of inserted portions sal_uInt16 nActPos = 0; // position, where '<' was found sal_uInt16 nOffset = 0; // Offset of nActPos to '<' sal_uInt16 nPortStart = USHRT_MAX; // for the TextPortion - sal_uInt16 nPortEnd = 0; // + sal_uInt16 nPortEnd = 0; SwTextPortion aText; while(nActPos < nStrLen) { @@ -722,7 +721,7 @@ void SwSrcEditWindow::ImpDoHighlight( const OUString& rSource, sal_uInt16 nLineO r.eType != svtools::HTMLUNKNOWN) r.eType = svtools::HTMLUNKNOWN; Color aColor((ColorData)SW_MOD()->GetColorConfig().GetColorValue((svtools::ColorConfigEntry)r.eType).nColor); - sal_uInt16 nLine = nLineOff+r.nLine; // + sal_uInt16 nLine = nLineOff+r.nLine; pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLine, r.nStart, r.nEnd+1, true ); } } diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index bc1ee30302a8..468f273fb14e 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -524,6 +524,4 @@ void SwEnvFmtPage::Reset(const SfxItemSet& rSet) DELETEZ(GetParentSwEnvDlg()->pAddresseeSet); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index a71c710a02b5..8629d5f8deb7 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -73,5 +73,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index d6475903b588..6bdbe02f6e31 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -44,8 +44,6 @@ using namespace utl; using namespace ::com::sun::star::uno; - - TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem ); SW_DLLPUBLIC OUString MakeSender() diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index ef04fa76ff74..f9abd95b55ab 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::rtl; - //impl in envimg.cxx extern SW_DLLPUBLIC OUString MakeSender(); @@ -353,5 +352,4 @@ void SwEnvPage::Reset(const SfxItemSet& rSet) m_pSenderBox->GetClickHdl().Call(m_pSenderBox); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 32d4defdad6c..6134474a7a6c 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_ENVELP_ENVPRT_HXX #define INCLUDED_SW_SOURCE_UI_ENVELP_ENVPRT_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/toolbox.hxx> #include <vcl/field.hxx> @@ -29,8 +28,6 @@ #include <vcl/button.hxx> #include <svtools/stdctrl.hxx> - - #include "envimg.hxx" class SwEnvDlg; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 3a64309f1e0a..839bd7ff657a 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -38,7 +38,6 @@ //impl in envimg.cxx extern SW_DLLPUBLIC OUString MakeSender(); - void SwLabRec::SetFromItem( const SwLabItem& rItem ) { lHDist = rItem.lHDist; @@ -878,6 +877,4 @@ void SwBusinessDataPage::Reset(const SfxItemSet& rSet) m_pMailED->SetText(aItem.aCompMail); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx index 9fe33ee3724d..8630ea098465 100644 --- a/sw/source/ui/envelp/labelcfg.cxx +++ b/sw/source/ui/envelp/labelcfg.cxx @@ -355,5 +355,4 @@ void SwLabelConfig::SaveLabel( const OUString& rManufacturer, m_aLabels[rManufacturer][rType].m_bPredefined = false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 4d0d8fed4b1f..669d5135c534 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -30,7 +30,6 @@ #include <unomid.h> #include <unoprnms.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; @@ -234,7 +233,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, } catch (const uno::RuntimeException&) { - // + } uno::Reference< container::XEnumerationAccess > xFldAcc = xFlds->getTextFields(); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 92a2475c832b..bae7395f7694 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -39,7 +39,6 @@ using namespace utl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - #define ROUND(x) ((sal_uInt16) ((x) + .5)) SwLabPreview::SwLabPreview(Window* pParent) diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx index c381b764e0a9..a2006b87dda9 100644 --- a/sw/source/ui/envelp/labimg.cxx +++ b/sw/source/ui/envelp/labimg.cxx @@ -32,7 +32,6 @@ using namespace utl; using namespace ::com::sun::star::uno; - SwLabItem::SwLabItem() : SfxPoolItem(FN_LABEL), diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/ui/envelp/labimp.hxx index bef8f983fb68..5d4d17d7cfb3 100644 --- a/sw/source/ui/envelp/labimp.hxx +++ b/sw/source/ui/envelp/labimp.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_ENVELP_LABIMP_HXX #define INCLUDED_SW_SOURCE_UI_ENVELP_LABIMP_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> @@ -101,7 +100,6 @@ public: sal_Bool bCont; }; - class SwLabRecs : public std::vector<SwLabRec*> { public: ~SwLabRecs() diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 0132db7f26cd..1821a2877ebc 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -26,7 +26,6 @@ #include <svtools/stdctrl.hxx> #include <sfx2/tabdlg.hxx> - class SwLabDlg; class SwLabItem; @@ -71,5 +70,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index b3d90b7d084a..bc38910ff376 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -77,7 +77,6 @@ using namespace ::com::sun::star::form; using namespace ::com::sun::star::view; using namespace ::com::sun::star::ui::dialogs; - struct SwMailMergeDlg_Impl { uno::Reference<runtime::XFormController> xFController; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 3a8b10b19726..e853f4479d08 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -94,7 +94,6 @@ class SwVisitingCardPage : public SfxTabPage SwOneExampleFrame* pExampleFrame; ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextContainer2 > m_xAutoText; - DECL_LINK( AutoTextSelectHdl, void* ); DECL_LINK( FrameControlInitializedHdl, void* ); diff --git a/sw/source/ui/envelp/syncbtn.cxx b/sw/source/ui/envelp/syncbtn.cxx index 8dfe8332291e..b3882f011b8e 100644 --- a/sw/source/ui/envelp/syncbtn.cxx +++ b/sw/source/ui/envelp/syncbtn.cxx @@ -79,5 +79,4 @@ IMPL_LINK_NOARG(SwSyncBtnDlg, BtnHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index ebb6ae19af07..1eb7e5107a52 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; - /*-------------------------------------------------------------------- Description: edit insert-field --------------------------------------------------------------------*/ @@ -56,7 +55,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(Window *pParent, SwWrtShell &rS, } if( RES_DROPDOWN == pField->GetTyp()->Which() ) { - // + pDropField = (SwDropDownField*)pField; OUString sTitle = GetText(); sTitle += pDropField->GetPar2(); diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index 1bb07a7bec3e..aa4021b2614f 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <FldRefTreeListBox.hxx> #include <helpid.h> diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 4115bc6f12be..f304d9077206 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::uno; - /*-------------------------------------------------------------------- Description: edit insert-field --------------------------------------------------------------------*/ diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 8ccfe3bea86d..2874f4e65697 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -83,7 +83,6 @@ public: void SetWrtShell(SwWrtShell& rSh); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 53ac270281f5..78ccac188032 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -472,6 +472,4 @@ void SwFldDokInfPage::FillUserData() SetUserData(sData); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index cd37f9366c2a..8e5727cd4033 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -71,7 +71,6 @@ public: virtual void FillUserData(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 39f016842f63..522599524996 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -73,7 +73,6 @@ public: virtual void FillUserData(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 71491a805d7d..053ea40fe929 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -37,7 +37,6 @@ #include <fldedt.hxx> #include <crsskip.hxx> - #include <cmdid.h> #include <helpid.h> #include <globals.hrc> diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 101f58f35740..6c172a2cf846 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; - SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet) : SwFldPage(pParent, "FldFuncPage", "modules/swriter/ui/fldfuncpage.ui", rCoreSet) diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 9f38cefc784c..2923fd2c7fd6 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -95,7 +95,6 @@ public: virtual void FillUserData(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 72615a1989ae..d4a0b5c4fb09 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cmdid.h> #include <hintids.hxx> #include <svl/stritem.hxx> @@ -236,7 +235,6 @@ SwFldMgr::SwFldMgr(SwWrtShell* pSh ) : GetCurFld(); } - SwFldMgr::~SwFldMgr() { } @@ -282,7 +280,6 @@ sal_uInt16 SwFldMgr::GetFldTypeCount(sal_uInt16 nResId) const return pSh ? pSh->GetFldTypeCount(nResId) : 0; } - SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, sal_uInt16 nId) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); @@ -290,7 +287,6 @@ SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, sal_uInt16 nId) const return pSh ? pSh->GetFldType(nId, nResId) : 0; } - SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, const OUString& rName) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); @@ -298,7 +294,6 @@ SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, const OUString& rName) cons return pSh ? pSh->GetFldType(nResId, rName) : 0; } - /*-------------------------------------------------------------------- Description: determine current field --------------------------------------------------------------------*/ @@ -344,7 +339,6 @@ SwField* SwFldMgr::GetCurFld() Description: provide group range --------------------------------------------------------------------*/ - const SwFldGroupRgn& SwFldMgr::GetGroupRange(sal_Bool bHtmlMode, sal_uInt16 nGrpId) const { static SwFldGroupRgn const aRanges[] = @@ -407,14 +401,12 @@ sal_uInt16 SwFldMgr::GetGroup(sal_Bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 ACCESS over TYP_.... --------------------------------------------------------------------*/ - sal_uInt16 SwFldMgr::GetTypeId(sal_uInt16 nPos) { OSL_ENSURE(nPos < ::GetPackCount(), "forbidden Pos"); return aSwFlds[ nPos ].nTypeId; } - OUString SwFldMgr::GetTypeStr(sal_uInt16 nPos) { OSL_ENSURE(nPos < ::GetPackCount(), "forbidden TypeId"); @@ -440,7 +432,6 @@ OUString SwFldMgr::GetTypeStr(sal_uInt16 nPos) Description: determine Pos in the list --------------------------------------------------------------------*/ - sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId) { switch( nTypeId ) @@ -571,7 +562,6 @@ bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) ACCESS over TYP_.... --------------------------------------------------------------------*/ - sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool bHtmlMode) const { OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId"); @@ -628,7 +618,6 @@ sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool b Description: determine FormatString to a type --------------------------------------------------------------------*/ - OUString SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const { OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId"); @@ -771,7 +760,6 @@ sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const Description: Traveling --------------------------------------------------------------------*/ - sal_Bool SwFldMgr::GoNextPrev( sal_Bool bNext, SwFieldType* pTyp ) { SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); @@ -802,7 +790,6 @@ sal_Bool SwFldMgr::GoNextPrev( sal_Bool bNext, SwFieldType* pTyp ) Description: insert field types --------------------------------------------------------------------*/ - void SwFldMgr::InsertFldType(SwFieldType& rType) { SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); @@ -815,7 +802,6 @@ void SwFldMgr::InsertFldType(SwFieldType& rType) Description: determine current TypeId --------------------------------------------------------------------*/ - sal_uInt16 SwFldMgr::GetCurTypeId() const { return pCurFld ? pCurFld->GetTypeId() : USHRT_MAX; @@ -825,7 +811,6 @@ sal_uInt16 SwFldMgr::GetCurTypeId() const Description: Over string insert field or update --------------------------------------------------------------------*/ - sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData) { @@ -1395,7 +1380,6 @@ sal_Bool SwFldMgr::InsertFld( } OSL_ENSURE(pFld, "field not available"); - //the auto language flag has to be set prior to the language! pFld->SetAutomaticLanguage(rData.bIsAutomaticLanguage); sal_uInt16 nLang = GetCurrLanguage(); @@ -1431,7 +1415,6 @@ sal_Bool SwFldMgr::InsertFld( Description: fields update --------------------------------------------------------------------*/ - void SwFldMgr::UpdateCurFld(sal_uLong nFormat, const OUString& rPar1, const OUString& rPar2, diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index 226a3f8d8e6c..364dad36c7ad 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -90,7 +90,6 @@ public: virtual sal_uInt16 GetGroup() = 0; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index ccd742513f85..dbfd35cfc660 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -152,7 +152,6 @@ sal_uInt16 SwFldRefPage::GetSavedSelectedPos() const return mnSavedSelectedPos; } - void SwFldRefPage::Reset(const SfxItemSet& ) { if (!IsFldEdit()) diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index fb88d16f5dcc..453ca8ada11b 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -89,7 +89,6 @@ public: virtual void FillUserData(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 32b3ab1410dd..9fa310f42093 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -46,12 +46,10 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> - /*-------------------------------------------------------------------- Description: carrier of the dialog --------------------------------------------------------------------*/ - SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) : SfxTabDialog(pParent, "FieldDialog", "modules/swriter/ui/fielddialog.ui") , m_pChildWin(pCW) @@ -207,7 +205,6 @@ IMPL_LINK_NOARG(SwFldDlg, CancelHdl) return 0; } - /*-------------------------------------------------------------------- Description: newly initialise dialog after Doc-Switch --------------------------------------------------------------------*/ @@ -342,5 +339,4 @@ void SwFldDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src index 0660727f15d8..a564a8e36180 100644 --- a/sw/source/ui/fldui/fldui.src +++ b/sw/source/ui/fldui/fldui.src @@ -24,9 +24,9 @@ /*-------------------------------------------------------------------- Description: strings for the types --------------------------------------------------------------------*/ - // + // range document - // + String STR_DATEFLD { Text [ en-US ] = "Date" ; @@ -67,9 +67,9 @@ String STR_EXTUSERFLD { Text [ en-US ] = "Sender" ; }; - // + // range functions - // + String STR_SETFLD { Text [ en-US ] = "Set variable" ; @@ -134,9 +134,9 @@ String STR_DROPDOWN { Text [ en-US ] = "Input list" ; }; - // + // range references - // + String STR_SETREFFLD { Text [ en-US ] = "Set Reference" ; @@ -145,9 +145,9 @@ String STR_GETREFFLD { Text [ en-US ] = "Insert Reference" ; }; - // + // range database - // + String STR_DBFLD { Text [ en-US ] = "Mail merge fields" ; @@ -176,9 +176,9 @@ String STR_HIDDENTXTFLD { Text [ en-US ] = "Hidden text" ; }; - // + // range user fields - // + String STR_USERFLD { Text [ en-US ] = "User Field" ; @@ -199,9 +199,9 @@ String STR_HIDDENPARAFLD { Text [ en-US ] = "Hidden Paragraph" ; }; - // + // range DocumentInfo - // + String STR_DOCINFOFLD { Text [ en-US ] = "DocInformation" ; @@ -225,9 +225,9 @@ String FLD_TIME_FIX { Text [ en-US ] = "Time (fixed)" ; }; - // + // SubCmd Statistic - // + String FLD_STAT_TABLE { Text [ en-US ] = "Tables" ; @@ -257,7 +257,7 @@ String FLD_STAT_PAGE Text [ en-US ] = "Pages" ; }; // SubCmd DDETypes - // + String FMT_DDE_HOT { Text [ en-US ] = "DDE automatic" ; diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 7e90bec09d6f..a400560258c2 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -825,7 +825,6 @@ IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl) break; } - // check buttons switch (nTypeId) { diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 2d85f0ae2254..295a6d42f896 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -102,7 +102,6 @@ public: virtual void FillUserData(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 66c8982ced13..2ebbb9880035 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -63,7 +63,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, OUString aStr; if( RES_INPUTFLD == pField->GetTyp()->Which() ) { // it is an input field - // + pInpFld = (SwInputField*)pField; m_pLabelED->SetText( pInpFld->GetPar2() ); sal_uInt16 nSubType = pInpFld->GetSubType(); @@ -157,12 +157,10 @@ void SwFldInputDlg::Apply() rSh.EndAllAction(); } - IMPL_LINK_NOARG(SwFldInputDlg, NextHdl) { EndDialog(RET_OK); return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 42f3fc5552e8..fad10ca8b6b3 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -36,15 +36,12 @@ #include <fldui.hrc> #include <globals.hrc> - using namespace ::com::sun::star; // static ---------------------------------------------------------------- // class SwJavaEditDialog ------------------------------------------------ - - SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) : SvxStandardDialog(pParent, "InsertScriptDialog", "modules/swriter/ui/insertscript.ui"), diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx index 5a033d1a8542..000a5b75a54c 100644 --- a/sw/source/ui/fldui/xfldui.cxx +++ b/sw/source/ui/fldui/xfldui.cxx @@ -33,7 +33,6 @@ #include <view.hxx> #include <swmodule.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -42,13 +41,10 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::beans; - - // This file contains all routines of the fldui directory, which must compile // with exceptions. So we can reduce the code of the other files, which don't // need any exception handling. - /*-------------------------------------------------------------------- Description: Is the database field numeric? remark: in case of error sal_True is returned @@ -169,5 +165,4 @@ sal_Bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQry return bNumeric; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx index 1714d1c8cee4..3137ec7565c5 100644 --- a/sw/source/ui/frmdlg/colex.cxx +++ b/sw/source/ui/frmdlg/colex.cxx @@ -21,7 +21,6 @@ #include "hintids.hxx" #include <algorithm> - #include <svl/eitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> @@ -94,7 +93,6 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) SetBottom( 0 ); } - // evaluate header-attributes const SfxPoolItem* pItem; if( SFX_ITEM_SET == rSet.GetItemState( pPool->GetWhich( SID_ATTR_PAGE_HEADERSET), diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/ui/frmdlg/colmgr.cxx index 9710f0e8ddd2..8ea5563eb474 100644 --- a/sw/source/ui/frmdlg/colmgr.cxx +++ b/sw/source/ui/frmdlg/colmgr.cxx @@ -24,7 +24,6 @@ #include "frmfmt.hxx" #include "colmgr.hxx" - // private methods /*------------------------------------------------------------------------ Description: set column width to current width diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index b851e939950d..c09a075027d9 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -140,7 +140,6 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) pColPgSet = pFrameSet; } - const SwPageDesc* pPageDesc = rWrtShell.GetSelectedPageDescs(); if( pPageDesc ) { @@ -648,7 +647,7 @@ sal_Bool SwColumnPage::FillItemSet(SfxItemSet &rSet) m_pCLNrEdt->GetDownHdl().Call(m_pCLNrEdt); // set in ItemSet setzen // the current settings are already present - // + const SfxPoolItem* pOldItem; const SwFmtCol& rCol = pColMgr->GetColumns(); if(0 == (pOldItem = GetOldItem( rSet, RES_COL )) || diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 428c9207d9b2..bff0ab286aa9 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -79,7 +79,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, m_bHTMLMode = static_cast< sal_Bool >(nHtmlMode & HTMLMODE_ON); // example font for both example TabPages - // + if(pStr) { SetText(GetText() + SW_RESSTR(STR_COLL_HEADER) + *pStr + OUString(')')); diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx index f1a11406a11c..07f6149e0011 100644 --- a/sw/source/ui/frmdlg/frmmgr.cxx +++ b/sw/source/ui/frmdlg/frmmgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "cmdid.h" #include "hintids.hxx" diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 10dfa30f8f3b..8c98fd6214bd 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -828,7 +828,6 @@ void SwFrmPage::setOptimalRelWidth() m_pHoriRelationLB->Clear(); } - SwFrmPage::~SwFrmPage() { } @@ -2368,7 +2367,6 @@ void SwFrmPage::SetFormatUsed(sal_Bool bFmt) } } - void SwFrmPage::EnableVerticalPositioning( bool bEnable ) { m_bAllowVertPositioning = bEnable; @@ -2380,7 +2378,6 @@ void SwFrmPage::EnableVerticalPositioning( bool bEnable ) m_pVertRelationLB->Enable( bEnable ); } - SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "PicturePage", "modules/swriter/ui/picturepage.ui", rSet) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 2e6bec7f258b..741b4526e73c 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -31,7 +31,6 @@ #include <fmtfollowtextflow.hxx> #include <svx/swframevalidation.hxx> - #include "cmdid.h" #include "uitool.hxx" #include "wrtsh.hxx" @@ -494,7 +493,6 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) m_pWrapOutsideCB->Hide(); m_pIdealWrapRB->Enable( false ); - m_pWrapTransparentCB->Enable( false ); m_pNoWrapRB->Enable( FLY_AT_PARA == nAnchorId ); m_pWrapParallelRB->Enable( false ); diff --git a/sw/source/ui/globdoc/globdoc.cxx b/sw/source/ui/globdoc/globdoc.cxx index 4fcdfeda25f5..1d72d5c16e0e 100644 --- a/sw/source/ui/globdoc/globdoc.cxx +++ b/sw/source/ui/globdoc/globdoc.cxx @@ -28,8 +28,6 @@ #include "globdoc.hrc" #include "cfgid.h" - - // Description: Register all filters TYPEINIT1(SwGlobalDocShell, SwDocShell); @@ -72,6 +70,4 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName, *pUserName = SW_RESSTR(STR_HUMAN_SWGLOBDOC_NAME); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/ui/inc/SwXFilterOptions.hxx index 8e50e3eab40c..8e39c494f529 100644 --- a/sw/source/ui/inc/SwXFilterOptions.hxx +++ b/sw/source/ui/inc/SwXFilterOptions.hxx @@ -98,5 +98,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx index 8d775917ffde..0111eb1de37d 100644 --- a/sw/source/ui/inc/actctrl.hxx +++ b/sw/source/ui/inc/actctrl.hxx @@ -40,7 +40,6 @@ public: const Link& GetActionHdl() const { return aActionLink; } }; - /* -------------------------------------------------- * Edit that doesn't accept spaces * --------------------------------------------------*/ diff --git a/sw/source/ui/inc/annotsh.hxx b/sw/source/ui/inc/annotsh.hxx index 5872c956d239..7592d441b29a 100644 --- a/sw/source/ui/inc/annotsh.hxx +++ b/sw/source/ui/inc/annotsh.hxx @@ -65,7 +65,6 @@ public: void ExecSearch(SfxRequest&, sal_Bool bNoMessage = sal_False); void StateSearch(SfxItemSet &); - virtual ::svl::IUndoManager* GetUndoManager(); }; diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx index faf18d8b3347..040485fedc08 100644 --- a/sw/source/ui/inc/ascfldlg.hxx +++ b/sw/source/ui/inc/ascfldlg.hxx @@ -57,8 +57,6 @@ public: void FillOptions( SwAsciiOptions& rOptions ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/ui/inc/autoedit.hxx index 385f0d952567..94d81b771527 100644 --- a/sw/source/ui/inc/autoedit.hxx +++ b/sw/source/ui/inc/autoedit.hxx @@ -21,7 +21,6 @@ #include <vcl/edit.hxx> - class AutoEdit : public Edit { public: @@ -33,9 +32,6 @@ protected: // Implementation in autocorr.cxx - - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx index bc2e4e5a028b..9875221d4c72 100644 --- a/sw/source/ui/inc/basesh.hxx +++ b/sw/source/ui/inc/basesh.hxx @@ -110,7 +110,6 @@ public: static FlyMode GetFrmMode() { return eFrameMode; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/ui/inc/bookctrl.hxx index 42ad20fa6218..a8ce181fd7fc 100644 --- a/sw/source/ui/inc/bookctrl.hxx +++ b/sw/source/ui/inc/bookctrl.hxx @@ -42,7 +42,6 @@ private: OUString sPageNumber; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx index 89d369689dec..5f91f6f24fae 100644 --- a/sw/source/ui/inc/caption.hxx +++ b/sw/source/ui/inc/caption.hxx @@ -95,5 +95,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index e78f85057a2b..fbcafa3c228c 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -60,7 +60,6 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem Color aIndexBackgrndCol; - public: TYPEINFO(); SwDocDisplayItem( sal_uInt16 nWhich = FN_PARAM_DOCDISP ); @@ -69,7 +68,6 @@ public: SwDocDisplayItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool operator==( const SfxPoolItem& ) const; void operator=( const SwDocDisplayItem& ); @@ -106,7 +104,6 @@ public: SwElemItem(const SwElemItem& rElemItem); SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool operator==( const SfxPoolItem& ) const; void operator=( const SwElemItem& ); @@ -137,7 +134,6 @@ public: const OUString &GetFax() const { return sFaxName; } void SetFax( const OUString& rFax) { sFaxName = rFax; } - sal_Bool IsPrintProspect() const { return bPrintProspect; } sal_Bool IsPrintProspectRTL() const { return bPrintProspectRTL; } void SetPrintProspect(sal_Bool bFlag ){ bPrintProspect = bFlag; } @@ -175,7 +171,6 @@ public: SwShadowCursorItem( const SwShadowCursorItem& rElemItem ); SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool operator==( const SfxPoolItem& ) const; void operator=( const SwShadowCursorItem& ); diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index ea8e127a4b57..4e8e31acce58 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_CHANGEDB_HXX #define INCLUDED_SW_SOURCE_UI_INC_CHANGEDB_HXX - #include <vcl/bitmap.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/ui/inc/chartins.hxx index e2402197c8eb..848653cf45f0 100644 --- a/sw/source/ui/inc/chartins.hxx +++ b/sw/source/ui/inc/chartins.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_CHARTINS_HXX #define INCLUDED_SW_SOURCE_UI_INC_CHARTINS_HXX - Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ); void SwInsertChart( Window *pParent, SfxBindings *pBindings ); diff --git a/sw/source/ui/inc/chldwrap.hxx b/sw/source/ui/inc/chldwrap.hxx index bec1c65438ee..41f771acc2f9 100644 --- a/sw/source/ui/inc/chldwrap.hxx +++ b/sw/source/ui/inc/chldwrap.hxx @@ -42,7 +42,6 @@ public: inline void SetOldDocShell(SwDocShell *pDcSh) { m_pDocSh = pDcSh; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/ui/inc/colmgr.hxx index c69fb5c2b1a7..b3f73001005a 100644 --- a/sw/source/ui/inc/colmgr.hxx +++ b/sw/source/ui/inc/colmgr.hxx @@ -31,7 +31,6 @@ public: SwColMgr(const SfxItemSet &rSet, sal_uInt16 nActWidth = USHRT_MAX); ~SwColMgr(); - inline sal_uInt16 GetCount() const; void SetCount(sal_uInt16 nCount, sal_uInt16 nGutterWidth); sal_uInt16 GetGutterWidth(sal_uInt16 nPos = USHRT_MAX) const; @@ -65,7 +64,6 @@ public: void SetActualWidth(sal_uInt16 nW); sal_uInt16 GetActualSize() const { return nWidth; } - private: SwFmtCol aFmtCol; diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index 004b34d0dfb1..2593a35be19c 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_COLUMN_HXX #define INCLUDED_SW_SOURCE_UI_INC_COLUMN_HXX - #include <vcl/fixed.hxx> #include <vcl/field.hxx> #include <vcl/image.hxx> @@ -61,7 +60,6 @@ class SwColumnDlg : public SfxModalDialog bool bSelSectionChanged : 1; bool bFrameChanged : 1; - DECL_LINK(ObjectHdl, ListBox*); DECL_LINK(OkHdl, void *); diff --git a/sw/source/ui/inc/conarc.hxx b/sw/source/ui/inc/conarc.hxx index 9eb6fa87f3da..354a625468f2 100644 --- a/sw/source/ui/inc/conarc.hxx +++ b/sw/source/ui/inc/conarc.hxx @@ -43,8 +43,6 @@ public: virtual void Deactivate(); }; - - #endif // INCLUDED_SW_SOURCE_UI_INC_CONARC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conform.hxx b/sw/source/ui/inc/conform.hxx index 11adb4f045bf..a1226a21f25e 100644 --- a/sw/source/ui/inc/conform.hxx +++ b/sw/source/ui/inc/conform.hxx @@ -33,8 +33,6 @@ public: virtual void CreateDefaultObject(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conpoly.hxx b/sw/source/ui/inc/conpoly.hxx index 48066efde70d..d91c38e0dd6b 100644 --- a/sw/source/ui/inc/conpoly.hxx +++ b/sw/source/ui/inc/conpoly.hxx @@ -42,7 +42,6 @@ public: virtual void Activate(const sal_uInt16 nSlotId); // activate function }; - #endif // INCLUDED_SW_SOURCE_UI_INC_CONPOLY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/conrect.hxx b/sw/source/ui/inc/conrect.hxx index 9811f9e1215e..4791935d37ce 100644 --- a/sw/source/ui/inc/conrect.hxx +++ b/sw/source/ui/inc/conrect.hxx @@ -46,8 +46,6 @@ class ConstRectangle : public SwDrawBase virtual void Activate(const sal_uInt16 nSlotId); // activate function }; - - #endif // INCLUDED_SW_SOURCE_UI_INC_CONRECT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx index 5ddd8f41fe44..2700bd261e83 100644 --- a/sw/source/ui/inc/content.hxx +++ b/sw/source/ui/inc/content.hxx @@ -31,9 +31,7 @@ class SwTxtINetFmt; class SwTOXBase; class SwRangeRedline; -//---------------------------------------------------------------------------- // helper classes -//---------------------------------------------------------------------------- class SwPopup : public PopupMenu { @@ -49,8 +47,6 @@ public: }; -//---------------------------------------------------------------------------- - class SwOutlineContent : public SwContent { sal_uInt16 nOutlinePos; @@ -71,7 +67,6 @@ class SwOutlineContent : public SwContent bool IsMoveable(){return bIsMoveable;}; }; -//---------------------------------------------------------------------------- class SwRegionContent : public SwContent { @@ -86,7 +81,6 @@ class SwRegionContent : public SwContent nRegionLevel(nLevel){} sal_uInt8 GetRegionLevel() const {return nRegionLevel;} }; -//---------------------------------------------------------------------------- class SwURLFieldContent : public SwContent { @@ -107,7 +101,6 @@ public: const SwTxtINetFmt* GetINetAttr() { return pINetAttr; } }; -//---------------------------------------------------------------------------- class SwPostItContent : public SwContent { const SwFmtFld* pFld; @@ -139,8 +132,6 @@ public: bool IsPostIt() {return mbPostIt; } }; -//---------------------------------------------------------------------------- - class SwGraphicContent : public SwContent { OUString sLink; @@ -153,7 +144,6 @@ public: const OUString& GetLink() const {return sLink;} }; -//---------------------------------------------------------------------------- class SwTOXBaseContent : public SwContent { const SwTOXBase* pBase; @@ -171,7 +161,6 @@ public: GetMember. It is reloaded after Invalidate() only if the content should be read again. */ -//---------------------------------------------------------------------------- class SwContentType : public SwTypeNumber { @@ -183,7 +172,7 @@ class SwContentType : public SwTypeNumber sal_uInt16 nMemberCount; // content count sal_uInt16 nContentType; // content type's Id sal_uInt8 nOutlineLevel; - bool bDataValid : 1; // + bool bDataValid : 1; bool bEdit: 1; // can this type be edited? bool bDelete: 1; // can this type be deleted? protected: diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index 254f13c61413..d51152a344e7 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -43,9 +43,6 @@ class SdrObject; #define EDIT_MODE_DELETE 4 #define EDIT_MODE_RENAME 5 -//---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- - class SwContentTree : public SvTreeListBox { ImageList aEntryImages; @@ -201,10 +198,7 @@ public: virtual sal_Int32 GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const; }; - -//---------------------------------------------------------------------------- // TreeListBox for global documents -//---------------------------------------------------------------------------- class SwLBoxString : public SvLBoxString { @@ -231,7 +225,7 @@ private: ImageList aEntryImages; - SwWrtShell* pActiveShell; // + SwWrtShell* pActiveShell; SvTreeListEntry* pEmphasisEntry; // Drag'n Drop emphasis SvTreeListEntry* pDDSource; // source for Drag'n Drop SwGlblDocContents* pSwGlblDocContents; // array with sorted content diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx index 5f4c5073a43e..e9f17a60e6e7 100644 --- a/sw/source/ui/inc/convert.hxx +++ b/sw/source/ui/inc/convert.hxx @@ -69,7 +69,6 @@ public: SwTableAutoFmt const*& prTAFmt ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx index d1128efeae5d..578efcdb8e1c 100644 --- a/sw/source/ui/inc/cption.hxx +++ b/sw/source/ui/inc/cption.hxx @@ -32,7 +32,6 @@ #include <vcl/button.hxx> #include <actctrl.hxx> - #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -59,7 +58,6 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ); }; - class SwCaptionDialog : public SvxStandardDialog { Edit* m_pTextEdit; @@ -112,5 +110,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index 6622e7ed6409..4d271dd41e2a 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_DBINSDLG_HXX #define INCLUDED_SW_SOURCE_UI_INC_DBINSDLG_HXX - #include <vcl/button.hxx> #include <vcl/group.hxx> #include <vcl/fixed.hxx> @@ -86,7 +85,6 @@ public: ~SwInsDBColumns() { DeleteAndDestroyAll(); } }; - class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem { RadioButton* m_pRbAsTable; diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx index 94e261459149..7105b2ec0199 100644 --- a/sw/source/ui/inc/dbui.hxx +++ b/sw/source/ui/inc/dbui.hxx @@ -24,7 +24,6 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> - class SW_DLLPUBLIC PrintMonitor: public ModelessDialog { public: diff --git a/sw/source/ui/inc/drawbase.hxx b/sw/source/ui/inc/drawbase.hxx index e3abd3824408..98c111dc2a6a 100644 --- a/sw/source/ui/inc/drawbase.hxx +++ b/sw/source/ui/inc/drawbase.hxx @@ -74,8 +74,6 @@ public: virtual bool doConstructOrthogonal() const; }; - - #endif // INCLUDED_SW_SOURCE_UI_INC_DRAWBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/drwbassh.hxx b/sw/source/ui/inc/drwbassh.hxx index c7e75dbee3a3..7bb62ad9076c 100644 --- a/sw/source/ui/inc/drwbassh.hxx +++ b/sw/source/ui/inc/drwbassh.hxx @@ -51,7 +51,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/dselect.hxx b/sw/source/ui/inc/dselect.hxx index c31cfb4e2822..d3905bc27e57 100644 --- a/sw/source/ui/inc/dselect.hxx +++ b/sw/source/ui/inc/dselect.hxx @@ -38,8 +38,6 @@ class DrawSelection : public SwDrawBase virtual void Activate(const sal_uInt16 nSlotId); // activate function }; - - #endif // INCLUDED_SW_SOURCE_UI_INC_DSELECT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index 3d16206d9112..7b6c807a6223 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -28,7 +28,6 @@ #include <svtools/transfer.hxx> #include <swevent.hxx> - class SwWrtShell; class SwView; class SwRect; @@ -125,8 +124,8 @@ friend void PageNumNotify( SwViewShell* pVwSh, m_bIsInDrag : 1, // don't execute StartExecuteDrag twice m_bOldIdle : 1, // to stop to idle m_bOldIdleSet : 1, // during QeueryDrop - m_bTblInsDelMode : 1, // - m_bTblIsInsMode : 1, // + m_bTblInsDelMode : 1, + m_bTblIsInsMode : 1, m_bChainMode : 1, // connect frames m_bWasShdwCrsr : 1, // ShadowCrsr was on in MouseButtonDown m_bLockInput : 1, // lock while calc panel is active @@ -194,7 +193,6 @@ protected: virtual void GetFocus(); virtual void LoseFocus(); - virtual void MouseMove(const MouseEvent& rMEvt); virtual void MouseButtonDown(const MouseEvent& rMEvt); virtual void MouseButtonUp(const MouseEvent& rMEvt); @@ -240,7 +238,6 @@ public: void StopInsFrm(); sal_uInt16 GetFrmColCount() const {return m_nInsFrmColCount;} // column number for interactive frame - void SetChainMode( sal_Bool bOn ); sal_Bool IsChainMode() const { return m_bChainMode; } diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx index da04b9153ed2..62c4210cae3a 100644 --- a/sw/source/ui/inc/fldmgr.hxx +++ b/sw/source/ui/inc/fldmgr.hxx @@ -167,7 +167,6 @@ public: // organise RefMark with names bool CanInsertRefMark( const OUString& rStr ); - // access to field types via ResId sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX) const; SwFieldType* GetFldType(sal_uInt16 nResId, sal_uInt16 nId = 0) const; @@ -202,7 +201,7 @@ public: // turn off evaluation of expression fields for insertation // of many expressino fields (see labels) - // + inline void SetEvalExpFlds(sal_Bool bEval); void EvalExpFlds(SwWrtShell* pSh = NULL); }; diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx index fd8873f8d061..49f536e8f48e 100644 --- a/sw/source/ui/inc/fontcfg.hxx +++ b/sw/source/ui/inc/fontcfg.hxx @@ -53,7 +53,6 @@ #define FONTSIZE_CJK_DEFAULT 210 #define FONTSIZE_OUTLINE 280 - class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem { OUString sDefaultFonts[DEF_FONT_COUNT]; @@ -110,5 +109,4 @@ public: }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/formatclipboard.hxx b/sw/source/ui/inc/formatclipboard.hxx index 10cf0b86dd5d..9d9335a32147 100644 --- a/sw/source/ui/inc/formatclipboard.hxx +++ b/sw/source/ui/inc/formatclipboard.hxx @@ -27,7 +27,6 @@ // header for class SfxStyleSheetBasePool #include <svl/style.hxx> -//----------------------------------------------------------------------------- /** This class acts as data container and execution class for the format paintbrush feature in writer. */ diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index b033f5132985..b9dfbb5b87bc 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -133,7 +133,6 @@ class SwFrmPage: public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - DECL_LINK(RangeModifyHdl, void *); DECL_LINK(AnchorTypeHdl, void *); DECL_LINK( PosHdl, ListBox * ); @@ -256,7 +255,6 @@ class SwFrmURLPage : public SfxTabPage DECL_LINK(InsertFileHdl, void *); - SwFrmURLPage(Window *pParent, const SfxItemSet &rSet); ~SwFrmURLPage(); diff --git a/sw/source/ui/inc/globdoc.hrc b/sw/source/ui/inc/globdoc.hrc index 8ad3e18b4e29..8c954b379294 100644 --- a/sw/source/ui/inc/globdoc.hrc +++ b/sw/source/ui/inc/globdoc.hrc @@ -30,7 +30,7 @@ #define MN_GLOBAL_TEXT_POPUPMENU (RC_GLOBDOC_BEGIN + 63) -// ------------------------------------------------------------------------ + #define GLOBDOC_ACT_END MN_GLOBAL_TEXT_POPUPMENU diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx index 80a1c3af3f9d..a5213b1179a1 100644 --- a/sw/source/ui/inc/glosdoc.hxx +++ b/sw/source/ui/inc/glosdoc.hxx @@ -130,7 +130,6 @@ public: std::vector<OUString> const& GetPathArray() const { return m_PathArr; } }; - #endif // INCLUDED_SW_SOURCE_UI_INC_GLOSDOC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx index 82a5dce5bc03..fb47656da3f2 100644 --- a/sw/source/ui/inc/gloslst.hxx +++ b/sw/source/ui/inc/gloslst.hxx @@ -43,7 +43,6 @@ struct AutoTextGroup } }; - typedef std::vector<AutoTextGroup*> AutoTextGroups; class SwGlossaryList : public AutoTimer @@ -80,9 +79,4 @@ public: #endif - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index c65db5a531f3..98f441620528 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -51,8 +51,6 @@ class Menu; const short RET_EDIT = 100; -//------------------------------------------------------------------ - class SwGlTreeListBox : public SvTreeListBox { const OUString sReadonly; @@ -84,7 +82,6 @@ public: void Clear(); }; -//------------------------------------------------------------------ class SwOneExampleFrame; class SwGlossaryDlg : public SvxStandardDialog { @@ -116,7 +113,6 @@ class SwGlossaryDlg : public SvxStandardDialog OUString sResumeShortName; sal_Bool bResume; - const sal_Bool bSelection : 1; sal_Bool bReadOnly : 1; sal_Bool bIsOld : 1; @@ -139,7 +135,6 @@ class SwGlossaryDlg : public SvxStandardDialog DECL_LINK( CheckBoxHdl, CheckBox * ); DECL_LINK( PreviewLoadedHdl, void * ); - virtual void Apply(); void Init(); SvTreeListEntry* DoesBlockExist(const OUString& sBlock, const OUString& rShort); diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx index 9a804a6c8d71..9e9513d22b77 100644 --- a/sw/source/ui/inc/glshell.hxx +++ b/sw/source/ui/inc/glshell.hxx @@ -50,7 +50,6 @@ public: const OUString& GetShortName(){return aShortName;} }; - class SwWebGlosDocShell : public SwWebDocShell { OUString aLongName; diff --git a/sw/source/ui/inc/imaildsplistener.hxx b/sw/source/ui/inc/imaildsplistener.hxx index 7a563eed9421..5b7e329df0d7 100644 --- a/sw/source/ui/inc/imaildsplistener.hxx +++ b/sw/source/ui/inc/imaildsplistener.hxx @@ -23,7 +23,6 @@ #include "com/sun/star/mail/XMailMessage.hpp" #include <salhelper/refobj.hxx> - class MailDispatcher; /** diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/ui/inc/initui.hxx index 7b39f2b48084..9d95043d3a19 100644 --- a/sw/source/ui/inc/initui.hxx +++ b/sw/source/ui/inc/initui.hxx @@ -61,7 +61,6 @@ extern void _FinitUI(); extern void _InitSpell(); extern void _FinitSpell(); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx index 01f2f0c4032f..d96c59f484ad 100644 --- a/sw/source/ui/inc/inpdlg.hxx +++ b/sw/source/ui/inc/inpdlg.hxx @@ -58,7 +58,6 @@ public: SwField* pField, sal_Bool bNextButton = sal_False ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx index 879a3e3d56ab..2278f51c23d4 100644 --- a/sw/source/ui/inc/inputwin.hxx +++ b/sw/source/ui/inc/inputwin.hxx @@ -30,7 +30,6 @@ class SwWrtShell; class SwView; class SfxDispatcher; -//======================================================================== class InputEdit : public Edit { public: @@ -44,8 +43,6 @@ protected: virtual void KeyInput( const KeyEvent& ); }; -//======================================================================== - class SwInputWindow : public ToolBox { friend class InputEdit; @@ -117,8 +114,6 @@ public: }; -//================================================================== - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx index 63b1fc495158..e8046d6079a1 100644 --- a/sw/source/ui/inc/instable.hxx +++ b/sw/source/ui/inc/instable.hxx @@ -32,7 +32,6 @@ class SwTableAutoFmt; class SwView; struct SwInsertTableOptions; - class SwInsTableDlg : public SfxModalDialog { TableNameEdit* m_pNameEdit; diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx index 92f40772fe94..2de39fd89704 100644 --- a/sw/source/ui/inc/mailconfigpage.hxx +++ b/sw/source/ui/inc/mailconfigpage.hxx @@ -54,7 +54,6 @@ class SwMailConfigPage : public SfxTabPage DECL_LINK(AuthenticationHdl, void *); DECL_LINK(TestHdl, void *); - public: SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ); ~SwMailConfigPage(); diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index cd62d2df0ab8..c59bfda286f8 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -115,7 +115,6 @@ class SwMailMergeDlg : public SvxStandardDialog Size m_aDialogSize; OUString m_sSaveFilter; - DECL_LINK( ButtonHdl, Button* pBtn ); DECL_LINK(InsertPathHdl, void *); DECL_LINK(AttachFileHdl, void *); diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/ui/inc/mergetbl.hxx index 8cea9ca892a7..3926c21b7376 100644 --- a/sw/source/ui/inc/mergetbl.hxx +++ b/sw/source/ui/inc/mergetbl.hxx @@ -24,7 +24,6 @@ #include <vcl/fixed.hxx> #include <svx/stddlg.hxx> - class SwMergeTblDlg : public SvxStandardDialog { RadioButton* m_pMergePrevRB; @@ -39,5 +38,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx index b5c751d3ae70..8e53939f4bf8 100644 --- a/sw/source/ui/inc/mmconfigitem.hxx +++ b/sw/source/ui/inc/mmconfigitem.hxx @@ -255,7 +255,6 @@ public: void SetSelectedPrinter(const OUString& rSet ) {m_sSelectedPrinter = rSet;} - SwView* GetTargetView(); void SetTargetView(SwView* pView); diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/ui/inc/multmrk.hxx index 774fb9c9ae58..b98192765931 100644 --- a/sw/source/ui/inc/multmrk.hxx +++ b/sw/source/ui/inc/multmrk.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_MULTMRK_HXX #define INCLUDED_SW_SOURCE_UI_INC_MULTMRK_HXX - #include <svx/stddlg.hxx> #include <vcl/fixed.hxx> #include <svtools/stdctrl.hxx> @@ -49,7 +48,6 @@ public: ~SwMultiTOXMarkDlg(); }; - #endif // INCLUDED_SW_SOURCE_UI_INC_MULTMRK_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/navicfg.hxx b/sw/source/ui/inc/navicfg.hxx index c99ba4c95443..77a14d667166 100644 --- a/sw/source/ui/inc/navicfg.hxx +++ b/sw/source/ui/inc/navicfg.hxx @@ -58,7 +58,6 @@ public: } } - sal_Int32 GetOutlineLevel()const {return nOutlineLevel;} void SetOutlineLevel(sal_Int32 nSet){ if(nOutlineLevel != nSet) @@ -77,7 +76,6 @@ public: } } - sal_Int32 GetActiveBlock()const {return nActiveBlock;} void SetActiveBlock(sal_Int32 nSet){ if(nActiveBlock != nSet) diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx index 8bcd7c78991b..04a6c269c706 100644 --- a/sw/source/ui/inc/navipi.hxx +++ b/sw/source/ui/inc/navipi.hxx @@ -133,7 +133,6 @@ protected: virtual void Resize(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - // release ObjectShellLock early enough for app end virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/sw/source/ui/inc/navmgr.hxx b/sw/source/ui/inc/navmgr.hxx index 49fdc9a7f90f..0ef4af93a1f6 100644 --- a/sw/source/ui/inc/navmgr.hxx +++ b/sw/source/ui/inc/navmgr.hxx @@ -19,7 +19,6 @@ class SwWrtShell; struct SwPosition; class SwUnoCrsr; - class SwNavigationMgr { private: diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index 4e0e96b2dcde..67d107588265 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_NUM_HXX #define INCLUDED_SW_SOURCE_UI_INC_NUM_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/menubtn.hxx> #include <vcl/field.hxx> diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/ui/inc/numberingtypelistbox.hxx index 812ecf4856a8..661252fb8e84 100644 --- a/sw/source/ui/inc/numberingtypelistbox.hxx +++ b/sw/source/ui/inc/numberingtypelistbox.hxx @@ -46,7 +46,6 @@ public: sal_Bool SelectNumberingType(sal_Int16 nType); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx index e8b8cbb37ccc..d6facd3da9b5 100644 --- a/sw/source/ui/inc/numfmtlb.hxx +++ b/sw/source/ui/inc/numfmtlb.hxx @@ -68,7 +68,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx index 2ea9cea19958..71602d8fc33c 100644 --- a/sw/source/ui/inc/numpara.hxx +++ b/sw/source/ui/inc/numpara.hxx @@ -19,14 +19,12 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_NUMPARA_HXX #define INCLUDED_SW_SOURCE_UI_INC_NUMPARA_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> #include <vcl/button.hxx> - /* --- class SwParagraphNumTabPage ---------------------------------------- with this TabPage numbering settings at the paragraph / paragraph style are performed. @@ -83,7 +81,6 @@ public: ListBox& GetStyleBox() {return *m_pNumberStyleLB;}; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/ui/inc/numprevw.hxx index ab1bbbcaa6c9..71374d899261 100644 --- a/sw/source/ui/inc/numprevw.hxx +++ b/sw/source/ui/inc/numprevw.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_NUMPREVW_HXX #define INCLUDED_SW_SOURCE_UI_INC_NUMPREVW_HXX - #include <vcl/window.hxx> class SwNumRule; @@ -69,5 +68,4 @@ class NumberingPreview : public Window #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/olesh.hxx b/sw/source/ui/inc/olesh.hxx index 504fa13c6a8d..f9b6108a8edf 100644 --- a/sw/source/ui/inc/olesh.hxx +++ b/sw/source/ui/inc/olesh.hxx @@ -32,10 +32,4 @@ public: #endif - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/ui/inc/olmenu.hxx index c245e208ae24..288413d5d746 100644 --- a/sw/source/ui/inc/olmenu.hxx +++ b/sw/source/ui/inc/olmenu.hxx @@ -31,7 +31,6 @@ #include <map> #include <vector> - class SwWrtShell; class SW_DLLPUBLIC SwSpellPopup : public PopupMenu diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 3e196e2eae28..802b06092eed 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -118,7 +118,6 @@ class SwAddPrinterTabPage : public SfxTabPage DECL_LINK(AutoClickHdl, void *); DECL_LINK(SelectHdl, void *); - SwAddPrinterTabPage( Window* pParent, const SfxItemSet& rSet ); public: @@ -231,7 +230,6 @@ class SwTableOptionsTabPage : public SfxTabPage DECL_LINK(CheckBoxHdl, void *); - SwTableOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwTableOptionsTabPage(); @@ -280,7 +278,6 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage SwWrtShell * m_pWrtShell; - SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwShdwCrsrOptionsTabPage(); diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx index 5afe786fd903..6d54f977108d 100644 --- a/sw/source/ui/inc/outline.hxx +++ b/sw/source/ui/inc/outline.hxx @@ -21,7 +21,6 @@ #include <sfx2/tabdlg.hxx> - #include <vcl/menu.hxx> #include <vcl/button.hxx> diff --git a/sw/source/ui/inc/popbox.hxx b/sw/source/ui/inc/popbox.hxx index 51508c72fcfe..e085886eaa81 100644 --- a/sw/source/ui/inc/popbox.hxx +++ b/sw/source/ui/inc/popbox.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_POPBOX_HXX #define INCLUDED_SW_SOURCE_UI_INC_POPBOX_HXX - #include <vcl/toolbox.hxx> #include <svtools/transfer.hxx> @@ -53,7 +52,6 @@ inline void SwHelpToolBox::SetRightClickLink(const Link &rLink) { aRightClickLink = rLink; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index ef127fc22388..de42c7930541 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -189,7 +189,6 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * ); SAL_DLLPRIVATE bool ChgPage( int eMvMode, int bUpdateScrollbar = sal_True ); - SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const; diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index 1d460a599cd5..2ee42bdef5c6 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -58,11 +58,9 @@ typedef boost::ptr_vector<SwRedlineDataParent> SwRedlineDataParentArr; class SwRedlineDataParentSortArr : public o3tl::sorted_vector<SwRedlineDataParent*, o3tl::less_ptr_to<SwRedlineDataParent> > {}; - typedef SwRedlineDataChild* SwRedlineDataChildPtr; typedef boost::ptr_vector<SwRedlineDataChild> SwRedlineDataChildArr; - typedef SvTreeListEntry* SvLBoxEntryPtr; typedef std::vector<SvLBoxEntryPtr> SvLBoxEntryArr; @@ -159,8 +157,6 @@ public: virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index bc44e02813e2..44a9fa642684 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -102,7 +102,6 @@ class SwEditRegionDlg : public SfxModalDialog sal_Bool bDontCheckPasswd :1; sal_Bool bWeb :1; - Image BuildBitmap(sal_Bool bProtect,sal_Bool bHidden); void RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry); @@ -227,7 +226,6 @@ class SwSectionFtnEndTabPage : public SfxTabPage FixedText* pEndSuffixFT; Edit* pEndSuffixED; - DECL_LINK( FootEndHdl, CheckBox * ); void ResetState( sal_Bool bFtn, const SwFmtFtnEndAtTxtEnd& ); diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx index 4c100703daae..ba0f66b33398 100644 --- a/sw/source/ui/inc/scroll.hxx +++ b/sw/source/ui/inc/scroll.hxx @@ -54,8 +54,6 @@ public: ~SwScrollbar(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/shdwcrsr.hxx b/sw/source/ui/inc/shdwcrsr.hxx index 5e52cd6f06cd..5fb1d9684162 100644 --- a/sw/source/ui/inc/shdwcrsr.hxx +++ b/sw/source/ui/inc/shdwcrsr.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_SHDWCRSR_HXX #define INCLUDED_SW_SOURCE_UI_INC_SHDWCRSR_HXX - #include <tools/gen.hxx> #include <tools/color.hxx> #include <limits.h> @@ -53,8 +52,6 @@ public: Rectangle GetRect() const; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/splittbl.hxx b/sw/source/ui/inc/splittbl.hxx index 1048c380e26f..522f1d65cab4 100644 --- a/sw/source/ui/inc/splittbl.hxx +++ b/sw/source/ui/inc/splittbl.hxx @@ -46,5 +46,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx index 40d42ee51558..c490dc4d6193 100644 --- a/sw/source/ui/inc/srcedtw.hxx +++ b/sw/source/ui/inc/srcedtw.hxx @@ -58,7 +58,6 @@ public: }; -//------------------------------------------------------------ typedef std::set<sal_uInt16> SyntaxLineSet; class SwSrcEditWindow : public Window, public SfxListener diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx index 9e404e66c54c..ba91f8732278 100644 --- a/sw/source/ui/inc/srcview.hxx +++ b/sw/source/ui/inc/srcview.hxx @@ -43,21 +43,18 @@ class SwSrcView: public SfxViewShell // for read-only switching virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - protected: sal_uInt16 StartSearchAndReplace(const SvxSearchItem& rItem, sal_Bool bFromStart, sal_Bool bApi, sal_Bool bRecursive = sal_False); - public: SFX_DECL_VIEWFACTORY(SwSrcView); SFX_DECL_INTERFACE(SW_SRC_VIEWSHELL) TYPEINFO(); - SwSrcView(SfxViewFrame* pFrame, SfxViewShell*); ~SwSrcView(); @@ -69,8 +66,6 @@ public: sal_Bool IsModified() {return aEditWin.IsModified();} - - void Execute(SfxRequest&); void GetState(SfxItemSet&); diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx index ce9566f8c18c..4c9294907b79 100644 --- a/sw/source/ui/inc/swcont.hxx +++ b/sw/source/ui/inc/swcont.hxx @@ -51,9 +51,6 @@ class SwContentType; #define REGION_MODE_LINK 1 #define REGION_MODE_EMBEDDED 2 -//---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- - //mini rtti class SwTypeNumber { @@ -65,7 +62,6 @@ class SwTypeNumber sal_uInt8 GetTypeId() const; }; -//---------------------------------------------------------------------------- class SwContent : public SwTypeNumber { diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index 04bd14066f98..d68a9daac07a 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.hxx @@ -52,7 +52,6 @@ namespace nsTransferBufferType const sal_uInt16 TRNSFR_DRAWING = 0x0081; // drawing is internal too! } - class SW_DLLPUBLIC SwTransferable : public TransferableHelper { friend class SwView_Impl; @@ -209,7 +208,6 @@ public: virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx index de24d86ff303..1dfc4f2597a4 100644 --- a/sw/source/ui/inc/swrenamexnameddlg.hxx +++ b/sw/source/ui/inc/swrenamexnameddlg.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_SWRENAMEXNAMEDDLG_HXX #define INCLUDED_SW_SOURCE_UI_INC_SWRENAMEXNAMEDDLG_HXX - #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> diff --git a/sw/source/ui/inc/swtablerep.hxx b/sw/source/ui/inc/swtablerep.hxx index 908fff827287..7f92bc0bc26b 100644 --- a/sw/source/ui/inc/swtablerep.hxx +++ b/sw/source/ui/inc/swtablerep.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_SWTABLEREP_HXX #define INCLUDED_SW_SOURCE_UI_INC_SWTABLEREP_HXX - #include <sfx2/tabdlg.hxx> #include "swdllapi.h" #include "swtypes.hxx" diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx index b7516d998192..d63d7ee99243 100644 --- a/sw/source/ui/inc/swuiccoll.hxx +++ b/sw/source/ui/inc/swuiccoll.hxx @@ -47,7 +47,6 @@ class SwCondCollPage : public SfxTabPage sal_Bool bNewTemplate; - SwCondCollPage(Window *pParent, const SfxItemSet &rSet); virtual ~SwCondCollPage(); @@ -71,8 +70,6 @@ public: void SetCollection( SwFmt* pFormat, sal_Bool bNew ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index 24f6dee18390..1986936f86f3 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -74,8 +74,8 @@ class SwMultiTOXTabDialog : public SfxTabDialog SwOneExampleFrame* pExampleFrame; - SwTOXDescription** pDescArr; // - SwForm** pFormArr; // + SwTOXDescription** pDescArr; + SwForm** pFormArr; SwIndexSections_Impl** pxIndexSectionsArr; SwTOXBase* pParamTOXBase; diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index 21b215105325..e552586e353b 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.hxx @@ -78,7 +78,6 @@ class SwIndexMarkPane CheckBox* m_pSearchCaseSensitiveCB; CheckBox* m_pSearchCaseWordOnlyCB; - PushButton* m_pOKBT; CloseButton* m_pCloseBT; PushButton* m_pDelBT; @@ -143,7 +142,6 @@ public: Dialog &GetDialog() { return m_rDialog; } - ~SwIndexMarkPane(); void ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark = 0); diff --git a/sw/source/ui/inc/swwrtshitem.hxx b/sw/source/ui/inc/swwrtshitem.hxx index 1cf1431732ec..ba498ea7c41f 100644 --- a/sw/source/ui/inc/swwrtshitem.hxx +++ b/sw/source/ui/inc/swwrtshitem.hxx @@ -33,7 +33,6 @@ public: SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh); SwWrtShellItem( const SwWrtShellItem& ); - virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx index b06c5671cf9a..468821ff2b58 100644 --- a/sw/source/ui/inc/syncbtn.hxx +++ b/sw/source/ui/inc/syncbtn.hxx @@ -48,7 +48,6 @@ public: SFX_DECL_CHILDWINDOW( SwSyncChildWin ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/ui/inc/tabledlg.hxx index 288e925e9ff8..d18be07670dc 100644 --- a/sw/source/ui/inc/tabledlg.hxx +++ b/sw/source/ui/inc/tabledlg.hxx @@ -21,7 +21,6 @@ #include <sfx2/tabdlg.hxx> - #include "swtypes.hxx" #include "swtablerep.hxx" @@ -45,7 +44,6 @@ public: const SfxItemSet* pItemSet, SwWrtShell* pSh ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx index 9e16028e8a3b..5aac7016a944 100644 --- a/sw/source/ui/inc/tautofmt.hxx +++ b/sw/source/ui/inc/tautofmt.hxx @@ -35,12 +35,8 @@ class AutoFmtPreview; class SwTableAutoFmtTbl; class SwWrtShell; -//------------------------------------------------------------------------ - enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; -//======================================================================== - class SwAutoFormatDlg : public SfxModalDialog { ListBox* m_pLbFormat; @@ -64,7 +60,6 @@ class SwAutoFormatDlg : public SfxModalDialog OUString aStrInvalidFmt; AutoFmtPreview* m_pWndPreview; - //------------------------ SwWrtShell* pShell; SwTableAutoFmtTbl* pTableTbl; sal_uInt8 nIndex; @@ -72,10 +67,9 @@ class SwAutoFormatDlg : public SfxModalDialog sal_Bool bCoreDataChanged : 1; sal_Bool bSetAutoFmt : 1; - void Init( const SwTableAutoFmt* pSelFmt ); void UpdateChecks( const SwTableAutoFmt&, sal_Bool bEnableBtn ); - //------------------------ + DECL_LINK( CheckHdl, Button * ); DECL_LINK(OkHdl, void *); DECL_LINK( AddHdl, void * ); @@ -92,7 +86,6 @@ public: void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const; }; - #endif // SW_AUTOFMT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/tblctrl.hxx b/sw/source/ui/inc/tblctrl.hxx index e511a0f59c29..fbf66057e2ae 100644 --- a/sw/source/ui/inc/tblctrl.hxx +++ b/sw/source/ui/inc/tblctrl.hxx @@ -19,14 +19,8 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_TBLCTRL_HXX #define INCLUDED_SW_SOURCE_UI_INC_TBLCTRL_HXX - #include <sfx2/tbxctrl.hxx> - -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- - class SwTableOptimizeCtrl : public SfxToolBoxControl { @@ -41,10 +35,6 @@ public: }; -// -//---------------------------------------------------------------------------- - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/ui/inc/toxmgr.hxx index 273ab7c0787d..86b2d7f5ecc5 100644 --- a/sw/source/ui/inc/toxmgr.hxx +++ b/sw/source/ui/inc/toxmgr.hxx @@ -245,7 +245,6 @@ public: {delete pTOUName; pTOUName = new OUString(rSet);} const OUString* GetTOUName() const {return pTOUName;} - void SetPhoneticReadingOfAltStr(const OUString& rSet) {delete pPhoneticReadingOfAltStr; pPhoneticReadingOfAltStr = new OUString(rSet);} const OUString* GetPhoneticReadingOfAltStr() const { return pPhoneticReadingOfAltStr; } @@ -271,14 +270,12 @@ public: // single argument ctors shall be explicit. explicit SwTOXMgr(SwWrtShell* pShell); - // // methods for directory marks - // + void InsertTOXMark(const SwTOXMarkDescription& rDesc); void UpdateTOXMark(const SwTOXMarkDescription& rDesc); - void DeleteTOXMark(); void NextTOXMark(sal_Bool bSame=sal_False); void PrevTOXMark(sal_Bool bSame=sal_False); @@ -290,9 +287,8 @@ public: SwTOXMark* GetCurTOXMark(); void SetCurTOXMark(sal_uInt16 nId); - // // methods for directories - // + sal_Bool UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0); const SwTOXType* GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const; diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx index 345828ef8a85..075dbf626708 100644 --- a/sw/source/ui/inc/uivwimp.hxx +++ b/sw/source/ui/inc/uivwimp.hxx @@ -160,7 +160,6 @@ public: return m_bEditingPositionSet; } - void StartDocumentInserter( const OUString& rFactory, const Link& rEndDialogHdl ); SfxMedium* CreateMedium(); void InitRequest( const SfxRequest& rRequest ); diff --git a/sw/source/ui/inc/unoatxt.hxx b/sw/source/ui/inc/unoatxt.hxx index b0a27da7afad..3a27de5d55e7 100644 --- a/sw/source/ui/inc/unoatxt.hxx +++ b/sw/source/ui/inc/unoatxt.hxx @@ -110,7 +110,6 @@ protected: public: SwXAutoTextGroup(const OUString& rName, SwGlossaries* pGloss); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel @@ -153,7 +152,6 @@ public: virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - // void Invalidate(); }; @@ -242,7 +240,6 @@ public: const OUString& GetEntryName() {return sEntryName;} }; - /** Implement the XNameAccess for the AutoText events */ class SwAutoTextEventDescriptor : public SvBaseEventDescriptor { @@ -281,7 +278,6 @@ protected: ::com::sun::star::uno::RuntimeException); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx index 1a004ed2d893..f5992c1e0465 100644 --- a/sw/source/ui/inc/unodispatch.hxx +++ b/sw/source/ui/inc/unodispatch.hxx @@ -87,7 +87,7 @@ public: // view destroyed void Invalidate(); }; -//--------------------------------------------------------------------------------------------------------------------- + struct StatusStruct_Impl { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener> xListener; diff --git a/sw/source/ui/inc/unomailmerge.hxx b/sw/source/ui/inc/unomailmerge.hxx index f66a616c02c4..211c2cbfe41b 100644 --- a/sw/source/ui/inc/unomailmerge.hxx +++ b/sw/source/ui/inc/unomailmerge.hxx @@ -24,7 +24,6 @@ #include <cppuhelper/interfacecontainer.hxx> #include <unotools/configitem.hxx> - #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -57,9 +56,6 @@ namespace com { namespace sun { namespace star { }}} - -/////////////////////////////////////////////////////////////////////////// - // uses templates from <cppuhelper/interfacecontainer.h> // and <unotools/configitem.hxx> @@ -75,8 +71,6 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar PropHashType_Impl > OPropertyListenerContainerHelper; -//////////////////////////////////////////////////////////// - class SwNewDBMgr; class MailMergeExecuteFinalizer; @@ -152,7 +146,6 @@ protected: public: SwXMailMerge(); - void LaunchMailMergeEvent( const com::sun::star::text::MailMergeEvent &rData ) const; // XJob @@ -189,14 +182,10 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; - extern com::sun::star::uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwXMailMerge_getImplementationName() throw(); extern com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( com::sun::star::uno::Exception ); -//////////////////////////////////////////////////////////// - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/unomod.hxx b/sw/source/ui/inc/unomod.hxx index c0ee901688da..1d1c8823eb7c 100644 --- a/sw/source/ui/inc/unomod.hxx +++ b/sw/source/ui/inc/unomod.hxx @@ -53,7 +53,6 @@ protected: public: SwXModule(); - //XViewSettings virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); @@ -105,7 +104,6 @@ protected: public: SwXPrintSettings( SwXPrintSettingsType eType, SwDoc * pDoc = NULL ); - //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); @@ -149,7 +147,6 @@ protected: public: SwXViewSettings(sal_Bool bWeb, SwView* pView); - //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx index d5c76cf3fbf5..0b85820a62bb 100644 --- a/sw/source/ui/inc/unotools.hxx +++ b/sw/source/ui/inc/unotools.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_UNOTOOLS_HXX #define INCLUDED_SW_SOURCE_UI_INC_UNOTOOLS_HXX - #include <vcl/button.hxx> #include <vcl/edit.hxx> #include <vcl/dialog.hxx> diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index f88a5e410906..76f370ca1eba 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.hxx @@ -67,7 +67,6 @@ class SwXTextView : ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxViewSettings; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > * pxTextViewCursor; - SdrObject* GetControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xToFill ); @@ -77,7 +76,6 @@ protected: public: SwXTextView(SwView* pSwView); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( ) throw(); virtual void SAL_CALL release( ) throw(); diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx index 946b3d2d1e63..9169166c5a6b 100644 --- a/sw/source/ui/inc/usrpref.hxx +++ b/sw/source/ui/inc/usrpref.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_INC_USRPREF_HXX #define INCLUDED_SW_SOURCE_UI_INC_USRPREF_HXX - - #include <unotools/configitem.hxx> #include <fldupde.hxx> #include "viewopt.hxx" diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc index 992c66c3c029..774a0b868231 100644 --- a/sw/source/ui/inc/utlui.hrc +++ b/sw/source/ui/inc/utlui.hrc @@ -26,7 +26,7 @@ #define RID_SW_SHELLRES (RC_UTLUI_BEGIN + 1) #define RID_STR_SYSTEM (RC_UTLUI_BEGIN + 2) -// ------------------------------------------------------------------------ + // Strings in NumberFormatter-Listbox #define STR_DEFINE_NUMBERFORMAT (RC_UTLUI_BEGIN + 4) diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index f1d656e0847f..91733d3da373 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -172,7 +172,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell static SearchAttrItemList* m_pSrchList; static SearchAttrItemList* m_pReplList; - SvxHtmlOptions m_aHTMLOpt; Timer m_aTimer; // for delayed ChgLnks during an action OUString m_aPageStr; // status view, current page @@ -199,7 +198,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwView_Impl *m_pViewImpl; // Impl-data for UNO + Basic - SwScrollbar *m_pHScrollbar, // MDI control elements *m_pVScrollbar; @@ -549,7 +547,6 @@ public: void GetState(SfxItemSet&); void StateStatusLine(SfxItemSet&); - // functions for drawing void SetDrawFuncPtr(SwDrawBase* pFuncPtr); inline SwDrawBase* GetDrawFuncPtr(/*sal_Bool bBuf = sal_False*/) const { return m_pDrawActual; } diff --git a/sw/source/ui/inc/web.hrc b/sw/source/ui/inc/web.hrc index 63540b8670cd..aef47e9d2bb1 100644 --- a/sw/source/ui/inc/web.hrc +++ b/sw/source/ui/inc/web.hrc @@ -34,7 +34,7 @@ #define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11) #define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12) -// ------------------------------------------------------------------------ + #define WEB_ACT_END STR_WRITER_WEBDOC_FULLTYPE diff --git a/sw/source/ui/inc/wformsh.hxx b/sw/source/ui/inc/wformsh.hxx index 02f3d29b7a79..aac9f9f69c94 100644 --- a/sw/source/ui/inc/wformsh.hxx +++ b/sw/source/ui/inc/wformsh.hxx @@ -31,8 +31,6 @@ public: TYPEINFO(); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wfrmsh.hxx b/sw/source/ui/inc/wfrmsh.hxx index 82ce2d384d22..68f7edcab86b 100644 --- a/sw/source/ui/inc/wfrmsh.hxx +++ b/sw/source/ui/inc/wfrmsh.hxx @@ -22,7 +22,6 @@ #include "frmsh.hxx" - class SwWebFrameShell: public SwFrameShell { @@ -36,6 +35,4 @@ public: #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wgrfsh.hxx b/sw/source/ui/inc/wgrfsh.hxx index d86341f3be5d..45682ac74554 100644 --- a/sw/source/ui/inc/wgrfsh.hxx +++ b/sw/source/ui/inc/wgrfsh.hxx @@ -31,8 +31,6 @@ public: TYPEINFO(); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wolesh.hxx b/sw/source/ui/inc/wolesh.hxx index 5f5d6ca1ab8d..bf9dcad60718 100644 --- a/sw/source/ui/inc/wolesh.hxx +++ b/sw/source/ui/inc/wolesh.hxx @@ -32,10 +32,4 @@ public: #endif - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index 6098865bd362..eef6332e01db 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -52,12 +52,6 @@ class SwView; #define NID_TABLE_FORMULA_ERROR 20019 #define NID_COUNT 20 - - -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- - class SwTbxInsertCtrl : public SfxToolBoxControl { sal_uInt16 nLastSlotId; @@ -80,16 +74,11 @@ public: virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); }; -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- - class SwTbxAutoTextCtrl : public SfxToolBoxControl { PopupMenu* pPopup; SwView* pView; - void DelPopup(); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -111,7 +100,6 @@ class SwTbxFieldCtrl : public SfxToolBoxControl PopupMenu* pPopup; SwView* pView; - void DelPopup(); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -128,12 +116,6 @@ public: DECL_LINK(PopupHdl, PopupMenu*); }; - - -//---------------------------------------------------------------------------- -// -//---------------------------------------------------------------------------- - class SwScrollNaviToolBox : public ToolBox { virtual void MouseButtonUp( const MouseEvent& rMEvt ); @@ -171,9 +153,7 @@ public: void GrabFocus(){aToolBox.GrabFocus();} }; -//---------------------------------------------------------------------------- // ImageButtons have to set the HelpText themselves if needed -//---------------------------------------------------------------------------- class SwHlpImageButton : public ImageButton { @@ -202,6 +182,4 @@ public: }; #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index 211bb0961095..322b0530a749 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.hxx @@ -39,7 +39,6 @@ public: SwWrtShell* GetWrtShell() { return pWrtShell; } }; - /*-------------------------------------------------------------------- Description: circulation TabPage --------------------------------------------------------------------*/ @@ -115,5 +114,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index 8ec265c3773e..fbcdecaecf19 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -51,7 +51,6 @@ namespace com { namespace sun { namespace star { namespace util { struct SearchOptions; } } } } - typedef sal_Int32 SelectionType; namespace nsSelectionType { @@ -448,7 +447,6 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); // link for inserting ranges via Drag&Drop/Clipboard DECL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData* ); - // ctor, the first one is a kind of a controlled copy ctor for more views of a document SwWrtShell( SwWrtShell&, Window *pWin, SwView &rShell); SwWrtShell( SwDoc& rDoc, Window *pWin, SwView &rShell, @@ -523,7 +521,6 @@ private: lOffset(lOff) { - } } *pCrsrStack; diff --git a/sw/source/ui/inc/wtextsh.hxx b/sw/source/ui/inc/wtextsh.hxx index 79ff56e06869..3a236f7ce307 100644 --- a/sw/source/ui/inc/wtextsh.hxx +++ b/sw/source/ui/inc/wtextsh.hxx @@ -22,7 +22,6 @@ #include "textsh.hxx" - class SwWebTextShell: public SwTextShell { @@ -36,6 +35,4 @@ public: #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/zoomctrl.hxx b/sw/source/ui/inc/zoomctrl.hxx index c30af120b12c..89818fdf4f72 100644 --- a/sw/source/ui/inc/zoomctrl.hxx +++ b/sw/source/ui/inc/zoomctrl.hxx @@ -38,8 +38,6 @@ public: }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index b7e9e05ba4a6..72ed20c9dcac 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -52,7 +52,6 @@ #include <swuicnttab.hxx> #include <unomid.h> - using namespace ::com::sun::star; using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; @@ -385,7 +384,6 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( OSL_ENSURE(aFormatAccess.getValueType() == ::getCppuType((uno::Reference<container::XIndexReplace>*)0), "wrong property type"); - uno::Reference< container::XIndexReplace > xFormatAccess; aFormatAccess >>= xFormatAccess; uno::Any aLevelProp(&aSequPropVals, ::getCppuType((uno::Sequence<beans::PropertyValues>*)0)); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 5d7a07b3d5b7..a0a1823e9b54 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -163,7 +163,6 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base long nCurrentRow; bool bModified; - void SetModified() {bModified = true;} protected: @@ -566,7 +565,6 @@ public: void setColSizes(); }; - SwIndexTreeLB::SwIndexTreeLB(SvSimpleTableContainer& rParent, WinBits nBits) : SvSimpleTable(rParent, nBits) { @@ -711,7 +709,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, } } // now the other styles - // + const SwTxtFmtColl *pColl = 0; const sal_uInt16 nSz = rWrtSh.GetTxtFmtCollCount(); @@ -2265,7 +2263,7 @@ IMPL_LINK_NOARG(SwTOXEntryTabPage, AllLevelsHdl) OUString sNewToken = m_pTokenWIN->GetPattern(); for(sal_uInt16 i = 1; i < m_pCurrentForm->GetFormMax(); i++) m_pCurrentForm->SetPattern(i, sNewToken); - // + ModifyHdl(this); } return 0; @@ -4102,7 +4100,6 @@ sal_Bool SwEntryBrowseBox::IsModified()const if(bModified) return sal_True; - //check if the current controller is modified sal_uInt16 nCol = GetCurColumnId(); ::svt::CellController* pController; diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 6959487a008f..a3b147289712 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -24,7 +24,6 @@ #include "index.hrc" - SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(Window* pParent, SwTOXMgr& rTOXMgr) : SvxStandardDialog(pParent, "SelectIndexDialog", "modules/swriter/ui/selectindexdialog.ui") @@ -57,7 +56,6 @@ IMPL_LINK_INLINE_START( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox ) } IMPL_LINK_INLINE_END( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox ) - void SwMultiTOXMarkDlg::Apply() { rMgr.SetCurTOXMark(nPos); @@ -67,9 +65,6 @@ void SwMultiTOXMarkDlg::Apply() overload dtor --------------------------------------------------*/ - SwMultiTOXMarkDlg::~SwMultiTOXMarkDlg() {} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 23e67afed334..58d415077614 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -62,7 +62,6 @@ #include <unomid.h> - #define POS_CONTENT 0 #define POS_INDEX 1 @@ -454,7 +453,6 @@ static void lcl_SelectSameStrings(SwWrtShell& rSh, sal_Bool bWordOnly, sal_Bool (FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY), sal_False ); } - void SwIndexMarkPane::InsertMark() { sal_uInt16 nPos = m_pTypeDCB->GetEntryPos(m_pTypeDCB->GetSelectEntry()); @@ -1519,7 +1517,6 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, pIdentifierBox->SetSelectHdl(LINK(this, SwCreateAuthEntryDlg_Impl, IdentifierHdl)); - const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) rSh.GetFldType(RES_AUTHORITY, OUString()); if(pFType) diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx index 4336fbf2c8fe..62875171feaf 100644 --- a/sw/source/ui/index/toxmgr.cxx +++ b/sw/source/ui/index/toxmgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <wrtsh.hxx> #include <shellres.hxx> #include <swwait.hxx> @@ -33,7 +32,6 @@ Description: handle indexes with TOXMgr --------------------------------------------------------------------*/ - SwTOXMgr::SwTOXMgr(SwWrtShell* pShell): pSh(pShell) { @@ -45,13 +43,11 @@ SwTOXMgr::SwTOXMgr(SwWrtShell* pShell): Description: handle current TOXMarks --------------------------------------------------------------------*/ - sal_uInt16 SwTOXMgr::GetTOXMarks() { return pSh->GetCurTOXMarks(aCurMarks); } - SwTOXMark* SwTOXMgr::GetTOXMark(sal_uInt16 nId) { if(!aCurMarks.empty()) @@ -59,7 +55,6 @@ SwTOXMark* SwTOXMgr::GetTOXMark(sal_uInt16 nId) return 0; } - void SwTOXMgr::DeleteTOXMark() { SwTOXMark* pNext = 0; @@ -163,7 +158,6 @@ void SwTOXMgr::InsertTOXMark(const SwTOXMarkDescription& rDesc) Description: Update of TOXMarks --------------------------------------------------------------------*/ - void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) { OSL_ENSURE(pCurTOXMark, "no current TOXMark"); @@ -237,12 +231,10 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) } } - /*-------------------------------------------------------------------- Description: determine UserTypeID --------------------------------------------------------------------*/ - sal_uInt16 SwTOXMgr::GetUserTypeID(const OUString& rStr) { sal_uInt16 nSize = pSh->GetTOXTypeCount(TOX_USER); @@ -261,7 +253,6 @@ sal_uInt16 SwTOXMgr::GetUserTypeID(const OUString& rStr) Description: traveling between TOXMarks --------------------------------------------------------------------*/ - void SwTOXMgr::NextTOXMark(sal_Bool bSame) { OSL_ENSURE(pCurTOXMark, "no current TOXMark"); @@ -272,7 +263,6 @@ void SwTOXMgr::NextTOXMark(sal_Bool bSame) } } - void SwTOXMgr::PrevTOXMark(sal_Bool bSame) { OSL_ENSURE(pCurTOXMark, "no current TOXMark"); @@ -425,7 +415,6 @@ sal_Bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc, break; } - OSL_ENSURE(pNewTOX, "no TOXBase created!" ); if(!pNewTOX) return sal_False; @@ -533,6 +522,4 @@ void SwTOXDescription::ApplyTo(SwTOXBase& rTOXBase) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx index 21e0aba383ed..b5d1950f24f3 100644 --- a/sw/source/ui/lingu/hhcwrp.cxx +++ b/sw/source/ui/lingu/hhcwrp.cxx @@ -55,7 +55,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::i18n; -////////////////////////////////////////////////////////////////////// // Description: Turn off frame/object shell if applicable static void lcl_ActivateTextShell( SwWrtShell & rWrtSh ) @@ -64,8 +63,6 @@ static void lcl_ActivateTextShell( SwWrtShell & rWrtSh ) rWrtSh.EnterStdMode(); } -////////////////////////////////////////////////////////////////////// - class SwKeepConversionDirectionStateContext { public: @@ -83,8 +80,6 @@ public: } }; -////////////////////////////////////////////////////////////////////// - SwHHCWrapper::SwHHCWrapper( SwView* pSwView, const uno::Reference< uno::XComponentContext >& rxContext, @@ -117,7 +112,6 @@ SwHHCWrapper::SwHHCWrapper( { } - SwHHCWrapper::~SwHHCWrapper() { delete m_pConvArgs; @@ -153,7 +147,7 @@ SwHHCWrapper::~SwHHCWrapper() //!! Note: This also effects the default language of text boxes (EditEngine/EditView) !! pDoc->SetDefault( SvxLanguageItem( nTargetLang, RES_CHRATR_CJK_LANGUAGE ) ); - // + const Font *pFont = GetTargetFont(); if (pFont) { @@ -166,7 +160,6 @@ SwHHCWrapper::~SwHHCWrapper() } } - void SwHHCWrapper::GetNextPortion( OUString& rNextPortion, LanguageType& rLangOfPortion, @@ -185,7 +178,6 @@ void SwHHCWrapper::GetNextPortion( m_nLastPos = pCrsr->Start()->nContent.GetIndex(); } - void SwHHCWrapper::SelectNewUnit_impl( sal_Int32 nUnitStart, sal_Int32 nUnitEnd ) { SwPaM *pCrsr = m_rWrtShell.GetCrsr(); @@ -203,7 +195,6 @@ void SwHHCWrapper::SelectNewUnit_impl( sal_Int32 nUnitStart, sal_Int32 nUnitEnd m_rWrtShell.EndSelect(); } - void SwHHCWrapper::HandleNewUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd ) { @@ -221,7 +212,6 @@ void SwHHCWrapper::HandleNewUnit( m_rWrtShell.EndAllAction(); } - void SwHHCWrapper::ChangeText( const OUString &rNewText, const OUString& rOrigText, const uno::Sequence< sal_Int32 > *pOffsets, @@ -331,7 +321,6 @@ void SwHHCWrapper::ChangeText( const OUString &rNewText, } } - void SwHHCWrapper::ChangeText_impl( const OUString &rNewText, bool bKeepAttributes ) { if (bKeepAttributes) @@ -376,7 +365,6 @@ void SwHHCWrapper::ChangeText_impl( const OUString &rNewText, bool bKeepAttribut } } - void SwHHCWrapper::ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, const OUString& rOrigText, @@ -535,13 +523,11 @@ void SwHHCWrapper::ReplaceUnit( m_rWrtShell.EndAllAction(); } - bool SwHHCWrapper::HasRubySupport() const { return true; } - void SwHHCWrapper::Convert() { OSL_ENSURE( m_pConvArgs == 0, "NULL pointer expected" ); @@ -550,7 +536,6 @@ void SwHHCWrapper::Convert() SwPosition* pSttPos = pCrsr->Start(); SwPosition* pEndPos = pCrsr->End(); - if (pSttPos->nNode.GetNode().IsTxtNode() && pEndPos->nNode.GetNode().IsTxtNode()) { @@ -640,7 +625,6 @@ void SwHHCWrapper::Convert() ConvEnd_impl( m_pConvArgs ); } - bool SwHHCWrapper::ConvNext_impl( ) { //! modified version of SvxSpellWrapper::SpellNext @@ -682,7 +666,6 @@ bool SwHHCWrapper::ConvNext_impl( ) return bGoOn; } - bool SwHHCWrapper::FindConvText_impl() { //! modified version of SvxSpellWrapper::FindSpellError @@ -709,26 +692,22 @@ bool SwHHCWrapper::FindConvText_impl() return bFound; } - bool SwHHCWrapper::HasOtherCnt_impl() { return m_bIsSelection ? false : m_rWrtShell.HasOtherCnt(); } - void SwHHCWrapper::ConvStart_impl( SwConversionArgs /* [out] */ *pConversionArgs, SvxSpellArea eArea ) { SetDrawObj( SVX_SPELL_OTHER == eArea ); m_pView->SpellStart( eArea, m_bStartDone, m_bEndDone, /* [out] */ pConversionArgs ); } - void SwHHCWrapper::ConvEnd_impl( SwConversionArgs *pConversionArgs ) { m_pView->SpellEnd( pConversionArgs ); } - bool SwHHCWrapper::ConvContinue_impl( SwConversionArgs *pConversionArgs ) { bool bProgress = !m_bIsDrawObj && !m_bIsSelection; @@ -738,6 +717,4 @@ bool SwHHCWrapper::ConvContinue_impl( SwConversionArgs *pConversionArgs ) return !pConversionArgs->aConvText.isEmpty(); } -////////////////////////////////////////////////////////////////////// - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx index 1b228e5dc877..73de46c7aeb8 100644 --- a/sw/source/ui/lingu/hyp.cxx +++ b/sw/source/ui/lingu/hyp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "initui.hxx" #include "view.hxx" #include "edtwin.hxx" @@ -62,7 +61,6 @@ SwHyphWrapper::SwHyphWrapper( SwView* pVw, SetHyphen(); } - void SwHyphWrapper::SpellStart( SvxSpellArea eSpell ) { if( SVX_SPELL_OTHER == eSpell && nPageCount ) @@ -74,8 +72,6 @@ void SwHyphWrapper::SpellStart( SvxSpellArea eSpell ) pView->HyphStart( eSpell ); } - - bool SwHyphWrapper::SpellContinue() { // for automatic separation, make actions visible only at the end @@ -101,14 +97,12 @@ bool SwHyphWrapper::SpellContinue() return GetLast().is(); } - void SwHyphWrapper::SpellEnd() { PSH->HyphEnd(); SvxSpellWrapper::SpellEnd(); } - bool SwHyphWrapper::SpellMore() { PSH->Push(); @@ -117,8 +111,6 @@ bool SwHyphWrapper::SpellMore() return false; } - - void SwHyphWrapper::InsertHyphen( const sal_uInt16 nPos ) { if( nPos) @@ -129,7 +121,6 @@ void SwHyphWrapper::InsertHyphen( const sal_uInt16 nPos ) PSH->HyphIgnore(); } - SwHyphWrapper::~SwHyphWrapper() { if( nPageCount ) diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index c2591a4966ac..f5909da430d1 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -93,12 +93,10 @@ #include <com/sun/star/system/SystemShellExecute.hpp> #include <com/sun/star/frame/theUICommandDescription.hpp> - using namespace ::com::sun::star; extern void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ); - /// @returns : the language for the selected text that is set for the /// specified attribute (script type). /// If there are more than one languages used LANGUAGE_DONTKNOW will be returned. @@ -197,7 +195,6 @@ void SwSpellPopup::fillLangPopupMenu( } } - sal_uInt16 nItemId = nLangItemIdStart; std::set< OUString >::const_iterator it; for (it = aLangItems.begin(); it != aLangItems.end(); ++it) @@ -267,7 +264,6 @@ OUString RetrieveLabelFromCommand( const OUString& aCmdURL ) return aLabel; } - SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const uno::Reference< linguistic2::XSpellAlternatives > &xAlt, @@ -414,7 +410,7 @@ SwSpellPopup::SwSpellPopup( EnableItem( MN_ADD_TO_DIC_SINGLE, ((nItemId - MN_DICTIONARIES_START) == 1)?sal_True:sal_False ); //ADD NEW LANGUAGE MENU ITEM - /////////////////////////////////////////////////////////////////////////// + OUString aScriptTypesInUse( OUString::number( pWrtSh->GetScriptType() ) ); SvtLanguageTable aLanguageTable; @@ -453,14 +449,10 @@ SwSpellPopup::SwSpellPopup( SetItemImage( MN_SPELLING_DLG, rImg ); } - ////////////////////////////////////////////////////////////////////////////////// - checkRedline(); RemoveDisabledEntries( true, true ); } - - SwSpellPopup::SwSpellPopup( SwWrtShell *pWrtSh, const linguistic2::ProofreadingResult &rResult, @@ -568,7 +560,7 @@ m_aInfo16( SW_RES(IMG_INFO_16) ) EnableItem( MN_ADD_TO_DIC_SINGLE, false ); //ADD NEW LANGUAGE MENU ITEM - /////////////////////////////////////////////////////////////////////////// + OUString aScriptTypesInUse( OUString::number( pWrtSh->GetScriptType() ) ); SvtLanguageTable aLanguageTable; @@ -607,8 +599,6 @@ m_aInfo16( SW_RES(IMG_INFO_16) ) SetItemImage( MN_SPELLING_DLG, rImg ); } - ////////////////////////////////////////////////////////////////////////////////// - checkRedline(); RemoveDisabledEntries( true, true ); } diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx index 7c3de8257ec4..3a05a06b3328 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.cxx +++ b/sw/source/ui/lingu/sdrhhcwrap.cxx @@ -44,8 +44,6 @@ using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////// - SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, LanguageType nSourceLanguage, LanguageType nTargetLanguage, const Font* pTargetFnt, @@ -78,7 +76,6 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, // Hack: all SdrTextObj attributes should be transferred to EditEngine pOutlView->SetBackgroundColor( Color( COL_WHITE ) ); - InsertView( pOutlView ); Point aPoint( 0, 0 ); Rectangle aRect( aPoint, aSize ); @@ -101,13 +98,11 @@ SdrHHCWrapper::~SdrHHCWrapper() delete pOutlView; } - void SdrHHCWrapper::StartTextConversion() { pOutlView->StartTextConversion( nSourceLang, nTargetLang, pTargetFont, nOptions, bIsInteractive, true ); } - bool SdrHHCWrapper::ConvertNextDocument() { bool bNextDoc = false; @@ -177,6 +172,4 @@ bool SdrHHCWrapper::ConvertNextDocument() return bNextDoc; } -////////////////////////////////////////////////////////////////////// - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/lingu/sdrhhcwrap.hxx b/sw/source/ui/lingu/sdrhhcwrap.hxx index c416124c04e1..d6befe334b44 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.hxx +++ b/sw/source/ui/lingu/sdrhhcwrap.hxx @@ -25,8 +25,6 @@ class SwView; class SdrTextObj; class OutlinerView; -////////////////////////////////////////////////////////////////////// - class SdrHHCWrapper : public SdrOutliner { // modified version of SdrSpeller @@ -53,8 +51,6 @@ public: void StartTextConversion(); }; -////////////////////////////////////////////////////////////////////// - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index c242903023d1..0367f40b75a5 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -22,7 +22,6 @@ #include <svl/stritem.hxx> #include <vcl/msgbox.hxx> - #include "view.hxx" #include "basesh.hxx" #include "wrtsh.hxx" @@ -58,7 +57,6 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) InfoBox(this, sWarning).Execute(); } - } m_pOkBtn->Enable(!bSelEntries); // new text mark diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index f6e888b7b7ba..7c8ee93a2e22 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -68,10 +68,6 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn ) return 0; } - - - - SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, bool bEN, const SfxItemSet &rSet) : SfxTabPage(pParent, @@ -255,8 +251,6 @@ void SwEndNoteOptionPage::SelectNumbering(int eNum) NumCountHdl(m_pNumCountBox); } - - int SwEndNoteOptionPage::GetNumbering() const { const sal_uInt16 nPos = m_pNumCountBox->GetSelectEntryPos(); @@ -281,7 +275,6 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell ) page. In this case all kinds of numbering can be used. ------------------------------------------------------------------------*/ - IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl) { const SwFtnNum eNum = (const SwFtnNum)GetNumbering(); @@ -317,7 +310,6 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl) numbering can be used. ------------------------------------------------------------------------*/ - IMPL_LINK_NOARG_INLINE_START(SwEndNoteOptionPage, PosChapterHdl) { if ( !bPosDoc ) @@ -418,10 +410,4 @@ SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet &rSet return new SwFootNoteOptionPage( pParent, rSet ); } - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index 34b98d15c8d1..4236067c95a8 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include <com/sun/star/container/XNamed.hpp> #include <unotools/transliterationwrapper.hxx> - #ifndef __RSC //autogen #include <tools/errinf.hxx> #endif diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx index 6614161eca54..c3776ceb852a 100644 --- a/sw/source/ui/misc/glshell.cxx +++ b/sw/source/ui/misc/glshell.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/frame/XTitle.hpp> #include <svl/eitem.hxx> diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index ad9dfc90b04f..fab6f1749104 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -66,7 +66,6 @@ class SwEndNoteOptionPage : public SfxTabPage DECL_LINK(PosChapterHdl, void *); DECL_LINK(NumCountHdl, void *); - public: SwEndNoteOptionPage( Window *pParent, bool bEndNote, const SfxItemSet &rSet ); @@ -88,8 +87,6 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index b66e726d2546..376c600fdee9 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -104,7 +104,6 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, m_pStandardPB->SetAccessibleRelationMemberOf(m_pPositionFrame->get_label_widget()); - m_pRelativeCB->Check(); m_pAlignLB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl)); m_pAlign2LB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl)); diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx index 79162c16f8aa..abf041025090 100644 --- a/sw/source/ui/misc/numberingtypelistbox.cxx +++ b/sw/source/ui/misc/numberingtypelistbox.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star; - struct SwNumberingTypeListBox_Impl { uno::Reference<text::XNumberingTypeInfo> xInfo; diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 15a0e8e39183..372b6526b2da 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -41,7 +41,6 @@ #include <globals.hrc> #include <misc.hrc> - using namespace ::com::sun::star; static sal_uInt16 aPageRg[] = { @@ -60,7 +59,6 @@ IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightPage) } IMPL_LINK_NOARG_INLINE_END(SwFootNotePage, HeightPage) - IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightMetric) { m_pMaxHeightEdit->Enable(); @@ -242,7 +240,6 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) m_pLineColorBox->SelectEntryPos( nSelPos ); m_pLineTypeBox->SetColor( pFtnInfo->GetLineColor() ); - // position m_pLinePosBox->SelectEntryPos( static_cast< sal_uInt16 >(pFtnInfo->GetAdj()) ); diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index 9feb5670c7ee..f6ceee69026d 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -1056,7 +1056,6 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) const SwRangeRedline &rRedline = pSh->GetRedline(nPos); - /* enable again once we have redline comments in the margin sComment = rRedline.GetComment(); if ( !sComment.Len() ) @@ -1208,5 +1207,4 @@ void SwRedlineAcceptDlg::FillInfo(OUString &rExtraData) const rExtraData += ")"; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx index 2063af43f5b2..1ba770fd6a42 100644 --- a/sw/source/ui/misc/swruler.cxx +++ b/sw/source/ui/misc/swruler.cxx @@ -62,7 +62,6 @@ void SwCommentRuler::Paint( const Rectangle& rRect ) DrawCommentControl(); } - void SwCommentRuler::DrawCommentControl() { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx index 658dbd49a0c1..de3eddb8fe3d 100644 --- a/sw/source/ui/ribbar/drawbase.cxx +++ b/sw/source/ui/ribbar/drawbase.cxx @@ -452,7 +452,7 @@ void SwDrawBase::Deactivate() } // Process keyboard events -// + // If a KeyEvent is processed then the return value is sal_True, otherwise // Sal_False. @@ -537,7 +537,7 @@ sal_Bool SwDrawBase::KeyInput(const KeyEvent& rKEvt) } // Process keyboard events -// + // If a KeyEvent is processed then the return value is sal_True, otherwise // Sal_False. diff --git a/sw/source/ui/ribbar/dselect.cxx b/sw/source/ui/ribbar/dselect.cxx index 6d21a80b19ec..91ad444ccf0b 100644 --- a/sw/source/ui/ribbar/dselect.cxx +++ b/sw/source/ui/ribbar/dselect.cxx @@ -32,7 +32,7 @@ DrawSelection::DrawSelection(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* } // Process keyboard events -// + // If a KeyEvent is processed then the return value is sal_True, otherwise // Sal_False. diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index da6ea417948b..aa1f46ab5598 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -453,7 +453,6 @@ IMPL_LINK( SwInputWindow, SelTblCellsNotify, SwWrtShell *, pCaller ) return 0; } - void SwInputWindow::SetFormula( const OUString& rFormula, sal_Bool bDelFlag ) { OUString sEdit('='); @@ -487,7 +486,6 @@ IMPL_LINK_NOARG(SwInputWindow, ModifyHdl) return 0; } - void SwInputWindow::DelBoxCntnt() { if( bIsTable ) @@ -629,7 +627,6 @@ SwInputChild::~SwInputChild() pDispatch->Lock(sal_False); } - SfxChildWinInfo SwInputChild::GetInfo() const { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \ diff --git a/sw/source/ui/ribbar/tblctrl.cxx b/sw/source/ui/ribbar/tblctrl.cxx index 9ee21f30bf4d..2649d74e6951 100644 --- a/sw/source/ui/ribbar/tblctrl.cxx +++ b/sw/source/ui/ribbar/tblctrl.cxx @@ -26,7 +26,6 @@ #include "swtypes.hxx" #include "tblctrl.hxx" - SFX_IMPL_TOOLBOX_CONTROL( SwTableOptimizeCtrl, SfxUInt16Item ); SwTableOptimizeCtrl::SwTableOptimizeCtrl( diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx index 055318378f1d..e90b3ab9905e 100644 --- a/sw/source/ui/ribbar/tbxanchr.cxx +++ b/sw/source/ui/ribbar/tbxanchr.cxx @@ -26,7 +26,6 @@ #include <vcl/toolbox.hxx> #include <sfx2/mnumgr.hxx> - #include "cmdid.h" #include "docsh.hxx" #include "swtypes.hxx" @@ -37,8 +36,6 @@ #include "ribbar.hrc" #include "tbxanchr.hxx" - - SFX_IMPL_TOOLBOX_CONTROL(SwTbxAnchor, SfxUInt16Item); SwTbxAnchor::SwTbxAnchor( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : @@ -117,7 +114,6 @@ void SwTbxAnchor::Click() if (nActAnchorId) aPopMenu.CheckItem(nActAnchorId); - sal_uInt16 nSlotId = aPopMenu.Execute(&GetToolBox(), aRect); GetToolBox().EndSelection(); diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index a4c2037bd5d5..e1d58875f9ba 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -136,7 +136,6 @@ SfxPopupWindowType SwTbxInsertCtrl::GetPopupWindowType() const return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK; } - void SwTbxInsertCtrl::Select( sal_Bool /*bMod1*/ ) { if( nLastSlotId ) @@ -398,7 +397,6 @@ void SwTbxFieldCtrl::DelPopup() } } - // Navigation-Popup // determine the order of the toolbox items static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] = diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 3247ce98972c..d1e69591744f 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> @@ -519,14 +518,12 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) aDlgAttr.Put(aEditAttr); - aDlgAttr.Put( SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE) ); aDlgAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) ); aDlgAttr.Put( SvxFmtSplitItem( true, RES_PARATR_SPLIT ) ); aDlgAttr.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) ); aDlgAttr.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) ); - SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -1069,7 +1066,6 @@ void SwAnnotationShell::StateInsert(SfxItemSet &rSet) } } - void SwAnnotationShell::NoteExec(SfxRequest &rReq) { SwPostItMgr* pPostItMgr = rView.GetPostItMgr(); diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 7ce08aa87c2a..797f9dee8749 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sot/factory.hxx> #include <hintids.hxx> #include <svl/urihelper.hxx> @@ -137,7 +136,6 @@ static sal_uInt8 nFooterPos; SvxIMapDlgChildWindow::GetChildWindowId() )-> \ GetWindow() ) ) - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -1818,9 +1816,9 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot ) break; case FN_WRAP_ANCHOR_ONLY: aWrap.SetAnchorOnly(!aWrap.IsAnchorOnly()); - // + // keep previous wrapping - // + // switch to wrap SURROUND_PARALLEL, if previous wrap is SURROUND_NONE if ( nOldSurround != SURROUND_NONE ) { @@ -2451,7 +2449,6 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - // Table cell(s) selected? if ( rSh.IsTableMode() ) { diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx index 9553699b83e1..9ba12d925938 100644 --- a/sw/source/ui/shells/drawdlg.cxx +++ b/sw/source/ui/shells/drawdlg.cxx @@ -160,7 +160,6 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) break; } - if (pDoc->IsChanged()) GetShell().SetModified(); else diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx index 49612e5458ed..117db5a8c69e 100644 --- a/sw/source/ui/shells/drformsh.cxx +++ b/sw/source/ui/shells/drformsh.cxx @@ -55,7 +55,6 @@ #include <unomid.h> - using namespace ::com::sun::star; SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFORM)) @@ -64,10 +63,8 @@ SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFO SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX)); } - TYPEINIT1(SwDrawFormShell, SwDrawBaseShell) - void SwDrawFormShell::Execute(SfxRequest &rReq) { SwWrtShell &rSh = GetShell(); @@ -142,7 +139,6 @@ void SwDrawFormShell::Execute(SfxRequest &rReq) xPropSet->setPropertyValue( "TargetFrame", aTmp ); } - form::FormButtonType eButtonType = form::FormButtonType_URL; aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0)); xPropSet->setPropertyValue( "ButtonType", aTmp ); diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 30d88e9b7c81..24abc785cf6e 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp> #include <comphelper/processfactory.hxx> @@ -994,7 +993,6 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet) const bool bCopy = (aSel.nStartPara != aSel.nEndPara) || (aSel.nStartPos != aSel.nEndPos); - SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 4b7ddb2db810..350c4f62c06a 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <i18nlangtag/lang.h> #include <svl/slstitm.hxx> diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index f28c80e13457..8342502e12ae 100644 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <vcl/window.hxx> @@ -229,7 +228,6 @@ namespace SwLangHelper return bRestoreSelection; } - void SetLanguage( SwWrtShell &rWrtSh, const OUString &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ) { SetLanguage( rWrtSh, 0 , ESelection(), rLangText, bIsForSelection, rCoreSet ); @@ -406,7 +404,6 @@ namespace SwLangHelper } } - /// @returns : the language for the selected text that is set for the /// specified attribute (script type). /// If there are more than one languages used LANGUAGE_DONTKNOW will be returned. @@ -588,7 +585,6 @@ namespace SwLangHelper return aText; } - void SelectPara( EditView &rEditView, const ESelection &rCurSel ) { ESelection aParaSel( rCurSel.nStartPara, 0, rCurSel.nStartPara, EE_TEXTPOS_ALL ); diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index 8f2935489dc6..ae32351c3db8 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -57,7 +57,6 @@ SFX_IMPL_INTERFACE(SwListShell, SwBaseShell, SW_RES(STR_SHELLNAME_LIST)) SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX)); } - TYPEINIT1(SwListShell,SwBaseShell) // #i35572# Functionality of Numbering/Bullet toolbar diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/ui/shells/navsh.cxx index 012d919b8d20..c5a9199daa32 100644 --- a/sw/source/ui/shells/navsh.cxx +++ b/sw/source/ui/shells/navsh.cxx @@ -29,7 +29,6 @@ #include <unomid.h> #include "navmgr.hxx" - SFX_IMPL_INTERFACE(SwNavigationShell, SwBaseShell, SW_RES(STR_SHELLNAME_NAVIGATION)) { } diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx index b4f32cec4a81..6014c2fd725a 100644 --- a/sw/source/ui/shells/olesh.cxx +++ b/sw/source/ui/shells/olesh.cxx @@ -33,19 +33,16 @@ #include <popup.hrc> #include <shells.hrc> - #define SwOleShell #include <sfx2/msg.hxx> #include <swslots.hxx> - SFX_IMPL_INTERFACE(SwOleShell, SwFrameShell, SW_RES(STR_SHELLNAME_OBJECT)) { SFX_POPUPMENU_REGISTRATION(SW_RES(MN_OLE_POPUPMENU)); SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_OLE_TOOLBOX)); } - SwOleShell::SwOleShell(SwView &_rView) : SwFrameShell(_rView) diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 1fdb41990d25..ed66709a37e5 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -99,7 +99,6 @@ #include <svx/xftshxy.hxx> #include <svx/grafctrl.hxx> - #include <fmtornt.hxx> #include <paratr.hxx> #include <fmtinfmt.hxx> @@ -137,6 +136,4 @@ #include <sfx2/msg.hxx> #include "swslots.hxx" - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 53b2d3a28ef6..5b60dafb9d50 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -384,14 +384,12 @@ void ItemSetToTableParam( const SfxItemSet& rSet, if(eOrient != text::HoriOrientation::NONE) ((SfxItemSet&)rSet).ClearItem( SID_ATTR_LRSPACE ); - if(pRep->HasColsChanged()) { bTabCols = true; } } - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, false, &pItem)) rSh.SetRowsToRepeat( ((SfxUInt16Item*)pItem)->GetValue() ); @@ -497,7 +495,6 @@ void SwTableShell::Execute(SfxRequest &rReq) aInfo.SetTable( true ); aInfo.SetValid( VALID_DISABLE, false ); - // The attributes of all lines will be read and the strongest wins. const SvxBorderLine* pBorderLine; SvxBorderLine aBorderLine; diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index 394855361d36..fcc12affcb9c 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -79,7 +79,6 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, uno::Reference< beans::XPropertySet > xPropSet(xControlModel, uno::UNO_QUERY); - uno::Any aTmp; aTmp <<= OUString(rTxt); @@ -99,7 +98,6 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, xPropSet->setPropertyValue( "TargetFrame", aTmp ); } - form::FormButtonType eButtonType = form::FormButtonType_URL; aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0)); xPropSet->setPropertyValue( "ButtonType", aTmp ); diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 2c3c5e8734b3..5b336ff25aee 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <crsskip.hxx> #include <hintids.hxx> diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx index 2b8b4197bf57..05d9fc295c67 100644 --- a/sw/source/ui/shells/textidx.cxx +++ b/sw/source/ui/shells/textidx.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <vcl/msgbox.hxx> #include <sfx2/request.hxx> @@ -235,7 +234,6 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet) rSet.Put(SfxBoolItem(FN_INSERT_IDX_ENTRY_DLG, 0 != pIdxMrk)); - SwField* pField = rSh.GetCurFld(); if(bInReadonly) diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 20107080d00d..7cbe020572f3 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -1568,7 +1568,6 @@ void SwTextShell::GetState( SfxItemSet &rSet ) } break; - case FN_INSERT_BREAK: if ( rSh.HasReadonlySel() && !rSh.CrsrInsideInputFld() ) @@ -1577,7 +1576,6 @@ void SwTextShell::GetState( SfxItemSet &rSet ) } break; - case FN_INSERT_BREAK_DLG: case FN_INSERT_COLUMN_BREAK: case FN_INSERT_PAGEBREAK: diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 0c1df19d6d21..47d7e9312acb 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -58,9 +58,6 @@ const sal_uInt32 nFontInc = 40; // 2pt const sal_uInt32 nFontMaxSz = 19998; // 999.9pt - - - void SwTextShell::ExecCharAttr(SfxRequest &rReq) { SwWrtShell &rSh = GetShell(); @@ -76,7 +73,6 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) Get( nWhich )).GetValue() ? STATE_ON : STATE_OFF; } - SfxItemSet aSet( GetPool(), RES_CHRATR_BEGIN, RES_CHRATR_END-1 ); if (STATE_TOGGLE == eState) rSh.GetCurAttr( aSet ); @@ -168,7 +164,6 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) } } - void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) { sal_uInt16 nSlot = rReq.GetSlot(); @@ -492,8 +487,6 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) } } - - void SwTextShell::GetAttrState(SfxItemSet &rSet) { SwWrtShell &rSh = GetShell(); diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index 551814569ad1..bffbfc2c3583 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -293,7 +293,6 @@ void SwTextShell::ExecSetNumber(SfxRequest &rReq) } } - switch(rReq.GetSlot()) { case FN_SVX_SET_NUMBER: diff --git a/sw/source/ui/sidebar/PageColumnControl.cxx b/sw/source/ui/sidebar/PageColumnControl.cxx index 3c148c0b87ec..f2a5f3857bee 100644 --- a/sw/source/ui/sidebar/PageColumnControl.cxx +++ b/sw/source/ui/sidebar/PageColumnControl.cxx @@ -75,13 +75,11 @@ PageColumnControl::PageColumnControl( FreeResource(); } - PageColumnControl::~PageColumnControl(void) { delete mpColumnValueSet; } - IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl) { mpColumnValueSet->SetNoSelection(); @@ -107,7 +105,6 @@ IMPL_LINK(PageColumnControl, MoreButtonClickHdl_Impl, void *, EMPTYARG) return 0; } - } } // end of namespace sw::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/sidebar/PageColumnControl.hxx b/sw/source/ui/sidebar/PageColumnControl.hxx index caa3836419c2..875bea370fd7 100644 --- a/sw/source/ui/sidebar/PageColumnControl.hxx +++ b/sw/source/ui/sidebar/PageColumnControl.hxx @@ -34,7 +34,6 @@ namespace sw { namespace sidebar { class PagePropertyPanel; - class PageColumnControl : public ::svx::sidebar::PopupControl { diff --git a/sw/source/ui/sidebar/PageMarginControl.cxx b/sw/source/ui/sidebar/PageMarginControl.cxx index 2d33467de0d8..717a18554f9c 100644 --- a/sw/source/ui/sidebar/PageMarginControl.cxx +++ b/sw/source/ui/sidebar/PageMarginControl.cxx @@ -32,7 +32,6 @@ #define SWPAGE_DOWN_GVALUE "Sw_Page_Down" #define SWPAGE_MIRROR_GVALUE "Sw_Page_Mirrored" - namespace sw { namespace sidebar { PageMarginControl::PageMarginControl( @@ -128,7 +127,6 @@ PageMarginControl::PageMarginControl( FreeResource(); } - PageMarginControl::~PageMarginControl(void) { delete mpMarginValueSet; @@ -136,7 +134,6 @@ PageMarginControl::~PageMarginControl(void) StoreUserCustomValues(); } - void PageMarginControl::SetMetricFieldMaxValues( const Size aPageSize ) { const long nML = maLeftMarginEdit.Denormalize( maLeftMarginEdit.GetValue(FUNIT_TWIP) ); @@ -164,7 +161,6 @@ void PageMarginControl::SetMetricFieldMaxValues( const Size aPageSize ) maBottomMarginEdit.SetMax(maTopMarginEdit.Normalize(nMax), FUNIT_TWIP); } - void PageMarginControl::FillValueSet( const bool bLandscape, const bool bUserCustomValuesAvailable ) @@ -259,7 +255,6 @@ void PageMarginControl::FillValueSet( SW_RESSTR(STR_LCVALUE), &aHelpText ); } - void PageMarginControl::SelectValueSetItem() { const long cTolerance = 5; @@ -305,7 +300,6 @@ void PageMarginControl::SelectValueSetItem() mpMarginValueSet->StartSelection(); }; - IMPL_LINK(PageMarginControl, ImplMarginHdl, void *, pControl) { if ( pControl == mpMarginValueSet ) @@ -385,7 +379,6 @@ IMPL_LINK(PageMarginControl, ImplMarginHdl, void *, pControl) return 0; } - IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, EMPTYARG ) { mpMarginValueSet->SetNoSelection(); @@ -414,7 +407,6 @@ IMPL_LINK( PageMarginControl, ModifyULMarginHdl, MetricField *, EMPTYARG ) return 0; } - bool PageMarginControl::GetUserCustomValues() { bool bUserCustomValuesAvailable = false; @@ -517,7 +509,6 @@ void PageMarginControl::StoreUserCustomValues() aWinOpt5.SetUserData( aSeq ); } - } } // end of namespace sw::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/sidebar/PageMarginControl.hxx b/sw/source/ui/sidebar/PageMarginControl.hxx index 60d5666b7177..f32e8846329c 100644 --- a/sw/source/ui/sidebar/PageMarginControl.hxx +++ b/sw/source/ui/sidebar/PageMarginControl.hxx @@ -36,7 +36,6 @@ #define SWPAGE_WIDE_VALUE2 2880 #define SWPAGE_WIDE_VALUE3 1800 - namespace svx { namespace sidebar { class ValueSetWithTextControl; } } @@ -47,7 +46,6 @@ namespace sw { namespace sidebar { class PagePropertyPanel; - class PageMarginControl : public ::svx::sidebar::PopupControl { diff --git a/sw/source/ui/sidebar/PageOrientationControl.cxx b/sw/source/ui/sidebar/PageOrientationControl.cxx index 27eb8a9be3af..2dbf8bf8762a 100644 --- a/sw/source/ui/sidebar/PageOrientationControl.cxx +++ b/sw/source/ui/sidebar/PageOrientationControl.cxx @@ -61,13 +61,11 @@ PageOrientationControl::PageOrientationControl( FreeResource(); } - PageOrientationControl::~PageOrientationControl(void) { delete mpOrientationValueSet; } - IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl) { mpOrientationValueSet->SetNoSelection(); @@ -87,7 +85,6 @@ IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl) return 0; } - } } // end of namespace sw::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/sidebar/PageOrientationControl.hxx b/sw/source/ui/sidebar/PageOrientationControl.hxx index a9a9b5e6b883..a4cfe4249376 100644 --- a/sw/source/ui/sidebar/PageOrientationControl.hxx +++ b/sw/source/ui/sidebar/PageOrientationControl.hxx @@ -29,7 +29,6 @@ namespace sw { namespace sidebar { class PagePropertyPanel; - class PageOrientationControl : public ::svx::sidebar::PopupControl { diff --git a/sw/source/ui/sidebar/PagePropertyPanel.cxx b/sw/source/ui/sidebar/PagePropertyPanel.cxx index 23d5a95066fc..156a1cb03429 100644 --- a/sw/source/ui/sidebar/PagePropertyPanel.cxx +++ b/sw/source/ui/sidebar/PagePropertyPanel.cxx @@ -77,7 +77,6 @@ namespace { } } - namespace sw { namespace sidebar { PagePropertyPanel* PagePropertyPanel::Create ( @@ -263,13 +262,11 @@ void PagePropertyPanel::Initialize() mpBindings->Update( SID_ATTR_PAGE_SIZE ); } - ::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent ) { return new PageOrientationControl( pParent, *this , mpPageItem->IsLandscape() ); } - IMPL_LINK( PagePropertyPanel, ClickOrientationHdl, ToolBox*, pToolBox ) { maOrientationPopup.Show( *pToolBox ); @@ -277,7 +274,6 @@ IMPL_LINK( PagePropertyPanel, ClickOrientationHdl, ToolBox*, pToolBox ) return 0L; } - void PagePropertyPanel::ExecuteOrientationChange( const sal_Bool bLandscape ) { StartUndo(); @@ -336,15 +332,11 @@ void PagePropertyPanel::ExecuteOrientationChange( const sal_Bool bLandscape ) EndUndo(); } - void PagePropertyPanel::ClosePageOrientationPopup() { maOrientationPopup.Hide(); } - - - ::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageMarginControl( ::svx::sidebar::PopupContainer* pParent ) { return new PageMarginControl( @@ -359,7 +351,6 @@ void PagePropertyPanel::ClosePageOrientationPopup() meUnit ); } - void PagePropertyPanel::ExecuteMarginLRChange( const long nPageLeftMargin, const long nPageRightMargin ) @@ -378,14 +369,12 @@ void PagePropertyPanel::ExecuteMarginULChange( GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_ULSPACE, SFX_CALLMODE_RECORD, mpPageULMarginItem.get(), 0L ); } - void PagePropertyPanel::ExecutePageLayoutChange( const bool bMirrored ) { mpPageItem->SetPageUsage( bMirrored ? SVX_PAGE_MIRROR : SVX_PAGE_ALL ); GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE, SFX_CALLMODE_RECORD, mpPageItem.get(), 0L ); } - IMPL_LINK( PagePropertyPanel, ClickMarginHdl, ToolBox*, pToolBox ) { maMarginPopup.Show( *pToolBox ); @@ -393,15 +382,11 @@ IMPL_LINK( PagePropertyPanel, ClickMarginHdl, ToolBox*, pToolBox ) return 0L; } - void PagePropertyPanel::ClosePageMarginPopup() { maMarginPopup.Hide(); } - - - ::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageSizeControl( ::svx::sidebar::PopupContainer* pParent ) { return new PageSizeControl( @@ -412,7 +397,6 @@ void PagePropertyPanel::ClosePageMarginPopup() meFUnit ); } - void PagePropertyPanel::ExecuteSizeChange( const Paper ePaper ) { Size aPageSize = SvxPaperInfo::GetPaperSize( ePaper, (MapUnit)(meUnit) ); @@ -425,7 +409,6 @@ void PagePropertyPanel::ExecuteSizeChange( const Paper ePaper ) mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_SIZE, SFX_CALLMODE_RECORD, mpPageSizeItem.get(), 0L ); } - IMPL_LINK( PagePropertyPanel, ClickSizeHdl, ToolBox*, pToolBox ) { maSizePopup.Show( *pToolBox ); @@ -433,15 +416,11 @@ IMPL_LINK( PagePropertyPanel, ClickSizeHdl, ToolBox*, pToolBox ) return 0L; } - void PagePropertyPanel::ClosePageSizePopup() { maSizePopup.Hide(); } - - - ::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageColumnControl( ::svx::sidebar::PopupContainer* pParent ) { return new PageColumnControl( @@ -451,14 +430,12 @@ void PagePropertyPanel::ClosePageSizePopup() mpPageItem->IsLandscape() ); } - void PagePropertyPanel::ExecuteColumnChange( const sal_uInt16 nColumnType ) { mpPageColumnTypeItem->SetValue( nColumnType ); mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_COLUMN, SFX_CALLMODE_RECORD, mpPageColumnTypeItem.get(), 0L ); } - IMPL_LINK( PagePropertyPanel, ClickColumnHdl, ToolBox*, pToolBox ) { maColumnPopup.Show( *pToolBox ); @@ -466,15 +443,11 @@ IMPL_LINK( PagePropertyPanel, ClickColumnHdl, ToolBox*, pToolBox ) return 0L; } - void PagePropertyPanel::ClosePageColumnPopup() { maColumnPopup.Hide(); } - - - void PagePropertyPanel::NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, @@ -551,7 +524,6 @@ void PagePropertyPanel::NotifyItemUpdate( } } - void PagePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* pState ) { meFUnit = FUNIT_NONE; @@ -582,9 +554,6 @@ void PagePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* pSt } } - - - void PagePropertyPanel::ChangeMarginImage() { if ( mpPageLRMarginItem.get() == 0 || @@ -629,7 +598,6 @@ void PagePropertyPanel::ChangeMarginImage() mpToolBoxMargin->SetItemImage( nIdMargin, mpPageItem->IsLandscape() ? mImgMarginCustom_L : mImgMarginCustom ); } - void PagePropertyPanel::ChangeSizeImage() { if ( mpPageSizeItem.get() == 0 || @@ -693,7 +661,6 @@ void PagePropertyPanel::ChangeSizeImage() } } - void PagePropertyPanel::ChangeColumnImage( const sal_uInt16 nColumnType ) { if ( mpPageItem.get() == 0 ) @@ -750,7 +717,6 @@ void PagePropertyPanel::ChangeColumnImage( const sal_uInt16 nColumnType ) } } - void PagePropertyPanel::StartUndo() { if ( mxUndoManager.is() ) @@ -759,7 +725,6 @@ void PagePropertyPanel::StartUndo() } } - void PagePropertyPanel::EndUndo() { if ( mxUndoManager.is() ) diff --git a/sw/source/ui/sidebar/PagePropertyPanel.hrc b/sw/source/ui/sidebar/PagePropertyPanel.hrc index f7bc210275ad..0f827f0d84fe 100644 --- a/sw/source/ui/sidebar/PagePropertyPanel.hrc +++ b/sw/source/ui/sidebar/PagePropertyPanel.hrc @@ -130,7 +130,7 @@ #define FLD_BOTTOM_MARGIN 116 #define IMG_CUSTOM_DIS 121 -// + #define STR_MARGIN_TOOLTIP_LEFT 122 #define STR_MARGIN_TOOLTIP_RIGHT 123 #define STR_MARGIN_TOOLTIP_INNER 124 diff --git a/sw/source/ui/sidebar/PagePropertyPanel.hxx b/sw/source/ui/sidebar/PagePropertyPanel.hxx index b457a438c5e5..d7b6e57153e0 100644 --- a/sw/source/ui/sidebar/PagePropertyPanel.hxx +++ b/sw/source/ui/sidebar/PagePropertyPanel.hxx @@ -73,7 +73,6 @@ namespace sw { namespace sidebar { return mpBindings; } - ::svx::sidebar::PopupControl* CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent ); void ExecuteOrientationChange( const sal_Bool bLandscape ); void ClosePageOrientationPopup(); diff --git a/sw/source/ui/sidebar/PageSizeControl.cxx b/sw/source/ui/sidebar/PageSizeControl.cxx index 4a21d344dd09..038e033235f2 100644 --- a/sw/source/ui/sidebar/PageSizeControl.cxx +++ b/sw/source/ui/sidebar/PageSizeControl.cxx @@ -141,13 +141,11 @@ PageSizeControl::PageSizeControl( FreeResource(); } - PageSizeControl::~PageSizeControl(void) { delete mpSizeValueSet; } - IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl) { mpSizeValueSet->SetNoSelection(); @@ -174,7 +172,6 @@ IMPL_LINK(PageSizeControl, MoreButtonClickHdl_Impl, void *, EMPTYARG) return 0; } - } } // end of namespace sw::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/sidebar/PageSizeControl.hxx b/sw/source/ui/sidebar/PageSizeControl.hxx index 09cc12166a61..e1f0313a3649 100644 --- a/sw/source/ui/sidebar/PageSizeControl.hxx +++ b/sw/source/ui/sidebar/PageSizeControl.hxx @@ -37,7 +37,6 @@ namespace sw { namespace sidebar { class PagePropertyPanel; - class PageSizeControl : public ::svx::sidebar::PopupControl { diff --git a/sw/source/ui/sidebar/SwPanelFactory.cxx b/sw/source/ui/sidebar/SwPanelFactory.cxx index 258ea5d7f7e1..18220cdbdf80 100644 --- a/sw/source/ui/sidebar/SwPanelFactory.cxx +++ b/sw/source/ui/sidebar/SwPanelFactory.cxx @@ -68,12 +68,10 @@ SwPanelFactory::SwPanelFactory (void) { } - SwPanelFactory::~SwPanelFactory (void) { } - Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, const ::cssu::Sequence<css::beans::PropertyValue>& rArguments) diff --git a/sw/source/ui/sidebar/WrapPropertyPanel.cxx b/sw/source/ui/sidebar/WrapPropertyPanel.cxx index 490a748300ee..6d4e8526f6fc 100644 --- a/sw/source/ui/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/ui/sidebar/WrapPropertyPanel.cxx @@ -60,7 +60,6 @@ WrapPropertyPanel* WrapPropertyPanel::Create ( pBindings); } - WrapPropertyPanel::WrapPropertyPanel( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, @@ -88,12 +87,10 @@ WrapPropertyPanel::WrapPropertyPanel( Initialize(); } - WrapPropertyPanel::~WrapPropertyPanel() { } - void WrapPropertyPanel::Initialize() { Link aLink = LINK(this, WrapPropertyPanel, WrapTypeHdl); @@ -147,7 +144,6 @@ void WrapPropertyPanel::Initialize() mpBindings->Update( FN_FRAME_WRAP_IDEAL ); } - IMPL_LINK(WrapPropertyPanel, WrapTypeHdl, void *, EMPTYARG) { sal_uInt16 nSlot = 0; @@ -181,7 +177,6 @@ IMPL_LINK(WrapPropertyPanel, WrapTypeHdl, void *, EMPTYARG) return 0; } - void WrapPropertyPanel::NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index d0b4ed317a00..1b956dd04582 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -567,7 +567,6 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) } - void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet ) { OSL_ENSURE(pTblData, "table data not available?"); @@ -615,7 +614,6 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) SwTwips lLeft = static_cast< SwTwips >(m_aLeftMF.DenormalizePercent(m_aLeftMF.GetValue( FUNIT_TWIP ))); SwTwips lRight = static_cast< SwTwips >(m_aRightMF.DenormalizePercent(m_aRightMF.GetValue( FUNIT_TWIP ))); - if( m_aLeftMF.GetText() != m_aLeftMF.GetSavedValue() || m_aRightMF.GetText() != m_aRightMF.GetSavedValue() ) { @@ -755,14 +753,12 @@ SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet) { }; - SfxTabPage* SwTableColumnPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwTableColumnPage( pParent, rAttrSet ); }; - void SwTableColumnPage::Reset( const SfxItemSet& ) { const SfxItemSet& rSet = GetItemSet(); @@ -911,7 +907,6 @@ IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox ) return 0; }; - sal_Bool SwTableColumnPage::FillItemSet( SfxItemSet& ) { for( sal_uInt16 i = 0; i < MET_FIELDS; i++ ) @@ -1350,11 +1345,9 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) if(TriState(m_pSplitRowCB->IsChecked()) != m_pSplitRowCB->GetSavedValue()) bModified |= 0 != rSet.Put( SwFmtRowSplit( m_pSplitRowCB->IsChecked())); - const SvxFmtBreakItem* pBreak = (const SvxFmtBreakItem*)GetOldItem( rSet, RES_BREAK ); const SwFmtPageDesc* pDesc = (const SwFmtPageDesc*) GetOldItem( rSet, RES_PAGEDESC ); - sal_Bool bState = m_pPageCollCB->IsChecked(); //If we have a page style, then there's no break diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx index 24b6ee83d238..17a708c7b3e3 100644 --- a/sw/source/ui/table/tablepg.hxx +++ b/sw/source/ui/table/tablepg.hxx @@ -169,7 +169,6 @@ class SwTextFlowPage : public SfxTabPage sal_Bool bPageBreak; sal_Bool bHtmlMode; - DECL_LINK(PageBreakHdl_Impl, void *); DECL_LINK(ApplyCollClickHdl_Impl, void *); DECL_LINK( PageBreakPosHdl_Impl, RadioButton* ); @@ -178,7 +177,6 @@ class SwTextFlowPage : public SfxTabPage DECL_LINK( SplitRowHdl_Impl, TriStateBox* ); DECL_LINK( HeadLineCBClickHdl, void* p = 0 ); - SwTextFlowPage( Window* pParent, const SfxItemSet& rSet ); ~SwTextFlowPage(); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 680cc726d5a5..4ef7254dafdb 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -112,7 +112,6 @@ private: Edit* m_pEdInput; // Edit obtains the focus. }; - SwStringInputDlg::SwStringInputDlg(Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault) : ModalDialog(pParent, "StringInputDialog", "modules/swriter/ui/stringinput.ui") @@ -129,7 +128,6 @@ OUString SwStringInputDlg::GetInputString() const return m_pEdInput->GetText(); } - SwStringInputDlg::~SwStringInputDlg() { } @@ -251,7 +249,6 @@ void SwAutoFormatDlg::FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const delete rToFill, rToFill = 0; } - // Handler: IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn ) diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 1ac159852224..b6dd3f5167c6 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "formatclipboard.hxx" - #include <svx/svxids.hrc> #include <cmdid.h> #include <charfmt.hxx> diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index e2dd9dbfa500..50aa5e1bd92a 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/objface.hxx> #include <vcl/timer.hxx> #include <vcl/field.hxx> @@ -1105,7 +1104,6 @@ void SwPagePreview::Init(const SwViewOption * pPrefs) SwEditShell* pESh = (SwEditShell*)GetViewShell(); sal_Bool bIsModified = pESh->IsModified(); - SwViewOption aOpt( *pPrefs ); aOpt.SetPagePreview(sal_True); aOpt.SetTab( sal_False ); diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx index 176ba6f18965..92ba2e43060a 100644 --- a/sw/source/ui/uiview/scroll.cxx +++ b/sw/source/ui/uiview/scroll.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "swtypes.hxx" #include "swrect.hxx" #include "scroll.hxx" #define SCROLL_LINE_SIZE 250 - SwScrollbar::SwScrollbar( Window *pWin, sal_Bool bHoriz ) : ScrollBar( pWin, WinBits( WB_3DLOOK | WB_HIDE | ( bHoriz ? WB_HSCROLL : WB_VSCROLL) ) ), @@ -38,7 +36,6 @@ SwScrollbar::SwScrollbar( Window *pWin, sal_Bool bHoriz ) : EnableRTL( false ); } - SwScrollbar::~SwScrollbar() {} // Will be called after a change of the document size diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index a2b0660e8780..c31d1111c41d 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <com/sun/star/util/SearchOptions.hpp> #include <com/sun/star/util/SearchFlags.hpp> @@ -96,7 +95,6 @@ using namespace ::com::sun::star::ui::dialogs; using namespace ::sfx2; using ::com::sun::star::util::SearchOptions; - #define SWSRCVIEWFLAGS ( SFX_VIEW_CAN_PRINT|\ SFX_VIEW_NO_NEWWINDOW ) @@ -153,7 +151,6 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt1 Point( nXLeft, nYTop ), Size( nXRight-nXLeft, aSz.Height() - nYTop - BMARGPRN + nBorder ) ) ); - long nY = TMARGPRN-2*nBorder; Point aPos( nLeftMargin, nY ); rOutDev.DrawText( aPos, rTitle ); @@ -170,7 +167,6 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt1 rOutDev.DrawText( aPos, aPageStr ); } - nY = TMARGPRN-nBorder; rOutDev.DrawLine( Point( nXLeft, nY ), Point( nXRight, nY ) ); @@ -626,7 +622,6 @@ sal_uInt16 SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, bNotFoundMessage = true; } - if(!bApi) { if(bNotFoundMessage) @@ -857,7 +852,6 @@ void SwSrcView::Load(SwDocShell* pDocShell) pInStream->Seek(0); pInStream->SetStreamCharSet( eDestEnc ); - aEditWin.Read(*pInStream); } } @@ -876,5 +870,4 @@ void SwSrcView::Load(SwDocShell* pDocShell) aEditWin.GetOutWin()->GrabFocus(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx index 3c0f75f0447d..6c6c1911d74e 100644 --- a/sw/source/ui/uiview/uivwimp.cxx +++ b/sw/source/ui/uiview/uivwimp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cmdid.h> #include "globals.hrc" @@ -303,5 +302,4 @@ void SwClipboardChangeListener::AddRemoveListener( sal_Bool bAdd ) pView->AddRemoveClipboardListener( Reference< XClipboardListener >( this ), bAdd ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 23c6b18d8c1a..868ae5d5e18b 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -224,10 +224,8 @@ IMPL_LINK_NOARG(SwView, FormControlActivated) void SwView::SelectShell() { - // Attention: Maintain the SelectShell for the WebView additionally - if(m_bInDtor) return; // Decision if the UpdateTable has to be called diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index aa10ea327808..5363d04bebf9 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <vcl/graph.hxx> #include <svx/galbrws.hxx> @@ -436,7 +435,6 @@ void SwView::ExecViewOptions(SfxRequest &rReq) pOpt->SetSmoothScroll( bFlag ); break; - case FN_VLINEAL: if( STATE_TOGGLE == eState ) bFlag = !pOpt->IsViewVRuler(); diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx index b7eb3654678d..40e001c6fa4f 100644 --- a/sw/source/ui/uiview/view1.cxx +++ b/sw/source/ui/uiview/view1.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <svx/ruler.hxx> diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 58a25d8d8ff7..9133455ca429 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -315,7 +315,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq ) } // pool formats - // + const ::std::vector<OUString>& rFrmPoolArr( SwStyleNameMapper::GetFrmFmtUINameArray()); for( i = 0; i < rFrmPoolArr.size(); ++i ) @@ -690,7 +690,7 @@ void SwView::Execute(SfxRequest &rReq) // FN_REDLINE_PREV_CHANGE leaves the selection point at the start of the redline. // In such cases, SelNextRedline (which starts searching from the selection point) // immediately finds the current redline and advances the selection point to its end. - // + // This behavior means that PREV_CHANGE followed by NEXT_CHANGE would not change // the current redline, so we detect it and select the next redline again. if (pCurrent && pCurrent == pNext) @@ -713,7 +713,7 @@ void SwView::Execute(SfxRequest &rReq) // In such cases, SelPrevRedline (which starts searching from the selection point) // immediately finds the current redline and advances the selection point to its // start. - // + // This behavior means that NEXT_CHANGE followed by PREV_CHANGE would not change // the current redline, so we detect it and move to the previous redline again. if (initialCursorStart == *pPrev->Start()) @@ -1232,7 +1232,6 @@ void SwView::Execute(SfxRequest &rReq) } break; - default: OSL_ENSURE(!this, "wrong dispatcher"); return; diff --git a/sw/source/ui/uiview/viewcoll.cxx b/sw/source/ui/uiview/viewcoll.cxx index be4cbf3b2b2e..1c87105ba737 100644 --- a/sw/source/ui/uiview/viewcoll.cxx +++ b/sw/source/ui/uiview/viewcoll.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "cmdid.h" #include "uiitems.hxx" #include <vcl/window.hxx> @@ -78,6 +77,4 @@ void SwView::ExecColl(SfxRequest &rReq) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uiview/viewdlg2.cxx b/sw/source/ui/uiview/viewdlg2.cxx index b029a9bcef61..af466021ead5 100644 --- a/sw/source/ui/uiview/viewdlg2.cxx +++ b/sw/source/ui/uiview/viewdlg2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objface.hxx> diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx index b0aa5335ecda..0e9849c797c4 100644 --- a/sw/source/ui/uiview/viewdraw.cxx +++ b/sw/source/ui/uiview/viewdraw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <svl/aeitem.hxx> #include <svl/itempool.hxx> diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/ui/uiview/viewfunc.hxx index e2eb9c32c396..6036509db172 100644 --- a/sw/source/ui/uiview/viewfunc.hxx +++ b/sw/source/ui/uiview/viewfunc.hxx @@ -48,7 +48,6 @@ void ViewResizePixel( const Window &rRef, SvxRuler* pHRuler = 0, sal_Bool bVRulerRight = sal_False ); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index da993813e2d4..45b2f12d5fb9 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -447,7 +447,6 @@ void SwView::HyphenateDocument() Reference< XLinguProperties > xProp( ::GetLinguPropertySet() ); - m_pWrtShell->StartUndo(UNDO_INSATTR); // valid later sal_Bool bHyphSpecial = xProp.is() ? xProp->getIsHyphSpecial() : sal_False; @@ -735,7 +734,6 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) uno::Sequence< beans::PropertyValue > aArgs; xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 ); - if (xDispatch.is()) { // Execute dispatch asynchronously @@ -777,7 +775,6 @@ sal_Bool SwView::ExecSmartTagPopup( const Point& rPt ) m_pWrtShell->LockView( sal_True ); m_pWrtShell->Push(); - // get word that was clicked on // This data structure maps a smart tag type string to the property bag SwRect aToFill; diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index 57c62941973f..4ff2f9443fea 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string> #include "hintids.hxx" diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index e428ac7173a7..119e03e05d91 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -163,7 +163,6 @@ void SwView::DocSzChgd(const Size &rSz) extern int bDocSzUpdated; - m_aDocSz = rSz; if( !m_pWrtShell || m_aVisArea.IsEmpty() ) // no shell -> no change @@ -340,9 +339,9 @@ void SwView::CheckVisArea() } /// Calculate the visible range. -// + // OUT Point *pPt: new position of the visible area -// + // IN Rectangle &rRect: Rectangle, which should be located // within the new visible area. // sal_uInt16 nRange optional accurate indication of the diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index d51956b4e98e..5a1e30fd6d69 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string> #include <boost/scoped_ptr.hpp> @@ -438,7 +437,6 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage) } } - sal_Bool SwView::SearchAndWrap(sal_Bool bApi) { SwSearchOptions aOpts( m_pWrtShell, m_pSrchItem->GetBackward() ); @@ -533,7 +531,6 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi) return m_bFound; } - sal_Bool SwView::SearchAll(sal_uInt16* pFound) { SwWait aWait( *GetDocShell(), true ); @@ -561,7 +558,6 @@ sal_Bool SwView::SearchAll(sal_uInt16* pFound) return m_bFound; } - void SwView::Replace() { SwWait aWait( *GetDocShell(), true ); @@ -716,9 +712,8 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions ) DELETEZ( pReplSet ); // the attributes } - // // build SearchOptions to be used - // + SearchOptions aSearchOpt( m_pSrchItem->GetSearchOptions() ); aSearchOpt.Locale = GetAppLanguageTag().getLocale(); if( !bDoReplace ) diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index e32db0bb3049..6314f4784007 100644 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <com/sun/star/linguistic2/XThesaurus.hpp> #include <com/sun/star/uno/Sequence.hxx> diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index 18893ed2d300..e0bc61098195 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -1839,7 +1839,6 @@ void SwView::StateTabWin(SfxItemSet& rSet) // Right is only the margin now. aRectangle.Right() = 0; - } } else if ( ((nFrmType & FRMTYPE_TABLE) || IsTabColFromDoc()) && diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index 068b27a64fa2..48f68dbe6dfd 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/mutex.hxx> #include <sfx2/sfxbasecontroller.hxx> #include <SwXDocumentSettings.hxx> @@ -45,7 +44,6 @@ #include "cfgitems.hxx" #include "prtopt.hxx" - using namespace comphelper; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -278,7 +276,7 @@ uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes( ) pBaseTypes[0] = ::getCppuType((Reference< XPropertySet >*)0); pBaseTypes[1] = ::getCppuType((Reference< XPropertyState >*)0); pBaseTypes[2] = ::getCppuType((Reference< XMultiPropertySet >*)0); - // + pBaseTypes[3] = ::getCppuType((Reference< XServiceInfo >*)0); pBaseTypes[4] = ::getCppuType((Reference< XTypeProvider >*)0); @@ -306,7 +304,6 @@ void SwXDocumentSettings::_preSetValues () throw UnknownPropertyException(); } - void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, const uno::Any &rValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { @@ -1254,5 +1251,4 @@ Sequence< OUString > SAL_CALL SwXDocumentSettings::getSupportedServiceNames( ) return aSeq; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uno/SwXDocumentSettings.hxx b/sw/source/ui/uno/SwXDocumentSettings.hxx index 76c4bddb2bc8..49edf23964a0 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.hxx +++ b/sw/source/ui/uno/SwXDocumentSettings.hxx @@ -27,7 +27,6 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/implbase5.hxx> - class SwXTextDocument; class SwDocShell; class SwDoc; @@ -69,7 +68,6 @@ protected: public: SwXDocumentSettings( SwXTextDocument* pModel ); - // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); diff --git a/sw/source/ui/uno/detreg.cxx b/sw/source/ui/uno/detreg.cxx index 9d6fd6ea451d..d6d6208d8c9e 100644 --- a/sw/source/ui/uno/detreg.cxx +++ b/sw/source/ui/uno/detreg.cxx @@ -63,6 +63,4 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL swd_component_getFactory( } } // extern "C" - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx index 1e8c48ff4cf0..802d45c40f4b 100644 --- a/sw/source/ui/uno/dlelstnr.cxx +++ b/sw/source/ui/uno/dlelstnr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp> #include <com/sun/star/linguistic2/XDictionaryList.hpp> diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index ac1ca77f59c7..6547a85b0b74 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -415,7 +415,6 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor lDescriptor[nIndexOfDocumentTitle].Value <<= aDocumentTitle; } - return aTypeName; } diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx index 5611027c46bd..ba58458f4292 100644 --- a/sw/source/ui/uno/swdetect.hxx +++ b/sw/source/ui/uno/swdetect.hxx @@ -65,9 +65,7 @@ public: SFX_DECL_XSERVICEINFO_NOFACTORY - //---------------------------------------------------------------------------------- // XExtendedFilterDetect - //---------------------------------------------------------------------------------- virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ); }; diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index d444c12edb72..3b381151a758 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -51,7 +51,6 @@ #include <boost/scoped_ptr.hpp> - SV_IMPL_REF ( SwDocShell ) using namespace ::com::sun::star; diff --git a/sw/source/ui/uno/unodefaults.hxx b/sw/source/ui/uno/unodefaults.hxx index 1006b0eaba70..dc4a160596ed 100644 --- a/sw/source/ui/uno/unodefaults.hxx +++ b/sw/source/ui/uno/unodefaults.hxx @@ -37,5 +37,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx index b17c276e2c8f..9815c9f3b424 100644 --- a/sw/source/ui/uno/unodispatch.cxx +++ b/sw/source/ui/uno/unodispatch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/svapp.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> @@ -30,10 +29,8 @@ #include "wrtsh.hxx" #include "dbmgr.hxx" - using namespace ::com::sun::star; - static const char* cURLFormLetter = ".uno:DataSourceBrowser/FormLetter"; static const char* cURLInsertContent = ".uno:DataSourceBrowser/InsertContent";//data into fields static const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns";//data into text @@ -294,7 +291,6 @@ void SwXDispatch::addStatusListener( aEvent.IsEnabled = !rData.sDataSource.isEmpty(); } - xControl->statusChanged( aEvent ); StatusListenerList::iterator aListIter = m_aListenerList.begin(); diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx index 60f31baaa639..94c2f8570561 100644 --- a/sw/source/ui/uno/unodoc.cxx +++ b/sw/source/ui/uno/unodoc.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; -//============================================================ // com.sun.star.comp.Writer.TextDocument uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw() @@ -57,7 +56,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( return uno::Reference< uno::XInterface >( pShell->GetModel() ); } -//============================================================ // com.sun.star.comp.Writer.WebDocument uno::Sequence< OUString > SAL_CALL SwWebDocument_getSupportedServiceNames() throw() @@ -86,7 +84,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwWebDocument_createInstance( return uno::Reference< uno::XInterface >( pShell->GetModel() ); } -//============================================================ // com.sun.star.comp.Writer.GlobalDocument uno::Sequence< OUString > SAL_CALL SwGlobalDocument_getSupportedServiceNames() throw() diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx index f2c71a4fb8cb..c8b3252df75b 100644 --- a/sw/source/ui/uno/unofreg.cxx +++ b/sw/source/ui/uno/unofreg.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; - // module extern uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw(); extern OUString SAL_CALL SwUnoModule_getImplementationName() throw(); diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 6d23b1b24a80..8e80738003e2 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -622,9 +622,8 @@ uno::Any SAL_CALL SwXMailMerge::execute( throw IllegalArgumentException("Either the ResultSet or DataSourceName and DataCommand must be set.", static_cast < cppu::OWeakObject * > ( this ), 0 ); } - // // build ResultSet from DataSourceName, DataCommand and DataCommandType - // + Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); if (xMgr.is()) { @@ -859,7 +858,6 @@ void SwXMailMerge::launchEvent( const PropertyChangeEvent &rEvt ) const } } - uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXMailMerge::getPropertySetInfo( ) throw (RuntimeException, std::exception) { @@ -1126,7 +1124,6 @@ void SAL_CALL SwXMailMerge::removeVetoableChangeListener( OSL_FAIL("not implemented"); } - void SAL_CALL SwXMailMerge::dispose() throw(RuntimeException, std::exception) { diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index c56f64a5a74c..ba9293248b9a 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -799,12 +799,10 @@ void SwXViewSettings::_postSetValues () SW_MOD()->ApplyRulerMetric( (FieldUnit)eVRulerUnit, sal_False, bWeb ); } - SW_MOD()->ApplyUsrPref( *mpViewOption, pView, pView ? VIEWOPT_DEST_VIEW_ONLY : bWeb ? VIEWOPT_DEST_WEB : VIEWOPT_DEST_TEXT ); - delete mpViewOption; mpViewOption = NULL; } diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 122e4829ac62..6a6ce86d52f6 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/mutex.hxx> #include <vcl/image.hxx> #include <vcl/virdev.hxx> @@ -2613,9 +2612,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( const sal_Int32 nPageCount = pViewShell->GetPageCount(); - // // get number of pages to be rendered - // + const bool bPrintProspect = m_pPrintUIOptions->getBoolValue( "PrintProspect", false ); if (bPrintProspect) { @@ -2883,7 +2881,7 @@ SfxViewShell * SwXTextDocument::GuessViewShell( { // #130810# SfxViewShell::Current() / SfxViewShell::GetObjectShell() // must not be used (see comment from MBA) - // + SfxViewShell *pView = 0; SwView *pSwView = 0; SwPagePreview *pSwPagePreview = 0; @@ -3008,11 +3006,11 @@ void SAL_CALL SwXTextDocument::render( pVwSh->SetPDFExportOption( sal_True ); // #i12836# enhanced pdf export - // + // First, we have to export hyperlinks, notes, and outline to pdf. // During this process, additional information required for tagging // the pdf file are collected, which are evaulated during painting. - // + SwWrtShell* pWrtShell = pView->IsA(aSwViewTypeId) ? ((SwView*)pView)->GetWrtShellPtr() : 0; @@ -3030,11 +3028,11 @@ void SAL_CALL SwXTextDocument::render( pVwSh->PrintOrPDFExport( pOut, rSwPrtOptions, nRenderer ); // #i35176# - // + // After printing the last page, we take care for the links coming // from the EditEngine. The links are generated during the painting // process, but the destinations are still missing. - // + if (bIsPDFExport && bLastPage && pWrtShell) { SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages, true ); @@ -3143,7 +3141,6 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( { SolarMutexGuard aGuard; - // possible canonical values for nScriptTypes // any bit wise combination is allowed const sal_Int16 nLatin = 0x001; diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 0a8f518423b3..c7e9c4ee4883 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "viscrs.hxx" #include <sfx2/frame.hxx> #include <sfx2/printer.hxx> @@ -87,7 +86,6 @@ using namespace ::com::sun::star::frame; using ::com::sun::star::util::URL; using comphelper::HelperBaseNoState; - SwXTextView::SwXTextView(SwView* pSwView) : SfxBaseController(pSwView), m_SelChangedListeners(m_aMutex), diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 3cc57ef8779b..6c3889384182 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -814,7 +814,6 @@ SfxItemPresentation SwFmtRowSplit::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } - SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation ( SfxItemPresentation ePres, diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx index 0f4ae0ba6dc5..5aa7ff1abb0b 100644 --- a/sw/source/ui/utlui/condedit.cxx +++ b/sw/source/ui/utlui/condedit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sot/formats.hxx> #include <condedit.hxx> @@ -88,5 +87,4 @@ sal_Int8 ConditionEdit::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 2dae88aa6641..c31c650911eb 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -2756,7 +2756,6 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) break; } - bViewHasChanged = true; } } diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index f803de5a1248..2065d9370230 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -95,26 +95,26 @@ using namespace ::com::sun::star::uno; const SfxObjectShell* SwGlobalTree::pShowShell = 0; static const char* aHelpForMenu[] = { - 0, // + 0, HID_GLBLTREE_UPDATE, //CTX_UPDATE HID_GLBLTREE_INSERT, //CTX_INSERT HID_GLBLTREE_EDIT, //CTX_EDIT HID_GLBLTREE_DEL, //CTX_DELETE HID_GLBLTREE_EDIT_LINK, //CTX_EDIT_LINK - 0, // - 0, // - 0, // - 0, // + 0, + 0, + 0, + 0, HID_GLBLTREE_INS_IDX, //CTX_INSERT_ANY_INDEX HID_GLBLTREE_INS_FILE, //CTX_INSERT_FILE HID_GLBLTREE_INS_NEW_FILE, //CTX_INSERT_NEW_FILE HID_GLBLTREE_INS_TEXT, //CTX_INSERT_TEXT - 0, // - 0, // - 0, // - 0, // - 0, // - 0, // + 0, + 0, + 0, + 0, + 0, + 0, HID_GLBLTREE_UPD_SEL, //CTX_UPDATE_SEL HID_GLBLTREE_UPD_IDX, //CTX_UPDATE_INDEX HID_GLBLTREE_UPD_LINK, //CTX_UPDATE_LINK @@ -348,7 +348,6 @@ PopupMenu* SwGlobalTree::CreateContextMenu() pSubPop1->InsertItem(CTX_INSERT_TEXT, aContextStrings[ST_TEXT - ST_GLOBAL_CONTEXT_FIRST]); pSubPop1->SetHelpId(CTX_INSERT_TEXT, aHelpForMenu[CTX_INSERT_TEXT]); - pPop->InsertItem(CTX_UPDATE, aContextStrings[ST_UPDATE - ST_GLOBAL_CONTEXT_FIRST]); pPop->SetHelpId(CTX_UPDATE, aHelpForMenu[CTX_UPDATE]); pPop->InsertItem(CTX_EDIT, aContextStrings[ST_EDIT_CONTENT - ST_GLOBAL_CONTEXT_FIRST]); @@ -375,7 +374,6 @@ PopupMenu* SwGlobalTree::CreateContextMenu() pPop->EnableItem(CTX_EDIT, 0 != (nEnableFlags & ENABLE_EDIT)); pPop->EnableItem(CTX_DELETE, 0 != (nEnableFlags & ENABLE_DELETE)); - pPop->SetPopupMenu( CTX_INSERT, pSubPop1 ); pPop->SetPopupMenu( CTX_UPDATE, pSubPop2 ); } diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index fabf1197952c..518a1ed02b5d 100644 --- a/sw/source/ui/utlui/gloslst.cxx +++ b/sw/source/ui/utlui/gloslst.cxx @@ -42,7 +42,6 @@ #define GLOS_TIMEOUT 30000 // update every 30 seconds #define FIND_MAX_GLOS 20 - struct TripleString { OUString sGroup; @@ -416,5 +415,4 @@ void SwGlossaryList::ClearGroups() bFilled = false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index 785ffc4d6a22..1a745a735392 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -251,7 +251,6 @@ OUString ShellResource::GetPageDescName(sal_uInt16 nNo, PageNameMode eMode) return sRet.replaceFirst( "$(ARG1)", OUString::number( nNo )); } - SwGlossaries* GetGlossaries() { if (!pGlossaries) diff --git a/sw/source/ui/utlui/initui.src b/sw/source/ui/utlui/initui.src index c1663fe5dcfa..81e47ff75eaa 100644 --- a/sw/source/ui/utlui/initui.src +++ b/sw/source/ui/utlui/initui.src @@ -143,7 +143,7 @@ Resource RID_SW_SHELLRES }; // SubType DocInfo - // + String FLD_DOCINFO_TITEL { Text [ en-US ] = "Title" ; diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx index b4e545fa6f77..975a08876fb9 100644 --- a/sw/source/ui/utlui/navicfg.cxx +++ b/sw/source/ui/utlui/navicfg.cxx @@ -116,5 +116,4 @@ void SwNavigationConfig::Commit() void SwNavigationConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index a7f38a4c0c16..9dbb33e41893 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -139,7 +139,6 @@ IMPL_LINK( SwNavigationPI, DocListBoxSelectHdl, ListBox *, pBox ) aContentTree.ShowHiddenShell(): aContentTree.ShowActualView(); - } else { @@ -730,7 +729,6 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, aStatusArr[3] = SW_RESSTR(ST_ACTIVE_VIEW); FreeResource(); - const Size& rOutSize = GetOutputSizePixel(); nZoomIn = (short)rOutSize.Height(); @@ -1082,7 +1080,6 @@ void SwNavigationPI::UpdateListBox() sEntry += ")"; aDocListBox.InsertEntry(sEntry); - if (pConstView && pView == pConstView) nConstPos = nCount; diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx index 99427622e656..ecd4dee197d5 100644 --- a/sw/source/ui/utlui/numfmtlb.cxx +++ b/sw/source/ui/utlui/numfmtlb.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - // STATIC DATA /** diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx index 1523fe512582..cd4863753d10 100644 --- a/sw/source/ui/utlui/prcntfld.cxx +++ b/sw/source/ui/utlui/prcntfld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "prcntfld.hxx" PercentField::PercentField() diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 2e0a8312b9c9..08db8a790b1c 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -49,7 +49,6 @@ #include "swrenamexnameddlg.hxx" - using namespace ::com::sun::star; SwRenameXNamedDlg::SwRenameXNamedDlg( Window* pWin, diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx index 6e39e0f688b2..a4a59ffc5370 100644 --- a/sw/source/ui/utlui/tmplctrl.cxx +++ b/sw/source/ui/utlui/tmplctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svl/style.hxx> #include <vcl/menu.hxx> #include <svl/stritem.hxx> diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 9a4603ac46ef..206b86451a63 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -73,7 +73,7 @@ #include <charfmt.hxx> #include <SwStyleNameMapper.hxx> // 50 cm 28350 -// + #define MAXHEIGHT 28350 #define MAXWIDTH 28350 @@ -196,7 +196,6 @@ void ConvertAttrGenToChar(SfxItemSet& rSet, const sal_uInt8 nMode) } } - // Fill header footer void FillHdFt(SwFrmFmt* pFmt, const SfxItemSet& rSet) @@ -358,7 +357,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) } // Footnotes - // + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_FTN_INFO, false, &pItem ) ) rPageDesc.SetFtnInfo( ((SwPageFtnInfoItem*)pItem)->GetPageFtnInfo() ); @@ -435,7 +434,6 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) aBoxInfo.SetValid( VALID_DISABLE ); rSet.Put( aBoxInfo ); - SfxStringItem aFollow(SID_ATTR_PAGE_EXT1, OUString()); if(rPageDesc.GetFollow()) aFollow.SetValue(rPageDesc.GetFollow()->GetName()); @@ -568,7 +566,6 @@ sal_uInt16 GetTabDist(const SvxTabStopItem& rTabs) return nDefDist; } - // Inquire if in the set is a Sfx-PageDesc combination present and return it. void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ) { diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index 8273264b2316..6d9b90cc88b6 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <swtypes.hxx> #include <globals.hrc> #include <misc.hrc> @@ -179,7 +178,7 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > xViewProps, //turn off scrollbars //turn back on online mode if that's what we want //which subverts the (dodgy/buggy) scrollbar setting - // + //To reproduce this problem, in edit->autotext and click through //the examples and see if the preview gets a horizontal scrollbar uno::Any aFalseSet(uno::makeAny(sal_False)); diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx index 5e82fed05ad2..ac592474eb80 100644 --- a/sw/source/ui/utlui/zoomctrl.cxx +++ b/sw/source/ui/utlui/zoomctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <vcl/status.hxx> diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index 8880d03c7f97..f1fbdc8b0359 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -21,9 +21,8 @@ #include "com/sun/star/registry/XRegistryKey.hpp" #include "comphelper/servicedecl.hxx" -// ============================================================================= // component exports -// ============================================================================= + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index 5e928afed2bd..e6bf8707b043 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -93,7 +93,6 @@ SwVbaAutoTextEntry::getServiceNames() return aServiceNames; } - SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ), mxAutoTextEntryAccess( xIndexAccess ) { } diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index 5e07936138d4..6d7975fa3932 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -46,7 +46,6 @@ public: virtual css::uno::Sequence<OUString> getServiceNames(); }; - /* class SwVbaAutoTextEntries */ typedef CollTestImplHelper< ooo::vba::word::XAutoTextEntries > SwVbaAutoTextEntries_BASE; diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 90bd3e0847ad..33ac997c4226 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangeBorders_Base; typedef InheritedHelperInterfaceImpl1<word::XBorder > SwVbaBorder_Base; diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index d46e20b67ee5..4963ba7578f1 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -393,7 +393,6 @@ public: } }; - typedef boost::unordered_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo; class BuiltInIndexHelper @@ -441,7 +440,6 @@ public: MSOIndexToOODocPropInfo& getDocPropInfoMap() { return m_docPropInfoMap; } }; - typedef InheritedHelperInterfaceImpl1< ooo::vba::XDocumentProperty > SwVbaDocumentProperty_BASE; class SwVbaBuiltInDocumentProperty : public SwVbaDocumentProperty_BASE @@ -486,7 +484,6 @@ public: }; - SwVbaCustomDocumentProperty::SwVbaCustomDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ) : SwVbaBuiltInDocumentProperty( xParent, xContext, rInfo ) { } @@ -882,7 +879,6 @@ public: }; - SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaBuiltinDocumentProperties( xParent, xContext, xModel ) { // replace the m_xIndexAccess implementation ( we need a virtual init ) diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index be2af5b3dc3e..83eda1d9fec0 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -19,14 +19,12 @@ #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX #define INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX - #include <vbahelper/vbacollectionimpl.hxx> #include <ooo/vba/word/XDocuments.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <vbahelper/vbadocumentsbase.hxx> #include "wordvbahelper.hxx" - typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::word::XDocuments > SwVbaDocuments_BASE; class SwVbaDocuments : public SwVbaDocuments_BASE diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx index 2e0e533be8a3..257c829b9c48 100644 --- a/sw/source/ui/vba/vbaeventshelper.cxx +++ b/sw/source/ui/vba/vbaeventshelper.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::script::vba::VBAEventId; using namespace ::ooo::vba; -// ============================================================================ - SwVbaEventsHelper::SwVbaEventsHelper( uno::Sequence< css::uno::Any > const& aArgs, uno::Reference< uno::XComponentContext > const& xContext ) : VbaEventsHelperBase( aArgs, xContext ) { @@ -82,8 +80,6 @@ OUString SwVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& / return OUString( "ThisDocument" ); } -// ============================================================================ - namespace vbaeventshelper { namespace sdecl = comphelper::service_decl; @@ -94,6 +90,4 @@ extern sdecl::ServiceDecl const serviceDecl( "com.sun.star.document.vba.VBATextEventProcessor" ); } -// ============================================================================ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx index 0093cf916e8f..8927a978f121 100644 --- a/sw/source/ui/vba/vbaeventshelper.hxx +++ b/sw/source/ui/vba/vbaeventshelper.hxx @@ -22,8 +22,6 @@ #include <vbahelper/vbaeventshelperbase.hxx> -// ============================================================================ - class SwVbaEventsHelper : public VbaEventsHelperBase { public: @@ -39,8 +37,6 @@ protected: virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); }; -// ============================================================================ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 91ea2546e17a..5c7122d36ebe 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -116,7 +116,6 @@ SwVbaReadFieldParams::~SwVbaReadFieldParams() { } - OUString SwVbaReadFieldParams::GetResult() const { return (-1 == nFnd) @@ -161,9 +160,9 @@ long SwVbaReadFieldParams::SkipToNextToken() // FindNextPara is searching for the next Backslash-Parameter or the next string // until blank or the next "\" or until the closing quotation mark // or until the string end of pStr. -// + // Output ppNext (if ppNext != 0) beginning of the search for the next parameter or 0 -// + // Return value: 0 if String-End reached, otherwise begin of the paramater or the string sal_Int32 SwVbaReadFieldParams::FindNextStringPiece(const sal_Int32 nStart) diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index f0ffd6bd9c77..fd2922f44ba5 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -232,5 +232,4 @@ SwVbaFont::getServiceNames() return aServiceNames; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index 7c6308784eaa..a996dd795d62 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -30,10 +30,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::ooo::vba; - -// ============================================================================= // SwVbaGlobals -// ============================================================================= SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "WordDocumentContext" ) { @@ -52,9 +49,8 @@ SwVbaGlobals::~SwVbaGlobals() OSL_TRACE("SwVbaGlobals::~SwVbaGlobals"); } -// ============================================================================= // XGlobals -// ============================================================================= + uno::Reference<word::XApplication > SwVbaGlobals::getApplication() throw (uno::RuntimeException) { diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index 6fcafddd35a2..92df9b43825c 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -31,10 +31,7 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbaglobalbase.hxx> -// ============================================================================= // class SwVbaGlobals -// ============================================================================= - typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE; diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx index 1143921198ca..12762c77b9b7 100644 --- a/sw/source/ui/vba/vbalistformat.hxx +++ b/sw/source/ui/vba/vbalistformat.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/text/XTextRange.hpp> #include "vbalisthelper.hxx" - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListFormat > SwVbaListFormat_BASE; class SwVbaListFormat : public SwVbaListFormat_BASE diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx index 540df4c2514a..720c4691ceeb 100644 --- a/sw/source/ui/vba/vbalistgallery.hxx +++ b/sw/source/ui/vba/vbalistgallery.hxx @@ -24,7 +24,6 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextDocument.hpp> - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListGallery > SwVbaListGallery_BASE; class SwVbaListGallery : public SwVbaListGallery_BASE diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx index 3eb38b86d642..24f2bf56125d 100644 --- a/sw/source/ui/vba/vbalisthelper.hxx +++ b/sw/source/ui/vba/vbalisthelper.hxx @@ -15,7 +15,6 @@ #include <com/sun/star/text/XTextDocument.hpp> #include <boost/shared_ptr.hpp> - class SwVbaListHelper; typedef ::boost::shared_ptr< SwVbaListHelper > SwVbaListHelperRef; diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx index f3b6d9c937b6..9f850fe9030a 100644 --- a/sw/source/ui/vba/vbalistlevel.hxx +++ b/sw/source/ui/vba/vbalistlevel.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/text/XTextDocument.hpp> #include "vbalisthelper.hxx" - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListLevel > SwVbaListLevel_BASE; class SwVbaListLevel : public SwVbaListLevel_BASE diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx index c3d2d23f8ba5..f4285eda59af 100644 --- a/sw/source/ui/vba/vbalistlevels.hxx +++ b/sw/source/ui/vba/vbalistlevels.hxx @@ -24,7 +24,6 @@ #include <vbahelper/vbahelperinterface.hxx> #include "vbalisthelper.hxx" - typedef CollTestImplHelper< ooo::vba::word::XListLevels > SwVbaListLevels_BASE; class SwVbaListLevels : public SwVbaListLevels_BASE diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx index 8c6f6ecaf87e..a9b831e6adf9 100644 --- a/sw/source/ui/vba/vbalisttemplate.hxx +++ b/sw/source/ui/vba/vbalisttemplate.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/text/XTextDocument.hpp> #include "vbalisthelper.hxx" - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListTemplate > SwVbaListTemplate_BASE; class SwVbaListTemplate : public SwVbaListTemplate_BASE diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index 22f28c0a75c0..7ae4a74de57f 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/text/XTextDocument.hpp> - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XParagraph > SwVbaParagraph_BASE; class SwVbaParagraph : public SwVbaParagraph_BASE @@ -50,7 +49,6 @@ public: virtual css::uno::Sequence<OUString> getServiceNames(); }; - /* class SwVbaParagraphs */ typedef CollTestImplHelper< ooo::vba::word::XParagraphs > SwVbaParagraphs_BASE; diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 062b15354140..aa5d0c9b12ba 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/style/BreakType.hpp> #include "vbatabstops.hxx" - using namespace ::ooo::vba; using namespace ::com::sun::star; diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx index e1326a5fa6f1..b522c44ce788 100644 --- a/sw/source/ui/vba/vbarangehelper.cxx +++ b/sw/source/ui/vba/vbarangehelper.cxx @@ -60,7 +60,6 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u return xRange; } - void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException ) { sal_Int32 nlastIndex = 0; diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx index 95c6357356ea..78e9b3003b20 100644 --- a/sw/source/ui/vba/vbarevisions.hxx +++ b/sw/source/ui/vba/vbarevisions.hxx @@ -24,7 +24,6 @@ #include <vbahelper/vbahelperinterface.hxx> #include <com/sun/star/text/XTextRange.hpp> - typedef CollTestImplHelper< ooo::vba::word::XRevisions > SwVbaRevisions_BASE; class SwVbaRevisions : public SwVbaRevisions_BASE diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index 62a18f4cc253..55bf3f442a10 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -30,7 +30,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; - SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel>& xModel, const uno::Reference< beans::XPropertySet >& _xPropertySet ) throw ( script::BasicErrorException, uno::RuntimeException ) : SwVbaStyle_BASE( xParent, xContext ) , mxModel( xModel ), mxStyleProps( _xPropertySet ) { mxStyle.set( _xPropertySet, uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index d71ee2673a03..3a9c87e57d4c 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -27,7 +27,6 @@ #include <ooo/vba/word/XFont.hpp> #include <ooo/vba/word/XListTemplate.hpp> - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XStyle > SwVbaStyle_BASE; class SwVbaStyle : public SwVbaStyle_BASE diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx index a224258d0dfc..3c0291b51b29 100644 --- a/sw/source/ui/vba/vbatableofcontents.cxx +++ b/sw/source/ui/vba/vbatableofcontents.cxx @@ -30,7 +30,6 @@ SwVbaTableOfContents::SwVbaTableOfContents( const uno::Reference< ooo::vba::XHel mxTocProps.set( mxDocumentIndex, uno::UNO_QUERY_THROW ); } - SwVbaTableOfContents::~SwVbaTableOfContents() { } diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 2f48f5ef2414..ae94ba1194be 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -159,7 +159,6 @@ SwVbaTables::SwVbaTables( const uno::Reference< XHelperInterface >& xParent, con { } - uno::Reference< word::XTable > SAL_CALL SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& /*DefaultTableBehavior*/, const uno::Any& /*AutoFitBehavior*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx index 368e33dc1ffe..4d78a5dc514c 100644 --- a/sw/source/ui/vba/vbatables.hxx +++ b/sw/source/ui/vba/vbatables.hxx @@ -23,7 +23,6 @@ #include <ooo/vba/word/XTables.hpp> #include <vbahelper/vbacollectionimpl.hxx> - typedef CollTestImplHelper< ov::word::XTables > SwVbaTables_BASE; class SwVbaTables : public SwVbaTables_BASE diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index 8a75916668c9..02880f48c95f 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -45,13 +45,11 @@ static OUString lcl_CheckGroupName( const OUString& rGroupName ) return comphelper::string::strip(sRet, ' '); } - SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rFullUrl ) : SwVbaTemplate_BASE( rParent, rContext ), mxModel( rModel ), msFullUrl( rFullUrl ) { } - SwVbaTemplate::~SwVbaTemplate() { } diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx index cc54c363a44f..cc9ffec06050 100644 --- a/sw/source/ui/vba/vbawrapformat.cxx +++ b/sw/source/ui/vba/vbawrapformat.cxx @@ -240,5 +240,4 @@ extern sdecl::ServiceDecl const serviceDecl( "ooo.vba.word.WrapFormat" ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx index be3443da93f6..7bf49e6e2836 100644 --- a/sw/source/ui/vba/wordvbahelper.cxx +++ b/sw/source/ui/vba/wordvbahelper.cxx @@ -176,7 +176,7 @@ bool gotoSelectedObjectAnchor( const uno::Reference< frame::XModel>& xModel ) th } } // word -} // -} // +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wdocsh.cxx b/sw/source/ui/web/wdocsh.cxx index b3ec036767b7..ac44c7d16c4a 100644 --- a/sw/source/ui/web/wdocsh.cxx +++ b/sw/source/ui/web/wdocsh.cxx @@ -39,7 +39,6 @@ #include <unomid.h> - SFX_IMPL_INTERFACE( SwWebDocShell, SfxObjectShell, SW_RES(0) ) { } @@ -58,8 +57,6 @@ SwWebDocShell::~SwWebDocShell() { } - - void SwWebDocShell::FillClass( SvGlobalName * pClassName, sal_uInt32 * pClipFormat, OUString * /*pAppName*/, @@ -86,6 +83,4 @@ void SwWebDocShell::FillClass( SvGlobalName * pClassName, *pUserName = SW_RESSTR(STR_HUMAN_SWWEBDOC_NAME); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wformsh.cxx b/sw/source/ui/web/wformsh.cxx index d2224d5b9d5b..9911d0be198a 100644 --- a/sw/source/ui/web/wformsh.cxx +++ b/sw/source/ui/web/wformsh.cxx @@ -53,5 +53,4 @@ SwWebDrawFormShell::~SwWebDrawFormShell() { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wfrmsh.cxx b/sw/source/ui/web/wfrmsh.cxx index c30d0f751a68..d2697400f983 100644 --- a/sw/source/ui/web/wfrmsh.cxx +++ b/sw/source/ui/web/wfrmsh.cxx @@ -30,7 +30,6 @@ #include "shells.hrc" #include "web.hrc" - // STATIC DATA #define SwWebFrameShell #include <sfx2/msg.hxx> @@ -42,8 +41,6 @@ SFX_IMPL_INTERFACE(SwWebFrameShell, SwFrameShell, SW_RES(STR_SHELLNAME_WEBFRAME) SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBFRAME_TOOLBOX)); } - - TYPEINIT1(SwWebFrameShell, SwFrameShell) SwWebFrameShell::SwWebFrameShell(SwView &_rView) : @@ -56,10 +53,4 @@ SwWebFrameShell::~SwWebFrameShell() { } - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wgrfsh.cxx b/sw/source/ui/web/wgrfsh.cxx index f2bc20d39eac..042b4ddbbefd 100644 --- a/sw/source/ui/web/wgrfsh.cxx +++ b/sw/source/ui/web/wgrfsh.cxx @@ -58,6 +58,4 @@ SwWebGrfShell::~SwWebGrfShell() { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wlistsh.cxx b/sw/source/ui/web/wlistsh.cxx index cd850143cac3..7bca24fcf64e 100644 --- a/sw/source/ui/web/wlistsh.cxx +++ b/sw/source/ui/web/wlistsh.cxx @@ -52,5 +52,4 @@ SwWebListShell::~SwWebListShell() { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wolesh.cxx b/sw/source/ui/web/wolesh.cxx index d45a2444d4b7..bf8359c8ef47 100644 --- a/sw/source/ui/web/wolesh.cxx +++ b/sw/source/ui/web/wolesh.cxx @@ -53,5 +53,4 @@ SwWebOleShell::~SwWebOleShell() { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wtabsh.cxx b/sw/source/ui/web/wtabsh.cxx index cd9eb53d886c..ca24430380fd 100644 --- a/sw/source/ui/web/wtabsh.cxx +++ b/sw/source/ui/web/wtabsh.cxx @@ -23,7 +23,6 @@ #include <sfx2/objface.hxx> #include <svl/srchitem.hxx> - #include "cmdid.h" #include "globals.hrc" #include "uitool.hxx" @@ -59,6 +58,4 @@ SwWebTableShell::~SwWebTableShell() { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx index 80958cb8740e..16299b4f2e68 100644 --- a/sw/source/ui/web/wtextsh.cxx +++ b/sw/source/ui/web/wtextsh.cxx @@ -61,6 +61,4 @@ SwWebTextShell::~SwWebTextShell() { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index ee71392215f7..5e733721c280 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -65,7 +65,6 @@ #define ListInTable #include <swslots.hxx> - SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default") { SFX_VIEW_REGISTRATION(SwWebDocShell); @@ -274,7 +273,6 @@ void SwWebView::SelectShell() GetFormShell()->SetView( PTR_CAST( FmFormView, GetWrtShell().GetDrawView())); - } GetViewImpl()->GetUNOObject_Impl()->NotifySelChanged(); @@ -287,7 +285,4 @@ void SwWebView::SelectShell() GetWrtShell().UpdateTable(); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx index bba3c3d369d3..7d95390ce8e9 100644 --- a/sw/source/ui/wrtsh/delete.cxx +++ b/sw/source/ui/wrtsh/delete.cxx @@ -102,8 +102,6 @@ long SwWrtShell::DelLine() return nRet; } - - long SwWrtShell::DelToStartOfLine() { OpenMark(); @@ -113,8 +111,6 @@ long SwWrtShell::DelToStartOfLine() return nRet; } - - long SwWrtShell::DelToEndOfLine() { OpenMark(); @@ -544,7 +540,4 @@ long SwWrtShell::DelPrvWord() return nRet; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx index c31afc6afec2..fdd75dfbbe14 100644 --- a/sw/source/ui/wrtsh/move.cxx +++ b/sw/source/ui/wrtsh/move.cxx @@ -421,7 +421,6 @@ sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect) // and we have to remember the position on the stack to return to it later. sal_Bool bIsFrmSel = sal_False; - //Target position is now within the viewable region --> //Place the cursor at the target position; remember that no target //position is longer on the stack. @@ -473,8 +472,6 @@ sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect) return !bDestOnStack && bDiff; } - - sal_Bool SwWrtShell::PopCrsr(sal_Bool bUpdate, sal_Bool bSelect) { if( 0 == pCrsrStack) @@ -546,8 +543,6 @@ void SwWrtShell::_ResetCursorStack() transpose cursor */ - - sal_Bool SwWrtShell::PageCrsr(SwTwips lOffset, sal_Bool bSelect) { // Do nothing if an offset of 0 was indicated diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index 56660aa03052..5b8eee1f367f 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -40,14 +40,12 @@ #include <doc.hxx> #include <wordcountdialog.hxx> - namespace com { namespace sun { namespace star { namespace util { struct SearchOptions; } } } } using namespace ::com::sun::star::util; - static long nStartDragX = 0, nStartDragY = 0; static bool bStartDrag = false; @@ -71,8 +69,6 @@ sal_Bool SwWrtShell::SelNearestWrd() return SelWrd(); } - - sal_Bool SwWrtShell::SelWrd(const Point *pPt, sal_Bool ) { sal_Bool bRet; @@ -123,7 +119,6 @@ void SwWrtShell::SelPara(const Point *pPt, sal_Bool ) bSelWrd = sal_False; // disable SelWord, otherwise no SelLine goes on } - long SwWrtShell::SelAll() { const sal_Bool bLockedView = IsViewLocked(); @@ -475,7 +470,6 @@ long SwWrtShell::ExtSelWrd(const Point *pPt, sal_Bool ) return bRet; } - long SwWrtShell::ExtSelLn(const Point *pPt, sal_Bool ) { SwMvContext aMvContext(this); diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx index d29aac7dfc5a..1634d1dae0b6 100644 --- a/sw/source/ui/wrtsh/wrtsh2.cxx +++ b/sw/source/ui/wrtsh/wrtsh2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <svl/macitem.hxx> #include <sfx2/frame.hxx> @@ -276,7 +275,6 @@ sal_Bool SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet // handler for click on the field given as parameter. // the cursor is positioned on the field. - void SwWrtShell::ClickToField( const SwField& rFld ) { // cross reference field must not be selected because it moves the cursor @@ -422,7 +420,6 @@ bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter ) return bRet; } - void LoadURL( SwViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter, const OUString& rTargetFrameName ) { @@ -542,5 +539,4 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk, } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx index 1030dce5d459..bc35ef16b8e3 100644 --- a/sw/source/ui/wrtsh/wrtsh3.cxx +++ b/sw/source/ui/wrtsh/wrtsh3.cxx @@ -158,7 +158,6 @@ void SwWrtShell::ExecMacro( const SvxMacro& rMacro, OUString* pRet, SbxArray* pA } } - sal_uInt16 SwWrtShell::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent, bool bChkPtr, SbxArray* pArgs, const Link* pCallBack ) @@ -166,7 +165,6 @@ sal_uInt16 SwWrtShell::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCa return GetDoc()->CallEvent( nEvent, rCallEvent, bChkPtr, pArgs, pCallBack ); } - // If a util::URL-Button is selected, return its util::URL // otherwise an emtpy string. bool SwWrtShell::GetURLFromButton( OUString& rURL, OUString& rDescr ) const diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx index 511d11deeca1..6290b5e7f5ce 100644 --- a/sw/source/ui/wrtsh/wrtundo.cxx +++ b/sw/source/ui/wrtsh/wrtundo.cxx @@ -138,7 +138,6 @@ sal_uInt16 SwWrtShell::GetDoStrings( DoType eDoType, SfxStringListItem& rStrs ) return static_cast<sal_uInt16>(comments.size()); } - OUString SwWrtShell::GetRepeatString() const { OUString str; |