summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/appl/appbas.cxx3
-rw-r--r--sfx2/source/appl/appcfg.cxx4
-rw-r--r--sfx2/source/appl/appinit.cxx6
-rw-r--r--sfx2/source/appl/linkmgr2.cxx12
-rw-r--r--sfx2/source/appl/lnkbase2.cxx4
-rw-r--r--sfx2/source/control/shell.cxx5
-rw-r--r--sfx2/source/control/templateabstractview.cxx7
-rw-r--r--sfx2/source/dialog/styfitem.cxx50
-rw-r--r--sfx2/source/doc/docfile.cxx28
-rw-r--r--sfx2/source/doc/objmisc.cxx5
-rw-r--r--sfx2/source/doc/objstor.cxx3
-rw-r--r--sfx2/source/doc/objxtor.cxx3
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx2
-rw-r--r--sfx2/source/inc/objshimp.hxx2
-rw-r--r--sfx2/source/menu/mnumgr.cxx5
-rw-r--r--sfx2/source/sidebar/FocusManager.cxx18
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx4
-rw-r--r--sfx2/source/view/ipclient.cxx5
-rw-r--r--sfx2/source/view/printer.cxx4
-rw-r--r--sfx2/source/view/viewfrm.cxx10
-rw-r--r--sfx2/source/view/viewprn.cxx3
-rw-r--r--sfx2/source/view/viewsh.cxx2
22 files changed, 65 insertions, 120 deletions
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 36f917d1d19d..028c2791c3e8 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -88,11 +88,10 @@ using namespace ::com::sun::star::script;
using ::basic::BasicManagerRepository;
-sal_uInt16 SfxApplication::SaveBasicAndDialogContainer() const
+void SfxApplication::SaveBasicAndDialogContainer() const
{
if ( pAppData_Impl->pBasicManager->isValid() )
pAppData_Impl->pBasicManager->storeAllLibraries();
- return 0;
}
BasicManager* SfxApplication::GetBasicManager()
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index f88853f32210..50f7fad3afb9 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -149,7 +149,7 @@ IMPL_LINK_TYPED(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle, void)
-bool SfxApplication::GetOptions( SfxItemSet& rSet )
+void SfxApplication::GetOptions( SfxItemSet& rSet )
{
bool bRet = false;
SfxItemPool &rPool = GetPool();
@@ -490,8 +490,6 @@ bool SfxApplication::GetOptions( SfxItemSet& rSet )
}
pRanges++;
}
-
- return bRet;
}
// TODO/CLEANUP: Why two SetOptions Methods?
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 2ac45255c8cd..2b9ebd1f1dcc 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -200,7 +200,7 @@ OUString GetSpecialCharsForEdit(vcl::Window* pParent, const vcl::Font& rFont)
-bool SfxApplication::Initialize_Impl()
+void SfxApplication::Initialize_Impl()
{
#ifdef TLX_VALIDATE
StgIo::SetErrorLink( LINK( this, SfxStorageErrHdl, Error ) );
@@ -270,7 +270,7 @@ bool SfxApplication::Initialize_Impl()
SetPool( pAppData_Impl->pPool );
if ( pAppData_Impl->bDowning )
- return false;
+ return;
// App-Dispatcher aufbauen
pAppData_Impl->pAppDispat->Push(*this);
@@ -282,8 +282,6 @@ bool SfxApplication::Initialize_Impl()
// Set special characters callback on vcl edit control
Edit::SetGetSpecialCharsFunction(&GetSpecialCharsForEdit);
}
-
- return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 74ef914677f8..6f1baf276bbb 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -186,33 +186,33 @@ bool LinkManager::InsertLink( SvBaseLink * pLink,
}
-bool LinkManager::InsertDDELink( SvBaseLink * pLink,
+void LinkManager::InsertDDELink( SvBaseLink * pLink,
const OUString& rServer,
const OUString& rTopic,
const OUString& rItem )
{
if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) )
- return false;
+ return;
OUString sCmd;
::sfx2::MakeLnkName( sCmd, &rServer, rTopic, rItem );
pLink->SetObjType( OBJECT_CLIENT_DDE );
pLink->SetName( sCmd );
- return Insert( pLink );
+ Insert( pLink );
}
-bool LinkManager::InsertDDELink( SvBaseLink * pLink )
+void LinkManager::InsertDDELink( SvBaseLink * pLink )
{
DBG_ASSERT( OBJECT_CLIENT_SO & pLink->GetObjType(), "no OBJECT_CLIENT_SO" );
if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) )
- return false;
+ return;
if( pLink->GetObjType() == OBJECT_CLIENT_SO )
pLink->SetObjType( OBJECT_CLIENT_DDE );
- return Insert( pLink );
+ Insert( pLink );
}
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 930939ebdf4a..d0344768bff4 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -422,14 +422,12 @@ SotClipboardFormatId SvBaseLink::GetContentType() const
}
-bool SvBaseLink::SetContentType( SotClipboardFormatId nType )
+void SvBaseLink::SetContentType( SotClipboardFormatId nType )
{
if( OBJECT_CLIENT_SO & nObjType )
{
pImplData->ClientType.nCntntType = nType;
- return true;
}
- return false;
}
LinkManager* SvBaseLink::GetLinkManager()
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index ca82105253fa..c37c41d26ea2 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -411,17 +411,16 @@ void ShellCall_Impl( void* pObj, void* pArg )
static_cast<SfxShell*>(pObj)->ExecuteSlot( *static_cast<SfxRequest*>(pArg) );
}
-const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, bool bAsync )
+void SfxShell::ExecuteSlot( SfxRequest& rReq, bool bAsync )
{
if( !bAsync )
- return ExecuteSlot( rReq );
+ ExecuteSlot( rReq );
else
{
if( !pImp->pExecuter )
pImp->pExecuter = new svtools::AsynchronLink(
Link<void*,void>( this, ShellCall_Impl ) );
pImp->pExecuter->Call( new SfxRequest( rReq ) );
- return nullptr;
}
}
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index 4a2a9138c1f2..544c3e04b111 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -119,13 +119,6 @@ bool ViewFilter_Application::operator () (const ThumbnailViewItem *pItem)
return true;
}
-bool ViewFilter_Keyword::operator ()(const ThumbnailViewItem *pItem)
-{
- assert(pItem);
-
- return pItem->maTitle.matchIgnoreAsciiCase(maKeyword);
-}
-
TemplateAbstractView::TemplateAbstractView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren)
: ThumbnailView(pParent,nWinStyle,bDisableTransientChildren),
mnCurRegionId(0),
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index 0a8b7480f336..e5e3be7b7ae8 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -117,39 +117,31 @@ SfxStyleFamilies::~SfxStyleFamilies()
-bool SfxStyleFamilies::updateImages( const ResId& _rId )
+void SfxStyleFamilies::updateImages( const ResId& _rId )
{
- bool bSuccess = false;
+ ::svt::OLocalResourceAccess aLocalRes( _rId );
- {
- ::svt::OLocalResourceAccess aLocalRes( _rId );
-
- // check if the image list is present
- ResId aImageListId( (sal_uInt16) 1, *_rId.GetResMgr() );
- aImageListId.SetRT( RSC_IMAGELIST );
-
- if ( aLocalRes.IsAvailableRes( aImageListId ) )
- { // there is such a list
- ImageList aImages( aImageListId );
-
- // number of styles items/images
- sal_uInt16 nCount = aImages.GetImageCount( );
- DBG_ASSERT( aEntryList.size() == nCount, "SfxStyleFamilies::updateImages: found the image list, but missing some bitmaps!" );
- if ( nCount > aEntryList.size() )
- nCount = aEntryList.size();
-
- // set the images on the items
- for ( size_t i = 0; i < nCount; ++i )
- {
- SfxStyleFamilyItem* pItem = aEntryList[ i ];
- pItem->SetImage( aImages.GetImage( aImages.GetImageId( i ) ) );
- }
-
- bSuccess = true;
+ // check if the image list is present
+ ResId aImageListId( (sal_uInt16) 1, *_rId.GetResMgr() );
+ aImageListId.SetRT( RSC_IMAGELIST );
+
+ if ( aLocalRes.IsAvailableRes( aImageListId ) )
+ { // there is such a list
+ ImageList aImages( aImageListId );
+
+ // number of styles items/images
+ sal_uInt16 nCount = aImages.GetImageCount( );
+ DBG_ASSERT( aEntryList.size() == nCount, "SfxStyleFamilies::updateImages: found the image list, but missing some bitmaps!" );
+ if ( nCount > aEntryList.size() )
+ nCount = aEntryList.size();
+
+ // set the images on the items
+ for ( size_t i = 0; i < nCount; ++i )
+ {
+ SfxStyleFamilyItem* pItem = aEntryList[ i ];
+ pItem->SetImage( aImages.GetImage( aImages.GetImageId( i ) ) );
}
}
-
- return bSuccess;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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();
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 36f8bdff6618..fb94a8e02978 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -152,7 +152,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
// IMacroDocumentAccess overridables
virtual sal_Int16 getCurrentMacroExecMode() const override;
- virtual bool setCurrentMacroExecMode( sal_uInt16 nMacroMode ) override;
+ virtual void setCurrentMacroExecMode( sal_uInt16 nMacroMode ) override;
virtual OUString getDocumentLocation() const override;
virtual bool documentStorageHasMacros() const override;
virtual css::uno::Reference< css::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const override;
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 00438ff78aff..31a304d47c23 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -251,11 +251,10 @@ void SfxPopupMenuManager::RemoveDisabledEntries()
-sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, vcl::Window* pWindow )
+void SfxPopupMenuManager::Execute( const Point& rPos, vcl::Window* pWindow )
{
- sal_uInt16 nVal = static_cast<PopupMenu*>( GetMenu()->GetSVMenu() )->Execute( pWindow, rPos );
+ static_cast<PopupMenu*>( GetMenu()->GetSVMenu() )->Execute( pWindow, rPos );
delete pStaticThesSubMenu; pStaticThesSubMenu = nullptr;
- return nVal;
}
diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index 556fc0d7dca9..b12995b0abba 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -301,7 +301,7 @@ void FocusManager::RemoveWindow (vcl::Window& rWindow)
}
}
-bool FocusManager::MoveFocusInsidePanel (
+void FocusManager::MoveFocusInsidePanel (
const FocusLocation& rFocusLocation,
const sal_Int32 nDirection)
{
@@ -314,21 +314,20 @@ bool FocusManager::MoveFocusInsidePanel (
maPanels[rFocusLocation.mnIndex]->GetTitleBar()->GetToolBox().GrabFocus();
else
FocusPanelContent(rFocusLocation.mnIndex);
- return true;
+ break;
case PC_PanelToolBox:
if (nDirection < 0 && bHasToolBoxItem)
maPanels[rFocusLocation.mnIndex]->GetTitleBar()->GrabFocus();
else
FocusPanelContent(rFocusLocation.mnIndex);
- return true;
+ break;
- default:
- return false;
+ default: break;
}
}
-bool FocusManager::MoveFocusInsideDeckTitle (
+void FocusManager::MoveFocusInsideDeckTitle (
const FocusLocation& rFocusLocation,
const sal_Int32 nDirection)
{
@@ -345,17 +344,16 @@ bool FocusManager::MoveFocusInsideDeckTitle (
FocusPanelContent(0);
else if (bHasToolBoxItem)
mpDeckTitleBar->GetToolBox().GrabFocus();
- return true;
+ break;
case PC_DeckToolBox:
if (nDirection>0 && ! IsPanelTitleVisible(0))
FocusPanelContent(0);
else
mpDeckTitleBar->GrabFocus();
- return true;
+ break;
- default:
- return false;
+ default: break;
}
}
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 35daecffe9db..f49b7dd13a35 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -983,7 +983,7 @@ void SfxPopupWindow::dispose()
-SfxFrameStatusListener* SfxPopupWindow::GetOrCreateStatusListener()
+void SfxPopupWindow::GetOrCreateStatusListener()
{
if ( !m_xStatusListener.is() )
{
@@ -993,8 +993,6 @@ SfxFrameStatusListener* SfxPopupWindow::GetOrCreateStatusListener()
this );
m_xStatusListener.set( static_cast< cppu::OWeakObject* >( m_pStatusListener ), UNO_QUERY );
}
-
- return m_pStatusListener;
}
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 09c85461b1a6..a51e23b447ed 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -770,7 +770,7 @@ void SfxInPlaceClient::SetSizeScale( const Fraction & rScaleWidth, const Fractio
}
-bool SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fraction& rScaleWidth, const Fraction& rScaleHeight )
+void SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fraction& rScaleWidth, const Fraction& rScaleHeight )
{
if( rArea != m_pImp->m_aObjArea || m_pImp->m_aScaleWidth != rScaleWidth || m_pImp->m_aScaleHeight != rScaleHeight )
{
@@ -781,10 +781,7 @@ bool SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fractio
m_pImp->SizeHasChanged();
Invalidate();
- return true;
}
-
- return false;
}
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index ee07c7850f21..ee8dfef79036 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -85,7 +85,7 @@ VclPtr<SfxPrinter> SfxPrinter::Create( SvStream& rStream, SfxItemSet* pOptions )
-SvStream& SfxPrinter::Store( SvStream& rStream ) const
+void SfxPrinter::Store( SvStream& rStream ) const
/* [Description]
@@ -93,7 +93,7 @@ SvStream& SfxPrinter::Store( SvStream& rStream ) const
*/
{
- return WriteJobSetup( rStream, GetJobSetup() );
+ WriteJobSetup( rStream, GetJobSetup() );
}
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 87f31489ea83..321526d73f96 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1169,7 +1169,7 @@ void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh )
}
}
-bool SfxViewFrame::SetBorderPixelImpl
+void SfxViewFrame::SetBorderPixelImpl
(
const SfxViewShell* pVSh,
const SvBorder& rBorder
@@ -1207,15 +1207,9 @@ bool SfxViewFrame::SetBorderPixelImpl
aEditArea.Bottom() -= rBorder.Bottom();
pVSh->GetWindow()->SetPosSizePixel( aEditArea.TopLeft(), aEditArea.GetSize() );
}
-
- return true;
}
-const SvBorder& SfxViewFrame::GetBorderPixelImpl
-(
- const SfxViewShell* /*pSh*/
-) const
-
+const SvBorder& SfxViewFrame::GetBorderPixelImpl() const
{
return pImp->aBorder;
}
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index daba22987ea5..04244896abf2 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -466,7 +466,7 @@ IMPL_LINK_NOARG_TYPED(SfxDialogExecutor_Impl, Execute, Button*, void)
Internal method for setting the differences between 'pNewPrinter' to the
current printer. pNewPrinter is either taken over or deleted.
*/
-SfxPrinter* SfxViewShell::SetPrinter_Impl( VclPtr<SfxPrinter>& pNewPrinter )
+void SfxViewShell::SetPrinter_Impl( VclPtr<SfxPrinter>& pNewPrinter )
{
// get current Printer
SfxPrinter *pDocPrinter = GetPrinter();
@@ -561,7 +561,6 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( VclPtr<SfxPrinter>& pNewPrinter )
if ( SfxPrinterChangeFlags::NONE != nChangedFlags )
// SetPrinter will delete the old printer if it changes
SetPrinter( pDocPrinter, nChangedFlags );
- return pDocPrinter;
}
void SfxViewShell::StartPrint( const uno::Sequence < beans::PropertyValue >& rProps, bool bIsAPI, bool bIsDirect )
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index f0a09e436be3..8e1fa3407409 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1193,7 +1193,7 @@ const SvBorder& SfxViewShell::GetBorderPixel() const
{
DBG_ASSERT( GetViewFrame(), "SfxViewShell without SfxViewFrame" );
- return GetViewFrame()->GetBorderPixelImpl( this );
+ return GetViewFrame()->GetBorderPixelImpl();
}
generated by cgit (git 2.34.1) at 2024-12-28 22:40:48 +0000