5 files changed, 12 insertions, 29 deletions

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 6c827ddfd2a3..d30d52f05bff 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -596,7 +596,7 @@ bool SfxMedium::CloseOutStream()
     return true;
 }
 
-bool SfxMedium::CloseOutStream_Impl()
+void SfxMedium::CloseOutStream_Impl()
 {
     if ( pImp->m_pOutStream )
     {
@@ -622,8 +622,6 @@ bool SfxMedium::CloseOutStream_Impl()
         if ( pImp->m_pSet )
             pImp->m_pSet->ClearItem( SID_STREAM );
     }
-
-    return true;
 }
 
 
@@ -1637,7 +1635,7 @@ bool SfxMedium::StorageCommit_Impl()
 }
 
 
-bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
+void SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
                                                  const INetURLObject& aDest,
                                                  const Reference< css::ucb::XCommandEnvironment >& xComEnv )
 {
@@ -1758,8 +1756,6 @@ bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
         else
             pImp->m_eError = ERRCODE_IO_CANTREAD;
     }
-
-    return bResult;
 }
 
 
@@ -3263,7 +3259,7 @@ uno::Sequence < util::RevisionTag > SfxMedium::GetVersionList( const uno::Refere
     return uno::Sequence < util::RevisionTag >();
 }
 
-sal_uInt16 SfxMedium::AddVersion_Impl( util::RevisionTag& rRevision )
+void SfxMedium::AddVersion_Impl( util::RevisionTag& rRevision )
 {
     if ( GetStorage().is() )
     {
@@ -3290,16 +3286,13 @@ sal_uInt16 SfxMedium::AddVersion_Impl( util::RevisionTag& rRevision )
         pImp->aVersions.realloc( nLength+1 );
         rRevision.Identifier = aRevName;
         pImp->aVersions[nLength] = rRevision;
-        return nKey;
     }
-
-    return 0;
 }
 
-bool SfxMedium::RemoveVersion_Impl( const OUString& rName )
+void SfxMedium::RemoveVersion_Impl( const OUString& rName )
 {
     if ( !pImp->aVersions.getLength() )
-        return false;
+        return;
 
     sal_Int32 nLength = pImp->aVersions.getLength();
     for ( sal_Int32 n=0; n<nLength; n++ )
@@ -3309,11 +3302,9 @@ bool SfxMedium::RemoveVersion_Impl( const OUString& rName )
             for ( sal_Int32 m=n; m<nLength-1; m++ )
                 pImp->aVersions[m] = pImp->aVersions[m+1];
             pImp->aVersions.realloc(nLength-1);
-            return true;
+            return;
         }
     }
-
-    return false;
 }
 
 bool SfxMedium::TransferVersionList_Impl( SfxMedium& rMedium )
@@ -3327,26 +3318,23 @@ bool SfxMedium::TransferVersionList_Impl( SfxMedium& rMedium )
     return false;
 }
 
-bool SfxMedium::SaveVersionList_Impl( bool /*bUseXML*/ )
+void SfxMedium::SaveVersionList_Impl( bool /*bUseXML*/ )
 {
     if ( GetStorage().is() )
     {
         if ( !pImp->aVersions.getLength() )
-            return true;
+            return;
 
         uno::Reference < document::XDocumentRevisionListPersistence > xWriter =
                  document::DocumentRevisionListPersistence::create( comphelper::getProcessComponentContext() );
         try
         {
             xWriter->store( GetStorage(), pImp->aVersions );
-            return true;
         }
         catch ( const uno::Exception& )
         {
         }
     }
-
-    return false;
 }
 
 bool SfxMedium::IsReadOnly() const
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index aca0fbd616d7..b721eaf30978 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1866,17 +1866,14 @@ sal_Int16 SfxObjectShell_Impl::getCurrentMacroExecMode() const
     return nImposedExecMode;
 }
 
-bool SfxObjectShell_Impl::setCurrentMacroExecMode( sal_uInt16 nMacroMode )
+void SfxObjectShell_Impl::setCurrentMacroExecMode( sal_uInt16 nMacroMode )
 {
     const SfxMedium* pMedium( rDocShell.GetMedium() );
     OSL_PRECOND( pMedium, "SfxObjectShell_Impl::getCurrentMacroExecMode: no medium!" );
     if ( pMedium )
     {
         pMedium->GetItemSet()->Put( SfxUInt16Item( SID_MACROEXECMODE, nMacroMode ) );
-        return true;
     }
-
-    return false;
 }
 
 OUString SfxObjectShell_Impl::getDocumentLocation() const
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index b18793361be5..01d7435bf2ef 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -487,10 +487,9 @@ bool SfxObjectShell::Load( SfxMedium& rMedium )
     return GeneralInit_Impl( rMedium.GetStorage(), true );
 }
 
-bool SfxObjectShell::DoInitUnitTest()
+void SfxObjectShell::DoInitUnitTest()
 {
     pMedium = new SfxMedium;
-    return true; // always a success!
 }
 
 bool SfxObjectShell::DoInitNew( SfxMedium* pMed )
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 3bdb6f74aa07..de21929497bd 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -1166,11 +1166,10 @@ void SfxObjectShell::SetChangeRecording( bool /*bActivate*/ )
 }
 
 
-bool SfxObjectShell::SetProtectionPassword( const OUString & /*rPassword*/ )
+void SfxObjectShell::SetProtectionPassword( const OUString & /*rPassword*/ )
 {
     // currently this function needs to be overwritten by Writer and Calc only
     DBG_ASSERT( false, "function not implemented" );
-    return false;
 }
 
 
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 3442c94603e2..9c21b989ddc0 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1015,7 +1015,7 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE
         SfxViewFrame* pFrame = SfxViewFrame::GetFirst( m_pData->m_pObjectShell );
         if ( pFrame )
         {
-            SvBorder aBorder = pFrame->GetBorderPixelImpl( pFrame->GetViewShell() );
+            SvBorder aBorder = pFrame->GetBorderPixelImpl();
 
             Sequence< sal_Int32 > aBorderSeq(4);
             aBorderSeq[0] = aBorder.Left();