remove noise UUUU tags in comments

Change-Id: Id8a2940ae7348bf75ca967f31adf8489dc678d00 Reviewed-on: https://gerrit.libreoffice.org/35161 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
author: Noel Grandin <noel.grandin@collabora.co.uk> 2017-03-14 09:14:53 +0200
committer: Noel Grandin <noel.grandin@collabora.co.uk> 2017-03-14 08:23:53 +0000
commit: 427678b9cf7fe968c10877dd6facecd8552fd291 (patch)
tree: c9efd0d9757e12660f1377abf1ea88f70266eb5a
parent: 250995d2b8d8ad544110d3daeb2f61089bff0aa5 (diff)
86 files changed, 237 insertions, 478 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 6b9640122360..f09b5b0fa318 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1050,7 +1050,6 @@ VclPtr<AbstractSvxSearchSimilarityDialog> AbstractDialogFactory_Impl::CreateSvxS
     return VclPtr<AbstractSvxSearchSimilarityDialog_Impl>::Create( pDlg );
 }
 
-//UUUU
 VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg(
     vcl::Window* pParent,
     const SfxItemSet& rCoreSet,
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 2cf6761d6dc1..9c1b19725d90 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -505,7 +505,7 @@ public:
     virtual VclPtr<AbstractFmShowColsDialog> CreateFmShowColsDialog() override;
     virtual VclPtr<AbstractSvxZoomDialog> CreateSvxZoomDialog( vcl::Window* pParent,
                                             const SfxItemSet& rCoreSet) override;
-   //UUUU add for SvxBorderBackgroundDlg
+   // add for SvxBorderBackgroundDlg
     virtual VclPtr<SfxAbstractTabDialog> CreateSvxBorderBackgroundDlg(
        vcl::Window* pParent,
        const SfxItemSet& rCoreSet,
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index d0317b66fbfa..1f86cb772874 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -64,7 +64,6 @@
         <SvxLRSpaceItem>:       <SID_ATTR_LRSPACE>
 */
 
-//UUUU struct   SvxPage_Impl;
 typedef sal_uInt16 MarginPosition;
 
 class SvxPageDescPage : public SfxTabPage
@@ -139,14 +138,11 @@ private:
     Paper               ePaperStart;
     Paper               ePaperEnd;
 
-    //UUUU SvxPage_Impl*        pImpl;
     MarginPosition      m_nPos;
     VclPtr<Printer>     mpDefPrinter;
 
     bool                mbDelPrinter : 1;
-
-    //UUUU
-    bool mbEnableDrawingLayerFillStyles : 1;
+    bool                mbEnableDrawingLayerFillStyles : 1;
 
     void                Init_Impl();
     DECL_LINK(    LayoutHdl_Impl, ListBox&, void);
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index 23422c352118..0cef97d9ce1b 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -20,7 +20,6 @@
 #include "bbdlg.hxx"
 #include "border.hxx"
 #include "backgrnd.hxx"
-//UUUU
 #include "svx/svxids.hrc"
 #include "cuitabarea.hxx"
 
@@ -45,7 +44,7 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(vcl::Window *pParent,
     AddTabPage("borders", SvxBorderTabPage::Create, nullptr );
     if (mbEnableDrawingLayerFillStyles)
     {
-        //UUUU Here we want full DrawingLayer FillStyle access, so add Area and Transparency TabPages
+        // Here we want full DrawingLayer FillStyle access, so add Area and Transparency TabPages
         m_nAreaPageId = AddTabPage("area", SvxAreaTabPage::Create, nullptr);
         m_nTransparencePageId = AddTabPage("transparence", SvxTransparenceTabPage::Create, nullptr);
     }
@@ -65,7 +64,7 @@ void SvxBorderBackgroundDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPa
             static_cast< SvxBackgroundTabPage& >(rTabPage).ShowSelector();
         }
     }
-    //UUUU inits for Area and Transparency TabPages
+    // inits for Area and Transparency TabPages
     // The selection attribute lists (XPropertyList derivates, e.g. XColorList for
     // the color table) need to be added as items (e.g. SvxColorTableItem) to make
     // these pages find the needed attributes for fill style suggestions.
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index d85c1aa62a8e..0b0f750afad9 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -54,11 +54,8 @@
 #include <svl/slstitm.hxx>
 #include <svl/aeitem.hxx>
 #include <sfx2/request.hxx>
-
-//UUUU
 #include <svx/xdef.hxx>
 #include <svx/unobrushitemhelper.hxx>
-
 #include <svx/SvxNumOptionsTabPageHelper.hxx>
 
 // static ----------------------------------------------------------------
@@ -140,21 +137,6 @@ bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize )
 #define MARGIN_TOP      ( (MarginPosition)0x0004 )
 #define MARGIN_BOTTOM   ( (MarginPosition)0x0008 )
 
-//UUUU
-//struct SvxPage_Impl
-//{
-//  MarginPosition  m_nPos;
-//    Printer*        mpDefPrinter;
-//    bool            mbDelPrinter;
-//
-//    SvxPage_Impl() :
-//        m_nPos( 0 ),
-//        mpDefPrinter( 0 ),
-//        mbDelPrinter( false ) {}
-//
-//    ~SvxPage_Impl() { if ( mbDelPrinter ) delete mpDefPrinter; }
-//};
-
 // class SvxPageDescPage --------------------------------------------------
 
 VclPtr<SfxTabPage> SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
@@ -170,16 +152,9 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr
     eMode               ( SVX_PAGE_MODE_STANDARD ),
     ePaperStart         ( PAPER_A3 ),
     ePaperEnd           ( PAPER_ENV_DL ),
-
-    //UUUU
-    // pImpl                ( new SvxPage_Impl ),
-
-    //UUUU
-    m_nPos( 0 ),
-    mpDefPrinter( nullptr ),
-    mbDelPrinter( false ),
-
-    //UUUU
+    m_nPos              ( 0 ),
+    mpDefPrinter        ( nullptr ),
+    mbDelPrinter        ( false ),
     mbEnableDrawingLayerFillStyles(false)
 {
     get(m_pPaperSizeBox,"comboPageFormat");
@@ -1168,7 +1143,7 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet)
 
             if(mbEnableDrawingLayerFillStyles)
             {
-                //UUUU create FillAttributes directly from DrawingLayer FillStyle entries
+                // create FillAttributes directly from DrawingLayer FillStyle entries
                 aHeaderFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(rTmpSet));
             }
             else
@@ -1177,7 +1152,7 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet)
 
                 if(SfxItemState::SET == rTmpSet.GetItemState(nWhich))
                 {
-                    //UUUU create FillAttributes from SvxBrushItem
+                    // create FillAttributes from SvxBrushItem
                     const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rTmpSet.Get(nWhich));
                     SfxItemSet aTempSet(*rTmpSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
@@ -1212,7 +1187,7 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet)
 
             if(mbEnableDrawingLayerFillStyles)
             {
-                //UUUU create FillAttributes directly from DrawingLayer FillStyle entries
+                // create FillAttributes directly from DrawingLayer FillStyle entries
                 aFooterFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(rTmpSet));
             }
             else
@@ -1221,7 +1196,7 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet)
 
                 if(SfxItemState::SET == rTmpSet.GetItemState(nWhich))
                 {
-                    //UUUU create FillAttributes from SvxBrushItem
+                    // create FillAttributes from SvxBrushItem
                     const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rTmpSet.Get(nWhich));
                     SfxItemSet aTempSet(*rTmpSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
@@ -1246,7 +1221,7 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet)
 
     if(mbEnableDrawingLayerFillStyles)
     {
-        //UUUU create FillAttributes directly from DrawingLayer FillStyle entries
+        // create FillAttributes directly from DrawingLayer FillStyle entries
         aPageFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(rSet));
     }
     else
