-Werror,-Wcompound-token-split-by-space

Between <https://github.com/llvm/llvm-project/commit/
0e00a95b4fad5e72851de012d3a0b2c2d01f8685> "Add new warning for compound
punctuation tokens that are split across macro expansions or split by
whitespace" and <https://github.com/llvm/llvm-project/commit/
0da84535b1e328188efbc1bb697dc7276f9e7d27> "Remove
-Wcompound-token-split-by-space from -Wall", Clang 12 trunk emitted such "'::'
and '*' tokens forming pointer to member type are separated by whitespace"
warnings, so just clean those places up for good even if the warning would not
hit out of the box with any official Clang release.

Change-Id: Ic58c0da4b3dcce428f5aaa54e13d15299394cf9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101987
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

17 files changed, 34 insertions, 34 deletions

diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 5708f14a3575..aadb46f9520d 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -159,8 +159,8 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
 
     static struct ChkCBoxEntries{
         MSFltrPg2_CheckBoxEntries eType;
-        bool (SvtFilterOptions:: *FnIs)() const;
-        void (SvtFilterOptions:: *FnSet)( bool bFlag );
+        bool (SvtFilterOptions::*FnIs)() const;
+        void (SvtFilterOptions::*FnSet)( bool bFlag );
     } const aChkArr[] = {
         { MSFltrPg2_CheckBoxEntries::Math,     &SvtFilterOptions::IsMathType2Math,
                         &SvtFilterOptions::SetMathType2Math },
@@ -257,7 +257,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
 
     static struct ChkCBoxEntries{
         MSFltrPg2_CheckBoxEntries eType;
-        bool (SvtFilterOptions:: *FnIs)() const;
+        bool (SvtFilterOptions::*FnIs)() const;
     } const aChkArr[] = {
         { MSFltrPg2_CheckBoxEntries::Math,     &SvtFilterOptions::IsMathType2Math },
         { MSFltrPg2_CheckBoxEntries::Math,     &SvtFilterOptions::IsMath2MathType },
diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index aa4c8f522f86..80bcf3ca960d 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -62,7 +62,7 @@ class TextSearch: public cppu::WeakImplHelper
 
     // define a function pointer for the different search methods
     typedef css::util::SearchResult
-        (SAL_CALL TextSearch:: *FnSrch)( const OUString& searchStr,
+        (SAL_CALL TextSearch::*FnSrch)( const OUString& searchStr,
                                 sal_Int32 startPos, sal_Int32 endPos );
 
     FnSrch fnForward;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 8f9925c3c024..07886b68f6a0 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -1043,7 +1043,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
                 if( pArgs && SfxItemState::SET == pArgs->GetItemState( nId, false, &pItem ))
                     nCnt = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
 
-                bool (SfxUndoManager:: *fnDo)();
+                bool (SfxUndoManager::*fnDo)();
 
                 size_t nCount;
                 if( SID_UNDO == rReq.GetSlot() )
@@ -1150,7 +1150,7 @@ void SmDocShell::GetState(SfxItemSet &rSet)
                 SfxUndoManager* pTmpUndoMgr = GetUndoManager();
                 if( pTmpUndoMgr )
                 {
-                    OUString(SfxUndoManager:: *fnGetComment)( size_t, bool const ) const;
+                    OUString(SfxUndoManager::*fnGetComment)( size_t, bool const ) const;
 
                     size_t nCount;
                     if( SID_GETUNDOSTRINGS == nWh )
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 52bd31b37b45..c7cb40e09694 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -57,7 +57,7 @@ public:
 
 class SAL_DLLPUBLIC_RTTI SwTableFormula
 {
-typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUStringBuffer&,
+typedef void (SwTableFormula::*FnScanFormula)( const SwTable&, OUStringBuffer&,
                                                 OUString&, OUString*, void* ) const;
 
     void BoxNmsToPtr( const SwTable&, OUStringBuffer&, OUString&, OUString*,
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ac257a843b92..ba8c67e3521c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -330,7 +330,7 @@ private:
                                 SwFrameFormat* );
     sal_Int8 SetFlyFrameAnchor( SwFrameFormat& rFlyFormat, SfxItemSet& rSet, bool bNewFrames );
 
-    typedef SwFormat* (SwDoc:: *FNCopyFormat)( const OUString&, SwFormat*, bool, bool );
+    typedef SwFormat* (SwDoc::*FNCopyFormat)( const OUString&, SwFormat*, bool, bool );
     SwFormat* CopyFormat( const SwFormat& rFormat, const SwFormatsBase& rFormatArr,
                         FNCopyFormat fnCopyFormat, const SwFormat& rDfltFormat );
     void CopyFormatArr( const SwFormatsBase& rSourceArr, SwFormatsBase const & rDestArr,
diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx
index b2c5279dc129..79a5be6649a9 100644
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.hxx
@@ -151,14 +151,14 @@ public:
     bool OverStepRight( long ) const;
 };
 
-typedef void (SwRect:: *SwRectSet)( const long nNew );
-typedef long (SwRect:: *SwRectGet)() const;
-typedef Point (SwRect:: *SwRectPoint)() const;
-typedef Size (SwRect:: *SwRectSize)() const;
-typedef bool (SwRect:: *SwRectMax)( long ) const;
-typedef long (SwRect:: *SwRectDist)( long ) const;
-typedef void (SwRect:: *SwRectSetTwice)( long, long );
-typedef void (SwRect:: *SwRectSetPos)( const Point& );
+typedef void (SwRect::*SwRectSet)( const long nNew );
+typedef long (SwRect::*SwRectGet)() const;
+typedef Point (SwRect::*SwRectPoint)() const;
+typedef Size (SwRect::*SwRectSize)() const;
+typedef bool (SwRect::*SwRectMax)( long ) const;
+typedef long (SwRect::*SwRectDist)( long ) const;
+typedef void (SwRect::*SwRectSetTwice)( long, long );
+typedef void (SwRect::*SwRectSetPos)( const Point& );
 
 //  Set-Methods
 inline void SwRect::Chg( const Point& rNP, const Size &rNS )
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 429746737bf4..ac5bc9570569 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -1258,11 +1258,11 @@ public:
     SwFrameDeleteGuard& operator=(const SwFrameDeleteGuard&) =delete;
 };
 
-typedef long (SwFrame:: *SwFrameGet)() const;
-typedef bool (SwFrame:: *SwFrameMax)( long );
-typedef void (SwFrame:: *SwFrameMakePos)( const SwFrame*, const SwFrame*, bool );
+typedef long (SwFrame::*SwFrameGet)() const;
+typedef bool (SwFrame::*SwFrameMax)( long );
+typedef void (SwFrame::*SwFrameMakePos)( const SwFrame*, const SwFrame*, bool );
 typedef long (*SwOperator)( long, long );
-typedef void (SwFrame:: *SwFrameSet)( long, long );
+typedef void (SwFrame::*SwFrameSet)( long, long );
 
 struct SwRectFnCollection
 {
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index 492c24957fd1..9326b348dcc2 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -60,9 +60,9 @@ typedef bool (*GoNd)( SwNode*, SwIndex*, sal_uInt16 );
 typedef SwContentNode* (*GoNds)( SwNodeIndex*, bool );
 typedef void (*GoDoc)( SwPosition* );
 typedef void (*GoSection)( SwPosition* );
-typedef bool (SwPosition:: *CmpOp)( const SwPosition& ) const;
+typedef bool (SwPosition::*CmpOp)( const SwPosition& ) const;
 typedef const SwTextAttr* (*GetHint)( const SwpHints&, size_t&, sal_Int32 );
-typedef bool (utl::TextSearch:: *SearchText)( const OUString&, sal_Int32*,
+typedef bool (utl::TextSearch::*SearchText)( const OUString&, sal_Int32*,
                     sal_Int32*, css::util::SearchResult* );
 typedef void (*MvSection)( SwNodeIndex * );
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 9dbd735fabe9..bbb6868a235f 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6510,8 +6510,8 @@ static void lcl_RefreshLine( const SwLayoutFrame *pLay,
     const bool bHori = rP1.Y() == rP2.Y();
 
     // use pointers to member function in order to unify flow
-    typedef long (Point:: *pmfPtGet)() const;
-    typedef void (Point:: *pmfPtSet)(long);
+    typedef long (Point::*pmfPtGet)() const;
+    typedef void (Point::*pmfPtSet)(long);
     const pmfPtGet pDirPtX = &Point::X;
     const pmfPtGet pDirPtY = &Point::Y;
     const pmfPtGet pDirPt = bHori ? pDirPtX : pDirPtY;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 1cc60c27a8af..1897a874582a 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -755,7 +755,7 @@ void WW8FieldEntry::SetBookmarkCode(const OUString& bookmarkCode)
 // Returnvalue: Total length of field
 long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
 {
-    typedef eF_ResT (SwWW8ImplReader:: *FNReadField)( WW8FieldDesc*, OUString& );
+    typedef eF_ResT (SwWW8ImplReader::*FNReadField)( WW8FieldDesc*, OUString& );
     enum Limits {eMax = 96};
     static const FNReadField aWW8FieldTab[eMax+1] =
     {
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index ebb21ecd5199..b546cb0ac79c 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -5256,7 +5256,7 @@ bool SwWW8ImplReader::ParseTabPos(WW8_TablePos *pTabPos, WW8PLCFx_Cp_FKP* pPap)
 long SwWW8ImplReader::ImportExtSprm(WW8PLCFManResult* pRes)
 {
     // array for reading of the extended ( self-defined ) SPRMs
-    typedef long (SwWW8ImplReader:: *FNReadRecordExt)(WW8PLCFManResult*);
+    typedef long (SwWW8ImplReader::*FNReadRecordExt)(WW8PLCFManResult*);
 
     static const FNReadRecordExt aWwSprmTab[] =
     {
@@ -5284,7 +5284,7 @@ long SwWW8ImplReader::ImportExtSprm(WW8PLCFManResult* pRes)
 
 void SwWW8ImplReader::EndExtSprm(sal_uInt16 nSprmId)
 {
-    typedef sal_uInt16 (SwWW8ImplReader:: *FNReadRecordExt)();
+    typedef sal_uInt16 (SwWW8ImplReader::*FNReadRecordExt)();
 
     static const FNReadRecordExt aWwSprmTab[] =
     {
@@ -5304,7 +5304,7 @@ void SwWW8ImplReader::EndExtSprm(sal_uInt16 nSprmId)
 // arrays for reading the SPRMs
 
 // function for reading of SPRMs. Par1: SprmId
-typedef void (SwWW8ImplReader:: *FNReadRecord)( sal_uInt16, const sal_uInt8*, short );
+typedef void (SwWW8ImplReader::*FNReadRecord)( sal_uInt16, const sal_uInt8*, short );
 
 struct SprmReadInfo
 {
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 8f3cf437a660..ba4f37b1e040 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -36,7 +36,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > const & xM
 
     static const struct SwLabItemMap {
         const char* pName;
-        OUString SwLabItem:: *pValue;
+        OUString SwLabItem::*pValue;
     }  aArr[] = {
         { "BC_PRIV_FIRSTNAME"  , &SwLabItem::m_aPrivFirstName },
         { "BC_PRIV_NAME"       , &SwLabItem::m_aPrivName },
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 8cb74403c795..1b70623ccb33 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -198,7 +198,7 @@ public:
     void    SelAll();
 
     // basecursortravelling
-typedef bool (SwWrtShell:: *FNSimpleMove)();
+typedef bool (SwWrtShell::*FNSimpleMove)();
     bool SimpleMove( FNSimpleMove, bool bSelect );
 
     bool Left       ( sal_uInt16 nMode, bool bSelect,
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 0d21ad65554c..81f17f8bfd59 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -819,7 +819,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept )
     else
         rTreeView.all_foreach(lambda);
 
-    bool (SwEditShell:: *FnAccRej)( SwRedlineTable::size_type ) = &SwEditShell::AcceptRedline;
+    bool (SwEditShell::*FnAccRej)( SwRedlineTable::size_type ) = &SwEditShell::AcceptRedline;
     if( !bAccept )
         FnAccRej = &SwEditShell::RejectRedline;
 
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index f43534d66eb3..c08be05edaad 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1615,7 +1615,7 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet)
             {
                 if( pUndoManager )
                 {
-                    OUString (SfxUndoManager:: *fnGetComment)( size_t, bool const ) const;
+                    OUString (SfxUndoManager::*fnGetComment)( size_t, bool const ) const;
 
                     sal_uInt16 nCount;
                     if( SID_GETUNDOSTRINGS == nWhich )
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 4b72415e4aaa..f8e34eabde29 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -549,7 +549,7 @@ void SwDrawTextShell::StateUndo(SfxItemSet &rSet)
                 SfxUndoManager* pUndoManager = GetUndoManager();
                 if( pUndoManager )
                 {
-                    OUString (SfxUndoManager:: *fnGetComment)( size_t, bool const ) const;
+                    OUString (SfxUndoManager::*fnGetComment)( size_t, bool const ) const;
 
                     sal_uInt16 nCount;
                     if( SID_GETUNDOSTRINGS == nWhich )
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 72a3cc8ba090..c19df2979057 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -108,7 +108,7 @@ std::weak_ptr<SvtDefaultOptions_Impl> g_pOptions;
 
 }
 
-typedef OUString SvtDefaultOptions_Impl:: *PathStrPtr;
+typedef OUString SvtDefaultOptions_Impl::*PathStrPtr;
 
 namespace {