diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/doc.hxx | 2 | ||||
-rw-r--r-- | sw/inc/format.hxx | 6 | ||||
-rw-r--r-- | sw/inc/frmfmt.hxx | 4 | ||||
-rw-r--r-- | sw/inc/hintids.hxx | 2 | ||||
-rw-r--r-- | sw/inc/ndtxt.hxx | 4 | ||||
-rw-r--r-- | sw/inc/node.hxx | 3 | ||||
-rw-r--r-- | sw/inc/swatrset.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swunohelper.hxx | 6 | ||||
-rw-r--r-- | sw/inc/unomap.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unoprnms.hxx | 2 |
10 files changed, 13 insertions, 20 deletions
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 |