@@ -1255,7 +1230,7 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet)
 
         if(pItem)
         {
-            //UUUU create FillAttributes from SvxBrushItem
+            // create FillAttributes from SvxBrushItem
             const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(*pItem);
             SfxItemSet aTempSet(*rSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
@@ -1316,7 +1291,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
 
         if(mbEnableDrawingLayerFillStyles)
         {
-            //UUUU create FillAttributes directly from DrawingLayer FillStyle entries
+            // create FillAttributes directly from DrawingLayer FillStyle entries
             aHeaderFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(rHeaderSet));
         }
         else
@@ -1325,7 +1300,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
 
             if(rHeaderSet.GetItemState(nWhich) >= SfxItemState::DEFAULT)
             {
-                //UUUU aBspWin.SetHdColor(rItem.GetColor());
+                // aBspWin.SetHdColor(rItem.GetColor());
                 const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rHeaderSet.Get(nWhich));
                 SfxItemSet aTempSet(*rHeaderSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
@@ -1378,7 +1353,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
 
         if(mbEnableDrawingLayerFillStyles)
         {
-            //UUUU create FillAttributes directly from DrawingLayer FillStyle entries
+            // create FillAttributes directly from DrawingLayer FillStyle entries
             aFooterFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(rFooterSet));
         }
         else
@@ -1387,7 +1362,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
 
             if(rFooterSet.GetItemState(nWhich) >= SfxItemState::DEFAULT)
             {
-                //UUUU aBspWin.SetFtColor(rItem.GetColor());
+                // aBspWin.SetFtColor(rItem.GetColor());
                 const SvxBrushItem& rItem = static_cast<const SvxBrushItem&>(rFooterSet.Get(nWhich));
                 SfxItemSet aTempSet(*rFooterSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
@@ -1699,8 +1674,6 @@ void SvxPageDescPage::PageCreated(const SfxAllItemSet& aSet)
     const SfxAllEnumItem* pPaperStartItem = aSet.GetItem<SfxAllEnumItem>(SID_PAPER_START, false);
     const SfxAllEnumItem* pPaperEndItem = aSet.GetItem<SfxAllEnumItem>(SID_PAPER_END, false);
     const SfxStringListItem* pCollectListItem = aSet.GetItem<SfxStringListItem>(SID_COLLECT_LIST, false);
-
-    //UUUU
     const SfxBoolItem* pSupportDrawingLayerFillStyleItem = aSet.GetItem<SfxBoolItem>(SID_DRAWINGLAYER_FILLSTYLES, false);
 
     if (pModeItem)
diff --git a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
index f191dc373e03..79a35a257dc2 100644
--- a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
@@ -220,7 +220,7 @@ namespace drawinglayer
             basegfx::B2DPoint aBitmapSize(1.0, 1.0);
             basegfx::B2DVector aBitmapTopLeft(0.0, 0.0);
 
-            //UUUU are changes needed? When stretched we are already done, all other values will have no influence
+            // are changes needed? When stretched we are already done, all other values will have no influence
             if(getTiling() || !mpSdrFillGraphicAttribute->getStretch())
             {
                 // init values with range sizes
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 149db46ea4e3..daa379b690fa 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -107,7 +107,7 @@ public:
     const OUString&         GetGraphicLink() const      { return maStrLink; }
     const OUString&         GetGraphicFilter() const    { return maStrFilter; }
 
-    //UUUU get graphic transparency in percent
+    // get graphic transparency in percent
     sal_Int8 getGraphicTransparency() const { return nGraphicTransparency; }
     void setGraphicTransparency(sal_Int8 nNew);
 
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 7db266f30e21..335f7aa74abb 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -52,7 +52,6 @@ public:
 
     void DisableDeleteQueryBox() { mbDisableQueryBox = true; }
 
-    //UUUU
     virtual void PageCreated(const SfxAllItemSet&) override;
 
     void            EnableDynamicSpacing();
diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx
index 50095f66a2d5..25b6bb54fe29 100644
--- a/include/svx/pagectrl.hxx
+++ b/include/svx/pagectrl.hxx
@@ -56,7 +56,6 @@ private:
     long nFtHeight;
     SvxBoxItem* pFtBorder;
 
-    //UUUU
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr  maHeaderFillAttributes;
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr  maFooterFillAttributes;
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr  maPageFillAttributes;
@@ -75,7 +74,6 @@ protected:
     virtual void DrawPage(vcl::RenderContext& rRenderContext, const Point& rPoint,
                           const bool bSecond, const bool bEnabled);
 
-    //UUUU
     void drawFillAttributes(vcl::RenderContext& rRenderContext,
                             const drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes,
                             const Rectangle& rPaintRange, const Rectangle& rDefineRange);
@@ -85,7 +83,6 @@ public:
     virtual ~SvxPageWindow() override;
     virtual void dispose() override;
 
-    //UUUU
     void setHeaderFillAttributes(const drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes)
     {
         maHeaderFillAttributes = rFillAttributes;
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index a88bed567381..12f7f70372eb 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -377,7 +377,7 @@ public:
                                                             sal_uInt16 nOther,
                                                             sal_uInt16 nShorter,
                                                             sal_uInt16 nLonger ) = 0;
-    //UUUU add for SvxBorderBackgroundDlg
+    // add for SvxBorderBackgroundDlg
     virtual VclPtr<SfxAbstractTabDialog> CreateSvxBorderBackgroundDlg(
         vcl::Window* pParent,
         const SfxItemSet& rCoreSet,
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 9a7fc71d885c..79eef2acf4c1 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -972,7 +972,6 @@
 #define SID_ATTR_BORDER_DEFAULT_WIDTH                   ( SID_SVX_START + 1141 )
 // 1142 is used by editeng (SID_ATTR_CHAR_GRABBAG)
 
-//UUUU
 #define SID_OFFER_IMPORT                                ( SID_SVX_START + 1143 )
 #define SID_DRAWINGLAYER_FILLSTYLES                     ( SID_SVX_START + 1144)
 #define SID_PARASPACE_INCREASE                          ( SID_SVX_START + 1145 )
diff --git a/include/svx/unobrushitemhelper.hxx b/include/svx/unobrushitemhelper.hxx
index df68b86dafbd..6d710b9659f2 100644
--- a/include/svx/unobrushitemhelper.hxx
+++ b/include/svx/unobrushitemhelper.hxx
@@ -22,7 +22,7 @@
 #include "svx/svxdllapi.h"
 #include <editeng/brushitem.hxx>
 
-//UUUU Helper function definitions for UNO API fallbacks to replace SvxBrushItem. The
+// Helper function definitions for UNO API fallbacks to replace SvxBrushItem. The
 // idea is to have fallbacks to create a SvxBrushItem if needed for backwards compatibility
 // if needed from the SfxItemSet and vice versa. This is used in cases where e.g. UNO API
 // accesses to slots in the SvxBrushItem are used (see cases in SvxBrushItem::QueryValue
diff --git a/include/xmloff/PageMasterStyleMap.hxx b/include/xmloff/PageMasterStyleMap.hxx
index 702bb1a6c268..2b6a1b373768 100644
--- a/include/xmloff/PageMasterStyleMap.hxx
+++ b/include/xmloff/PageMasterStyleMap.hxx
@@ -85,7 +85,7 @@
 #define CTF_PM_GRAPHICFILTER            (XML_PM_CTF_START + 0x0033)
 #define CTF_PM_GRAPHICURL               (XML_PM_CTF_START + 0x0034)
 
-//UUUUNeed own entries for PageMasterStyleMap since these get *filtered*
+// Need own entries for PageMasterStyleMap since these get *filtered*
 // at export time using CTF_PM_FLAGMASK and XML_PM_CTF_START as detector
 // to find the first entry for header/footer (!), see
 // SvXMLAutoStylePoolP_Impl::exportXML, look for XML_STYLE_FAMILY_PAGE_MASTER
@@ -133,7 +133,7 @@
 #define CTF_PM_HEADERMARGINLEFT         (CTF_PM_HEADERFLAG|CTF_PM_MARGINLEFT)
 #define CTF_PM_HEADERMARGINRIGHT        (CTF_PM_HEADERFLAG|CTF_PM_MARGINRIGHT)
 
-//UUUUNeed own entries for PageMasterStyleMap ORed with the CTF_PM_HEADERFLAG
+// Need own entries for PageMasterStyleMap ORed with the CTF_PM_HEADERFLAG
 #define CTF_PM_HEADERREPEAT_OFFSET_X    (CTF_PM_HEADERFLAG|CTF_PM_REPEAT_OFFSET_X)
 #define CTF_PM_HEADERREPEAT_OFFSET_Y    (CTF_PM_HEADERFLAG|CTF_PM_REPEAT_OFFSET_Y)
 #define CTF_PM_HEADERFILLGRADIENTNAME   (CTF_PM_HEADERFLAG|CTF_PM_FILLGRADIENTNAME)
@@ -169,7 +169,7 @@
 #define CTF_PM_FOOTERMARGINLEFT         (CTF_PM_FOOTERFLAG|CTF_PM_MARGINLEFT)
 #define CTF_PM_FOOTERMARGINRIGHT        (CTF_PM_FOOTERFLAG|CTF_PM_MARGINRIGHT)
 
-//UUUUNeed own entries for PageMasterStyleMap ORed with the CTF_PM_FOOTERFLAG
+// Need own entries for PageMasterStyleMap ORed with the CTF_PM_FOOTERFLAG
 #define CTF_PM_FOOTERREPEAT_OFFSET_X    (CTF_PM_FOOTERFLAG|CTF_PM_REPEAT_OFFSET_X)
 #define CTF_PM_FOOTERREPEAT_OFFSET_Y    (CTF_PM_FOOTERFLAG|CTF_PM_REPEAT_OFFSET_Y)
 #define CTF_PM_FOOTERFILLGRADIENTNAME   (CTF_PM_FOOTERFLAG|CTF_PM_FILLGRADIENTNAME)
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 57f451c79bb3..cd843faf2c9d 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -26,7 +26,6 @@
 #include <vector>
 #include <xmloff/xmlstyle.hxx>
 
-//UUUU
 #include <unordered_set>
 
 struct XMLPropertyState;
@@ -36,7 +35,6 @@ namespace com { namespace sun { namespace star {
     namespace beans { class XPropertySet; }
 } } }
 
-//UUUU
 typedef std::unordered_set<OUString, OUStringHash> OldFillStyleDefinitionSet;
 
 class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext
@@ -53,25 +51,25 @@ private:
 
 protected:
 
-    //UUUU Helper to check if the local maProperties contains the given
+    // Helper to check if the local maProperties contains the given
     // FillStyle tag and if the FillStyle there is different from FillStyle_NONE
     bool doNewDrawingLayerFillStyleDefinitionsExist(
         const ::rtl::OUString& rFillStyleTag) const;
 
-    //UUUU Helper which will deactivate all old fill definitions (identified by
+    // Helper which will deactivate all old fill definitions (identified by
     // the given OldFillStyleDefinitionSet) in the local maProperties. Deactivation
     // is done setting theindex to -1. It returns true when actually old fill
     // definitions existed and were deactivated
     void deactivateOldFillStyleDefinitions(
         const OldFillStyleDefinitionSet& rHashSetOfTags);
 
-    //UUUU Helper to translate new DrawingLayer FillStyle values which are name-based
+    // Helper to translate new DrawingLayer FillStyle values which are name-based
     // from ODF internal name to style display names which can be found in the current
     // document model (using NameOrIndex Items). The change is executed on the internal
     // maProperties. The return value is true when actually names were changed
     void translateNameBasedDrawingLayerFillStyleDefinitionsToStyleDisplayNames();
 
-    //UUUU provider for often used sets
+    // provider for often used sets
     static const OldFillStyleDefinitionSet& getStandardSet();
     static const OldFillStyleDefinitionSet& getHeaderSet();
     static const OldFillStyleDefinitionSet& getFooterSet();
diff --git a/include/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx
index b57f7549ab23..010dad07fc38 100644
--- a/include/xmloff/xmltypes.hxx
+++ b/include/xmloff/xmltypes.hxx
@@ -281,7 +281,6 @@
 #define XML_TYPE_CHAR_RFC_LANGUAGE_TAG  (XML_TEXT_TYPES_START + 117)
 #define XML_TYPE_VERTICAL_ALIGN         (XML_TEXT_TYPES_START + 118)
 
-//UUUU
 #define XML_SW_TYPE_FILLSTYLE           (XML_TEXT_TYPES_START + 119)
 #define XML_SW_TYPE_FILLBITMAPSIZE      (XML_TEXT_TYPES_START + 120)
 #define XML_SW_TYPE_LOGICAL_SIZE        (XML_TEXT_TYPES_START + 121)
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 339c75b24a3d..d05af1653510 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -122,7 +122,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
         if (pMgr)
             pDrawLayer->SetLinkManager(pMgr);
 
-        //UUUU set DrawingLayer's SfxItemPool at Calc's SfxItemPool as
+        // set DrawingLayer's SfxItemPool at Calc's SfxItemPool as
         // secondary pool to support DrawingLayer FillStyle ranges (and similar)
         // in SfxItemSets using the Calc SfxItemPool. This is e.g. needed when
         // the PageStyle using SvxBrushItem is visualized and will be potentially
@@ -235,7 +235,7 @@ IMPL_LINK( ScDocument, GetUserDefinedColor, sal_uInt16, nColorIndex, Color* )
 
 void ScDocument::DeleteDrawLayer()
 {
-    //UUUU remove DrawingLayer's SfxItemPool from Calc's SfxItemPool where
+    // remove DrawingLayer's SfxItemPool from Calc's SfxItemPool where
     // it is registered as secondary pool
     if (xPoolHelper.is() && !IsClipOrUndo()) //Using IsClipOrUndo as a proxy for SharePooledResources called
     {
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index cf11ada4d9b6..e818a146fe5f 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1049,7 +1049,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
     VclPtr<SfxTabPage> pTabPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId ));
     Data_Impl* pDataObject = Find( m_pImpl->aData, nId );
 
-    //UUUU fallback to 1st page when requested one does not exist
+    // fallback to 1st page when requested one does not exist
     if(!pDataObject && pTabCtrl->GetPageCount())
     {
         pTabCtrl->SetCurPageId(pTabCtrl->GetPageId(0));
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index f1ee79437a3b..044a1d9f7ddc 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -46,7 +46,6 @@
 #include <svx/svxdlg.hxx>
 #include <memory>
 
-//UUUU
 #include <svx/xdef.hxx>
 #include <svx/xenum.hxx>
 #include <svx/xfillit0.hxx>
@@ -66,7 +65,7 @@ const sal_uInt16 SvxHFPage::pRanges[] =
 {
     SID_ATTR_BRUSH,          SID_ATTR_BRUSH,
 
-    //UUUU Support DrawingLayer FillStyles (no real call to below GetRanges()
+    // Support DrawingLayer FillStyles (no real call to below GetRanges()
     // detected, still do the complete transition)
     XATTR_FILL_FIRST,        XATTR_FILL_LAST,
 
@@ -265,7 +264,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet )
         nWShadow, nWShadow,
         nWDynSpacing, nWDynSpacing,
 
-        //UUUU take over DrawingLayer FillStyles
+        // take over DrawingLayer FillStyles
         XATTR_FILL_FIRST, XATTR_FILL_LAST,                // [1014
 
         0, 0};
@@ -278,7 +277,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet )
 
     if(mbEnableDrawingLayerFillStyles)
     {
-        //UUUU When using the XATTR_FILLSTYLE DrawingLayer FillStyle definition
+        // When using the XATTR_FILLSTYLE DrawingLayer FillStyle definition
         // extra action has to be done here since the pool default is drawing::FillStyle_SOLID
         // instead of drawing::FillStyle_NONE (to have the default blue fill color at start).
         aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
@@ -353,7 +352,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet )
                 aSet.Put(_pSet->Get(nWShadow));
             }
 
-            //UUUU take care of [XATTR_XATTR_FILL_FIRST .. XATTR_FILL_LAST]
+            // take care of [XATTR_XATTR_FILL_FIRST .. XATTR_FILL_LAST]
             for(sal_uInt16 nFillStyleId(XATTR_FILL_FIRST); nFillStyleId <= XATTR_FILL_LAST; nFillStyleId++)
             {
                 if(_pSet->GetItemState(nFillStyleId) == SfxItemState::SET)
@@ -607,7 +606,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, Button*, void)
                 nShadow, nShadow,
                 0, 0);
 
-            //UUUU copy items for XPropertyList entries from the DrawModel so that
+            // copy items for XPropertyList entries from the DrawModel so that
             // the Area TabPage can access them
             static const sal_uInt16 nCopyFlags[] = {
                 SID_COLOR_TABLE,
@@ -657,7 +656,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, Button*, void)
         {
             if(mbEnableDrawingLayerFillStyles)
             {
-                //UUUU The style for header/footer is not yet created, need to reset
+                // The style for header/footer is not yet created, need to reset
                 // XFillStyleItem to drawing::FillStyle_NONE which is the same as in the style
                 // initialization. This needs to be done since the pool default for
                 // XFillStyleItem is drawing::FillStyle_SOLID
@@ -676,7 +675,6 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, Button*, void)
 
     if(pFact)
     {
-        //UUUU
         ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg(
             this,
             *pBBSet,
@@ -704,7 +702,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, Button*, void)
 
                 if(mbEnableDrawingLayerFillStyles)
                 {
-                    //UUUU create FillAttributes directly from DrawingLayer FillStyle entries
+                    // create FillAttributes directly from DrawingLayer FillStyle entries
                     aFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(*pBBSet));
                 }
                 else
@@ -713,7 +711,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, Button*, void)
 
                     if(pBBSet->GetItemState(nWhich) == SfxItemState::SET)
                     {
-                        //UUUU create FillAttributes from SvxBrushItem
+                        // create FillAttributes from SvxBrushItem
                         const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(pBBSet->Get(nWhich));
                         SfxItemSet aTempSet(*pBBSet->GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
@@ -791,7 +789,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
 
             if(mbEnableDrawingLayerFillStyles)
             {
-                //UUUU create FillAttributes directly from DrawingLayer FillStyle entries
+                // create FillAttributes directly from DrawingLayer FillStyle entries
                 aHeaderFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(rTmpSet));
             }
             else
@@ -800,7 +798,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
 
                 if(SfxItemState::SET == rTmpSet.GetItemState(nWhich))
                 {
-                    //UUUU create FillAttributes from SvxBrushItem
+                    // create FillAttributes from SvxBrushItem
                     const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rTmpSet.Get(nWhich));
                     SfxItemSet aTempSet(*rTmpSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
@@ -835,7 +833,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
 
             if(mbEnableDrawingLayerFillStyles)
             {
-                //UUUU create FillAttributes directly from DrawingLayer FillStyle entries
+                // create FillAttributes directly from DrawingLayer FillStyle entries
                 aFooterFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(rTmpSet));
             }
             else
@@ -844,7 +842,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
 
                 if(SfxItemState::SET == rTmpSet.GetItemState(nWhich))
                 {
-                    //UUUU create FillAttributes from SvxBrushItem
+                    // create FillAttributes from SvxBrushItem
                     const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rTmpSet.Get(nWhich));
                     SfxItemSet aTempSet(*rTmpSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
@@ -868,7 +866,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
 
     if(mbEnableDrawingLayerFillStyles)
     {
-        //UUUU create FillAttributes directly from DrawingLayer FillStyle entries
+        // create FillAttributes directly from DrawingLayer FillStyle entries
         aPageFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(rSet));
     }
     else
@@ -877,7 +875,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
 
         if(rSet.GetItemState(nWhich) >= SfxItemState::DEFAULT)
         {
-            //UUUU create FillAttributes from SvxBrushItem
+            // create FillAttributes from SvxBrushItem
             const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rSet.Get(nWhich));
             SfxItemSet aTempSet(*rSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
@@ -1166,7 +1164,6 @@ void SvxHFPage::EnableDynamicSpacing()
 
 void SvxHFPage::PageCreated(const SfxAllItemSet &rSet)
 {
-    //UUUU
     const SfxBoolItem* pSupportDrawingLayerFillStyleItem = rSet.GetItem<SfxBoolItem>(SID_DRAWINGLAYER_FILLSTYLES, false);
 
     if(pSupportDrawingLayerFillStyleItem)
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 5e18beebbd59..38a1169e1cd2 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -45,7 +45,6 @@ SvxPageWindow::SvxPageWindow(vcl::Window* pParent)
     nLeft(0),
     nRight(0),
 
-    //UUUU
     pBorder(nullptr),
     bResetBackground(false),
     bFrameDirection(false),
@@ -208,10 +207,10 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO
 
     if (bHeader || bFooter)
     {
-        //UUUU Header and/or footer used
+        // Header and/or footer used
         const Color aLineColor(rRenderContext.GetLineColor());
 
-        //UUUU draw PageFill first and on the whole page, no outline
+        // draw PageFill first and on the whole page, no outline
         rRenderContext.SetLineColor();
         drawFillAttributes(rRenderContext, maPageFillAttributes, aRect, aRect);
         rRenderContext.SetLineColor(aLineColor);
@@ -245,7 +244,7 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO
     }
     else
     {
-        //UUUU draw PageFill and outline
+        // draw PageFill and outline
         drawFillAttributes(rRenderContext, maPageFillAttributes, aRect, aRect);
     }
 
@@ -344,7 +343,6 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO
     }
 }
 
-//UUUU
 void SvxPageWindow::drawFillAttributes(vcl::RenderContext& rRenderContext,
                                        const drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes,
                                        const Rectangle& rPaintRange,
diff --git a/svx/source/unodraw/unobrushitemhelper.cxx b/svx/source/unodraw/unobrushitemhelper.cxx
index 5f610e1dacb3..a62b083f0eb2 100644
--- a/svx/source/unodraw/unobrushitemhelper.cxx
+++ b/svx/source/unodraw/unobrushitemhelper.cxx
@@ -38,7 +38,6 @@
 
 using namespace com::sun::star;
 
-//UUUU
 void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxItemSet& rToSet)
 {
     // Clear all items from the DrawingLayer FillStyle range (if we have any). All
@@ -150,7 +149,6 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI
     }
 }
 
-//UUUU
 sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, bool bSearchInParents)
 {
     sal_uInt16 nFillTransparence(static_cast< const XFillTransparenceItem& >(rSourceSet.Get(XATTR_FILLTRANSPARENCE, bSearchInParents)).GetValue());
@@ -170,7 +168,6 @@ sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, bool bSe
     return nFillTransparence;
 }
 
-//UUUU
 SvxBrushItem getSvxBrushItemForSolid(const SfxItemSet& rSourceSet, bool bSearchInParents, sal_uInt16 nBackgroundID)
 {
     Color aFillColor(static_cast< const XFillColorItem& >(rSourceSet.Get(XATTR_FILLCOLOR, bSearchInParents)).GetColorValue());
@@ -191,7 +188,6 @@ SvxBrushItem getSvxBrushItemForSolid(const SfxItemSet& rSourceSet, bool bSearchI
     return SvxBrushItem(aFillColor, nBackgroundID);
 }
 
-//UUUU
 SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, sal_uInt16 nBackgroundID, bool bSearchInParents, bool bXMLImportHack)
 {
     const XFillStyleItem* pXFillStyleItem(rSourceSet.GetItem<XFillStyleItem>(XATTR_FILLSTYLE, bSearchInParents));
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 6b013fcff94a..1a6545898c8e 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -636,7 +636,7 @@ public:
                                 const SwSelBoxes* pSelBoxes,
                                 SwFrameFormat *pParent );
 
-    //UUUU Helper that checks for unique items for DrawingLayer items of type NameOrIndex
+    // Helper that checks for unique items for DrawingLayer items of type NameOrIndex
     // and evtl. corrects that items to ensure unique names for that type. This call may
     // modify/correct entries inside of the given SfxItemSet, and it will apply a name to
     // the items in question (what is essential to make the named slots associated with
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index a3a166182d45..405ee06a1c99 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -90,10 +90,8 @@ public:
     bool SetDerivedFrom(SwFormat *pDerivedFrom = nullptr);
 
     /// If bInParents is FALSE, search only in this format for attribute.
-    //UUUUinline
     const SfxPoolItem& GetFormatAttr( sal_uInt16 nWhich,
                                    bool bInParents = true ) const;
-    //UUUUinline
     SfxItemState GetItemState( sal_uInt16 nWhich, bool bSrchInParent = true,
                                     const SfxPoolItem **ppItem = nullptr ) const;
     SfxItemState GetBackgroundState(SvxBrushItem &rItem) const;
@@ -203,7 +201,7 @@ public:
     inline const SvxBoxItem               &GetBox( bool = true ) const;
     inline const SvxFormatKeepItem         &GetKeep( bool = true ) const;
 
-    //UUUU Create SvxBrushItem for Background fill (partially for backwards compatibility)
+    // Create SvxBrushItem for Background fill (partially for backwards compatibility)
     SvxBrushItem makeBackgroundBrushItem( bool = true ) const;
 
     inline const SvxShadowItem            &GetShadow( bool = true ) const;
@@ -250,7 +248,7 @@ public:
     */
     virtual bool IsBackgroundTransparent() const;
 
-    //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
+    // Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const;
     virtual bool supportsFullDrawingLayerFillAttributeSet() const;
 };
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 19a509d6b5da..c62895056200 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -62,7 +62,7 @@ class SW_DLLPUBLIC SwFrameFormat: public SwFormat
 
     css::uno::WeakReference<css::uno::XInterface> m_wXObject;
 
-    //UUUU DrawingLayer FillAttributes in a preprocessed form for primitive usage
+    // DrawingLayer FillAttributes in a preprocessed form for primitive usage
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr  maFillAttributes;
 
     // The assigned SwFrmFmt list.
@@ -163,7 +163,7 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrameFormat)
     void RegisterToFormat( SwFormat& rFormat );
 
-    //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
+    // Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const override;
     virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
 
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index aef7161dc64e..921509accee6 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -389,7 +389,7 @@ inline bool isFRMATR(const sal_uInt16 nWhich)
 {
     return (RES_FRMATR_BEGIN <= nWhich) && (RES_FRMATR_END > nWhich);
 }
-inline bool isDrawingLayerAttribute(const sal_uInt16 nWhich) //UUUU
+inline bool isDrawingLayerAttribute(const sal_uInt16 nWhich)
 {
     return (XATTR_START <= nWhich) && (XATTR_END > nWhich);
 }
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 384782bc6254..1798dad33a03 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -114,7 +114,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable
 
     css::uno::WeakReference<css::text::XTextContent> m_wXParagraph;
 
-    //UUUU DrawingLayer FillAttributes in a preprocessed form for primitive usage
+    // DrawingLayer FillAttributes in a preprocessed form for primitive usage
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr  maFillAttributes;
 
     SAL_DLLPRIVATE SwTextNode( const SwNodeIndex &rWhere, SwTextFormatColl *pTextColl,
@@ -790,7 +790,7 @@ public:
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwTextNode)
 
-    //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
+    // Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const override;
 
     /// In MS Word, the font underline setting of the paragraph end position won't affect the formatting of numbering, so we ignore it
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 04d883b19d62..a9a52227b7e9 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -70,7 +70,6 @@ class IDocumentListItems;
 class Point;
 typedef std::vector<SwOLENode*> SwOLENodes; // docary.hxx
 
