diff options
Diffstat (limited to 'sw/source/ui/app/docsh.cxx')
-rw-r--r-- | sw/source/ui/app/docsh.cxx | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index a7083b41cb14..5bfd6ea179ee 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,18 +68,18 @@ #include <swwait.hxx> #include <swprtopt.hxx> #include <frmatr.hxx> -#include <view.hxx> // fuer die aktuelle Sicht +#include <view.hxx> // fuer die aktuelle Sicht #include <edtwin.hxx> #include <PostItMgr.hxx> -#include <wrtsh.hxx> // Verbindung zur Core -#include <docsh.hxx> // Dokumenterzeugung +#include <wrtsh.hxx> // Verbindung zur Core +#include <docsh.hxx> // Dokumenterzeugung #include <basesh.hxx> #include <viewopt.hxx> #include <wdocsh.hxx> #include <swmodule.hxx> #include <globdoc.hxx> #include <usrpref.hxx> -#include <shellio.hxx> // I/O +#include <shellio.hxx> // I/O #include <docstyle.hxx> #include <doc.hxx> #include <docstat.hxx> @@ -98,7 +98,7 @@ #include <fldbas.hxx> #include <docary.hxx> // <-- -#include <swerror.h> // Fehlermeldungen +#include <swerror.h> // Fehlermeldungen #include <helpid.h> #include <cmdid.h> #include <globals.hrc> @@ -321,7 +321,7 @@ BOOL SwDocShell::Save() pView->GetEditWin().StopQuickHelp(); SwWait aWait( *this, TRUE ); - CalcLayoutForOLEObjects(); // format for OLE objets + CalcLayoutForOLEObjects(); // format for OLE objets // #i62875# // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible if ( pWrtShell && pDoc && @@ -448,7 +448,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) } } - CalcLayoutForOLEObjects(); // format for OLE objets + CalcLayoutForOLEObjects(); // format for OLE objets // #i62875# // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible if ( pWrtShell && pDoc && @@ -551,7 +551,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium ) WriterRef xWriter; SwReaderWriter::GetWriter( pFlt->GetUserData(), rMedium.GetBaseURL( true ), xWriter ); if( !xWriter.Is() ) - { // Filter not available + { // Filter not available InfoBox( 0, SW_RESSTR(STR_DLLNOTFOUND) ).Execute(); return FALSE; @@ -624,7 +624,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium ) SwDocStat aDocStat( pDoc->GetDocStat() );; pDoc->UpdateDocStat( aDocStat ); // <-- - CalcLayoutForOLEObjects(); // format for OLE objets + CalcLayoutForOLEObjects(); // format for OLE objets // #i62875# // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible if ( pWrtShell && pDoc && @@ -761,7 +761,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium ) SwWriter aWrt( rMedium, *pWrtShell, TRUE ); nErrno = aWrt.Write( xWriter, &aFileName ); //JP 16.05.97: falls der SFX uns die View waehrend des speicherns - // entzieht + // entzieht if( pWrtShell ) { pWrtShell->Pop(FALSE); @@ -795,7 +795,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium ) } /*-------------------------------------------------------------------- - Beschreibung: Haende weg + Beschreibung: Haende weg --------------------------------------------------------------------*/ @@ -859,7 +859,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, if ( rSetup.GetPrinterName().Len() && ASPECT_THUMBNAIL != nAspect ) { pOrig = const_cast<JobSetup*>(pDoc->getJobsetup()); - if( pOrig ) // dann kopieren wir uns den + if( pOrig ) // dann kopieren wir uns den pOrig = new JobSetup( *pOrig ); pDoc->setJobsetup( rSetup ); } @@ -993,7 +993,7 @@ sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates ) void SwDocShell::GetState(SfxItemSet& rSet) { SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + USHORT nWhich = aIter.FirstWhich(); while (nWhich) { @@ -1005,7 +1005,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) if ( !bDisable ) { SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this); - while (pTmpFrm) // Preview suchen + while (pTmpFrm) // Preview suchen { if ( PTR_CAST(SwView, pTmpFrm->GetViewShell()) && ((SwView*)pTmpFrm->GetViewShell())->GetWrtShell().getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE)) @@ -1097,15 +1097,15 @@ void SwDocShell::GetState(SfxItemSet& rSet) } /*-------------------------------------------------------------------- - Beschreibung: OLE-Hdls + Beschreibung: OLE-Hdls --------------------------------------------------------------------*/ IMPL_LINK( SwDocShell, Ole2ModifiedHdl, void *, p ) { // vom Doc wird der Status mitgegeben (siehe doc.cxx) - // Bit 0: -> alter Zustand - // Bit 1: -> neuer Zustand + // Bit 0: -> alter Zustand + // Bit 1: -> neuer Zustand long nStatus = (long)p; if( IsEnableSetModified() ) SetModified( (nStatus & 2) ? TRUE : FALSE ); @@ -1113,11 +1113,11 @@ IMPL_LINK( SwDocShell, Ole2ModifiedHdl, void *, p ) } /*-------------------------------------------------------------------- - Beschreibung: Pool returnen Hier weil virtuelll + Beschreibung: Pool returnen Hier weil virtuelll --------------------------------------------------------------------*/ -SfxStyleSheetBasePool* SwDocShell::GetStyleSheetPool() +SfxStyleSheetBasePool* SwDocShell::GetStyleSheetPool() { return mxBasePool.get(); } @@ -1261,7 +1261,7 @@ static const char* pEventNames[] = "OnLayoutFinished" }; -Sequence< OUString > SwDocShell::GetEventNames() +Sequence< OUString > SwDocShell::GetEventNames() { Sequence< OUString > aRet = SfxObjectShell::GetEventNames(); sal_Int32 nLen = aRet.getLength(); @@ -1297,13 +1297,13 @@ 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 ) { USHORT nOn = bActivate ? nsRedlineMode_t::REDLINE_ON : 0; @@ -1311,13 +1311,13 @@ void SwDocShell::SetChangeRecording( bool bActivate ) pWrtShell->SetRedlineModeAndCheckInsMode( (nMode & ~nsRedlineMode_t::REDLINE_ON) | nOn); } - + bool SwDocShell::SetProtectionPassword( const String &rNewPassword ) { const SfxAllItemSet aSet( GetPool() ); const SfxItemSet* pArgs = &aSet; const SfxPoolItem* pItem = NULL; - + IDocumentRedlineAccess* pIDRA = pWrtShell->getIDocumentRedlineAccess(); Sequence< sal_Int8 > aPasswd = pIDRA->GetRedlinePassword(); if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_REDLINE_PROTECT, FALSE, &pItem ) @@ -1325,12 +1325,12 @@ bool SwDocShell::SetProtectionPassword( const String &rNewPassword ) return false; bool bRes = false; - + if (rNewPassword.Len()) { // when password protection is applied change tracking must always be active SetChangeRecording( true ); - + Sequence< sal_Int8 > aNewPasswd; SvPasswordHelper::GetHashPassword( aNewPasswd, rNewPassword ); pIDRA->SetRedlinePassword( aNewPasswd ); @@ -1345,7 +1345,7 @@ bool SwDocShell::SetProtectionPassword( const String &rNewPassword ) return bRes; } - + bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) { bool bRes = false; @@ -1353,7 +1353,7 @@ bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal const SfxAllItemSet aSet( GetPool() ); const SfxItemSet* pArgs = &aSet; const SfxPoolItem* pItem = NULL; - + IDocumentRedlineAccess* pIDRA = pWrtShell->getIDocumentRedlineAccess(); Sequence< sal_Int8 > aPasswdHash( pIDRA->GetRedlinePassword() ); if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_REDLINE_PROTECT, FALSE, &pItem ) @@ -1363,8 +1363,8 @@ bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal bRes = true; return bRes; -} - +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |