[Libreoffice-commits] core.git: cui/source drawinglayer/source include/editeng include/svx include/xmloff sc/source sfx2/source svx/source sw/inc sw/sdi sw/source vcl/source xmloff/inc xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Mar 14 08:24:44 UTC 2017
cui/source/factory/dlgfact.cxx | 1
cui/source/factory/dlgfact.hxx | 2
cui/source/inc/page.hxx | 6 -
cui/source/tabpages/bbdlg.cxx | 5 -
cui/source/tabpages/page.cxx | 53 +++-----------
drawinglayer/source/attribute/sdrfillgraphicattribute.cxx | 2
include/editeng/brushitem.hxx | 2
include/svx/hdft.hxx | 1
include/svx/pagectrl.hxx | 3
include/svx/svxdlg.hxx | 2
include/svx/svxids.hrc | 1
include/svx/unobrushitemhelper.hxx | 2
include/xmloff/PageMasterStyleMap.hxx | 6 -
include/xmloff/prstylei.hxx | 10 +-
include/xmloff/xmltypes.hxx | 1
sc/source/core/data/documen9.cxx | 4 -
sfx2/source/dialog/tabdlg.cxx | 2
svx/source/dialog/hdft.cxx | 31 +++-----
svx/source/dialog/pagectrl.cxx | 8 --
svx/source/unodraw/unobrushitemhelper.cxx | 4 -
sw/inc/doc.hxx | 2
sw/inc/format.hxx | 6 -
sw/inc/frmfmt.hxx | 4 -
sw/inc/hintids.hxx | 2
sw/inc/ndtxt.hxx | 4 -
sw/inc/node.hxx | 3
sw/inc/swatrset.hxx | 2
sw/inc/swunohelper.hxx | 6 -
sw/inc/unomap.hxx | 2
sw/inc/unoprnms.hxx | 2
sw/sdi/_frmsh.sdi | 13 ---
sw/source/core/access/accpara.cxx | 2
sw/source/core/attr/format.cxx | 21 ++---
sw/source/core/attr/swatrset.cxx | 6 -
sw/source/core/bastyp/init.cxx | 6 -
sw/source/core/doc/DocumentContentOperationsManager.cxx | 6 -
sw/source/core/doc/DocumentDrawModelManager.cxx | 40 ----------
sw/source/core/doc/DocumentStylePoolManager.cxx | 2
sw/source/core/doc/docdesc.cxx | 4 -
sw/source/core/doc/docfly.cxx | 2
sw/source/core/doc/docfmt.cxx | 2
sw/source/core/doc/docnew.cxx | 3
sw/source/core/doc/notxtfrm.cxx | 6 -
sw/source/core/doc/poolfmt.cxx | 2
sw/source/core/docnode/node.cxx | 1
sw/source/core/inc/frame.hxx | 2
sw/source/core/layout/atrfrm.cxx | 9 --
sw/source/core/layout/findfrm.cxx | 1
sw/source/core/layout/frmtool.cxx | 5 -
sw/source/core/layout/paintfrm.cxx | 21 +----
sw/source/core/layout/wsfrm.cxx | 2
sw/source/core/text/inftxt.cxx | 5 -
sw/source/core/txtnode/fntcache.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 7 -
sw/source/core/undo/rolbck.cxx | 2
sw/source/core/unocore/swunohelper.cxx | 3
sw/source/core/unocore/unoframe.cxx | 37 +++------
sw/source/core/unocore/unomap1.cxx | 36 ++++-----
sw/source/core/unocore/unomapproperties.hxx | 5 -
sw/source/core/unocore/unoparagraph.cxx | 12 +--
sw/source/core/unocore/unostyle.cxx | 53 ++++++--------
sw/source/ui/chrdlg/pardlg.cxx | 8 +-
sw/source/ui/fmtui/tmpdlg.cxx | 18 ++--
sw/source/ui/frmdlg/frmdlg.cxx | 18 +---
sw/source/uibase/app/docst.cxx | 3
sw/source/uibase/app/docstyle.cxx | 15 +--
sw/source/uibase/frmdlg/colex.cxx | 15 +--
sw/source/uibase/frmdlg/frmmgr.cxx | 2
sw/source/uibase/inc/frmsh.hxx | 2
sw/source/uibase/shells/basesh.cxx | 6 -
sw/source/uibase/shells/frmsh.cxx | 12 +--
sw/source/uibase/shells/grfsh.cxx | 8 +-
sw/source/uibase/shells/textsh1.cxx | 8 +-
sw/source/uibase/uiview/viewstat.cxx | 3
sw/source/uibase/utlui/uitool.cxx | 8 +-
vcl/source/gdi/impgraph.cxx | 2
xmloff/inc/PageMasterImportContext.hxx | 2
xmloff/source/style/PageMasterExportPropMapper.cxx | 17 +---
xmloff/source/style/PageMasterImportContext.cxx | 18 ++--
xmloff/source/style/PageMasterPropHdlFactory.cxx | 5 -
xmloff/source/style/PageMasterStyleMap.cxx | 14 +--
xmloff/source/style/prstylei.cxx | 11 --
xmloff/source/text/txtexppr.cxx | 7 -
xmloff/source/text/txtprhdl.cxx | 6 -
xmloff/source/text/txtprmap.cxx | 7 -
xmloff/source/text/txtstyli.cxx | 3
86 files changed, 237 insertions(+), 478 deletions(-)
New commits:
commit 427678b9cf7fe968c10877dd6facecd8552fd291
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Mar 14 09:14:53 2017 +0200
remove noise UUUU tags in comments
Change-Id: Id8a2940ae7348bf75ca967f31adf8489dc678d00
Reviewed-on: https://gerrit.libreoffice.org/35161
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 6b96401..f09b5b0 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 2cf6761..9c1b197 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 d0317b6..1f86cb7 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 23422c3..0cef97d 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 d85c1aa..0b0f750 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 f191dc3..79a35a2 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 149db46..daa379b 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 7db266f..335f7aa 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 50095f6..25b6bb5 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 a88bed5..12f7f70 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 9a7fc71..79eef2a 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 df68b86..6d710b9 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 702bb1a..2b6a1b3 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 57f451c..cd843fa 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 b57f754..010dad0 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 339c75b..d05af16 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 cf11ada..e818a14 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 f1ee794..044a1d9 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 5e18bee..38a1169 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 5f610e1..a62b083 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 6b013fc..1a65458 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 a3a1661..405ee06 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 19a509d..c628950 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 aef7161..921509a 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 384782b..1798dad 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 04d883b..a9a5222 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 42c5ba2..be584b6 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 1ac05dc..5d50605 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 cf5b068..40b54b1 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 c4020c5..1be45cc 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 2ccb88f..0ff5414 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 5a974dd..6b93b7e 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 279a05a..7addf5f 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 3cc2dca..29a6cb2 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 493b4fc..7b85287 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 06d61e8..18f1c71 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 4f95094..b97143d 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 23ca102..11f83a2 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 583d8bb..6c108ed 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 c89c636..6c1847b 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 cab0d32..b8e2d6e 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 add4c24..7f95a68 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 533ba65..ebcca78 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 88fddf4..ee3a579 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 74a1698..611a8d2 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 73ceab4..e9f121b 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 496dda2..c9f3e15 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 89cf316..da6fb6b 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 ebaeddd..e0fa2f0 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 3f9598e..8841a2d 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 c041307..6f71f42 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 ac87b78..4fe42f2 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 4b8ef21..cfd02c4 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 40969ca..cf22c35 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 2e9ac3d..2a2c8c0 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 8044bfb..ba8242f 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 6ec8c97..5c7a4af 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 c93effc..46674eb 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 c0c6ed9..b8b3091 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 de10429..6ad3ede 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(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list