[Libreoffice-commits] core.git: 11 commits - cui/source drawinglayer/source editeng/source extensions/source forms/source formula/source framework/inc framework/source include/drawinglayer include/editeng include/formula include/toolkit include/tools reportdesign/source sc/inc sc/source sd/inc sd/source svx/source sw/source toolkit/source tools/source
Noel Grandin
noel at peralex.com
Thu Mar 10 08:10:44 UTC 2016
cui/source/dialogs/SpellDialog.cxx | 8 -
cui/source/dialogs/hlmarkwn.cxx | 4
cui/source/dialogs/hltpbase.cxx | 4
cui/source/inc/SpellDialog.hxx | 2
cui/source/inc/hlmarkwn.hxx | 2
drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx | 6 -
editeng/source/editeng/editview.cxx | 2
editeng/source/editeng/impedit.cxx | 15 ---
editeng/source/editeng/impedit.hxx | 2
editeng/source/outliner/outlin2.cxx | 4
editeng/source/outliner/outliner.cxx | 10 +-
editeng/source/outliner/paralist.cxx | 12 --
editeng/source/outliner/paralist.hxx | 2
extensions/source/dbpilots/listcombowizard.cxx | 12 +-
extensions/source/dbpilots/listcombowizard.hxx | 2
forms/source/inc/InterfaceContainer.hxx | 2
forms/source/misc/InterfaceContainer.cxx | 6 -
formula/source/ui/dlg/formula.cxx | 10 +-
formula/source/ui/dlg/parawin.cxx | 8 -
formula/source/ui/dlg/parawin.hxx | 2
framework/inc/dispatch/menudispatcher.hxx | 2
framework/inc/services/layoutmanager.hxx | 8 -
framework/source/dispatch/menudispatcher.cxx | 32 ------
framework/source/layoutmanager/layoutmanager.cxx | 5 -
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 12 +-
framework/source/services/urltransformer.cxx | 4
include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx | 2
include/editeng/outliner.hxx | 2
include/formula/formula.hxx | 4
include/toolkit/controls/unocontrol.hxx | 2
include/tools/pstm.hxx | 2
include/tools/urlobj.hxx | 8 -
reportdesign/source/ui/dlg/Formula.cxx | 2
sc/inc/cellsuno.hxx | 2
sc/inc/compressedarray.hxx | 5 -
sc/inc/docuno.hxx | 2
sc/inc/scabstdlg.hxx | 7 -
sc/inc/segmenttree.hxx | 2
sc/source/core/data/compressedarray.cxx | 5 -
sc/source/core/data/segmenttree.cxx | 4
sc/source/core/data/table2.cxx | 6 -
sc/source/filter/excel/xeformula.cxx | 8 -
sc/source/filter/inc/biffinputstream.hxx | 2
sc/source/filter/inc/workbookhelper.hxx | 4
sc/source/filter/oox/biffinputstream.cxx | 9 -
sc/source/filter/oox/formulaparser.cxx | 20 ++--
sc/source/filter/oox/stylesbuffer.cxx | 2
sc/source/filter/oox/workbookhelper.cxx | 12 +-
sc/source/filter/xml/xmlcelli.cxx | 8 -
sc/source/filter/xml/xmlimprt.cxx | 6 -
sc/source/filter/xml/xmlimprt.hxx | 2
sc/source/filter/xml/xmltabi.cxx | 2
sc/source/ui/attrdlg/scdlgfact.cxx | 12 +-
sc/source/ui/attrdlg/scdlgfact.hxx | 7 -
sc/source/ui/formdlg/formula.cxx | 2
sc/source/ui/inc/cbutton.hxx | 4
sc/source/ui/inc/navipi.hxx | 2
sc/source/ui/inc/viewfunc.hxx | 2
sc/source/ui/navipi/scenwnd.cxx | 8 -
sc/source/ui/undo/undoblk.cxx | 2
sc/source/ui/unoobj/celllistsource.cxx | 8 -
sc/source/ui/unoobj/celllistsource.hxx | 3
sc/source/ui/unoobj/cellsuno.cxx | 10 +-
sc/source/ui/unoobj/docuno.cxx | 4
sc/source/ui/unoobj/filtuno.cxx | 6 -
sc/source/ui/vba/excelvbahelper.cxx | 2
sc/source/ui/view/cellsh1.cxx | 2
sc/source/ui/view/cellsh2.cxx | 2
sc/source/ui/view/gridwin4.cxx | 2
sc/source/ui/view/viewfun3.cxx | 4
sc/source/ui/view/viewfun5.cxx | 5 -
sd/inc/sdabstdlg.hxx | 24 ++---
sd/inc/sdmod.hxx | 2
sd/source/filter/eppt/epptbase.hxx | 2
sd/source/filter/eppt/pptx-epptbase.cxx | 15 +--
sd/source/filter/eppt/pptx-epptooxml.cxx | 10 +-
sd/source/ui/app/sdmod1.cxx | 8 -
sd/source/ui/dlg/dlgass.cxx | 6 -
sd/source/ui/dlg/sddlgfact.cxx | 48 +++++-----
sd/source/ui/dlg/sddlgfact.hxx | 24 ++---
sd/source/ui/framework/module/ToolBarModule.cxx | 2
sd/source/ui/func/fuchar.cxx | 2
sd/source/ui/func/fucopy.cxx | 2
sd/source/ui/func/fucushow.cxx | 2
sd/source/ui/func/fuinsfil.cxx | 4
sd/source/ui/func/fuoaprms.cxx | 2
sd/source/ui/func/fuolbull.cxx | 2
sd/source/ui/func/fupage.cxx | 2
sd/source/ui/func/fuparagr.cxx | 2
sd/source/ui/func/fusnapln.cxx | 2
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/inc/ToolBarManager.hxx | 4
sd/source/ui/slideshow/showwin.cxx | 6 -
sd/source/ui/slideshow/showwindow.hxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 3
sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx | 6 -
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 2
sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx | 5 -
sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx | 2
sd/source/ui/slidesorter/cache/SlsPageCache.cxx | 2
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 2
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 6 -
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx | 5 -
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx | 1
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 18 ---
sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 5 -
sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx | 4
sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx | 8 -
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 2
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 3
sd/source/ui/slidesorter/view/SlsLayouter.cxx | 3
sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx | 9 -
sd/source/ui/view/ToolBarManager.cxx | 4
sd/source/ui/view/drviews2.cxx | 6 -
svx/source/sdr/contact/viewcontactofe3dscene.cxx | 2
svx/source/sdr/contact/viewcontactofgraphic.cxx | 2
svx/source/sdr/contact/viewcontactofunocontrol.cxx | 2
svx/source/sdr/contact/viewcontactofvirtobj.cxx | 2
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx | 1
svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx | 1
svx/source/table/viewcontactoftableobj.cxx | 1
sw/source/uibase/docvw/SidebarWin.cxx | 2
toolkit/source/controls/controlmodelcontainerbase.cxx | 2
toolkit/source/controls/dialogcontrol.cxx | 2
toolkit/source/controls/unocontrol.cxx | 9 -
toolkit/source/controls/unocontrolbase.cxx | 10 +-
tools/source/fsys/urlobj.cxx | 7 -
tools/source/ref/pstm.cxx | 29 +-----
129 files changed, 312 insertions(+), 430 deletions(-)
New commits:
commit 3915ffc46fc063fa1f9be68c29a4157984f1bdb3
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 10 09:51:51 2016 +0200
loplugin:constantparam in tools
Change-Id: Ibd093ba4e8140ed3fda87ef340280433302f82a5
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 6ff1450..bdccdb4 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -107,8 +107,8 @@ namespace
_rURL.Name = _rParser.GetName ( );
}
- _rURL.Arguments = _rParser.GetParam ( INetURLObject::NO_DECODE );
- _rURL.Mark = _rParser.GetMark ( INetURLObject::DECODE_WITH_CHARSET );
+ _rURL.Arguments = _rParser.GetParam();
+ _rURL.Mark = _rParser.GetMark( INetURLObject::DECODE_WITH_CHARSET );
// INetURLObject supports only an intelligent method of parsing URL's. So write
// back Complete to have a valid encoded URL in all cases!
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index ab75416..ffbaac1 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -158,7 +158,7 @@ public:
Index nStartIdx = 1 );
virtual ~SvPersistStream();
- void SetStream( SvStream * pStream );
+ void ClearStream();
SvPersistBase * GetObject( Index nIdx ) const;
Index GetIndex( SvPersistBase * ) const;
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index b127150..ac18bf1 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -731,10 +731,9 @@ public:
inline bool HasParam() const { return m_aQuery.isPresent(); }
- inline OUString GetParam(DecodeMechanism eMechanism = DECODE_TO_IURI,
- rtl_TextEncoding eCharset
+ inline OUString GetParam(rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
- { return decode(m_aQuery, eMechanism, eCharset); }
+ { return decode(m_aQuery, NO_DECODE, eCharset); }
inline bool SetParam(OUString const & rTheQuery,
EncodeMechanism eMechanism = WAS_ENCODED,
@@ -800,8 +799,7 @@ public:
// POP3 and URLs:
- static OUString GetMsgId(DecodeMechanism eMechanism = DECODE_TO_IURI,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
+ static OUString GetMsgId(rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
// Coding:
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 1756bff..e8b0260 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -3656,8 +3656,8 @@ bool INetURLObject::operator ==(INetURLObject const & rObject) const
rObject.GetHost(NO_DECODE))
|| GetPort() != rObject.GetPort()
|| HasParam() != rObject.HasParam()
- || GetParam(NO_DECODE) != rObject.GetParam(NO_DECODE)
- || GetMsgId(NO_DECODE) != INetURLObject::GetMsgId(NO_DECODE))
+ || GetParam() != rObject.GetParam()
+ || GetMsgId() != INetURLObject::GetMsgId(NO_DECODE))
return false;
OUString aPath1(GetURLPath(NO_DECODE));
OUString aPath2(rObject.GetURLPath(NO_DECODE));
@@ -4528,8 +4528,7 @@ OUString INetURLObject::getFSysPath(FSysStyle eStyle,
}
}
-OUString INetURLObject::GetMsgId(DecodeMechanism,
- rtl_TextEncoding)
+OUString INetURLObject::GetMsgId(rtl_TextEncoding)
{
return OUString();
}
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index 47dc22e..6c10aaa 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -70,33 +70,16 @@ SvPersistStream::SvPersistStream( SvClassManager & rMgr, SvStream * pStream, Ind
SvPersistStream::~SvPersistStream()
{
- SetStream( nullptr );
+ ClearStream();
}
-/**
-
- @param pStream This stream is used as the medium for PersistStream
-
- @warning pStream is used as the medium for PersistStream.
- It must not be manipulated while used in SvPersistStream.
- An Exception to this is pvStream (cf. <SvPersistStream::SetStream>).
-*/
-void SvPersistStream::SetStream( SvStream * pStream )
+void SvPersistStream::ClearStream()
{
- if( pStm != pStream )
- {
- if( pStm )
- {
- SyncSysStream();
- pStm->SetError( GetError() );
- }
- pStm = pStream;
- }
- if( pStm )
+ if( pStm != nullptr )
{
- SetVersion( pStm->GetVersion() );
- SetError( pStm->GetError() );
- SyncSvStream( pStm->Tell() );
+ SyncSysStream();
+ pStm->SetError( GetError() );
+ pStm = nullptr;
}
}
commit 4358dc795cbd2b49aa87c89795cf63413b82400c
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 9 15:43:41 2016 +0200
loplugin:constantparam in sc
Change-Id: Ia7bc394fdc0dba720751c2a58d55bfe34b239098
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index be3df61..d734358 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -191,7 +191,7 @@ private:
DECL_LINK_TYPED( ValueListenerHdl, const SfxHint&, void );
private:
- void PaintRanges_Impl( sal_uInt16 nPart );
+ void PaintGridRanges_Impl();
ScRangeListRef GetLimitedChartRanges_Impl( long nDataColumns, long nDataRows ) const;
void ForceChartListener_Impl();
ScMemChart* CreateMemChart_Impl() const;
diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index 1161ecf..e95c036 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -171,10 +171,9 @@ public:
A nStart, A nEnd, const D& rValueToAnd );
/** Return the last row where an entry meets the condition:
- ((aValue & rBitMask) != 0), start searching at nStart. If no entry
+ ((aValue & rBitMask) != 0), start searching at 0. If no entry
meets this condition, ::std::numeric_limits<A>::max() is returned. */
- A GetLastAnyBitAccess( A nStart,
- const D& rBitMask ) const;
+ A GetLastAnyBitAccess( const D& rBitMask ) const;
};
template< typename A, typename D >
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 6dc18f6..f0ac91e 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -130,7 +130,7 @@ public:
void UpdateAllRowHeights();
void BeforeXMLLoading();
- void AfterXMLLoading(bool bRet);
+ void AfterXMLLoading();
ScSheetSaveData* GetSheetSaveData();
void RepaintRange( const ScRange& rRange );
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9216dbe..c515d5b 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -326,11 +326,11 @@ class ScAbstractDialogFactory
public:
SC_DLLPUBLIC static ScAbstractDialogFactory* Create();
- virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatName,
+ virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( const OUString& aDatName,
SvStream* pInStream,
ScImportAsciiCall eCall) = 0;
- virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(vcl::Window* pParent) = 0;
+ virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg() = 0;
virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg(vcl::Window* pParent,
ScAutoFormat* pAutoFormat,
@@ -454,8 +454,7 @@ public:
const Color& rDefaultColor, //Currently selected Color
const OString& ) = 0;
- virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( vcl::Window* pParent,
- bool bAscii = true,
+ virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( bool bAscii = true,
const ScImportOptions* pOptions = nullptr,
const OUString* pStrTitle = nullptr,
bool bMultiByte = false,
diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx
index 3a2d128..4e64a53 100644
--- a/sc/inc/segmenttree.hxx
+++ b/sc/inc/segmenttree.hxx
@@ -73,7 +73,7 @@ public:
void removeSegment(SCROW nRow1, SCROW nRow2);
void insertSegment(SCROW nRow, SCROW nSize, bool bSkipStartBoundary);
- SCROW findLastNotOf(bool bValue) const;
+ SCROW findLastNotOf() const;
private:
::std::unique_ptr<ScFlatBoolSegmentsImpl> mpImpl;
diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx
index d79643d..9f1e647 100644
--- a/sc/source/core/data/compressedarray.cxx
+++ b/sc/source/core/data/compressedarray.cxx
@@ -386,8 +386,7 @@ void ScBitMaskCompressedArray<A,D>::CopyFromAnded(
}
template< typename A, typename D >
-A ScBitMaskCompressedArray<A,D>::GetLastAnyBitAccess( A nStart,
- const D& rBitMask ) const
+A ScBitMaskCompressedArray<A,D>::GetLastAnyBitAccess( const D& rBitMask ) const
{
A nEnd = ::std::numeric_limits<A>::max();
size_t nIndex = this->nCount-1;
@@ -403,7 +402,7 @@ A ScBitMaskCompressedArray<A,D>::GetLastAnyBitAccess( A nStart,
if (nIndex > 0)
{
--nIndex;
- if (this->pData[nIndex].nEnd < nStart)
+ if (this->pData[nIndex].nEnd < 0)
break; // while
}
else
diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx
index 344464c..288a8dc 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -378,9 +378,9 @@ void ScFlatBoolRowSegments::insertSegment(SCROW nRow, SCROW nSize, bool bSkipSta
mpImpl->insertSegment(static_cast<SCCOLROW>(nRow), static_cast<SCCOLROW>(nSize), bSkipStartBoundary);
}
-SCROW ScFlatBoolRowSegments::findLastNotOf(bool bValue) const
+SCROW ScFlatBoolRowSegments::findLastNotOf() const
{
- return static_cast<SCROW>(mpImpl->findLastNotOf(bValue));
+ return static_cast<SCROW>(mpImpl->findLastNotOf(false));
}
ScFlatBoolColSegments::ScFlatBoolColSegments() :
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 9eb910f..fd3d02c 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3263,7 +3263,7 @@ SCROW ScTable::GetLastFlaggedRow() const
SCROW nLastFound = 0;
if (pRowFlags)
{
- SCROW nRow = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<sal_uInt8>(CR_ALL) );
+ SCROW nRow = pRowFlags->GetLastAnyBitAccess( sal::static_int_cast<sal_uInt8>(CR_ALL) );
if (ValidRow(nRow))
nLastFound = nRow;
}
@@ -3273,14 +3273,14 @@ SCROW ScTable::GetLastFlaggedRow() const
if (mpHiddenRows)
{
- SCROW nRow = mpHiddenRows->findLastNotOf(false);
+ SCROW nRow = mpHiddenRows->findLastNotOf();
if (ValidRow(nRow))
nLastFound = ::std::max(nLastFound, nRow);
}
if (mpFilteredRows)
{
- SCROW nRow = mpFilteredRows->findLastNotOf(false);
+ SCROW nRow = mpFilteredRows->findLastNotOf();
if (ValidRow(nRow))
nLastFound = ::std::max(nLastFound, nRow);
}
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index d372e8a..29ac7a0 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -331,7 +331,7 @@ private:
// XclExpScToken: pass-by-value and return-by-value is intended
const FormulaToken* GetNextRawToken();
- const FormulaToken* PeekNextRawToken( bool bSkipSpaces ) const;
+ const FormulaToken* PeekNextRawToken() const;
bool GetNextToken( XclExpScToken& rTokData );
XclExpScToken GetNextToken();
@@ -796,7 +796,7 @@ const FormulaToken* XclExpFmlaCompImpl::GetNextRawToken()
return pScToken;
}
-const FormulaToken* XclExpFmlaCompImpl::PeekNextRawToken( bool bSkipSpaces ) const
+const FormulaToken* XclExpFmlaCompImpl::PeekNextRawToken() const
{
/* Returns pointer to next raw token in the token array. The token array
iterator already points to the next token (A call to GetNextToken()
@@ -805,7 +805,7 @@ const FormulaToken* XclExpFmlaCompImpl::PeekNextRawToken( bool bSkipSpaces ) con
created and set to the passed skip-spaces mode. If spaces have to be
skipped, and the iterator currently points to a space token, the
constructor will move it to the next non-space token. */
- XclTokenArrayIterator aTempIt( mxData->maTokArrIt, bSkipSpaces );
+ XclTokenArrayIterator aTempIt( mxData->maTokArrIt, true/*bSkipSpaces*/ );
return aTempIt.Get();
}
@@ -1252,7 +1252,7 @@ void XclExpFmlaCompImpl::ProcessExternal( const XclExpScToken& rTokData )
names and for external/invalid function calls. This function looks for
the next token in the token array. If it is an opening parenthesis, the
token is processed as external function call, otherwise as undefined name. */
- const FormulaToken* pNextScToken = PeekNextRawToken( true );
+ const FormulaToken* pNextScToken = PeekNextRawToken();
if( !pNextScToken || (pNextScToken->GetOpCode() != ocOpen) )
AppendMissingNameToken( rTokData.mpScToken->GetExternal(), rTokData.mnSpaces );
else
diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx
index 37f64e6..997b563 100644
--- a/sc/source/filter/inc/biffinputstream.hxx
+++ b/sc/source/filter/inc/biffinputstream.hxx
@@ -277,7 +277,7 @@ private:
/** Initializes all members after base stream has been sought to new record. */
void setupRecord();
/** Restarts the current record from the beginning. */
- void restartRecord( bool bInvalidateRecSize );
+ void restartRecord();
/** Sets stream pointer before specified record and invalidates stream. */
void rewindToRecord( sal_Int64 nRecHandle );
/** Returns true, if stream was able to start a valid record. */
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index 91c544b..c314bf5 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -169,9 +169,9 @@ public:
getCellRangeFromDoc(
const css::table::CellRangeAddress& rRange ) const;
- /** Returns the cell or page styles container from the Calc document. */
+ /** Returns the cell styles container from the Calc document. */
css::uno::Reference< css::container::XNameContainer >
- getStyleFamily( bool bPageStyles ) const;
+ getCellStyleFamily() const;
/** Returns the specified cell or page style from the Calc document. */
css::uno::Reference< css::style::XStyle >
getStyleObject( const OUString& rStyleName, bool bPageStyle ) const;
diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx
index 1619d2a..c9840ba 100644
--- a/sc/source/filter/oox/biffinputstream.cxx
+++ b/sc/source/filter/oox/biffinputstream.cxx
@@ -247,7 +247,7 @@ void BiffInputStream::seek( sal_Int64 nRecPos )
if( isInRecord() )
{
if( mbEof || (nRecPos < tell()) )
- restartRecord( false );
+ restartRecord();
if( !mbEof && (nRecPos > tell()) )
skip( static_cast< sal_Int32 >( nRecPos - tell() ) );
}
@@ -389,17 +389,12 @@ void BiffInputStream::setupRecord()
enableDecoder();
}
-void BiffInputStream::restartRecord( bool bInvalidateRecSize )
+void BiffInputStream::restartRecord()
{
if( isInRecord() )
{
maRecBuffer.startRecord( getRecHandle() );
mnCurrRecSize = maRecBuffer.getRecSize();
- if( bInvalidateRecSize )
- {
- mnComplRecSize = mnCurrRecSize;
- mbHasComplRec = !mbCont;
- }
mbEof = false;
}
}
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 7b899f4..32588ca 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -471,7 +471,7 @@ protected:
void pushOperandSize( size_t nSize );
size_t popOperandSize();
- ApiToken& getOperandToken( size_t nOpCountFromEnd, size_t nOpIndex, size_t nTokenIndex );
+ ApiToken& getOperandToken( size_t nOpIndex, size_t nTokenIndex );
bool pushOperandToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr );
bool pushAnyOperandToken( const Any& rAny, sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr );
@@ -480,7 +480,7 @@ protected:
template< typename Type >
inline bool pushValueOperandToken( const Type& rValue )
{ return pushValueOperandToken( rValue, OPCODE_PUSH, nullptr ); }
- bool pushParenthesesOperandToken( const WhiteSpaceVec* pOpeningSpaces = nullptr, const WhiteSpaceVec* pClosingSpaces = nullptr );
+ bool pushParenthesesOperandToken( const WhiteSpaceVec* pClosingSpaces = nullptr );
bool pushUnaryPreOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr );
bool pushUnaryPostOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr );
bool pushBinaryOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr );
@@ -747,13 +747,13 @@ size_t FormulaParserImpl::popOperandSize()
return nOpSize;
}
-ApiToken& FormulaParserImpl::getOperandToken( size_t nOpCountFromEnd, size_t nOpIndex, size_t nTokenIndex )
+ApiToken& FormulaParserImpl::getOperandToken( size_t nOpIndex, size_t nTokenIndex )
{
SAL_WARN_IF(
- getOperandSize( nOpCountFromEnd, nOpIndex ) <= nTokenIndex, "sc.filter",
+ getOperandSize( 1, nOpIndex ) <= nTokenIndex, "sc.filter",
"FormulaParserImpl::getOperandToken - invalid parameters" );
SizeTypeVector::const_iterator aIndexIt = maTokenIndexes.end();
- for( SizeTypeVector::const_iterator aEnd = maOperandSizeStack.end(), aIt = aEnd - nOpCountFromEnd + nOpIndex; aIt != aEnd; ++aIt )
+ for( SizeTypeVector::const_iterator aEnd = maOperandSizeStack.end(), aIt = aEnd - 1 + nOpIndex; aIt != aEnd; ++aIt )
aIndexIt -= *aIt;
return maTokenStorage[ *(aIndexIt + nTokenIndex) ];
}
@@ -783,9 +783,9 @@ bool FormulaParserImpl::pushValueOperandToken( const Type& rValue, sal_Int32 nOp
return true;
}
-bool FormulaParserImpl::pushParenthesesOperandToken( const WhiteSpaceVec* pOpeningSpaces, const WhiteSpaceVec* pClosingSpaces )
+bool FormulaParserImpl::pushParenthesesOperandToken( const WhiteSpaceVec* pClosingSpaces )
{
- size_t nSpacesSize = appendWhiteSpaceTokens( pOpeningSpaces );
+ size_t nSpacesSize = appendWhiteSpaceTokens( nullptr );
appendRawToken( OPCODE_OPEN );
nSpacesSize += appendWhiteSpaceTokens( pClosingSpaces );
appendRawToken( OPCODE_CLOSE );
@@ -861,7 +861,7 @@ bool FormulaParserImpl::pushFunctionOperatorToken( sal_Int32 nOpCode, size_t nPa
// add function parentheses and function name
return bOk &&
- ((nParamCount > 0) ? pushParenthesesOperatorToken( nullptr, pClosingSpaces ) : pushParenthesesOperandToken( nullptr, pClosingSpaces )) &&
+ ((nParamCount > 0) ? pushParenthesesOperatorToken( nullptr, pClosingSpaces ) : pushParenthesesOperandToken( pClosingSpaces )) &&
pushUnaryPreOperatorToken( nOpCode, pLeadingSpaces );
}
@@ -872,10 +872,10 @@ bool FormulaParserImpl::pushFunctionOperatorToken( const FunctionInfo& rFuncInfo
{
// create an external add-in call for the passed built-in function
if( (rFuncInfo.mnApiOpCode == OPCODE_EXTERNAL) && !rFuncInfo.maExtProgName.isEmpty() )
- getOperandToken( 1, 0, 0 ).Data <<= rFuncInfo.maExtProgName;
+ getOperandToken( 0, 0 ).Data <<= rFuncInfo.maExtProgName;
// create a bad token with unsupported function name
else if( (rFuncInfo.mnApiOpCode == OPCODE_BAD) && !rFuncInfo.maOoxFuncName.isEmpty() )
- getOperandToken( 1, 0, 0 ).Data <<= rFuncInfo.maOoxFuncName;
+ getOperandToken( 0, 0 ).Data <<= rFuncInfo.maOoxFuncName;
}
return bOk;
}
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 5756f2f..009e5c9 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2707,7 +2707,7 @@ void CellStyleBuffer::finalizeImport()
try
{
// unfortunately, com.sun.star.style.StyleFamily does not implement XEnumerationAccess...
- Reference< XIndexAccess > xStyleFamilyIA( getStyleFamily( false ), UNO_QUERY_THROW );
+ Reference< XIndexAccess > xStyleFamilyIA( getCellStyleFamily(), UNO_QUERY_THROW );
for( sal_Int32 nIndex = 0, nCount = xStyleFamilyIA->getCount(); nIndex < nCount; ++nIndex )
{
Reference< XStyle > xStyle( xStyleFamilyIA->getByIndex( nIndex ), UNO_QUERY_THROW );
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index c21e471..05d904d 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -232,7 +232,7 @@ public:
private:
/** Initializes some basic members and sets needed document properties. */
- void initialize( bool bWorkbookFile );
+ void initialize();
/** Finalizes the filter process (sets some needed document properties). */
void finalize();
@@ -322,7 +322,7 @@ WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) :
{
// register at the filter, needed for virtual callbacks (even during construction)
mrExcelFilter.registerWorkbookGlobals( *this );
- initialize( true );
+ initialize();
}
WorkbookGlobals::~WorkbookGlobals()
@@ -528,14 +528,14 @@ void WorkbookGlobals::useInternalChartDataTable( bool bInternal )
// private --------------------------------------------------------------------
-void WorkbookGlobals::initialize( bool bWorkbookFile )
+void WorkbookGlobals::initialize()
{
maCellStyles = "CellStyles";
maPageStyles = "PageStyles";
maCellStyleServ = "com.sun.star.style.CellStyle";
maPageStyleServ = "com.sun.star.style.PageStyle";
mnCurrSheet = -1;
- mbWorkbook = bWorkbookFile;
+ mbWorkbook = true;
meTextEnc = osl_getThreadTextEncoding();
mbHasCodePage = false;
@@ -827,9 +827,9 @@ Reference< XCellRange > WorkbookHelper::getCellRangeFromDoc( const CellRangeAddr
return xRange;
}
-Reference< XNameContainer > WorkbookHelper::getStyleFamily( bool bPageStyles ) const
+Reference< XNameContainer > WorkbookHelper::getCellStyleFamily() const
{
- return mrBookGlob.getStyleFamily( bPageStyles );
+ return mrBookGlob.getStyleFamily( false/*bPageStyles*/ );
}
Reference< XStyle > WorkbookHelper::getStyleObject( const OUString& rStyleName, bool bPageStyle ) const
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index d64d204..6fbad6d 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -738,7 +738,7 @@ SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPr
if (pContext)
{
bIsEmpty = false;
- rXMLImport.ProgressBarIncrement(false);
+ rXMLImport.ProgressBarIncrement();
}
}
}
@@ -1138,7 +1138,7 @@ void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos,
// Formatted text that is put into the cell by the child context
// is handled in AddCellsToTable() (bIsEmpty is true then).
if (bDoIncrement)
- rXMLImport.ProgressBarIncrement(false);
+ rXMLImport.ProgressBarIncrement();
}
void ScXMLTableRowCellContext::PutValueCell( const ScAddress& rCurrentPos )
@@ -1169,7 +1169,7 @@ void ScXMLTableRowCellContext::PutValueCell( const ScAddress& rCurrentPos )
rXMLImport.GetDoc().setNumericCell(rCurrentPos, fValue);
}
- rXMLImport.ProgressBarIncrement(false);
+ rXMLImport.ProgressBarIncrement();
}
namespace {
@@ -1464,7 +1464,7 @@ void ScXMLTableRowCellContext::AddFormulaCell( const ScAddress& rCellPos )
SetAnnotation( rCellPos );
SetDetectiveObj( rCellPos );
SetCellRangeSource( rCellPos );
- rXMLImport.ProgressBarIncrement(false);
+ rXMLImport.ProgressBarIncrement();
}
else
{
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index e256492..eb22e90 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3266,7 +3266,7 @@ void SAL_CALL ScXMLImport::endDocument()
SvXMLImport::endDocument();
if(pDoc && bSelfImportingXMLSet)
- ScModelObj::getImplementation(GetModel())->AfterXMLLoading(true);
+ ScModelObj::getImplementation(GetModel())->AfterXMLLoading();
}
// XEventListener
@@ -3339,10 +3339,10 @@ void ScXMLImport::SetRangeOverflowType(sal_uInt32 nType)
pDoc->SetRangeOverflowType( nType );
}
-void ScXMLImport::ProgressBarIncrement(bool bEditCell)
+void ScXMLImport::ProgressBarIncrement()
{
nProgressCount++;
- if (bEditCell || nProgressCount > 100)
+ if (nProgressCount > 100)
{
GetProgressBarHelper()->Increment(nProgressCount);
nProgressCount = 0;
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 04ff141..395c0e8 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -1149,7 +1149,7 @@ public:
const sal_Int16 nCellType,
const OUString& rCurrency);
- void ProgressBarIncrement(bool bEditCell);
+ void ProgressBarIncrement();
void SetNewCondFormatData() { mbHasNewCondFormatData = true; }
bool HasNewCondFormatData() { return mbHasNewCondFormatData; }
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index e0a18c8..5747f22 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -408,7 +408,7 @@ void ScXMLTableContext::EndElement()
}
rTables.DeleteTable();
- rImport.ProgressBarIncrement(false);
+ rImport.ProgressBarIncrement();
// store stream positions
if (!pExternalRefInfo.get() && nStartOffset >= 0 /* && nEndOffset >= 0 */)
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 02394b19..a778894 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -593,16 +593,16 @@ bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const
}
// =========================Factories for createdialog ===================
-AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( vcl::Window* pParent, const OUString& aDatName,
+AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( const OUString& aDatName,
SvStream* pInStream, ScImportAsciiCall eCall )
{
- VclPtr<ScImportAsciiDlg> pDlg = VclPtr<ScImportAsciiDlg>::Create( pParent, aDatName,pInStream, eCall );
+ VclPtr<ScImportAsciiDlg> pDlg = VclPtr<ScImportAsciiDlg>::Create( nullptr, aDatName,pInStream, eCall );
return new AbstractScImportAsciiDlg_Impl( pDlg );
}
-AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg(vcl::Window* pParent)
+AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg()
{
- VclPtr<ScTextImportOptionsDlg> pDlg = VclPtr<ScTextImportOptionsDlg>::Create(pParent);
+ VclPtr<ScTextImportOptionsDlg> pDlg = VclPtr<ScTextImportOptionsDlg>::Create(nullptr);
return new AbstractScTextImportOptionsDlg_Impl(pDlg);
}
@@ -889,7 +889,7 @@ AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg(
return new AbstractScTabBgColorDlg_Impl( pDlg );
}
-AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( vcl::Window* pParent,
+AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg (
bool bAscii,
const ScImportOptions* pOptions,
const OUString* pStrTitle,
@@ -897,7 +897,7 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions
bool bOnlyDbtoolsEncodings,
bool bImport )
{
- VclPtr<ScImportOptionsDlg> pDlg = VclPtr<ScImportOptionsDlg>::Create( pParent, bAscii, pOptions,pStrTitle, bMultiByte,bOnlyDbtoolsEncodings, bImport );
+ VclPtr<ScImportOptionsDlg> pDlg = VclPtr<ScImportOptionsDlg>::Create( nullptr, bAscii, pOptions,pStrTitle, bMultiByte,bOnlyDbtoolsEncodings, bImport );
return new AbstractScImportOptionsDlg_Impl( pDlg );
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 0f9e1fe..9c45952 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -392,11 +392,11 @@ class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory
public:
virtual ~ScAbstractDialogFactory_Impl() {}
- virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatName,
+ virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( const OUString& aDatName,
SvStream* pInStream,
ScImportAsciiCall eCall) override;
- virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(vcl::Window* pParent) override;
+ virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg() override;
virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg(vcl::Window* pParent,
ScAutoFormat* pAutoFormat,
@@ -520,8 +520,7 @@ public:
const Color& rDefaultColor, //Currently selected Color
const OString& sHelpId ) override;
- virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( vcl::Window* pParent,
- bool bAscii = true,
+ virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( bool bAscii = true,
const ScImportOptions* pOptions = nullptr,
const OUString* pStrTitle = nullptr,
bool bMultiByte = false,
diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx
index a78d71e..4b6aaaed 100644
--- a/sc/source/ui/inc/cbutton.hxx
+++ b/sc/source/ui/inc/cbutton.hxx
@@ -37,8 +37,8 @@ public:
void Draw( const Point& rAt,
const Size& rSize,
bool bState );
- void Draw( bool bState )
- { Draw( aBtnPos, aBtnSize, bState ); }
+ void Draw()
+ { Draw( aBtnPos, aBtnSize, false ); }
void SetOptSizePixel();
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index b6b6152..6a91afd 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -83,7 +83,7 @@ private:
void ExecuteScenarioSlot( sal_uInt16 nSlotId );
void SelectScenario();
void EditScenario();
- void DeleteScenario( bool bQueryBox );
+ void DeleteScenario();
private:
ScScenarioWindow& mrParent;
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 2644952..3e837fe 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -97,7 +97,7 @@ public:
void EnterDataAtCursor( const OUString& rString ); //! Not used?
- SC_DLLPUBLIC void CutToClip( ScDocument* pClipDoc = nullptr, bool bIncludeObjects = false );
+ SC_DLLPUBLIC void CutToClip( bool bIncludeObjects = false );
SC_DLLPUBLIC bool CopyToClip( ScDocument* pClipDoc = nullptr, bool bCut = false, bool bApi = false,
bool bIncludeObjects = false, bool bStopEdit = true );
SC_DLLPUBLIC bool CopyToClip( ScDocument* pClipDoc, const ScRangeList& rRange, bool bCut = false,
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 501c2c1..cd3d248 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -121,7 +121,7 @@ bool ScScenarioListBox::Notify( NotifyEvent& rNEvt )
bHandled = true;
break;
case KEY_DELETE:
- DeleteScenario( true );
+ DeleteScenario();
bHandled = true;
break;
}
@@ -142,7 +142,7 @@ bool ScScenarioListBox::Notify( NotifyEvent& rNEvt )
switch( aPopup.GetSelected() )
{
case RID_NAVIPI_SCENARIO_DELETE:
- DeleteScenario( true );
+ DeleteScenario();
break;
case RID_NAVIPI_SCENARIO_EDIT:
EditScenario();
@@ -185,10 +185,10 @@ void ScScenarioListBox::EditScenario()
ExecuteScenarioSlot( SID_EDIT_SCENARIO );
}
-void ScScenarioListBox::DeleteScenario( bool bQueryBox )
+void ScScenarioListBox::DeleteScenario()
{
if( GetSelectEntryCount() > 0 )
- if( !bQueryBox || (ScopedVclPtr<QueryBox>::Create( nullptr, WinBits( WB_YES_NO | WB_DEF_YES ), ScGlobal::GetRscString( STR_QUERY_DELSCENARIO ) )->Execute() == RET_YES) )
+ if( ScopedVclPtr<QueryBox>::Create( nullptr, WinBits( WB_YES_NO | WB_DEF_YES ), ScGlobal::GetRscString( STR_QUERY_DELSCENARIO ) )->Execute() == RET_YES )
ExecuteScenarioSlot( SID_DELETE_SCENARIO );
}
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 9d5b047..c81cd3b 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -816,7 +816,7 @@ void ScUndoCut::Redo()
void ScUndoCut::Repeat(SfxRepeatTarget& rTarget)
{
if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr)
- static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->CutToClip( nullptr, true );
+ static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->CutToClip( true );
}
bool ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx
index d722268..f6908f2 100644
--- a/sc/source/ui/unoobj/celllistsource.cxx
+++ b/sc/source/ui/unoobj/celllistsource.cxx
@@ -162,12 +162,12 @@ namespace calc
return aAddress;
}
- OUString OCellListSource::getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow )
+ OUString OCellListSource::getCellTextContent_noCheck( sal_Int32 _nRangeRelativeRow )
{
OSL_PRECOND( m_xRange.is(), "OCellListSource::getRangeAddress: invalid range!" );
Reference< XTextRange > xCellText;
if ( m_xRange.is() )
- xCellText.set(m_xRange->getCellByPosition( _nRangeRelativeColumn, _nRangeRelativeRow ), css::uno::UNO_QUERY);
+ xCellText.set(m_xRange->getCellByPosition( 0, _nRangeRelativeRow ), css::uno::UNO_QUERY);
OUString sText;
if ( xCellText.is() )
@@ -194,7 +194,7 @@ namespace calc
if ( _nPosition >= getListEntryCount() )
throw IndexOutOfBoundsException();
- return getCellTextContent_noCheck( 0, _nPosition );
+ return getCellTextContent_noCheck( _nPosition );
}
Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException, std::exception)
@@ -207,7 +207,7 @@ namespace calc
OUString* pAllEntries = aAllEntries.getArray();
for ( sal_Int32 i = 0; i < aAllEntries.getLength(); ++i )
{
- *pAllEntries++ = getCellTextContent_noCheck( 0, i );
+ *pAllEntries++ = getCellTextContent_noCheck( i );
}
return aAllEntries;
diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx
index ceb2e15..2cc076b 100644
--- a/sc/source/ui/unoobj/celllistsource.hxx
+++ b/sc/source/ui/unoobj/celllistsource.hxx
@@ -128,8 +128,6 @@ namespace calc
getRangeAddress( ) const;
/** retrievs the text of a cell within our range
- @param _nRangeRelativeColumn
- the relative column index of the cell within our range
@param _nRangeRelativeRow
the relative row index of the cell within our range
@precond
@@ -137,7 +135,6 @@ namespace calc
*/
OUString
getCellTextContent_noCheck(
- sal_Int32 _nRangeRelativeColumn,
sal_Int32 _nRangeRelativeRow
);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index df1de74..46bf00c 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1809,10 +1809,10 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellRangesBase::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-void ScCellRangesBase::PaintRanges_Impl( sal_uInt16 nPart )
+void ScCellRangesBase::PaintGridRanges_Impl( )
{
for (size_t i = 0, nCount = aRanges.size(); i < nCount; ++i)
- pDocShell->PostPaint( *aRanges[ i ], nPart );
+ pDocShell->PostPaint( *aRanges[ i ], PAINT_GRID );
}
// XSheetOperation
@@ -3174,7 +3174,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub
}
//! undo
- PaintRanges_Impl( PAINT_GRID );
+ PaintGridRanges_Impl();
pDocShell->SetDocumentModified();
ForceChartListener_Impl(); // call listeners for this object synchronously
bDone = true;
@@ -3244,7 +3244,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions(
}
//! undo
- PaintRanges_Impl( PAINT_GRID );
+ PaintGridRanges_Impl();
pDocShell->SetDocumentModified();
ForceChartListener_Impl(); // call listeners for this object synchronously
bDone = true;
@@ -3315,7 +3315,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions(
}
//! undo
- PaintRanges_Impl( PAINT_GRID );
+ PaintGridRanges_Impl();
pDocShell->SetDocumentModified();
ForceChartListener_Impl(); // call listeners for this object synchronously
bDone = true;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index cdb8682..1c51354 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -444,10 +444,10 @@ void ScModelObj::BeforeXMLLoading()
pDocShell->BeforeXMLLoading();
}
-void ScModelObj::AfterXMLLoading(bool bRet)
+void ScModelObj::AfterXMLLoading()
{
if (pDocShell)
- pDocShell->AfterXMLLoading(bRet);
+ pDocShell->AfterXMLLoading(true);
}
ScSheetSaveData* ScModelObj::GetSheetSaveData()
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index b1b289d..96f74ce 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -176,7 +176,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, st
if ( xInputStream.is() )
pInStream.reset(utl::UcbStreamHelper::CreateStream( xInputStream ));
- std::unique_ptr<AbstractScImportAsciiDlg> pDlg(pFact->CreateScImportAsciiDlg( nullptr, aPrivDatName, pInStream.get(), SC_IMPORTFILE));
+ std::unique_ptr<AbstractScImportAsciiDlg> pDlg(pFact->CreateScImportAsciiDlg( aPrivDatName, pInStream.get(), SC_IMPORTFILE));
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
{
@@ -195,7 +195,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, st
{
// HTML import.
std::unique_ptr<AbstractScTextImportOptionsDlg> pDlg(
- pFact->CreateScTextImportOptionsDlg(nullptr));
+ pFact->CreateScTextImportOptionsDlg());
if (pDlg->Execute() == RET_OK)
{
@@ -277,7 +277,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, st
ScImportOptions aOptions( cAsciiDel, cStrDel, eEncoding);
- std::unique_ptr<AbstractScImportOptionsDlg> pDlg(pFact->CreateScImportOptionsDlg(nullptr,
+ std::unique_ptr<AbstractScImportOptionsDlg> pDlg(pFact->CreateScImportOptionsDlg(
bAscii, &aOptions, &aTitle, bMultiByte, bDBEnc,
!bExport));
OSL_ENSURE(pDlg, "Dialog create fail!");
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index e6f583b..29ac7bc 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -177,7 +177,7 @@ implnCut( const uno::Reference< frame::XModel>& xModel )
ScTabViewShell* pViewShell = getBestViewShell( xModel );
if ( pViewShell )
{
- pViewShell->CutToClip( nullptr, true );
+ pViewShell->CutToClip( true );
// mark the copied transfer object so it is used in ScVbaRange::Insert
ScTransferObj* pClipObj = ScTransferObj::GetOwnClipboard( nullptr );
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 88a620b..b9fbf41 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1272,7 +1272,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
case SID_CUT: // for graphs in DrawShell
{
WaitObject aWait( GetViewData()->GetDialogParent() );
- pTabViewShell->CutToClip( nullptr, true );
+ pTabViewShell->CutToClip( true );
rReq.Done();
GetViewData()->SetPasteMode( (ScPasteFlags)(SC_PASTE_MODE | SC_PASTE_BORDER));
pTabViewShell->ShowCursor();
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 70c0af5..1ab82ab 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -977,7 +977,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE( pFact, "ScCellShell::ExecuteDB: SID_TEXT_TO_COLUMNS - pFact is null!" );
std::unique_ptr<AbstractScImportAsciiDlg> pDlg(pFact->CreateScImportAsciiDlg(
- nullptr, OUString(), &aStream, SC_TEXTTOCOLUMNS));
+ OUString(), &aStream, SC_TEXTTOCOLUMNS));
OSL_ENSURE( pDlg, "ScCellShell::ExecuteDB: SID_TEXT_TO_COLUMNS - pDlg is null!" );
if ( pDlg->Execute() == RET_OK )
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index c6f0a6c..e36bf90 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1450,7 +1450,7 @@ void ScGridWindow::DrawButtons(SCCOL nX1, SCCOL nX2, const ScTableInfo& rTabInfo
aComboButton.SetPosPixel( aRect.TopLeft() );
aComboButton.SetSizePixel( aRect.GetSize() );
pContentDev->SetClipRegion(vcl::Region(aRect));
- aComboButton.Draw( false );
+ aComboButton.Draw();
pContentDev->SetClipRegion(); // always called from Draw() without clip region
aComboButton.SetPosPixel( aOldPos ); // restore old state
aComboButton.SetSizePixel( aOldSize ); // for MouseUp/Down (AutoFilter)
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 77b0fad..24b91a9 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -75,7 +75,7 @@ using namespace com::sun::star;
// C U T
-void ScViewFunc::CutToClip( ScDocument* pClipDoc, bool bIncludeObjects )
+void ScViewFunc::CutToClip( bool bIncludeObjects )
{
UpdateInputLine();
@@ -104,7 +104,7 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, bool bIncludeObjects )
MarkDataChanged();
}
- CopyToClip( pClipDoc, true, false, bIncludeObjects ); // copy to clipboard
+ CopyToClip( nullptr, true, false, bIncludeObjects ); // copy to clipboard
ScAddress aOldEnd( aRange.aEnd ); // combined cells in this range?
pDoc->ExtendMerge( aRange, true );
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 260f4f8..bbd61e0 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -307,7 +307,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
// make sense to do it for other data types too.
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
std::unique_ptr<AbstractScTextImportOptionsDlg> pDlg(
- pFact->CreateScTextImportOptionsDlg(nullptr));
+ pFact->CreateScTextImportOptionsDlg());
if (pDlg->Execute() == RET_OK)
{
@@ -336,8 +336,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
std::unique_ptr<AbstractScImportAsciiDlg> pDlg(
- pFact->CreateScImportAsciiDlg( nullptr, OUString(), &aStrm,
- SC_PASTETEXT));
+ pFact->CreateScImportAsciiDlg( OUString(), &aStrm, SC_PASTETEXT));
if (pDlg->Execute() == RET_OK)
{
commit f946e905c6c6bb041ae580b14b711c6964af97bd
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 9 14:37:43 2016 +0200
loplugin:constantparam in sd
Change-Id: I7f5065c08f539ceefa4b8d3925b9c09e72b25a44
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 99dab1b..1c6195d 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -167,25 +167,25 @@ public:
static SdAbstractDialogFactory* Create();
virtual VclAbstractDialog* CreateBreakDlg(vcl::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0;
- virtual AbstractCopyDlg* CreateCopyDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) = 0;
- virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0;
- virtual SfxAbstractTabDialog* CreateSdTabCharDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0;
- virtual SfxAbstractTabDialog* CreateSdTabPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) = 0;
- virtual AbstractAssistentDlg* CreateAssistentDlg( vcl::Window* pParent, bool bAutoPilot) = 0;
+ virtual AbstractCopyDlg* CreateCopyDlg( const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) = 0;
+ virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( SdDrawDocument& rDrawDoc ) = 0;
+ virtual SfxAbstractTabDialog* CreateSdTabCharDialog( const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0;
+ virtual SfxAbstractTabDialog* CreateSdTabPageDialog( const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) = 0;
+ virtual AbstractAssistentDlg* CreateAssistentDlg( bool bAutoPilot) = 0;
virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0;
- virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0;
- virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) = 0;
- virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) = 0;
+ virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( const SfxItemSet& rInAttrs, ::sd::View* pView) = 0;
+ virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) = 0;
+ virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) = 0;
virtual AbstractMorphDlg* CreateMorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0;
- virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = nullptr ) = 0;
- virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr ) = 0;
+ virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( const SfxItemSet* pAttr, ::sd::View* pView = nullptr ) = 0;
+ virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( const SfxItemSet* pAttr ) = 0;
virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs,
const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) = 0;
virtual VclAbstractDialog* CreateRemoteDialog( vcl::Window* pWindow ) = 0;
virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SdResId& DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, vcl::Window* pWindow, const SfxItemSet& rInAttrs) = 0;
- virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0;
- virtual SfxAbstractDialog* CreatSdActionDialog( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0;
+ virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0;
+ virtual SfxAbstractDialog* CreatSdActionDialog( const SfxItemSet* pAttr, ::sd::View* pView ) = 0;
virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0;
virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( vcl::Window* pWindow, DocumentType eDocType) = 0;
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 27297e6..7293b65 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -151,7 +151,7 @@ private:
SfxFrame* ExecuteNewDocument( SfxRequest& rReq );
static void ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewFrame, const sal_Int32 eMedium );
- static SfxFrame* CreateEmptyDocument( DocumentType eDocType, const css::uno::Reference< css::frame::XFrame >& i_rFrame );
+ static SfxFrame* CreateEmptyDocument( const css::uno::Reference< css::frame::XFrame >& i_rFrame );
static SfxFrame* CreateFromTemplate( const OUString& rTemplatePath, const css::uno::Reference< css::frame::XFrame >& i_rFrame );
/** The resource container controls the lifetime of some singletons.
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index af0901f..a0dac14 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -380,7 +380,7 @@ protected:
css::awt::Point MapPoint( const css::awt::Point& );
Rectangle MapRectangle( const css::awt::Rectangle& );
- bool ContainsOtherShapeThanPlaceholders( bool bForOOMLX );
+ bool ContainsOtherShapeThanPlaceholders();
public:
PPTWriterBase();
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 3695252..b3c3bdb 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -971,7 +971,7 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection
return nPPTTransitionType;
}
-bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( bool bForOOMLX )
+bool PPTWriterBase::ContainsOtherShapeThanPlaceholders()
{
sal_uInt32 nShapes = mXShapes->getCount();
bool bOtherThanPlaceHolders = false;
@@ -981,16 +981,15 @@ bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( bool bForOOMLX )
{
if ( GetShapeByIndex( nIndex ) && mType != "drawing.Page" )
{
- if( bForOOMLX &&
- ( mType == "presentation.Page" ||
- mType == "presentation.Notes" ) ) {
+ if( mType == "presentation.Page" || mType == "presentation.Notes" )
+ {
Reference< XSimpleText > rXText( mXShape, UNO_QUERY );
- if( rXText.is() && !rXText->getString().isEmpty() )
+ if( rXText.is() && !rXText->getString().isEmpty() )
+ bOtherThanPlaceHolders = true;
+ }
+ else
bOtherThanPlaceHolders = true;
- }
- else
- bOtherThanPlaceHolders = true;
}
DBG(printf("mType == %s\n", mType.getStr()));
}
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 1e483ab..ad0c30f 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1597,7 +1597,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu
void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum )
{
- if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( true ) )
+ if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders() )
return;
DBG(printf("write Notes %" SAL_PRIuUINT32 "\n----------------\n", nPageNum));
@@ -2211,10 +2211,10 @@ bool PowerPointExport::ImplCreateDocument()
if ( !GetPageByIndex( i, NOTICE ) )
return false;
- if( ContainsOtherShapeThanPlaceholders( true ) ) {
- mbCreateNotes = true;
- break;
- }
+ if( ContainsOtherShapeThanPlaceholders() ) {
+ mbCreateNotes = true;
+ break;
+ }
}
return true;
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index e07f38b..45dfe09 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -546,13 +546,13 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
else
{
//create an empty document
- pFrame = CreateEmptyDocument( DOCUMENT_TYPE_IMPRESS, xTargetFrame );
+ pFrame = CreateEmptyDocument( xTargetFrame );
}
}
else
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr< AbstractAssistentDlg > pPilotDlg( pFact ? pFact->CreateAssistentDlg( nullptr, !bNewDocDirect ) : nullptr );
+ std::unique_ptr< AbstractAssistentDlg > pPilotDlg( pFact ? pFact->CreateAssistentDlg( !bNewDocDirect ) : nullptr );
// Open the Pilot
if( pPilotDlg.get() && pPilotDlg->Execute()==RET_OK )
@@ -711,13 +711,13 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
return pFrame;
}
-SfxFrame* SdModule::CreateEmptyDocument( DocumentType eDocType, const Reference< XFrame >& i_rFrame )
+SfxFrame* SdModule::CreateEmptyDocument( const Reference< XFrame >& i_rFrame )
{
SfxFrame* pFrame = nullptr;
SfxObjectShellLock xDocShell;
::sd::DrawDocShell* pNewDocSh;
- xDocShell = pNewDocSh = new ::sd::DrawDocShell(SfxObjectCreateMode::STANDARD,false,eDocType);
+ xDocShell = pNewDocSh = new ::sd::DrawDocShell(SfxObjectCreateMode::STANDARD,false,DOCUMENT_TYPE_IMPRESS);
pNewDocSh->DoInitNew();
SdDrawDocument* pDoc = pNewDocSh->GetDoc();
if (pDoc)
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index f4ba795..67dba1c 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -209,7 +209,7 @@ public:
static bool IsOwnFormat( const OUString& rPath );
// dlg status
- void EndDialog( long nResult = 0 );
+ void EndDialog();
void SetStartType( StartType eType );
StartType GetStartType();
@@ -689,7 +689,7 @@ void AssistentDlgImpl::CloseDocShell()
}
}
-void AssistentDlgImpl::EndDialog( long )
+void AssistentDlgImpl::EndDialog()
{
mpWindow = nullptr;
}
@@ -1778,7 +1778,7 @@ void AssistentDlg::FinishHdl()
}
// end
- mpImpl->EndDialog(RET_OK);
+ mpImpl->EndDialog();
EndDialog(RET_OK);
}
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 7dec856..08e9969 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -362,31 +362,31 @@ VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg(
}
AbstractCopyDlg * SdAbstractDialogFactory_Impl::CreateCopyDlg(
- vcl::Window* pWindow, const SfxItemSet& rInAttrs,
+ const SfxItemSet& rInAttrs,
const rtl::Reference<XColorList> &pColTab,
::sd::View* pView )
{
- return new AbstractCopyDlg_Impl( VclPtr< ::sd::CopyDlg>::Create( pWindow, rInAttrs, pColTab, pView ) );
+ return new AbstractCopyDlg_Impl( VclPtr< ::sd::CopyDlg>::Create( nullptr, rInAttrs, pColTab, pView ) );
}
-AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc )
+AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( SdDrawDocument& rDrawDoc )
{
- return new AbstractSdCustomShowDlg_Impl( VclPtr<SdCustomShowDlg>::Create( pWindow, rDrawDoc ) );
+ return new AbstractSdCustomShowDlg_Impl( VclPtr<SdCustomShowDlg>::Create( nullptr, rDrawDoc ) );
}
-SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell )
+SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( const SfxItemSet* pAttr, SfxObjectShell* pDocShell )
{
- return new SdAbstractTabDialog_Impl( VclPtr<SdCharDlg>::Create( pParent, pAttr, pDocShell ) );
+ return new SdAbstractTabDialog_Impl( VclPtr<SdCharDlg>::Create( nullptr, pAttr, pDocShell ) );
}
-SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage )
+SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage )
{
- return new SdAbstractTabDialog_Impl( VclPtr<SdPageDlg>::Create( pDocShell, pParent, pAttr, bAreaPage ) );
+ return new SdAbstractTabDialog_Impl( VclPtr<SdPageDlg>::Create( pDocShell, nullptr, pAttr, bAreaPage ) );
}
-AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( vcl::Window* pParent, bool bAutoPilot)
+AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( bool bAutoPilot)
{
- return new AbstractAssistentDlg_Impl( VclPtr<AssistentDlg>::Create( pParent, bAutoPilot ) );
+ return new AbstractAssistentDlg_Impl( VclPtr<AssistentDlg>::Create( nullptr, bAutoPilot ) );
}
AbstractSdModifyFieldDlg * SdAbstractDialogFactory_Impl::CreateSdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet )
@@ -394,19 +394,19 @@ AbstractSdModifyFieldDlg * SdAbstractDialogFactory_Impl::CreateSdModifyFieldDlg(
return new AbstractSdModifyFieldDlg_Impl( VclPtr<SdModifyFieldDlg>::Create( pWindow, pInField, rSet ) );
}
-AbstractSdSnapLineDlg * SdAbstractDialogFactory_Impl::CreateSdSnapLineDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView)
+AbstractSdSnapLineDlg * SdAbstractDialogFactory_Impl::CreateSdSnapLineDlg( const SfxItemSet& rInAttrs, ::sd::View* pView)
{
- return new AbstractSdSnapLineDlg_Impl( VclPtr<SdSnapLineDlg>::Create( pWindow, rInAttrs, pView ) );
+ return new AbstractSdSnapLineDlg_Impl( VclPtr<SdSnapLineDlg>::Create( nullptr, rInAttrs, pView ) );
}
-AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr )
+AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr )
{
- return new AbstractSdInsertLayerDlg_Impl( VclPtr<SdInsertLayerDlg>::Create( pWindow, rInAttrs, bDeletable, aStr ) );
+ return new AbstractSdInsertLayerDlg_Impl( VclPtr<SdInsertLayerDlg>::Create( nullptr, rInAttrs, bDeletable, aStr ) );
}
-AbstractSdInsertPagesObjsDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName )
+AbstractSdInsertPagesObjsDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPagesObjsDlg( const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName )
{
- return new AbstractSdInsertPagesObjsDlg_Impl( VclPtr<SdInsertPagesObjsDlg>::Create( pParent, pDoc, pSfxMedium, rFileName ) );
+ return new AbstractSdInsertPagesObjsDlg_Impl( VclPtr<SdInsertPagesObjsDlg>::Create( nullptr, pDoc, pSfxMedium, rFileName ) );
}
AbstractMorphDlg * SdAbstractDialogFactory_Impl::CreateMorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2)
@@ -414,14 +414,14 @@ AbstractMorphDlg * SdAbstractDialogFactory_Impl::CreateMorphDlg( vcl::Window* pP
return new AbstractMorphDlg_Impl( VclPtr< ::sd::MorphDlg>::Create( pParent, pObj1, pObj2 ) );
}
-SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDlg( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView )
+SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDlg( const SfxItemSet* pAttr, ::sd::View* pView )
{
- return new AbstractBulletDialog_Impl( VclPtr< ::sd::OutlineBulletDlg>::Create( pParent, pAttr, pView ) );
+ return new AbstractBulletDialog_Impl( VclPtr< ::sd::OutlineBulletDlg>::Create( nullptr, pAttr, pView ) );
}
-SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( vcl::Window* pParent, const SfxItemSet* pAttr )
+SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( const SfxItemSet* pAttr )
{
- return new SdAbstractTabDialog_Impl( VclPtr<SdParagraphDlg>::Create( pParent, pAttr ) );
+ return new SdAbstractTabDialog_Impl( VclPtr<SdParagraphDlg>::Create( nullptr, pAttr ) );
}
AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs,
@@ -445,14 +445,14 @@ AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg(
return new AbstractSdPresLayoutDlg_Impl( VclPtr<SdPresLayoutDlg>::Create( pDocShell, pWindow, rInAttrs ) );
}
-SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView )
+SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView )
{
- return new SdAbstractTabDialog_Impl( VclPtr<SdTabTemplateDlg>::Create( pParent, pDocShell, rStyleBase, pModel, pView ) );
+ return new SdAbstractTabDialog_Impl( VclPtr<SdTabTemplateDlg>::Create( nullptr, pDocShell, rStyleBase, pModel, pView ) );
}
-SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView )
+SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( const SfxItemSet* pAttr, ::sd::View* pView )
{
- return new SdAbstractSfxDialog_Impl( VclPtr<SdActionDlg>::Create( pParent, pAttr, pView ) );
+ return new SdAbstractSfxDialog_Impl( VclPtr<SdActionDlg>::Create( nullptr, pAttr, pView ) );
}
AbstractSdVectorizeDlg * SdAbstractDialogFactory_Impl::CreateSdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell )
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index b2a97d3..2638f31 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -228,25 +228,25 @@ public:
virtual ~SdAbstractDialogFactory_Impl() {}
virtual VclAbstractDialog* CreateBreakDlg(vcl::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) override;
- virtual AbstractCopyDlg* CreateCopyDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) override;
- virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ) override;
- virtual SfxAbstractTabDialog* CreateSdTabCharDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) override;
- virtual SfxAbstractTabDialog* CreateSdTabPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) override;
- virtual AbstractAssistentDlg* CreateAssistentDlg( vcl::Window* pParent, bool bAutoPilot) override;
+ virtual AbstractCopyDlg* CreateCopyDlg( const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) override;
+ virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( SdDrawDocument& rDrawDoc ) override;
+ virtual SfxAbstractTabDialog* CreateSdTabCharDialog( const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) override;
+ virtual SfxAbstractTabDialog* CreateSdTabPageDialog( const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) override;
+ virtual AbstractAssistentDlg* CreateAssistentDlg( bool bAutoPilot) override;
virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) override;
- virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) override;
- virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) override;
- virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) override;
+ virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( const SfxItemSet& rInAttrs, ::sd::View* pView) override;
+ virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) override;
+ virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) override;
virtual AbstractMorphDlg* CreateMorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) override;
- virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = nullptr ) override;
- virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr ) override;
+ virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( const SfxItemSet* pAttr, ::sd::View* pView = nullptr ) override;
+ virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( const SfxItemSet* pAttr ) override;
virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs,
const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) override;
virtual VclAbstractDialog* CreateRemoteDialog( vcl::Window* pWindow ) override; // ad for RemoteDialog
virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SdResId& DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) override;
virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, vcl::Window* pWindow, const SfxItemSet& rInAttrs) override;
- virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) override;
- virtual SfxAbstractDialog* CreatSdActionDialog( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) override;
+ virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) override;
+ virtual SfxAbstractDialog* CreatSdActionDialog( const SfxItemSet* pAttr, ::sd::View* pView ) override;
virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) override;
virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( vcl::Window* pWindow, DocumentType eDocType) override;
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx
index b88cd32..1370bd0 100644
--- a/sd/source/ui/framework/module/ToolBarModule.cxx
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -171,7 +171,7 @@ void ToolBarModule::HandleUpdateEnd()
}
else
{
- pToolBarManager->MainViewShellChanged(ViewShell::ST_NONE);
+ pToolBarManager->MainViewShellChanged();
pToolBarManager->PreUpdate();
}
}
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index c013103..e3f6b9c 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -95,7 +95,7 @@ void FuChar::DoExecute( SfxRequest& rReq )
}
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdTabCharDialog( nullptr, &aNewAttr, mpDoc->GetDocSh() ) : nullptr);
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdTabCharDialog( &aNewAttr, mpDoc->GetDocSh() ) : nullptr);
sal_uInt16 nResult = RET_CANCEL;
if( pDlg )
{
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 9e9276b..1d38fde 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -101,7 +101,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
if( pFact )
{
- std::unique_ptr<AbstractCopyDlg> pDlg(pFact->CreateCopyDlg(nullptr, aSet, mpDoc->GetColorList(), mpView ));
+ std::unique_ptr<AbstractCopyDlg> pDlg(pFact->CreateCopyDlg(aSet, mpDoc->GetColorList(), mpView ));
if (!pDlg)
return;
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index 100a433..8bb5439 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -56,7 +56,7 @@ rtl::Reference<FuPoor> FuCustomShowDlg::Create( ViewShell* pViewSh, ::sd::Window
void FuCustomShowDlg::DoExecute( SfxRequest& )
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdCustomShowDlg> pDlg(pFact ? pFact->CreateSdCustomShowDlg( nullptr, *mpDoc ) : nullptr);
+ std::unique_ptr<AbstractSdCustomShowDlg> pDlg(pFact ? pFact->CreateSdCustomShowDlg( *mpDoc ) : nullptr);
if( pDlg )
{
sal_uInt16 nRet = pDlg->Execute();
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index f47970d..e057342 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -327,7 +327,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
mpDocSh->SetWaitCursor( false );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdInsertPagesObjsDlg> pDlg(pFact ? pFact->CreateSdInsertPagesObjsDlg( nullptr, mpDoc, pMedium, aFile ) : nullptr);
+ std::unique_ptr<AbstractSdInsertPagesObjsDlg> pDlg(pFact ? pFact->CreateSdInsertPagesObjsDlg( mpDoc, pMedium, aFile ) : nullptr);
if( !pDlg )
return false;
@@ -419,7 +419,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdInsertPagesObjsDlg> pDlg(pFact ? pFact->CreateSdInsertPagesObjsDlg(nullptr, mpDoc, nullptr, aFile ) : nullptr);
+ std::unique_ptr<AbstractSdInsertPagesObjsDlg> pDlg(pFact ? pFact->CreateSdInsertPagesObjsDlg( mpDoc, nullptr, aFile ) : nullptr);
if( !pDlg )
return;
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index a7068b0..866f838 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -445,7 +445,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, false));
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractDialog> pDlg(pFact ? pFact->CreatSdActionDialog( nullptr, &aSet, mpView ) : nullptr);
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact ? pFact->CreatSdActionDialog( &aSet, mpView ) : nullptr);
short nResult = pDlg ? pDlg->Execute() : static_cast<short>(RET_CANCEL);
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 9a38ee8..1a3a8a6 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -81,7 +81,7 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
// create and execute dialog
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdOutlineBulletTabDlg( nullptr, &aNewAttr, mpView ) : nullptr);
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdOutlineBulletTabDlg( &aNewAttr, mpView ) : nullptr);
if( pDlg )
{
if ( pPageItem )
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 431f885..eda465c 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -328,7 +328,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
{
// create the dialog
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg( pFact ? pFact->CreateSdTabPageDialog(nullptr, &aMergedAttr, mpDocSh, mbDisplayBackgroundTabPage ) : nullptr );
+ std::unique_ptr<SfxAbstractTabDialog> pDlg( pFact ? pFact->CreateSdTabPageDialog(&aMergedAttr, mpDocSh, mbDisplayBackgroundTabPage ) : nullptr );
if( pDlg.get() && pDlg->Execute() == RET_OK )
pTempSet.reset( new SfxItemSet(*pDlg->GetOutputItemSet()) );
}
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index 935a019..bc70d74 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -90,7 +90,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq )
}
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdParagraphTabDlg(nullptr, &aNewAttr ) : nullptr);
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdParagraphTabDlg( &aNewAttr ) : nullptr);
if (!pDlg)
return;
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index 84688cd..4269c16 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -110,7 +110,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq )
aNewAttr.Put(SfxInt32Item(ATTR_SNAPLINE_Y, aLinePos.Y()));
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdSnapLineDlg> pDlg(pFact ? pFact->CreateSdSnapLineDlg( nullptr, aNewAttr, mpView ) : nullptr);
+ std::unique_ptr<AbstractSdSnapLineDlg> pDlg(pFact ? pFact->CreateSdSnapLineDlg( aNewAttr, mpView ) : nullptr);
OSL_ASSERT(pDlg);
if (!pDlg)
return;
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 50c9425..e0d9773 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -305,7 +305,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if (eFamily == SD_STYLE_FAMILY_GRAPHICS)
{
- pStdDlg.reset(pFact ? pFact->CreateSdTabTemplateDlg( nullptr, mpDoc->GetDocSh(), *pStyleSheet, mpDoc, mpView ) : nullptr);
+ pStdDlg.reset(pFact ? pFact->CreateSdTabTemplateDlg( mpDoc->GetDocSh(), *pStyleSheet, mpDoc, mpView ) : nullptr);
}
else if (eFamily == SD_STYLE_FAMILY_PSEUDO)
{
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index fa681d6..606ccdd 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -83,13 +83,13 @@ public:
/** When the view in the center pane changes then this method sets up
the initial set of tool bars for the new view.
- The ToolBarManager listenes for view switching itself and then calls
+ The ToolBarManager listens for view switching itself and then calls
MainViewShellChanged(). Calling this method from the outside should
not be necessary.
@param nShellType
The type of the new main view shell.
*/
- void MainViewShellChanged (ViewShell::ShellType nShellType);
+ void MainViewShellChanged ();
void MainViewShellChanged (const ViewShell& rMainViewShell);
/** Call this method when the selection has changed to update the more
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 85be7aa..eeb01c6 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -324,7 +324,7 @@ void ShowWindow::SetEndMode()
}
}
-bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout, Graphic* pLogo )
+bool ShowWindow::SetPauseMode( sal_Int32 nTimeout, Graphic* pLogo )
{
rtl::Reference< SlideShow > xSlideShow;
@@ -333,13 +333,13 @@ bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout
if( xSlideShow.is() && !nTimeout )
{
- xSlideShow->jumpToPageIndex( nPageIndexToRestart );
+ xSlideShow->jumpToPageIndex( 0 );
}
else if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() )
{
DeleteWindowFromPaintView();
mnPauseTimeout = nTimeout;
- mnRestartPageIndex = nPageIndexToRestart;
+ mnRestartPageIndex = 0;
meShowWindowMode = SHOWWINDOWMODE_PAUSE;
maShowBackground = Wallpaper( Color( COL_BLACK ) );
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index dafd0a5..af2f016 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -54,7 +54,7 @@ public:
virtual void dispose() override;
void SetEndMode();
- bool SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = nullptr );
+ bool SetPauseMode( sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = nullptr );
bool SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor );
const Color& GetBlankColor() const { return maShowBackground.GetColor(); }
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index b154130..954bdd3 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2947,10 +2947,10 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException, std::exc
if ( maPresSettings.mbShowPauseLogo )
{
Graphic aGraphic(SfxApplication::GetApplicationLogo(360));
- mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, &aGraphic );
+ mpShowWindow->SetPauseMode( maPresSettings.mnPauseTimeout, &aGraphic );
}
else
- mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout );
+ mpShowWindow->SetPauseMode( maPresSettings.mnPauseTimeout );
}
}
else
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 9c93b87..e537fff 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -376,7 +376,6 @@ void BitmapCache::Recycle (const BitmapCache& rCache)
}
::std::unique_ptr<BitmapCache::CacheIndex> BitmapCache::GetCacheIndex (
- bool bIncludePrecious,
bool bIncludeNoPreview) const
{
::osl::MutexGuard aGuard (maMutex);
@@ -389,7 +388,7 @@ void BitmapCache::Recycle (const BitmapCache& rCache)
CacheBitmapContainer::iterator iEntry;
for (iEntry=mpBitmapContainer->begin(); iEntry!=mpBitmapContainer->end(); ++iEntry)
{
- if ( ! bIncludePrecious && iEntry->second.IsPrecious())
+ if ( iEntry->second.IsPrecious())
continue;
if ( ! bIncludeNoPreview && ! iEntry->second.HasPreview())
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index 53716ee..dff7a63 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -150,17 +150,13 @@ public:
/** Return a list of sorted cache keys that represent an index into (a
part of) the cache. The entries of the index are sorted according
to last access times with the least recently access time first.
- @param bIncludePrecious
- When this flag is <TRUE/> entries with the precious flag set are
- included in the index. When the flag is <FALSE/> these entries
- are omitted.
+ Entries with the precious flag set are omitted.
@param bIncludeNoPreview
When this flag is <TRUE/> entries with that have no preview
bitmaps are included in the index. When the flag is <FALSE/> these entries
are omitted.
*/
::std::unique_ptr<CacheIndex> GetCacheIndex (
- bool bIncludePrecious,
bool bIncludeNoPreview) const;
/** Compress the specified preview bitmap with the given bitmap
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index 27403e4..ce782e9 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -172,7 +172,7 @@ void CacheCompactionByCompression::Run()
SAL_INFO("sd.sls", OSL_THIS_FUNC << ": bitmap cache uses to much space: " << mrCache.GetSize() << " > " << mnMaximalCacheSize);
::std::unique_ptr< ::sd::slidesorter::cache::BitmapCache::CacheIndex> pIndex (
- mrCache.GetCacheIndex(false,false));
+ mrCache.GetCacheIndex(false));
::sd::slidesorter::cache::BitmapCache::CacheIndex::iterator iIndex;
for (iIndex=pIndex->begin(); iIndex!=pIndex->end(); ++iIndex)
{
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
index 8b13028..ca34385 100644
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
@@ -226,7 +226,7 @@ bool GenericPageCache::InvalidatePreviewBitmap (const CacheKey aKey)
return false;
}
-void GenericPageCache::InvalidateCache (const bool bUpdateCache)
+void GenericPageCache::InvalidateCache ()
{
if (mpBitmapCache)
{
@@ -240,8 +240,7 @@ void GenericPageCache::InvalidateCache (const bool bUpdateCache)
// Depending on the given bUpdateCache flag we start to create new
// preview bitmaps.
mpBitmapCache->InvalidateCache();
- if (bUpdateCache)
- RequestFactory()(maRequestQueue, mpCacheContext);
+ RequestFactory()(maRequestQueue, mpCacheContext);
}
}
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
index 315b914..91e8a9f 100644
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
@@ -115,7 +115,7 @@ public:
This is the case when the size of the page objects on the screen has
changed or when the model has changed.
*/
- void InvalidateCache (const bool bUpdateCache);
+ void InvalidateCache ();
/** With the precious flag you can control whether a bitmap can be
removed from the cache or reduced in size to make room for other
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
index fa7ff45..07f4f62 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
@@ -88,7 +88,7 @@ void PageCache::InvalidatePreviewBitmap (
void PageCache::InvalidateCache()
{
- mpImplementation->InvalidateCache(true);
+ mpImplementation->InvalidateCache();
}
void PageCache::SetPreciousFlag (
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index ce63783..2069d24 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -717,7 +717,7 @@ void SlideSorterController::Rearrange (bool bForce)
// Adapt the scroll bars to the new zoom factor of the browser
// window and the arrangement of the page objects.
- GetScrollBarManager().UpdateScrollBars(false, !bForce);
+ GetScrollBarManager().UpdateScrollBars(!bForce);
// Keep the current slide in the visible area.
GetVisibleAreaManager().RequestCurrentSlideVisible();
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 7df784f..6928baa 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -244,7 +244,7 @@ void Clipboard::DoPaste ()
if (pClipTransferable!=nullptr && pClipTransferable->IsPageTransferable())
{
- sal_Int32 nInsertPosition = GetInsertionPosition(nullptr);
+ sal_Int32 nInsertPosition = GetInsertionPosition();
if (nInsertPosition >= 0)
{
@@ -258,7 +258,7 @@ void Clipboard::DoPaste ()
}
}
-sal_Int32 Clipboard::GetInsertionPosition (vcl::Window* pWindow)
+sal_Int32 Clipboard::GetInsertionPosition ()
{
sal_Int32 nInsertPosition = -1;
@@ -286,7 +286,7 @@ sal_Int32 Clipboard::GetInsertionPosition (vcl::Window* pWindow)
else if (mrController.GetFocusManager().IsFocusShowing())
{
// Use the focus to determine the insertion position.
- ScopedVclPtrInstance< SdInsertPasteDlg > aDialog(pWindow);
+ ScopedVclPtrInstance< SdInsertPasteDlg > aDialog(nullptr);
if (aDialog->Execute() == RET_OK)
{
nInsertPosition = mrController.GetFocusManager().GetFocusedPageIndex();
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index 49127da..05090c8 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -64,7 +64,7 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter)
DragAndDropContext::~DragAndDropContext()
{
- SetTargetSlideSorter (nullptr, Point(0,0));
+ SetTargetSlideSorter (Point(0,0));
}
void DragAndDropContext::Dispose()
@@ -110,7 +110,6 @@ void DragAndDropContext::UpdatePosition (
}
void DragAndDropContext::SetTargetSlideSorter (
- SlideSorter* pSlideSorter,
const Point& rMousePosition,
const InsertionIndicatorHandler::Mode eMode,
const bool bIsOverSourceView)
@@ -122,7 +121,7 @@ void DragAndDropContext::SetTargetSlideSorter (
Animator::AM_Animated);
}
- mpTargetSlideSorter = pSlideSorter;
+ mpTargetSlideSorter = nullptr;
if (mpTargetSlideSorter != nullptr)
{
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
index 1e84b81..1e14c70 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
@@ -61,7 +61,6 @@ public:
const bool bAllowAutoScroll = true);
void SetTargetSlideSorter (
- SlideSorter* pSlideSorter = nullptr,
const Point& rMousePosition = Point(0,0),
const InsertionIndicatorHandler::Mode eMode = InsertionIndicatorHandler::UnknownMode,
const bool bIsOverSourceView = false);
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index 4e202c4..6bb7399 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -174,7 +174,7 @@ void ScrollBarManager::PlaceFiller (const Rectangle& aArea)
mpHorizontalScrollBar->GetSizePixel().Height()));
}
-void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScrolling)
+void ScrollBarManager::UpdateScrollBars(bool bUseScrolling)
{
Rectangle aModelArea (mrSlideSorter.GetView().GetModelArea());
sd::Window *pWindow (mrSlideSorter.GetContentWindow());
@@ -187,13 +187,7 @@ void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScro
mpHorizontalScrollBar->Show();
mpHorizontalScrollBar->SetRange (
Range(aModelArea.Left(), aModelArea.Right()));
- if (bResetThumbPosition)
- {
- mpHorizontalScrollBar->SetThumbPos (0);
- mnHorizontalPosition = 0;
- }
- else
- mnHorizontalPosition =
+ mnHorizontalPosition =
double(mpHorizontalScrollBar->GetThumbPos())
/ double(mpHorizontalScrollBar->GetRange().Len());
@@ -216,13 +210,7 @@ void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScro
{
mpVerticalScrollBar->SetRange (
Range(aModelArea.Top(), aModelArea.Bottom()));
- if (bResetThumbPosition)
- {
- mpVerticalScrollBar->SetThumbPos (0);
- mnVerticalPosition = 0;
- }
- else
- mnVerticalPosition =
+ mnVerticalPosition =
double(mpVerticalScrollBar->GetThumbPos())
/ double(mpVerticalScrollBar->GetRange().Len());
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index 53217e2..de6902d 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -148,14 +148,11 @@ private:
/** Determine the position of where to insert the pages in the current
transferable of the sd module.
- @param pWindow
- This window is used as parent for dialogs that have to be shown
- to the user.
@return
The index in the range [0,n] (both inclusive) with n the number
of pages is returned.
*/
- sal_Int32 GetInsertionPosition (vcl::Window* pWindow);
+ sal_Int32 GetInsertionPosition ();
/** Paste the pages of the transferable of the sd module at the given
position.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index 422d883..a486ee8 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -78,16 +78,12 @@ public:
method when the content of the browser window changed, i.e. pages
were inserted or deleted, the layout or the zoom factor has
changed.
- @param bResetThumbPosition
- When <TRUE/> then set the thumb position to position 0. This is
- done when e.g. switching between master page mode and draw mode.
@param bScrollToCurrentPosition
When <TRUE/> then scroll the window to the new offset that is
defined by the scroll bars. Otherwise the new offset is simply
set and the whole window is repainted.
*/
void UpdateScrollBars (
- bool bResetThumbPosition = false,
bool bScrollToCurrentPosition = true);
/** Place the scroll bars inside the given area. When the available
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index fa28321..039d626 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -109,11 +109,11 @@ public:
const CoordinateSystem eCoordinateSystem,
bool bIgnoreLocation = false);
- /// the size of the embedded preview: position independent
- Size GetPreviewSize(const CoordinateSystem eCoordinateSystem);
+ /// the size of the embedded preview: position independent, in window coordinate system
+ Size GetPreviewSize();
- /// the maximum size of each tile, also position independent
- Size GetGridMaxSize(const CoordinateSystem eCoordinateSystem);
+ /// the maximum size of each tile, also position independent, in window coordinate system
+ Size GetGridMaxSize();
Image GetTransitionEffectIcon() const { return maTransitionEffectIcon;}
Image GetCustomAnimationEffectIcon() const { return maCustomAnimationEffectIcon;}
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index a44a3e5..2f57b1f 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -418,7 +418,7 @@ void SlideSorterView::Layout ()
mpLayouter->GetPageObjectLayouter());
if (pPageObjectLayouter)
{
- const Size aNewPreviewSize (mpLayouter->GetPageObjectLayouter()->GetPreviewSize(PageObjectLayouter::WindowCoordinateSystem));
+ const Size aNewPreviewSize (mpLayouter->GetPageObjectLayouter()->GetPreviewSize());
if (maPreviewSize != aNewPreviewSize && GetPreviewCache())
{
mpPreviewCache->ChangeSize(aNewPreviewSize, Bitmap::HasFastScale());
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index fdef07a..dbcca0e 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -113,8 +113,7 @@ void InsertionIndicatorOverlay::Create (
std::shared_ptr<view::PageObjectLayouter> pPageObjectLayouter (
rLayouter.GetPageObjectLayouter());
std::shared_ptr<view::Theme> pTheme (mrSlideSorter.GetTheme());
- const Size aOriginalPreviewSize (pPageObjectLayouter->GetPreviewSize(
- PageObjectLayouter::WindowCoordinateSystem));
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list