diff options
Diffstat (limited to 'include/svx')
43 files changed, 428 insertions, 104 deletions
diff --git a/include/svx/annotation/Annotation.hxx b/include/svx/annotation/Annotation.hxx index 5ec5e2ec3c34..d7e4842f534c 100644 --- a/include/svx/annotation/Annotation.hxx +++ b/include/svx/annotation/Annotation.hxx @@ -20,6 +20,8 @@ #include <comphelper/compbase.hxx> #include <cppuhelper/propertysetmixin.hxx> #include <svx/annotation/Annotation.hxx> +#include <svx/annotation/TextAPI.hxx> +#include <vcl/bitmapex.hxx> class SdrUndoAction; class SfxViewShell; @@ -29,6 +31,7 @@ namespace sdr::annotation { class Annotation; +/** Type of the annotation / comment change. */ enum class CommentNotificationType { Add, @@ -36,10 +39,47 @@ enum class CommentNotificationType Remove }; +/** LOKit notify for a view */ SVXCORE_DLLPUBLIC void LOKCommentNotify(CommentNotificationType nType, const SfxViewShell* pViewShell, Annotation& rAnnotation); + +/** LOKit notify for all views */ SVXCORE_DLLPUBLIC void LOKCommentNotifyAll(CommentNotificationType nType, Annotation& rAnnotation); +/** Type of the annotation (that is supported) */ +enum class AnnotationType +{ + None, + Square, + Polygon, + Circle, + Ink, + Highlight, + Line, + FreeText, + Stamp +}; + +/** Annotation data that is used at annotation creation */ +struct CreationInfo +{ + AnnotationType meType = AnnotationType::None; + + std::vector<basegfx::B2DPolygon> maPolygons; + basegfx::B2DRectangle maRectangle; + + float mnWidth = 0.0f; + + bool mbFillColor = false; + Color maFillColor = COL_TRANSPARENT; + + bool mbColor = false; + Color maColor = COL_TRANSPARENT; + + BitmapEx maBitmapEx; +}; + +/** Data of an annotation */ struct SVXCORE_DLLPUBLIC AnnotationData { css::geometry::RealPoint2D m_Position; @@ -53,6 +93,11 @@ struct SVXCORE_DLLPUBLIC AnnotationData void set(Annotation& rAnnotation); }; +/** Annotation object, responsible for handling of the annotation. + * + * Implements the XAnnotation UNO API, handles undo/redo and notifications () + * + **/ class SVXCORE_DLLPUBLIC Annotation : public ::comphelper::WeakComponentImplHelper<css::office::XAnnotation>, public ::cppu::PropertySetMixin<css::office::XAnnotation> @@ -70,8 +115,9 @@ protected: OUString m_Author; OUString m_Initials; css::util::DateTime m_DateTime; + rtl::Reference<sdr::annotation::TextApiObject> m_TextRange; - bool m_bIsFreeText = false; + CreationInfo maCreationInfo; std::unique_ptr<SdrUndoAction> createUndoAnnotation(); @@ -84,13 +130,14 @@ public: virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const& type) override; virtual void SAL_CALL acquire() noexcept override { - ::comphelper::WeakComponentImplHelper<css::office::XAnnotation>::acquire(); + comphelper::WeakComponentImplHelper<css::office::XAnnotation>::acquire(); } virtual void SAL_CALL release() noexcept override { - ::comphelper::WeakComponentImplHelper<css::office::XAnnotation>::release(); + comphelper::WeakComponentImplHelper<css::office::XAnnotation>::release(); } + // Changes without triggering notification broadcast css::geometry::RealPoint2D GetPosition() const { return m_Position; } void SetPosition(const css::geometry::RealPoint2D& rValue) { m_Position = rValue; } @@ -106,20 +153,34 @@ public: css::util::DateTime GetDateTime() const { return m_DateTime; } void SetDateTime(const css::util::DateTime& rValue) { m_DateTime = rValue; } - virtual OUString GetText() = 0; - virtual void SetText(OUString const& rText) = 0; + virtual css::uno::Reference<css::text::XText> SAL_CALL getTextRange() override; + + // override WeakComponentImplHelperBase::disposing() + // This function is called upon disposing the component, + // if your component needs special work when it becomes + // disposed, do it here. + virtual void disposing(std::unique_lock<std::mutex>& rGuard) override; + + OUString GetText(); + void SetText(OUString const& rText); + rtl::Reference<sdr::annotation::TextApiObject> getTextApiObject() { return m_TextRange; } SdrModel* GetModel() const; SdrPage const* getPage() const { return mpPage; } SdrPage* getPage() { return mpPage; } + // Unique ID of the annotation sal_uInt32 GetId() const { return m_nId; } - void setIsFreeText(bool value) { m_bIsFreeText = value; } + CreationInfo const& getCreationInfo() { return maCreationInfo; } + void setCreationInfo(CreationInfo const& rCreationInfo) { maCreationInfo = rCreationInfo; } + + SdrObject* findAnnotationObject(); - bool isFreeText() const { return m_bIsFreeText; } + virtual rtl::Reference<Annotation> clone(SdrPage* pTargetPage) = 0; }; +/** Vector of annotations */ typedef std::vector<rtl::Reference<Annotation>> AnnotationVector; } // namespace sdr::annotation diff --git a/include/svx/annotation/AnnotationObject.hxx b/include/svx/annotation/AnnotationObject.hxx new file mode 100644 index 000000000000..e372fec1f56a --- /dev/null +++ b/include/svx/annotation/AnnotationObject.hxx @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include <svx/svxdllapi.h> + +#include <svx/annotation/Annotation.hxx> +#include <svx/svdorect.hxx> + +namespace sdr::annotation +{ +/** Annotation data that contains the annotation unique ID and author's ID */ +struct SVXCORE_DLLPUBLIC AnnotationViewData +{ + sal_Int32 nIndex = -1; + sal_uInt16 nAuthorIndex = 0; +}; + +/** Annotation (sdr) object, which represents an annotation inside the document */ +class SVXCORE_DLLPUBLIC AnnotationObject final : public SdrRectObj +{ +private: + virtual ~AnnotationObject() override; + + sdr::annotation::AnnotationViewData maViewData; + +public: + AnnotationObject(SdrModel& rSdrModel); + AnnotationObject(SdrModel& rSdrModel, AnnotationObject const& rSource); + AnnotationObject(SdrModel& rSdrModel, tools::Rectangle const& rRectangle, + sdr::annotation::AnnotationViewData const& aAnnotationViewData); + + rtl::Reference<SdrObject> CloneSdrObject(SdrModel& rTargetModel) const override; + + SdrObjKind GetObjIdentifier() const override; + OUString TakeObjNameSingul() const override; + OUString TakeObjNamePlural() const override; + + void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; + + void ApplyAnnotationName(); + + bool HasTextEdit() const override; + + bool hasSpecialDrag() const override { return true; } + + bool beginSpecialDrag(SdrDragStat& /*rDrag*/) const override { return false; } +}; + +} // end sdr::annotation + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/annotation/IAnnotationPopup.hxx b/include/svx/annotation/IAnnotationPopup.hxx new file mode 100644 index 000000000000..8a705ef1e935 --- /dev/null +++ b/include/svx/annotation/IAnnotationPopup.hxx @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include <svx/svxdllapi.h> + +#include <svx/annotation/Annotation.hxx> + +namespace sdr::annotation +{ +class SVXCORE_DLLPUBLIC IAnnotationPopup +{ +protected: + rtl::Reference<sdr::annotation::Annotation> mxAnnotation; + +public: + IAnnotationPopup(rtl::Reference<sdr::annotation::Annotation> const& pAnnotation) + : mxAnnotation(pAnnotation) + { + } + + virtual ~IAnnotationPopup() {} + + virtual void openPopup() = 0; + virtual void closePopup() = 0; +}; + +} // end sdr::annotation + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/annotation/ObjectAnnotationData.hxx b/include/svx/annotation/ObjectAnnotationData.hxx new file mode 100644 index 000000000000..4530df2fb61c --- /dev/null +++ b/include/svx/annotation/ObjectAnnotationData.hxx @@ -0,0 +1,40 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include <svx/svxdllapi.h> +#include <svx/annotation/Annotation.hxx> +#include <svx/annotation/IAnnotationPopup.hxx> + +namespace sdr::annotation +{ +/** Contains the annotation data specific for a SdrObject (which represents an annotation) */ +class ObjectAnnotationData +{ +public: + /// Does the (sdr) object represent an annotation + bool mbIsAnnotation : 1 = false; + + /// The annotation + rtl::Reference<sdr::annotation::Annotation> mxAnnotation; + + /// Object handling the pop-up window + std::unique_ptr<sdr::annotation::IAnnotationPopup> mpAnnotationPopup; + + /// Open popup for the annotation + void openPopup() + { + if (mbIsAnnotation && mpAnnotationPopup) + mpAnnotationPopup->openPopup(); + } +}; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/annotation/TextAPI.hxx b/include/svx/annotation/TextAPI.hxx new file mode 100644 index 000000000000..c227b4a803c5 --- /dev/null +++ b/include/svx/annotation/TextAPI.hxx @@ -0,0 +1,56 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#pragma once + +#include <editeng/unotext.hxx> +#include <rtl/ref.hxx> +#include <editeng/outliner.hxx> +#include <svx/svxdllapi.h> + +class SdrModel; + +namespace sdr::annotation +{ +class TextAPIEditSource; + +class SVXCORE_DLLPUBLIC TextApiObject final : public SvxUnoText +{ +public: + static rtl::Reference<TextApiObject> create(SdrModel* pModel); + + virtual ~TextApiObject() noexcept override; + + /// @throws css::uno::RuntimeException + void dispose(); + + std::optional<OutlinerParaObject> CreateText(); + void SetText(OutlinerParaObject const& rText); + OUString GetText() const; + + static TextApiObject* getImplementation(const css::uno::Reference<css::text::XText>&); + +private: + std::unique_ptr<TextAPIEditSource> mpSource; + TextApiObject(std::unique_ptr<TextAPIEditSource> pEditSource); +}; + +} // namespace sdr::annotation + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/diagram/IDiagramHelper.hxx b/include/svx/diagram/IDiagramHelper.hxx index e93056f70049..67142c26e2a7 100644 --- a/include/svx/diagram/IDiagramHelper.hxx +++ b/include/svx/diagram/IDiagramHelper.hxx @@ -80,11 +80,15 @@ private: // a newly created oox::drawingml::Theme object bool mbForceThemePtrRecreation; // false + // if true, content was self-created using addTo/addShape + // and the layouting stuff + bool mbSelfCreated; + protected: void anchorToSdrObjGroup(SdrObjGroup& rTarget); public: - IDiagramHelper(); + IDiagramHelper(bool bSelfCreated); virtual ~IDiagramHelper(); // re-create XShapes @@ -111,6 +115,10 @@ public: bool UseDiagramModelData() const { return mbUseDiagramModelData; } bool ForceThemePtrRecreation() const { return mbForceThemePtrRecreation; }; + // get/set SelfCreated flag + bool isSelfCreated() const { return mbSelfCreated; } + void setSelfCreated() { mbSelfCreated = true; } + static void AddAdditionalVisualization(const SdrObjGroup& rTarget, SdrHdlList& rHdlList); }; diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index a1a08de5e56b..e601047eff00 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -53,8 +53,8 @@ namespace com::sun::star::form { class SVXCORE_DLLPUBLIC FmFormView : public E3dView { - rtl::Reference<FmXFormView> pImpl; - FmFormShell* pFormShell; + rtl::Reference<FmXFormView> m_pImpl; + FmFormShell* m_pFormShell; void Init(); @@ -128,11 +128,11 @@ public: SVX_DLLPRIVATE void ChangeDesignMode(bool bDesign); - SVX_DLLPRIVATE FmXFormView* GetImpl() const { return pImpl.get(); } - SVX_DLLPRIVATE FmFormShell* GetFormShell() const { return pFormShell; } + SVX_DLLPRIVATE FmXFormView* GetImpl() const { return m_pImpl.get(); } + SVX_DLLPRIVATE FmFormShell* GetFormShell() const { return m_pFormShell; } struct FormShellAccess { friend class FmFormShell; private: FormShellAccess() { } }; - void SetFormShell( FmFormShell* pShell, FormShellAccess ) { pFormShell = pShell; } + void SetFormShell( FmFormShell* pShell, FormShellAccess ) { m_pFormShell = pShell; } struct ImplAccess { friend class FmXFormView; private: ImplAccess() { } }; void SetMoveOutside( bool _bMoveOutside, ImplAccess ) { E3dView::SetMoveOutside( _bMoveOutside ); } diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index de0cfef5b976..3eed97fbab47 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -30,10 +30,11 @@ class SVXCORE_DLLPUBLIC SvxGrfCrop : public SfxPoolItem { sal_Int32 nLeft, nRight, nTop, nBottom; public: - SvxGrfCrop( TypedWhichId<SvxGrfCrop> ); + SvxGrfCrop( TypedWhichId<SvxGrfCrop>, SfxItemType eType = SfxItemType::SvxGrfCropType ); SvxGrfCrop( sal_Int32 nLeft, sal_Int32 nRight, sal_Int32 nTop, sal_Int32 nBottom, - TypedWhichId<SvxGrfCrop> ); + TypedWhichId<SvxGrfCrop>, + SfxItemType eItemType = SfxItemType::SvxGrfCropType ); virtual ~SvxGrfCrop() override; SvxGrfCrop(SvxGrfCrop const &) = default; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 27d7f25c7cf2..09c2a609a483 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -161,6 +161,7 @@ enum class DbGridControlNavigationBarState class FmXGridSourcePropListener; class DisposeListenerGridBridge; +class DbGridControl; // NavigationBar class NavigationBar final : public InterimItemWindow @@ -195,21 +196,26 @@ class NavigationBar final : public InterimItemWindow std::shared_ptr<weld::ButtonPressRepeater> m_xPrevRepeater; std::shared_ptr<weld::ButtonPressRepeater> m_xNextRepeater; + Size m_aLastAllocSize; + sal_Int32 m_nCurrentPos; bool m_bPositioning; // protect PositionDataSource against recursion public: - NavigationBar(vcl::Window* pParent); + NavigationBar(DbGridControl* pParent); virtual ~NavigationBar() override; virtual void dispose() override; + DECL_LINK(SizeAllocHdl, const Size&, void); + // Status methods for Controls void InvalidateAll(sal_Int32 nCurrentPos, bool bAll = false); void InvalidateState(DbGridControlNavigationBarState nWhich) {SetState(nWhich);} void SetState(DbGridControlNavigationBarState nWhich); bool GetState(DbGridControlNavigationBarState nWhich) const; - sal_uInt16 ArrangeControls(); + void SetPointFontAndZoom(const vcl::Font& rFont, const Fraction& rZoom); + sal_uInt16 GetPreferredWidth() const; private: @@ -278,6 +284,8 @@ private: osl::Mutex m_aDestructionSafety; osl::Mutex m_aAdjustSafety; + Idle m_aRearrangeIdle; + css::util::Date m_aNullDate; // NullDate of the Numberformatter; @@ -552,6 +560,8 @@ public: css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) override; + void RearrangeAtIdle(); + protected: void RecalcRows(sal_Int32 nNewTopRow, sal_uInt16 nLinesOnScreen, bool bUpdateCursor); bool SeekCursor(sal_Int32 nRow, bool bAbsolute = false); @@ -588,6 +598,7 @@ protected: protected: void ImplInitWindow( const InitWindowFacet _eInitWhat ); DECL_DLLPRIVATE_LINK(OnDelete, void*, void); + DECL_DLLPRIVATE_LINK(RearrangeHdl, Timer*, void); DECL_DLLPRIVATE_LINK(OnAsyncAdjust, void*, void); // if the param is != NULL, AdjustRows will be called, else AdjustDataSource diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index 03eb8424561c..95a42c273c59 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -62,7 +62,8 @@ public: static SfxPoolItem* CreateDefault(); SvxHyperlinkItem( TypedWhichId<SvxHyperlinkItem> _nWhich = SID_HYPERLINK_GETLINK ): - SfxPoolItem(_nWhich) { eType = HLINK_DEFAULT; nMacroEvents=HyperDialogEvent::NONE; }; + SfxPoolItem(_nWhich, SfxItemType::SvxHyperlinkItemType) + { eType = HLINK_DEFAULT; nMacroEvents=HyperDialogEvent::NONE; }; SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ); SvxHyperlinkItem( TypedWhichId<SvxHyperlinkItem> nWhich, OUString aName, OUString aURL, OUString aTarget, OUString aIntName, diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index 894304e4c37d..8979b736e40c 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -145,7 +145,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase }; -class BulletsTypeMgr final : public NBOTypeMgrBase +class SVX_DLLPUBLIC BulletsTypeMgr final : public NBOTypeMgrBase { friend class OutlineTypeMgr; friend class NumberingTypeMgr; @@ -161,6 +161,7 @@ class BulletsTypeMgr final : public NBOTypeMgrBase virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override; virtual void ReplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel) override; virtual void ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel, bool isDefault=false,bool isResetSize=false) override; + void ApplyCustomRule(SvxNumRule& aNum, std::u16string_view sBullet, std::u16string_view sFont, sal_uInt16 mLevel,bool isResetSize=false); virtual OUString GetDescription(sal_uInt16 nIndex, bool isDefault) override; virtual bool IsCustomized(sal_uInt16 nIndex) override; static BulletsTypeMgr& GetInstance(); diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index 059d6b7bc558..d3b6e71a69e1 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -40,6 +40,7 @@ namespace com::sun::star { enum class NumberingPageType { + DOCBULLET, BULLET, SINGLENUM, OUTLINE, @@ -55,6 +56,9 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet css::uno::Reference<css::text::XNumberingFormatter> xFormatter; css::lang::Locale aLocale; + // Pair of bullet chars (first), and their respective font (second) + std::vector<std::pair<OUString, OUString>> maCustomBullets; + css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue> > aNumSettings; @@ -82,6 +86,9 @@ public: css::uno::Reference<css::text::XNumberingFormatter> const & xFormatter, const css::lang::Locale& rLocale); + std::vector<std::pair<OUString, OUString>> GetCustomBullets() { return maCustomBullets; } + void SetCustomBullets(std::vector<std::pair<OUString, OUString>> aCustomBullets); + virtual FactoryFunction GetUITestFactory() const override; }; diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 7cdcdf8399f3..6876d0c25b30 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -69,7 +69,8 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem friend class SvxGridTabPage; public: - SvxGridItem( TypedWhichId<SvxGridItem> _nWhich) : SfxPoolItem(_nWhich){}; + SvxGridItem( TypedWhichId<SvxGridItem> _nWhich) + : SfxPoolItem(_nWhich, SfxItemType::SvxGridItemType){}; virtual SvxGridItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index 486515f1822a..f9d91412b229 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -40,6 +40,7 @@ class SfxRectangleItem; class SvxObjectItem; class SfxBoolItem; struct SvxRuler_Impl; +namespace tools { class JsonWriter; } enum class RulerChangeType { @@ -162,6 +163,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener void UpdateColumns(); void UpdateObject(); + void NotifyKit(); + // Convert position to stick to ruler ticks tools::Long MakePositionSticky(tools::Long rValue, tools::Long aPointOfReference, bool aSnapToFrameMargin = true) const; @@ -230,6 +233,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener void UpdateParaContents_Impl(tools::Long lDiff, UpdateType); protected: + bool isHorizontal() { return bHorz; } + virtual void Command( const CommandEvent& rCEvt ) override; virtual void Click() override; virtual bool StartDrag() override; @@ -275,6 +280,8 @@ public: Update(); } + void CreateJsonNotification(tools::JsonWriter& rJsonWriter); + //#i24363# tab stops relative to indent void SetTabsRelativeToIndent( bool bRel ); void SetValues(RulerChangeType type, tools::Long value); diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index ee4af385a171..2d778010c6cd 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -27,7 +27,8 @@ class SVXCORE_DLLPUBLIC SdrAngleItem: public SfxInt32Item { public: - SdrAngleItem(TypedWhichId<SdrAngleItem> nId, Degree100 nAngle): SfxInt32Item(nId,nAngle.get()) {} + SdrAngleItem(TypedWhichId<SdrAngleItem> nId, Degree100 nAngle, SfxItemType eItemType = SfxItemType::SdrAngleItemType) + : SfxInt32Item(nId,nAngle.get(), eItemType) {} virtual SdrAngleItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 2ea7a84ca292..cb5a1d90cb6c 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -29,7 +29,7 @@ class SAL_DLLPUBLIC_RTTI SdrGrafModeItem_Base: public SfxEnumItem<GraphicDrawMode> { protected: SdrGrafModeItem_Base(GraphicDrawMode eMode): - SfxEnumItem(SDRATTR_GRAFMODE, eMode) {} + SfxEnumItem(SDRATTR_GRAFMODE, SfxItemType::SdrGrafModeItem_Base, eMode) {} }; class SVXCORE_DLLPUBLIC SdrGrafModeItem final : public SdrGrafModeItem_Base diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index d456ac6bf11b..b83322acbf61 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -48,6 +48,7 @@ namespace sdr::overlay sal_uInt16 mnLastTransparence; bool mbBorder : 1; + bool mbContrastOutline : 1; // geometry creation for OverlayObject, can use local *Last* values virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; @@ -57,7 +58,8 @@ namespace sdr::overlay OverlayType eType, const Color& rColor, std::vector< basegfx::B2DRange >&& rRanges, - bool bBorder); + bool bBorder, + bool bContrastOutline = false); virtual ~OverlaySelection() override; // data read access diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 79ae6bc011be..6225352e2738 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -33,7 +33,8 @@ enum class SdrTextAniDirection class SVXCORE_DLLPUBLIC SdrTextAniDirectionItem final : public SfxEnumItem<SdrTextAniDirection> { public: - SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, eDir) {} + SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left) + : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, SfxItemType::SdrTextAniDirectionItemType, eDir) {} virtual SdrTextAniDirectionItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index 716f703ec4eb..4838c85c4a53 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -34,8 +34,10 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally class SVXCORE_DLLPUBLIC SdrTextVertAdjustItem final : public SfxEnumItem<SdrTextVertAdjust> { public: - SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST, eAdj) {} - SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, TypedWhichId<SdrTextVertAdjustItem> nWhich): SfxEnumItem(nWhich, eAdj) {} + SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): + SfxEnumItem(SDRATTR_TEXT_VERTADJUST, SfxItemType::SdrTextVertAdjustType, eAdj) {} + SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, TypedWhichId<SdrTextVertAdjustItem> nWhich) + : SfxEnumItem(nWhich, SfxItemType::SdrTextVertAdjustType, eAdj) {} virtual SdrTextVertAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } @@ -58,7 +60,8 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted class SVXCORE_DLLPUBLIC SdrTextHorzAdjustItem final : public SfxEnumItem<SdrTextHorzAdjust> { public: - SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST, eAdj) {} + SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): + SfxEnumItem(SDRATTR_TEXT_HORZADJUST, SfxItemType::SdrTextHorzAdjustType, eAdj) {} virtual SdrTextHorzAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 0d86e517bb84..38ec15a2b851 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -78,7 +78,8 @@ enum class SdrTextAniKind { class SVXCORE_DLLPUBLIC SdrTextAniKindItem final : public SfxEnumItem<SdrTextAniKind> { public: - SdrTextAniKindItem(SdrTextAniKind eKind=SdrTextAniKind::NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND, eKind) {} + SdrTextAniKindItem(SdrTextAniKind eKind=SdrTextAniKind::NONE) + : SfxEnumItem(SDRATTR_TEXT_ANIKIND, SfxItemType::SdrTextAniKindItemType, eKind) {} virtual SdrTextAniKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index 55fe48a5fc61..c61349d5352d 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -36,7 +36,7 @@ class SVXCORE_DLLPUBLIC SdrTextFitToSizeTypeItem final public: static SfxPoolItem* CreateDefault(); SdrTextFitToSizeTypeItem(css::drawing::TextFitToSizeType const eFit = css::drawing::TextFitToSizeType_NONE) - : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE, eFit) + : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE, SfxItemType::SdrTextFitToSizeTypeItemType, eFit) { } diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index 970956a42cee..08884c3404d2 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -29,7 +29,8 @@ //-------------------------------------------------- ---------- class SVXCORE_DLLPUBLIC SdrYesNoItem: public SfxBoolItem { public: - SdrYesNoItem(TypedWhichId<SdrYesNoItem> nId, bool bOn): SfxBoolItem(nId,bOn) {} + SdrYesNoItem(TypedWhichId<SdrYesNoItem> nId, bool bOn, SfxItemType eItemType = SfxItemType::SdrYesNoItemType) + : SfxBoolItem(nId, bOn, eItemType) {} virtual SdrYesNoItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual OUString GetValueTextByVal(bool bVal) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 13f896f04eeb..8c61f7714e09 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -1464,14 +1464,13 @@ #define RID_SVXSTR_SAVE_MODIFIED_IMAGE NC_("RID_SVXSTR_SAVE_MODIFIED_IMAGE", "The image has been modified. By default the original image will be saved.\nDo you want to save the modified version instead?") #define RID_SUBSETSTR_BASIC_LATIN NC_("RID_SUBSETMAP", "Basic Latin") -#define RID_SUBSETSTR_LATIN_1_SUPPLEMENT NC_("RID_SUBSETMAP", "C1 Controls and Latin-1 Supplement") +#define RID_SUBSETSTR_LATIN_1_SUPPLEMENT NC_("RID_SUBSETMAP", "Latin-1 Supplement") #define RID_SUBSETSTR_LATIN_EXTENDED_A NC_("RID_SUBSETMAP", "Latin Extended-A") #define RID_SUBSETSTR_LATIN_EXTENDED_B NC_("RID_SUBSETMAP", "Latin Extended-B") #define RID_SUBSETSTR_IPA_EXTENSIONS NC_("RID_SUBSETMAP", "IPA Extensions") #define RID_SUBSETSTR_SPACING_MODIFIERS NC_("RID_SUBSETMAP", "Spacing Modifier Letters") #define RID_SUBSETSTR_COMB_DIACRITICAL NC_("RID_SUBSETMAP", "Combining Diacritical Marks") -#define RID_SUBSETSTR_BASIC_GREEK NC_("RID_SUBSETMAP", "Basic Greek") -#define RID_SUBSETSTR_GREEK_SYMS_COPTIC NC_("RID_SUBSETMAP", "Greek Symbols And Coptic") +#define RID_SUBSETSTR_GREEK NC_("RID_SUBSETMAP", "Greek and Coptic") #define RID_SUBSETSTR_CYRILLIC NC_("RID_SUBSETMAP", "Cyrillic") #define RID_SUBSETSTR_ARMENIAN NC_("RID_SUBSETMAP", "Armenian") #define RID_SUBSETSTR_BASIC_HEBREW NC_("RID_SUBSETMAP", "Basic Hebrew") @@ -1571,7 +1570,7 @@ #define RID_SUBSETSTR_THAANA NC_("RID_SUBSETMAP", "Thaana") #define RID_SUBSETSTR_ETHIOPIC NC_("RID_SUBSETMAP", "Ethiopic") #define RID_SUBSETSTR_CHEROKEE NC_("RID_SUBSETMAP", "Cherokee") -#define RID_SUBSETSTR_CANADIAN_ABORIGINAL NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllables") +#define RID_SUBSETSTR_CANADIAN_ABORIGINAL NC_("RID_SUBSETMAP", "Unified Canadian Aboriginal Syllables") #define RID_SUBSETSTR_MONGOLIAN NC_("RID_SUBSETMAP", "Mongolian") #define RID_SUBSETSTR_MISC_MATH_SYMS_A NC_("RID_SUBSETMAP", "Miscellaneous Mathematical Symbols-A") #define RID_SUBSETSTR_SUPPL_ARROWS_A NC_("RID_SUBSETMAP", "Supplemental Arrows-A") @@ -1638,7 +1637,7 @@ #define RID_SUBSETSTR_MAHJONG_TILES NC_("RID_SUBSETMAP", "Mahjong Tiles") #define RID_SUBSETSTR_DOMINO_TILES NC_("RID_SUBSETMAP", "Domino Tiles") #define RID_SUBSETSTR_SAMARITAN NC_("RID_SUBSETMAP", "Samaritan") -#define RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllabics Extended") +#define RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED NC_("RID_SUBSETMAP", "Unified Canadian Aboriginal Syllabics Extended") #define RID_SUBSETSTR_TAI_THAM NC_("RID_SUBSETMAP", "Tai Tham") #define RID_SUBSETSTR_VEDIC_EXTENSIONS NC_("RID_SUBSETMAP", "Vedic Extensions") #define RID_SUBSETSTR_LISU NC_("RID_SUBSETMAP", "Lisu") @@ -1780,7 +1779,7 @@ #define RID_SUBSETSTR_OLD_UYGHUR NC_("RID_SUBSETMAP", "Old Uyghur") #define RID_SUBSETSTR_TANGSA NC_("RID_SUBSETMAP", "Tangsa") #define RID_SUBSETSTR_TOTO NC_("RID_SUBSETMAP", "Toto") -#define RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED_A NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllabics Extended-A") +#define RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED_A NC_("RID_SUBSETMAP", "Unified Canadian Aboriginal Syllabics Extended-A") #define RID_SUBSETSTR_VITHKUQI NC_("RID_SUBSETMAP", "Vithkuqi") #define RID_SUBSETSTR_ZNAMENNY_MUSICAL_NOTATION NC_("RID_SUBSETMAP", "Znamenny Musical Notation") #define RID_SUBSETSTR_ARABIC_EXTENDED_C NC_("RID_SUBSETMAP", "Arabic Extended-C") @@ -1790,6 +1789,7 @@ #define RID_SUBSETSTR_KAKTOVIK_NUMERALS NC_("RID_SUBSETMAP", "Kaktovik Numerals") #define RID_SUBSETSTR_KAWI NC_("RID_SUBSETMAP", "Kawi") #define RID_SUBSETSTR_NAG_MUNDARI NC_("RID_SUBSETMAP", "Nag Mundari") +#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension I") #define RID_SVXSTR_FRAMEDIR_LTR NC_("RID_SVXSTR_FRAMEDIR_LTR", "Left-to-right (LTR)") #define RID_SVXSTR_FRAMEDIR_RTL NC_("RID_SVXSTR_FRAMEDIR_RTL", "Right-to-left (RTL)") @@ -1811,7 +1811,8 @@ // strings related to borders #define RID_SVXSTR_TABLE_PRESET_NONE NC_("RID_SVXSTR_TABLE_PRESET_NONE", "No Borders") -#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border Only") +#define RID_SVXSTR_TABLE_PRESET_OUTER NC_("RID_SVXSTR_TABLE_PRESET_OUTER", "Outer Border") // Sidebar/toolbar +#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border Only") // Format dialog #define RID_SVXSTR_TABLE_PRESET_OUTERHORI NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Outer Border and Horizontal Lines") #define RID_SVXSTR_TABLE_PRESET_OUTERALL NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Outer Border and All Inner Lines") #define RID_SVXSTR_TABLE_PRESET_OUTERVERI NC_("RID_SVXSTR_TABLE_PRESET_OUTERVERI", "Outer Border and Vertical Lines") @@ -1821,15 +1822,22 @@ #define RID_SVXSTR_PARA_PRESET_DIAGONALUP NC_("RID_SVXSTR_PARA_PRESET_DIAGONALUP", "Diagonal Up Border") #define RID_SVXSTR_PARA_PRESET_CRISSCROSS NC_("RID_SVXSTR_PARA_PRESET_CRISSCROSS", "Criss-Cross Border") #define RID_SVXSTR_PARA_PRESET_ALL NC_("RID_SVXSTR_PARA_PRESET_ALL", "All Four Borders") -#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Left and Right Borders Only") -#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Top and Bottom Borders Only") +#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Left and Right Borders") +#define RID_SVXSTR_PARA_PRESET_ONLYLEFTRIGHT NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFTRIGHT", "Left and Right Borders Only") +#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Top and Bottom Borders") +#define RID_SVXSTR_PARA_PRESET_ONLYTOPBOTTOM NC_("RID_SVXSTR_PARA_PRESET_ONLYTOPBOTTOM", "Top and Bottom Borders Only") #define RID_SVXSTR_PARA_PRESET_TOPBOTTOMHORI NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOMHORI", "Top and Bottom Borders, and All Horizontal Lines") -#define RID_SVXSTR_PARA_PRESET_ONLYLEFT NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Left Border Only") -#define RID_SVXSTR_PARA_PRESET_ONLYRIGHT NC_("RID_SVXSTR_PARA_PRESET_ONLYRIGHT", "Right Border Only") -#define RID_SVXSTR_PARA_PRESET_ONLYTOP NC_("RID_SVXSTR_PARA_PRESET_ONLYTOP", "Top Border Only") -#define RID_SVXSTR_PARA_PRESET_ONLYTBOTTOM NC_("RID_SVXSTR_PARA_PRESET_ONLYTBOTTOM", "Bottom Border Only") +#define RID_SVXSTR_PARA_PRESET_ONLYLEFT NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Left Border") +#define RID_SVXSTR_PARA_PRESET_ONLYRIGHT NC_("RID_SVXSTR_PARA_PRESET_ONLYRIGHT", "Right Border") +#define RID_SVXSTR_PARA_PRESET_ONLYTOP NC_("RID_SVXSTR_PARA_PRESET_ONLYTOP", "Top Border") +#define RID_SVXSTR_PARA_PRESET_ONLYBOTTOM NC_("RID_SVXSTR_PARA_PRESET_ONLYBOTTOM", "Bottom Border") #define RID_SVXSTR_HOR_PRESET_ONLYHOR NC_("RID_SVXSTR_HOR_PRESET_ONLYHOR", "Top and Bottom Borders, and All Inner Lines") #define RID_SVXSTR_VER_PRESET_ONLYVER NC_("RID_SVXSTR_VER_PRESET_ONLYVER", "Left and Right Borders, and All Inner Lines") +#define RID_SVXSTR_TABLE_PRESET_THICK NC_("RID_SVXSTR_TABLE_PRESET_THICK", "Thick Box Border") +#define RID_SVXSTR_TABLE_PRESET_THICKBOTTOM NC_("RID_SVXSTR_TABLE_PRESET_THICKBOTTOM", "Thick Bottom Border") +#define RID_SVXSTR_TABLE_PRESET_TOPTHICKBOTTOM NC_("RID_SVXSTR_TABLE_PRESET_TOPTHICKBOTTOM", "Top and Thick Bottom Borders") +#define RID_SVXSTR_TABLE_PRESET_DOUBLEBOTTOM NC_("RID_SVXSTR_TABLE_PRESET_DOUBLEBOTTOM", "Double Bottom Border") +#define RID_SVXSTR_TABLE_PRESET_TOPDOUBLEBOTTOM NC_("RID_SVXSTR_TABLE_PRESET_TOPDOUBLEBOTTOM", "Top and Double Bottom Borders") #define RID_SVXSTR_REMOVE_FAVORITES NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites") #define RID_SVXSTR_MISSING_CHAR NC_("RID_SVXSTR_MISSING_CHAR", "Missing character") diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 5b01852ea363..58639bc85df5 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -41,7 +41,7 @@ public: SdrDragEntry(); virtual ~SdrDragEntry(); - virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) = 0; + virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod, bool IsDragSizeValid=true) = 0; // data read access bool getAddToTransparent() const { return mbAddToTransparent; } @@ -57,7 +57,7 @@ public: SdrDragEntryPolyPolygon(basegfx::B2DPolyPolygon aOriginalPolyPolygon); virtual ~SdrDragEntryPolyPolygon() override; - virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; + virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod, bool IsDragSizeValid=true) override; }; @@ -80,7 +80,7 @@ public: const SdrObject& getOriginal() const { return maOriginal; } SdrObject* getClone() { return mxClone.get(); } - virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; + virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod, bool IsDragSizeValid=true) override; }; @@ -93,7 +93,7 @@ public: SdrDragEntryPrimitive2DSequence(drawinglayer::primitive2d::Primitive2DContainer&& rSequence); virtual ~SdrDragEntryPrimitive2DSequence() override; - virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; + virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod, bool IsDragSizeValid=true) override; }; @@ -107,7 +107,7 @@ public: SdrDragEntryPointGlueDrag(std::vector< basegfx::B2DPoint >&& rPositions, bool bIsPointDrag); virtual ~SdrDragEntryPointGlueDrag() override; - virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; + virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod, bool IsDragSizeValid=true) override; }; @@ -190,7 +190,7 @@ public: // #i58950# virtual destructor was missing virtual ~SdrDragMethod(); - void Show(); + void Show(bool IsValidSize=true); void Hide(); bool IsShiftPressed() const { return mbShiftPressed; } void SetShiftPressed(bool bShiftPressed) { mbShiftPressed = bShiftPressed; } @@ -203,7 +203,7 @@ public: virtual void CreateOverlayGeometry( sdr::overlay::OverlayManager& rOverlayManager, - const sdr::contact::ObjectContact& rObjectContact); + const sdr::contact::ObjectContact& rObjectContact, bool bIsGeometrySizeValid=true); SAL_DLLPRIVATE void destroyOverlayGeometry(); virtual basegfx::B2DHomMatrix getCurrentTransformation() const; diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx index a717cdbf3f0f..ee91134bdc5f 100644 --- a/include/svx/svddrgv.hxx +++ b/include/svx/svddrgv.hxx @@ -62,7 +62,7 @@ protected: protected: virtual void SetMarkHandles(SfxViewShell* pOtherShell) override; - SAL_DLLPRIVATE void ShowDragObj(); + SAL_DLLPRIVATE void ShowDragObj(bool IsSizeValid=true); SAL_DLLPRIVATE void HideDragObj(); bool ImpBegInsObjPoint(bool bIdxZwang, const Point& rPnt, bool bNewObj, OutputDevice* pOut); diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 56fcfacaaaeb..7d7670048a59 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -235,6 +235,7 @@ public: void SetMarkedObjRect(const tools::Rectangle& rRect); void MoveMarkedObj(const Size& rSiz, bool bCopy=false); void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); + bool IsMarkedObjSizeValid(Size& aTargetSize); SAL_DLLPRIVATE void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bWdh, const bool bHgt); SAL_DLLPRIVATE Degree100 GetMarkedObjRotate() const; void RotateMarkedObj(const Point& rRef, Degree100 nAngle, bool bCopy=false); diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index edcc0678b676..e9e97c4ca5ac 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -85,6 +85,7 @@ enum class ImpGetDescriptionOptions }; class ImplMarkingOverlay; +class MarkingSelectionOverlay; class MarkingSubSelectionOverlay; class SVXCORE_DLLPUBLIC SdrMarkView : public SdrSnapView @@ -96,6 +97,7 @@ class SVXCORE_DLLPUBLIC SdrMarkView : public SdrSnapView std::unique_ptr<ImplMarkingOverlay> mpMarkPointsOverlay; std::unique_ptr<ImplMarkingOverlay> mpMarkGluePointsOverlay; + std::unique_ptr<MarkingSelectionOverlay> mpMarkingSelectionOverlay; std::unique_ptr<MarkingSubSelectionOverlay> mpMarkingSubSelectionOverlay; protected: @@ -258,17 +260,6 @@ protected: public: // all available const methods for read access to selection const SdrMarkList& GetMarkedObjectList() const { return maSdrViewSelection.GetMarkedObjectList(); } - // returns SAL_MAX_SIZE if not found - size_t TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); } - SdrPageView* GetSdrPageViewOfMarkedByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); } - SdrMark* GetSdrMarkByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum); } - SdrObject* GetMarkedObjectByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetMarkedSdrObj(); } - size_t GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); } - void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); } - bool AreObjectsMarked() const { return 0 != GetMarkedObjectList().GetMarkCount(); } - OUString const & GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); } - OUString const & GetDescriptionOfMarkedPoints() const { return GetMarkedObjectList().GetPointMarkDescription(); } - OUString const & GetDescriptionOfMarkedGluePoints() const { return GetMarkedObjectList().GetGluePointMarkDescription(); } // Get a list of all those links which are connected to marked nodes, // but which are not marked themselves. @@ -449,7 +440,7 @@ public: const Point& GetRef2() const { return maRef2; } SAL_DLLPRIVATE void SetRef2(const Point& rPt); /// Get access to the view shell owning this draw view, if any. - virtual SfxViewShell* GetSfxViewShell() const; + SAL_RET_MAYBENULL virtual SfxViewShell* GetSfxViewShell() const; }; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 4e03abf18da3..8dd17bdc00f5 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -87,7 +87,7 @@ namespace basegfx namespace sdr { class ObjectUser; } namespace sdr::properties { class BaseProperties; } namespace sdr::contact { class ViewContact; } - +namespace sdr::annotation { class ObjectAnnotationData; } namespace com::sun::star::drawing { class XShape; } namespace svx::diagram { class IDiagramHelper; } @@ -359,6 +359,11 @@ public: virtual void SetDecorative(bool isDecorative); virtual bool IsDecorative() const; + // Object representing an annotation + bool isAnnotationObject() const; + void setAsAnnotationObject(bool bSetAnnotation); + std::unique_ptr<sdr::annotation::ObjectAnnotationData>& getAnnotationData(); + // for group objects bool IsGroupObject() const; virtual SdrObjList* GetSubList() const; @@ -518,6 +523,7 @@ public: /// Nbc means "no broadcast". virtual void NbcMove (const Size& rSiz); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); + virtual bool IsSizeValid(Size aTargetSize); virtual void NbcCrop (const basegfx::B2DPoint& rRef, double fxFact, double fyFact); virtual void NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double cs) = 0; // Utility for call sites that don't have sin and cos handy @@ -895,6 +901,8 @@ protected: // #i25616# bool mbSupportTextIndentingOnLineWidthChange : 1; + std::unique_ptr<sdr::annotation::ObjectAnnotationData> mpAnnotationData; + virtual ~SdrObject() override; virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() = 0; diff --git a/include/svx/svdobjkind.hxx b/include/svx/svdobjkind.hxx index d25eba0a0027..1517bbeba4aa 100644 --- a/include/svx/svdobjkind.hxx +++ b/include/svx/svdobjkind.hxx @@ -53,6 +53,7 @@ enum class SdrObjKind : sal_uInt16 CustomShape = 33, /// custom shape Media = 34, /// media shape Table = 35, /// table + Annotation = 36, /// annotation object OLE2Applet = 100, OLE2Plugin = 101, diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index ec2c94ab3f45..88296f4a2629 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -79,14 +79,14 @@ private: SAL_DLLPRIVATE virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override; SAL_DLLPRIVATE void ImpSetAttrToGrafInfo(); // Copy values from the pool - GraphicAttr aGrafInfo; + GraphicAttr m_aGrafInfo; - OUString aFileName; // If it's a Link, the filename can be found in here - OUString aFilterName; + OUString m_aFileName; // If it's a Link, the filename can be found in here + OUString m_aFilterName; std::unique_ptr<GraphicObject> mpGraphicObject; // In order to speed up output of bitmaps, especially rotated ones std::unique_ptr<GraphicObject> mpReplacementGraphicObject; - SdrGraphicLink* pGraphicLink; // And here a pointer for linked graphics - bool bMirrored:1; // True: the graphic is horizontal, which means it's mirrored along the y-axis + SdrGraphicLink* m_pGraphicLink; // And here a pointer for linked graphics + bool m_bMirrored:1; // True: the graphic is horizontal, which means it's mirrored along the y-axis // Flag for allowing text animation. Default is true. bool mbGrafAnimationAllowed:1; @@ -157,7 +157,7 @@ public: void ReleaseGraphicLink(); bool IsLinkedGraphic() const; - const OUString& GetFileName() const { return aFileName;} + const OUString& GetFileName() const { return m_aFileName;} void StartAnimation(); @@ -192,7 +192,7 @@ public: SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - bool IsMirrored() const { return bMirrored;} + bool IsMirrored() const { return m_bMirrored;} SAL_DLLPRIVATE void SetMirrored( bool _bMirrored ); virtual bool shouldKeepAspectRatio() const override { return true; } diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 4a25ae970d7e..3f3573466651 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -284,6 +284,8 @@ private: SVX_DLLPUBLIC void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); SVX_DLLPUBLIC void ImportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); +SVX_DLLPUBLIC void ImportAsHTML( SvStream& rStrm, SdrTableObj& rObj ); + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index aeb99556f097..9ff8a3e67f8b 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -78,6 +78,7 @@ namespace sdr::table { class Cell; class SdrTableRtfExporter; class SdrTableRTFParser; + class SdrTableHTMLParser; } @@ -128,6 +129,7 @@ private: friend class sdr::table::Cell; friend class sdr::table::SdrTableRtfExporter; friend class sdr::table::SdrTableRTFParser; + friend class sdr::table::SdrTableHTMLParser; friend class TextChain; friend class TextChainFlow; friend class EditingTextChainFlow; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 0747c4625773..d6e68943e0ac 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -23,7 +23,6 @@ #include <svl/stylesheetuser.hxx> #include <vcl/prntypes.hxx> #include <svl/itemset.hxx> -#include <svx/annotation/Annotation.hxx> #include <svx/sdrpageuser.hxx> #include <svx/sdr/contact/viewobjectcontactredirector.hxx> #include <svx/sdrmasterpagedescriptor.hxx> @@ -41,6 +40,7 @@ namespace model { class Theme; } namespace reportdesign { class OSection; } namespace sdr::contact { class ViewContact; } +namespace sdr::annotation { class Annotation; } class SdrPage; class SdrModel; class SfxItemPool; @@ -555,11 +555,14 @@ public: void dumpAsXml(xmlTextWriterPtr pWriter) const override; - virtual rtl::Reference<sdr::annotation::Annotation> createAnnotation() { assert(false); return nullptr; } - virtual void addAnnotation(rtl::Reference<sdr::annotation::Annotation> const& /*xAnnotation*/, int /*nIndex*/) { assert(false); } - virtual void removeAnnotation(rtl::Reference<sdr::annotation::Annotation> const& /*xAnnotation*/) { assert(false); } + // Annotations + virtual rtl::Reference<sdr::annotation::Annotation> createAnnotation(); + virtual void addAnnotation(rtl::Reference<sdr::annotation::Annotation> const& xAnnotation, int nIndex = -1); + virtual void addAnnotationNoNotify(rtl::Reference<sdr::annotation::Annotation> const& xAnnotation, int nIndex = -1); + virtual void removeAnnotation(rtl::Reference<sdr::annotation::Annotation> const& xAnnotation); + virtual void removeAnnotationNoNotify(rtl::Reference<sdr::annotation::Annotation> const& xAnnotation); - std::vector<rtl::Reference<sdr::annotation::Annotation>> const& getAnnotations() const { return maAnnotations; } + std::vector<rtl::Reference<sdr::annotation::Annotation>> const& getAnnotations() const; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 824f36f06efc..743afaced0e3 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -94,10 +94,10 @@ class SVXCORE_DLLPUBLIC SdrUndoGroup final : public SdrUndoAction std::vector<std::unique_ptr<SdrUndoAction>> maActions; // No expanded description of the Action (contains %O) - OUString aComment; - OUString aObjDescription; + OUString m_aComment; + OUString m_aObjDescription; - SdrRepeatFunc eFunction; + SdrRepeatFunc m_eFunction; public: SdrUndoGroup(SdrModel& rNewMod); @@ -107,8 +107,8 @@ public: SdrUndoAction* GetAction(sal_Int32 nNum) const { return maActions[nNum].get(); } void AddAction(std::unique_ptr<SdrUndoAction> pAct); - void SetComment(const OUString& rStr) { aComment=rStr; } - void SetObjDescription(const OUString& rStr) { aObjDescription=rStr; } + void SetComment(const OUString& rStr) { m_aComment=rStr; } + void SetObjDescription(const OUString& rStr) { m_aObjDescription=rStr; } virtual OUString GetComment() const override; virtual OUString GetSdrRepeatComment() const override; @@ -117,7 +117,7 @@ public: virtual bool CanSdrRepeat(SdrView& rView) const override; virtual void SdrRepeat(SdrView& rView) override; - void SetRepeatFunction(SdrRepeatFunc eFunc) { eFunction=eFunc; } + void SetRepeatFunction(SdrRepeatFunc eFunc) { m_eFunction=eFunc; } }; /** @@ -155,17 +155,17 @@ class SVXCORE_DLLPUBLIC SdrUndoAttrObj : public SdrUndoObj // FIXME: Or should we better remember the StyleSheetNames? rtl::Reference< SfxStyleSheet > mxUndoStyleSheet; rtl::Reference< SfxStyleSheet > mxRedoStyleSheet; - bool bStyleSheet; - bool bHaveToTakeRedoSet; + bool m_bStyleSheet; + bool m_bHaveToTakeRedoSet; // When assigning TextItems to a drawing object with text: - std::optional<OutlinerParaObject> pTextUndo; + std::optional<OutlinerParaObject> m_pTextUndo; // #i8508# // The text rescue mechanism needs also to be implemented for redo actions. - std::optional<OutlinerParaObject> pTextRedo; + std::optional<OutlinerParaObject> m_pTextRedo; // If we have a group object: - std::unique_ptr<SdrUndoGroup> pUndoGroup; + std::unique_ptr<SdrUndoGroup> m_pUndoGroup; protected: // Helper to ensure StyleSheet is in pool (provided by SdrModel from SdrObject) @@ -211,10 +211,10 @@ public: class SVXCORE_DLLPUBLIC SdrUndoGeoObj : public SdrUndoObj { - std::unique_ptr<SdrObjGeoData> pUndoGeo; - std::unique_ptr<SdrObjGeoData> pRedoGeo; + std::unique_ptr<SdrObjGeoData> m_pUndoGeo; + std::unique_ptr<SdrObjGeoData> m_pRedoGeo; // If we have a group object: - std::unique_ptr<SdrUndoGroup> pUndoGroup; + std::unique_ptr<SdrUndoGroup> m_pUndoGroup; /// If we have a table object, should its layout change? bool mbSkipChangeLayout; @@ -594,7 +594,7 @@ class SVXCORE_DLLPUBLIC SdrUndoDelPage final : public SdrUndoPageList { // When deleting a MasterPage, we remember all relations of the // Character Page with the MasterPage in this UndoGroup. - std::unique_ptr<SdrUndoGroup> pUndoGroup; + std::unique_ptr<SdrUndoGroup> m_pUndoGroup; std::unique_ptr<SfxPoolItem> mpFillBitmapItem; bool mbHasFillBitmap; diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index b4e1a91d386a..68d02d4a86fc 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -185,6 +185,7 @@ class XFillGradientItem; #define FN_BUL_NUM_RULE_INDEX TypedWhichId<SfxUInt16Item>(FN_EDIT + 120) // achieving num rule index #define FN_NUM_NUM_RULE_INDEX TypedWhichId<SfxUInt16Item>(FN_EDIT + 121) #define FN_OUTLINE_RULE_INDEX TypedWhichId<SfxUInt16Item>(FN_EDIT + 122) +#define FN_BUL_GET_DOC_BULLETS TypedWhichId<SfxStringListItem>(FN_EDIT + 123) #define FN_INSERT (SID_SW_START + 300) // 20300 #define FN_DELETE_BOOKMARK TypedWhichId<SfxStringItem>(FN_INSERT + 1) @@ -1058,8 +1059,12 @@ class XFillGradientItem; #define SID_CHAR_DLG_FOR_PARAGRAPH ( SID_SVX_START + 1210 ) #define SID_SET_DOCUMENT_LANGUAGE TypedWhichId<SfxBoolItem>( SID_SVX_START + 1211 ) +#define SID_ATTR_BULLET_CHAR TypedWhichId<SfxStringItem>(SID_SVX_START + 1212) +#define SID_ATTR_BULLET_FONT TypedWhichId<SfxStringItem>(SID_SVX_START + 1213) +#define SID_ATTR_BULLET_INDEX TypedWhichId<SfxUInt16Item>(SID_SVX_START + 1214) + // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id -#define SID_SVX_FIRSTFREE ( SID_SVX_START + 1211 + 1 ) +#define SID_SVX_FIRSTFREE ( SID_SVX_START + 1214 + 1 ) // Overflow check for slot IDs diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index 493234ea6c7f..9f20c10c1a7f 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -32,7 +32,8 @@ enum class SdrCaptionEscDir { Horizontal, Vertical, BestFit }; class SVXCORE_DLLPUBLIC SdrCaptionEscDirItem final : public SfxEnumItem<SdrCaptionEscDir> { public: - SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SdrCaptionEscDir::Horizontal): SfxEnumItem(SDRATTR_CAPTIONESCDIR, eDir) {} + SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SdrCaptionEscDir::Horizontal) + : SfxEnumItem(SDRATTR_CAPTIONESCDIR, SfxItemType::SdrCaptionEscDirItemType, eDir) {} SAL_DLLPRIVATE virtual SdrCaptionEscDirItem* Clone(SfxItemPool* pPool=nullptr) const override; SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; // { return 3; } diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index 402f6320b505..5872f079b34e 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -29,7 +29,8 @@ enum class SdrCaptionType { Type1, Type2, Type3, Type4 }; class SVXCORE_DLLPUBLIC SdrCaptionTypeItem final : public SfxEnumItem<SdrCaptionType> { public: - SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3): SfxEnumItem(SDRATTR_CAPTIONTYPE, eStyle) {} + SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3) + : SfxEnumItem(SDRATTR_CAPTIONTYPE, SfxItemType::SdrCaptionTypeItemType, eStyle) {} SAL_DLLPRIVATE virtual SdrCaptionTypeItem* Clone(SfxItemPool* pPool=nullptr) const override; SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; // { return 4; } SAL_DLLPRIVATE static OUString GetValueTextByPos(sal_uInt16 nPos); diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 4d6b05bf9d6b..7aa6bdb6f55b 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -30,7 +30,8 @@ enum class SdrEdgeKind class SVXCORE_DLLPUBLIC SdrEdgeKindItem final : public SfxEnumItem<SdrEdgeKind> { public: - SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines): SfxEnumItem(SDRATTR_EDGEKIND, eStyle) {} + SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines) + : SfxEnumItem(SDRATTR_EDGEKIND, SfxItemType::SdrEdgeKindItemType, eStyle) {} SAL_DLLPRIVATE virtual SdrEdgeKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 0a07ea0fb6f6..3cb963ca5b7e 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -28,7 +28,7 @@ class SVXCORE_DLLPUBLIC SdrMeasureTextHPosItem final : public SfxEnumItem<css::drawing::MeasureTextHorzPos> { public: SdrMeasureTextHPosItem(css::drawing::MeasureTextHorzPos ePos = css::drawing::MeasureTextHorzPos::MeasureTextHorzPos_AUTO) - : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, ePos) + : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, SfxItemType::SdrMeasureTextHPosItemType, ePos) { } SAL_DLLPRIVATE virtual SdrMeasureTextHPosItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -44,7 +44,7 @@ public: class SVXCORE_DLLPUBLIC SdrMeasureTextVPosItem final : public SfxEnumItem<css::drawing::MeasureTextVertPos> { public: SdrMeasureTextVPosItem(css::drawing::MeasureTextVertPos ePos = css::drawing::MeasureTextVertPos_AUTO) - : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, ePos) + : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, SfxItemType::SdrMeasureTextVPosItemType, ePos) { } SAL_DLLPRIVATE virtual SdrMeasureTextVPosItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index 5ebf0a4f6499..d409f2973ad2 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -28,7 +28,8 @@ // (based on the facts of the MapUnit of the model). This unity is displayed if necessary. class SVXCORE_DLLPUBLIC SdrMeasureUnitItem final : public SfxEnumItem<FieldUnit> { public: - SdrMeasureUnitItem(FieldUnit eUnit=FieldUnit::NONE): SfxEnumItem(SDRATTR_MEASUREUNIT, eUnit) {} + SdrMeasureUnitItem(FieldUnit eUnit=FieldUnit::NONE) + : SfxEnumItem(SDRATTR_MEASUREUNIT, SfxItemType::SdrMeasureUnitItemType, eUnit) {} SAL_DLLPRIVATE virtual SdrMeasureUnitItem* Clone(SfxItemPool* pPool=nullptr) const override; SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; // { return 14; } diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx index ff346e3bd416..308e07e49c99 100644 --- a/include/svx/unomod.hxx +++ b/include/svx/unomod.hxx @@ -38,7 +38,7 @@ class SVXCORE_DLLPUBLIC SvxUnoDrawMSFactory : public css::lang::XMultiServiceFac { protected: /** abstract SdrModel provider */ - // Every App has a DrwingLayer as internal Tooling, thus ist is + // Every App has a DrawingLayer as internal Tooling, thus it is // not too hard to asl a UnoModel to hand back a DrawingLayer Model in the // form of an SdrModel. Thus, returning a reference and make usages // safer and easier is justified. diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx index f1b5c81ec516..8136603fdceb 100644 --- a/include/svx/unopage.hxx +++ b/include/svx/unopage.hxx @@ -85,7 +85,7 @@ class SVXCORE_DLLPUBLIC SvxDrawPage : static void GetTypeAndInventor( SdrObjKind& rType, SdrInventor& rInventor, const OUString& aName ) noexcept; // Creating a SdrObject using it's Description. - // Can be used by derived classes to support their owen Shapes (e.g. Controls). + // Can be used by derived classes to support their own Shapes (e.g. Controls). /// @throws css::uno::RuntimeException virtual rtl::Reference<SdrObject> CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape ); diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index 54d354b52268..acc8fb7fdea7 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -23,10 +23,10 @@ #include <svl/intitem.hxx> #include <svx/svxdllapi.h> -class SVXCORE_DLLPUBLIC XFillBmpPosOffsetXItem final : public SfxUInt16Item +class SVXCORE_DLLPUBLIC XFillBmpPosOffsetXItem final : public SfxInt32Item { public: - XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 ); + XFillBmpPosOffsetXItem( sal_Int32 nOffPosX = 0 ); SVX_DLLPRIVATE virtual XFillBmpPosOffsetXItem* Clone( SfxItemPool* pPool = nullptr ) const override; @@ -36,10 +36,10 @@ public: OUString &rText, const IntlWrapper& ) const override; }; -class SVXCORE_DLLPUBLIC XFillBmpPosOffsetYItem final : public SfxUInt16Item +class SVXCORE_DLLPUBLIC XFillBmpPosOffsetYItem final : public SfxInt32Item { public: - XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 ); + XFillBmpPosOffsetYItem( sal_Int32 nOffPosY = 0 ); SVX_DLLPRIVATE virtual XFillBmpPosOffsetYItem* Clone( SfxItemPool* pPool = nullptr ) const override; |