diff options
Diffstat (limited to 'sw/source/ui/app')
-rw-r--r-- | sw/source/ui/app/app.src | 4 | ||||
-rw-r--r-- | sw/source/ui/app/appenv.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/app/apphdl.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/app/applab.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/app/appopt.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/app/docsh.cxx | 14 | ||||
-rw-r--r-- | sw/source/ui/app/docshdrw.cxx | 1 | ||||
-rw-r--r-- | sw/source/ui/app/docshini.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/app/docstyle.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/app/mainwn.cxx | 5 | ||||
-rw-r--r-- | sw/source/ui/app/swmodul1.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/app/swmodule.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/app/swwait.cxx | 1 |
13 files changed, 2 insertions, 55 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 ) |