[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - compilerplugins/clang

[Stephan Bergmann]

 compilerplugins/clang/badstatics.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5f20d614b7be2a2b5a1dad31695d441a40213e2e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 26 09:58:15 2015 +0100

    Adapt whitelisted names
    
    ...after 49c2b9808df8a6b197dec666dfc0cda6321a4306
    "bin/rename-sw-abbreviations.sh"
    
    Change-Id: I90cec551bdc52ea4d76dd9e32b45692e8a3be70f
    (cherry picked from commit 88309564142eecc86e4d30a917032637d5c48e2b)

diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx
index 394c33e..5900f49 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -126,10 +126,10 @@ public:
                 || name == "s_pVout" // _FrmFinit()
                 || name == "s_pPaintQueue" // SwPaintQueue::Remove()
                 || name == "gProp" // only owned (VclPtr) member cleared again
-                || name == "g_pColumnCacheLastTabFrm" // not owning
-                || name == "g_pColumnCacheLastCellFrm" // not owning
-                || name == "g_pRowCacheLastTabFrm" // not owning
-                || name == "g_pRowCacheLastCellFrm" // not owning
+                || name == "g_pColumnCacheLastTabFrame" // not owning
+                || name == "g_pColumnCacheLastCellFrame" // not owning
+                || name == "g_pRowCacheLastTabFrame" // not owning
+                || name == "g_pRowCacheLastCellFrame" // not owning
                 || name == "g_OszCtrl" // SwCrsrOszControl::Exit()
                 || name == "g_pSpellIter" // SwEditShell::SpellEnd()
                 || name == "g_pConvIter" // SwEditShell::SpellEnd()