-//UUUU
 namespace drawinglayer { namespace attribute {
     class SdrAllFillAttributesHelper;
     typedef std::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr;
@@ -477,7 +476,7 @@ public:
 
     static SwOLENodes* CreateOLENodesArray( const SwFormatColl& rColl, bool bOnlyWithInvalidSize );
 
-    //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
+    // Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const;
 
 private:
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 42c5ba2aafae..be584b623c27 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -136,7 +136,7 @@ class SwTableBoxValue;
 class SwAttrPool : public SfxItemPool
 {
 private:
-    //UUUU helpers to add/rmove DrawingLayer ItemPool, used in constructor
+    // helpers to add/rmove DrawingLayer ItemPool, used in constructor
     // and destructor; still isolated to evtl. allow other use later, but
     // used bz default now to have it instantly as needed for DrawingLayer
     // FillStyle support
diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx
index 1ac05dc1cd08..5d50605cd759 100644
--- a/sw/inc/swunohelper.hxx
+++ b/sw/inc/swunohelper.hxx
@@ -30,12 +30,8 @@ namespace com { namespace sun { namespace star {
         class Any;
     }
 }}}
-
 namespace rtl {class OUString;}
-
 class DateTime;
-
-//UUUU
 class SfxItemSet;
 
 namespace SWUnoHelper {
@@ -74,7 +70,7 @@ SW_DLLPUBLIC bool UCB_IsFile( const OUString& rURL );
     // is the URL a existing directory?
 bool UCB_IsDirectory( const OUString& rURL );
 
-///UUUU helper to check if fill style is set to color or bitmap
+/// helper to check if fill style is set to color or bitmap
 /// and thus formerly used SvxBrushItem parts need to be mapped
 /// for backwards compatibility
 bool needToMapFillItemsToSvxBrushItemTypes(const SfxItemSet& rSet, sal_uInt16 const nMemberId);
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index cf5b068c5e82..40b54b13b0d1 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -312,7 +312,7 @@
 #define WID_TXTCOL_AUTO_DISTANCE        6
 #define WID_TXTCOL_LINE_STYLE           7
 
-//UUUU This define would need the include of <svx/unoshprp.hxx>, but this ends
+// This define would need the include of <svx/unoshprp.hxx>, but this ends
 // in a mess; there *are* double used symbols which are used in a #define in
 // editengine and as an enum in sw; these will then collide and lead to severe
 // problems which will be hard to detect at all (e.g. look for UNO_NAME_CHAR_COLOR).
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index c4020c53acf8..1be45ccf6308 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -583,7 +583,7 @@
 #define UNO_NAME_FRAME_WIDTH_ABSOLUTE "FrameWidthAbsolute"
 #define UNO_NAME_FRAME_WIDTH_PERCENT "FrameWidthPercent"
 
-//UUUU names for FillAttributes from SVX
+// names for FillAttributes from SVX
 #define UNO_NAME_SW_FILLBMP_LOGICAL_SIZE UNO_NAME_FILLBMP_LOGICAL_SIZE
 #define UNO_NAME_SW_FILLBMP_OFFSET_X UNO_NAME_FILLBMP_OFFSET_X
 #define UNO_NAME_SW_FILLBMP_OFFSET_Y UNO_NAME_FILLBMP_OFFSET_Y
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index 2ccb88f2534b..0ff541461cee 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -18,7 +18,6 @@
 
 interface BaseTextFrame
 {
-    //UUUU
     SID_ATTR_FILL_STYLE
     [
         Export = FALSE;
@@ -27,7 +26,6 @@ interface BaseTextFrame
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    //UUUU
     SID_ATTR_FILL_COLOR
     [
         Export = FALSE;
@@ -36,7 +34,6 @@ interface BaseTextFrame
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    //UUUU
     SID_ATTR_FILL_GRADIENT
     [
         Export = FALSE;
@@ -45,7 +42,6 @@ interface BaseTextFrame
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    //UUUU
     SID_ATTR_FILL_HATCH
     [
         Export = FALSE;
@@ -54,7 +50,6 @@ interface BaseTextFrame
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    //UUUU
     SID_ATTR_FILL_BITMAP
     [
         Export = FALSE;
@@ -63,7 +58,6 @@ interface BaseTextFrame
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    //UUUU
     SID_ATTR_FILL_TRANSPARENCE
     [
         Export = FALSE;
@@ -72,7 +66,6 @@ interface BaseTextFrame
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    //UUUU
     SID_ATTR_FILL_FLOATTRANSPARENCE
     [
         Export = FALSE;
@@ -81,37 +74,31 @@ interface BaseTextFrame
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    //UUUU
     SID_COLOR_TABLE
     [
         StateMethod = GetDrawAttrStateTextFrame;
     ]
 
-    //UUUU
     SID_GRADIENT_LIST
     [
         StateMethod = GetDrawAttrStateTextFrame;
     ]
 
-    //UUUU
     SID_HATCH_LIST
     [
         StateMethod = GetDrawAttrStateTextFrame;
     ]
 
-    //UUUU
     SID_BITMAP_LIST
     [
         StateMethod = GetDrawAttrStateTextFrame;
     ]
 
-    //UUUU
     SID_PATTERN_LIST
     [
         StateMethod = GetDrawAttrStateTextFrame;
     ]
 
-    //UUUU
     SID_ATTRIBUTES_AREA
     [
         ExecMethod = ExecDrawDlgTextFrame;
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 5a974dd4d217..6b93b7e1c574 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1028,8 +1028,6 @@ static bool lcl_GetBackgroundColor( Color & rColor,
     const SvxBrushItem* pBackgrdBrush = nullptr;
     const Color* pSectionTOXColor = nullptr;
     SwRect aDummyRect;
-
-    //UUUU
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes;
 
     if ( pFrame &&
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 279a05af976b..7addf5ff6528 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -29,8 +29,6 @@
 #include <swcache.hxx>
 #include <swtblfmt.hxx>
 #include <svl/grabbagitem.hxx>
-
-//UUUU
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <svx/unobrushitemhelper.hxx>
 #include <svx/xdef.hxx>
@@ -392,7 +390,7 @@ const SfxPoolItem& SwFormat::GetFormatAttr( sal_uInt16 nWhich, bool bInParents )
 {
     if (RES_BACKGROUND == nWhich && supportsFullDrawingLayerFillAttributeSet())
     {
-        //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
+        // FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
         SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes or makeBackgroundBrushItem (simple fallback is in place and used)");
         static SvxBrushItem aSvxBrushItem(RES_BACKGROUND);
 
@@ -411,7 +409,7 @@ SfxItemState SwFormat::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, cons
 {
     if (RES_BACKGROUND == nWhich && supportsFullDrawingLayerFillAttributeSet())
     {
-        //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
+        // FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
         SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes or SwFormat::GetBackgroundStat (simple fallback is in place and used)");
         const drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFill = getSdrAllFillAttributesHelper();
 
@@ -446,7 +444,7 @@ SfxItemState SwFormat::GetBackgroundState(SvxBrushItem &rItem) const
 {
     if (supportsFullDrawingLayerFillAttributeSet())
     {
-        //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
+        // FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
         const drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFill = getSdrAllFillAttributesHelper();
 
         // check if the new fill attributes are used
@@ -480,10 +478,9 @@ bool SwFormat::SetFormatAttr( const SfxPoolItem& rAttr )
 
     bool bRet = false;
 
-    //UUUU
     if (RES_BACKGROUND == rAttr.Which() && supportsFullDrawingLayerFillAttributeSet())
     {
-        //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
+        // FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
         SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes (simple fallback is in place and used)");
         SfxItemSet aTempSet(*m_aSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST, 0, 0);
         const SvxBrushItem& rSource = static_cast< const SvxBrushItem& >(rAttr);
@@ -572,11 +569,11 @@ bool SwFormat::SetFormatAttr( const SfxItemSet& rSet )
 
     bool bRet = false;
 
-    //UUUU Use local copy to be able to apply needed changes, e.g. call
+    // Use local copy to be able to apply needed changes, e.g. call
     // CheckForUniqueItemForLineFillNameOrIndex which is needed for NameOrIndex stuff
     SfxItemSet aTempSet(rSet);
 
-    //UUUU Need to check for unique item for DrawingLayer items of type NameOrIndex
+    // Need to check for unique item for DrawingLayer items of type NameOrIndex
     // and evtl. correct that item to ensure unique names for that type. This call may
     // modify/correct entries inside of the given SfxItemSet
     if(GetDoc())
@@ -590,7 +587,7 @@ bool SwFormat::SetFormatAttr( const SfxItemSet& rSet )
 
         if(SfxItemState::SET == aTempSet.GetItemState(RES_BACKGROUND, false, &pSource))
         {
-            //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
+            // FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
             SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes (simple fallback is in place and used)");
 
             // copy all items to be set anyways to a local ItemSet with is also prepared for the new
@@ -798,12 +795,11 @@ void SwFormat::SetGrabBagItem(const uno::Any& rVal)
     m_pGrabBagItem->PutValue(rVal, 0);
 }
 
-//UUUU
 SvxBrushItem SwFormat::makeBackgroundBrushItem(bool bInP) const
 {
     if (supportsFullDrawingLayerFillAttributeSet())
     {
-        //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
+        // FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
         SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes (simple fallback is in place and used)");
 
         // fill the local static SvxBrushItem from the current ItemSet so that
@@ -815,7 +811,6 @@ SvxBrushItem SwFormat::makeBackgroundBrushItem(bool bInP) const
     return m_aSet.GetBackground(bInP);
 }
 
-//UUUU
 drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFormat::getSdrAllFillAttributesHelper() const
 {
     return drawinglayer::attribute::SdrAllFillAttributesHelperPtr();
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 3cc2dca668dd..29a6cb291d22 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -60,17 +60,16 @@ SwAttrPool::SwAttrPool( SwDoc* pD )
     SetVersionMap( 6, 1,136, pVersionMap6 );
     SetVersionMap( 7, 1,144, pVersionMap7 );
 
-    //UUUU create secondary pools immediately
+    // create secondary pools immediately
     createAndAddSecondaryPools();
 }
 
 SwAttrPool::~SwAttrPool()
 {
-    //UUUU cleanup secondary pools first
+    // cleanup secondary pools first
     removeAndDeleteSecondaryPools();
 }
 
-//UUUU
 void SwAttrPool::createAndAddSecondaryPools()
 {
     const SfxItemPool* pCheckAlreadySet = GetSecondaryPool();
@@ -114,7 +113,6 @@ void SwAttrPool::createAndAddSecondaryPools()
     }
 }
 
-//UUUU
 void SwAttrPool::removeAndDeleteSecondaryPools()
 {
     SfxItemPool *pSdrPool = GetSecondaryPool();
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 493b4fc590c8..7b85287a72e0 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -149,7 +149,7 @@ sal_uInt16 aTextFormatCollSetRange[] = {
     RES_PARATR_BEGIN, RES_PARATR_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
 
-    //UUUU FillAttribute support
+    // FillAttribute support
     XATTR_FILL_FIRST, XATTR_FILL_LAST,
 
     0
@@ -171,7 +171,7 @@ sal_uInt16 aTextNodeSetRange[] = {
     RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
 
-    //UUUU FillAttribute support (paragraph FillStyle)
+    // FillAttribute support (paragraph FillStyle)
     XATTR_FILL_FIRST, XATTR_FILL_LAST,
 
     0
@@ -231,7 +231,7 @@ sal_uInt16 aFrameFormatSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
 
-    //UUUU FillAttribute support (TextFrame, OLE, Writer GraphicObject)
+    // FillAttribute support (TextFrame, OLE, Writer GraphicObject)
     XATTR_FILL_FIRST, XATTR_FILL_LAST,
 
     0
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 06d61e8076cd..18f1c71c5ecc 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -1058,7 +1058,7 @@ namespace //local functions originally from docfmt.cxx
                      || isFRMATR(nWhich)
                      || isGRFATR(nWhich)
                      || isUNKNOWNATR(nWhich)
-                     || isDrawingLayerAttribute(nWhich) ) //UUUU
+                     || isDrawingLayerAttribute(nWhich) )
                 {
                     pOtherSet = &rChgSet;
                     bOtherAttr = true;
@@ -1086,7 +1086,7 @@ namespace //local functions originally from docfmt.cxx
                                         RES_GRFATR_BEGIN, RES_GRFATR_END-1,
                                         RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
 
-                                        //UUUU FillAttribute support
+                                        // FillAttribute support
                                         XATTR_FILL_FIRST, XATTR_FILL_LAST,
 
                                         0 );
@@ -1395,7 +1395,7 @@ namespace //local functions originally from docfmt.cxx
             {
                 SwRegHistory aRegH( pNode, *pNode, pHistory );
 
-                //UUUU Need to check for unique item for DrawingLayer items of type NameOrIndex
+                // Need to check for unique item for DrawingLayer items of type NameOrIndex
                 // and evtl. correct that item to ensure unique names for that type. This call may
                 // modify/correct entries inside of the given SfxItemSet
                 SfxItemSet aTempLocalCopy(*pOtherSet);
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index 4f95094eb545..b97143d3fbe4 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -75,33 +75,6 @@ void DocumentDrawModelManager::InitDrawModel()
     if ( mpDrawModel )
         ReleaseDrawModel();
 
-//UUUU
-//  // Setup DrawPool and EditEnginePool. Ownership is ours and only gets passed
-//  // to the Drawing.
-//  // The pools are destroyed in the ReleaseDrawModel.
-//  // for loading the drawing items. This must be loaded without RefCounts!
-//  SfxItemPool *pSdrPool = new SdrItemPool( &GetAttrPool() );
-//  // change DefaultItems for the SdrEdgeObj distance items to TWIPS.
-//  if(pSdrPool)
-//  {
-//      const long nDefEdgeDist = ((500 * 72) / 127); // 1/100th mm in twips
-//      pSdrPool->SetPoolDefaultItem(SdrEdgeNode1HorzDistItem(nDefEdgeDist));
-//      pSdrPool->SetPoolDefaultItem(SdrEdgeNode1VertDistItem(nDefEdgeDist));
-//      pSdrPool->SetPoolDefaultItem(SdrEdgeNode2HorzDistItem(nDefEdgeDist));
-//      pSdrPool->SetPoolDefaultItem(SdrEdgeNode2VertDistItem(nDefEdgeDist));
-//
-//      // #i33700#
-//      // Set shadow distance defaults as PoolDefaultItems. Details see bug.
-//      pSdrPool->SetPoolDefaultItem(makeSdrShadowXDistItem((300 * 72) / 127));
-//      pSdrPool->SetPoolDefaultItem(makeSdrShadowYDistItem((300 * 72) / 127));
-//  }
-//  SfxItemPool *pEEgPool = EditEngine::CreatePool( false );
-//  pSdrPool->SetSecondaryPool( pEEgPool );
-//   if ( !GetAttrPool().GetFrozenIdRanges () )
-//      GetAttrPool().FreezeIdRanges();
-//  else
-//      pSdrPool->FreezeIdRanges();
-
     // set FontHeight pool defaults without changing static SdrEngineDefaults
     m_rDoc.GetAttrPool().SetPoolDefaultItem(SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT ));
 
@@ -185,20 +158,7 @@ void DocumentDrawModelManager::ReleaseDrawModel()
     if ( mpDrawModel )
     {
         // !! Also maintain the code in the sw3io for inserting documents!!
-
         delete mpDrawModel; mpDrawModel = nullptr;
-//UUUU
-//      SfxItemPool *pSdrPool = GetAttrPool().GetSecondaryPool();
-//
-//      OSL_ENSURE( pSdrPool, "missing pool" );
-//      SfxItemPool *pEEgPool = pSdrPool->GetSecondaryPool();
-//      OSL_ENSURE( !pEEgPool->GetSecondaryPool(), "I don't accept additional pools");
-//      pSdrPool->Delete();                 // First have the items destroyed,
-//                                          // then destroy the chain!
-//      GetAttrPool().SetSecondaryPool( 0 );    // This one's a must!
-//      pSdrPool->SetSecondaryPool( 0 );    // That one's safer
-//      SfxItemPool::Free(pSdrPool);
-//      SfxItemPool::Free(pEEgPool);
     }
 }
 
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 23ca1027edb8..11f83a206e30 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -1294,7 +1294,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
                 aSet.Put( SvxULSpaceItem( 114, 114, RES_UL_SPACE ) );
             }
 
-            //UUUU for styles of FlyFrames do not set the FillStyle to make it a derived attribute
+            // for styles of FlyFrames do not set the FillStyle to make it a derived attribute
             aSet.ClearItem(XATTR_FILLSTYLE);
         }
         break;
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 583d8bb79bcc..6c108ed9f166 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -145,7 +145,7 @@ static void lcl_DescSetAttr( const SwFrameFormat &rSource, SwFrameFormat &rDest,
         RES_HEADER_FOOTER_EAT_SPACING,  RES_HEADER_FOOTER_EAT_SPACING,  // [115
         RES_UNKNOWNATR_CONTAINER,       RES_UNKNOWNATR_CONTAINER,       // [143
 
-        //UUUU take over DrawingLayer FillStyles
+        // take over DrawingLayer FillStyles
         XATTR_FILL_FIRST,               XATTR_FILL_LAST,                // [1014
 
         0};
@@ -169,7 +169,7 @@ static void lcl_DescSetAttr( const SwFrameFormat &rSource, SwFrameFormat &rDest,
                 {
                     // All in aIdArr except from RES_HEADER_FOOTER_EAT_SPACING
                     case RES_HEADER_FOOTER_EAT_SPACING:
-                    //UUUU take out SvxBrushItem; it's the result of the fallback
+                    // take out SvxBrushItem; it's the result of the fallback
                     // at SwFormat::GetItemState and not really in state SfxItemState::SET
                     case RES_BACKGROUND:
                         bExecuteId = false;
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index c89c6360a6d0..6c1847bf0c3d 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -61,8 +61,6 @@
 #include <undoflystrattr.hxx>
 #include <calbck.hxx>
 #include <memory>
-
-//UUUU
 #include <svx/xbtmpit.hxx>
 #include <svx/xflftrit.hxx>
 #include <svx/xlndsit.hxx>
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index cab0d32ace3c..b8e2d6ebb6b5 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -581,7 +581,7 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
         {
             aCallMod.Add( mpDfltGrfFormatColl );
         }
-        else if (isFRMATR(nWhich) || isDrawingLayerAttribute(nWhich) ) //UUUU
+        else if (isFRMATR(nWhich) || isDrawingLayerAttribute(nWhich) )
         {
             aCallMod.Add( mpDfltGrfFormatColl );
             aCallMod.Add( mpDfltTextFormatColl );
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index add4c242d4c3..7f95a681b43c 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -117,7 +117,6 @@
 #include <sfx2/Metadatable.hxx>
 #include <fmtmeta.hxx>
 
-//UUUU
 #include <svx/xfillit0.hxx>
 
 using namespace ::com::sun::star;
@@ -272,7 +271,7 @@ SwDoc::SwDoc()
 
     meDocType(DOCTYPE_NATIVE)
 {
-    //UUUU The DrawingLayer ItemPool which is used as 2nd pool for Writer documents' pool
+    // The DrawingLayer ItemPool which is used as 2nd pool for Writer documents' pool
     // has a default for the XFillStyleItem of XFILL_SOLID and the color for it is the default
     // fill color (blue7 or similar). This is a problem, in Writer we want the default fill
     // style to be drawing::FillStyle_NONE. This cannot simply be done by changing it in the 2nd pool at the
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 533ba658c4c0..ebcca78b2ef4 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -178,9 +178,9 @@ static void lcl_ClearArea( const SwFrame &rFrame,
 
     if ( !aRegion.empty() )
     {
-        const SvxBrushItem *pItem; const Color *pCol; SwRect aOrigRect;
-
-        //UUUU
+        const SvxBrushItem *pItem;
+        const Color *pCol;
+        SwRect aOrigRect;
         drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes;
 
         if ( rFrame.GetBackgroundBrush( aFillAttributes, pItem, pCol, aOrigRect, false ) )
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 88fddf44894d..ee3a57981848 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -68,8 +68,6 @@
 #include <swtable.hxx>
 #include <tblafmt.hxx>
 #include <svx/xdef.hxx>
-
-//UUUU
 #include <svx/xfillit0.hxx>
 
 using namespace ::editeng;
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 74a169813b03..611a8d212bd2 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1986,7 +1986,6 @@ SwOLENodes* SwContentNode::CreateOLENodesArray( const SwFormatColl& rColl, bool
     return pNodes;
 }
 
-//UUUU
 drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwContentNode::getSdrAllFillAttributesHelper() const
 {
     return drawinglayer::attribute::SdrAllFillAttributesHelperPtr();
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 73ceab4eda86..e9f121bdf059 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -110,7 +110,6 @@ enum MakePageType
     MAKEPAGE_NOSECTION  // Don't create section frames
 };
 
-//UUUU
 namespace drawinglayer { namespace attribute {
     class SdrAllFillAttributesHelper;
     typedef std::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr;
@@ -753,7 +752,6 @@ public:
     void ForbidDelete()      { mbForbidDelete = true; }
     void AllowDelete()    { mbForbidDelete = false; }
 
-    //UUUU
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const;
     bool supportsFullDrawingLayerFillAttributeSet() const;
 
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 496dda2511c4..c9f3e15e00e6 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -77,11 +77,11 @@
 #include <HandleAnchorNodeChg.hxx>
 #include <calbck.hxx>
 #include <pagedeschint.hxx>
+
 #ifndef NDEBUG
 #include <ndtxt.hxx>
 #endif
 
-//UUUU
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <svx/xfillit0.hxx>
 #include <svl/itemiter.hxx>
@@ -2556,7 +2556,7 @@ void SwFrameFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         static_cast<const SwAttrSetChg*>(pNew)->GetChgSet()->GetItemState(
             RES_FOOTER, false, reinterpret_cast<const SfxPoolItem**>(&pF) );
 
-        //UUUU reset fill information
+        // reset fill information
         if (maFillAttributes.get() && supportsFullDrawingLayerFillAttributeSet())
         {
             SfxItemIter aIter(*static_cast<const SwAttrSetChg*>(pNew)->GetChgSet());
@@ -2575,7 +2575,7 @@ void SwFrameFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     }
     else if(RES_FMT_CHG == nWhich)
     {
-        //UUUU reset fill information on format change (e.g. style changed)
+        // reset fill information on format change (e.g. style changed)
         if (maFillAttributes.get() && supportsFullDrawingLayerFillAttributeSet())
         {
             maFillAttributes.reset();
@@ -3144,7 +3144,6 @@ OUString SwFlyFrameFormat::GetObjDescription() const
 */
 bool SwFlyFrameFormat::IsBackgroundTransparent() const
 {
-    //UUUU
     if (supportsFullDrawingLayerFillAttributeSet() && getSdrAllFillAttributesHelper())
     {
         return getSdrAllFillAttributesHelper()->isTransparent();
@@ -3186,7 +3185,6 @@ bool SwFlyFrameFormat::IsBackgroundTransparent() const
 */
 bool SwFlyFrameFormat::IsBackgroundBrushInherited() const
 {
-    //UUUU
     if (supportsFullDrawingLayerFillAttributeSet() && getSdrAllFillAttributesHelper())
     {
         return !getSdrAllFillAttributesHelper()->isUsed();
@@ -3424,7 +3422,6 @@ IMapObject* SwFrameFormat::GetIMapObject( const Point& rPoint,
     return nullptr;
 }
 
-//UUUU
 drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFrameFormat::getSdrAllFillAttributesHelper() const
 {
     if (supportsFullDrawingLayerFillAttributeSet())
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 89cf31663e2c..da6fb6b918a6 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -629,7 +629,6 @@ const SwAttrSet* SwFrame::GetAttrSet() const
         return &static_cast<const SwLayoutFrame*>(this)->GetFormat()->GetAttrSet();
 }
 
-//UUUU
 drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFrame::getSdrAllFillAttributesHelper() const
 {
     if(IsContentFrame())
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index ebaedddcc9c2..e0fa2f08c59e 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -67,8 +67,6 @@
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentState.hxx>
 #include <boost/circular_buffer.hpp>
-
-//UUUU
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 
 using namespace ::com::sun::star;
@@ -197,7 +195,6 @@ SwFrameNotify::~SwFrameNotify()
             aRectFnSet.GetHeight(maPrt)!=aRectFnSet.GetHeight(mpFrame->Prt());
     if ( bPrtWidth || bPrtHeight )
     {
-        //UUUU
         bool bUseNewFillProperties(false);
         if (mpFrame->supportsFullDrawingLayerFillAttributeSet())
         {
@@ -205,7 +202,7 @@ SwFrameNotify::~SwFrameNotify()
             if(aFillAttributes.get() && aFillAttributes->isUsed())
             {
                 bUseNewFillProperties = true;
-                //UUUU use SetCompletePaint if needed
+                // use SetCompletePaint if needed
                 if(aFillAttributes->needCompleteRepaint())
                 {
                     mpFrame->SetCompletePaint();
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 3f9598e89944..8841a2de4a0a 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1869,7 +1869,7 @@ bool DrawFillAttributes(
         {
             const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
 
-            //UUUU need to expand for correct AAed and non-AAed visualization as primitive.
+            // need to expand for correct AAed and non-AAed visualization as primitive.
             // This must probably be removed again when we will be able to get all Writer visualization
             // as primitives and Writer prepares all it's stuff in high precision coordinates (also
             // needs to avoid moving boundaries around to better show overlapping stuff...)
@@ -3952,7 +3952,6 @@ bool SwFlyFrame::IsBackgroundTransparent() const
         const SvxBrushItem* pBackgrdBrush = nullptr;
         const Color* pSectionTOXColor = nullptr;
         SwRect aDummyRect;
-        //UUUU
         drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes;
 
         if ( GetBackgroundBrush( aFillAttributes, pBackgrdBrush, pSectionTOXColor, aDummyRect, false) )
@@ -3963,7 +3962,7 @@ bool SwFlyFrame::IsBackgroundTransparent() const
             {
                 bBackgroundTransparent = true;
             }
-            else if(aFillAttributes.get() && aFillAttributes->isUsed()) //UUUU
+            else if(aFillAttributes.get() && aFillAttributes->isUsed())
             {
                 bBackgroundTransparent = aFillAttributes->isTransparent();
             }
@@ -4166,7 +4165,7 @@ void SwFlyFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect,
 
             if (pSwFrameFormat && pSwFrameFormat->supportsFullDrawingLayerFillAttributeSet())
             {
-                //UUUU check for transparency
+                // check for transparency
                 const drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes(pSwFrameFormat->getSdrAllFillAttributesHelper());
 
                 // check if the new fill attributes are used
@@ -5963,7 +5962,7 @@ void SwPageFrame::PaintMarginArea( const SwRect& _rOutputRect,
 {
     if (  _pViewShell->GetWin() && !_pViewShell->GetViewOptions()->getBrowseMode() )
     {
-        //UUUU Simplified paint with DrawingLayer FillStyle
+        // Simplified paint with DrawingLayer FillStyle
         SwRect aPgRect = Frame();
         aPgRect.Intersection_( _rOutputRect );
 
@@ -6491,8 +6490,6 @@ void SwFrame::PaintBackground( const SwRect &rRect, const SwPageFrame *pPage,
     SwRect aOrigBackRect;
     const bool bPageFrame = IsPageFrame();
     bool bLowMode = true;
-
-    //UUUU
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes;
 
     bool bBack = GetBackgroundBrush( aFillAttributes, pItem, pCol, aOrigBackRect, bLowerMode );
@@ -6580,8 +6577,6 @@ void SwFrame::PaintBackground( const SwRect &rRect, const SwPageFrame *pPage,
                 {
                     pNewItem = new SvxBrushItem( *pCol, RES_BACKGROUND );
                     pItem = pNewItem;
-
-                    //UUUU
                     aFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(*pCol));
                 }
 
@@ -7294,13 +7289,11 @@ const Color SwPageFrame::GetDrawBackgrdColor() const
     const SvxBrushItem* pBrushItem;
     const Color* pDummyColor;
     SwRect aDummyRect;
-
-    //UUUU
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes;
 
     if ( GetBackgroundBrush( aFillAttributes, pBrushItem, pDummyColor, aDummyRect, true) )
     {
-        if(aFillAttributes.get() && aFillAttributes->isUsed()) //UUUU
+        if(aFillAttributes.get() && aFillAttributes->isUsed())
         {
             // let SdrAllFillAttributesHelper do the average color calculation
             return Color(aFillAttributes->getAverageColor(aGlobalRetoucheColor.getBColor()));
@@ -7477,10 +7470,10 @@ bool SwFrame::GetBackgroundBrush(
     rpBrush = nullptr;
     rpCol = nullptr;
     do
-    {   if ( pFrame->IsPageFrame() && !pOpt->IsPageBack() )
+    {
+        if ( pFrame->IsPageFrame() && !pOpt->IsPageBack() )
             return false;
 
-        //UUUU
         if (pFrame->supportsFullDrawingLayerFillAttributeSet())
             rFillAttributes = pFrame->getSdrAllFillAttributesHelper();
         const SvxBrushItem &rBack = pFrame->GetAttrSet()->GetBackground();
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index c041307020a2..6f71f423d440 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -333,7 +333,7 @@ void SwFrame::UpdateAttrFrame( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
             break;
 
         default:
-            //UUUU the new FillStyle has to do the same as previous RES_BACKGROUND
+            // the new FillStyle has to do the same as previous RES_BACKGROUND
             if(nWhich >= XATTR_FILL_FIRST && nWhich <= XATTR_FILL_LAST)
             {
                 rInvFlags |= 0x28;
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index ac87b78fb06d..4fe42f288f1d 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -64,10 +64,7 @@
 #include "numrule.hxx"
 #include <EnhancedPDFExportHelper.hxx>
 #include <docufld.hxx>
-
-//UUUU
 #include <frmfmt.hxx>
-
 #include <unomid.h>
 
 using namespace ::com::sun::star;
@@ -531,8 +528,6 @@ static bool lcl_IsDarkBackground( const SwTextPaintInfo& rInf )
     {
         const SvxBrushItem* pItem;
         SwRect aOrigBackRect;
-
-        //UUUU
         drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes;
 
         // Consider, that [GetBackgroundBrush(...)] can set <pCol>
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 4b8ef213bf53..cfd02c46d468 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2525,8 +2525,6 @@ bool SwDrawTextInfo::ApplyAutoColor( vcl::Font* pFont )
             {
                 const SvxBrushItem* pItem;
                 SwRect aOrigBackRect;
-
-                //UUUU
                 drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes;
 
                 /// OD 21.08.2002
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 40969ca7308f..cf22c355e38e 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -88,8 +88,6 @@
 #include <memory>
 #include <unoparagraph.hxx>
 #include <wrtsh.hxx>
-
-//UUUU
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <svl/itemiter.hxx>
 
@@ -3541,7 +3539,7 @@ void SwTextNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewVa
                         static_cast<const SwTextFormatColl*>(static_cast<const SwFormatChg*>(pNewValue)->pChangedFormat) );
     }
 
-    //UUUU reset fill information
+    // reset fill information
     if(maFillAttributes.get())
     {
         const sal_uInt16 nWhich = pNewValue ? pNewValue->Which() : 0;
@@ -3605,7 +3603,7 @@ SwFormatColl* SwTextNode::ChgFormatColl( SwFormatColl *pNewColl )
             HandleModifyAtTextNode( *this, &aTmp1, &aTmp2  );
         }
 
-        //UUUU reset fill information on parent style change
+        // reset fill information on parent style change
         if(maFillAttributes.get())
         {
             maFillAttributes.reset();
@@ -4930,7 +4928,6 @@ SwTextNode::MakeUnoObject()
     return xMeta;
 }
 
-//UUUU
 drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwTextNode::getSdrAllFillAttributesHelper() const
 {
     // create SdrAllFillAttributesHelper on demand
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 2e9ac3d3b6e3..2a2c8c0eba60 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -903,7 +903,7 @@ void SwHistory::Add(
     // no default Attribute?
     SwHistoryHint* pHt = nullptr;
 
-    //UUUU To be able to include the DrawingLayer FillItems something more
+    // To be able to include the DrawingLayer FillItems something more
     // general has to be done to check if an Item is default than to check
     // if its pointer equals that in Writer's global PoolDefaults (held in
     // aAttrTab and used to fill the pool defaults in Writer - looks as if
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 8044bfbc4691..ba8242fc3d08 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -37,8 +37,6 @@
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/content.hxx>
 #include <swunohelper.hxx>
-
-//UUUU
 #include <svx/xfillit0.hxx>
 #include <editeng/memberids.hrc>
 #include <svl/itemset.hxx>
@@ -259,7 +257,6 @@ bool UCB_GetFileListOfFolder( const OUString& rURL,
     return bOk;
 }
 
-//UUUU
 bool needToMapFillItemsToSvxBrushItemTypes(const SfxItemSet& rSet,
         sal_uInt16 const nMID)
 {
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 6ec8c97b48c2..5c7a4afbfd05 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -181,7 +181,7 @@ bool BaseFrameProperties_Impl::GetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId,
 
 bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxItemSet& rFromSet, bool& rSizeFound)
 {
-    //UUUU assert when the target SfxItemSet has no parent. It *should* have the pDfltFrameFormat
+    // assert when the target SfxItemSet has no parent. It *should* have the pDfltFrameFormat
     // from SwDoc set as parent (or similar) to have the necessary XFILL_NONE in the ItemSet
     if(!rToSet.GetParent())
     {
@@ -202,7 +202,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
 
     rToSet.Put(aAnchor);
 
-    //UUUU check for SvxBrushItem (RES_BACKGROUND) properties
+    // check for SvxBrushItem (RES_BACKGROUND) properties
     const ::uno::Any* pCol = nullptr; GetProperty(RES_BACKGROUND, MID_BACK_COLOR, pCol );
     const ::uno::Any* pRGBCol = nullptr; GetProperty(RES_BACKGROUND, MID_BACK_COLOR_R_G_B, pRGBCol );
     const ::uno::Any* pColTrans = nullptr; GetProperty(RES_BACKGROUND, MID_BACK_COLOR_TRANSPARENCY, pColTrans);
@@ -221,7 +221,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
         pColTrans ||
         pRGBCol);
 
-    //UUUU check for FillStyle properties in the range XATTR_FILL_FIRST, XATTR_FILL_LAST
+    // check for FillStyle properties in the range XATTR_FILL_FIRST, XATTR_FILL_LAST
     const uno::Any* pXFillStyleItem = nullptr; GetProperty(XATTR_FILLSTYLE, 0, pXFillStyleItem);
     const uno::Any* pXFillColorItem = nullptr; GetProperty(XATTR_FILLCOLOR, 0, pXFillColorItem);
 
@@ -295,7 +295,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
     // from both sets.
     if(bSvxBrushItemPropertiesUsed && !bXFillStyleItemUsed)
     {
-        //UUUU create a temporary SvxBrushItem, fill the attributes to it and use it to set
+        // create a temporary SvxBrushItem, fill the attributes to it and use it to set
         // the corresponding FillAttributes
         SvxBrushItem aBrush(RES_BACKGROUND);
 
@@ -1410,11 +1410,10 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any&
     if (!pEntry)
         throw beans::UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
 
-    //UUUU
     const sal_uInt8 nMemberId(pEntry->nMemberId & (~SFX_METRIC_ITEM));
     uno::Any aValue(_rValue);
 
-    //UUUU check for needed metric translation
+    // check for needed metric translation
     if(pEntry->nMemberId & SFX_METRIC_ITEM)
     {
         bool bDoIt(true);
@@ -1784,14 +1783,14 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any&
                 throw lang::IllegalArgumentException();
         }
         else
-        {   //UUUU
+        {
             // standard UNO API write attributes
             // adapt former attr from SvxBrushItem::PutValue to new items XATTR_FILL_FIRST, XATTR_FILL_LAST
             SfxItemSet aSet( pDoc->GetAttrPool(),
                 RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
                 RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
 
-                //UUUU FillAttribute support
+                // FillAttribute support
                 XATTR_FILL_FIRST, XATTR_FILL_LAST,
 
                 0L);
@@ -1817,7 +1816,6 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any&
             }
             else if(OWN_ATTR_FILLBMP_MODE == pEntry->nWID)
             {
-                //UUUU
                 drawing::BitmapMode eMode;
 
                 if(!(aValue >>= eMode))
@@ -1842,7 +1840,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any&
             {
                 case MID_NAME:
                 {
-                    //UUUU when named items get set, replace these with the NameOrIndex items
+                    // when named items get set, replace these with the NameOrIndex items
                     // which exist already in the pool
                     switch(pEntry->nWID)
                     {
@@ -1870,7 +1868,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any&
                 }
                 case MID_GRAFURL:
                 {
-                    //UUUU Bitmap also has the MID_GRAFURL mode where a Bitmap URL is used
+                    // Bitmap also has the MID_GRAFURL mode where a Bitmap URL is used
                     switch(pEntry->nWID)
                     {
                         case XATTR_FILLBITMAP:
@@ -2003,7 +2001,6 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
     if (!pEntry)
         throw beans::UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
 
-    //UUUU
     const sal_uInt8 nMemberId(pEntry->nMemberId & (~SFX_METRIC_ITEM));
 
     if(FN_UNO_ANCHOR_TYPES == pEntry->nWID)
@@ -2247,7 +2244,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
             }
         }
         else
-        {   //UUUU
+        {
             // standard UNO API read attributes
             // adapt former attr from SvxBrushItem::PutValue to new items XATTR_FILL_FIRST, XATTR_FILL_LAST
             const SwAttrSet& rSet = pFormat->GetAttrSet();
@@ -2255,7 +2252,6 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
 
             if(RES_BACKGROUND == pEntry->nWID)
             {
-                //UUUU
                 const SvxBrushItem aOriginalBrushItem(getSvxBrushItemFromSourceSet(rSet, RES_BACKGROUND));
 
                 if(!aOriginalBrushItem.QueryValue(aAny, nMemberId))
@@ -2267,7 +2263,6 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
             }
             else if(OWN_ATTR_FILLBMP_MODE == pEntry->nWID)
             {
-                //UUUU
                 const XFillBmpStretchItem* pStretchItem = dynamic_cast< const XFillBmpStretchItem* >(&rSet.Get(XATTR_FILLBMP_STRETCH));
                 const XFillBmpTileItem* pTileItem = dynamic_cast< const XFillBmpTileItem* >(&rSet.Get(XATTR_FILLBMP_TILE));
 
@@ -2309,7 +2304,6 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
     else
         throw uno::RuntimeException();
 
-    //UUUU
     if(pEntry && pEntry->aType == ::cppu::UnoType<sal_Int16>::get() && pEntry->aType != aAny.getValueType())
     {
         // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
@@ -2318,7 +2312,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
         aAny <<= (sal_Int16)nValue;
     }
 
-    //UUUU check for needed metric translation
+    // check for needed metric translation
     if(pEntry->nMemberId & SFX_METRIC_ITEM)
     {
         bool bDoIt(true);
@@ -2412,7 +2406,6 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
             }
             else if(OWN_ATTR_FILLBMP_MODE == pEntry->nWID)
             {
-                //UUUU
                 if(SfxItemState::SET == rFormatSet.GetItemState(XATTR_FILLBMP_STRETCH, false)
                     || SfxItemState::SET == rFormatSet.GetItemState(XATTR_FILLBMP_TILE, false))
                 {
@@ -2423,7 +2416,7 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
                     pStates[i] = beans::PropertyState_AMBIGUOUS_VALUE;
                 }
             }
-            //UUUU for FlyFrames we need to mark the used properties from type RES_BACKGROUND
+            // for FlyFrames we need to mark the used properties from type RES_BACKGROUND
             // as beans::PropertyState_DIRECT_VALUE to let users of this property call
             // getPropertyValue where the member properties will be mapped from the
             // fill attributes to the according SvxBrushItem entries
@@ -2484,7 +2477,6 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
         bool bNextFrame;
         if(OWN_ATTR_FILLBMP_MODE == pEntry->nWID)
         {
-            //UUUU
             SwDoc* pDoc = pFormat->GetDoc();
             SfxItemSet aSet(pDoc->GetAttrPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
             aSet.SetParent(&pFormat->GetAttrSet());
@@ -2576,7 +2568,6 @@ uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName )
             {
                 const SfxPoolItem& rDefItem =
                     pFormat->GetDoc()->GetAttrPool().GetDefaultItem(pEntry->nWID);
-                //UUUU
                 const sal_uInt8 nMemberId(pEntry->nMemberId & (~SFX_METRIC_ITEM));
 
                 rDefItem.QueryValue(aRet, nMemberId);
@@ -2713,7 +2704,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
             RES_FRMATR_BEGIN,       RES_FRMATR_END-1,
             RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
 
-            //UUUU FillAttribute support
+            // FillAttribute support
             XATTR_FILL_FIRST, XATTR_FILL_LAST,
 
             SID_ATTR_BORDER_INNER,  SID_ATTR_BORDER_INNER,
@@ -2728,7 +2719,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
 
         SfxItemSet aFrameSet(pDoc->GetAttrPool(), aFrameAttrRange );
 
-        //UUUU set correct parent to get the XFILL_NONE FillStyle as needed
+        // set correct parent to get the XFILL_NONE FillStyle as needed
         aFrameSet.SetParent(&pDoc->GetDfltFrameFormat()->GetAttrSet());
 
         // no the related items need to be added to the set
diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx
index c93effc95184..46674ebd4b6c 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -141,11 +141,11 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetParagraphPropertyMa
         COMMON_TEXT_CONTENT_PROPERTIES
         { OUString(UNO_NAME_CHAR_STYLE_NAME), RES_TXTATR_CHARFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
         { OUString(UNO_NAME_CHAR_STYLE_NAMES), FN_UNO_CHARFMT_SEQUENCE,  cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),     PropertyAttribute::MAYBEVOID,     0},
-        //UUUU added FillProperties for SW, same as FILL_PROPERTIES in svx
+        // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
         // and uno types (see loop at end of this method and definition of SW_PROP_NMID)
         // This entry is for adding that properties to style import/export
-        //UUUU Added for paragraph backgrounds, this is for paragraph itself
+        // Added for paragraph backgrounds, this is for paragraph itself
         FILL_PROPERTIES_SW
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
@@ -175,11 +175,11 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetAutoParaStyleProper
         TABSTOPS_MAP_ENTRY
         COMMON_TEXT_CONTENT_PROPERTIES
         { OUString(UNO_NAME_PARA_AUTO_STYLE_NAME), RES_AUTO_STYLE,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
-        //UUUU added FillProperties for SW, same as FILL_PROPERTIES in svx
+        // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
         // and uno types (see loop at end of this method and definition of SW_PROP_NMID)
         // This entry is for adding that properties to style import/export
-        //UUUU Added for paragraph backgrounds, this is for Paragraph AutoStyles
+        // Added for paragraph backgrounds, this is for Paragraph AutoStyles
         FILL_PROPERTIES_SW
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
@@ -313,11 +313,11 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetParaStylePropertyMa
     static SfxItemPropertyMapEntry const aParaStyleMap [] =
     {
         COMMON_PARA_STYLE_PROPERTIES
-        //UUUU added FillProperties for SW, same as FILL_PROPERTIES in svx
+        // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
         // and uno types (see loop at end of this method and definition of SW_PROP_NMID)
         // This entry is for adding that properties to style import/export
-        //UUUU Added for paragraph backgrounds, this is for Paragraph Styles
+        // Added for paragraph backgrounds, this is for Paragraph Styles
         FILL_PROPERTIES_SW
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
@@ -332,11 +332,11 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetConditionalParaStyl
         COMMON_PARA_STYLE_PROPERTIES
         { OUString(UNO_NAME_PARA_STYLE_CONDITIONS), FN_UNO_PARA_STYLE_CONDITIONS, cppu::UnoType< cppu::UnoSequenceType<css::beans::NamedValue> >::get(), PropertyAttribute::MAYBEVOID, 0},
 
-        //UUUU added FillProperties for SW, same as FILL_PROPERTIES in svx
+        // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
         // and uno types (see loop at end of this method and definition of SW_PROP_NMID)
         // This entry is for adding that properties to style import/export
-        //UUUU Added for paragraph backgrounds, this is for Paragraph Styles
+        // Added for paragraph backgrounds, this is for Paragraph Styles
         FILL_PROPERTIES_SW
 
         { OUString(), 0, css::uno::Type(), 0, 0 }
@@ -428,7 +428,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetFrameStylePropertyM
         { OUString(UNO_NAME_HIDDEN), FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
         { OUString(UNO_NAME_TEXT_VERT_ADJUST), RES_TEXT_VERT_ADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), PROPERTY_NONE ,0},
 
-        //UUUU added FillProperties for SW, same as FILL_PROPERTIES in svx
+        // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
         // and uno types (see loop at end of this method and definition of SW_PROP_NMID)
         // This entry is for adding that properties to style import/export
@@ -569,13 +569,13 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetPageStylePropertyMa
         { OUString(UNO_NAME_GRID_STANDARD_PAGE_MODE), RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_STANDARD_MODE},
         { OUString(UNO_NAME_HIDDEN), FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
 
-        //UUUU added FillProperties for SW, same as FILL_PROPERTIES in svx
+        // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
         // and uno types (see loop at end of this method and definition of SW_PROP_NMID)
         // This entry is for adding that properties to style import/export
         FILL_PROPERTIES_SW
 
-        //UUUU Added DrawingLayer FillStyle Properties for Header. These need an own unique name,
+        // Added DrawingLayer FillStyle Properties for Header. These need an own unique name,
         // but reuse the same WhichIDs as the regular fill. The implementation will decide to which
         // group of fill properties it belongs based on the start of the name (was already done in
         // the implementation partially), thus all SlotNames *have* to start with 'Header'
@@ -606,7 +606,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetPageStylePropertyMa
         { OUString(UNO_NAME_HEADER_FILLTRANSPARENCEGRADIENTNAME),   XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<OUString>::get(),        0,  MID_NAME },
         { OUString(UNO_NAME_HEADER_FILLCOLOR_2),                    XATTR_SECONDARYFILLCOLOR,       cppu::UnoType<sal_Int32>::get(),           0,  0},
 
-        //UUUU Added DrawingLayer FillStyle Properties for Footer, similar as for Header (see there)
+        // Added DrawingLayer FillStyle Properties for Footer, similar as for Header (see there)
         { OUString(UNO_NAME_FOOTER_FILLBMP_LOGICAL_SIZE),           XATTR_FILLBMP_SIZELOG,          cppu::UnoType<bool>::get() ,        0,  0},
         { OUString(UNO_NAME_FOOTER_FILLBMP_OFFSET_X),               XATTR_FILLBMP_TILEOFFSETX,      cppu::UnoType<sal_Int32>::get() ,          0,  0},
         { OUString(UNO_NAME_FOOTER_FILLBMP_OFFSET_Y),               XATTR_FILLBMP_TILEOFFSETY,      cppu::UnoType<sal_Int32>::get() ,          0,  0},
@@ -767,7 +767,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetSectionPropertyMap(
 const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetFramePropertyMap()
 {
     static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] =
-    {   //UUUU
+    {   //
         // TODO: We should consider completely removing SvxBrushItem() stuff
         // add support for XATTR_FILL_FIRST, XATTR_FILL_LAST
         // COMMON_FRAME_PROPERTIES currently hosts the RES_BACKGROUND entries from SvxBrushItem
@@ -788,7 +788,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetFramePropertyMap()
         { OUString(UNO_NAME_WIDTH_TYPE), RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
         { OUString(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
 
-        //UUUU added FillProperties for SW, same as FILL_PROPERTIES in svx
+        // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
         // and uno types (see loop at end of this method and definition of SW_PROP_NMID)
         // This entry is for adding that properties to FlyFrame import/export
@@ -803,7 +803,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetFramePropertyMap()
 const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetGraphicPropertyMap()
 {
     static SfxItemPropertyMapEntry const aGraphicPropertyMap_Impl[] =
-    {   //UUUU
+    {
         // TODO: We should consider completely removing SvxBrushItem() stuff
         // add support for XATTR_FILL_FIRST, XATTR_FILL_LAST
         // COMMON_FRAME_PROPERTIES currently hosts the RES_BACKGROUND entries from SvxBrushItem
@@ -833,7 +833,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetGraphicPropertyMap(
         { OUString(UNO_NAME_TRANSPARENCY), RES_GRFATR_TRANSPARENCY, cppu::UnoType<sal_Int16>::get(),   0,   0},
         { OUString(UNO_NAME_GRAPHIC_COLOR_MODE), RES_GRFATR_DRAWMODE,    cppu::UnoType<css::drawing::ColorMode>::get(),      0,   0},
 
-        //UUUU added FillProperties for SW, same as FILL_PROPERTIES in svx
+        // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
         // and uno types (see loop at end of this method and definition of SW_PROP_NMID)
         // This entry is for adding that properties to Writer GraphicObject import/export
@@ -848,7 +848,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetGraphicPropertyMap(
 const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetEmbeddedPropertyMap()
 {
     static SfxItemPropertyMapEntry const aEmbeddedPropertyMap_Impl[] =
-    {   //UUUU
+    {   //
         // TODO: We should consider completely removing SvxBrushItem() stuff
         // add support for XATTR_FILL_FIRST, XATTR_FILL_LAST
         // COMMON_FRAME_PROPERTIES currently hosts the RES_BACKGROUND entries from SvxBrushItem
@@ -865,7 +865,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetEmbeddedPropertyMap
         { OUString(UNO_NAME_GRAPHIC), FN_UNO_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), PropertyAttribute::MAYBEVOID, 0 },
         { OUString(UNO_NAME_COMPONENT),FN_UNO_COMPONENT, cppu::UnoType<css::lang::XComponent>::get(), PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_EMBEDDED_OBJECT),FN_EMBEDDED_OBJECT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), PROPERTY_NONE, 0},
-        //UUUU added FillProperties for SW, same as FILL_PROPERTIES in svx
+        // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
         // and uno types (see loop at end of this method and definition of SW_PROP_NMID)
         // This entry is for adding that properties to OLE/EmbeddedObject import/export
diff --git a/sw/source/core/unocore/unomapproperties.hxx b/sw/source/core/unocore/unomapproperties.hxx
index c0c6ed936aec..b8b3091464d0 100644
--- a/sw/source/core/unocore/unomapproperties.hxx
+++ b/sw/source/core/unocore/unomapproperties.hxx
@@ -251,7 +251,7 @@
 #define ANCHOR_TYPES_PROPERTY    { OUString(UNO_NAME_ANCHOR_TYPES), FN_UNO_ANCHOR_TYPES,    cppu::UnoType< cppu::UnoSequenceType<css::text::TextContentAnchorType> >::get(),PropertyAttribute::READONLY, 0xff},
 
 // #i18732# #i28701# #i73249#
-//UUUU all users of COMMON_FRAME_PROPERTIES add the new XATTR_FILL_FIRST, XATTR_FILL_LAST FillStyle,
+// all users of COMMON_FRAME_PROPERTIES add the new XATTR_FILL_FIRST, XATTR_FILL_LAST FillStyle,
 // thus it may be possible to remove the RES_BACKGROUND entries from SvxBrushItem completely (this includes
 // all using UNO_NAME_BACK_* slots) in the future
 #define COMMON_FRAME_PROPERTIES \
@@ -476,7 +476,6 @@
                     { OUString(UNO_NAME_PARA_RIGHT_MARGIN), RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},  \
                     { OUString(UNO_NAME_TABSTOPS), RES_PARATR_TABSTOP,   cppu::UnoType< cppu::UnoSequenceType<css::style::TabStop> >::get(),   PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
 
-//UUUU
 #define FILL_PROPERTIES_SW_BMP \
     { OUString(UNO_NAME_SW_FILLBMP_LOGICAL_SIZE),               XATTR_FILLBMP_SIZELOG,      cppu::UnoType<bool>::get(),       0,  0}, \
     { OUString(UNO_NAME_SW_FILLBMP_OFFSET_X),                   XATTR_FILLBMP_TILEOFFSETX,  cppu::UnoType<sal_Int32>::get(),   0,  0}, \
@@ -490,11 +489,9 @@
     { OUString(UNO_NAME_SW_FILLBMP_TILE),                       XATTR_FILLBMP_TILE,         cppu::UnoType<bool>::get(),       0,  0},\
     { OUString(UNO_NAME_SW_FILLBMP_MODE),                       OWN_ATTR_FILLBMP_MODE,      cppu::UnoType<drawing::BitmapMode>::get(), 0,  0}, \
 
-//UUUU
 #define FILL_PROPERTIES_SW_DEFAULTS \
     { OUString(UNO_NAME_SW_FILLCOLOR),                          XATTR_FILLCOLOR,            cppu::UnoType<sal_Int32>::get(),   0,  0}, \
 
-//UUUU
 #define FILL_PROPERTIES_SW \
     FILL_PROPERTIES_SW_BMP \
     FILL_PROPERTIES_SW_DEFAULTS \
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index de1042970cce..6ad3ede2bdc3 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <comphelper/servicehelper.hxx>
 
-//UUUU
 #include <swunohelper.hxx>
 #include <svx/unobrushitemhelper.hxx>
 #include <editeng/unoipset.hxx>
@@ -164,7 +163,6 @@ public:
         GetPropertyValues_Impl(
             const uno::Sequence< OUString >& rPropertyNames);
 
-    //UUUU
     /// @throws uno::RuntimeException
     void GetSinglePropertyValue_Impl(
         const SfxItemPropertySimpleEntry& rEntry,
@@ -438,7 +436,7 @@ void SAL_CALL SwXParagraph::setPropertyValues(
     }
 }
 
-//UUUU Support for DrawingLayer FillStyles for GetPropertyValue() usages
+// Support for DrawingLayer FillStyles for GetPropertyValue() usages
 void SwXParagraph::Impl::GetSinglePropertyValue_Impl(
     const SfxItemPropertySimpleEntry& rEntry,
     const SfxItemSet& rSet,
@@ -501,7 +499,7 @@ void SwXParagraph::Impl::GetSinglePropertyValue_Impl(
             }
         }
 
-        //UUUU check for needed metric translation
+        // check for needed metric translation
         if(rEntry.nMemberId & SFX_METRIC_ITEM)
         {
             bool bDoIt(true);
@@ -561,7 +559,6 @@ uno::Sequence< uno::Any > SwXParagraph::Impl::GetPropertyValues_Impl(
                 *pEntry, aPam, &(pValues[nProp]), eTemp, &rTextNode );
             if (!bDone)
             {
-                //UUUU
                 GetSinglePropertyValue_Impl(*pEntry, rAttrSet, pValues[nProp]);
             }
         }
@@ -811,7 +808,6 @@ SwXParagraph::Impl::GetPropertyValuesTolerant_Impl(
                         // if not found try the real paragraph attributes...
                         if (!bDone)
                         {
-                            //UUUU
                             GetSinglePropertyValue_Impl(*pEntry, rValueAttrSet, aValue);
                         }
                     }
@@ -977,7 +973,7 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState(
             break;
         }
 
-        //UUUU DrawingLayer PropertyStyle support
+        // DrawingLayer PropertyStyle support
         case OWN_ATTR_FILLBMP_MODE:
         {
             if(*ppSet)
@@ -1126,7 +1122,7 @@ SwXParagraph::setPropertyToDefault(const OUString& rPropertyName)
     {
         std::set<sal_uInt16> aWhichIds;
 
-        //UUUU For FillBitmapMode two IDs have to be reset (!)
+        // For FillBitmapMode two IDs have to be reset (!)
         if(OWN_ATTR_FILLBMP_MODE == pEntry->nWID)
         {
             aWhichIds.insert(XATTR_FILLBMP_STRETCH);
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 593a17e54ed0..659c068c69f0 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -79,7 +79,7 @@
 #include <comphelper/sequence.hxx>
 #include <o3tl/make_unique.hxx>
 
-//UUUU
+//
 #include <svx/unobrushitemhelper.hxx>
 #include <editeng/unoipset.hxx>
 #include <editeng/memberids.hrc>
@@ -1492,7 +1492,7 @@ public:
             m_pMyItemSet.reset(new SfxItemSet(m_xNewBase->GetItemSet()));
             m_pItemSet = m_pMyItemSet.get();
 
-            //UUUU set parent style to have the correct XFillStyle setting as XFILL_NONE
+            // set parent style to have the correct XFillStyle setting as XFILL_NONE
             if(!m_pItemSet->GetParent() && m_pParentStyle)
                 m_pItemSet->SetParent(m_pParentStyle);
         }
@@ -1982,7 +1982,7 @@ void SwXStyle::SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const
         pUnoToCoreIt->second(*this, rEntry, rPropSet, rValue, rBase);
     else
     {
-        //UUUU adapted switch logic to a more readable state; removed goto's and made
+        // adapted switch logic to a more readable state; removed goto's and made
         // execution of standard setting of proerty in ItemSet dependent of this variable
         uno::Any aValue(rValue);
         lcl_TranslateMetric(rEntry, m_pDoc, aValue);
@@ -1999,7 +1999,7 @@ void SwXStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rPropertyNa
     if(rPropertyNames.getLength() != rValues.getLength())
         throw lang::IllegalArgumentException();
 
-    SwStyleBase_Impl aBaseImpl(*m_pDoc, m_sStyleName, &GetDoc()->GetDfltTextFormatColl()->GetAttrSet()); //UUUU add pDfltTextFormatColl as parent
+    SwStyleBase_Impl aBaseImpl(*m_pDoc, m_sStyleName, &GetDoc()->GetDfltTextFormatColl()->GetAttrSet()); // add pDfltTextFormatColl as parent
     if(m_pBasePool)
     {
         const sal_uInt16 nSaveMask = m_pBasePool->GetSearchMask();
@@ -2246,7 +2246,6 @@ template<>
 uno::Any SwXStyle::GetStyleProperty<RES_BACKGROUND>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet&, SwStyleBase_Impl& rBase)
 {
     PrepareStyleBase(rBase);
-    //UUUU
     const SfxItemSet& rSet = rBase.GetItemSet();
     const SvxBrushItem aOriginalBrushItem(getSvxBrushItemFromSourceSet(rSet, RES_BACKGROUND));
     const sal_uInt8 nMemberId(rEntry.nMemberId & (~SFX_METRIC_ITEM));
@@ -2259,7 +2258,6 @@ template<>
 uno::Any SwXStyle::GetStyleProperty<OWN_ATTR_FILLBMP_MODE>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase)
 {
     PrepareStyleBase(rBase);
-    //UUUU
     const SfxItemSet& rSet = rBase.GetItemSet();
     const XFillBmpTileItem* pTileItem = dynamic_cast<const XFillBmpTileItem*>(&rSet.Get(XATTR_FILLBMP_TILE));
     if(pTileItem && pTileItem->GetValue())
@@ -2276,11 +2274,11 @@ uno::Any SwXStyle::GetStyleProperty<HINT_BEGIN>(const SfxItemPropertySimpleEntry
     SfxItemSet& rSet = rBase.GetItemSet();
     uno::Any aResult;
     rPropSet.getPropertyValue(rEntry, rSet, aResult);
-    //UUUU
+    //
     // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
     if(rEntry.aType == cppu::UnoType<sal_Int16>::get() && aResult.getValueType() == cppu::UnoType<sal_Int32>::get())
         aResult <<= (sal_Int16)(aResult.get<sal_Int32>());
-    //UUUU check for needed metric translation
+    // check for needed metric translation
     if(rEntry.nMemberId & SFX_METRIC_ITEM && GetDoc())
     {
         const SfxItemPool& rPool = GetDoc()->GetAttrPool();
@@ -2380,7 +2378,7 @@ uno::Any SwXStyle::getPropertyValue(const OUString& rPropertyName)
         throw uno::RuntimeException();
     sal_Int8 nPropSetId = m_bIsConditional ? PROPERTY_MAP_CONDITIONAL_PARA_STYLE : m_rEntry.m_nPropMapType;
     const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(nPropSetId);
-    SwStyleBase_Impl aBase(*m_pDoc, m_sStyleName, &m_pDoc->GetDfltTextFormatColl()->GetAttrSet()); //UUUU add pDfltTextFormatColl as parent
+    SwStyleBase_Impl aBase(*m_pDoc, m_sStyleName, &m_pDoc->GetDfltTextFormatColl()->GetAttrSet()); // add pDfltTextFormatColl as parent
     return GetPropertyValue_Impl(pPropSet, aBase, rPropertyName);
 }
 
@@ -2393,7 +2391,7 @@ uno::Sequence<uno::Any> SwXStyle::getPropertyValues(const uno::Sequence<OUString
         throw uno::RuntimeException();
     sal_Int8 nPropSetId = m_bIsConditional ? PROPERTY_MAP_CONDITIONAL_PARA_STYLE : m_rEntry.m_nPropMapType;
     const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(nPropSetId);
-    SwStyleBase_Impl aBase(*m_pDoc, m_sStyleName, &m_pDoc->GetDfltTextFormatColl()->GetAttrSet()); //UUUU add pDfltTextFormatColl as parent
+    SwStyleBase_Impl aBase(*m_pDoc, m_sStyleName, &m_pDoc->GetDfltTextFormatColl()->GetAttrSet()); // add pDfltTextFormatColl as parent
     uno::Sequence<uno::Any> aValues(rPropertyNames.getLength());
     // workaround for bad designed API
     try
@@ -2490,7 +2488,6 @@ uno::Sequence<beans::PropertyState> SwXStyle::getPropertyStates(const uno::Seque
         {
             case OWN_ATTR_FILLBMP_MODE:
             {
-                //UUUU
                 if(SfxItemState::SET == pSourceSet->GetItemState(XATTR_FILLBMP_STRETCH, false)
                     || SfxItemState::SET == pSourceSet->GetItemState(XATTR_FILLBMP_TILE, false))
                 {
@@ -2504,7 +2501,7 @@ uno::Sequence<beans::PropertyState> SwXStyle::getPropertyStates(const uno::Seque
             break;
             case RES_BACKGROUND:
             {
-                //UUUU for FlyFrames we need to mark the used properties from type RES_BACKGROUND
+                // for FlyFrames we need to mark the used properties from type RES_BACKGROUND
                 // as beans::PropertyState_DIRECT_VALUE to let users of this property call
                 // getPropertyValue where the member properties will be mapped from the
                 // fill attributes to the according SvxBrushItem entries
@@ -2599,7 +2596,7 @@ void SAL_CALL SwXStyle::setPropertiesToDefault(const uno::Sequence<OUString>& aP
         pTargetFormat->ResetFormatAttr(pEntry->nWID);
         if(OWN_ATTR_FILLBMP_MODE == pEntry->nWID)
         {
-            //UUUU
+            //
             SwDoc* pDoc = pTargetFormat->GetDoc();
             SfxItemSet aSet(pDoc->GetAttrPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
             aSet.SetParent(&pTargetFormat->GetAttrSet());
@@ -2808,7 +2805,7 @@ void SwXPageStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rProper
 
     const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_PAGE_STYLE);
     const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap();
-    SwStyleBase_Impl aBaseImpl(*GetDoc(), GetStyleName(), &GetDoc()->GetDfltFrameFormat()->GetAttrSet()); //UUUU add pDfltFrameFormat as parent
+    SwStyleBase_Impl aBaseImpl(*GetDoc(), GetStyleName(), &GetDoc()->GetDfltFrameFormat()->GetAttrSet()); // add pDfltFrameFormat as parent
     if(!m_pBasePool)
     {
         if(!IsDescriptor())
@@ -2874,7 +2871,7 @@ void SwXPageStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rProper
                         SfxItemSet aTempSet(*aBaseImpl.GetItemSet().GetPool(),
                             RES_FRMATR_BEGIN,RES_FRMATR_END - 1,            // [82
 
-                            //UUUU FillAttribute support
+                            // FillAttribute support
                             XATTR_FILL_FIRST, XATTR_FILL_LAST,              // [1014
 
                             SID_ATTR_BORDER_INNER,SID_ATTR_BORDER_INNER,    // [10023
@@ -2883,7 +2880,7 @@ void SwXPageStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rProper
                             SID_ATTR_PAGE_SHARED_FIRST,SID_ATTR_PAGE_SHARED_FIRST,
                             0);
 
-                        //UUUU set correct parent to get the XFILL_NONE FillStyle as needed
+                        // set correct parent to get the XFILL_NONE FillStyle as needed
                         aTempSet.SetParent(&GetDoc()->GetDfltFrameFormat()->GetAttrSet());
 
                         aTempSet.Put(SfxBoolItem(SID_ATTR_PAGE_ON, true));
@@ -3060,7 +3057,7 @@ uno::Sequence<uno::Any> SwXPageStyle::GetPropertyValues_Impl(const uno::Sequence
     }
     const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_PAGE_STYLE);
     const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap();
-    SwStyleBase_Impl aBase(*GetDoc(), GetStyleName(), &GetDoc()->GetDfltFrameFormat()->GetAttrSet()); //UUUU add pDfltFrameFormat as parent
+    SwStyleBase_Impl aBase(*GetDoc(), GetStyleName(), &GetDoc()->GetDfltFrameFormat()->GetAttrSet()); // add pDfltFrameFormat as parent
     SfxStyleSheetBase* pBase = GetStyleSheetBase();
     if(!pBase)
         throw uno::RuntimeException();
@@ -3478,7 +3475,7 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
         }
         case IStyleAccess::AUTO_STYLE_PARA:
         {
-            pRange = aTextNodeSetRange; //UUUU checked, already added support for [XATTR_FILL_FIRST, XATTR_FILL_LAST]
+            pRange = aTextNodeSetRange; // checked, already added support for [XATTR_FILL_FIRST, XATTR_FILL_LAST]
             pPropSet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_PARA_AUTO_STYLE);
             break;
         }
@@ -3513,12 +3510,12 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
     }
     else
     {
-        //UUUU set parent to ItemSet to ensure XFILL_NONE as XFillStyleItem
+        // set parent to ItemSet to ensure XFILL_NONE as XFillStyleItem
         // to make cases in RES_BACKGROUND work correct; target *is* a style
         // where this is the case
         aSet.SetParent(&m_pDocShell->GetDoc()->GetDfltTextFormatColl()->GetAttrSet());
 
-        //UUUU here the used DrawingLayer FillStyles are imported when family is
+        // here the used DrawingLayer FillStyles are imported when family is
         // equal to IStyleAccess::AUTO_STYLE_PARA, thus we will need to serve the
         // used slots functionality here to do this correctly
         const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap();
@@ -3580,7 +3577,7 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
                 {
                     if(MID_NAME == nMemberId)
                     {
-                        //UUUU add set commands for FillName items
+                        // add set commands for FillName items
                         OUString aTempName;
 
                         if(!(aValue >>= aTempName))
@@ -3595,7 +3592,7 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
                     {
                         if(XATTR_FILLBITMAP == pEntry->nWID)
                         {
-                            //UUUU Bitmap also has the MID_GRAFURL mode where a Bitmap URL is used
+                            // Bitmap also has the MID_GRAFURL mode where a Bitmap URL is used
                             const Graphic aNullGraphic;
                             XFillBitmapItem aXFillBitmapItem(aSet.GetPool(), aNullGraphic);
 
@@ -3609,7 +3606,6 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
                 }
                 case RES_BACKGROUND:
                 {
-                    //UUUU
                     const SvxBrushItem aOriginalBrushItem(getSvxBrushItemFromSourceSet(aSet, RES_BACKGROUND, true, m_pDocShell->GetDoc()->IsInXMLImport()));
                     SvxBrushItem aChangedBrushItem(aOriginalBrushItem);
 
@@ -3625,7 +3621,6 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
                 }
                 case OWN_ATTR_FILLBMP_MODE:
                 {
-                    //UUUU
                     drawing::BitmapMode eMode;
 
                     if(!(aValue >>= eMode))
@@ -3666,11 +3661,11 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
             }
          }
 
-        //UUUU clear parent again
+        // clear parent again
         aSet.SetParent(nullptr);
     }
 
-    //UUUU need to ensure uniqueness of evtl. added NameOrIndex items
+    // need to ensure uniqueness of evtl. added NameOrIndex items
     // currently in principle only needed when bTakeCareOfDrawingLayerFillStyle,
     // but does not hurt and is easily forgotten later eventually, so keep it
     // as common case
@@ -3777,7 +3772,7 @@ uno::Any SwXAutoStylesEnumerator::nextElement(  )
     return aRet;
 }
 
-//UUUU SwXAutoStyle with the family IStyleAccess::AUTO_STYLE_PARA (or
+// SwXAutoStyle with the family IStyleAccess::AUTO_STYLE_PARA (or
 // PROPERTY_MAP_PARA_AUTO_STYLE) now uses DrawingLayer FillStyles to allow
 // unified paragraph background fill, thus the UNO API implementation has to
 // support the needed slots for these. This seems to be used only for reading
@@ -3938,7 +3933,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl(
         }
         else if(bTakeCareOfDrawingLayerFillStyle)
         {
-            //UUUU add support for DrawingLayer FillStyle slots
+            // add support for DrawingLayer FillStyle slots
             switch(pEntry->nWID)
             {
                 case RES_BACKGROUND:
@@ -4130,7 +4125,7 @@ uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates(
 
         if(bTakeCareOfDrawingLayerFillStyle)
         {
-            //UUUU DrawingLayer PropertyStyle support
+            // DrawingLayer PropertyStyle support
             switch(pEntry->nWID)
             {
                 case OWN_ATTR_FILLBMP_MODE:
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 6fe5ddeef3d0..84697cd7b968 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -143,18 +143,18 @@ SwParaDlg::SwParaDlg(vcl::Window *pParent,
 
         if(!bHtmlMode || (nHtmlMode & (HTMLMODE_SOME_STYLES|HTMLMODE_FULL_STYLES)))
         {
-            //UUUU remove?
+            // remove?
             //OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
             //OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
             //m_nParaBckGrnd = AddTabPage("labelTP_BACKGROUND", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
             //
-            //UUUU add Area and Transparence TabPages
+            // add Area and Transparence TabPages
             m_nAreaId = AddTabPage("area", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA ));
             m_nTransparenceId = AddTabPage("transparence", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_TRANSPARENCE ) );
         }
         else
         {
-            //UUUU RemoveTabPage("labelTP_BACKGROUND");
+            // RemoveTabPage("labelTP_BACKGROUND");
             RemoveTabPage("area");
             RemoveTabPage("transparence");
         }
@@ -257,7 +257,7 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
         for(std::set<OUString>::const_iterator it = aNames.begin(); it != aNames.end(); ++it)
             rBox.InsertEntry(*it);
     }
-    //UUUU inits for Area and Transparency TabPages
+    // inits for Area and Transparency TabPages
     // The selection attribute lists (XPropertyList derivates, e.g. XColorList for
     // the color table) need to be added as items (e.g. SvxColorTableItem) to make
     // these pages find the needed attributes for fill style suggestions.
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index f5e431423057..bb5fb940360d 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -200,7 +200,7 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
             m_nDropCapsId = AddTabPage("dropcaps", SwDropCapsPage::Create,
                            SwDropCapsPage::GetRanges );
 
-            //UUUU add Area and Transparence TabPages
+            // add Area and Transparence TabPages
             m_nAreaId = AddTabPage("area", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA ));
             m_nTransparenceId = AddTabPage("transparence", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_TRANSPARENCE ) );
 
@@ -249,7 +249,7 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
             m_nWrapId = AddTabPage("wrap", SwWrapTabPage::Create,
                                         SwWrapTabPage::GetRanges);
 
-            //UUUU add Area and Transparence TabPages
+            // add Area and Transparence TabPages
             m_nAreaId = AddTabPage("area", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA ));
             m_nTransparenceId = AddTabPage("transparence", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_TRANSPARENCE ) );
 
@@ -265,12 +265,12 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
         // page styles
         case SfxStyleFamily::Page:
         {
-            //UUUU remove?
+            // remove?
             //OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
             //OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
             //m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
 
-            //UUUU add Area and Transparence TabPages
+            // add Area and Transparence TabPages
             m_nAreaId = AddTabPage("area", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA ));
             m_nTransparenceId = AddTabPage("transparence", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_TRANSPARENCE ) );
 
@@ -466,7 +466,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             static_cast<SwColumnPage&>(rPage).SetFrameMode(true);
         static_cast<SwColumnPage&>(rPage).SetFormatUsed( true );
     }
-    //UUUU do not remove; many other style dialog combinations still use the SfxTabPage
+    // do not remove; many other style dialog combinations still use the SfxTabPage
     // for the SvxBrushItem (see RID_SVXPAGE_BACKGROUND)
     else if (nId == m_nBackgroundId)
     {
@@ -501,7 +501,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
                     pFirstStyle = pStyleSheetPool->Next();
                 }
             }
-            //UUUU set DrawingLayer FillStyles active
+            // set DrawingLayer FillStyles active
             aSet.Put(SfxBoolItem(SID_DRAWINGLAYER_FILLSTYLES, true));
             aSet.Put(SfxStringListItem(SID_COLLECT_LIST, &aList));
             rPage.PageCreated(aSet);
@@ -562,7 +562,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             static_cast<SvxHeaderPage&>(rPage).EnableDynamicSpacing();
         }
 
-        //UUUU set DrawingLayer FillStyles active
+        // set DrawingLayer FillStyles active
         aSet.Put(SfxBoolItem(SID_DRAWINGLAYER_FILLSTYLES, true));
         rPage.PageCreated(aSet);
     }
@@ -573,7 +573,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             static_cast<SvxFooterPage&>(rPage).EnableDynamicSpacing();
         }
 
-        //UUUU set DrawingLayer FillStyles active
+        // set DrawingLayer FillStyles active
         aSet.Put(SfxBoolItem(SID_DRAWINGLAYER_FILLSTYLES, true));
         rPage.PageCreated(aSet);
     }
@@ -589,7 +589,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
         }
         rPage.PageCreated(aSet);
     }
-    //UUUU inits for Area and Transparency TabPages
+    // inits for Area and Transparency TabPages
     // The selection attribute lists (XPropertyList derivates, e.g. XColorList for
     // the color table) need to be added as items (e.g. SvxColorTableItem) to make
     // these pages find the needed attributes for fill style suggestions.
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 30c411cfb19a..3dab469a0cc1 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -100,10 +100,10 @@ SwFrameDlg::SwFrameDlg( SfxViewFrame*       pViewFrame,
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "Dialog creation failed!");
 
-    //UUUU remove?
+    // remove?
     // m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0);
 
-    //UUUU add Area and Transparence TabPages
+    // add Area and Transparence TabPages
     m_nAreaId = AddTabPage("area", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA ));
     m_nTransparenceId = AddTabPage("transparence", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_TRANSPARENCE ) );
 
@@ -123,7 +123,7 @@ SwFrameDlg::SwFrameDlg( SfxViewFrame*       pViewFrame,
             RemoveTabPage("crop");
         if( m_sDlgType != "FrameDialog" )
         {
-            //UUUU RemoveTabPage("background");
+            // RemoveTabPage("background");
             RemoveTabPage("area");
             RemoveTabPage("transparence");
         }
@@ -180,22 +180,12 @@ void SwFrameDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             rPage.SetFrame( m_pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() );
         rPage.PageCreated(aNewSet);
     }
-    //UUUU
-    //else if (nId == m_nBackgroundId && m_sDlgType == "FrameDialog")
-    //{
-    //    sal_Int32 nFlagType = SVX_SHOW_SELECTOR;
-    //    if (!m_bHTMLMode)
-    //        nFlagType |= SVX_ENABLE_TRANSPARENCY;
-    //    aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType));
-    //
-    //    rPage.PageCreated(aSet);
-    //}
     else if (nId == m_nBorderId)
     {
         aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,static_cast<sal_uInt16>(SwBorderModes::FRAME)));
         rPage.PageCreated(aSet);
     }
-    //UUUU inits for Area and Transparency TabPages
+    // inits for Area and Transparency TabPages
     // The selection attribute lists (XPropertyList derivates, e.g. XColorList for
     // the color table) need to be added as items (e.g. SvxColorListItem) to make
     // these pages find the needed attributes for fill style suggestions.
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index f83924f7c6ec..7ae5a2fbb700 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -611,7 +611,6 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl, LinkParamNone*, void)
         }
     }
 
-    //UUUU
     if(m_bNew)
     {
         if(SfxStyleFamily::Frame == m_nFamily || SfxStyleFamily::Para == m_nFamily)
@@ -786,7 +785,7 @@ sal_uInt16 SwDocShell::Edit(
 
     if(SfxStyleFamily::Page == nFamily || SfxStyleFamily::Para == nFamily)
     {
-        //UUUU create needed items for XPropertyList entries from the DrawModel so that
+        // create needed items for XPropertyList entries from the DrawModel so that
         // the Area TabPage can access them
         SfxItemSet& rSet = xTmp->GetItemSet();
         const SwDrawModel* pDrawModel = GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index a4257fa71fb3..ff9a10de82c3 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -461,14 +461,14 @@ SwDocStyleSheet::SwDocStyleSheet(   SwDoc&                rDocument,
     pTableFormat(nullptr),
     pBoxFormat(nullptr),
     rDoc(rDocument),
-    aCoreSet(GetPool().GetPool(),   //UUUU sorted by indices, one double removed
+    aCoreSet(GetPool().GetPool(),   // sorted by indices, one double removed
             RES_CHRATR_BEGIN,       RES_CHRATR_END - 1,             // [1
             RES_PARATR_BEGIN,       RES_PARATR_END - 1,             // [60
             RES_PARATR_LIST_BEGIN,  RES_PARATR_LIST_END - 1,        // [77
             RES_FRMATR_BEGIN,       RES_FRMATR_END - 1,             // [82
             RES_UNKNOWNATR_BEGIN,   RES_UNKNOWNATR_END-1,           // [143
 
-            //UUUU FillAttribute support
+            // FillAttribute support
             XATTR_FILL_FIRST, XATTR_FILL_LAST,                      // [1014
 
             SID_ATTR_BORDER_INNER,  SID_ATTR_BORDER_INNER,          // [10023
@@ -476,7 +476,7 @@ SwDocStyleSheet::SwDocStyleSheet(   SwDoc&                rDocument,
             SID_ATTR_PAGE_HEADERSET,SID_ATTR_PAGE_FOOTERSET,        // [10058
             SID_ATTR_PARA_MODEL,    SID_ATTR_PARA_MODEL,            // [10065
 
-            //UUUU items to hand over XPropertyList things like
+            // items to hand over XPropertyList things like
             // XColorList, XHatchList, XGradientList and XBitmapList
             // to the Area TabPage
             SID_COLOR_TABLE,        SID_PATTERN_LIST,                // [10179
@@ -893,7 +893,7 @@ OUString  SwDocStyleSheet::GetDescription(MapUnit eUnit)
         bool bHasCJKFontPrefix = false;
         SvtCJKOptions aCJKOptions;
 
-        //UUUU Get currently used FillStyle and remember, also need the XFillFloatTransparenceItem
+        // Get currently used FillStyle and remember, also need the XFillFloatTransparenceItem
         // to decide if gradient transparence is used
         const drawing::FillStyle eFillStyle(static_cast< const XFillStyleItem& >(pSet->Get(XATTR_FILLSTYLE)).GetValue());
         const bool bUseFloatTransparence(static_cast< const XFillFloatTransparenceItem& >(pSet->Get(XATTR_FILLFLOATTRANSPARENCE)).IsEnabled());
@@ -923,7 +923,6 @@ OUString  SwDocStyleSheet::GetDescription(MapUnit eUnit)
                             bool bIsDefault = false;
                             switch ( pItem->Which() )
                             {
-                                //UUUU
                                 case XATTR_FILLCOLOR:
                                 {
                                     // only use active FillStyle information
@@ -1369,7 +1368,7 @@ SfxItemSet&   SwDocStyleSheet::GetItemSet()
                     if(pFrameFormat->DerivedFrom())
                         aCoreSet.SetParent(&pFrameFormat->DerivedFrom()->GetAttrSet());
 
-                    //UUUU create needed items for XPropertyList entries from the DrawModel so that
+                    // create needed items for XPropertyList entries from the DrawModel so that
                     // the Area TabPage can access them
                     const SwDrawModel* pDrawModel = rDoc.getIDocumentDrawModelAccess().GetDrawModel();
 
@@ -1384,7 +1383,7 @@ SfxItemSet&   SwDocStyleSheet::GetItemSet()
 
         case SfxStyleFamily::Page :
             {
-                //UUUU set correct parent to get the drawing::FillStyle_NONE FillStyle as needed
+                // set correct parent to get the drawing::FillStyle_NONE FillStyle as needed
                 if(!aCoreSet.GetParent())
                 {
                     aCoreSet.SetParent(&rDoc.GetDfltFrameFormat()->GetAttrSet());
@@ -1690,7 +1689,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
 
         if(SfxStyleFamily::Frame == nFamily)
         {
-            //UUUU Need to check for unique item for DrawingLayer items of type NameOrIndex
+            // Need to check for unique item for DrawingLayer items of type NameOrIndex
             // and evtl. correct that item to ensure unique names for that type. This call may
             // modify/correct entries inside of the given SfxItemSet
             rDoc.CheckForUniqueItemForLineFillNameOrIndex(aSet);
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index a71f884dab30..01ae1d42056f 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -37,8 +37,6 @@
 #include <viewopt.hxx>
 #include "colex.hxx"
 #include "colmgr.hxx"
-
-//UUUU
 #include <svx/unobrushitemhelper.hxx>
 
 // Taking the updated values from the set
@@ -129,7 +127,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
 
             if(SfxItemState::SET == rHeaderSet.GetItemState(RES_BACKGROUND))
             {
-                //UUUU create FillAttributes from SvxBrushItem //SetHdColor(rItem.GetColor());
+                // create FillAttributes from SvxBrushItem //SetHdColor(rItem.GetColor());
                 const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rHeaderSet.Get(RES_BACKGROUND));
                 SfxItemSet aTempSet(*rHeaderSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
@@ -175,7 +173,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
 
             if( rFooterSet.GetItemState( RES_BACKGROUND ) == SfxItemState::SET )
             {
-                //UUUU create FillAttributes from SvxBrushItem //SetFtColor(rItem.GetColor());
+                // create FillAttributes from SvxBrushItem //SetFtColor(rItem.GetColor());
                 const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rFooterSet.Get(RES_BACKGROUND));
                 SfxItemSet aTempSet(*rFooterSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
@@ -198,7 +196,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
 
     if(SfxItemState::SET == rSet.GetItemState(RES_BACKGROUND, false, &pItem))
     {
-        //UUUU create FillAttributes from SvxBrushItem
+        // create FillAttributes from SvxBrushItem
         const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(*pItem);
         SfxItemSet aTempSet(*rSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
@@ -239,15 +237,12 @@ void SwColExample::DrawPage(vcl::RenderContext& rRenderContext, const Point& rOr
     aRect.Bottom()= rOrg.Y() + GetSize().Height() - GetBottom() - GetFtHeight() - GetFtDist();
     rRenderContext.DrawRect(aRect);
 
-    //UUUU
     const Rectangle aDefineRect(aRect);
-
-    //UUUU
     const drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes = getPageFillAttributes();
 
     if (!rFillAttributes.get() || !rFillAttributes->isUsed())
     {
-        //UUUU If there is no fill, use fallback color
+        // If there is no fill, use fallback color
         const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
         const Color& rFieldColor = rStyleSettings.GetFieldColor();
 
@@ -277,7 +272,7 @@ void SwColExample::DrawPage(vcl::RenderContext& rRenderContext, const Point& rOr
         else
             aRect.Bottom() = aRect.Top() + nAutoColWidth;
 
-        //UUUU use primitive draw command
+        // use primitive draw command
         drawFillAttributes(rRenderContext, getPageFillAttributes(), aRect, aDefineRect);
 
         if (i < nColumnCount - 1)
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index 9f55d2d70947..0f91925b7e9b 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star;
 static sal_uInt16 aFrameMgrRange[] = {
                             RES_FRMATR_BEGIN, RES_FRMATR_END-1,
 
-                            //UUUU FillAttribute support
+                            // FillAttribute support
                             XATTR_FILL_FIRST, XATTR_FILL_LAST,
 
                             SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
diff --git a/sw/source/uibase/inc/frmsh.hxx b/sw/source/uibase/inc/frmsh.hxx
index 10ce123d2953..3965ca82cfa8 100644
--- a/sw/source/uibase/inc/frmsh.hxx
+++ b/sw/source/uibase/inc/frmsh.hxx
@@ -40,11 +40,9 @@ public:
     void    GetLineStyleState(SfxItemSet &rSet);
     void    StateInsert(SfxItemSet &rSet);
 
-    //UUUU
     void GetDrawAttrStateTextFrame(SfxItemSet &rSet);
     void ExecDrawAttrArgsTextFrame(SfxRequest& rReq);
 
-    //UUUU
     void ExecDrawDlgTextFrame(SfxRequest& rReq);
     void DisableStateTextFrame(SfxItemSet &rSet);
 };
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index b62d8e58db68..dd18d849a30b 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2214,7 +2214,7 @@ void SwBaseShell::GetBckColState(SfxItemSet &rSet)
     }
     else
     {
-        //UUUU Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
+        // Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
         SfxItemSet aCoreSet(GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
         aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrameFormat()->GetAttrSet());
@@ -2274,7 +2274,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
     }
     else
     {
-        //UUUU Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
+        // Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
         SfxItemSet aCoreSet(GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
         aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrameFormat()->GetAttrSet());
@@ -2333,7 +2333,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
     }
     else
     {
-        //UUUU Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
+        // Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
         SfxItemSet aCoreSet(GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
         aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrameFormat()->GetAttrSet());
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index b2b6a19e9242..91d0c8e77dbb 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -386,10 +386,10 @@ void SwFrameShell::Execute(SfxRequest &rReq)
             }
             else
             {
-                SfxItemSet aSet(GetPool(),  //UUUU sorted by indices
+                SfxItemSet aSet(GetPool(),  // sorted by indices
                     RES_FRMATR_BEGIN,       RES_FRMATR_END-1,                       // [82
 
-                    //UUUU FillAttribute support
+                    // FillAttribute support
                     XATTR_FILL_FIRST,       XATTR_FILL_LAST,                        // [1014
 
                     SID_DOCFRAME,           SID_DOCFRAME,                           // [5598
@@ -399,7 +399,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                     SID_ATTR_LRSPACE,       SID_ATTR_ULSPACE,                       // [10048
                     SID_ATTR_PAGE_SIZE,     SID_ATTR_PAGE_SIZE,                     // [10051
 
-                    //UUUU items to hand over XPropertyList things like
+                    // items to hand over XPropertyList things like
                     // XColorList, XHatchList, XGradientList and XBitmapList
                     // to the Area TabPage
                     SID_COLOR_TABLE,        SID_PATTERN_LIST,                        // [10179
@@ -414,7 +414,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
 
                     0);
 
-                //UUUU create needed items for XPropertyList entries from the DrawModel so that
+                // create needed items for XPropertyList entries from the DrawModel so that
                 // the Area TabPage can access them
                 const SwDrawModel* pDrawModel = rSh.GetView().GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
                 pDrawModel->PutAreaListItems(aSet);
@@ -1204,7 +1204,6 @@ void  SwFrameShell::StateInsert(SfxItemSet &rSet)
     }
 }
 
-//UUUU
 void SwFrameShell::GetDrawAttrStateTextFrame(SfxItemSet &rSet)
 {
     SwWrtShell &rSh = GetShell();
@@ -1224,7 +1223,6 @@ void SwFrameShell::GetDrawAttrStateTextFrame(SfxItemSet &rSet)
     }
 }
 
-//UUUU
 void SwFrameShell::ExecDrawAttrArgsTextFrame(SfxRequest& rReq)
 {
     const SfxItemSet* pArgs = rReq.GetArgs();
@@ -1267,7 +1265,6 @@ void SwFrameShell::ExecDrawAttrArgsTextFrame(SfxRequest& rReq)
     }
 }
 
-//UUUU
 void SwFrameShell::ExecDrawDlgTextFrame(SfxRequest& rReq)
 {
     switch(rReq.GetSlot())
@@ -1323,7 +1320,6 @@ void SwFrameShell::ExecDrawDlgTextFrame(SfxRequest& rReq)
     }
 }
 
-//UUUU
 void SwFrameShell::DisableStateTextFrame(SfxItemSet &rSet)
 {
     SfxWhichIter aIter(rSet);
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 0405fc7a4b67..bbff31c07da0 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -219,12 +219,12 @@ void SwGrfShell::Execute(SfxRequest &rReq)
             const SwViewOption* pVOpt = rSh.GetViewOptions();
             SwViewOption aUsrPref( *pVOpt );
 
-            SfxItemSet aSet(GetPool(), //UUUU sorted by indices
+            SfxItemSet aSet(GetPool(), // sorted by indices
 
                 RES_FRMATR_BEGIN,RES_FRMATR_END - 1,                            // [   82
                 RES_GRFATR_MIRRORGRF,RES_GRFATR_CROPGRF,                        // [  123
 
-                //UUUU FillAttribute support
+                // FillAttribute support
                 XATTR_FILL_FIRST,       XATTR_FILL_LAST,                        // [ 1014
 
                 SID_DOCFRAME,SID_DOCFRAME,                                      // [ 5598
@@ -233,7 +233,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                 SID_ATTR_GRAF_KEEP_ZOOM,SID_ATTR_GRAF_KEEP_ZOOM,                // [10882
                 SID_ATTR_GRAF_FRMSIZE,SID_ATTR_GRAF_GRAPHIC,                    // [10884, contains SID_ATTR_GRAF_FRMSIZE_PERCENT
 
-                //UUUU items to hand over XPropertyList things like
+                // items to hand over XPropertyList things like
                 // XColorList, XHatchList, XGradientList and XBitmapList
                 // to the Area TabPage
                 SID_COLOR_TABLE,        SID_PATTERN_LIST,                        // [10179
@@ -247,7 +247,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                 SID_REFERER,            SID_REFERER,
                 0);
 
-            //UUUU create needed items for XPropertyList entries from the DrawModel so that
+            // create needed items for XPropertyList entries from the DrawModel so that
             // the Area TabPage can access them
             const SwDrawModel* pDrawModel = rSh.GetView().GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
 
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 0a9c346e3c28..aecf52c6b51c 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -909,12 +909,12 @@ void SwTextShell::Execute(SfxRequest &rReq)
             bool bApplyCharUnit = ::HasCharUnit( dynamic_cast<SwWebView*>( &GetView()) != nullptr  );
             SW_MOD()->PutItem(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bApplyCharUnit));
 
-            SfxItemSet aCoreSet( GetPool(), //UUUU sorted by indices, one group of three concatenated
+            SfxItemSet aCoreSet( GetPool(), // sorted by indices, one group of three concatenated
                             RES_PARATR_BEGIN,           RES_PARATR_END - 1,         // [60
                             RES_PARATR_LIST_BEGIN,      RES_PARATR_LIST_END - 1,    // [77
                             RES_FRMATR_BEGIN,           RES_FRMATR_END - 1,         // [82
 
-                            //UUUU FillAttribute support
+                            // FillAttribute support
                             XATTR_FILL_FIRST, XATTR_FILL_LAST,                      // [1014
 
                             // includes SID_ATTR_TABSTOP_POS
@@ -923,7 +923,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                             SID_ATTR_BORDER_INNER,      SID_ATTR_BORDER_INNER,      // [10023
                             SID_ATTR_PARA_MODEL,        SID_ATTR_PARA_KEEP,         // [10065
 
-                            //UUUU items to hand over XPropertyList things like
+                            // items to hand over XPropertyList things like
                             // XColorList, XHatchList, XGradientList and XBitmapList
                             // to the Area TabPage
                             SID_COLOR_TABLE,        SID_PATTERN_LIST,                // [10179
@@ -938,7 +938,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             // get also the list level indent values merged as LR-SPACE item, if needed.
             rWrtSh.GetPaMAttr( pPaM, aCoreSet, true );
 
-            //UUUU create needed items for XPropertyList entries from the DrawModel so that
+            // create needed items for XPropertyList entries from the DrawModel so that
             // the Area TabPage can access them
             // Do this after GetCurAttr, this resets the ItemSet content again
             const SwDrawModel* pDrawModel = GetView().GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index 0bfeda9fd1e8..519e6c396e76 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -60,7 +60,6 @@
 #include <cmdid.h>
 #include <IDocumentRedlineAccess.hxx>
 
-//UUUU
 #include <doc.hxx>
 
 using namespace ::com::sun::star;
@@ -158,7 +157,7 @@ void SwView::GetState(SfxItemSet &rSet)
                 const size_t nCurIdx = m_pWrtShell->GetCurPageDesc();
                 const SwPageDesc& rDesc = m_pWrtShell->GetPageDesc( nCurIdx );
 
-                //UUUU set correct parent to get the XFILL_NONE FillStyle as needed
+                // set correct parent to get the XFILL_NONE FillStyle as needed
                 if(!rSet.GetParent())
                 {
                     const SwFrameFormat& rMaster = rDesc.GetMaster();
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 6f4c20ae016b..09b5841f3cf0 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -467,7 +467,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
         SfxItemSet aHeaderSet(*rSet.GetPool(),
             RES_FRMATR_BEGIN,RES_FRMATR_END - 1,            // [82
 
-            //UUUU FillAttribute support
+            // FillAttribute support
             XATTR_FILL_FIRST, XATTR_FILL_LAST,              // [1014
 
             SID_ATTR_BORDER_INNER,SID_ATTR_BORDER_INNER,    // [10023
@@ -476,7 +476,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
             SID_ATTR_PAGE_SHARED_FIRST,SID_ATTR_PAGE_SHARED_FIRST,
             0, 0);
 
-        //UUUU set correct parent to get the XFILL_NONE FillStyle as needed
+        // set correct parent to get the XFILL_NONE FillStyle as needed
         aHeaderSet.SetParent(&rMaster.GetDoc()->GetDfltFrameFormat()->GetAttrSet());
 
         // Dynamic or fixed height
@@ -518,7 +518,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
         SfxItemSet aFooterSet(*rSet.GetPool(),
             RES_FRMATR_BEGIN,RES_FRMATR_END - 1,            // [82
 
-            //UUUU FillAttribute support
+            // FillAttribute support
             XATTR_FILL_FIRST, XATTR_FILL_LAST,              // [1014
 
             SID_ATTR_BORDER_INNER,SID_ATTR_BORDER_INNER,    // [10023
@@ -527,7 +527,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
             SID_ATTR_PAGE_SHARED_FIRST,SID_ATTR_PAGE_SHARED_FIRST,
             0, 0);
 
-        //UUUU set correct parent to get the XFILL_NONE FillStyle as needed
+        // set correct parent to get the XFILL_NONE FillStyle as needed
         aFooterSet.SetParent(&rMaster.GetDoc()->GetDfltFrameFormat()->GetAttrSet());
 
         // Dynamic or fixed height
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 546b953bc19b..ee81b1447a0a 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -680,7 +680,7 @@ void ImpGraphic::ImplSetPrefSize( const Size& rPrefSize )
 
         case GraphicType::Bitmap:
         {
-            //UUUU used when importing a writer FlyFrame with SVG as graphic, added conversion
+            // used when importing a writer FlyFrame with SVG as graphic, added conversion
             // to allow setting the PrefSize at the BitmapEx to hold it
             if(maSvgData.get() && maEx.IsEmpty())
             {
diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx
index 5b08ac8cd7bf..09365e18ed5f 100644
--- a/xmloff/inc/PageMasterImportContext.hxx
+++ b/xmloff/inc/PageMasterImportContext.hxx
@@ -27,8 +27,6 @@ class PageStyleContext : public XMLPropStyleContext
 {
 private:
     OUString sPageUsage;
-
-    //UUUU
     bool                m_bIsFillStyleAlreadyConverted : 1;
 
 protected:
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 3bec5d6884c5..b66b95d22cba 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -24,8 +24,6 @@
 #include <xmloff/PageMasterStyleMap.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/extract.hxx>
-
-//UUUU
 #include <xmloff/txtprmap.hxx>
 
 using namespace ::com::sun::star;
@@ -326,7 +324,6 @@ void XMLPageMasterExportPropMapper::ContextFilter(
 
     XMLPropertyState*       pPrint              = nullptr;
 
-    //UUUU
     XMLPropertyState* pRepeatOffsetX = nullptr;
     XMLPropertyState* pRepeatOffsetY = nullptr;
     XMLPropertyState* pHeaderRepeatOffsetX = nullptr;
@@ -393,37 +390,31 @@ void XMLPageMasterExportPropMapper::ContextFilter(
             case CTP_PM_GRID_SNAP_TO_CHARS:     pPMGridSnapToChars  = pProp;    break;
             case CTP_PM_GRID_SNAP_TO:       pPMGridSnapTo = pProp;    break;
 
-            //UUUU
             case CTF_PM_REPEAT_OFFSET_X:
                 pRepeatOffsetX = pProp;
                 break;
 
-            //UUUU
             case CTF_PM_REPEAT_OFFSET_Y:
                 pRepeatOffsetY = pProp;
                 break;
 
-            //UUUU
             case CTF_PM_HEADERREPEAT_OFFSET_X:
                 pHeaderRepeatOffsetX = pProp;
                 break;
 
-            //UUUU
             case CTF_PM_HEADERREPEAT_OFFSET_Y:
                 pHeaderRepeatOffsetY = pProp;
                 break;
 
-            //UUUU
             case CTF_PM_FOOTERREPEAT_OFFSET_X:
                 pFooterRepeatOffsetX = pProp;
                 break;
 
-            //UUUU
             case CTF_PM_FOOTERREPEAT_OFFSET_Y:
                 pFooterRepeatOffsetY = pProp;
                 break;
 
-            //UUUU Sort out empty entries
+            // Sort out empty entries
             case CTF_PM_FILLGRADIENTNAME:
             case CTF_PM_FILLHATCHNAME:
             case CTF_PM_FILLBITMAPNAME:
@@ -457,7 +448,7 @@ void XMLPageMasterExportPropMapper::ContextFilter(
         }
     }
 
-    //UUUU These entries need to be reduced to a single one for XML export.
+    // These entries need to be reduced to a single one for XML export.
     // Both would be exported as 'draw:tile-repeat-offset' following a percent
     // value and a 'vertical' or 'horizontal' tag as mark. If both would be active
     // and both would be exported this would create an XML error (same property twice)
@@ -475,7 +466,7 @@ void XMLPageMasterExportPropMapper::ContextFilter(
         }
     }
 
-    //UUUU Same as above for Header
+    // Same as above for Header
     if(pHeaderRepeatOffsetX && pHeaderRepeatOffsetY)
     {
         sal_Int32 nOffset(0);
@@ -490,7 +481,7 @@ void XMLPageMasterExportPropMapper::ContextFilter(
         }
     }
 
-    //UUUU Same as above for Footer
+    // Same as above for Footer
     if(pFooterRepeatOffsetX && pFooterRepeatOffsetY)
     {
         sal_Int32 nOffset(0);
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index 1aaee2640818..e92b05c2c8b0 100644
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <osl/diagnose.h>
 
-//UUUU
+//
 #include <xmlsdtypes.hxx>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <xmloff/xmlerror.hxx>
@@ -39,7 +39,7 @@ using namespace ::xmloff::token;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-//UUUU
+//
 using namespace ::com::sun::star::beans;
 
 void PageStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
@@ -65,7 +65,7 @@ PageStyleContext::PageStyleContext( SvXMLImport& rImport,
         bool bDefaultStyle) :
     XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_PAGE_MASTER, bDefaultStyle),
     sPageUsage(),
-    m_bIsFillStyleAlreadyConverted(false) //UUUU
+    m_bIsFillStyleAlreadyConverted(false) //
 {
 }
 
@@ -160,7 +160,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext(
 
 void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet > & rPropSet)
 {
-    //UUUU need to filter out old fill definitions when the new ones are used. The new
+    // need to filter out old fill definitions when the new ones are used. The new
     // ones are used when a FillStyle is defined
     if(!m_bIsFillStyleAlreadyConverted && GetProperties().size())
     {
@@ -186,7 +186,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet
         m_bIsFillStyleAlreadyConverted = true;
     }
 
-    //UUUU do not use XMLPropStyleContext::FillPropertySet, we need to handle this ourselves since
+    // do not use XMLPropStyleContext::FillPropertySet, we need to handle this ourselves since
     // we have properties which use the MID_FLAG_NO_PROPERTY_IMPORT flag since they need some special
     // handling
     rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper(GetFamily());
@@ -225,14 +225,14 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet
             XML_STYLE_FAMILY_SD_FILL_IMAGE_ID
         };
 
-        //UUUU Fill PropertySet, but let it handle special properties not itself
+        // Fill PropertySet, but let it handle special properties not itself
         xImpPrMap->FillPropertySet(GetProperties(), rPropSet, aContextIDs);
 
         // get property set mapper
         const rtl::Reference< XMLPropertySetMapper >& rMapper = xImpPrMap->getPropertySetMapper();
         Reference< XPropertySetInfo > xInfo;
 
-        //UUUU handle special attributes which have MID_FLAG_NO_PROPERTY_IMPORT set
+        // handle special attributes which have MID_FLAG_NO_PROPERTY_IMPORT set
         for(sal_uInt16 i = 0; aContextIDs[i].nContextID != -1; i++)
         {
             sal_Int32 nIndex = aContextIDs[i].nIndex;
@@ -260,7 +260,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet
                         rtl::OUString sStyleName;
                         rState.maValue >>= sStyleName;
 
-                        //UUUU translate the used name from ODF intern to the name used in the Model
+                        // translate the used name from ODF intern to the name used in the Model
                         sStyleName = GetImport().GetStyleDisplayName(aFamilies[i%4], sStyleName);
 
                         try
@@ -296,7 +296,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet
         OSL_ENSURE(xImpPrMap.is(), "Got no SvXMLImportPropertyMapper (!)");
     }
 
-    //UUUU old code, replaced by above stuff
+    // old code, replaced by above stuff
     // XMLPropStyleContext::FillPropertySet(rPropSet);
 
     if (!sPageUsage.isEmpty())
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx
index e216566a8c0c..a5047fec91fa 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.cxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx
@@ -28,8 +28,6 @@
 #include "PageMasterPropHdl.hxx"
 #include <xmloff/PageMasterStyleMap.hxx>
 #include <com/sun/star/text/TextGridMode.hpp>
-
-//UUUU
 #include <xmloff/EnumPropertyHdl.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/drawing/FillStyle.hpp>
@@ -41,7 +39,6 @@
 
 using namespace ::xmloff::token;
 using namespace ::com::sun::star;
-//UUUU
 using namespace ::com::sun::star::drawing;
 
 static SvXMLEnumMapEntry<sal_uInt16> const aXML_TextGridMode_ConstantMap[] =
@@ -132,7 +129,6 @@ const XMLPropertyHandler* XMLPageMasterPropHdlFactory::GetPropertyHandler( sal_I
                     aXML_TextGridMode_ConstantMap, XML_NONE );
             break;
 
-            //UUUU
             case XML_SW_TYPE_FILLSTYLE:
                 pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap );
                 break;
@@ -153,7 +149,6 @@ const XMLPropertyHandler* XMLPageMasterPropHdlFactory::GetPropertyHandler( sal_I
                 pHdl = new XMLBitmapRepeatOffsetPropertyHandler(XML_SW_TYPE_BITMAPREPOFFSETX == nType);
                 break;
 
-            //UUUU
             default:
             {
                 OSL_ENSURE(false, "XMLPropertyHandler missing (!)");
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
index c904decfb8a3..7b11abbd2795 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -20,8 +20,6 @@
 #include <xmloff/PageMasterStyleMap.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
-
-//UUUU
 #include <xmloff/txtprmap.hxx>
 
 using namespace ::xmloff::token;
@@ -42,7 +40,7 @@ using namespace ::xmloff::token;
 const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
 {
     //////////////////////////////////////////////////////////////////////////
-    //UUUU Section for 'page-layout-properties'
+    // Section for 'page-layout-properties'
 
     // page master
     PLMAP( "PageStyleLayout",            XML_NAMESPACE_STYLE,    XML_PAGE_USAGE,                    XML_PM_TYPE_PAGESTYLELAYOUT | MID_FLAG_SPECIAL_ITEM,    CTF_PM_PAGEUSAGE ),
@@ -119,7 +117,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
 
     PLMAP( "UserDefinedAttributes",    XML_NAMESPACE_TEXT,        XML_XMLNS,                        XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ),
 
-    //UUUUIndex 65: fill attributes; use PLMAP macro here instead of GMAP, tis list is ordered and it's order is used
+    //Index 65: fill attributes; use PLMAP macro here instead of GMAP, tis list is ordered and it's order is used
     // to decide in which section in ODF to export the contained stuff (the PageMasterStyle creates several XML
     // sections, for Page, Header and Footer). The needed order seems to rely not on filtering, but using sections
     // based on the order used in this list.
@@ -158,7 +156,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
     PLMAP( "FootnoteLineStyle",     XML_NAMESPACE_STYLE,    XML_EMPTY,  XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM,  CTF_PM_FTN_LINE_STYLE ),
 
     //////////////////////////////////////////////////////////////////////////
-    //UUUUIndex 92: Section for 'header-style' own section, all members *have* to use CTF_PM_HEADERFLAG in the context entry (the 5th one)
+    //Index 92: Section for 'header-style' own section, all members *have* to use CTF_PM_HEADERFLAG in the context entry (the 5th one)
     HFMAP( "HeaderHeight",                XML_NAMESPACE_SVG,        XML_HEIGHT,                     XML_TYPE_MEASURE,        CTF_PM_HEADERHEIGHT ),
     HFMAP( "HeaderHeight",                XML_NAMESPACE_FO,        XML_MIN_HEIGHT,                 XML_TYPE_MEASURE,        CTF_PM_HEADERMINHEIGHT ),
     HFMAP( "HeaderIsDynamicHeight",        XML_NAMESPACE_STYLE,    XML__EMPTY,                        XML_TYPE_BOOL,            CTF_PM_HEADERDYNAMIC ),
@@ -189,7 +187,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
     HFMAP( "HeaderBackGraphicURL",        XML_NAMESPACE_STYLE,    XML_BACKGROUND_IMAGE,            XML_TYPE_STRING | MID_FLAG_ELEMENT_ITEM,                CTF_PM_HEADERGRAPHICURL ),
     HFMAP( "HeaderDynamicSpacing",        XML_NAMESPACE_STYLE,    XML_DYNAMIC_SPACING,            XML_TYPE_BOOL,          CTF_PM_HEADERFLAG ),
 
-    //UUUUIndex 121: Header DrawingLayer FillAttributes
+    //Index 121: Header DrawingLayer FillAttributes
     // Use HFMAP to get XML_TYPE_PROP_HEADER_FOOTER ORed to the 4th entry
     // Names have to begin with 'Header', all 5th entries need to be ORed with the CTF_PM_HEADERFLAG
     HFMAP( "HeaderFillStyle",                     XML_NAMESPACE_DRAW,     XML_FILL,                   XML_SW_TYPE_FILLSTYLE,                                  CTF_PM_HEADERFLAG ),
@@ -214,7 +212,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
     HFMAP( "HeaderFillBitmapOffsetY",             XML_NAMESPACE_DRAW,     XML_TILE_REPEAT_OFFSET,     XML_SW_TYPE_BITMAPREPOFFSETY|MID_FLAG_MULTI_PROPERTY,   CTF_PM_HEADERREPEAT_OFFSET_Y ),
 
     //////////////////////////////////////////////////////////////////////////
-    //UUUUIndex 141: Section for 'footer-style' own section, all members *have* to use CTF_PM_FOOTERFLAG in the context entry (the 5th one)
+    //Index 141: Section for 'footer-style' own section, all members *have* to use CTF_PM_FOOTERFLAG in the context entry (the 5th one)
     HFMAP( "FooterHeight",                XML_NAMESPACE_SVG,        XML_HEIGHT,                     XML_TYPE_MEASURE,        CTF_PM_FOOTERHEIGHT ),
     HFMAP( "FooterHeight",                XML_NAMESPACE_FO,        XML_MIN_HEIGHT,                 XML_TYPE_MEASURE,        CTF_PM_FOOTERMINHEIGHT ),
     HFMAP( "FooterIsDynamicHeight",        XML_NAMESPACE_STYLE,    XML__EMPTY,                     XML_TYPE_BOOL,            CTF_PM_FOOTERDYNAMIC ),
@@ -245,7 +243,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
     HFMAP( "FooterBackGraphicURL",        XML_NAMESPACE_STYLE,    XML_BACKGROUND_IMAGE,            XML_TYPE_STRING | MID_FLAG_ELEMENT_ITEM,                CTF_PM_FOOTERGRAPHICURL ),
     HFMAP( "FooterDynamicSpacing",        XML_NAMESPACE_STYLE,    XML_DYNAMIC_SPACING,           XML_TYPE_BOOL,          CTF_PM_FOOTERFLAG ),
 
-    //UUUUIndex 170: Footer DrawingLayer FillAttributes
+    //Index 170: Footer DrawingLayer FillAttributes
     // Use HFMAP to get XML_TYPE_PROP_HEADER_FOOTER ORed to the 4th entry
     // Names have to begin with 'Footer', all 5th entries need to be ORed with the CTF_PM_FOOTERFLAG
     HFMAP( "FooterFillStyle",                     XML_NAMESPACE_DRAW,     XML_FILL,                   XML_SW_TYPE_FILLSTYLE,                                  CTF_PM_FOOTERFLAG ),
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index bc00a86c944c..079bea84c086 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -40,8 +40,6 @@
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/maptype.hxx>
 #include <comphelper/sequence.hxx>
-
-//UUUU
 #include <com/sun/star/drawing/FillStyle.hpp>
 
 using namespace ::com::sun::star;
@@ -52,8 +50,6 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::xmloff::token;
-
-//UUUU
 using namespace com::sun::star::drawing;
 
 void XMLPropStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
@@ -273,7 +269,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite )
     rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = pSvXMLStylesContext->GetImportPropertyMapper(GetFamily());
     OSL_ENSURE(xImpPrMap.is(), "There is no import prop mapper");
 
-    //UUUU need to filter out old fill definitions when the new ones are used. The new
+    // need to filter out old fill definitions when the new ones are used. The new
     // ones are used when a FillStyle is defined
     const bool bTakeCareOfDrawingLayerFillStyle(xImpPrMap.is() && GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH);
     bool bDrawingLayerFillStylesUsed(false);
@@ -293,7 +289,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite )
     if( pSvXMLStylesContext->IsAutomaticStyle()
         && ( GetFamily() == XML_STYLE_FAMILY_TEXT_TEXT || GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH ) )
     {
-        //UUUU Need to translate StyleName from temp MapNames to names
+        // Need to translate StyleName from temp MapNames to names
         // used in already imported items (already exist in the pool). This
         // is required for AutomaticStyles since these do *not* use FillPropertySet
         // and thus just trigger CheckSpecialContext in XMLTextStyleContext::FillPropertySet
@@ -534,7 +530,6 @@ void XMLPropStyleContext::Finish( bool bOverwrite )
     }
 }
 
-//UUUU
 bool XMLPropStyleContext::doNewDrawingLayerFillStyleDefinitionsExist(
     const OUString& rFillStyleTag) const
 {
@@ -580,7 +575,6 @@ bool XMLPropStyleContext::doNewDrawingLayerFillStyleDefinitionsExist(
     return false;
 }
 
-//UUUU
 void XMLPropStyleContext::deactivateOldFillStyleDefinitions(
     const OldFillStyleDefinitionSet& rHashSetOfTags)
 {
@@ -607,7 +601,6 @@ void XMLPropStyleContext::deactivateOldFillStyleDefinitions(
     }
 }
 
-//UUUU
 void XMLPropStyleContext::translateNameBasedDrawingLayerFillStyleDefinitionsToStyleDisplayNames()
 {
     if(maProperties.size())
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 71131c2fb4e8..65fd45d877b5 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -33,8 +33,6 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/maptype.hxx>
 #include "XMLSectionFootnoteConfigExport.hxx"
-
-//UUUU
 #include <xmlsdtypes.hxx>
 
 using namespace ::com::sun::star;
@@ -664,7 +662,6 @@ void XMLTextExportPropertySetMapper::ContextFilter(
     XMLPropertyState* pAllParaMargin = nullptr;
     XMLPropertyState* pAllMargin = nullptr;
 
-    //UUUU
     XMLPropertyState* pRepeatOffsetX = nullptr;
     XMLPropertyState* pRepeatOffsetY = nullptr;
 
@@ -810,17 +807,14 @@ void XMLTextExportPropertySetMapper::ContextFilter(
         case CTF_PARAMARGINALL:         pAllParaMargin = propertyState; break;
         case CTF_MARGINALL:             pAllMargin = propertyState; break;
 
-        //UUUU
         case CTF_REPEAT_OFFSET_X:
             pRepeatOffsetX = propertyState;
             break;
 
-        //UUUU
         case CTF_REPEAT_OFFSET_Y:
             pRepeatOffsetY = propertyState;
             break;
 
-        //UUUU
         case CTF_FILLGRADIENTNAME:
         case CTF_FILLHATCHNAME:
         case CTF_FILLBITMAPNAME:
@@ -838,7 +832,6 @@ void XMLTextExportPropertySetMapper::ContextFilter(
         }
     }
 
-    //UUUU
     if( pRepeatOffsetX && pRepeatOffsetY )
     {
         sal_Int32 nOffset = 0;
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index b3712ea3fb7f..fc6514d4c3a8 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -50,8 +50,6 @@
 #include "txtprhdl.hxx"
 #include <com/sun/star/text/WrapInfluenceOnPosition.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-
-//UUUU
 #include <xmloff/EnumPropertyHdl.hxx>
 #include "XMLFillBitmapSizePropertyHandler.hxx"
 #include "XMLBitmapLogicalSizePropertyHandler.hxx"
@@ -64,8 +62,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::style;
 using namespace ::com::sun::star::text;
 using namespace ::xmloff::token;
-
-//UUUU
 using namespace ::com::sun::star::drawing;
 
 static SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriPos_Enum[] =
@@ -1295,7 +1291,6 @@ static const XMLPropertyHandler *GetPropertyHandler
         pHdl = new XMLConstantsPropertyHandler( pXML_VerticalAlign_Enum, XML_TOKEN_INVALID );
         break;
 
-    //UUUU
     case XML_SW_TYPE_FILLSTYLE:
         pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap);
         break;
@@ -1316,7 +1311,6 @@ static const XMLPropertyHandler *GetPropertyHandler
         pHdl = new XMLBitmapRepeatOffsetPropertyHandler(XML_SW_TYPE_BITMAPREPOFFSETX == nType);
         break;
 
-    //UUUU
     default:
     {
         OSL_ENSURE(false, "XMLPropertyHandler missing (!)");
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index eaaff4690d98..99861f5a8c03 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -25,8 +25,6 @@
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmltypes.hxx>
 #include "txtprhdl.hxx"
-
-//UUUU
 #include <xmlsdtypes.hxx>
 
 using namespace ::com::sun::star;
@@ -82,7 +80,6 @@ using namespace ::xmloff::token;
 #define M_END() \
     { nullptr, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010, false }
 
-//UUUU
 #define MAP_(name,prefix,token,type,context)  { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010, false }
 #define GMAP(name,prefix,token,type,context) MAP_(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context)
 
@@ -91,7 +88,7 @@ XMLPropertyMapEntry const aXMLParaPropMap[] =
     // RES_UNKNOWNATR_CONTAINER
     MP_E( "ParaUserDefinedAttributes", TEXT, XMLNS, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ),
 
-    //UUUU fill attributes for paragraph backgrounds
+    // fill attributes for paragraph backgrounds
     // #i125045# moved to the front to be able to exclude these in lcl_txtprmap_getMap
     // for TextPropMap::SHAPE_PARA to not have these double for Shapes (which already have these)
     GMAP( "FillStyle",                      XML_NAMESPACE_DRAW, XML_FILL,                   XML_SW_TYPE_FILLSTYLE, 0 ),
@@ -759,7 +756,7 @@ XMLPropertyMapEntry const aXMLFramePropMap[] =
     MG_E( "BackGraphicFilter",STYLE,    FILTER_NAME,    MID_FLAG_SPECIAL_ITEM|XML_TYPE_STRING, CTF_BACKGROUND_FILTER ),
     MG_E( "BackGraphicURL", STYLE,  BACKGROUND_IMAGE,   MID_FLAG_ELEMENT_ITEM|XML_TYPE_STRING, CTF_BACKGROUND_URL ),
 
-    //UUUU fill attributes
+    // fill attributes
     GMAP( "FillStyle",                      XML_NAMESPACE_DRAW, XML_FILL,                   XML_SW_TYPE_FILLSTYLE, 0 ),
     GMAP( "FillColor",                      XML_NAMESPACE_DRAW, XML_FILL_COLOR,             XML_TYPE_COLOR, 0 ),
     GMAP( "FillColor2",                     XML_NAMESPACE_DRAW, XML_SECONDARY_FILL_COLOR,   XML_TYPE_COLOR, 0 ),
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 7c3a11913b19..de594dca7a6d 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -51,7 +51,6 @@
 #include <utility>
 #include <vector>
 
-//UUUU
 #include <xmlsdtypes.hxx>
 #include <xmloff/xmlerror.hxx>
 
@@ -532,7 +531,7 @@ void XMLTextStyleContext::FillPropertySet(
                         rtl::OUString sStyleName;
                         rState.maValue >>= sStyleName;
 
-                        //UUUU translate the used name from ODF intern to the name used in the Model
+                        // translate the used name from ODF intern to the name used in the Model
                         sStyleName = GetImport().GetStyleDisplayName(aFamilies[i - 7], sStyleName);
 
                         if(bAutomatic)
author	Noel Grandin <noel.grandin@collabora.co.uk>	2017-03-14 09:14:53 +0200
committer	Noel Grandin <noel.grandin@collabora.co.uk>	2017-03-14 08:23:53 +0000
commit	427678b9cf7fe968c10877dd6facecd8552fd291 (patch)
tree	c9efd0d9757e12660f1377abf1ea88f70266eb5a
parent	250995d2b8d8ad544110d3daeb2f61089bff0aa5 (diff)