[Libreoffice-commits] core.git: 2 commits - filter/source include/filter sw/inc sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Nov 7 06:33:31 UTC 2017
filter/source/msfilter/msdffimp.cxx | 8 ++++----
include/filter/msfilter/msdffimp.hxx | 6 +++---
sw/inc/dbfld.hxx | 2 +-
sw/inc/editsh.hxx | 2 +-
sw/inc/splargs.hxx | 2 +-
sw/source/core/access/accpara.cxx | 4 ++--
sw/source/core/access/accpara.hxx | 2 +-
sw/source/core/doc/doccomp.cxx | 26 +++++++++++++-------------
sw/source/core/doc/docsort.cxx | 2 +-
sw/source/core/docnode/ndtbl.cxx | 6 +++---
sw/source/core/edit/autofmt.cxx | 2 +-
sw/source/core/edit/edfcol.cxx | 2 +-
sw/source/core/edit/edlingu.cxx | 5 ++---
sw/source/core/fields/dbfld.cxx | 2 +-
sw/source/core/inc/docsort.hxx | 2 +-
sw/source/core/text/txtfld.cxx | 2 +-
sw/source/core/undo/undraw.cxx | 4 ++--
sw/source/filter/html/htmlcss1.cxx | 2 +-
sw/source/filter/html/htmlplug.cxx | 2 +-
sw/source/filter/html/swhtml.hxx | 4 ++--
sw/source/filter/ww8/docxattributeoutput.cxx | 2 +-
sw/source/filter/ww8/docxattributeoutput.hxx | 2 +-
sw/source/filter/ww8/docxsdrexport.cxx | 8 ++++----
sw/source/filter/ww8/docxsdrexport.hxx | 8 ++++----
sw/source/filter/ww8/ww8graf.cxx | 8 ++++----
sw/source/filter/ww8/ww8graf2.cxx | 4 ++--
sw/source/filter/ww8/ww8par.cxx | 4 ++--
sw/source/filter/ww8/ww8par.hxx | 14 +++++++-------
sw/source/filter/ww8/ww8par2.cxx | 2 +-
sw/source/filter/ww8/ww8par2.hxx | 2 +-
sw/source/filter/ww8/ww8par5.cxx | 2 +-
sw/source/filter/ww8/ww8par6.cxx | 2 +-
sw/source/filter/ww8/ww8scan.cxx | 4 ++--
sw/source/filter/ww8/ww8scan.hxx | 4 ++--
sw/source/ui/frmdlg/frmpage.cxx | 2 +-
sw/source/ui/vba/vbaparagraphformat.cxx | 2 +-
sw/source/ui/vba/vbaparagraphformat.hxx | 2 +-
sw/source/uibase/inc/frmpage.hxx | 2 +-
38 files changed, 80 insertions(+), 81 deletions(-)
New commits:
commit e2655495d544d51db68bb6ce94b3264290533bad
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Nov 6 14:28:34 2017 +0200
convert nDrawingContainerId to sal_uInt16
which is all that can be stored anyhow
Change-Id: Iaec28a97ed25004715accafc0cbd4bd620bfbba9
Reviewed-on: https://gerrit.libreoffice.org/44360
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 1fc80da83cb8..9c006116d403 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5847,7 +5847,7 @@ void SvxMSDffManager::GetCtrlData(sal_uInt32 nOffsDggL)
sal_uInt32 nMaxStrPos = rStCtrl.Tell();
nPos += nLength;
- unsigned long nDrawingContainerId = 1;
+ sal_uInt16 nDrawingContainerId = 1;
do
{
if (!checkSeek(rStCtrl, nPos))
@@ -5965,7 +5965,7 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe
// ================= ======
void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg,
- const unsigned long nDrawingContainerId )
+ sal_uInt16 nDrawingContainerId )
{
sal_uInt8 nVer;sal_uInt16 nInst;sal_uInt16 nFbt;sal_uInt32 nLength;
@@ -6003,7 +6003,7 @@ void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg,
bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt,
sal_uLong nLenShapeGroupCont,
bool bPatriarch,
- const unsigned long nDrawingContainerId )
+ sal_uInt16 nDrawingContainerId )
{
sal_uInt8 nVer;sal_uInt16 nInst;sal_uInt16 nFbt;sal_uInt32 nLength;
long nStartShapeGroupCont = rSt.Tell();
@@ -6043,7 +6043,7 @@ bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt,
bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
sal_uLong nLenShapeCont,
sal_uLong nPosGroup,
- const unsigned long nDrawingContainerId )
+ sal_uInt16 nDrawingContainerId )
{
sal_uInt8 nVer;sal_uInt16 nInst;sal_uInt16 nFbt;sal_uInt32 nLength;
long nStartShapeCont = rSt.Tell();
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 03ebc81ccf6a..9e5e814016ba 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -449,15 +449,15 @@ protected:
// objects in different drawing containers.
void GetDrawingContainerData( SvStream& rSt,
sal_uLong nLenDg,
- const unsigned long nDrawingContainerId );
+ sal_uInt16 nDrawingContainerId );
bool GetShapeGroupContainerData( SvStream& rSt,
sal_uLong nLenShapeGroupCont,
bool bPatriarch,
- const unsigned long nDrawingContainerId );
+ sal_uInt16 nDrawingContainerId );
bool GetShapeContainerData( SvStream& rSt,
sal_uLong nLenShapeCont,
sal_uLong nPosGroup,
- const unsigned long nDrawingContainerId );
+ sal_uInt16 nDrawingContainerId );
SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& );
// #i32596# - pass <nCalledByGroup> to method
commit 4f5469ed0bb4dce1dc62180eb3d1c5e0257f6cc3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Nov 6 13:40:23 2017 +0200
loplugin:constparams in sw
Change-Id: Ie7aac013db4116aa9bd2caa4fc6b4bfad5cea733
Reviewed-on: https://gerrit.libreoffice.org/44356
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index b751fcc76345..cb7ed9c266bf 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -106,7 +106,7 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override;
- static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString const &aString, sal_uInt32 nFormat,
+ static bool FormatValue( SvNumberFormatter const * pDocFormatter, OUString const &aString, sal_uInt32 nFormat,
double &aNumber, sal_Int32 nColumnType, SwDBField *pField = nullptr );
};
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index c076ac7e8ba1..70250a85ac6c 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -824,7 +824,7 @@ public:
void AutoFormat( const SvxSwAutoFormatFlags* pAFlags );
static SvxSwAutoFormatFlags* GetAutoFormatFlags();
- static void SetAutoFormatFlags(SvxSwAutoFormatFlags *);
+ static void SetAutoFormatFlags(SvxSwAutoFormatFlags const *);
/// Calculates selection.
OUString Calculate();
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 26ab90a5049f..50c3e7ae6973 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -150,7 +150,7 @@ namespace sw {
typedef std::function<SwTextFrame*()> Creator;
SwTextFrame *
-SwHyphIterCacheLastTextFrame(SwTextNode *, const Creator& rCreator);
+SwHyphIterCacheLastTextFrame(SwTextNode const *, const Creator& rCreator);
}
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index cce1b6a8eba4..84fded6f5a2c 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -3532,9 +3532,9 @@ void SwAccessibleParagraph::Modify( const SfxPoolItem* pOld, const SfxPoolItem*
}
bool SwAccessibleParagraph::GetSelectionAtIndex(
- sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd)
+ sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd)
{
- if(nIndex < 0) return false;
+ if(nIndex < 0) return false;
bool bRet = false;
nStart = -1;
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 008cef420736..f6c89632afb3 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -368,7 +368,7 @@ public:
virtual sal_Int32 SAL_CALL addSelection( sal_Int32 selectionIndex, sal_Int32 startOffset, sal_Int32 endOffset) override;
// XAccessibleExtendedAttributes
virtual css::uno::Any SAL_CALL getExtendedAttributes() override ;
- bool GetSelectionAtIndex(sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd);
+ bool GetSelectionAtIndex(sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd);
sal_Int32 GetRealHeadingLevel();
// XAccessibleComponent
bool m_bLastHasSelection;
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 819ebbdb4cbe..52f9c86a4e62 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -122,8 +122,8 @@ public:
void ShowDelete( const CompareData& rData, sal_uLong nStt,
sal_uLong nEnd, sal_uLong nInsPos );
void CheckForChangesInLine( const CompareData& rData,
- sal_uLong& nStt, sal_uLong& nEnd,
- sal_uLong& nThisStt, sal_uLong& nThisEnd );
+ sal_uLong nStt, sal_uLong nEnd,
+ sal_uLong nThisStt, sal_uLong nThisEnd );
// Set non-ambiguous index for a line. Same lines have the same index, even in the other CompareData!
void SetIndex( size_t nLine, size_t nIndex );
@@ -1555,11 +1555,11 @@ void CompareData::ShowDelete(
}
void CompareData::CheckForChangesInLine( const CompareData& rData,
- sal_uLong& rStt, sal_uLong& rEnd,
- sal_uLong& rThisStt, sal_uLong& rThisEnd )
+ sal_uLong nStt, sal_uLong nEnd,
+ sal_uLong nThisStt, sal_uLong nThisEnd )
{
- LineArrayComparator aCmp( *this, rData, rThisStt, rThisEnd,
- rStt, rEnd );
+ LineArrayComparator aCmp( *this, rData, nThisStt, nThisEnd,
+ nStt, nEnd );
int nMinLen = std::min( aCmp.GetLen1(), aCmp.GetLen2() );
std::unique_ptr<int[]> pLcsDst(new int[ nMinLen ]);
@@ -1580,29 +1580,29 @@ void CompareData::CheckForChangesInLine( const CompareData& rData,
if( i )
{
- const SwCompareLine* pDstLn = GetLine( rThisStt + nDstFrom - 1 );
- const SwCompareLine* pSrcLn = rData.GetLine( rStt + nSrcFrom - 1 );
+ const SwCompareLine* pDstLn = GetLine( nThisStt + nDstFrom - 1 );
+ const SwCompareLine* pSrcLn = rData.GetLine( nStt + nSrcFrom - 1 );
// Show differences in detail for lines that
// were matched as only slightly different
if( !pDstLn->ChangesInLine( *pSrcLn, pInsRing, pDelRing ) )
{
- ShowInsert( rThisStt + nDstFrom - 1, rThisStt + nDstFrom );
- ShowDelete( rData, rStt + nSrcFrom - 1, rStt + nSrcFrom,
- rThisStt + nDstFrom );
+ ShowInsert( nThisStt + nDstFrom - 1, nThisStt + nDstFrom );
+ ShowDelete( rData, nStt + nSrcFrom - 1, nStt + nSrcFrom,
+ nThisStt + nDstFrom );
}
}
// Lines missing from source are inserted
if( nDstFrom != nDstTo )
{
- ShowInsert( rThisStt + nDstFrom, rThisStt + nDstTo );
+ ShowInsert( nThisStt + nDstFrom, nThisStt + nDstTo );
}
// Lines missing from destination are deleted
if( nSrcFrom != nSrcTo )
{
- ShowDelete( rData, rStt + nSrcFrom, rStt + nSrcTo, rThisStt + nDstTo );
+ ShowDelete( rData, nStt + nSrcFrom, nStt + nSrcTo, nThisStt + nDstTo );
}
}
}
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 26cdcc41a19f..cd146f81dc61 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -68,7 +68,7 @@ typedef std::multiset<SwSortBoxElement> SwSortBoxElements;
/// Construct a SortElement for the Sort
void SwSortElement::Init( SwDoc* pD, const SwSortOptions& rOpt,
- FlatFndBox* pFltBx )
+ FlatFndBox const * pFltBx )
{
OSL_ENSURE( !pDoc && !pOptions && !pBox, "Who forgot to call Finit?" );
pDoc = pD;
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index de122406d3c4..957e8e2cf60c 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3274,7 +3274,7 @@ static bool lcl_ChgTableSize( SwTable& rTable )
class SplitTable_Para
{
- std::map<SwFrameFormat*, SwFrameFormat*> aSrcDestMap;
+ std::map<SwFrameFormat const *, SwFrameFormat*> aSrcDestMap;
SwTableNode* pNewTableNd;
SwTable& rOldTable;
@@ -3284,11 +3284,11 @@ public:
{}
SwFrameFormat* GetDestFormat( SwFrameFormat* pSrcFormat ) const
{
- std::map<SwFrameFormat*, SwFrameFormat*>::const_iterator it = aSrcDestMap.find( pSrcFormat );
+ auto it = aSrcDestMap.find( pSrcFormat );
return it == aSrcDestMap.end() ? nullptr : it->second;
}
- void InsertSrcDest( SwFrameFormat* pSrcFormat, SwFrameFormat* pDestFormat )
+ void InsertSrcDest( SwFrameFormat const * pSrcFormat, SwFrameFormat* pDestFormat )
{ aSrcDestMap[ pSrcFormat ] = pDestFormat; }
void ChgBox( SwTableBox* pBox )
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index c16e22940933..d8411be089ec 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2633,7 +2633,7 @@ SvxSwAutoFormatFlags* SwEditShell::GetAutoFormatFlags()
return s_pAutoFormatFlags;
}
-void SwEditShell::SetAutoFormatFlags(SvxSwAutoFormatFlags * pFlags)
+void SwEditShell::SetAutoFormatFlags(SvxSwAutoFormatFlags const * pFlags)
{
SvxSwAutoFormatFlags* pEditFlags = GetAutoFormatFlags();
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 1671271a23e6..a6dc65b2607b 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -1756,7 +1756,7 @@ void SwEditShell::ValidateAllParagraphSignatures(bool updateDontRemove)
}
}
-uno::Reference<text::XTextField> lcl_GetParagraphMetadataFieldAtIndex(const SwDocShell* pDocSh, SwTextNode* pNode, const sal_uLong index)
+uno::Reference<text::XTextField> lcl_GetParagraphMetadataFieldAtIndex(const SwDocShell* pDocSh, SwTextNode const * pNode, const sal_uLong index)
{
uno::Reference<text::XTextField> xTextField;
if (pNode != nullptr && pDocSh != nullptr)
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index c40d776b419a..faecd8033ec2 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -155,7 +155,7 @@ class SwHyphIter : public SwLinguIter
// With that we save a GetFrame() in Hyphenate //TODO: does it actually matter?
const SwTextNode *m_pLastNode;
SwTextFrame *m_pLastFrame;
- friend SwTextFrame * sw::SwHyphIterCacheLastTextFrame(SwTextNode* pNode, const sw::Creator& rCreator);
+ friend SwTextFrame * sw::SwHyphIterCacheLastTextFrame(SwTextNode const * pNode, const sw::Creator& rCreator);
bool bOldIdle;
static void DelSoftHyph( SwPaM &rPam );
@@ -568,8 +568,7 @@ void SwHyphIter::InsertSoftHyph( const sal_Int32 nHyphPos )
namespace sw {
SwTextFrame *
-SwHyphIterCacheLastTextFrame(SwTextNode *const pNode,
- const sw::Creator& create)
+SwHyphIterCacheLastTextFrame(SwTextNode const * pNode, const sw::Creator& create)
{
assert(g_pHyphIter);
if (pNode != g_pHyphIter->m_pLastNode || !g_pHyphIter->m_pLastFrame)
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 422a55bd138d..ab3d1a10f7b0 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -264,7 +264,7 @@ SwFieldType* SwDBField::ChgTyp( SwFieldType* pNewType )
return pOld;
}
-bool SwDBField::FormatValue( SvNumberFormatter* pDocFormatter, OUString const &aString, sal_uInt32 nFormat,
+bool SwDBField::FormatValue( SvNumberFormatter const * pDocFormatter, OUString const &aString, sal_uInt32 nFormat,
double &aNumber, sal_Int32 nColumnType, SwDBField *pField )
{
bool bValidValue = false;
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index b66ecd3f5159..10f141d656e4 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -76,7 +76,7 @@ struct SwSortElement
static OUString* pLastAlgorithm;
static LocaleDataWrapper* pLclData;
- static void Init( SwDoc*, const SwSortOptions& rOpt, FlatFndBox* = nullptr );
+ static void Init( SwDoc*, const SwSortOptions& rOpt, FlatFndBox const * = nullptr );
static void Finit();
virtual ~SwSortElement();
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 0e2c12dac3c1..08b5c744a57d 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -54,7 +54,7 @@
#include <IDocumentSettingAccess.hxx>
#include <svl/itemiter.hxx>
-static bool lcl_IsInBody( SwFrame *pFrame )
+static bool lcl_IsInBody( SwFrame const *pFrame )
{
if ( pFrame->IsInDocBody() )
return true;
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index 40d5a33dc782..77b60e80ab9c 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -151,7 +151,7 @@ static void lcl_SaveAnchor( SwFrameFormat* pFormat, sal_uLong& rNodePos )
}
}
-static void lcl_RestoreAnchor( SwFrameFormat* pFormat, sal_uLong& rNodePos )
+static void lcl_RestoreAnchor( SwFrameFormat* pFormat, sal_uLong nNodePos )
{
const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
if ((RndStdIds::FLY_AT_PARA == rAnchor.GetAnchorId()) ||
@@ -162,7 +162,7 @@ static void lcl_RestoreAnchor( SwFrameFormat* pFormat, sal_uLong& rNodePos )
const sal_Int32 nContentPos = rAnchor.GetPageNum();
SwNodes& rNds = pFormat->GetDoc()->GetNodes();
- SwNodeIndex aIdx( rNds, rNodePos );
+ SwNodeIndex aIdx( rNds, nNodePos );
SwPosition aPos( aIdx );
SwFormatAnchor aTmp( rAnchor.GetAnchorId() );
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 01fb4ab01943..45c7c86b5283 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -2035,7 +2035,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SvxCSS1PropertyInfo &rPropInfo,
rFrameItemSet.Put( SwFormatSurround( eSurround ) );
}
-void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo &rPropInfo,
+void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo const &rPropInfo,
SfxItemSet &rFrameItemSet,
SwTwips nDfltWidth, sal_uInt8 nDfltPrcWidth )
{
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 6c7373df40d9..ed8bf7fa833b 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -120,7 +120,7 @@ const HtmlFrmOpts HTML_FRMOPTS_OLE_CSS1 =
void SwHTMLParser::SetFixSize( const Size& rPixSize,
const Size& rTwipDfltSize,
bool bPrcWidth, bool bPrcHeight,
- SvxCSS1PropertyInfo& rCSS1PropInfo,
+ SvxCSS1PropertyInfo const & rCSS1PropInfo,
SfxItemSet& rFlyItemSet )
{
// convert absolute size values into Twip
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 01d4acd01afc..69a47da0005f 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -677,9 +677,9 @@ private:
// (not for graphics, therefore htmlplug.cxx)
static void SetFixSize( const Size& rPixSize, const Size& rTwipDfltSize,
bool bPrcWidth, bool bPrcHeight,
- SvxCSS1PropertyInfo &rPropInfo,
+ SvxCSS1PropertyInfo const &rPropInfo,
SfxItemSet& rFlyItemSet );
- static void SetVarSize( SvxCSS1PropertyInfo &rPropInfo,
+ static void SetVarSize( SvxCSS1PropertyInfo const &rPropInfo,
SfxItemSet& rFlyItemSet, SwTwips nDfltWidth=MINLAY,
sal_uInt8 nDltPrcWidth=0 );
static void SetSpace( const Size& rPixSpace, SfxItemSet &rItemSet,
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index b9a0095fa484..048bafc1d194 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5551,7 +5551,7 @@ void DocxAttributeOutput::pushToTableExportContext(DocxTableExportContext& rCont
m_tableReference->m_nTableDepth = 0;
}
-void DocxAttributeOutput::popFromTableExportContext(DocxTableExportContext& rContext)
+void DocxAttributeOutput::popFromTableExportContext(DocxTableExportContext const & rContext)
{
m_rExport.m_pTableInfo = rContext.m_pTableInfo;
m_tableReference->m_bTableCellOpen = rContext.m_bTableCellOpen;
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index eb9dcf4d6791..7a09130e23e5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -1019,7 +1019,7 @@ public:
/// Stores the table export state to the passed context and resets own state.
void pushToTableExportContext(DocxTableExportContext& rContext);
/// Restores from the remembered state.
- void popFromTableExportContext(DocxTableExportContext& rContext);
+ void popFromTableExportContext(DocxTableExportContext const & rContext);
};
#endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXATTRIBUTEOUTPUT_HXX
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index ae0b02873cb5..aeb544a679b5 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -112,7 +112,7 @@ void lclMovePositionWithRotation(awt::Point& aPos, const Size& rSize, sal_Int64
}
-ExportDataSaveRestore::ExportDataSaveRestore(DocxExport& rExport, sal_uLong nStt, sal_uLong nEnd, ww8::Frame* pParentFrame)
+ExportDataSaveRestore::ExportDataSaveRestore(DocxExport& rExport, sal_uLong nStt, sal_uLong nEnd, ww8::Frame const * pParentFrame)
: m_rExport(rExport)
{
m_rExport.SaveData(nStt, nEnd);
@@ -1291,7 +1291,7 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrameFormat
}
}
-void DocxSdrExport::writeOnlyTextOfFrame(ww8::Frame* pParentFrame)
+void DocxSdrExport::writeOnlyTextOfFrame(ww8::Frame const * pParentFrame)
{
const SwFrameFormat& rFrameFormat = pParentFrame->GetFrameFormat();
const SwNodeIndex* pNodeIndex = rFrameFormat.GetContent().GetContentIdx();
@@ -1357,7 +1357,7 @@ void DocxSdrExport::writeBoxItemLine(const SvxBoxItem& rBox)
pFS->endElementNS(XML_a, XML_ln);
}
-void DocxSdrExport::writeDMLTextFrame(ww8::Frame* pParentFrame, int nAnchorId, bool bTextBoxOnly)
+void DocxSdrExport::writeDMLTextFrame(ww8::Frame const * pParentFrame, int nAnchorId, bool bTextBoxOnly)
{
bool bDMLAndVMLDrawingOpen = m_pImpl->m_bDMLAndVMLDrawingOpen;
m_pImpl->m_bDMLAndVMLDrawingOpen = true;
@@ -1634,7 +1634,7 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame* pParentFrame, int nAnchorId, b
m_pImpl->m_bDMLAndVMLDrawingOpen = bDMLAndVMLDrawingOpen;
}
-void DocxSdrExport::writeVMLTextFrame(ww8::Frame* pParentFrame, bool bTextBoxOnly)
+void DocxSdrExport::writeVMLTextFrame(ww8::Frame const * pParentFrame, bool bTextBoxOnly)
{
bool bDMLAndVMLDrawingOpen = m_pImpl->m_bDMLAndVMLDrawingOpen;
m_pImpl->m_bDMLAndVMLDrawingOpen = true;
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx
index 59871e7511f0..86bf9bca80ad 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -46,7 +46,7 @@ class ExportDataSaveRestore
private:
DocxExport& m_rExport;
public:
- ExportDataSaveRestore(DocxExport& rExport, sal_uLong nStt, sal_uLong nEnd, ww8::Frame* pParentFrame);
+ ExportDataSaveRestore(DocxExport& rExport, sal_uLong nStt, sal_uLong nEnd, ww8::Frame const * pParentFrame);
~ExportDataSaveRestore();
};
@@ -101,13 +101,13 @@ public:
const css::uno::Reference<css::io::XOutputStream>& xOutStream, const OUString& sGrabBagProperyName,
int nAnchorId);
/// Writes text frame in DML format.
- void writeDMLTextFrame(ww8::Frame* pParentFrame, int nAnchorId, bool bTextBoxOnly = false);
+ void writeDMLTextFrame(ww8::Frame const * pParentFrame, int nAnchorId, bool bTextBoxOnly = false);
/// Writes text frame in VML format.
- void writeVMLTextFrame(ww8::Frame* pParentFrame, bool bTextBoxOnly = false);
+ void writeVMLTextFrame(ww8::Frame const * pParentFrame, bool bTextBoxOnly = false);
/// Is this a standalone TextFrame, or used as a TextBox of a shape?
static bool isTextBox(const SwFrameFormat& rFrameFormat);
/// Writes text from Textbox for <w:framePr>
- void writeOnlyTextOfFrame(ww8::Frame* pParentFrame);
+ void writeOnlyTextOfFrame(ww8::Frame const * pParentFrame);
/// Writes the drawingML <a:ln> markup of a box item.
void writeBoxItemLine(const SvxBoxItem& rBox);
};
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 1109229f4e58..96255010573c 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -981,7 +981,7 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
Size const * pObjSiz, sal_uInt16 nTxBxS, sal_uInt16 nSequence, long nPosCp,
SwFrameFormat const * pOldFlyFormat, bool bMakeSdrGrafObj, bool& rbEraseTextObj,
bool* pbTestTxbxContainsText, long* pnStartCp, long* pnEndCp,
- bool* pbContainsGraphics, SvxMSDffImportRec* pRecord)
+ bool* pbContainsGraphics, SvxMSDffImportRec const * pRecord)
{
SwFrameFormat* pFlyFormat = nullptr;
sal_uLong nOld = m_pStrm->Tell();
@@ -1918,7 +1918,7 @@ void SwWW8ImplReader::AdjustULWrapForWordMargins(
rUL.SetUpper((sal_uInt16)0);
}
-void SwWW8ImplReader::MapWrapIntoFlyFormat(SvxMSDffImportRec* pRecord,
+void SwWW8ImplReader::MapWrapIntoFlyFormat(SvxMSDffImportRec const * pRecord,
SwFrameFormat* pFlyFormat)
{
if (!pRecord || !pFlyFormat)
@@ -2854,8 +2854,8 @@ SwFrameFormat* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
}
SwFlyFrameFormat* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
- SdrObject* &rpOurNewObject, SvxMSDffImportRec* pRecord, RndStdIds eAnchor,
- WW8_FSPA *pF, SfxItemSet &rFlySet)
+ SdrObject* &rpOurNewObject, SvxMSDffImportRec const * pRecord, RndStdIds eAnchor,
+ WW8_FSPA const *pF, SfxItemSet &rFlySet)
{
SwFlyFrameFormat* pRetFrameFormat = nullptr;
long nStartCp;
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 5e7b7da6bf6a..5e1527eda9fb 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -237,7 +237,7 @@ void wwZOrderer::InsertObject(SdrObject* pObject, sal_uLong nPos)
}
}
-extern void WW8PicShadowToReal( WW8_PIC_SHADOW* pPicS, WW8_PIC* pPic );
+extern void WW8PicShadowToReal( WW8_PIC_SHADOW const * pPicS, WW8_PIC* pPic );
bool SwWW8ImplReader::GetPictGrafFromStream(Graphic& rGraphic, SvStream& rSrc)
{
@@ -738,7 +738,7 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj const * pTextObj,
return AddAutoAnchor(pRet);
}
-void WW8PicShadowToReal( WW8_PIC_SHADOW * pPicS, WW8_PIC * pPic )
+void WW8PicShadowToReal( WW8_PIC_SHADOW const * pPicS, WW8_PIC * pPic )
{
pPic->lcb = SVBT32ToUInt32( pPicS->lcb );
pPic->cbHeader = SVBT16ToShort( pPicS->cbHeader );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index c90803a6f969..d1aefa0a1910 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2345,7 +2345,7 @@ bool wwSectionManager::SectionIsProtected(const wwSection &rSection) const
return (mrReader.m_xWwFib->m_fReadOnlyRecommended && !rSection.IsNotProtected());
}
-void wwSectionManager::SetHdFt(wwSection &rSection, int nSect,
+void wwSectionManager::SetHdFt(wwSection const &rSection, int nSect,
const wwSection *pPrevious)
{
// Header/Footer not present
@@ -5554,7 +5554,7 @@ namespace
return aPassw;
}
- uno::Sequence< beans::NamedValue > InitXorWord95Codec( ::msfilter::MSCodec_XorWord95& rCodec, SfxMedium& rMedium, WW8Fib* pWwFib )
+ uno::Sequence< beans::NamedValue > InitXorWord95Codec( ::msfilter::MSCodec_XorWord95& rCodec, SfxMedium& rMedium, WW8Fib const * pWwFib )
{
uno::Sequence< beans::NamedValue > aEncryptionData;
const SfxUnoAnyItem* pEncryptionData = SfxItemSet::GetItem<SfxUnoAnyItem>(rMedium.GetItemSet(), SID_ENCRYPTIONDATA, false);
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 5760b1ba1a46..b5bed2270818 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -835,7 +835,7 @@ private:
void GetPageULData(const wwSection &rNewSection,
wwULSpaceData& rData) const;
- static void SetPageULSpaceItems(SwFrameFormat &rFormat, wwULSpaceData& rData,
+ static void SetPageULSpaceItems(SwFrameFormat &rFormat, wwULSpaceData const & rData,
const wwSection &rSection);
static void SetPage(SwPageDesc &rPageDesc, SwFrameFormat &rFormat,
@@ -844,7 +844,7 @@ private:
static void SetNumberingType(const wwSection &rNewSection, SwPageDesc &rPageDesc);
void SetUseOn(wwSection &rSection);
- void SetHdFt(wwSection &rSection, int nSect, const wwSection *pPrevious);
+ void SetHdFt(wwSection const &rSection, int nSect, const wwSection *pPrevious);
SwSectionFormat *InsertSection(SwPaM const & rMyPaM, wwSection &rSection);
static bool SetCols(SwFrameFormat &rFormat, const wwSection &rSection,
@@ -1474,7 +1474,7 @@ private:
SvxLRSpaceItem &rLR);
static void AdjustULWrapForWordMargins(const SvxMSDffImportRec &rRecord,
SvxULSpaceItem &rUL);
- static void MapWrapIntoFlyFormat(SvxMSDffImportRec* pRecord, SwFrameFormat* pFlyFormat);
+ static void MapWrapIntoFlyFormat(SvxMSDffImportRec const * pRecord, SwFrameFormat* pFlyFormat);
void SetAttributesAtGrfNode(SvxMSDffImportRec const* pRecord,
SwFrameFormat const *pFlyFormat, WW8_FSPA const *pF);
@@ -1585,7 +1585,7 @@ private:
bool bMakeSdrGrafObj, bool& rbEraseTextObj,
bool* pbTestTxbxContainsText = nullptr, long* pnStartCp = nullptr,
long* pnEndCp = nullptr, bool* pbContainsGraphics = nullptr,
- SvxMSDffImportRec* pRecord = nullptr);
+ SvxMSDffImportRec const * pRecord = nullptr);
bool TxbxChainContainsRealText( sal_uInt16 nTxBxS,
long& rStartCp,
long& rEndCp );
@@ -1604,8 +1604,8 @@ private:
SdrObject* &rpOurNewObject, SvxMSDffImportRec* pRecord, WW8_FSPA *pF,
SfxItemSet &rFlySet );
SwFlyFrameFormat *ConvertDrawTextToFly( SdrObject* &rpObject,
- SdrObject* &rpOurNewObject, SvxMSDffImportRec* pRecord,
- RndStdIds eAnchor, WW8_FSPA *pF, SfxItemSet &rFlySet );
+ SdrObject* &rpOurNewObject, SvxMSDffImportRec const * pRecord,
+ RndStdIds eAnchor, WW8_FSPA const *pF, SfxItemSet &rFlySet );
SwFrameFormat* MungeTextIntoDrawBox(SdrObject* pTrueObject,
SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrameFormat *pRetFrameFormat);
@@ -1613,7 +1613,7 @@ private:
void GrafikDtor();
// other stuff
- OUString GetFieldResult( WW8FieldDesc* pF );
+ OUString GetFieldResult( WW8FieldDesc const * pF );
void MakeTagString( OUString& rStr, const OUString& rOrg );
void UpdateFields();
OUString ConvertFFileName(const OUString& rRaw);
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index a7e085fd3cf4..4329ac64eabd 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3968,7 +3968,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
return bOldNoImp;
}
-void WW8RStyle::PostStyle(SwWW8StyInf &rSI, bool bOldNoImp)
+void WW8RStyle::PostStyle(SwWW8StyInf const &rSI, bool bOldNoImp)
{
// Reset attribute flags, because there are no style-ends.
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index f7e7121012be..11d5a37e9982 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -121,7 +121,7 @@ friend class SwWW8ImplReader;
void ImportOldFormatStyles();
bool PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisStyle, sal_uInt16 nNextStyle);
- void PostStyle(SwWW8StyInf &rSI, bool bOldNoImp);
+ void PostStyle(SwWW8StyInf const &rSI, bool bOldNoImp);
WW8RStyle(const WW8RStyle&) = delete;
WW8RStyle& operator=(const WW8RStyle&) = delete;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index ef2530318fc0..72db4201932a 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1166,7 +1166,7 @@ eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF, OUString& rStr )
}
// GetFieldResult allocates a string and reads the resulted field
-OUString SwWW8ImplReader::GetFieldResult( WW8FieldDesc* pF )
+OUString SwWW8ImplReader::GetFieldResult( WW8FieldDesc const * pF )
{
long nOldPos = m_pStrm->Tell();
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 7a9fdf0c4676..f6bf8446ecbc 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -577,7 +577,7 @@ void wwSectionManager::GetPageULData(const wwSection &rSection,
}
void wwSectionManager::SetPageULSpaceItems(SwFrameFormat &rFormat,
- wwSectionManager::wwULSpaceData& rData, const wwSection &rSection)
+ wwSectionManager::wwULSpaceData const & rData, const wwSection &rSection)
{
if (rData.bHasHeader) // ... and set Header-Lower
{
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 25e99ba55afd..e7d37be5fd87 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7026,7 +7026,7 @@ namespace
}
}
-WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
+WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib const & rFib )
: pFontA(nullptr), nMax(0)
{
// Attention: MacWord-Documents have their Fontnames
@@ -7306,7 +7306,7 @@ const WW8_FFN* WW8Fonts::GetFont( sal_uInt16 nNum ) const
// out of WW8_{FOOTER,HEADER}_{ODD,EVEN,FIRST} (Do not change!)
// -> maybe we can get a right result then
-WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop const & rDop )
+WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib const & rFib, WW8Dop const & rDop )
: aPLCF(*pSt, rFib.m_fcPlcfhdd , rFib.m_lcbPlcfhdd , 0)
{
nIdxOffset = 0;
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 416dac0239a4..4dbaaebc49e8 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1578,7 +1578,7 @@ private:
sal_uInt16 nMax; // Array-Size
public:
- WW8Fonts( SvStream& rSt, WW8Fib& rFib );
+ WW8Fonts( SvStream& rSt, WW8Fib const & rFib );
const WW8_FFN* GetFont( sal_uInt16 nNum ) const;
sal_uInt16 GetMax() const { return nMax; }
};
@@ -1847,7 +1847,7 @@ private:
short nIdxOffset;
public:
- WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop const & rDop );
+ WW8PLCF_HdFt( SvStream* pSt, WW8Fib const & rFib, WW8Dop const & rDop );
bool GetTextPos(sal_uInt8 grpfIhdt, sal_uInt8 nWhich, WW8_CP& rStart, WW8_CP& rLen);
void GetTextPosExact(short nIdx, WW8_CP& rStart, WW8_CP& rLen);
void UpdateIndex( sal_uInt8 grpfIhdt );
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index f1abe60c19fe..c8470a43d773 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1639,7 +1639,7 @@ sal_Int16 SwFramePage::GetRelation(ListBox const &rRelationLB)
return 0;
}
-sal_Int16 SwFramePage::GetAlignment(FrameMap *pMap, sal_Int32 nMapPos,
+sal_Int16 SwFramePage::GetAlignment(FrameMap const *pMap, sal_Int32 nMapPos,
ListBox const &rRelationLB)
{
if (!pMap || nMapPos < 0)
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index c50dd5d4a396..0e5c8f50ef64 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -410,7 +410,7 @@ style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacingFromRule( sal_Int32 _l
return aLineSpacing;
}
-float SwVbaParagraphFormat::getMSWordLineSpacing( style::LineSpacing& rLineSpacing )
+float SwVbaParagraphFormat::getMSWordLineSpacing( style::LineSpacing const & rLineSpacing )
{
float wdLineSpacing = 0;
if( rLineSpacing.Mode != style::LineSpacingMode::PROP )
diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx
index c24162a712c8..1508df7505c5 100644
--- a/sw/source/ui/vba/vbaparagraphformat.hxx
+++ b/sw/source/ui/vba/vbaparagraphformat.hxx
@@ -35,7 +35,7 @@ private:
private:
static css::style::LineSpacing getOOoLineSpacing( float _lineSpace, sal_Int16 mode );
css::style::LineSpacing getOOoLineSpacingFromRule( sal_Int32 _linespacingrule );
- static float getMSWordLineSpacing( css::style::LineSpacing& rLineSpacing );
+ static float getMSWordLineSpacing( css::style::LineSpacing const & rLineSpacing );
static sal_Int32 getMSWordLineSpacingRule( css::style::LineSpacing const & rLineSpacing );
/// @throws css::uno::RuntimeException
sal_Int16 getCharHeight();
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index bc6ee6950b97..ddd3261fc82f 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -165,7 +165,7 @@ class SwFramePage: public SfxTabPage
ListBox& _rLB,
FixedText& _rFT );
static sal_Int32 GetMapPos(const FrameMap *pMap, ListBox const &rAlignLB);
- static sal_Int16 GetAlignment(FrameMap *pMap, sal_Int32 nMapPos, ListBox const &rRelationLB);
+ static sal_Int16 GetAlignment(FrameMap const *pMap, sal_Int32 nMapPos, ListBox const &rRelationLB);
static sal_Int16 GetRelation(ListBox const &rRelationLB);
RndStdIds GetAnchor();
More information about the Libreoffice-commits
mailing list