core.git: include/svx svx/source
include/svx/SvxPresetListBox.hxx |1 -
svx/source/tbxctrls/SvxPresetListBox.cxx |2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 828b7fdfb0e40545553c863273096ff3a440ed43
Author: Michael Weghorn
AuthorDate: Mon Apr 13 13:35:53 2026 +0200
Commit: Michael Weghorn
CommitDate: Tue Apr 14 07:20:04 2026 +0200
svx: Drop SvxPresetListBox::s_nColCount
Just hard-code the value in SvxPresetListBox::Resize,
to make this consistent with the line count in the
next line.
Change-Id: Id981e81127e0fa58798e04c2d588641cc68baff4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/203466
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx
index bdc1d1f30b75..922d8c6cfb75 100644
--- a/include/svx/SvxPresetListBox.hxx
+++ b/include/svx/SvxPresetListBox.hxx
@@ -26,7 +26,6 @@
class SVXCORE_DLLPUBLIC SvxPresetListBox : public ValueSet
{
private:
-static constexpr sal_uInt32 s_nColCount = 3;
Size m_aIconSize;
sal_uInt16 mnContextMenuItemId;
Link maRenameHdl;
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx
b/svx/source/tbxctrls/SvxPresetListBox.cxx
index 690f42c1a9a6..7a242a74fea2 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -42,7 +42,7 @@ void SvxPresetListBox::SetDrawingArea(weld::DrawingArea*
pDrawingArea)
void SvxPresetListBox::Resize()
{
-SetColCount(s_nColCount);
+SetColCount(3);
SetLineCount(5);
WinBits aWinBits(GetStyle());
aWinBits |= WB_VSCROLL;
core.git: include/svx svx/source
include/svx/ruler.hxx | 44 -
svx/source/dialog/svxruler.cxx | 948 -
2 files changed, 496 insertions(+), 496 deletions(-)
New commits:
commit 941872c82adc7c7fca55bfb963325f7b62c5ed0f
Author: Miklos Vajna
AuthorDate: Mon Mar 30 08:17:16 2026 +0200
Commit: Miklos Vajna
CommitDate: Mon Mar 30 10:54:39 2026 +0200
svx: prefix members of SvxRuler
Change-Id: I5e8773c8513a94ab197b4a52b0755cab154d15c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202955
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index a5ce7e0e3612..6703db2e4dbb 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -84,7 +84,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
{
friend class SvxRulerItem;
-std::vector > pCtrlItems;
+std::vector > m_pCtrlItems;
std::unique_ptr mxLRSpaceItem;// left and right
edge
std::unique_ptr mxMinMaxItem; // maxima for
dragging
@@ -96,35 +96,35 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public
SfxListener
std::unique_ptr mxColumnItem; // columns
std::unique_ptr mxObjectItem; // object
-VclPtr pEditWin;
+VclPtr m_pEditWin;
std::unique_ptr mxRulerImpl;
-boolbAppSetNullOffset :1;
-boolbHorz :1;
-tools::LonglLogicNullOffset; // in logic coordinates
-tools::LonglAppNullOffset; // in logic coordinates
-tools::LonglInitialDragPos;
-SvxRulerSupportFlags nFlags;
-SvxRulerDragFlagsnDragType;
-sal_uInt16 nDefTabType;
-sal_uInt16 nTabCount;
-sal_uInt16 nTabBufSize;
-tools::LonglDefTabDist;
-tools::LonglTabPos;
+boolm_bAppSetNullOffset :1;
+boolm_bHorz :1;
+tools::Longm_lLogicNullOffset; // in logic coordinates
+tools::Longm_lAppNullOffset; // in logic coordinates
+tools::Longm_lInitialDragPos;
+SvxRulerSupportFlags m_nFlags;
+SvxRulerDragFlagsm_nDragType;
+sal_uInt16 m_nDefTabType;
+sal_uInt16 m_nTabCount;
+sal_uInt16 m_nTabBufSize;
+tools::Longm_lDefTabDist;
+tools::Longm_lTabPos;
std::vectormpTabs;// tab positions in pixel
std::vector mpIndents; // paragraph margins in pixel
std::vector mpBorders;
std::vector mpObjectBorders;
-SfxBindings*pBindings;
-tools::LongnDragOffset;
-tools::LongnMaxLeft;
-tools::LongnMaxRight;
-boolbValid;
-boolbListening;
-boolbActive;
+SfxBindings*m_pBindings;
+tools::Longm_nDragOffset;
+tools::Longm_nMaxLeft;
+tools::Longm_nMaxRight;
+boolm_bValid;
+boolm_bListening;
+boolm_bActive;
bool mbCoarseSnapping;
bool mbSnapping;
@@ -232,7 +232,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public
SfxListener
void UpdateParaContents_Impl(tools::Long lDiff, UpdateType);
protected:
-bool isHorizontal() { return bHorz; }
+bool isHorizontal() { return m_bHorz; }
virtual voidCommand( const CommandEvent& rCEvt ) override;
virtual voidClick() override;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 8a740728203b..71cacc4d5f6f 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -177,28 +177,28 @@ SvxRuler::SvxRuler(
SfxBindings &rBindings, // associated Bindings
WinBits nWinStyle) : // StarView WinBits
Ruler(pParent, nWinStyle),
-pCtrlItems(CTRL_ITEM_COUNT),
-pEditWin(pWin),
+m_pCtrlItems(CTRL_ITEM_COUNT),
+m_pEditWin(pWin),
mxRulerImpl(new SvxRuler_Impl),
-bAppSetNullOffset(false), // Is the 0-offset of the ruler set by the
application?
-lLogicNullOffset(0),
-lAppNullOffset(LONG_MAX),
-lInitialDragPos(0),
-nFlags(flags),
-nDragType(SvxRulerDragFlags::NONE),
-nDefTabType(RULER_TAB_LEFT),
-nTabCount(0),
-nTabBufSize(0),
-lDefTabDist(50),
-lTabPos(-1),
+m_bAppSetNullOffset(false), // Is the 0-offset of the ruler set by the
application?
+m_lLogicNullOffset(0),
+m_lAppNullOffset(LONG_MAX),
+m_lInitialDragPos(0),
+m_nFlags(flags),
+m_nDragType(SvxRulerDragFlags::NONE),
+m_nDefTabType(RULER_TAB_LEFT),
+m_nTabCount(0),
+m_nTabBufSize(0),
+m_lDefTabDist(50),
+m_lTabPos(-1),
mpBorders(1), // due to one column tables
-pBindings(&rBindings),
-nDragOffset(0),
-nMaxLeft(0),
-nMaxRight(0),
-bValid(false),
-bListening(false),
-bActive(true),
+m_pBindings(&rBindings),
+m_nDra
core.git: include/svx svx/source sw/source
include/svx/diagram/datamodel_svx.hxx |4 +
svx/source/diagram/datamodel_svx.cxx | 67 +++-
svx/source/svdraw/svdedtv.cxx | 16 +++---
svx/source/svdraw/svdobj.cxx | 12 ++---
sw/source/core/draw/dview.cxx | 81 +-
5 files changed, 97 insertions(+), 83 deletions(-)
New commits:
commit 88f90b5c7bd6b63b29dd919936595d0b1d0e8ba7
Author: Armin Le Grand (collabora)
AuthorDate: Tue Mar 24 10:48:35 2026 +0100
Commit: Armin Le Grand
CommitDate: Tue Mar 24 13:22:35 2026 +0100
SmartArt: Undo/Redo fixes, minimize OwnFormat Data
Fixed a missing trhing in DiagramDataState used by
SdrUndoDiagramModelData. The BGShapeID was not restored,
so after copy/paste and change and Undo the BGShape could
not be associated and loose it's FillState ModelData.
Simplified Point/Connection Im/Export for own format.
No need to read/write NumOfPt/Cn at all. No need to
read/write Pt#/Cn# at all. Simplified AFAP before this
will be used when feature is activated.
Change-Id: I6fca23964df708a5da13fdb620376b7a5684e1a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202582
Reviewed-by: Armin Le Grand
Tested-by: Jenkins
diff --git a/include/svx/diagram/datamodel_svx.hxx
b/include/svx/diagram/datamodel_svx.hxx
index c96aae887b44..17063bd61f66 100644
--- a/include/svx/diagram/datamodel_svx.hxx
+++ b/include/svx/diagram/datamodel_svx.hxx
@@ -153,14 +153,16 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) DiagramDataState
Points maPoints;
std::vector> mxShapes;
basegfx::B2DHomMatrix maTransformation;
+OUString msBackgroundShapeModelID;
public:
-DiagramDataState(const Connections& aConnections, const Points& aPoints,
const css::uno::Reference< css::drawing::XShape >& rRootShape);
+DiagramDataState(const Connections& aConnections, const Points& aPoints,
const css::uno::Reference< css::drawing::XShape >& rRootShape, const OUString&
rBackgroundShapeModelID);
const Connections& getConnections() const { return maConnections; }
const Points& getPoints() const { return maPoints; }
const std::vector>& getXShapes()
const { return mxShapes;}
const basegfx::B2DHomMatrix& getTransformation() const { return
maTransformation; }
+const OUString& getBackgroundShapeModelID() const { return
msBackgroundShapeModelID; }
};
typedef std::shared_ptr< DiagramDataState > DiagramDataStatePtr;
diff --git a/svx/source/diagram/datamodel_svx.cxx
b/svx/source/diagram/datamodel_svx.cxx
index d7daa2a235a8..44371d4e2948 100644
--- a/svx/source/diagram/datamodel_svx.cxx
+++ b/svx/source/diagram/datamodel_svx.cxx
@@ -414,21 +414,15 @@ DiagramData_svx::DiagramData_svx(const
boost::property_tree::ptree& rDiagramMode
, maPresOfNameMap()
,
msBackgroundShapeModelID(OUString::fromUtf8(rDiagramModel.get("BGShapeModelID",
"")))
{
-const int nPtCnt(rDiagramModel.get_child("PtCnt").get_value());
-for (int a(0); a < nPtCnt; a++)
-{
-const OUString aName(OUString::Concat("Pt") + OUString::number(a));
-boost::property_tree::ptree aPointData =
rDiagramModel.get_child(aName.toUtf8().getStr());
-maPoints.emplace_back(aPointData);
-}
+// read all Point entries
+auto aRangePt(rDiagramModel.equal_range("Pt"));
+for (auto itPt = aRangePt.first; itPt != aRangePt.second; itPt++)
+maPoints.emplace_back(itPt->second);
-const int nConnCnt(rDiagramModel.get_child("ConnCnt").get_value());
-for (int a(0); a < nConnCnt; a++)
-{
-const OUString aName(OUString::Concat("Cn") + OUString::number(a));
-boost::property_tree::ptree aConnectionData =
rDiagramModel.get_child(aName.toUtf8().getStr());
-maConnections.emplace_back(aConnectionData);
-}
+// read all Connection entries
+auto aRangeCn(rDiagramModel.equal_range("Cn"));
+for (auto itCn = aRangeCn.first; itCn != aRangeCn.second; itCn++)
+maConnections.emplace_back(itCn->second);
}
DiagramData_svx::~DiagramData_svx()
@@ -512,11 +506,12 @@ DomMapFlags DiagramData_svx::removeDiagramNode(const
OUString& rNodeId)
return aRetval;
}
-DiagramDataState::DiagramDataState(const Connections& aConnections, const
Points& aPoints, const uno::Reference< drawing::XShape >& rRootShape)
+DiagramDataState::DiagramDataState(const Connections& aConnections, const
Points& aPoints, const uno::Reference< drawing::XShape >& rRootShape, const
OUString& rBackgroundShapeModelID)
: maConnections(aConnections)
, maPoints(aPoints)
, mxShapes()
, maTransformation()
+, msBackgroundShapeModelID(rBackgroundShapeModelID)
{
SdrObjGroup*
pSource(dynamic_cast(SdrObject::getSdrObjectFromXShape(rRootShape)));
if (nullptr != pSource)
@@ -541,7 +536,7 @@ DiagramDataStatePtr
DiagramData_svx::extractDiagramDataState() const
{
// Just copy all Connections && Points. The shared_ptr data in
// Point-entr
core.git: include/svx svx/source
include/svx/srchdlg.hxx |4 ++--
svx/source/dialog/srchdlg.cxx |8
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 0186a604d2d486aa7ad42dbb0c1bdf63e56721c3
Author: Miklos Vajna
AuthorDate: Mon Mar 23 08:21:41 2026 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 23 14:12:05 2026 +0100
svx: prefix members of SvxSearchDialogWrapper
See tdf#94879 for motivation.
Change-Id: I8c07b640e3b0d799c3f7a6b7cfb49f19f1e2c25b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202410
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index f10dc30d119a..efec53e9f97d 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -96,13 +96,13 @@ enum class SearchLabel
class SvxSearchDialog;
class SVX_DLLPUBLIC SvxSearchDialogWrapper final : public SfxChildWindow
{
-std::shared_ptr dialog;
+std::shared_ptr m_dialog;
public:
SvxSearchDialogWrapper( vcl::Window*pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo const *
pInfo );
virtual ~SvxSearchDialogWrapper () override;
-SvxSearchDialog *getDialog () { return dialog.get();}
+SvxSearchDialog *getDialog () { return m_dialog.get();}
static void SetSearchLabel(const SearchLabel& rSL);
static void SetSearchLabel(const OUString& sStr);
static OUString GetSearchLabel();
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index c7d821b6c36c..5daed50640a6 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2356,16 +2356,16 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper(
vcl::Window* _pParent, sal_uInt1
SfxBindings* pBindings,
SfxChildWinInfo const * pInfo )
: SfxChildWindow( _pParent, nId )
-, dialog(std::make_shared(_pParent->GetFrameWeld(), this,
*pBindings))
+, m_dialog(std::make_shared(_pParent->GetFrameWeld(),
this, *pBindings))
{
-SetController(dialog);
-dialog->Initialize( pInfo );
+SetController(m_dialog);
+m_dialog->Initialize( pInfo );
pBindings->Update( SID_SEARCH_ITEM );
pBindings->Update( SID_SEARCH_OPTIONS );
pBindings->Update( SID_SEARCH_SEARCHSET );
pBindings->Update( SID_SEARCH_REPLACESET );
-dialog->m_bConstruct = false;
+m_dialog->m_bConstruct = false;
}
SvxSearchDialogWrapper::~SvxSearchDialogWrapper ()
core.git: include/svx svx/source
include/svx/svdglev.hxx|2 +-
svx/source/svdraw/svddrgmt.cxx |2 +-
svx/source/svdraw/svdglev.cxx |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9c4e67cf47ff1e7d51bec7458f94b41c054de30a
Author: Noel Grandin
AuthorDate: Sun Mar 15 20:31:37 2026 +0200
Commit: Noel Grandin
CommitDate: Wed Mar 18 18:53:08 2026 +0100
Fraction->double in ResizeMarkedGluePoints
Change-Id: Iaee1c1a7827d14a94e60d152ef18adff86e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201746
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx
index 1356033d25d0..d6967e16ae39 100644
--- a/include/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
@@ -76,7 +76,7 @@ public:
SAL_DLLPRIVATE void DeleteMarkedGluePoints();
SAL_DLLPRIVATE void MoveMarkedGluePoints (const Size& rSiz, bool bCopy);
-SAL_DLLPRIVATE void ResizeMarkedGluePoints(const Point& rRef, const
Fraction& xFact, const Fraction& yFact, bool bCopy);
+SAL_DLLPRIVATE void ResizeMarkedGluePoints(const Point& rRef, double
xFact, double yFact, bool bCopy);
SAL_DLLPRIVATE void RotateMarkedGluePoints(const Point& rRef, Degree100
nAngle, bool bCopy);
};
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index eb1ec0f9ad08..e2b32225bf3c 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -2032,7 +2032,7 @@ bool SdrDragResize::EndSdrDrag(bool bCopy)
}
else if (IsDraggingGluePoints())
{
-
getSdrDragView().ResizeMarkedGluePoints(DragStat().GetRef1(),Fraction(m_aXFact),Fraction(m_aYFact),bCopy);
+
getSdrDragView().ResizeMarkedGluePoints(DragStat().GetRef1(),m_aXFact,m_aYFact,bCopy);
}
else
{
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index e2b2076b959a..5d41f495dee7 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -372,10 +372,10 @@ void SdrGlueEditView::MoveMarkedGluePoints(const Size&
rSiz, bool bCopy)
static void ImpResize(Point& rPt, const void* p1, const void* p2, const void*
p3, const void* /*p4*/)
{
-ResizePoint(rPt,*static_cast(p1),*static_cast(p2),*static_cast(p3));
+ResizePoint(rPt,*static_cast(p1),*static_cast(p2),*static_cast(p3));
}
-void SdrGlueEditView::ResizeMarkedGluePoints(const Point& rRef, const
Fraction& xFact, const Fraction& yFact, bool bCopy)
+void SdrGlueEditView::ResizeMarkedGluePoints(const Point& rRef, double xFact,
double yFact, bool bCopy)
{
ForceUndirtyMrkPnt();
OUString aStr(SvxResId(STR_EditResize));
core.git: include/svx svx/source
include/svx/svdotext.hxx |4 ++--
svx/source/svdraw/svdotext.cxx | 10 +-
svx/source/svdraw/svdotxed.cxx |2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 4ce81e43021160da7fae2957001c8922e2d7cdc1
Author: Noel Grandin
AuthorDate: Sun Mar 15 15:58:19 2026 +0200
Commit: Noel Grandin
CommitDate: Wed Mar 18 07:59:46 2026 +0100
Fraction->double in ImpSetCharStretching
Change-Id: I8f191c9491ba475e58b00abdcde388005b937b96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201737
Tested-by: Noel Grandin
Reviewed-by: Noel Grandin
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 4954786faa71..4d18337edca2 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -270,7 +270,7 @@ private:
tools::Rectangle& rTextRect,
tools::Rectangle& rAnchorRect,
tools::Rectangle& rPaintRect,
- Fraction&aFitXCorrection )
const;
+ double&aFitXCorrection ) const;
void setupAutoFitText( SdrOutliner& rOutliner ) const;
void setupAutoFitText(SdrOutliner& rOutliner, const Size& rShapeSize)
const;
@@ -291,7 +291,7 @@ protected:
rtl::Reference ImpConvertMakeObj(const
basegfx::B2DPolyPolygon& rPolyPolygon, bool bClosed, bool bBezier) const;
rtl::Reference ImpConvertAddText(const
rtl::Reference & pObj, bool bBezier) const;
void ImpSetTextStyleSheetListeners();
-static void ImpSetCharStretching(SdrOutliner& rOutliner, const Size&
rTextSize, const Size& rShapeSize, Fraction& rFitXCorrection);
+static void ImpSetCharStretching(SdrOutliner& rOutliner, const Size&
rTextSize, const Size& rShapeSize, double& rFitXCorrection);
static void ImpJustifyRect(tools::Rectangle& rRect);
void ImpCheckShear();
tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 2659eb352a78..bf379b0ebbd6 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -832,7 +832,7 @@ std::optional
SdrTextObj::CreateEditOutlinerParaObject() con
return pPara;
}
-void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size&
rTextSize, const Size& rShapeSize, Fraction& rFitXCorrection)
+void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size&
rTextSize, const Size& rShapeSize, double& rFitXCorrection)
{
OutputDevice* pOut = rOutliner.GetRefDevice();
bool bNoStretching(false);
@@ -955,7 +955,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner&
rOutliner, const Size& rTextS
nLoopCount++;
Size aSiz(rOutliner.CalcTextSize());
tools::Long nXDiff = aSiz.Width() - nWantWdt;
-rFitXCorrection=Fraction(nWantWdt,aSiz.Width());
+rFitXCorrection = double(nWantWdt) / aSiz.Width();
if (((nXDiff>=nXTolMi || !bChkX) && nXDiff<=nXTolPl) ||
nXDiff==nXDiff0) {
bNoMoreLoop = true;
} else {
@@ -1169,7 +1169,7 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool
bContourFrame,
tools::Rectangle&
rTextRect,
tools::Rectangle&
rAnchorRect,
tools::Rectangle&
rPaintRect,
- Fraction&
rFitXCorrection ) const
+ double&rFitXCorrection
) const
{
if (!bContourFrame)
{
@@ -1259,7 +1259,7 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner&
rOutl, tools::Rectangle&
{
tools::Rectangle aTextRect;
tools::Rectangle aAnchorRect;
-Fraction aFitXCorrection(1,1);
+double aFitXCorrection(1.0);
const bool bContourFrame(IsContourTextFrame());
const MapMode aMapMode(getSdrModelFromSdrObject().GetScaleUnit());
@@ -1754,7 +1754,7 @@ GDIMetaFile*
SdrTextObj::GetTextScrollMetaFileAndRectangle(
tools::Rectangle aTextRect;
tools::Rectangle aAnchorRect;
tools::Rectangle aPaintRect;
-Fraction aFitXCorrection(1,1);
+double aFitXCorrection(1.0);
bool bContourFrame(IsContourTextFrame());
// get outliner set up. To avoid getting a somehow rotated MetaFile,
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index f8cb7c8f125a..b3fac1d95bb1 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -105,7 +105,7 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
tools::Rectangle aTextRect;
TakeTextRect(rOutl, aTextRect, false,
&aAnchorRect);
-Fraction aFitXCorrection(1,1);
+double aFitXCorrection(1.0);
ImpSetCharStretchi
core.git: include/svx svx/source
include/svx/svdedtv.hxx|2 +-
svx/source/svdraw/svdedtv1.cxx | 23 ---
2 files changed, 13 insertions(+), 12 deletions(-)
New commits:
commit 5c66e050a5570069244586fcd8723bf83a6060ff
Author: Noel Grandin
AuthorDate: Sun Mar 15 15:49:58 2026 +0200
Commit: Noel Grandin
CommitDate: Wed Mar 18 07:09:19 2026 +0100
Fraction->double in ResizeMultMarkedObj
Change-Id: Ic91d5e20d0de17f73b2ff1b12c7092a5236d2627
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201736
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 7d724f68af95..8ffb06286ad0 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -232,7 +232,7 @@ public:
void MoveMarkedObj(const Size& rSiz, bool bCopy=false);
void ResizeMarkedObj(const Point& rRef, double xFact, double yFact, bool
bCopy=false);
bool IsMarkedObjSizeValid(const Size& aTargetSize);
-SAL_DLLPRIVATE void ResizeMultMarkedObj(const Point& rRef, const Fraction&
xFact, const Fraction& yFact, const bool bWdh, const bool bHgt);
+SAL_DLLPRIVATE void ResizeMultMarkedObj(const Point& rRef, double xFact,
double yFact, const bool bWdh, const bool bHgt);
SAL_DLLPRIVATE Degree100 GetMarkedObjRotate() const;
void RotateMarkedObj(const Point& rRef, Degree100 nAngle, bool
bCopy=false);
SAL_DLLPRIVATE void MirrorMarkedObj(const Point& rRef1, const Point&
rRef2, bool bCopy=false);
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 2ccc9778464a..b70125977073 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -272,8 +272,8 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, double
xFact, double yFact,
EndUndo();
}
void SdrEditView::ResizeMultMarkedObj(const Point& rRef,
-const Fraction& xFact,
-const Fraction& yFact,
+double xFact,
+double yFact,
const bool bWdh,
const bool bHgt)
{
@@ -296,13 +296,12 @@ void SdrEditView::ResizeMultMarkedObj(const Point& rRef,
AddUndo(GetModel().GetSdrUndoFactory().CreateUndoGeoObject(*pO));
}
-Fraction aFrac(1,1);
-if (bWdh && xFact.IsValid() && bHgt && yFact.IsValid())
-pO->Resize(rRef, double(xFact), double(yFact));
-else if (bWdh && xFact.IsValid())
-pO->Resize(rRef, double(xFact), double(aFrac));
-else if (bHgt && yFact.IsValid())
-pO->Resize(rRef, double(aFrac), double(yFact));
+if (bWdh && xFact != 0.0 && bHgt && yFact != 0.0)
+pO->Resize(rRef, xFact, yFact);
+else if (bWdh && xFact != 0.0)
+pO->Resize(rRef, xFact, 1.0);
+else if (bHgt && yFact != 0.0)
+pO->Resize(rRef, 1.0, yFact);
}
if( bUndo )
EndUndo();
@@ -1785,8 +1784,10 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet&
rAttr, bool addPageMargin
// change size and height
if (bChgSiz && (m_bResizeFreeAllowed || m_bResizePropAllowed)) {
-Fraction aWdt(nSizX,aRect.Right()-aRect.Left());
-Fraction aHgt(nSizY,aRect.Bottom()-aRect.Top());
+auto nWidth = aRect.Right()-aRect.Left();
+double aWdt = nWidth == 0 ? 0 : (double(nSizX) / nWidth);
+auto nHeight = aRect.Bottom()-aRect.Top();
+double aHgt = nHeight == 0 ? 0 : (double(nSizY) / nHeight);
Point aRef(ImpGetPoint(aRect,eSizePoint));
if(GetSdrPageView())
core.git: include/svx svx/source
include/svx/svddrag.hxx |4 ++--
svx/source/svdraw/svddrag.cxx |8
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f7829ece897611ecc52d31388b46c73089e65bb9
Author: Noel Grandin
AuthorDate: Sun Mar 15 15:35:08 2026 +0200
Commit: Noel Grandin
CommitDate: Tue Mar 17 06:58:36 2026 +0100
Fraction->double in SdrDragStat
Change-Id: I075253de02b9cc44703f99befd09cb43a01272e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201735
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index 633eeebc3bb2..38fd6af98c3c 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -157,8 +157,8 @@ public:
bool CheckMinMoved(const Point& rPnt);
tools::Long GetDX() const { return
GetNow().X()-GetPrev().X(); }
tools::Long GetDY() const { return
GetNow().Y()-GetPrev().Y(); }
-Fraction GetXFact() const;
-Fraction GetYFact() const;
+double GetXFact() const;
+double GetYFact() const;
SdrDragMethod* GetDragMethod() const { return m_pDragMethod; }
void SetDragMethod(SdrDragMethod* pMth) { m_pDragMethod=pMth; }
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index 31d8fa79cba4..8fb9a74f78f2 100644
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -94,22 +94,22 @@ bool SdrDragStat::CheckMinMoved(const Point& rPnt)
return m_bMinMoved;
}
-Fraction SdrDragStat::GetXFact() const
+double SdrDragStat::GetXFact() const
{
tools::Long nMul=mvPnts.back().X()-m_aRef1.X();
tools::Long nDiv=GetPrev().X()-m_aRef1.X();
if (nDiv==0) nDiv=1;
if (m_bHorFixed) { nMul=1; nDiv=1; }
-return Fraction(nMul,nDiv);
+return double(nMul) / nDiv;
}
-Fraction SdrDragStat::GetYFact() const
+double SdrDragStat::GetYFact() const
{
tools::Long nMul=mvPnts.back().Y()-m_aRef1.Y();
tools::Long nDiv=GetPrev().Y()-m_aRef1.Y();
if (nDiv==0) nDiv=1;
if (m_bVerFixed) { nMul=1; nDiv=1; }
-return Fraction(nMul,nDiv);
+return double(nMul) / nDiv;
}
void SdrDragStat::TakeCreateRect(tools::Rectangle& rRect) const
core.git: include/svx svx/source
include/svx/rulritem.hxx | 12 -
svx/source/dialog/rulritem.cxx | 50 -
2 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit a4bd1e76d856703b6ddc5d5ef6bc6202868c8a62
Author: Miklos Vajna
AuthorDate: Mon Mar 16 08:20:57 2026 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 16 09:31:54 2026 +0100
svx: prefix members of SvxPagePosSizeItem
See tdf#94879 for motivation.
Change-Id: Ice48bc11dc94c030a71f56b94b0150fd8d4eae40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201783
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index e3baf60fcc11..74637ca331af 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -88,9 +88,9 @@ public:
class SVX_DLLPUBLIC SvxPagePosSizeItem final : public SfxPoolItem
{
-Point aPos;
-tools::Long lWidth;
-tools::Long lHeight;
+Point m_aPos;
+tools::Long m_lWidth;
+tools::Long m_lHeight;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
@@ -112,9 +112,9 @@ public:
SvxPagePosSizeItem();
SvxPagePosSizeItem(SvxPagePosSizeItem const &) = default;
-const Point &GetPos() const { return aPos; }
-tools::LongGetWidth() const { return lWidth; }
-tools::LongGetHeight() const { return lHeight; }
+const Point &GetPos() const { return m_aPos; }
+tools::LongGetWidth() const { return m_lWidth; }
+tools::LongGetHeight() const { return m_lHeight; }
};
struct SVX_DLLPUBLIC SvxColumnDescription
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 62fd0a6dfb2a..4cc8c18173f9 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -281,9 +281,9 @@ void SvxLongULSpaceItem::SetLower(tools::Long lArgRight)
bool SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const
{
return SfxPoolItem::operator==(rCmp) &&
-aPos == static_cast(rCmp).aPos &&
-lWidth == static_cast(rCmp).lWidth &&
-lHeight == static_cast(rCmp).lHeight;
+m_aPos == static_cast(rCmp).m_aPos &&
+m_lWidth == static_cast(rCmp).m_lWidth
&&
+m_lHeight == static_cast(rCmp).m_lHeight;
}
bool SvxPagePosSizeItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId
) const
@@ -296,18 +296,18 @@ bool SvxPagePosSizeItem::QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId )
case 0 :
{
css::awt::Rectangle aPagePosSize;
-aPagePosSize.X = aPos.X();
-aPagePosSize.Y = aPos.Y();
-aPagePosSize.Width = lWidth;
-aPagePosSize.Height = lHeight;
+aPagePosSize.X = m_aPos.X();
+aPagePosSize.Y = m_aPos.Y();
+aPagePosSize.Width = m_lWidth;
+aPagePosSize.Height = m_lHeight;
rVal <<= aPagePosSize;
return true;
}
-case MID_X: nVal = aPos.X(); break;
-case MID_Y: nVal = aPos.Y(); break;
-case MID_WIDTH: nVal = lWidth; break;
-case MID_HEIGHT: nVal = lHeight; break;
+case MID_X: nVal = m_aPos.X(); break;
+case MID_Y: nVal = m_aPos.Y(); break;
+case MID_WIDTH: nVal = m_lWidth; break;
+case MID_HEIGHT: nVal = m_lHeight; break;
default: OSL_FAIL("Wrong MemberId!"); return false;
}
@@ -326,10 +326,10 @@ bool SvxPagePosSizeItem::PutValue( const css::uno::Any&
rVal, sal_uInt8 nMemberI
css::awt::Rectangle aPagePosSize;
if ( rVal >>= aPagePosSize )
{
-aPos.setX( aPagePosSize.X );
-aPos.setY( aPagePosSize.Y );
-lWidth = aPagePosSize.Width;
-lHeight = aPagePosSize.Height;
+m_aPos.setX( aPagePosSize.X );
+m_aPos.setY( aPagePosSize.Y );
+m_lWidth = aPagePosSize.Width;
+m_lHeight = aPagePosSize.Height;
return true;
}
else
@@ -339,10 +339,10 @@ bool SvxPagePosSizeItem::PutValue( const css::uno::Any&
rVal, sal_uInt8 nMemberI
{
switch ( nMemberId )
{
-case MID_X: aPos.setX( nVal ); break;
-case MID_Y: aPos.setY( nVal ); break;
-case MID_WIDTH: lWidth = nVal; break;
-case MID_HEIGHT: lHeight = nVal; break;
+case MID_X: m_aPos.setX( nVal ); break;
+case MID_Y: m_aPos.setY( nVal ); break;
+case MID_WIDTH: m_lWidth = nVal; break;
+case MID_HEIGHT: m_lHeight = nVal; break;
default: OSL_FAIL("Wrong MemberId!"); return false;
}
@@ -370,16 +370,16 @@ SvxPagePosSizeItem* SvxPagePosSizeItem::Clone(SfxItemPool
*) const
SvxPagePosSizeItem::SvxPagePosSizeItem(const Point &rP, tools::Long lW,
tools::Lo
core.git: include/svx svx/source
include/svx/rulritem.hxx | 18 +++
svx/source/dialog/rulritem.cxx | 48 -
2 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit 770d8700e50334e19f4f0df5d6beb47f0f53a091
Author: Miklos Vajna
AuthorDate: Mon Mar 9 08:20:58 2026 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 9 11:13:21 2026 +0100
svx: prefix members of SvxObjectItem
See tdf#94879 for motivation.
Change-Id: I98472609ed026ae0d57197c4046ef641351e75c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201240
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 44009c456be0..e3baf60fcc11 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -199,11 +199,11 @@ public:
class SVX_DLLPUBLIC SvxObjectItem final : public SfxPoolItem
{
-tools::Long nStartX; /* Start in x direction */
-tools::Long nEndX; /* End in x direction */
-tools::Long nStartY; /* Start in y direction */
-tools::Long nEndY; /* End in y direction */
-bool bLimits; /* boundary limit control by the application */
+tools::Long m_nStartX; /* Start in x direction */
+tools::Long m_nEndX; /* End in x direction */
+tools::Long m_nStartY; /* Start in y direction */
+tools::Long m_nEndY; /* End in y direction */
+bool m_bLimits; /* boundary limit control by the application */
virtual bool operator==( const SfxPoolItem& ) const override;
@@ -225,10 +225,10 @@ public:
tools::Long nStartY, tools::Long nEndY);
SvxObjectItem(SvxObjectItem const &) = default;
-tools::Long GetStartX() const { return nStartX;}
-tools::Long GetEndX() const { return nEndX;}
-tools::Long GetStartY() const { return nStartY;}
-tools::Long GetEndY() const { return nEndY;}
+tools::Long GetStartX() const { return m_nStartX;}
+tools::Long GetEndX() const { return m_nEndX;}
+tools::Long GetStartY() const { return m_nStartY;}
+tools::Long GetEndY() const { return m_nEndY;}
void SetStartX(tools::Long lValue);
void SetEndX(tools::Long lValue);
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 99e8a29ec81e..62fd0a6dfb2a 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -624,11 +624,11 @@ bool SvxColumnItem::IsConsistent() const
bool SvxObjectItem::operator==( const SfxPoolItem& rCmp ) const
{
return SfxPoolItem::operator==(rCmp) &&
- nStartX == static_cast(rCmp).nStartX &&
- nEndX == static_cast(rCmp).nEndX &&
- nStartY == static_cast(rCmp).nStartY &&
- nEndY == static_cast(rCmp).nEndY &&
- bLimits == static_cast(rCmp).bLimits;
+ m_nStartX == static_cast(rCmp).m_nStartX &&
+ m_nEndX == static_cast(rCmp).m_nEndX &&
+ m_nStartY == static_cast(rCmp).m_nStartY &&
+ m_nEndY == static_cast(rCmp).m_nEndY &&
+ m_bLimits == static_cast(rCmp).m_bLimits;
}
bool SvxObjectItem::GetPresentation(
@@ -649,11 +649,11 @@ SvxObjectItem* SvxObjectItem::Clone(SfxItemPool *) const
SvxObjectItem::SvxObjectItem( tools::Long nSX, tools::Long nEX,
tools::Long nSY, tools::Long nEY ) :
SfxPoolItem (SID_RULER_OBJECT),
-nStartX (nSX),
-nEndX (nEX),
-nStartY (nSY),
-nEndY (nEY),
-bLimits (false)
+m_nStartX (nSX),
+m_nEndX (nEX),
+m_nStartY (nSY),
+m_nEndY (nEY),
+m_bLimits (false)
{}
bool SvxObjectItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId )
const
@@ -662,19 +662,19 @@ bool SvxObjectItem::QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId ) const
switch (nMemberId)
{
case MID_START_X:
-rVal <<= nStartX;
+rVal <<= m_nStartX;
break;
case MID_START_Y:
-rVal <<= nStartY;
+rVal <<= m_nStartY;
break;
case MID_END_X:
-rVal <<= nEndX;
+rVal <<= m_nEndX;
break;
case MID_END_Y:
-rVal <<= nEndY;
+rVal <<= m_nEndY;
break;
case MID_LIMIT:
-rVal <<= bLimits;
+rVal <<= m_bLimits;
break;
default:
OSL_FAIL( "Wrong MemberId" );
@@ -691,19 +691,19 @@ bool SvxObjectItem::PutValue( const css::uno::Any& rVal,
sal_uInt8 nMemberId )
switch (nMemberId)
{
case MID_START_X:
-bRet = (rVal >>= nStartX);
+bRet = (rVal >>= m_nStartX);
break;
case MID_START_Y:
-bRet = (rVal >>= nStartY);
+bRet = (rVal >>= m_nStartY);
break;
case MID_END_X:
-bRet = (rVal >>= nEndX);
+bRet = (rVal >>= m_nEndX);
break;
case MID_END_Y:
-bRet
core.git: include/svx svx/source
include/svx/galmisc.hxx |2 --
svx/source/gallery2/galctrl.cxx |4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 997007a1bc7e36986237b009de2ac2b296c760c9
Author: Gabor Kelemen
AuthorDate: Sat Feb 14 18:26:22 2026 +0100
Commit: Gabor Kelemen
CommitDate: Sat Mar 7 19:11:33 2026 +0100
Drop #define, use the method call directly
Change-Id: I1e49dfde7b9fb6e152919a670c63efc57cdc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199389
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index aa70aa1a60d4..c9d1eea18249 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -70,8 +70,6 @@ enum class GalleryGraphicImportRet
#define GALLERY_PROGRESS_RANGE 1
-#define GALLERY_BG_COLOR
Application::GetSettings().GetStyleSettings().GetWindowColor()
-
class SvStream;
class Graphic;
class FmFormModel;
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 6fc8b4d88508..4404e03298fc 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -114,7 +114,7 @@ bool GalleryPreview::ImplGetGraphicCenterRect( const
Graphic& rGraphic, tools::R
void GalleryPreview::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& /*rRect*/)
{
-rRenderContext.SetBackground(Wallpaper(GALLERY_BG_COLOR));
+
rRenderContext.SetBackground(Wallpaper(Application::GetSettings().GetStyleSettings().GetWindowColor()));
rRenderContext.Erase();
if (ImplGetGraphicCenterRect(m_aGraphicObj.GetGraphic(), m_aPreviewRect))
@@ -259,7 +259,7 @@ bool DialogGalleryPreview::ImplGetGraphicCenterRect( const
Graphic& rGraphic, to
void DialogGalleryPreview::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&)
{
-rRenderContext.SetBackground(Wallpaper(GALLERY_BG_COLOR));
+
rRenderContext.SetBackground(Wallpaper(Application::GetSettings().GetStyleSettings().GetWindowColor()));
if (ImplGetGraphicCenterRect(maGraphicObj.GetGraphic(), maPreviewRect))
{
core.git: include/svx svx/source sw/inc sw/source
include/svx/autoformathelper.hxx |4 ---
svx/source/items/autoformathelper.cxx | 38 --
sw/inc/tblafmt.hxx|1
sw/source/core/doc/tblafmt.cxx| 32 ++--
4 files changed, 25 insertions(+), 50 deletions(-)
New commits:
commit f799194720f3105a075d58f2f0fa4bb964c48227
Author: Caolán McNamara
AuthorDate: Thu Mar 5 23:20:00 2026 +
Commit: Caolán McNamara
CommitDate: Fri Mar 6 09:29:35 2026 +0100
remove AutoFormatBase::operator=
fold its body into SwBoxAutoFormat::operator=
Change-Id: Id30de41c3ffca82bb93b0fab1d87706b10e5733c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201078
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/svx/autoformathelper.hxx b/include/svx/autoformathelper.hxx
index 7b8462fcfd71..e2f384093923 100644
--- a/include/svx/autoformathelper.hxx
+++ b/include/svx/autoformathelper.hxx
@@ -84,10 +84,6 @@ protected:
std::unique_ptr m_aHorJustify;
std::unique_ptr m_aVerJustify;
-// assignment-op is protected due to this being a tooling
-// class, so callers need to be aware of what they do
-AutoFormatBase& operator=(const AutoFormatBase&);
-
AutoFormatBase();
AutoFormatBase( const AutoFormatBase& rNew );
~AutoFormatBase();
diff --git a/svx/source/items/autoformathelper.cxx
b/svx/source/items/autoformathelper.cxx
index 0f03e6b83262..071e1a87ee0e 100644
--- a/svx/source/items/autoformathelper.cxx
+++ b/svx/source/items/autoformathelper.cxx
@@ -105,42 +105,4 @@ AutoFormatBase::~AutoFormatBase()
{
}
-AutoFormatBase& AutoFormatBase::operator=(const AutoFormatBase& rRef)
-{
-// check self-assignment
-if(this == &rRef)
-{
-return *this;
-}
-
-// copy local members - this will use ::Clone() on all involved Items
-SetFont(rRef.GetFont());
-SetHeight(rRef.GetHeight());
-SetWeight(rRef.GetWeight());
-SetPosture(rRef.GetPosture());
-SetCJKFont(rRef.GetCJKFont());
-SetCJKHeight(rRef.GetCJKHeight());
-SetCJKWeight(rRef.GetCJKWeight());
-SetCJKPosture(rRef.GetCJKPosture());
-SetCTLFont(rRef.GetCTLFont());
-SetCTLHeight(rRef.GetCTLHeight());
-SetCTLWeight(rRef.GetCTLWeight());
-SetCTLPosture(rRef.GetCTLPosture());
-SetUnderline(rRef.GetUnderline());
-SetOverline(rRef.GetOverline());
-SetCrossedOut(rRef.GetCrossedOut());
-SetContour(rRef.GetContour());
-SetShadowed(rRef.GetShadowed());
-SetColor(rRef.GetColor());
-SetBox(rRef.GetBox());
-SetTLBR(rRef.GetTLBR());
-SetBLTR(rRef.GetBLTR());
-SetBackground(rRef.GetBackground());
-SetAdjust(rRef.GetAdjust());
-SetHorJustify(rRef.GetHorJustify());
-SetVerJustify(rRef.GetVerJustify());
-
-return *this;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index a4540b1f1ba2..fafea70d17a2 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -54,7 +54,6 @@ public:
SwBoxAutoFormat(const SvxAutoFormatDataField& rNew);
~SwBoxAutoFormat();
-/// assignment-op (still used)
SwBoxAutoFormat& operator=(const SwBoxAutoFormat& rRef);
/// Comparing based of boxes backgrounds.
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 89ba4fc49f02..fbeef32d0b30 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -178,16 +178,34 @@ SwBoxAutoFormat::~SwBoxAutoFormat() {}
SwBoxAutoFormat& SwBoxAutoFormat::operator=(const SwBoxAutoFormat& rRef)
{
-// check self-assignment
if (this == &rRef)
-{
return *this;
-}
-
-// call baseclass implementation
-AutoFormatBase::operator=(rRef);
-// copy local members - this will use ::Clone() on all involved Items
+SetFont(rRef.GetFont());
+SetHeight(rRef.GetHeight());
+SetWeight(rRef.GetWeight());
+SetPosture(rRef.GetPosture());
+SetCJKFont(rRef.GetCJKFont());
+SetCJKHeight(rRef.GetCJKHeight());
+SetCJKWeight(rRef.GetCJKWeight());
+SetCJKPosture(rRef.GetCJKPosture());
+SetCTLFont(rRef.GetCTLFont());
+SetCTLHeight(rRef.GetCTLHeight());
+SetCTLWeight(rRef.GetCTLWeight());
+SetCTLPosture(rRef.GetCTLPosture());
+SetUnderline(rRef.GetUnderline());
+SetOverline(rRef.GetOverline());
+SetCrossedOut(rRef.GetCrossedOut());
+SetContour(rRef.GetContour());
+SetShadowed(rRef.GetShadowed());
+SetColor(rRef.GetColor());
+SetBox(rRef.GetBox());
+SetTLBR(rRef.GetTLBR());
+SetBLTR(rRef.GetBLTR());
+SetBackground(rRef.GetBackground());
+SetAdjust(rRef.GetAdjust());
+SetHorJustify(rRef.GetHorJustify());
+SetVerJustify(rRef.GetVerJustify());
SetTextOrientation(rRef.GetTextOrientation());
SetVerticalAlignment(rRef.GetVerticalAlignment());
SetNumFormatString(rRef.GetNumFormatString());
core.git: include/svx svx/source
include/svx/AccessibleShape.hxx |3 +--
svx/source/accessibility/AccessibleShape.cxx |9 -
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit fe36eee75ea64aabfd84fae1d2b71eb6d18f371c
Author: Michael Weghorn
AuthorDate: Thu Mar 5 12:23:30 2026 +0100
Commit: Michael Weghorn
CommitDate: Fri Mar 6 07:15:26 2026 +0100
svx a11y: Switch to override new extended attr helper
Override the OAccessible::implGetExtendedAttributes
base class method newly introduced in
Change-Id: Ie66f135fbf6cdc98c7cdca27fa3f5fe7db7f9a74
Author: Michael Weghorn
Date: Thu Mar 5 12:12:45 2026 +0100
a11y: Introduce helper to implement XAccessibleExtendedAttributes
logic
instead of manually implementing
XAccessibleExtendedAttributes::getExtendedAttributes, to
unify/deduplicate the string concatenation and locking logic
by having it implemented (only) in the base class implementation.
Change-Id: I0a16552643c4a04c09df5b1129d55d96ebb0ee8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201036
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index d851829db538..dea2791af431 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -127,8 +127,6 @@ public:
virtual void SAL_CALL deselectAccessibleChild(
sal_Int64 nSelectedChildIndex ) override;
-// == XAccessibleExtendedAttributes
=
-virtual OUString SAL_CALL getExtendedAttributes() override;
/// Return this object's role.
virtual sal_Int16 SAL_CALL getAccessibleRole() override;
//= XAccessibleGroupPosition
=
@@ -217,6 +215,7 @@ public:
// OAccessible
virtual css::awt::Rectangle implGetBounds() override;
+virtual std::unordered_map implGetExtendedAttributes()
override;
//= XAccessibleComponent
diff --git a/svx/source/accessibility/AccessibleShape.cxx
b/svx/source/accessibility/AccessibleShape.cxx
index 7c6300c2903e..8508e9d7426c 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -730,16 +730,15 @@ void SAL_CALL AccessibleShape::deselectAccessibleChild(
sal_Int64 )
}
-// XAccessibleExtendedAttributes
-OUString SAL_CALL AccessibleShape::getExtendedAttributes()
+std::unordered_map
AccessibleShape::implGetExtendedAttributes()
{
if (getAccessibleRole() != AccessibleRole::SHAPE)
-return OUString();
+return {};
if (m_pShape)
-return "style:" + GetStyle() + ";";
+return { { u"style"_ustr, GetStyle() } };
-return OUString();
+return {};
}
// XTypeProvider
core.git: include/svx svx/source
include/svx/measctrl.hxx |4 ++--
svx/source/dialog/measctrl.cxx | 12 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit b78438854dfd246b9495a9407bbf9876bd138ad7
Author: Miklos Vajna
AuthorDate: Mon Mar 2 08:31:37 2026 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 2 11:53:16 2026 +0100
svx: prefix members of SvxXMeasurePreview
See tdf#94879 for motivation.
Change-Id: Ica2fd132985cd791c5aa087be39627222867a63e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200767
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx
index eb3c4953e4d5..6d376667392d 100644
--- a/include/svx/measctrl.hxx
+++ b/include/svx/measctrl.hxx
@@ -35,8 +35,8 @@ class SVX_DLLPUBLIC SvxXMeasurePreview final : public
weld::CustomWidgetControll
private:
MapMode m_aMapMode;
-std::unique_ptr pModel;
-rtl::Reference pMeasureObj;
+std::unique_ptr m_pModel;
+rtl::Reference m_pMeasureObj;
void ResizeImpl(const Size& rSize);
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 19b743601955..6bdb76396527 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -41,8 +41,8 @@ void SvxXMeasurePreview::SetDrawingArea(weld::DrawingArea*
pDrawingArea)
Size aSize(getPreviewStripSize(pDrawingArea->get_ref_device()));
pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
-pModel.reset(new SdrModel(nullptr, nullptr, true));
-pMeasureObj = new SdrMeasureObj(*pModel, Point(), Point());
+m_pModel.reset(new SdrModel(nullptr, nullptr, true));
+m_pMeasureObj = new SdrMeasureObj(*m_pModel, Point(), Point());
ResizeImpl(aSize);
Invalidate();
@@ -57,9 +57,9 @@ void SvxXMeasurePreview::ResizeImpl(const Size& rSize)
Size aSize = rRefDevice.PixelToLogic(rSize);
Point aPt1(aSize.Width() / 5, static_cast(aSize.Height() /
2));
-pMeasureObj->SetPoint(aPt1, 0);
+m_pMeasureObj->SetPoint(aPt1, 0);
Point aPt2(aSize.Width() * 4 / 5, static_cast(aSize.Height()
/ 2));
-pMeasureObj->SetPoint(aPt2, 1);
+m_pMeasureObj->SetPoint(aPt2, 1);
}
void SvxXMeasurePreview::Resize()
@@ -81,12 +81,12 @@ void SvxXMeasurePreview::Paint(vcl::RenderContext&
rRenderContext, const tools::
bool bHighContrast =
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
rRenderContext.SetDrawMode(bHighContrast ? OUTPUT_DRAWMODE_CONTRAST :
OUTPUT_DRAWMODE_COLOR);
-pMeasureObj->SingleObjectPainter(rRenderContext);
+m_pMeasureObj->SingleObjectPainter(rRenderContext);
}
void SvxXMeasurePreview::SetAttributes(const SfxItemSet& rInAttrs)
{
-pMeasureObj->SetMergedItemSetAndBroadcast(rInAttrs);
+m_pMeasureObj->SetMergedItemSetAndBroadcast(rInAttrs);
Invalidate();
}
core.git: include/svx svx/source
include/svx/charmap.hxx |2 +-
svx/source/dialog/charmap.cxx |3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit a53c360a82b27b39e6e604024cd3015ab1ca92cc
Author: Michael Weghorn
AuthorDate: Fri Feb 27 18:55:59 2026 +0100
Commit: Michael Weghorn
CommitDate: Sat Feb 28 09:41:14 2026 +0100
cui: Don't use SystemClipboard service ctor in SvxShowCharSet
Instead, simply use weld::Widget::get_clipboard to
get the clipboard instance.
Change-Id: I3f22a8b43103eaf43ed66e17f902800896a1e053
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200652
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index e414c9d8b0ee..6c0be4bce165 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -91,7 +91,7 @@ public:
virtual voidSelectIndex( int index, bool bFocus =
false );
voidOutputIndex( int index );
voidDeSelect();
-static void CopyToClipboard(const OUString& str);
+void CopyToClipboard(const OUString& str);
bool IsSelected(sal_uInt16 _nPos) const { return _nPos ==
mnSelectedIndex; }
sal_uInt16 GetSelectIndexId() const { return
sal::static_int_cast(mnSelectedIndex); }
static sal_uInt16 GetRowPos(sal_uInt16 _nPos);
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index fec4800f1599..9858f910c04e 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -43,7 +43,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -265,7 +264,7 @@ void SvxShowCharSet::createContextMenu(const Point&
rPosition)
void SvxShowCharSet::CopyToClipboard(const OUString& rOUStr)
{
css::uno::Reference xClipboard =
-
css::datatransfer::clipboard::SystemClipboard::create(comphelper::getProcessComponentContext());
+GetDrawingArea()->get_clipboard();
if (!xClipboard.is())
return;
core.git: include/svx svx/source
include/svx/TableAutoFmt.hxx |2 +-
svx/source/table/tableautofmt.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit eff009e260af32cd2d819321f6b5d9440df3eb65
Author: Noel Grandin
AuthorDate: Tue Feb 24 12:10:31 2026 +0200
Commit: Noel Grandin
CommitDate: Tue Feb 24 18:00:38 2026 +0100
loplugin:unnecessaryvirtual
Change-Id: I678d6b4d8662fb9bb84895f04163577acff6db40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200164
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/include/svx/TableAutoFmt.hxx b/include/svx/TableAutoFmt.hxx
index b5b0344c179e..ec5290008025 100644
--- a/include/svx/TableAutoFmt.hxx
+++ b/include/svx/TableAutoFmt.hxx
@@ -200,7 +200,7 @@ public:
virtual SvxAutoFormatDataField* GetDefaultField() = 0;
virtual const SvxAutoFormatData* GetResolvedStyle(const SvxAutoFormatData*
pData) const = 0;
virtual size_t size() const = 0;
-virtual void ResetParent(const OUString& rName);
+void ResetParent(std::u16string_view rName);
static const SfxItemPropertySet& GetTablePropertySet();
diff --git a/svx/source/table/tableautofmt.cxx
b/svx/source/table/tableautofmt.cxx
index 03f8f92b90f8..6c87827372ec 100644
--- a/svx/source/table/tableautofmt.cxx
+++ b/svx/source/table/tableautofmt.cxx
@@ -416,7 +416,7 @@ void SvxAutoFormatData::ResetAutoFormat(SvxAutoFormatData&
pOld)
SvxAutoFormat::~SvxAutoFormat() = default;
-void SvxAutoFormat::ResetParent(const OUString& rName)
+void SvxAutoFormat::ResetParent(std::u16string_view rName)
{
OUString sParent;
if (size())
core.git: include/svx svx/source
include/svx/galmisc.hxx|2 --
svx/source/gallery2/galleryfilestorage.cxx |2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit debcc7e27decef605d1490c979a5e56613b1ce2b
Author: Noel Grandin
AuthorDate: Mon Feb 23 13:37:00 2026 +0200
Commit: Noel Grandin
CommitDate: Mon Feb 23 15:51:49 2026 +0100
STREAMBUF_SIZE constant is only used in one place
Change-Id: Ic2ddcc653a99eb7d23aa06941d74f138c343a2e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200052
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 6e7c5b851d89..aa70aa1a60d4 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -63,8 +63,6 @@ enum class SgaObjKind
#define ID_IMAPINFO 2
-#define STREAMBUF_SIZE 16384L
-
enum class GalleryGraphicImportRet
{
IMPORT_NONE, IMPORT_FILE
diff --git a/svx/source/gallery2/galleryfilestorage.cxx
b/svx/source/gallery2/galleryfilestorage.cxx
index afd24eac29a4..5e2a14c15665 100644
--- a/svx/source/gallery2/galleryfilestorage.cxx
+++ b/svx/source/gallery2/galleryfilestorage.cxx
@@ -278,7 +278,7 @@ bool GalleryFileStorage::readModel(const GalleryObject*
pObject, SdrModel& rMode
if (xInputStream.is() && !xInputStream->GetError())
{
-xInputStream->SetBufferSize(STREAMBUF_SIZE);
+xInputStream->SetBufferSize(16384);
bRet = GallerySvDrawImport(*xInputStream, rModel);
xInputStream->SetBufferSize(0);
}
core.git: include/svx svx/source
include/svx/numvset.hxx |2 +-
svx/source/dialog/svxbmpnumvalueset.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fa57da9274fa2f57e42070baaf43d794114815b9
Author: Mike Kaganski
AuthorDate: Sat Feb 21 18:56:36 2026 +0500
Commit: Mike Kaganski
CommitDate: Sat Feb 21 18:37:53 2026 +0100
fix VirtualDevice GDI handle leaks in SvxNumValueSet
Similar to commit e9392c0c86fcf373e00ede92f8c2c7efd233 (fix
VirtualDevice GDI handle leaks across IconView callers, 2026-02-21).
Change-Id: I521f8cd5679172c5e98172939dd7065cfc8afd86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199940
Reviewed-by: Andras Timar
Tested-by: Jenkins CollaboraOffice
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199949
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 6c8bc4dd4073..86d9bee62895 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -51,7 +51,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
{
NumberingPageType mePageType;
tools::Rectangle maOrgRect;
-VclPtr mpVDev;
+ScopedVclPtr mpVDev;
css::uno::Reference mxFormatter;
css::lang::Locale maLocale;
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx
b/svx/source/dialog/svxbmpnumvalueset.cxx
index 025fc769ab44..15460f452c63 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -407,7 +407,7 @@ FactoryFunction SvxNumValueSet::GetUITestFactory() const
void SvxNumValueSet::init(NumberingPageType eType)
{
mePageType = eType;
-mpVDev = nullptr;
+mpVDev.disposeAndClear();
SetColCount( 4 );
SetLineCount( 2 );
core.git: include/svx svx/source
include/svx/optgrid.hxx |2 +-
svx/source/dialog/optgrid.cxx | 14 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit b4f8a7da851147740a00c6ebd789b097c739a64e
Author: Miklos Vajna
AuthorDate: Mon Feb 16 08:48:01 2026 +0100
Commit: Miklos Vajna
CommitDate: Mon Feb 16 09:39:32 2026 +0100
svx: prefix members of SvxGridTabPage
See tdf#94879 for motivation.
Change-Id: Ic3397ecc7d535b2ee44467f8dae41ba99de84507
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199446
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 85c72b1c7d23..6bac125d9496 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -104,7 +104,7 @@ private:
DRAW_MODE = 3,
HTML_MODE = 4
};
-boolbAttrModified;
+boolm_bAttrModified;
ModuleMode m_Emode;
std::unique_ptr m_xCbxUseGridsnap;
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index dd963e40294c..72de459b22ba 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -103,7 +103,7 @@ bool SvxGridItem::GetPresentation
// TabPage Screen Settings
SvxGridTabPage::SvxGridTabPage(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet& rCoreSet)
: SfxTabPage(pPage, pController, u"svx/ui/optgridpage.ui"_ustr,
u"OptGridPage"_ustr, &rCoreSet)
-, bAttrModified(false)
+, m_bAttrModified(false)
, m_Emode(WRITER_MODE)
, m_xCbxUseGridsnap(m_xBuilder->weld_check_button(u"usegridsnap"_ustr))
, m_xCbxUseGridsnapImg(m_xBuilder->weld_widget(u"lockusegridsnap"_ustr))
@@ -234,7 +234,7 @@ OUString SvxGridTabPage::GetAllStrings()
bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet )
{
-if ( bAttrModified )
+if ( m_bAttrModified )
{
SvxGridItem aGridItem( SID_ATTR_GRID_OPTIONS );
@@ -253,7 +253,7 @@ bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet )
rCoreSet->Put( aGridItem );
}
-return bAttrModified;
+return m_bAttrModified;
}
void SvxGridTabPage::Reset( const SfxItemSet* rSet )
@@ -409,7 +409,7 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet )
}
ChangeGridsnapHdl_Impl(*m_xCbxUseGridsnap);
-bAttrModified = false;
+m_bAttrModified = false;
}
void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
@@ -460,7 +460,7 @@ DeactivateRC SvxGridTabPage::DeactivatePage( SfxItemSet*
_pSet )
IMPL_LINK(SvxGridTabPage, ChangeDrawHdl_Impl, weld::MetricSpinButton&, rField,
void)
{
-bAttrModified = true;
+m_bAttrModified = true;
if (m_xCbxSynchronize->get_active())
{
if (&rField == m_xMtrFldDrawX.get())
@@ -484,7 +484,7 @@ IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl,
weld::Toggleable&, void)
IMPL_LINK(SvxGridTabPage, ChangeDivisionHdl_Impl, weld::SpinButton&, rField,
void)
{
-bAttrModified = true;
+m_bAttrModified = true;
if (m_xCbxSynchronize->get_active())
{
if (m_xNumFldDivisionX.get() == &rField)
@@ -496,7 +496,7 @@ IMPL_LINK(SvxGridTabPage, ChangeDivisionHdl_Impl,
weld::SpinButton&, rField, voi
IMPL_LINK_NOARG(SvxGridTabPage, ChangeGridsnapHdl_Impl, weld::Toggleable&,
void)
{
-bAttrModified = true;
+m_bAttrModified = true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
core.git: include/svx svx/source
include/svx/paraprev.hxx | 36 ++--
svx/source/dialog/paraprev.cxx | 36 ++--
2 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit a94cf807f32c5fd5c1c0c1658ecac1f4b0b6a4c0
Author: Miklos Vajna
AuthorDate: Mon Feb 9 08:54:01 2026 +0100
Commit: Miklos Vajna
CommitDate: Mon Feb 9 09:48:36 2026 +0100
svx: prefix members of SvxParaPrevWindow
See tdf#94879 for motivation.
Change-Id: I7ae347cbb0ca3200ac01f32a5569bb16dfac507b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198942
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx
index c571efe98432..84adfd48366a 100644
--- a/include/svx/paraprev.hxx
+++ b/include/svx/paraprev.hxx
@@ -36,21 +36,21 @@ enum class SvxPrevLineSpace
class SVX_DLLPUBLIC SvxParaPrevWindow final : public
weld::CustomWidgetController
{
-SizeaSize;
+Sizem_aSize;
// indentation
-tools::LongnLeftMargin;
-tools::LongnRightMargin;
-short nFirstLineOffset;
+tools::Longm_nLeftMargin;
+tools::Longm_nRightMargin;
+short m_nFirstLineOffset;
// distances
-sal_uInt16 nUpper;
-sal_uInt16 nLower;
+sal_uInt16 m_nUpper;
+sal_uInt16 m_nLower;
// adjustment
-SvxAdjust eAdjust;
+SvxAdjust m_eAdjust;
// last line in justification
-SvxAdjust eLastLine;
+SvxAdjust m_eLastLine;
// line distance
-SvxPrevLineSpaceeLine;
+SvxPrevLineSpacem_eLine;
virtual void Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect) override;
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
@@ -61,39 +61,39 @@ public:
void SetFirstLineOffset( short nNew )
{
-nFirstLineOffset = nNew;
+m_nFirstLineOffset = nNew;
}
void SetLeftMargin( tools::Long nNew )
{
-nLeftMargin = nNew;
+m_nLeftMargin = nNew;
}
void SetRightMargin( tools::Long nNew )
{
-nRightMargin = nNew;
+m_nRightMargin = nNew;
}
void SetUpper( sal_uInt16 nNew )
{
-nUpper = nNew;
+m_nUpper = nNew;
}
void SetLower( sal_uInt16 nNew )
{
-nLower = nNew;
+m_nLower = nNew;
}
void SetAdjust( SvxAdjust eNew )
{
-eAdjust = eNew;
+m_eAdjust = eNew;
}
void SetLastLine( SvxAdjust eNew )
{
-eLastLine = eNew;
+m_eLastLine = eNew;
}
void SetLineSpace( SvxPrevLineSpace eNew )
{
-eLine = eNew;
+m_eLine = eNew;
}
void SetSize( Size aNew )
{
-aSize = aNew;
+m_aSize = aNew;
}
};
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index d77ad513a2ba..d812fd4917ea 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -24,16 +24,16 @@
#include
SvxParaPrevWindow::SvxParaPrevWindow() :
-nLeftMargin ( 0 ),
-nRightMargin( 0 ),
-nFirstLineOffset ( 0 ),
-nUpper ( 0 ),
-nLower ( 0 ),
-eAdjust ( SvxAdjust::Left ),
-eLastLine ( SvxAdjust::Left ),
-eLine ( SvxPrevLineSpace::N1 )
+m_nLeftMargin ( 0 ),
+m_nRightMargin( 0 ),
+m_nFirstLineOffset ( 0 ),
+m_nUpper ( 0 ),
+m_nLower ( 0 ),
+m_eAdjust ( SvxAdjust::Left ),
+m_eLastLine ( SvxAdjust::Left ),
+m_eLine ( SvxPrevLineSpace::N1 )
{
-aSize = Size(11905, 16837);
+m_aSize = Size(11905, 16837);
}
void SvxParaPrevWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea)
@@ -84,7 +84,7 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext&
rRenderContext)
if (i == 3)
{
rRenderContext.SetFillColor(COL_GRAY);
-auto nTop = nUpper * aLineSiz.Height() / aSize.Height();
+auto nTop = m_nUpper * aLineSiz.Height() / m_aSize.Height();
aPnt.AdjustY(nTop * 2 );
}
@@ -93,8 +93,8 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext&
rRenderContext)
if (3 <= i && 6 > i)
{
-tools::Long nLeft = nLeftMargin * aLineSiz.Width() / aSize.Width();
-tools::Long nFirst = nFirstLineOffset * aLineSiz.Width() /
aSize.Width();
+tools::Long nLeft = m_nLeftMargin * aLineSiz.Width() /
m_aSize.Width();
+tools::Long nFirst = m_nFirstLineOffset * aLineSiz.Width() /
m_aSize.Width();
tools::Long nTmp = nLeft + nFirst;
if (i == 3)
@@ -107,13 +107,13 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext&
rRenderContext)
aPn
core.git: include/svx svx/source
include/svx/SvxColorValueSet.hxx |1 -
svx/source/tbxctrls/PaletteManager.cxx |8 +++-
svx/source/tbxctrls/SvxColorValueSet.cxx | 21 -
3 files changed, 7 insertions(+), 23 deletions(-)
New commits:
commit a930454879cfa98934e983f01decb05a23c959da
Author: Michael Weghorn
AuthorDate: Thu Feb 5 14:33:06 2026 +0100
Commit: Michael Weghorn
CommitDate: Thu Feb 5 22:28:51 2026 +0100
svx: Move relevant SvxColorValueSet::addEntriesForColorSet logic
There is only one caller that always calls the method with
a non-empty prefix.
Inline the relevant logic into the only caller, and drop
unused logic that would have handled the case of an
empty prefix.
Change-Id: I5ef0b289d8993f0a246fce89d3237534636b4f5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198762
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx
index 10076027c356..77d6e247ae74 100644
--- a/include/svx/SvxColorValueSet.hxx
+++ b/include/svx/SvxColorValueSet.hxx
@@ -39,7 +39,6 @@ public:
static sal_uInt32 getColumnCount();
void addEntriesForXColorList(const XColorList& rXColorList);
-void addEntriesForColorSet(const std::set& rColorSet,
std::u16string_view rNamePrefix);
Size layoutAllVisible(sal_uInt32 nEntryCount);
void layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount);
diff --git a/svx/source/tbxctrls/PaletteManager.cxx
b/svx/source/tbxctrls/PaletteManager.cxx
index fb592d1b3a06..cde719e6a114 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -235,7 +235,13 @@ void PaletteManager::ReloadColorSet(SvxColorValueSet
&rColorSet)
std::set aColors = pDocSh->GetDocColors();
mnColorCount = aColors.size();
rColorSet.Clear();
-rColorSet.addEntriesForColorSet(aColors, Concat2View(SvxResId(
RID_SVXSTR_DOC_COLOR_PREFIX ) + " ") );
+const OUString sNamePrefix = SvxResId(RID_SVXSTR_DOC_COLOR_PREFIX)
+ u" ";
+sal_uInt32 nIndex = 1;
+for(const auto& rColor : aColors)
+{
+rColorSet.InsertItem(nIndex, rColor, sNamePrefix +
OUString::number(nIndex));
+nIndex++;
+}
}
}
else
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx
b/svx/source/tbxctrls/SvxColorValueSet.cxx
index 737b0ab93874..ee24b81170dd 100644
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -71,27 +71,6 @@ void SvxColorValueSet::addEntriesForXColorList(const
XColorList& rXColorList)
}
}
-void SvxColorValueSet::addEntriesForColorSet(const std::set& rColorSet,
std::u16string_view rNamePrefix)
-{
-sal_uInt32 nStartIndex = 1;
-if(!rNamePrefix.empty())
-{
-for(const auto& rColor : rColorSet)
-{
-InsertItem(nStartIndex, rColor, rNamePrefix +
OUString::number(nStartIndex));
-nStartIndex++;
-}
-}
-else
-{
-for(const auto& rColor : rColorSet)
-{
-InsertItem(nStartIndex, rColor, u""_ustr);
-nStartIndex++;
-}
-}
-}
-
Size SvxColorValueSet::layoutAllVisible(sal_uInt32 nEntryCount)
{
if(!nEntryCount)
core.git: include/svx svx/source
include/svx/imapdlg.hxx |2 +-
svx/source/dialog/imapdlg.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 726b1151e25ae748ca76c21cabb427d82f00c23c
Author: Miklos Vajna
AuthorDate: Mon Feb 2 08:47:21 2026 +0100
Commit: Miklos Vajna
CommitDate: Mon Feb 2 10:12:10 2026 +0100
svx: prefix members of SvxIMapDlgItem
See tdf#94879 for motivation.
Change-Id: Ie75dce4fc7f16696d316c9d5a4eec1769e4e30bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198513
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index b31501f3c815..5a31351a377a 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -68,7 +68,7 @@ class SvxIMapDlg;
class SvxIMapDlgItem final : public SfxControllerItem
{
-SvxIMapDlg& rIMap;
+SvxIMapDlg& m_rIMap;
virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState
eState,
const SfxPoolItem* pState ) override;
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 3bf8098fb750..faded8737064 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -63,7 +63,7 @@ SFX_IMPL_MODELESSDIALOGCONTOLLER_WITHID(
SvxIMapDlgChildWindow, SID_IMAP );
SvxIMapDlgItem::SvxIMapDlgItem( SvxIMapDlg& rIMapDlg, SfxBindings& rBindings )
:
SfxControllerItem ( SID_IMAP_EXEC, rBindings ),
-rIMap ( rIMapDlg )
+m_rIMap ( rIMapDlg )
{
}
@@ -77,7 +77,7 @@ void SvxIMapDlgItem::StateChangedAtToolBoxControl( sal_uInt16
nSID, SfxItemState
if (pStateItem)
{
// Disable Float if possible
-rIMap.SetExecState( !pStateItem->GetValue() );
+m_rIMap.SetExecState( !pStateItem->GetValue() );
}
}
}
core.git: include/svx svx/source
include/svx/imapdlg.hxx |8
svx/source/dialog/imapdlg.cxx | 42 +-
2 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit d188260af59612be0c9440704345d05118b6c058
Author: Miklos Vajna
AuthorDate: Mon Jan 26 08:48:34 2026 +0100
Commit: Miklos Vajna
CommitDate: Mon Jan 26 15:41:44 2026 +0100
svx: prefix members of SvxIMapDlg
See tdf#94879 for motivation.
Change-Id: Ib72635f52a33e3bb6212b6f0545d4aa75dc72998
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198121
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 330bb706aeff..b31501f3c815 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -88,9 +88,9 @@ class SVX_DLLPUBLIC SvxIMapDlg final : public
SfxModelessDialogController
friend class IMapOwnData;
friend class IMapWindow;
-std::unique_ptr pOwnData;
-void* pCheckObj;
-SvxIMapDlgItem aIMapItem;
+std::unique_ptr m_pOwnData;
+void* m_pCheckObj;
+SvxIMapDlgItem m_aIMapItem;
std::unique_ptr m_xIMapWnd;
std::unique_ptr m_xTbxIMapDlg1;
@@ -130,7 +130,7 @@ public:
voidSetExecState( bool bEnable );
-const void* GetEditingObject() const { return pCheckObj; }
+const void* GetEditingObject() const { return m_pCheckObj; }
const ImageMap& GetImageMap() const;
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index c2245258ac77..4c70d16c5c0e 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -101,8 +101,8 @@ void SvxIMapDlgChildWindow::UpdateIMapDlg( const Graphic&
rGraphic, const ImageM
SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW,
weld::Window* _pParent)
: SfxModelessDialogController(_pBindings, pCW, _pParent,
u"svx/ui/imapdialog.ui"_ustr, u"ImapDialog"_ustr)
-, pCheckObj(nullptr)
-, aIMapItem(*this, *_pBindings)
+, m_pCheckObj(nullptr)
+, m_aIMapItem(*this, *_pBindings)
, m_xIMapWnd(new IMapWindow(_pBindings->GetActiveFrame(), m_xDialog.get()))
, m_xTbxIMapDlg1(m_xBuilder->weld_toolbar(u"toolbar"_ustr))
, m_xFtURL(m_xBuilder->weld_label(u"urlft"_ustr))
@@ -135,7 +135,7 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings,
SfxChildWindow *pCW, weld::Windo
m_xIMapWnd->Show();
-pOwnData.reset(new IMapOwnData);
+m_pOwnData.reset(new IMapOwnData);
m_xIMapWnd->SetInfoLink( LINK( this, SvxIMapDlg, InfoHdl ) );
m_xIMapWnd->SetMousePosLink( LINK( this, SvxIMapDlg, MousePosHdl ) );
@@ -163,9 +163,9 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings,
SfxChildWindow *pCW, weld::Windo
m_xEdtText->set_sensitive(false);
m_xFtTarget->set_sensitive(false);
m_xCbbTarget->set_sensitive(false);
-pOwnData->bExecState = false;
+m_pOwnData->bExecState = false;
-pOwnData->aIdle.SetInvokeHandler( LINK( this, SvxIMapDlg, UpdateHdl ) );
+m_pOwnData->aIdle.SetInvokeHandler( LINK( this, SvxIMapDlg, UpdateHdl ) );
m_xTbxIMapDlg1->set_item_sensitive(u"TBI_ACTIVE"_ustr, false);
m_xTbxIMapDlg1->set_item_sensitive(u"TBI_MACRO"_ustr, false );
@@ -220,7 +220,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, CancelHdl, weld::Button&, void)
void SvxIMapDlg::SetExecState( bool bEnable )
{
-pOwnData->bExecState = bEnable;
+m_pOwnData->bExecState = bEnable;
}
const ImageMap& SvxIMapDlg::GetImageMap() const
@@ -241,14 +241,14 @@ void SvxIMapDlg::SetTargetList( const TargetList&
rTargetList )
void SvxIMapDlg::UpdateLink( const Graphic& rGraphic, const ImageMap*
pImageMap,
const TargetList* pTargetList, void* pEditingObj )
{
-pOwnData->aUpdateGraphic = rGraphic;
+m_pOwnData->aUpdateGraphic = rGraphic;
if ( pImageMap )
-pOwnData->aUpdateImageMap = *pImageMap;
+m_pOwnData->aUpdateImageMap = *pImageMap;
else
-pOwnData->aUpdateImageMap.ClearImageMap();
+m_pOwnData->aUpdateImageMap.ClearImageMap();
-pOwnData->pUpdateEditingObject = pEditingObj;
+m_pOwnData->pUpdateEditingObject = pEditingObj;
// Delete UpdateTargetList, because this method can still be called several
// times before the update timer is turned on
@@ -257,11 +257,11 @@ void SvxIMapDlg::UpdateLink( const Graphic& rGraphic,
const ImageMap* pImageMap,
// deleted immediately after this call the copied list will be deleted
// again in the handler
if( pTargetList )
-pOwnData->aUpdateTargetList = *pTargetList;
+m_pOwnData->aUpdateTargetList = *pTargetList;
else
-pOwnData->aUpdateTargetList.clear();
+m_pOwnData->aUpdateTargetList.clear();
-pOwnData->aIdle.Start();
+m_pOwnData->aIdle.Start();
}
@@ -632,9 +632,9 @@ IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl, weld::Widget&,
void)
IMPL_LINK_NOARG(
core.git: include/svx svx/source
include/svx/nbdtmg.hxx|6 +++---
svx/source/sidebar/nbdtmg.cxx | 12 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 0de962a42ef0a5d95068263294e99179531d7e85
Author: Xisco Fauli
AuthorDate: Thu Jan 22 12:41:25 2026 +0100
Commit: Xisco Fauli
CommitDate: Thu Jan 22 15:57:13 2026 +0100
svx: fix typo
Change-Id: Ib96dffaedf182fbeb0f605c14ddcd19c47507ff9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197805
Reviewed-by: Xisco Fauli
Tested-by: Jenkins
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 45b0f99d9e82..ca199e2477cd 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -29,7 +29,7 @@ class SfxItemSet;
namespace svx::sidebar {
#define DEFAULT_BULLET_TYPES8
-#define DEFAULT_NUM_VALUSET_COUNT 8
+#define DEFAULT_NUM_VALUESET_COUNT 8
#define DEFAULT_NUMBERING_CACHE_FORMAT_VERSION 0x10
enum class NBOType
@@ -201,8 +201,8 @@ class OutlineTypeMgr final : public NBOTypeMgrBase
virtual bool IsCustomized(sal_uInt16 nIndex) override;
static OutlineTypeMgr& GetInstance();
private:
-OutlineSettings_Impl*
pOutlineSettingsArrs[DEFAULT_NUM_VALUSET_COUNT];
-OutlineSettings_Impl*
pDefaultOutlineSettingsArrs[DEFAULT_NUM_VALUSET_COUNT];
+OutlineSettings_Impl*
pOutlineSettingsArrs[DEFAULT_NUM_VALUESET_COUNT];
+OutlineSettings_Impl*
pDefaultOutlineSettingsArrs[DEFAULT_NUM_VALUESET_COUNT];
};
}
#endif
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 0c9d9c26b015..c7fc6b1748c7 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -179,7 +179,7 @@ void NBOTypeMgrBase::ImplLoad(std::u16string_view filename)
if (nVersion==DEFAULT_NUMBERING_CACHE_FORMAT_VERSION) //first version
{
xIStm->ReadInt32( nNumIndex );
-while (nNumIndex>=0 && nNumIndex=0 && nNumIndexWriteUInt32( nVersion );
-for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUSET_COUNT; nItem++ ) {
+for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUESET_COUNT; nItem++ )
{
if (IsCustomized(nItem)) {
SvxNumRule aDefNumRule( SvxNumRuleFlags::BULLET_REL_SIZE |
SvxNumRuleFlags::CONTINUOUS | SvxNumRuleFlags::BULLET_COLOR,
10, false,
@@ -571,7 +571,7 @@ bool NumberingTypeMgr::IsCustomized(sal_uInt16 nIndex)
OutlineTypeMgr::OutlineTypeMgr()
{
Init();
-for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUSET_COUNT; nItem++ )
+for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUESET_COUNT; nItem++ )
{
pDefaultOutlineSettingsArrs[nItem] = pOutlineSettingsArrs[nItem];
}
@@ -601,7 +601,7 @@ void OutlineTypeMgr::Init()
10, false,
SvxNumRuleType::NUMBERING, SvxNumberFormat::LABEL_ALIGNMENT);
-auto nSize = std::min(aOutlineAccess.getLength(),
DEFAULT_NUM_VALUSET_COUNT);
+auto nSize = std::min(aOutlineAccess.getLength(),
DEFAULT_NUM_VALUESET_COUNT);
for(sal_Int32 nItem = 0; nItem < nSize; nItem++ )
{
pOutlineSettingsArrs[ nItem ] = new OutlineSettings_Impl;
@@ -780,8 +780,8 @@ void OutlineTypeMgr::ReplaceNumRule(SvxNumRule& aNum,
sal_uInt16 nIndex, sal_uIn
void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 /*mLevel*/, bool isDefault, bool isResetSize)
{
-DBG_ASSERT(DEFAULT_NUM_VALUSET_COUNT > nIndex, "wrong index");
-if(DEFAULT_NUM_VALUSET_COUNT <= nIndex)
+DBG_ASSERT(DEFAULT_NUM_VALUESET_COUNT > nIndex, "wrong index");
+if(DEFAULT_NUM_VALUESET_COUNT <= nIndex)
return;
const FontList* pList = nullptr;
core.git: include/svx svx/source
include/svx/rulritem.hxx | 20 +--
svx/source/dialog/rulritem.cxx | 72 -
2 files changed, 46 insertions(+), 46 deletions(-)
New commits:
commit c3df5eb7b4b445e4201683e48acd3fc14c2113ab
Author: Miklos Vajna
AuthorDate: Mon Jan 19 08:16:29 2026 +0100
Commit: Miklos Vajna
CommitDate: Mon Jan 19 09:27:09 2026 +0100
svx: prefix members of SvxColumnItem
See tdf#94879 for motivation.
Change-Id: I90923d835b75050b41276c7c95151ecaa0c54717
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197544
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 626fa5d17a9b..44009c456be0 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -148,14 +148,14 @@ inline std::basic_ostream & operator <<(
class SVX_DLLPUBLIC SvxColumnItem final : public SfxPoolItem
{
-std::vector aColumns; // Column array
+std::vector m_aColumns; // Column array
-tools::Long nLeft; // Left edge for the table
-tools::Long nRight;// Right edge for the table; for columns
always
+tools::Long m_nLeft; // Left edge for the table
+tools::Long m_nRight;// Right edge for the table; for columns
always
// equal to the surrounding frame
-sal_uInt16 nActColumn; // the current column
-bool bTable; // table?
-bool bOrtho; // evenly spread columns
+sal_uInt16 m_nActColumn; // the current column
+bool m_bTable; // table?
+bool m_bOrtho; // evenly spread columns
virtual bool operator==( const SfxPoolItem& ) const override;
@@ -186,12 +186,12 @@ public:
voidAppend(const SvxColumnDescription& rDesc);
voidSetLeft(tools::Long aLeft);
voidSetRight(tools::Long aRight);
-sal_uInt16 GetActColumn() const { return nActColumn;}
+sal_uInt16 GetActColumn() const { return m_nActColumn;}
boolIsFirstAct() const;
boolIsLastAct() const;
-tools::LongGetLeft() const { return nLeft;}
-tools::LongGetRight() const { return nRight;}
-boolIsTable() const { return bTable;}
+tools::LongGetLeft() const { return m_nLeft;}
+tools::LongGetRight() const { return m_nRight;}
+boolIsTable() const { return m_bTable;}
boolCalcOrtho() const;
voidSetOrtho(bool bVal);
boolIsConsistent() const;
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 6a4e09e16021..99e8a29ec81e 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -387,10 +387,10 @@ SvxPagePosSizeItem::SvxPagePosSizeItem() :
bool SvxColumnItem::operator==(const SfxPoolItem& rCmp) const
{
if(!SfxPoolItem::operator==(rCmp) ||
- nActColumn != static_cast(rCmp).nActColumn ||
- nLeft != static_cast(rCmp).nLeft ||
- nRight != static_cast(rCmp).nRight ||
- bTable != static_cast(rCmp).bTable ||
+ m_nActColumn != static_cast(rCmp).m_nActColumn ||
+ m_nLeft != static_cast(rCmp).m_nLeft ||
+ m_nRight != static_cast(rCmp).m_nRight ||
+ m_bTable != static_cast(rCmp).m_bTable ||
Count() != static_cast(rCmp).Count())
return false;
@@ -405,21 +405,21 @@ bool SvxColumnItem::operator==(const SfxPoolItem& rCmp)
const
SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) :
SfxPoolItem (SID_RULER_BORDERS ),
-nLeft (0),
-nRight (0),
-nActColumn (nAct),
-bTable (false),
-bOrtho (true)
+m_nLeft (0),
+m_nRight (0),
+m_nActColumn (nAct),
+m_bTable (false),
+m_bOrtho (true)
{}
SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16
right ) :
SfxPoolItem (SID_RULER_BORDERS),
-nLeft (left),
-nRight (right),
-nActColumn (nActCol),
-bTable (true),
-bOrtho (true)
+m_nLeft (left),
+m_nRight (right),
+m_nActColumn (nActCol),
+m_bTable (true),
+m_bOrtho (true)
{}
bool SvxColumnItem::GetPresentation(
@@ -465,19 +465,19 @@ bool SvxColumnItem::QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId ) const
case MID_COLUMNARRAY:
return false;
case MID_RIGHT:
-rVal <<= nRight;
+rVal <<= m_nRight;
break;
case MID_LEFT:
-rVal <<= nLeft;
+rVal <<= m_nLeft;
break;
case MID_ORTHO:
-rVal <<= bOrtho;
+rVal <<= m_bOrtho;
break;
case MID_ACTUAL:
-rVal <<= static_cast(nActColumn);
+rVal <<= static_cast(m_nActColumn);
break;
case MID_TABLE:
-rVal <<= bTable;
+rVal <<= m_bTa
core.git: include/svx svx/source
include/svx/AccessibleGraphicShape.hxx | 21 -
svx/source/accessibility/AccessibleGraphicShape.cxx | 44 +---
2 files changed, 4 insertions(+), 61 deletions(-)
New commits:
commit a17ca736697d95845ab2df20bef514b8ba5b4211
Author: Michael Weghorn
AuthorDate: Mon Jan 12 21:15:10 2026 +0100
Commit: Michael Weghorn
CommitDate: Tue Jan 13 21:59:00 2026 +0100
svx a11y: Use ImplInheritanceHelper for AccessibleGraphicShape
Change-Id: I650870d348f49593b6dfdee3049109f0f8622ca4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197146
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/include/svx/AccessibleGraphicShape.hxx
b/include/svx/AccessibleGraphicShape.hxx
index 472198366bae..789149d0d1a9 100644
--- a/include/svx/AccessibleGraphicShape.hxx
+++ b/include/svx/AccessibleGraphicShape.hxx
@@ -40,8 +40,7 @@ class AccessibleShapeTreeInfo;
XAccessibleImage interface.
*/
class SVX_DLLPUBLIC AccessibleGraphicShape
-: public AccessibleShape,
-public css::accessibility::XAccessibleImage
+: public cppu::ImplInheritanceHelper
{
public:
AccessibleGraphicShape (
@@ -58,24 +57,6 @@ public:
sal_Int32 SAL_CALL getAccessibleImageWidth() override;
-//= XInterface ==
-
-virtual css::uno::Any SAL_CALL
-queryInterface (const css::uno::Type & rType) override;
-
-virtual void SAL_CALL
-acquire()
-noexcept override;
-
-virtual void SAL_CALL
-release()
-noexcept override;
-
-//= XTypeProvider ===
-
-virtual css::uno::Sequence< css::uno::Type> SAL_CALL
-getTypes() override;
-
protected:
/// Create a name string that contains the accessible name.
virtual OUString
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx
b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 1b45a24cc5e8..14eae87938bc 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -33,10 +33,9 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
// internal
-AccessibleGraphicShape::AccessibleGraphicShape (
-const AccessibleShapeInfo& rShapeInfo,
-const AccessibleShapeTreeInfo& rShapeTreeInfo)
-: AccessibleShape (rShapeInfo, rShapeTreeInfo)
+AccessibleGraphicShape::AccessibleGraphicShape(const AccessibleShapeInfo&
rShapeInfo,
+ const AccessibleShapeTreeInfo&
rShapeTreeInfo)
+: ImplInheritanceHelper(rShapeInfo, rShapeTreeInfo)
{
}
@@ -65,43 +64,6 @@ sal_Int32 SAL_CALL
AccessibleGraphicShape::getAccessibleImageWidth()
return AccessibleShape::getSize().Width;
}
-// XInterface
-css::uno::Any SAL_CALL
-AccessibleGraphicShape::queryInterface (const css::uno::Type & rType)
-{
-css::uno::Any aReturn = AccessibleShape::queryInterface (rType);
-if ( ! aReturn.hasValue())
-aReturn = ::cppu::queryInterface (rType,
-static_cast(this));
-return aReturn;
-}
-
-
-void SAL_CALL
-AccessibleGraphicShape::acquire()
-noexcept
-{
-AccessibleShape::acquire ();
-}
-
-
-void SAL_CALL
-AccessibleGraphicShape::release()
-noexcept
-{
-AccessibleShape::release ();
-}
-
-// XTypeProvider
-uno::Sequence SAL_CALL
-AccessibleGraphicShape::getTypes()
-{
-// Get list of types from the context base implementation...
-return comphelper::concatSequences(AccessibleShape::getTypes(),
-uno::Sequence { cppu::UnoType::get() });
-}
-
-
/// Create the base name of this object, i.e. the name without appended number.
OUString
AccessibleGraphicShape::CreateAccessibleBaseName()
core.git: include/svx svx/source
include/svx/AccessibleShape.hxx | 28 +++
svx/source/accessibility/AccessibleShape.cxx | 48 +++
2 files changed, 13 insertions(+), 63 deletions(-)
New commits:
commit cc04e8b1774702761f89201cefa94fc961c5c68f
Author: Michael Weghorn
AuthorDate: Mon Jan 12 20:34:40 2026 +0100
Commit: Michael Weghorn
CommitDate: Tue Jan 13 19:39:07 2026 +0100
svx a11y: Use ImplInheritanceHelper for AccessibleShape
This drops the need to manually implement/override
the XInterface methods.
AccessibleShape::getTypes doesn't simply return the types
of the implemented UNO interfaces, so leave the custom
implementation in place for now.
(The reason for this custom handling isn't immediately
clear to me at first glance.)
Change-Id: I544ad8a2b9594dd6c0fb75ae489e1cb98d5cd4f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197144
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index dabe921ae7e9..94f7dc2aefd5 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -79,14 +79,12 @@ class IAccessibleParent;
container, who can then call dispose() at the accessible object.
*/
class SVX_DLLPUBLIC AccessibleShape
-: public AccessibleContextBase,
-public css::accessibility::XAccessibleSelection,
-public css::accessibility::XAccessibleExtendedAttributes,
-public css::accessibility::XAccessibleGroupPosition,
-public css::accessibility::XAccessibleHypertext,
-public IAccessibleViewForwarderListener,
-public css::document::XShapeEventListener,
-public css::lang::XUnoTunnel
+: public cppu::ImplInheritanceHelper<
+ AccessibleContextBase, css::accessibility::XAccessibleSelection,
+ css::accessibility::XAccessibleExtendedAttributes,
+ css::accessibility::XAccessibleGroupPosition,
css::accessibility::XAccessibleHypertext,
+ css::document::XShapeEventListener, css::lang::XUnoTunnel>,
+ public IAccessibleViewForwarderListener
{
public:
/** Create a new accessible object that makes the given shape accessible.
@@ -257,20 +255,6 @@ public:
const css::uno::Reference<
css::accessibility::XAccessibleEventListener >& rxListener)
override;
-
-//= XInterface ==
-
-virtual css::uno::Any SAL_CALL
-queryInterface (const css::uno::Type & rType) override;
-
-virtual void SAL_CALL
-acquire()
-noexcept override;
-
-virtual void SAL_CALL
-release()
-noexcept override;
-
//= XTypeProvider ===
virtual css::uno::Sequence< css::uno::Type> SAL_CALL
diff --git a/svx/source/accessibility/AccessibleShape.cxx
b/svx/source/accessibility/AccessibleShape.cxx
index 87e345158913..7c6300c2903e 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -93,14 +93,13 @@ OUString GetOptionalProperty (
} // end of anonymous namespace
// internal
-AccessibleShape::AccessibleShape (
-const AccessibleShapeInfo& rShapeInfo,
-const AccessibleShapeTreeInfo& rShapeTreeInfo)
-: AccessibleContextBase (rShapeInfo.mxParent,AccessibleRole::SHAPE),
- mxShape (rShapeInfo.mxShape),
- maShapeTreeInfo (rShapeTreeInfo),
- m_nIndexInParent(-1),
- mpParent (rShapeInfo.mpChildrenManager)
+AccessibleShape::AccessibleShape(const AccessibleShapeInfo& rShapeInfo,
+ const AccessibleShapeTreeInfo& rShapeTreeInfo)
+: ImplInheritanceHelper(rShapeInfo.mxParent, AccessibleRole::SHAPE)
+, mxShape(rShapeInfo.mxShape)
+, maShapeTreeInfo(rShapeTreeInfo)
+, m_nIndexInParent(-1)
+, mpParent(rShapeInfo.mpChildrenManager)
{
m_pShape = SdrObject::getSdrObjectFromXShape(mxShape);
UpdateNameAndDescription();
@@ -652,39 +651,6 @@ void SAL_CALL
AccessibleShape::removeAccessibleEventListener (
mpText->RemoveEventListener (rxListener);
}
-// XInterface
-css::uno::Any SAL_CALL
-AccessibleShape::queryInterface (const css::uno::Type & rType)
-{
-css::uno::Any aReturn = AccessibleContextBase::queryInterface (rType);
-if ( ! aReturn.hasValue())
-aReturn = ::cppu::queryInterface (rType,
-static_cast< css::accessibility::XAccessibleSelection* >(this),
-static_cast< css::accessibility::XAccessibleExtendedAttributes*
>(this),
-static_cast(this),
-static_cast(this),
-static_cast(this),
-static_cast(this)
-);
-return aReturn;
-}
-
-
-void SAL_CALL
-AccessibleShape::acquire()
-noexcept
-{
-AccessibleContextBase::acquire ();
-}
-
-
-void SAL_CALL
-AccessibleShape::release()
-noexcept
-{
-
core.git: include/svx svx/source
include/svx/pagectrl.hxx | 126 +++---
svx/source/dialog/pagectrl.cxx | 134 -
2 files changed, 130 insertions(+), 130 deletions(-)
New commits:
commit ea841b82fefc0295fdb37cc8909b1f5067321e84
Author: Miklos Vajna
AuthorDate: Mon Jan 12 08:26:20 2026 +0100
Commit: Miklos Vajna
CommitDate: Mon Jan 12 10:02:24 2026 +0100
svx: prefix members of SvxPageWindow
See tdf#94879 for motivation.
Change-Id: I69c2ae8e1792d0823a562936ef1458cab5634b6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197060
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx
index a82bec40d78c..1e46a0fb7a31 100644
--- a/include/svx/pagectrl.hxx
+++ b/include/svx/pagectrl.hxx
@@ -29,39 +29,39 @@ enum class SvxFrameDirection;
class SVX_DLLPUBLIC SvxPageWindow : public weld::CustomWidgetController
{
private:
-Size aWinSize;
-Size aSize;
+Size m_aWinSize;
+Size m_aSize;
-tools::Long nTop;
-tools::Long nBottom;
-tools::Long nLeft;
-tools::Long nRight;
+tools::Long m_nTop;
+tools::Long m_nBottom;
+tools::Long m_nLeft;
+tools::Long m_nRight;
-bool bResetBackground;
-bool bFrameDirection;
-SvxFrameDirection nFrameDirection;
+bool m_bResetBackground;
+bool m_bFrameDirection;
+SvxFrameDirection m_nFrameDirection;
-tools::Long nHdLeft;
-tools::Long nHdRight;
-tools::Long nHdDist;
-tools::Long nHdHeight;
+tools::Long m_nHdLeft;
+tools::Long m_nHdRight;
+tools::Long m_nHdDist;
+tools::Long m_nHdHeight;
-tools::Long nFtLeft;
-tools::Long nFtRight;
-tools::Long nFtDist;
-tools::Long nFtHeight;
+tools::Long m_nFtLeft;
+tools::Long m_nFtRight;
+tools::Long m_nFtDist;
+tools::Long m_nFtHeight;
drawinglayer::attribute::SdrAllFillAttributesHelperPtr
maHeaderFillAttributes;
drawinglayer::attribute::SdrAllFillAttributesHelperPtr
maFooterFillAttributes;
drawinglayer::attribute::SdrAllFillAttributesHelperPtr
maPageFillAttributes;
-bool bFooter : 1;
-bool bHeader : 1;
-bool bTable : 1;
-bool bHorz : 1;
-bool bVert : 1;
+bool m_bFooter : 1;
+bool m_bHeader : 1;
+bool m_bTable : 1;
+bool m_bHorz : 1;
+bool m_bVert : 1;
-SvxPageUsage eUsage;
+SvxPageUsage m_eUsage;
protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect) override;
@@ -96,51 +96,51 @@ public:
}
void SetSize(const Size& rSize)
{
-aSize = rSize;
+m_aSize = rSize;
}
const Size& GetSize() const
{
-return aSize;
+return m_aSize;
}
-void SetTop(tools::Long nNew) { nTop = nNew; }
-void SetBottom(tools::Long nNew) { nBottom = nNew; }
-void SetLeft(tools::Long nNew) { nLeft = nNew; }
-void SetRight(tools::Long nNew) { nRight = nNew; }
-
-tools::Long GetTop() const { return nTop; }
-tools::Long GetBottom() const { return nBottom; }
-tools::Long GetLeft() const { return nLeft; }
-tools::Long GetRight() const { return nRight; }
-
-void SetHdLeft(tools::Long nNew) { nHdLeft = nNew; }
-void SetHdRight(tools::Long nNew) { nHdRight = nNew; }
-void SetHdDist(tools::Long nNew) { nHdDist = nNew; }
-void SetHdHeight(tools::Long nNew) { nHdHeight = nNew; }
-
-tools::Long GetHdLeft() const { return nHdLeft; }
-tools::Long GetHdRight() const { return nHdRight; }
-tools::Long GetHdDist() const { return nHdDist; }
-tools::Long GetHdHeight() const { return nHdHeight; }
-
-void SetFtLeft(tools::Long nNew) { nFtLeft = nNew; }
-void SetFtRight(tools::Long nNew) { nFtRight = nNew; }
-void SetFtDist(tools::Long nNew) { nFtDist = nNew; }
-void SetFtHeight(tools::Long nNew) { nFtHeight = nNew; }
-
-tools::Long GetFtLeft() const { return nFtLeft; }
-tools::Long GetFtRight() const { return nFtRight; }
-tools::Long GetFtDist() const { return nFtDist; }
-tools::Long GetFtHeight() const { return nFtHeight; }
-
-void SetUsage(SvxPageUsage eU) { eUsage = eU; }
-SvxPageUsage GetUsage() const { return eUsage; }
-
-void SetHeader( bool bNew ) { bHeader = bNew; }
-void SetFooter( bool bNew ) { bFooter = bNew; }
-void SetTable( bool bNew ) { bTable = bNew; }
-void SetHorz( bool bNew ) { bHorz = bNew; }
-void SetVert( bool bNew ) { bVert = bNew; }
+void SetTop(tools::Long nNew) { m_nTop = nNew; }
+void SetBottom(tools::Long nNew) { m_nBottom = nNew; }
+void SetLeft(tools::Long nNew) { m_nLeft = nNew; }
+void SetRight(tools::Long nNew) { m_nRight = nNew; }
+
+tools::Long GetTop() const { return m_nTop; }
+tools::Long GetBottom() const { return m_nBottom; }
+tools::Long GetLeft() const { return m_nLeft; }
+tools::Long GetRight() const { return m_nRight; }
+
+void SetHdL
core.git: include/svx svx/source
include/svx/svdobj.hxx |2 --
svx/source/svdraw/svdobj.cxx | 29 ++---
2 files changed, 10 insertions(+), 21 deletions(-)
New commits:
commit 64dfe34cdc0f7db90804bceb25f1e19e534d4d1b
Author: Noel Grandin
AuthorDate: Wed Jan 7 17:25:35 2026 +0100
Commit: Noel Grandin
CommitDate: Sat Jan 10 14:21:49 2026 +0100
tdf#170257 Dragging a shape over another shape changes positions
Revert the following commit which seems to have caused this problem
commit 11fd1adad3b23b57cfc6ffde88672154b02b15b6.
tdf#154913 empty is a valid value for m_aOutRect
Change-Id: I3e4ef9b27021f76e3e474d00ec59cc8e1784dfff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196781
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 8b679ecc2373..810670e86c68 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -876,14 +876,12 @@ public:
protected:
const tools::Rectangle& getOutRectangle() const;
-bool isOutRectangleSet() const { return m_bOutRectangleSet; }
void setOutRectangleConst(tools::Rectangle const& rRectangle) const; //
need to do something about this
void setOutRectangle(tools::Rectangle const& rRectangle);
void resetOutRectangle();
void moveOutRectangle(sal_Int32 nXDelta, sal_Int32 nYDelta);
mutable tools::Rectangle m_aOutRect; // surrounding rectangle for
Paint (incl. LineWidth, ...)
-mutable boolm_bOutRectangleSet; // empty is a valid
rectangle, so we need a separate flag to know when the cached value is not yet
set
Point m_aAnchor; // anchor position (Writer)
SdrObjUserCall* m_pUserCall;
std::unique_ptr
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 898dae7d6228..c6d90fe2b106 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -357,7 +357,6 @@ void impRemoveIncarnatedSdrObjectToSdrModel(SdrObject&
rSdrObject, SdrModel& rSd
SdrObject::SdrObject(SdrModel& rSdrModel)
: mpFillGeometryDefiningShape(nullptr)
, mrSdrModelFromSdrObject(rSdrModel)
-, m_bOutRectangleSet(false)
, m_pUserCall(nullptr)
, mpImpl(new Impl)
, mpParentOfSdrObject(nullptr)
@@ -395,7 +394,6 @@ SdrObject::SdrObject(SdrModel& rSdrModel)
SdrObject::SdrObject(SdrModel& rSdrModel, SdrObject const & rSource)
: mpFillGeometryDefiningShape(nullptr)
, mrSdrModelFromSdrObject(rSdrModel)
-, m_bOutRectangleSet(false)
, m_pUserCall(nullptr)
, mpImpl(new Impl)
, mpParentOfSdrObject(nullptr)
@@ -978,12 +976,13 @@ void SdrObject::SetNavigationPosition (const sal_uInt32
nNewPosition)
// GetCurrentBoundRect().
const tools::Rectangle& SdrObject::GetCurrentBoundRect() const
{
-if (!isOutRectangleSet())
+auto const& rRectangle = getOutRectangle();
+if (rRectangle.IsEmpty())
{
const_cast< SdrObject* >(this)->RecalcBoundRect();
}
-return getOutRectangle();
+return rRectangle;
}
// To have a possibility to get the last calculated BoundRect e.g for producing
@@ -1013,27 +1012,22 @@ void SdrObject::RecalcBoundRect()
GetViewContact().getViewIndependentPrimitive2DContainer(xPrimitives);
if (xPrimitives.empty())
-{
-setOutRectangle(tools::Rectangle());
return;
-}
// use neutral ViewInformation and get the range of the primitives
const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
const basegfx::B2DRange
aRange(xPrimitives.getB2DRange(aViewInformation2D));
-if (aRange.isEmpty())
+if (!aRange.isEmpty())
{
-setOutRectangle(tools::Rectangle());
+tools::Rectangle aNewRectangle(
+tools::Long(floor(aRange.getMinX())),
+tools::Long(floor(aRange.getMinY())),
+tools::Long(ceil(aRange.getMaxX())),
+tools::Long(ceil(aRange.getMaxY(;
+setOutRectangle(aNewRectangle);
return;
}
-
-tools::Rectangle aNewRectangle(
-tools::Long(floor(aRange.getMinX())),
-tools::Long(floor(aRange.getMinY())),
-tools::Long(ceil(aRange.getMaxX())),
-tools::Long(ceil(aRange.getMaxY(;
-setOutRectangle(aNewRectangle);
}
void SdrObject::BroadcastObjectChange() const
@@ -3233,19 +3227,16 @@ const tools::Rectangle& SdrObject::getOutRectangle()
const
void SdrObject::setOutRectangleConst(tools::Rectangle const& rRectangle) const
{
m_aOutRect = rRectangle;
-m_bOutRectangleSet = true;
}
void SdrObject::setOutRectangle(tools::Rectangle const& rRectangle)
{
m_aOutRect = rRectangle;
-m_bOutRectangleSet = true;
}
void SdrObject::resetOutRectangle()
{
m_aOutRect = tools::Rectangle();
-m_bOutRectangleSet = false;
}
void SdrObject::moveOutRectangle(sal_Int32 nXDelta, sal_Int32 nYDelta)
core.git: include/svx svx/source
include/svx/relfld.hxx | 24 ++--
svx/source/dialog/relfld.cxx | 50 +--
2 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit 8b7d0c8a93a4da75dcbda6b1cb30d3a86bd8e8a2
Author: Miklos Vajna
AuthorDate: Mon Jan 5 08:37:09 2026 +0100
Commit: Miklos Vajna
CommitDate: Mon Jan 5 10:22:08 2026 +0100
svx: prefix members of SvxRelativeField
See tdf#94879 for motivation.
Change-Id: I5607196a2a0390d92963f8386bd44d61622fbc0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196529
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 389bce0cdb6e..21f1125e2795 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -31,14 +31,14 @@ class SVX_DLLPUBLIC SvxRelativeField
private:
std::unique_ptr m_xSpinButton;
-FieldUnit eAbsoluteFieldUnit = FieldUnit::NONE;
-FieldUnit eFontRelativeFieldUnit = FieldUnit::NONE;
-sal_uInt16 nRelMin;
-sal_uInt16 nRelMax;
-boolbRelativeMode;
-boolbRelative;
-boolbNegativeEnabled;
-bool bFontRelativeMode;
+FieldUnit m_eAbsoluteFieldUnit = FieldUnit::NONE;
+FieldUnit m_eFontRelativeFieldUnit = FieldUnit::NONE;
+sal_uInt16 m_nRelMin;
+sal_uInt16 m_nRelMax;
+boolm_bRelativeMode;
+boolm_bRelative;
+boolm_bNegativeEnabled;
+bool m_bFontRelativeMode;
DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void);
@@ -49,9 +49,9 @@ public:
void EnableFontRelativeMode();
voidSetRelative( bool bRelative );
void SetFontRelative(FieldUnit eNewRelativeUnit);
-boolIsRelative() const { return bRelative; }
-voidEnableNegativeMode() {bNegativeEnabled = true;}
-FieldUnit GetCurrentUnit() const { return eFontRelativeFieldUnit; }
+boolIsRelative() const { return m_bRelative; }
+voidEnableNegativeMode() {m_bNegativeEnabled = true;}
+FieldUnit GetCurrentUnit() const { return m_eFontRelativeFieldUnit; }
void set_sensitive(bool sensitive) {
m_xSpinButton->set_sensitive(sensitive); }
bool get_sensitive() const { return m_xSpinButton->get_sensitive(); }
@@ -73,7 +73,7 @@ public:
void SetFieldUnit(FieldUnit eUnit, bool bAll = false)
{
::SetFieldUnit(*m_xSpinButton, eUnit, bAll);
-eAbsoluteFieldUnit = m_xSpinButton->get_unit();
+m_eAbsoluteFieldUnit = m_xSpinButton->get_unit();
}
void SetMetricValue(sal_Int64 lCoreValue, MapUnit eUnit) {
::SetMetricValue(*m_xSpinButton, lCoreValue, eUnit); }
};
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 77da81b0c77b..f8ac1843621b 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -22,12 +22,12 @@
SvxRelativeField::SvxRelativeField(std::unique_ptr
pControl)
: m_xSpinButton(std::move(pControl))
-, nRelMin(0)
-, nRelMax(0)
-, bRelativeMode(false)
-, bRelative(false)
-, bNegativeEnabled(false)
-, bFontRelativeMode(false)
+, m_nRelMin(0)
+, m_nRelMax(0)
+, m_bRelativeMode(false)
+, m_bRelative(false)
+, m_bNegativeEnabled(false)
+, m_bFontRelativeMode(false)
{
weld::SpinButton& rSpinButton = m_xSpinButton->get_widget();
rSpinButton.connect_changed(LINK(this, SvxRelativeField, ModifyHdl));
@@ -35,12 +35,12 @@
SvxRelativeField::SvxRelativeField(std::unique_ptr pCont
IMPL_LINK_NOARG(SvxRelativeField, ModifyHdl, weld::Entry&, void)
{
-if (bRelativeMode)
+if (m_bRelativeMode)
{
OUString aStr = m_xSpinButton->get_text();
-bool bNewMode = bRelative;
+bool bNewMode = m_bRelative;
-if (bRelative)
+if (m_bRelative)
{
const sal_Unicode* pStr = aStr.getStr();
@@ -60,11 +60,11 @@ IMPL_LINK_NOARG(SvxRelativeField, ModifyHdl, weld::Entry&,
void)
bNewMode = true;
}
-if (bNewMode != bRelative)
+if (bNewMode != m_bRelative)
SetRelative(bNewMode);
}
-if (bFontRelativeMode)
+if (m_bFontRelativeMode)
{
OUString aStr = m_xSpinButton->get_text();
FieldUnit eNewFieldUnit = vcl::GetTextMetricUnit(aStr);
@@ -81,7 +81,7 @@ IMPL_LINK_NOARG(SvxRelativeField, ModifyHdl, weld::Entry&,
void)
break;
}
-if (eNewFieldUnit != eFontRelativeFieldUnit)
+if (eNewFieldUnit != m_eFontRelativeFieldUnit)
{
SetFontRelative(eNewFieldUnit);
}
@@ -90,13 +90,13 @@ IMPL_LINK_NOARG(SvxRelativeField, ModifyHdl, weld::Entry&,
void)
void SvxRelativeField::EnableRelativeMode(sal_uInt16 nMin, sal_uInt16 nMax)
{
-bRelativeMode = true;
-nRelMin = nMin;
-nRelMax = nMax;
+m_bRela
core.git: include/svx svx/source
include/svx/pageitem.hxx | 22
svx/source/items/pageitem.cxx | 56 +-
2 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit 6c6d0bae27999a1b44872ee2b2a2c93c315f8d34
Author: Miklos Vajna
AuthorDate: Fri Jan 2 08:34:33 2026 +0100
Commit: Miklos Vajna
CommitDate: Fri Jan 2 17:06:19 2026 +0100
svx: prefix members of SvxPageItem
See tdf#94879 for motivation.
Change-Id: I268131e6eabf686dece757d3457c0bb5e514ad31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196409
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index b7ec34cf70b3..801c24474445 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -50,10 +50,10 @@ portrait or landscape, layout)
class SVX_DLLPUBLIC SvxPageItem final : public SfxPoolItem
{
private:
-OUStringaDescName; // name of the template
-SvxNumType eNumType;
-boolbLandscape; // Portrait / Landscape
-SvxPageUsageeUse; // Layout
+OUStringm_aDescName; // name of the template
+SvxNumType m_eNumType;
+boolm_bLandscape; // Portrait / Landscape
+SvxPageUsagem_eUse; // Layout
public:
@@ -76,18 +76,18 @@ public:
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
// orientation
-SvxPageUsageGetPageUsage() const{ return eUse; }
-voidSetPageUsage(SvxPageUsage eU) { eUse= eU; }
+SvxPageUsageGetPageUsage() const{ return m_eUse;
}
+voidSetPageUsage(SvxPageUsage eU) { m_eUse= eU;
}
-boolIsLandscape() const { return bLandscape; }
-voidSetLandscape(bool bL) { bLandscape = bL; }
+boolIsLandscape() const { return m_bLandscape;
}
+voidSetLandscape(bool bL) { m_bLandscape = bL;
}
// enumeration
-SvxNumType GetNumType() const { return eNumType; }
-voidSetNumType(SvxNumType eNum) { eNumType = eNum; }
+SvxNumType GetNumType() const { return m_eNumType;
}
+voidSetNumType(SvxNumType eNum) { m_eNumType = eNum;
}
// name of the descriptor
-voidSetDescName(const OUString& rStr) { aDescName = rStr; }
+voidSetDescName(const OUString& rStr) { m_aDescName = rStr;
}
};
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index f3b322e248d4..27b83f6f7f2d 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -43,9 +43,9 @@ SfxPoolItem* SvxPageItem::CreateDefault() { return new
SvxPageItem(TypedWhichId<
SvxPageItem::SvxPageItem( const TypedWhichId nId )
: SfxPoolItem( nId ),
-eNumType( SVX_NUM_ARABIC ),
-bLandscape ( false ),
-eUse( SvxPageUsage::All )
+m_eNumType( SVX_NUM_ARABIC ),
+m_bLandscape ( false ),
+m_eUse( SvxPageUsage::All )
{
}
@@ -53,9 +53,9 @@ SvxPageItem::SvxPageItem( const TypedWhichId nId
)
SvxPageItem::SvxPageItem( const SvxPageItem& rItem )
: SfxPoolItem( rItem )
{
-eNumType= rItem.eNumType;
-bLandscape = rItem.bLandscape;
-eUse= rItem.eUse;
+m_eNumType= rItem.m_eNumType;
+m_bLandscape = rItem.m_bLandscape;
+m_eUse= rItem.m_eUse;
}
SvxPageItem::~SvxPageItem() {}
@@ -71,9 +71,9 @@ bool SvxPageItem::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
const SvxPageItem& rItem = static_cast(rAttr);
-return ( eNumType == rItem.eNumType &&
- bLandscape == rItem.bLandscape &&
- eUse == rItem.eUse );
+return ( m_eNumType == rItem.m_eNumType &&
+ m_bLandscape == rItem.m_bLandscape &&
+ m_eUse == rItem.m_eUse );
}
static OUString GetUsageText( const SvxPageUsage eU )
@@ -133,16 +133,16 @@ bool SvxPageItem::GetPresentation
{
case SfxItemPresentation::Nameless:
{
-if ( !aDescName.isEmpty() )
+if ( !m_aDescName.isEmpty() )
{
-rText = aDescName + cpDelimTmp;
+rText = m_aDescName + cpDelimTmp;
}
-rText += GetNumberingDescription(eNumType) + cpDelimTmp;
-if ( bLandscape )
+rText += GetNumberingDescription(m_eNumType) + cpDelimTmp;
+if ( m_bLandscape )
rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE);
else
rText += SvxResId(RID_SVXITEMS_PAGE_LAND_FALSE);
-
core.git: include/svx svx/source
include/svx/tbcontrl.hxx |1
svx/source/tbxctrls/tbcontrl.cxx | 75 +--
2 files changed, 34 insertions(+), 42 deletions(-)
New commits:
commit f4c7443b561eaa58be3eea5bd2598a7090ef386b
Author: Szymon Kłos
AuthorDate: Fri Dec 26 08:31:12 2025 +
Commit: Szymon Kłos
CommitDate: Mon Dec 29 09:41:49 2025 +0100
tdf#108239 sidebar: unify style list with notebookbar
- similar as in commit cee5c21e0c8c64c78e5d04ff4e300edfaac30404
Writer: iterate styles to show also favourite in the notebookbar
- make sidebar list similar
- use deterministic alogithm without number of default styles
depending on how much used styles are in the document
- do not sort entries to show in natural order
(we can try to introduce priority inside iterator)
- show all favourite, user defined and used styles
- helps to use defined template and follow style guidelines
as we see customstyles which are not yet used too
- both sidebar and notebookbar users see the same list
Change-Id: Iae81aeaf99a8f60f5ed14eb63960ee38f76bcaa1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196226
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196276
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 63811d9b6f73..e9dd731a83e2 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -186,6 +186,7 @@ private:
void Update();
void FillStyleBox();
+void AppendStyles(std::vector& rStyles, SfxStyleFamily eFamily,
SfxStyleSearchBits eBits);
void SelectStyle(const OUString& rStyleName);
friend class SfxStyleControllerItem_Impl;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5d2eba20a149..7f43648a3e25 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -153,7 +153,6 @@ public:
voidSetDefaultStyle( const OUString& rDefault ) {
sDefaultStyle = rDefault; }
-int get_count() const { return m_xWidget->get_count(); }
OUString get_text(int nIndex) const { return m_xWidget->get_text(nIndex); }
OUString get_active_text() const { return m_xWidget->get_active_text(); }
@@ -3239,67 +3238,45 @@ void SvxStyleToolBoxControl::FillStyleBox()
return;
const SfxStyleFamilyeFamily = GetActFamily();
-SfxStyleSheetBase* pStyle = nullptr;
-boolbDoFill = false;
-auto xIter = m_pStyleSheetPool->CreateIterator(eFamily,
SfxStyleSearchBits::Used);
-sal_uInt16 nCount = xIter->Count();
-
-// Check whether fill is necessary
-pStyle = xIter->First();
-//!!! TODO: This condition isn't right any longer, because we always show
some default entries
-//!!! so the list doesn't show the count
-if ( nCount != pBox->get_count() )
-{
-bDoFill = true;
-}
-else
-{
-sal_uInt16 i= 0;
-while ( pStyle && !bDoFill )
-{
-bDoFill = ( pBox->get_text(i) != pStyle->GetName() );
-pStyle = xIter->Next();
-i++;
-}
-}
-
-if ( !bDoFill )
-return;
+// TODO: Check whether fill is necessary
OUString aStrSel(pBox->get_active_text());
pBox->freeze();
pBox->clear();
-std::vector aStyles;
-
-// add used styles
-pStyle = xIter->Next();
-while ( pStyle )
-{
-aStyles.push_back(pStyle->GetName());
-pStyle = xIter->Next();
-}
+// Insert Clear button
if (m_pImpl->bSpecModeWriter || m_pImpl->bSpecModeCalc)
{
pBox->append_text(m_pImpl->aClearForm);
pBox->insert_separator(1, u"separator"_ustr);
+}
+
+// Add used, favourite and user defined
-// add default styles if less than 12 items
+std::vector aStyles;
+
+AppendStyles(aStyles, eFamily, SfxStyleSearchBits::Favourite);
+AppendStyles(aStyles, eFamily, SfxStyleSearchBits::UserDefined);
+AppendStyles(aStyles, eFamily, SfxStyleSearchBits::Used);
+
+// Add default styles on top first
+if (m_pImpl->bSpecModeWriter || m_pImpl->bSpecModeCalc)
+{
for( const auto &rStyle : m_pImpl->aDefaultStyles )
-{
-if ( aStyles.size() + pBox->get_count() > 12)
-break;
pBox->append_text(rStyle.second);
-}
}
-std::sort(aStyles.begin(), aStyles.end());
+// Insert styles
for (const auto& rStyle : aStyles)
+{
+// do not duplicate default styles
if (pBox->find_text(rStyle) == -1)
pBox->append_text(rStyle);
+}
+// Insert More button
if ((m_pImpl->bSpecModeWriter || m_pImpl->bSpecModeCalc) &&
!comphelper::LibreOfficeKit::isActive())
pBox->append_text(m_pImpl->aMore);
@@ -3308,6 +3285,20 @@ void SvxStyleToolBoxControl::FillStyleBox()
pBox->SetFamily( eFamily );
core.git: include/svx svx/source
include/svx/fntctrl.hxx |2
svx/source/dialog/fntctrl.cxx | 192 +-
2 files changed, 97 insertions(+), 97 deletions(-)
New commits:
commit 3607bea3ca4d91d1aa6e19e65d6bfaf71be18b11
Author: Miklos Vajna
AuthorDate: Mon Dec 15 08:29:38 2025 +0100
Commit: Miklos Vajna
CommitDate: Mon Dec 15 10:15:10 2025 +0100
svx: prefix members of SvxFontPrevWindow
See tdf#94879 for motivation.
Change-Id: I17b99b9ec074c664cbb51ae6b4be6d1c6926cf50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195625
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index 1751c3ac85bb..b6869648762c 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -31,7 +31,7 @@ class FontPrevWin_Impl;
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontPrevWindow final : public
weld::CustomWidgetController
{
private:
-std::unique_ptr pImpl;
+std::unique_ptr m_pImpl;
SVX_DLLPRIVATE static void ApplySettings(vcl::RenderContext&
rRenderContext);
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 443eeca3fb5d..260194504ee7 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -486,20 +486,20 @@ void SvxFontPrevWindow::SetDrawingArea(weld::DrawingArea*
pDrawingArea)
Size aPrefSize(getPreviewStripSize(pDrawingArea->get_ref_device()));
pDrawingArea->set_size_request(aPrefSize.Width(), aPrefSize.Height());
-pImpl.reset(new FontPrevWin_Impl);
+m_pImpl.reset(new FontPrevWin_Impl);
SfxViewShell* pSh = SfxViewShell::Current();
if (pSh)
-pImpl->mpPrinter = pSh->GetPrinter();
+m_pImpl->mpPrinter = pSh->GetPrinter();
-if (!pImpl->mpPrinter)
+if (!m_pImpl->mpPrinter)
{
-pImpl->mpPrinter = VclPtr::Create();
-pImpl->mbDelPrinter = true;
+m_pImpl->mpPrinter = VclPtr::Create();
+m_pImpl->mbDelPrinter = true;
}
-initFont(pImpl->maFont);
-initFont(pImpl->maCJKFont);
-initFont(pImpl->maCTLFont);
+initFont(m_pImpl->maFont);
+initFont(m_pImpl->maCJKFont);
+initFont(m_pImpl->maCTLFont);
Invalidate();
}
@@ -514,67 +514,67 @@ SvxFontPrevWindow::~SvxFontPrevWindow()
SvxFont& SvxFontPrevWindow::GetCTLFont()
{
-return pImpl->maCTLFont;
+return m_pImpl->maCTLFont;
}
SvxFont& SvxFontPrevWindow::GetCJKFont()
{
-return pImpl->maCJKFont;
+return m_pImpl->maCJKFont;
}
SvxFont& SvxFontPrevWindow::GetFont()
{
-pImpl->Invalidate100PercentFontWidth(); // because the user might
change the size
-return pImpl->maFont;
+m_pImpl->Invalidate100PercentFontWidth(); // because the user might
change the size
+return m_pImpl->maFont;
}
const SvxFont& SvxFontPrevWindow::GetFont() const
{
-return pImpl->maFont;
+return m_pImpl->maFont;
}
void SvxFontPrevWindow::SetPreviewText( const OUString& rString )
{
-pImpl->maText = rString;
-pImpl->mbTextInited = true;
+m_pImpl->maText = rString;
+m_pImpl->mbTextInited = true;
}
void SvxFontPrevWindow::SetFontNameAsPreviewText()
{
-pImpl->mbUseFontNameAsText = true;
+m_pImpl->mbUseFontNameAsText = true;
}
void SvxFontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont&
rCJKOutFont, const SvxFont& rCTLFont )
{
-setFont(rNormalOutFont, pImpl->maFont);
-setFont(rCJKOutFont, pImpl->maCJKFont);
-setFont(rCTLFont, pImpl->maCTLFont);
+setFont(rNormalOutFont, m_pImpl->maFont);
+setFont(rCJKOutFont, m_pImpl->maCJKFont);
+setFont(rCTLFont, m_pImpl->maCTLFont);
-pImpl->Invalidate100PercentFontWidth();
+m_pImpl->Invalidate100PercentFontWidth();
Invalidate();
}
void SvxFontPrevWindow::SetColor(const Color &rColor)
{
-pImpl->mxColor = rColor;
+m_pImpl->mxColor = rColor;
Invalidate();
}
void SvxFontPrevWindow::ResetColor()
{
-pImpl->mxColor.reset();
+m_pImpl->mxColor.reset();
Invalidate();
}
void SvxFontPrevWindow::SetTextLineColor(const Color &rColor)
{
-pImpl->mxTextLineColor = rColor;
+m_pImpl->mxTextLineColor = rColor;
Invalidate();
}
void SvxFontPrevWindow::SetOverlineColor(const Color &rColor)
{
-pImpl->mxOverlineColor = rColor;
+m_pImpl->mxOverlineColor = rColor;
Invalidate();
}
@@ -586,10 +586,10 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext&
rRenderContext, const tools::R
ApplySettings(rRenderContext);
rRenderContext.Erase();
-Printer* pPrinter = pImpl->mpPrinter;
-const SvxFont& rFont = pImpl->maFont;
-const SvxFont& rCJKFont = pImpl->maCJKFont;
-const SvxFont& rCTLFont = pImpl->maCTLFont;
+Printer* pPrinter = m_pImpl->mpPrinter;
+const SvxFont& rFont = m_pImpl->maFont;
+const SvxFont& rCJKFont = m_pImpl->maCJKFont;
+const SvxFont& rCTLFont
core.git: include/svx svx/source
include/svx/svdoedge.hxx |4 ++--
svx/source/svdraw/svdoedge.cxx | 22 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 9e7ec018ce46b0edf9dc32301e294620a9470245
Author: shlok3640
AuthorDate: Wed Dec 10 14:22:44 2025 +
Commit: Mike Kaganski
CommitDate: Thu Dec 11 08:36:04 2025 +0100
tdf#75280 Convert sal_uIntPtr to sal_uInt64 in SdrEdgeObj
Replaces sal_uIntPtr with sal_uInt64 in ImpCalcEdgeTrack and
related variables.
This ensures safety on 64-bit systems and avoids usage of
pointer-sized integers for arithmetic logic, consistent with
modern codebase standards.
Change-Id: I9120d4e15fc63ea75dc04ae67969b6108e0499f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194938
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 3b0cf917a100..f5c6361b6a48 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -182,7 +182,7 @@ private:
SAL_DLLPRIVATE XPolygon ImpCalcEdgeTrack(const XPolygon& rTrack0,
SdrObjConnection& rCon1, SdrObjConnection& rCon2, SdrEdgeInfoRec* pInfo) const;
SAL_DLLPRIVATE XPolygon ImpCalcEdgeTrack(const Point& rPt1, tools::Long
nAngle1, const tools::Rectangle& rBoundRect1, const tools::Rectangle&
rBewareRect1,
const Point& rPt2, tools::Long nAngle2, const tools::Rectangle&
rBoundRect2, const tools::Rectangle& rBewareRect2,
-sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const;
+sal_uInt64* pnQuality, SdrEdgeInfoRec* pInfo) const;
SAL_DLLPRIVATE static bool ImpFindConnector(const Point& rPt, const
SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis,
OutputDevice* pOut=nullptr, SdrDragStat* pDragStat = nullptr);
SAL_DLLPRIVATE static SdrEscapeDirection ImpCalcEscAngle(SdrObject const *
pObj, const Point& aPt2);
SAL_DLLPRIVATE void ImpSetTailPoint(bool bTail1, const Point& rPt);
@@ -319,7 +319,7 @@ public:
// true -> when determining the connector exit angle, angle for
// object rotation is taken as an offset.
//
- // sal_uIntPtr EdgeFlowDefDistdefault 0, min 0, max ?
+ // sal_uInt64 EdgeFlowDefDistdefault 0, min 0, max ?
// This is the default minimum distance on calculation of the
// connection Line to the docked objects is in logical units.
// This distance is overridden within the object, as soon as the
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index dc253e837952..84ca803ad8e3 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -815,7 +815,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon&
rTrack0, SdrObjConnection&
}
XPolygon aBestXP;
-sal_uIntPtr nBestQual=0x;
+sal_uInt64 nBestQual=0x;
SdrEdgeInfoRec aBestInfo;
bool bAuto1=bCon1 && rCon1.m_bBestVertex;
bool bAuto2=bCon2 && rCon2.m_bBestVertex;
@@ -852,7 +852,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon&
rTrack0, SdrObjConnection&
SdrEscapeDirection nE2 = nA2==0 ?
SdrEscapeDirection::RIGHT : nA2==9000 ? SdrEscapeDirection::TOP : nA2==18000 ?
SdrEscapeDirection::LEFT : nA2==27000 ? SdrEscapeDirection::BOTTOM :
SdrEscapeDirection::SMART;
if ((nEsc1&nE1) && (nEsc2&nE2))
{
-sal_uIntPtr nQual=0;
+sal_uInt64 nQual=0;
SdrEdgeInfoRec aInfo;
if (pInfo!=nullptr) aInfo=*pInfo;
XPolygon
aXP(ImpCalcEdgeTrack(aPt1,nA1,aBoundRect1,aBewareRect1,aPt2,nA2,aBoundRect2,aBewareRect2,&nQual,&aInfo));
@@ -877,7 +877,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon&
rTrack0, SdrObjConnection&
XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, tools::Long nAngle1,
const tools::Rectangle& rBoundRect1, const tools::Rectangle& rBewareRect1,
const Point& rPt2, tools::Long nAngle2, const tools::Rectangle&
rBoundRect2, const tools::Rectangle& rBewareRect2,
-sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const
+sal_uInt64* pnQuality, SdrEdgeInfoRec* pInfo) const
{
SdrEdgeKind eKind=GetObjectItem(SDRATTR_EDGEKIND).GetValue();
bool bRts1=nAngle1==0;
@@ -1363,8 +1363,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1,
tools::Long nAngle1, co
cForm = 0;
}
if (pnQuality!=nullptr) {
-sal_uIntPtr nQual=0;
-sal_uIntPtr nQual0=nQual; // prevent overruns
+sal_uInt64 nQual=0;
+sal_uInt64 nQual0=nQual; // prevent overruns
bool bOverflow = false;
Point aPt0(aXP1[0]);
for (sal_uInt16 nPntNum=1; nPntNum=n2) nBesser=6;
@@ -1393,7 +1393,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1,
tools::Long nAngle1, co
}
if (nTmp>=3) {
nQual0=nQual;
-nQual+=stati
core.git: include/svx svx/source
include/svx/fontwork.hxx | 14 +++
svx/source/dialog/fontwork.cxx | 72 -
2 files changed, 43 insertions(+), 43 deletions(-)
New commits:
commit cdd58b8ccb7160a97d96f2f9c841a9825b16020a
Author: Miklos Vajna
AuthorDate: Mon Dec 8 08:16:52 2025 +0100
Commit: Miklos Vajna
CommitDate: Mon Dec 8 09:46:27 2025 +0100
svx: prefix members of SvxFontWorkDialog
See tdf#94879 for motivation.
Change-Id: Iba29aef042f32c3d382a94dcd90d13579434271c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195212
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 64e03bbbdb2c..8a836a34fb96 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -73,19 +73,19 @@ class SAL_WARN_UNUSED SvxFontWorkDialog final : public
SfxDockingWindow
{
#define CONTROLLER_COUNT 11
-SfxBindings&rBindings;
-IdleaInputIdle;
+SfxBindings&m_rBindings;
+Idlem_aInputIdle;
OUString m_sLastStyleTbxId;
OUString m_sLastAdjustTbxId;
OUString m_sLastShadowTbxId;
-tools::LongnSaveShadowX;
-tools::LongnSaveShadowY;
-tools::LongnSaveShadowAngle;
-tools::LongnSaveShadowSize;
+tools::Longm_nSaveShadowX;
+tools::Longm_nSaveShadowY;
+tools::Longm_nSaveShadowAngle;
+tools::Longm_nSaveShadowSize;
-SvxFontWorkControllerItem* pCtrlItems[CONTROLLER_COUNT];
+SvxFontWorkControllerItem* m_pCtrlItems[CONTROLLER_COUNT];
std::unique_ptr m_xTbxStyle;
std::unique_ptr m_xTbxAdjust;
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 953d5fea874b..404c80808c60 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -178,12 +178,12 @@ SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings
*pBindinx,
SfxChildWindow *pCW,
vcl::Window* _pParent)
: SfxDockingWindow(pBindinx, pCW, _pParent, u"DockingFontwork"_ustr,
u"svx/ui/dockingfontwork.ui"_ustr)
-, rBindings(*pBindinx)
-, aInputIdle("SvxFontWorkDialog Input")
-, nSaveShadowX(0)
-, nSaveShadowY(0)
-, nSaveShadowAngle(450)
-, nSaveShadowSize (100)
+, m_rBindings(*pBindinx)
+, m_aInputIdle("SvxFontWorkDialog Input")
+, m_nSaveShadowX(0)
+, m_nSaveShadowY(0)
+, m_nSaveShadowAngle(450)
+, m_nSaveShadowSize (100)
, m_xTbxStyle(m_xBuilder->weld_toolbar(u"style"_ustr))
, m_xTbxAdjust(m_xBuilder->weld_toolbar(u"adjust"_ustr))
, m_xMtrFldDistance(m_xBuilder->weld_metric_spin_button(u"distance"_ustr,
FieldUnit::CM))
@@ -199,17 +199,17 @@ SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings
*pBindinx,
ApplyImageList();
-pCtrlItems[0] = new SvxFontWorkControllerItem(SID_FORMTEXT_STYLE, *this,
rBindings);
-pCtrlItems[1] = new SvxFontWorkControllerItem(SID_FORMTEXT_ADJUST, *this,
rBindings);
-pCtrlItems[2] = new SvxFontWorkControllerItem(SID_FORMTEXT_DISTANCE,
*this, rBindings);
-pCtrlItems[3] = new SvxFontWorkControllerItem(SID_FORMTEXT_START, *this,
rBindings);
-pCtrlItems[4] = new SvxFontWorkControllerItem(SID_FORMTEXT_MIRROR, *this,
rBindings);
-pCtrlItems[5] = new SvxFontWorkControllerItem(SID_FORMTEXT_HIDEFORM,
*this, rBindings);
-pCtrlItems[6] = new SvxFontWorkControllerItem(SID_FORMTEXT_OUTLINE, *this,
rBindings);
-pCtrlItems[7] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHADOW, *this,
rBindings);
-pCtrlItems[8] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWCOLOR,
*this, rBindings);
-pCtrlItems[9] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWXVAL,
*this, rBindings);
-pCtrlItems[10] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWYVAL,
*this, rBindings);
+m_pCtrlItems[0] = new SvxFontWorkControllerItem(SID_FORMTEXT_STYLE, *this,
m_rBindings);
+m_pCtrlItems[1] = new SvxFontWorkControllerItem(SID_FORMTEXT_ADJUST,
*this, m_rBindings);
+m_pCtrlItems[2] = new SvxFontWorkControllerItem(SID_FORMTEXT_DISTANCE,
*this, m_rBindings);
+m_pCtrlItems[3] = new SvxFontWorkControllerItem(SID_FORMTEXT_START, *this,
m_rBindings);
+m_pCtrlItems[4] = new SvxFontWorkControllerItem(SID_FORMTEXT_MIRROR,
*this, m_rBindings);
+m_pCtrlItems[5] = new SvxFontWorkControllerItem(SID_FORMTEXT_HIDEFORM,
*this, m_rBindings);
+m_pCtrlItems[6] = new SvxFontWorkControllerItem(SID_FORMTEXT_OUTLINE,
*this, m_rBindings);
+m_pCtrlItems[7] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHADOW,
*this, m_rBindings);
+m_pCtrlItems[8] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWCOLOR,
*this, m_rBindings);
+m_pCtrlItems[9] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWXVAL,
*this, m_rBindings);
+m_pCtrlItems[10] = new SvxFontWorkControllerIte
core.git: include/svx svx/source
include/svx/xcolit.hxx | 25 --
include/svx/xflclit.hxx | 31 +++---
include/svx/xit.hxx | 52 +
svx/source/xoutdev/xattr.cxx | 59 ++-
4 files changed, 87 insertions(+), 80 deletions(-)
New commits:
commit 68ecab2225bd3ca098a0b26819e2b85d05fa0ed2
Author: Tomaž Vajngerl
AuthorDate: Sat Dec 6 23:00:57 2025 +0900
Commit: Tomaž Vajngerl
CommitDate: Mon Dec 8 04:15:38 2025 +0100
svx: clean-up NameOrIndex and XColorItem and XFillColorItem
Change-Id: I40ef3e6826857f465a7e0c1643536b99cc32e778
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195168
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx
index 7336d0bc62a2..5cd3c6cbd993 100644
--- a/include/svx/xcolit.hxx
+++ b/include/svx/xcolit.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_XCOLIT_HXX
-#define INCLUDED_SVX_XCOLIT_HXX
+#pragma once
#include
#include
@@ -32,21 +31,21 @@ class SVXCORE_DLLPUBLIC XColorItem : public NameOrIndex
model::ComplexColor maComplexColor;
public:
-static SfxPoolItem* CreateDefault();
-DECLARE_ITEM_TYPE_FUNCTION(XColorItem)
-XColorItem() : NameOrIndex() {}
-XColorItem(TypedWhichId nWhich, sal_Int32 nIndex,
const Color& rTheColor);
-XColorItem(TypedWhichId nWhich, const Color&
rTheColor);
-XColorItem(TypedWhichId nWhich, const OUString& rName,
const Color& rTheColor);
-XColorItem(const XColorItem& rItem);
+static SfxPoolItem* CreateDefault();
+DECLARE_ITEM_TYPE_FUNCTION(XColorItem)
+XColorItem();
+XColorItem(TypedWhichId nWhich, sal_Int32 nIndex, const Color&
rTheColor);
+XColorItem(TypedWhichId nWhich, const Color& rTheColor);
+XColorItem(TypedWhichId nWhich, const OUString& rName, const
Color& rTheColor);
+XColorItem(const XColorItem& rItem);
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 )
const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
override;
-virtual booloperator==(const SfxPoolItem& rItem) const
override;
+virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual XColorItem* Clone(SfxItemPool* pPool = nullptr) const override;
-const Color&GetColorValue() const;
-voidSetColorValue(const Color& rNew) { m_aColor = rNew;
Detach(); }
+Color const& GetColorValue() const;
+void SetColorValue(const Color& rNew);
void setComplexColor(model::ComplexColor const& rComplexColor) {
maComplexColor = rComplexColor; }
const model::ComplexColor& getComplexColor() const { return
maComplexColor; }
@@ -55,6 +54,4 @@ public:
virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx
index ea2908e6ee71..706a73b5ae46 100644
--- a/include/svx/xflclit.hxx
+++ b/include/svx/xflclit.hxx
@@ -17,41 +17,30 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_XFLCLIT_HXX
-#define INCLUDED_SVX_XFLCLIT_HXX
+#pragma once
#include
#include
-//
-// Fuellattribute
-//
-
-
-
class SVXCORE_DLLPUBLIC XFillColorItem final : public XColorItem
{
public:
-static SfxPoolItem* CreateDefault();
-DECLARE_ITEM_TYPE_FUNCTION(XFillColorItem)
-XFillColorItem() : XColorItem() {}
-XFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
-XFillColorItem(const OUString& rName, const Color& rTheColor);
+static SfxPoolItem* CreateDefault();
+DECLARE_ITEM_TYPE_FUNCTION(XFillColorItem)
+XFillColorItem();
+XFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
+XFillColorItem(const OUString& rName, const Color& rTheColor);
virtual XFillColorItem* Clone(SfxItemPool* pPool = nullptr) const override;
-virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
-virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
+virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 )
const override;
+virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
override;
-virtual bool GetPresentation( SfxItemPresentation ePres,
- MapUnit eCoreMetric,
- MapUnit ePresMetric,
- OUString &rText, const IntlWrapper& ) const
override;
+
core.git: include/svx svx/source
include/svx/xfltrit.hxx | 28 +++---
svx/source/xoutdev/xattr2.cxx | 65 +-
2 files changed, 88 insertions(+), 5 deletions(-)
New commits:
commit 953219b81126f5c092bf5375c0abe2a7afce40d2
Author: Noel Grandin
AuthorDate: Wed Dec 3 21:34:19 2025 +0200
Commit: Noel Grandin
CommitDate: Thu Dec 4 17:44:53 2025 +0100
make XFillTransparenceItem extend SfxPoolItem
so that we can assert when its value is out of range
Change-Id: Icfca58777af4f03bc996630e0702d5ce4196e1fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194964
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx
index 1f2a9b08052b..68c5b81dc9ac 100644
--- a/include/svx/xfltrit.hxx
+++ b/include/svx/xfltrit.hxx
@@ -20,8 +20,9 @@
#ifndef INCLUDED_SVX_XFLTRIT_HXX
#define INCLUDED_SVX_XFLTRIT_HXX
-#include
+#include
#include
+#include
/*
|*
@@ -29,17 +30,36 @@
|*
\/
-class SVXCORE_DLLPUBLIC XFillTransparenceItem final : public SfxUInt16Item
+class SVXCORE_DLLPUBLIC XFillTransparenceItem final : public SfxPoolItem
{
+sal_uInt16 m_nValue;
public:
-DECLARE_ITEM_TYPE_FUNCTION(XFillTransparenceItem)
-XFillTransparenceItem(sal_uInt16 nFillTransparence
= 0);
+//static SfxPoolItem* CreateDefault();
+
+DECLARE_ITEM_TYPE_FUNCTION(XFillTransparenceItem)
+XFillTransparenceItem(sal_uInt16 nFillTransparence = 0);
virtual XFillTransparenceItem* Clone(SfxItemPool* pPool = nullptr) const
override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const
override;
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
+virtual boost::property_tree::ptree dumpAsJSON() const override;
+
+sal_uInt16 GetValue() const { return m_nValue; }
+void SetValue(sal_uInt16 nTheValue) { ASSERT_CHANGE_REFCOUNTED_ITEM;
assert(nTheValue <= 100); m_nValue = nTheValue; }
+
+virtual bool operator ==(const SfxPoolItem & rItem) const override;
+
+virtual bool supportsHashCode() const override final;
+virtual size_t hashCode() const override final;
+
+virtual bool QueryValue(css::uno::Any& rVal,
+sal_uInt8 nMemberId = 0) const override;
+
+virtual bool PutValue(const css::uno::Any& rVal,
+ sal_uInt8 nMemberId) override;
+
};
#endif
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 47bc2ecc9587..1131408e4bf5 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -22,7 +22,9 @@
#include
#include
+#include
#include
+#include
#include
#include
#include
@@ -49,6 +51,7 @@
#include
#include
+#include
XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) :
SfxUInt16Item(XATTR_LINETRANSPARENCE, nLineTransparence)
@@ -317,8 +320,9 @@ css::drawing::LineCap XLineCapItem::GetValue() const
}
XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) :
-SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence)
+SfxPoolItem(XATTR_FILLTRANSPARENCE), m_nValue(nFillTransparence)
{
+assert(m_nValue <= 100);
}
XFillTransparenceItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/)
const
@@ -358,6 +362,65 @@ void XFillTransparenceItem::dumpAsXml(xmlTextWriterPtr
pWriter) const
(void)xmlTextWriterEndElement(pWriter);
}
+boost::property_tree::ptree XFillTransparenceItem::dumpAsJSON() const
+{
+boost::property_tree::ptree aTree = SfxPoolItem::dumpAsJSON();
+aTree.put("state", GetValue());
+return aTree;
+}
+
+// virtual
+bool XFillTransparenceItem::operator ==(const SfxPoolItem & rItem) const
+{
+assert(SfxPoolItem::operator==(rItem));
+return m_nValue == static_cast(&rItem)->m_nValue;
+}
+
+// virtual
+bool XFillTransparenceItem::supportsHashCode() const
+{
+return true;
+}
+
+// virtual
+bool XFillTransparenceItem::QueryValue(css::uno::Any& rVal, sal_uInt8) const
+{
+rVal <<= m_nValue;
+return true;
+}
+
+// virtual
+bool XFillTransparenceItem::PutValue(const css::uno::Any& rVal, sal_uInt8)
+{
+if (rVal >>= m_nValue)
+{
+assert(m_nValue <= 100);
+return true;
+}
+// Legacy: for a long time, XFillTransparenceItem::PutValue accepted
sal_Int32; play safe and accept
+// if someone passes that
+if (sal_Int32 nValue; rVal >>= nValue)
+{
+SAL_WARN("svl.items", "Passing sal_uInt16 in sal_Int32!");
+SAL_WARN_IF(nValue < 0 || nValue > SAL_MAX_UINT16, "svl.items",
+"Ove
core.git: include/svx svx/source
include/svx/sdr/contact/viewobjectcontact.hxx |2 -
svx/source/sdr/contact/viewobjectcontact.cxx | 26 +++--
svx/source/svdraw/sdrhittesthelper.cxx| 27 ++
3 files changed, 19 insertions(+), 36 deletions(-)
New commits:
commit 8a7b5d8b3af8eab09209ce1748ddc5b5c2feee91
Author: Noel Grandin
AuthorDate: Mon Dec 1 11:14:22 2025 +0200
Commit: Noel Grandin
CommitDate: Mon Dec 1 13:42:59 2025 +0100
tdf#169414 Ghost object remains in original position after object is moved
revert
commit 1c8b8d1fb80e6445aaeca2f2df6816d223277dbc
Author: Noel Grandin
Date: Fri Nov 7 16:38:40 2025 +0200
tdf#168928 Draw object not removed from the view after delete
and
commit e6a8c40e5051363d5825bd09131b86cf8a2b659b
Author: Noel Grandin
Date: Tue Sep 30 14:54:37 2025 +0200
tdf#116975 Laggy behavior when clicking between table cells in impress
No idea why this is going wrong, there must be some implicit thing kicking
in that I removed.
Change-Id: I5da81be9d6a8305163a70a4639ff0229acfb2329
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194864
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx
b/include/svx/sdr/contact/viewobjectcontact.hxx
index 26154d80f63f..fa54bd470580 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -65,7 +65,6 @@ private:
// This bool gets set when the object gets invalidated by ActionChanged()
and
// can be used from the OC to late-invalidates
boolmbLazyInvalidate : 1;
-mutable boolmbInvalidateViewOnDestruct
: 1;
protected:
// make redirector a protected friend, it needs to call createPrimitives
as default action
@@ -98,7 +97,6 @@ public:
// get the object size range
const basegfx::B2DRange& getObjectRange() const;
-bool hasCachedObjectRange() const { return !maObjectRange.isEmpty(); }
// React on changes of the object of this ViewContact
virtual void ActionChanged();
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx
b/svx/source/sdr/contact/viewobjectcontact.cxx
index 94df04ff4758..122813c33420 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -155,8 +155,7 @@ ViewObjectContact::ViewObjectContact(ObjectContact&
rObjectContact, ViewContact&
: mrObjectContact(rObjectContact),
mrViewContact(rViewContact),
mnActionChangedCount(0),
-mbLazyInvalidate(false),
-mbInvalidateViewOnDestruct(false)
+mbLazyInvalidate(false)
{
// make the ViewContact remember me
mrViewContact.AddViewObjectContact(*this);
@@ -167,21 +166,11 @@ ViewObjectContact::ViewObjectContact(ObjectContact&
rObjectContact, ViewContact&
ViewObjectContact::~ViewObjectContact()
{
-if (mbInvalidateViewOnDestruct)
+// if the object range is empty, then we have never had the primitive
range change, so nothing to invalidate
+if (!maObjectRange.isEmpty())
{
-// used cached object range to limit invalidation
-if (!maObjectRange.isEmpty())
-{
-// invalidate in view
-GetObjectContact().InvalidatePartOfView(maObjectRange);
-}
-else
-{
-// we do not currently have cached range information, so just
invalidate the whole viewport
-const drawinglayer::geometry::ViewInformation2D& rViewInfo2D =
GetObjectContact().getViewInformation2D();
-if (!rViewInfo2D.getViewport().isEmpty())
-
GetObjectContact().InvalidatePartOfView(rViewInfo2D.getViewport());
-}
+// invalidate in view
+GetObjectContact().InvalidatePartOfView(maObjectRange);
}
// delete PrimitiveAnimation
@@ -532,8 +521,9 @@ drawinglayer::primitive2d::Primitive2DContainer const &
ViewObjectContact::getPr
// check for animated stuff
const_cast< ViewObjectContact*
>(this)->checkForPrimitive2DAnimations();
-const_cast< ViewObjectContact* >(this)->maObjectRange.reset();
-mbInvalidateViewOnDestruct = true;
+// always update object range when PrimitiveSequence changes
+const drawinglayer::geometry::ViewInformation2D&
rViewInformation2D(GetObjectContact().getViewInformation2D());
+const_cast< ViewObjectContact* >(this)->maObjectRange =
mxPrimitive2DSequence.getB2DRange(rViewInformation2D);
}
// return current Primitive2DContainer
diff --git a/svx/source/svdraw/sdrhittesthelper.cxx
b/svx/source/svdraw/sdrhittesthelper.cxx
index 2262172465d0..72e41dbc2dc8 100644
--- a/svx/source/svdraw/sdrhittesthelper.cxx
+++ b/svx/source/svdraw/sdrhittesthelper.cxx
@@ -120,26 +120,21 @@ bool ViewObjectContactPrimitiveHit(
bool bTex
core.git: include/svx svx/source
include/svx/fontwork.hxx |2 +-
svx/source/dialog/fontwork.cxx | 24
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 02c57b6a1191337eee24d265e26fec55f48f8df6
Author: Miklos Vajna
AuthorDate: Mon Dec 1 08:00:23 2025 +0100
Commit: Miklos Vajna
CommitDate: Mon Dec 1 10:17:55 2025 +0100
svx: prefix members of SvxFontWorkControllerItem
See tdf#94879 for motivation.
Change-Id: Ia36ec1aedb6eccb66b31fe2b09a0df5dc3010c97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194849
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index c726382756e6..64e03bbbdb2c 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -47,7 +47,7 @@ class SvxFontWorkDialog;
class SvxFontWorkControllerItem final : public SfxControllerItem
{
-SvxFontWorkDialog &rFontWorkDlg;
+SvxFontWorkDialog &m_rFontWorkDlg;
virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState
eState,
const SfxPoolItem* pState) override;
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 6bb3eb6a6e58..953d5fea874b 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -54,7 +54,7 @@ SvxFontWorkControllerItem::SvxFontWorkControllerItem
SfxControllerItem( _nId, rBindings ),
-rFontWorkDlg( rDlg )
+m_rFontWorkDlg( rDlg )
{
}
@@ -70,7 +70,7 @@ void SvxFontWorkControllerItem::StateChangedAtToolBoxControl(
sal_uInt16 /*nSID*
const XFormTextStyleItem* pStateItem =
dynamic_cast( pItem
);
DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextStyleItem
expected");
-rFontWorkDlg.SetStyle_Impl(pStateItem);
+m_rFontWorkDlg.SetStyle_Impl(pStateItem);
break;
}
case SID_FORMTEXT_ADJUST:
@@ -78,7 +78,7 @@ void SvxFontWorkControllerItem::StateChangedAtToolBoxControl(
sal_uInt16 /*nSID*
const XFormTextAdjustItem* pStateItem =
dynamic_cast(
pItem );
DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextAdjustItem
expected");
-rFontWorkDlg.SetAdjust_Impl(pStateItem);
+m_rFontWorkDlg.SetAdjust_Impl(pStateItem);
break;
}
case SID_FORMTEXT_DISTANCE:
@@ -86,7 +86,7 @@ void SvxFontWorkControllerItem::StateChangedAtToolBoxControl(
sal_uInt16 /*nSID*
const XFormTextDistanceItem* pStateItem =
dynamic_cast(
pItem );
DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextDistanceItem
expected");
-rFontWorkDlg.SetDistance_Impl(pStateItem);
+m_rFontWorkDlg.SetDistance_Impl(pStateItem);
break;
}
case SID_FORMTEXT_START:
@@ -94,7 +94,7 @@ void SvxFontWorkControllerItem::StateChangedAtToolBoxControl(
sal_uInt16 /*nSID*
const XFormTextStartItem* pStateItem =
dynamic_cast( pItem
);
DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextStartItem
expected");
-rFontWorkDlg.SetStart_Impl(pStateItem);
+m_rFontWorkDlg.SetStart_Impl(pStateItem);
break;
}
case SID_FORMTEXT_MIRROR:
@@ -102,7 +102,7 @@ void
SvxFontWorkControllerItem::StateChangedAtToolBoxControl( sal_uInt16 /*nSID*
const XFormTextMirrorItem* pStateItem =
dynamic_cast(
pItem );
DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextMirrorItem
expected");
-rFontWorkDlg.SetMirror_Impl(pStateItem);
+m_rFontWorkDlg.SetMirror_Impl(pStateItem);
break;
}
case SID_FORMTEXT_HIDEFORM:
@@ -110,7 +110,7 @@ void
SvxFontWorkControllerItem::StateChangedAtToolBoxControl( sal_uInt16 /*nSID*
const XFormTextHideFormItem* pStateItem =
dynamic_cast(
pItem );
DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextHideFormItem
expected");
-rFontWorkDlg.SetShowForm_Impl(pStateItem);
+m_rFontWorkDlg.SetShowForm_Impl(pStateItem);
break;
}
case SID_FORMTEXT_OUTLINE:
@@ -118,7 +118,7 @@ void
SvxFontWorkControllerItem::StateChangedAtToolBoxControl( sal_uInt16 /*nSID*
const XFormTextOutlineItem* pStateItem =
dynamic_cast(
pItem );
DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextOutlineItem
expected");
-rFontWorkDlg.SetOutline_Impl(pStateItem);
+m_rFontWorkDlg.SetOutline_Impl(pStateItem);
break;
}
case SID_FORMTEXT_SHADOW:
@@ -126,7 +126,7 @@ void
SvxFontWorkControllerItem::StateChangedAtToolBoxControl( sal_uInt16 /*nSID*
const XFormT
core.git: include/svx svx/source
include/svx/sdr/animation/animationstate.hxx |2 +
svx/source/sdr/animation/animationstate.cxx |6 +++
svx/source/sdr/contact/viewobjectcontact.cxx | 49 +--
3 files changed, 40 insertions(+), 17 deletions(-)
New commits:
commit 12baba92e0a581866c6dedea428e888dd0934d78
Author: Noel Grandin
AuthorDate: Tue Nov 25 08:19:54 2025 +0200
Commit: Noel Grandin
CommitDate: Tue Nov 25 11:52:46 2025 +0100
tdf#169656 Crash upon starting animated GIF
this is caused by freeing an object that is currently on the callstack.
I dont have a complete fix here, this will fix it 99% of the time.
regression from
commit e6a8c40e5051363d5825bd09131b86cf8a2b659b
Author: Noel Grandin
Date: Tue Sep 30 14:54:37 2025 +0200
tdf#116975 Laggy behavior when clicking between table cells in impress
but only because it made it more obvious, this has been a lurking problem.
Change-Id: I4f2f56a54a74f2a51e7ca05421d3db82de47f2ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194502
Tested-by: Noel Grandin
Tested-by: Jenkins
Code-Style: Noel Grandin
Reviewed-by: Noel Grandin
diff --git a/include/svx/sdr/animation/animationstate.hxx
b/include/svx/sdr/animation/animationstate.hxx
index a2e079725df3..ad41a592666b 100644
--- a/include/svx/sdr/animation/animationstate.hxx
+++ b/include/svx/sdr/animation/animationstate.hxx
@@ -47,6 +47,8 @@ namespace sdr::animation
// destructor
virtual ~PrimitiveAnimation() override;
+void
SetPrimitives(drawinglayer::primitive2d::Primitive2DContainer&&);
+
// execute event, from base class Event
virtual void Trigger(sal_uInt32 nTime) override;
};
diff --git a/svx/source/sdr/animation/animationstate.cxx
b/svx/source/sdr/animation/animationstate.cxx
index 375bccaf0975..9690e25591dc 100644
--- a/svx/source/sdr/animation/animationstate.cxx
+++ b/svx/source/sdr/animation/animationstate.cxx
@@ -122,6 +122,12 @@ namespace sdr::animation
prepareNextEvent();
}
+void
PrimitiveAnimation::SetPrimitives(drawinglayer::primitive2d::Primitive2DContainer&&
rAnimatedPrimitives)
+{
+// called from ViewObjectContact::checkForPrimitive2DAnimations
+maAnimatedPrimitives = std::move(rAnimatedPrimitives);
+}
+
} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx
b/svx/source/sdr/contact/viewobjectcontact.cxx
index beb2163d4f0f..b1bef068102f 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -287,30 +287,45 @@ void ViewObjectContact::ActionChildInserted(ViewContact&
rChild)
// GetObjectContact().InvalidatePartOfView(rChildVOC.getObjectRange());
}
+// Check for animated primitives.
void ViewObjectContact::checkForPrimitive2DAnimations()
{
-// remove old one
-mpPrimitiveAnimation.reset();
-
-// check for animated primitives
-if(mxPrimitive2DSequence.empty())
-return;
-
-const bool
bTextAnimationAllowed(GetObjectContact().IsTextAnimationAllowed());
-const bool
bGraphicAnimationAllowed(GetObjectContact().IsGraphicAnimationAllowed());
-
-if(bTextAnimationAllowed || bGraphicAnimationAllowed)
+// Somewhat odd structure here, because we are trying to avoid deleting
and re-allocating the mpPrimitiveAnimation
+// object, because we might be inside a call from the Scheduler, in which
case we will be deleting an object
+// on the call stack.
+// Yes, this does still leave a possible situation where the user could
turn animations off while we are
+// animating and we could crash. I dont have a better solution right now.
+//
+drawinglayer::primitive2d::Primitive2DContainer aNewAnimatedPrimitives;
+if(!mxPrimitive2DSequence.empty())
{
-AnimatedExtractingProcessor2D
aAnimatedExtractor(GetObjectContact().getViewInformation2D(),
-bTextAnimationAllowed, bGraphicAnimationAllowed);
-aAnimatedExtractor.process(mxPrimitive2DSequence);
+const bool
bTextAnimationAllowed(GetObjectContact().IsTextAnimationAllowed());
+const bool
bGraphicAnimationAllowed(GetObjectContact().IsGraphicAnimationAllowed());
-if(!aAnimatedExtractor.getPrimitive2DSequence().empty())
+if(bTextAnimationAllowed || bGraphicAnimationAllowed)
{
-// derived primitiveList is animated, setup new PrimitiveAnimation
-mpPrimitiveAnimation.reset( new
sdr::animation::PrimitiveAnimation(*this,
aAnimatedExtractor.extractPrimitive2DSequence()) );
+AnimatedExtractingProcessor2D
aAnimatedExtractor(GetObjectContact().getViewInformation2D(),
+bTextAnimationAllowed, bGraphicAnimationAllowed);
+aAnimatedExtractor.process(mxPrimitive2DSequence);
+
+
core.git: include/svx svx/source
include/svx/ctredlin.hxx | 38 +--
svx/source/dialog/ctredlin.cxx | 56 -
2 files changed, 47 insertions(+), 47 deletions(-)
New commits:
commit 9464a07502992acc0aeddcd02f04a0286d3da69c
Author: Miklos Vajna
AuthorDate: Mon Nov 24 09:17:47 2025 +0100
Commit: Miklos Vajna
CommitDate: Mon Nov 24 10:32:43 2025 +0100
svx: prefix members of SvxTPView
See tdf#94879 for motivation.
Change-Id: I1fe7570e1ac6a8b729d8d6374cfec0775d215684
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194411
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 486cf30fcd62..b6b863fde841 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -259,22 +259,22 @@ public:
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxTPView final : public SvxTPage
{
private:
-Link AcceptClickLk;
-Link AcceptAllClickLk;
-Link RejectClickLk;
-Link RejectAllClickLk;
-Link UndoClickLk;
+Link m_AcceptClickLk;
+Link m_AcceptAllClickLk;
+Link m_RejectClickLk;
+Link m_RejectAllClickLk;
+Link m_UndoClickLk;
-Link SortByComboBoxChangedLk;
+Link m_SortByComboBoxChangedLk;
-bool bEnableAccept;
-bool bEnableAcceptAll;
-bool bEnableReject;
-bool bEnableRejectAll;
-bool bEnableUndo;
+bool m_bEnableAccept;
+bool m_bEnableAcceptAll;
+bool m_bEnableReject;
+bool m_bEnableRejectAll;
+bool m_bEnableUndo;
-bool bEnableClearFormat;
-bool bEnableClearFormatAll;
+bool m_bEnableClearFormat;
+bool m_bEnableClearFormatAll;
std::unique_ptr m_xAccept;
std::unique_ptr m_xReject;
@@ -305,19 +305,19 @@ public:
voidDisableUndo() {EnableUndo(false);}
voidShowUndo();
-voidSetAcceptClickHdl( const Link& rLink ) {
AcceptClickLk = rLink; }
+voidSetAcceptClickHdl( const Link& rLink ) {
m_AcceptClickLk = rLink; }
-voidSetAcceptAllClickHdl( const Link& rLink )
{ AcceptAllClickLk = rLink; }
+voidSetAcceptAllClickHdl( const Link& rLink )
{ m_AcceptAllClickLk = rLink; }
-voidSetRejectClickHdl( const Link& rLink ) {
RejectClickLk = rLink; }
+voidSetRejectClickHdl( const Link& rLink ) {
m_RejectClickLk = rLink; }
-voidSetRejectAllClickHdl( const Link& rLink )
{ RejectAllClickLk = rLink; }
+voidSetRejectAllClickHdl( const Link& rLink )
{ m_RejectAllClickLk = rLink; }
-voidSetUndoClickHdl( const Link& rLink ) {
UndoClickLk = rLink; }
+voidSetUndoClickHdl( const Link& rLink ) {
m_UndoClickLk = rLink; }
void SetSortByComboBoxChangedHdl(const Link& rLink)
{
-SortByComboBoxChangedLk = rLink;
+m_SortByComboBoxChangedLk = rLink;
}
virtual voidActivatePage() override;
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 5ea339f67711..0c884b749846 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -299,13 +299,13 @@ void SvxTPage::ActivatePage()
SvxTPView::SvxTPView(weld::Container* pParent)
: SvxTPage(pParent, u"svx/ui/redlineviewpage.ui"_ustr,
u"RedlineViewPage"_ustr)
-, bEnableAccept(true)
-, bEnableAcceptAll(true)
-, bEnableReject(true)
-, bEnableRejectAll(true)
-, bEnableUndo(true)
-, bEnableClearFormat(false)
-, bEnableClearFormatAll(false)
+, m_bEnableAccept(true)
+, m_bEnableAcceptAll(true)
+, m_bEnableReject(true)
+, m_bEnableRejectAll(true)
+, m_bEnableUndo(true)
+, m_bEnableClearFormat(false)
+, m_bEnableClearFormatAll(false)
, m_xAccept(m_xBuilder->weld_button(u"accept"_ustr))
, m_xReject(m_xBuilder->weld_button(u"reject"_ustr))
, m_xAcceptAll(m_xBuilder->weld_button(u"acceptall"_ustr))
@@ -329,11 +329,11 @@ SvxTPView::SvxTPView(weld::Container* pParent)
void SvxTPView::ActivatePage()
{
-m_xAccept->set_sensitive(bEnableAccept);
-m_xReject->set_sensitive(bEnableReject);
-m_xAcceptAll->set_sensitive(bEnableAcceptAll);
-m_xRejectAll->set_sensitive(bEnableRejectAll);
-m_xUndo->set_sensitive(bEnableUndo);
+m_xAccept->set_sensitive(m_bEnableAccept);
+m_xReject->set_sensitive(m_bEnableReject);
+m_xAcceptAll->set_sensitive(m_bEnableAcceptAll);
+m_xRejectAll->set_sensitive(m_bEnableRejectAll);
+m_xUndo->set_sensitive(m_bEnableUndo);
}
void SvxTPView::DeactivatePage()
@@ -392,40 +392,40 @@ void SvxRedlinTable::SetCalcView()
void SvxTPView::EnableAccept(bool bFlag)
{
-bEnableAccept = bFlag;
+m_bEnableAccept = bFlag;
m_xAccept->set_sensitive(bFlag);
}
void SvxTPView::EnableAcceptAll(bool bFlag)
{
-bEnableAcceptAll = bFlag;
+m_b
core.git: include/svx svx/source
include/svx/ctredlin.hxx | 10 +-
svx/source/dialog/ctredlin.cxx | 36 ++--
2 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 0857a999af86a178632dc699e4bd40d6cd960798
Author: Miklos Vajna
AuthorDate: Mon Nov 17 08:59:25 2025 +0100
Commit: Miklos Vajna
CommitDate: Mon Nov 17 10:14:34 2025 +0100
svx: prefix members of SvxTPFilter
See tdf#94879 for motivation.
Change-Id: Ic2368f78b95c08f267a2d6b790f90ef2604564cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194089
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 995151596368..486cf30fcd62 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -155,10 +155,10 @@ namespace weld
/// Tabpage with the filter text entries etc.
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxTPFilter final : public SvxTPage
{
-Link aReadyLink;
-Link aRefLink;
+Link m_aReadyLink;
+Link m_aRefLink;
-bool bModified;
+bool m_bModified;
SvxRedlinTable* m_pRedlinTable;
std::unique_ptr m_xCbDate;
@@ -245,11 +245,11 @@ public:
weld::ComboBox* GetLbAction() { return m_xLbAction.get(); }
-voidSetReadyHdl( const Link& rLink ) {
aReadyLink= rLink; }
+voidSetReadyHdl( const Link& rLink ) {
m_aReadyLink= rLink; }
// Methods for Calc {
-voidSetRefHdl( const Link& rLink ) {
aRefLink = rLink; }
+voidSetRefHdl( const Link& rLink ) {
m_aRefLink = rLink; }
voidEnable( bool bEnable = true );
// } Methods for Calc
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 89c92dd6861a..5ea339f67711 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -477,7 +477,7 @@ SvxTPage::SvxTPage(weld::Container* pParent, const
OUString& rUIXMLDescription,
SvxTPFilter::SvxTPFilter(weld::Container* pParent)
: SvxTPage(pParent, u"svx/ui/redlinefilterpage.ui"_ustr,
u"RedlineFilterPage"_ustr)
-, bModified(false)
+, m_bModified(false)
, m_pRedlinTable(nullptr)
, m_xCbDate(m_xBuilder->weld_check_button(u"date"_ustr))
, m_xLbDate(m_xBuilder->weld_combo_box(u"datecond"_ustr))
@@ -543,7 +543,7 @@ SvxTPFilter::SvxTPFilter(weld::Container* pParent)
SetLastTime(aDateTime);
HideRange();
ShowAction();
-bModified=false;
+m_bModified=false;
}
SvxTPFilter::~SvxTPFilter()
@@ -737,35 +737,35 @@ void SvxTPFilter::CheckDate(bool bFlag)
{
m_xCbDate->set_active(bFlag);
RowEnableHdl(*m_xCbDate);
-bModified=false;
+m_bModified=false;
}
void SvxTPFilter::CheckAuthor(bool bFlag)
{
m_xCbAuthor->set_active(bFlag);
RowEnableHdl(*m_xCbAuthor);
-bModified=false;
+m_bModified=false;
}
void SvxTPFilter::CheckRange(bool bFlag)
{
m_xCbRange->set_active(bFlag);
RowEnableHdl(*m_xCbRange);
-bModified=false;
+m_bModified=false;
}
void SvxTPFilter::CheckAction(bool bFlag)
{
m_xCbAction->set_active(bFlag);
RowEnableHdl(*m_xCbAction);
-bModified=false;
+m_bModified=false;
}
void SvxTPFilter::CheckComment(bool bFlag)
{
m_xCbComment->set_active(bFlag);
RowEnableHdl(*m_xCbComment);
-bModified=false;
+m_bModified=false;
}
void SvxTPFilter::ShowAction(bool bShow)
@@ -811,7 +811,7 @@ IMPL_LINK_NOARG(SvxTPFilter, SelDateHdl, weld::ComboBox&,
void)
case SvxRedlinDateMode::NONE:
break;
}
-bModified = true;
+m_bModified = true;
}
IMPL_LINK(SvxTPFilter, RowEnableHdl, weld::Toggleable&, rCB, void)
@@ -840,7 +840,7 @@ IMPL_LINK(SvxTPFilter, RowEnableHdl, weld::Toggleable&,
rCB, void)
{
m_xEdComment->set_sensitive(m_xCbComment->get_active());
}
-bModified = true;
+m_bModified = true;
}
IMPL_LINK(SvxTPFilter, TimeHdl, weld::Button&, rIB, void)
@@ -856,22 +856,22 @@ IMPL_LINK(SvxTPFilter, TimeHdl, weld::Button&, rIB, void)
SetLastDate(aDateTime);
SetLastTime(aDateTime);
}
-bModified=true;
+m_bModified=true;
}
IMPL_LINK_NOARG(SvxTPFilter, ModifyHdl, weld::Entry&, void)
{
-bModified=true;
+m_bModified=true;
}
IMPL_LINK_NOARG(SvxTPFilter, ModifyListBoxHdl, weld::ComboBox&, void)
{
-bModified=true;
+m_bModified=true;
}
void SvxTPFilter::DeactivatePage()
{
-if(bModified)
+if(m_bModified)
{
if (m_pRedlinTable)
{
@@ -894,9 +894,9 @@ void SvxTPFilter::DeactivatePage()
m_pRedlinTable->UpdateFilterTest();
}
-aReadyLink.Call(this);
+m_aReadyLink.Call(this);
}
-bModified=false;
+m_bModified=false;
}
void SvxTPFilter::Enable(bool bEnable)
@@ -930,7 +930,7 @@ IMPL_LINK(SvxTPFilter, ModifyDate, SvtCalendarBox&, rTF,
void)
if (m_pRedlinTable)
core.git: include/svx svx/source
include/svx/srchdlg.hxx|2
svx/source/dialog/srchdlg.cxx |6 ++
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 66 -
3 files changed, 73 insertions(+), 1 deletion(-)
New commits:
commit ef503a4abf51b6eeac26d80444b5d69a98674db5
Author: Jim Raykowski
AuthorDate: Tue Nov 11 22:40:11 2025 -0900
Commit: Jim Raykowski
CommitDate: Sat Nov 15 06:52:15 2025 +0100
tdf#162580 copy query text from Find toolbar to Find&Replace dialog
This patch copies the query text to the Find&Replace dialog when Ctrl+H
is pressed in the Find toolbar find text field control. Normally Ctrl+H
toggles the Find&Replace dialog on and off. This patch makes the dialog
not toggle off when pressed in the Find toolbar find text field control,
it either opens the Find&Replace dialog and copies the query text or
copies the query text to the already open Find&Replace dialog.
Change-Id: I6aa28f9e47431bdc75d63c7f68469203bc3b59df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193837
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 7b874bd9027a..34d82fbb9d28 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -143,6 +143,8 @@ public:
// bring this window back to the foreground
void Present();
+void SetSearchLBEntryTextAndGrabFocus(const OUString& rStr);
+
private:
SfxBindings& m_rBindings;
Timer m_aPresentIdle;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 6841fe36a0f5..73fb1f3a7472 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -359,6 +359,12 @@ void SvxSearchDialog::Present()
m_aPresentIdle.Start();
}
+void SvxSearchDialog::SetSearchLBEntryTextAndGrabFocus(const OUString& rStr)
+{
+m_xSearchLB->set_entry_text(rStr);
+m_xSearchLB->grab_focus();
+}
+
void SvxSearchDialog::ChildWinDispose()
{
m_rBindings.EnterRegistrations();
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 7f24d173cd3d..59f8c4389a70 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -63,6 +63,10 @@
#include
+#include
+#include
+#include
+
using namespace css;
namespace {
@@ -352,8 +356,68 @@ IMPL_LINK(FindTextFieldControl, KeyInputHdl, const
KeyEvent&, rKeyEvent, bool)
bRet = true;
}
else if (aCommand == ".uno:SearchDialog")
+{
+#if HAVE_FEATURE_DESKTOP
+const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId();
+SfxViewFrame* pViewFrm = SfxViewFrame::Current();
+if (pViewFrm)
+{
+SvxSearchDialogWrapper* pWrp
+=
static_cast(pViewFrm->GetChildWindow(nId));
+if (pWrp) // if the search dialog wrapper window exists
+{
+SvxSearchDialog* pSearchDialog = pWrp->getDialog();
+assert(pSearchDialog);
+if (pSearchDialog) // if we have the wrapper window this
should be good, shouldn't it?
+{
+pSearchDialog->SetSearchLBEntryTextAndGrabFocus(
+m_xWidget->get_active_text());
+pSearchDialog->Present();
+bRet = true;
+}
+else // likely not needed
+{
+
pViewFrm->GetBindings().ExecuteSynchron(SID_SEARCH_DLG);
+pWrp =
static_cast(pViewFrm->GetChildWindow(nId));
+if (pWrp)
+{
+pSearchDialog = pWrp->getDialog();
+assert(pSearchDialog);
+if (pSearchDialog)
+{
+
pSearchDialog->SetSearchLBEntryTextAndGrabFocus(
+m_xWidget->get_active_text());
+pSearchDialog->Present();
+bRet = true;
+}
+}
+}
+}
+else // the search dialog wrapper window does not exist so try
to make it exist
+{
+pViewFrm->GetBindings().ExecuteSynchron(SID_SEARCH_DLG);
+pWrp =
static_cast(pViewFrm->GetChildWindow(nId));
+if (pWrp)
+{
+SvxSearchDialog* pSearchDialog = pWrp->getDialog();
+assert(pSearchDialog);
+if (pSearchDialog)
+{
+pSearchDialog->SetSearchLBEntryTextAndGrabFocus(
+
core.git: include/svx svx/source
include/svx/ctredlin.hxx | 36
svx/source/dialog/ctredlin.cxx | 174 -
2 files changed, 105 insertions(+), 105 deletions(-)
New commits:
commit 9667d5e9ebe4a68a7727ce45a0eab13ff6cf7181
Author: Miklos Vajna
AuthorDate: Mon Nov 10 08:16:18 2025 +0100
Commit: Miklos Vajna
CommitDate: Mon Nov 10 09:10:02 2025 +0100
svx: prefix members of SvxRedlinTable
See tdf#94879 for motivation.
Change-Id: I70302b0534c36476caaef806464f5677e9170eae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193711
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index f6536d9a54fd..995151596368 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -78,25 +78,25 @@ public:
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxRedlinTable
{
private:
-std::unique_ptr xSorter;
-std::unique_ptr xWriterTreeView;
-std::unique_ptr xCalcTreeView;
-weld::TreeView* pTreeView;
+std::unique_ptr m_xSorter;
+std::unique_ptr m_xWriterTreeView;
+std::unique_ptr m_xCalcTreeView;
+weld::TreeView* m_pTreeView;
weld::ComboBox* m_pSortByComboBox;
-sal_uInt16 nDatePos;
-boolbAuthor;
-boolbDate;
-boolbComment;
-boolbSorted;
-SvxRedlinDateMode nDaTiMode;
-DateTimeaDaTiFirst;
-DateTimeaDaTiLast;
-DateTimeaDaTiFilterFirst;
-DateTimeaDaTiFilterLast;
-OUStringaAuthor;
-std::unique_ptr pCommentSearcher;
+sal_uInt16 m_nDatePos;
+boolm_bAuthor;
+boolm_bDate;
+boolm_bComment;
+boolm_bSorted;
+SvxRedlinDateMode m_nDaTiMode;
+DateTimem_aDaTiFirst;
+DateTimem_aDaTiLast;
+DateTimem_aDaTiFilterFirst;
+DateTimem_aDaTiFilterLast;
+OUStringm_aAuthor;
+std::unique_ptr m_pCommentSearcher;
int ColCompare(const weld::TreeIter& rLeft, const weld::TreeIter& rRight);
@@ -105,8 +105,8 @@ public:
std::unique_ptr xCalcControl,
weld::ComboBox* pSortByControl);
-weld::TreeView& GetWidget() { return *pTreeView; }
-bool IsSorted() const { return bSorted; }
+weld::TreeView& GetWidget() { return *m_pTreeView; }
+bool IsSorted() const { return m_bSorted; }
~SvxRedlinTable();
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index fb011732aecb..89c92dd6861a 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -50,40 +50,40 @@ RedlinData::~RedlinData()
SvxRedlinTable::SvxRedlinTable(std::unique_ptr xWriterControl,
std::unique_ptr xCalcControl,
weld::ComboBox* pSortByControl)
-: xSorter(new
comphelper::string::NaturalStringSorter(::comphelper::getProcessComponentContext(),
+: m_xSorter(new
comphelper::string::NaturalStringSorter(::comphelper::getProcessComponentContext(),
Application::GetSettings().GetUILanguageTag().getLocale()))
-, xWriterTreeView(std::move(xWriterControl))
-, xCalcTreeView(std::move(xCalcControl))
-, pTreeView(nullptr)
+, m_xWriterTreeView(std::move(xWriterControl))
+, m_xCalcTreeView(std::move(xCalcControl))
+, m_pTreeView(nullptr)
, m_pSortByComboBox(pSortByControl)
-, nDatePos(WRITER_DATE)
-, bAuthor(false)
-, bDate(false)
-, bComment(false)
-, bSorted(false)
-, nDaTiMode(SvxRedlinDateMode::BEFORE)
-, aDaTiFirst( DateTime::EMPTY )
-, aDaTiLast( DateTime::EMPTY )
-, aDaTiFilterFirst( DateTime::EMPTY )
-, aDaTiFilterLast( DateTime::EMPTY )
-{
-if (xWriterTreeView)
+, m_nDatePos(WRITER_DATE)
+, m_bAuthor(false)
+, m_bDate(false)
+, m_bComment(false)
+, m_bSorted(false)
+, m_nDaTiMode(SvxRedlinDateMode::BEFORE)
+, m_aDaTiFirst( DateTime::EMPTY )
+, m_aDaTiLast( DateTime::EMPTY )
+, m_aDaTiFilterFirst( DateTime::EMPTY )
+, m_aDaTiFilterLast( DateTime::EMPTY )
+{
+if (m_xWriterTreeView)
{
-xWriterTreeView->set_size_request(-1,
xWriterTreeView->get_height_rows(8));
-xWriterTreeView->connect_column_clicked(LINK(this, SvxRedlinTable,
HeaderBarClick));
-xWriterTreeView->set_sort_func([this](const weld::TreeIter& rLeft,
const weld::TreeIter& rRight){
+m_xWriterTreeView->set_size_request(-1,
m_xWriterTreeView->get_height_rows(8));
+m_xWriterTreeView->connect_column_clicked(LINK(this, SvxRedlinTable,
HeaderBarClick));
+m_xWriterTreeView->set_sort_func([this](const weld::TreeIter& rLeft,
const weld::TreeIter& rRight){
return ColCompare(rLeft, rRight);
});
-pTreeView = xWriterTreeView.get();
+m_pTreeView = m_xWriterTreeView.get();
}
-if (xCalcTreeView)
+if (m_
core.git: include/svx svx/source
include/svx/sdr/contact/viewobjectcontact.hxx |1 +
svx/source/sdr/contact/viewobjectcontact.cxx | 22 +-
2 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit 1c8b8d1fb80e6445aaeca2f2df6816d223277dbc
Author: Noel Grandin
AuthorDate: Fri Nov 7 16:38:40 2025 +0200
Commit: Noel Grandin
CommitDate: Sat Nov 8 13:11:06 2025 +0100
tdf#168928 Draw object not removed from the view after delete
regression from
commit e6a8c40e5051363d5825bd09131b86cf8a2b659b
Author: Noel Grandin
Date: Tue Sep 30 14:54:37 2025 +0200
tdf#116975 Laggy behavior when clicking between table cells in impress
Change-Id: I9f430aece90badae7e0911ef82fffa84fb707755
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193582
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx
b/include/svx/sdr/contact/viewobjectcontact.hxx
index eab0aed2c093..26154d80f63f 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -65,6 +65,7 @@ private:
// This bool gets set when the object gets invalidated by ActionChanged()
and
// can be used from the OC to late-invalidates
boolmbLazyInvalidate : 1;
+mutable boolmbInvalidateViewOnDestruct
: 1;
protected:
// make redirector a protected friend, it needs to call createPrimitives
as default action
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx
b/svx/source/sdr/contact/viewobjectcontact.cxx
index d5cf6e6ae7f7..960d4a8db74e 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -155,7 +155,8 @@ ViewObjectContact::ViewObjectContact(ObjectContact&
rObjectContact, ViewContact&
: mrObjectContact(rObjectContact),
mrViewContact(rViewContact),
mnActionChangedCount(0),
-mbLazyInvalidate(false)
+mbLazyInvalidate(false),
+mbInvalidateViewOnDestruct(false)
{
// make the ViewContact remember me
mrViewContact.AddViewObjectContact(*this);
@@ -166,11 +167,21 @@ ViewObjectContact::ViewObjectContact(ObjectContact&
rObjectContact, ViewContact&
ViewObjectContact::~ViewObjectContact()
{
-// if the object range is empty, then we have never had the primitive
range change, so nothing to invalidate
-if (!maObjectRange.isEmpty())
+if (mbInvalidateViewOnDestruct)
{
-// invalidate in view
-GetObjectContact().InvalidatePartOfView(maObjectRange);
+// used cached object range to limit invalidation
+if (!maObjectRange.isEmpty())
+{
+// invalidate in view
+GetObjectContact().InvalidatePartOfView(maObjectRange);
+}
+else
+{
+// we do not currently have cached range information, so just
invalidate the whole viewport
+const drawinglayer::geometry::ViewInformation2D& rViewInfo2D =
GetObjectContact().getViewInformation2D();
+if (!rViewInfo2D.getViewport().isEmpty())
+
GetObjectContact().InvalidatePartOfView(rViewInfo2D.getViewport());
+}
}
// delete PrimitiveAnimation
@@ -518,6 +529,7 @@ drawinglayer::primitive2d::Primitive2DContainer const &
ViewObjectContact::getPr
const_cast< ViewObjectContact*
>(this)->checkForPrimitive2DAnimations();
const_cast< ViewObjectContact* >(this)->maObjectRange.reset();
+mbInvalidateViewOnDestruct = true;
}
// return current Primitive2DContainer
core.git: include/svx svx/source
include/svx/numvset.hxx | 14 ++--
svx/source/dialog/svxbmpnumvalueset.cxx | 108
2 files changed, 61 insertions(+), 61 deletions(-)
New commits:
commit 693e0a3b44f5dd518a4913cbf41afccaf9f17e8d
Author: Miklos Vajna
AuthorDate: Mon Nov 3 08:25:43 2025 +0100
Commit: Miklos Vajna
CommitDate: Mon Nov 3 10:26:30 2025 +0100
svx: prefix members of SvxNumValueSet
See tdf#94879 for motivation.
Change-Id: Ic939b96bfa1a7a2353ae71406aff8106b96da60d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193320
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 1ecfe9e180b8..6c8bc4dd4073 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -49,23 +49,23 @@ enum class NumberingPageType
class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
{
-NumberingPageType ePageType;
-tools::Rectangle aOrgRect;
-VclPtr pVDev;
+NumberingPageType mePageType;
+tools::Rectangle maOrgRect;
+VclPtr mpVDev;
-css::uno::Reference xFormatter;
-css::lang::Locale aLocale;
+css::uno::Reference mxFormatter;
+css::lang::Locale maLocale;
// Pair of bullet chars (first), and their respective font (second)
std::vector> maCustomBullets;
css::uno::Sequence<
css::uno::Sequence<
-css::beans::PropertyValue> > aNumSettings;
+css::beans::PropertyValue> > maNumSettings;
css::uno::Sequence<
css::uno::Reference<
-css::container::XIndexAccess> > aOutlineSettings;
+css::container::XIndexAccess> > maOutlineSettings;
public:
SvxNumValueSet(std::unique_ptr pScrolledWindow);
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx
b/svx/source/dialog/svxbmpnumvalueset.cxx
index d089ae095fb0..82349b5d9123 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -149,19 +149,19 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent&
rUDEvt )
aRuleFont.SetFillColor(aBackColor);
css::uno::Sequence< OUString > aBulletSymbols;
-if(ePageType == NumberingPageType::BULLET || ePageType ==
NumberingPageType::DOCBULLET)
+if(mePageType == NumberingPageType::BULLET || mePageType ==
NumberingPageType::DOCBULLET)
{
aBulletSymbols =
officecfg::Office::Common::BulletsNumbering::DefaultBullets::get();
css::uno::Sequence< OUString >
aBulletFonts(officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::get());
aRuleFont.SetFamilyName(aBulletFonts[nIndex]);
aFont = aRuleFont;
}
-else if (ePageType == NumberingPageType::DOCBULLET)
+else if (mePageType == NumberingPageType::DOCBULLET)
{
aRuleFont.SetFamilyName(maCustomBullets[nIndex].second);
aFont = aRuleFont;
}
-else if(ePageType == NumberingPageType::OUTLINE)
+else if(mePageType == NumberingPageType::OUTLINE)
{
aSize.setHeight( nRectHeight/8 );
}
@@ -170,19 +170,19 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent&
rUDEvt )
aFont.SetFontSize( aSize );
pDev->SetFont(aFont);
-if(!pVDev)
+if(!mpVDev)
{
// The lines are only one time in the virtual device, only the outline
// page is currently done
-pVDev = VclPtr::Create(*pDev);
-pVDev->SetMapMode(pDev->GetMapMode());
-pVDev->EnableRTL( IsRTLEnabled() );
-pVDev->SetOutputSize( aRectSize );
-aOrgRect = aRect;
-pVDev->SetFillColor( aBackColor );
-pVDev->SetLineColor(COL_LIGHTGRAY);
+mpVDev = VclPtr::Create(*pDev);
+mpVDev->SetMapMode(pDev->GetMapMode());
+mpVDev->EnableRTL( IsRTLEnabled() );
+mpVDev->SetOutputSize( aRectSize );
+maOrgRect = aRect;
+mpVDev->SetFillColor( aBackColor );
+mpVDev->SetLineColor(COL_LIGHTGRAY);
// Draw line only once
-if(ePageType != NumberingPageType::OUTLINE)
+if(mePageType != NumberingPageType::OUTLINE)
{
Point aStart(aBLPos.X() + nRectWidth *25 / 100,0);
Point aEnd(aBLPos.X() + nRectWidth * 9 / 10,0);
@@ -190,21 +190,21 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent&
rUDEvt )
{
aStart.setY( aBLPos.Y() + nRectHeight * i / 100 );
aEnd.setY( aStart.Y() );
-pVDev->DrawLine(aStart, aEnd);
+mpVDev->DrawLine(aStart, aEnd);
aStart.setY( aBLPos.Y() + nRectHeight * (i + 11) / 100 );
aEnd.setY( aStart.Y() );
-pVDev->DrawLine(aStart, aEnd);
+mpVDev->DrawLine(aStart, aEnd);
}
}
}
pDev->DrawOutDev( aRect.TopLeft(), aRectSize,
-aOrgRect.TopLeft(), aRectSize,
-*pVDev );
+maOrgRect.TopLeft(), aRect
core.git: include/svx svx/source
include/svx/numvset.hxx |4 ++--
svx/source/dialog/svxbmpnumvalueset.cxx | 18 +-
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit bbfb54d6c00a00ded47d2721b53a486cbaf023dd
Author: Miklos Vajna
AuthorDate: Fri Oct 31 08:24:42 2025 +0100
Commit: Miklos Vajna
CommitDate: Fri Oct 31 09:37:16 2025 +0100
svx: prefix members of SvxBmpNumValueSet
See tdf#94879 for motivation.
Change-Id: I1d2b6a077d9722e90ba02f5e60fdffda98032c99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193237
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index d54ad8f17a19..1ecfe9e180b8 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -96,8 +96,8 @@ public:
class SVX_DLLPUBLIC SvxBmpNumValueSet final : public SvxNumValueSet
{
-IdleaFormatIdle;
-boolbGrfNotFound;
+Idlem_aFormatIdle;
+boolm_bGrfNotFound;
DECL_DLLPRIVATE_LINK(FormatHdl_Impl, Timer *, void);
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx
b/svx/source/dialog/svxbmpnumvalueset.cxx
index ed2e9bfaf80a..d089ae095fb0 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -470,27 +470,27 @@ void SvxNumValueSet::SetCustomBullets(const
std::vector
pScrolledWindow)
: SvxNumValueSet(std::move(pScrolledWindow))
-, aFormatIdle("SvxBmpNumValueSet FormatIdle")
-, bGrfNotFound(false)
+, m_aFormatIdle("SvxBmpNumValueSet FormatIdle")
+, m_bGrfNotFound(false)
{
}
void SvxBmpNumValueSet::init()
{
SvxNumValueSet::init(NumberingPageType::BITMAP);
-bGrfNotFound = false;
+m_bGrfNotFound = false;
GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
SetStyle( GetStyle() | WB_VSCROLL );
SetLineCount( 3 );
-aFormatIdle.SetPriority(TaskPriority::LOWEST);
-aFormatIdle.SetInvokeHandler(LINK(this, SvxBmpNumValueSet,
FormatHdl_Impl));
+m_aFormatIdle.SetPriority(TaskPriority::LOWEST);
+m_aFormatIdle.SetInvokeHandler(LINK(this, SvxBmpNumValueSet,
FormatHdl_Impl));
}
SvxBmpNumValueSet::~SvxBmpNumValueSet()
{
GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS);
-aFormatIdle.Stop();
+m_aFormatIdle.Stop();
}
void SvxBmpNumValueSet::UserDraw(const UserDrawEvent& rUDEvt)
@@ -509,7 +509,7 @@ void SvxBmpNumValueSet::UserDraw(const UserDrawEvent&
rUDEvt)
if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1,
&aGraphic))
{
-bGrfNotFound = true;
+m_bGrfNotFound = true;
}
else
{
@@ -526,10 +526,10 @@ void SvxBmpNumValueSet::UserDraw(const UserDrawEvent&
rUDEvt)
IMPL_LINK_NOARG(SvxBmpNumValueSet, FormatHdl_Impl, Timer *, void)
{
// only when a graphics was not there, it needs to be formatted
-if (bGrfNotFound)
+if (m_bGrfNotFound)
{
SetFormat();
-bGrfNotFound = false;
+m_bGrfNotFound = false;
}
Invalidate();
}
core.git: include/svx svx/source
include/svx/connctrl.hxx | 12 ++--
svx/source/dialog/connctrl.cxx | 30 +++---
2 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 5630afeeef233d2b0b519fe0e7c561d342d201d6
Author: Miklos Vajna
AuthorDate: Mon Oct 20 09:05:45 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Oct 20 12:01:06 2025 +0200
svx: prefix members of SvxXConnectionPreview
See tdf#94879 for motivation.
Change-Id: Iea4f9b55e4d769d891fbf7d88cb97ef307e219be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192681
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx
index 8e416674b1b2..d4eca1e6feee 100644
--- a/include/svx/connctrl.hxx
+++ b/include/svx/connctrl.hxx
@@ -39,14 +39,14 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXConnectionPreview
final : public weld::C
friend class SvxConnectionPage;
private:
-MapMode aNewMapMode;
-rtl::Reference pEdgeObj;
+MapMode m_aNewMapMode;
+rtl::Reference m_pEdgeObj;
rtl::Reference mxSdrPage;
-const SdrView* pView;
+const SdrView* m_pView;
SVX_DLLPRIVATE void AdaptSize();
-SVX_DLLPRIVATE void SetMapMode(const MapMode& rNewMapMode) { aNewMapMode =
rNewMapMode; }
-SVX_DLLPRIVATE const MapMode& GetMapMode() const { return aNewMapMode; }
+SVX_DLLPRIVATE void SetMapMode(const MapMode& rNewMapMode) { m_aNewMapMode
= rNewMapMode; }
+SVX_DLLPRIVATE const MapMode& GetMapMode() const { return m_aNewMapMode; }
public:
SvxXConnectionPreview();
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
@@ -60,7 +60,7 @@ public:
sal_uInt16 GetLineDeltaCount() const;
void Construct();
-void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
+void SetView( const SdrView* pSdrView ) { m_pView = pSdrView; }
};
#endif // INCLUDED_SVX_CONNCTRL_HXX
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 41f825b91ab0..3e0d48d15e4b 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -34,7 +34,7 @@
#include
SvxXConnectionPreview::SvxXConnectionPreview()
-: pView(nullptr)
+: m_pView(nullptr)
{
SetMapMode(MapMode(MapUnit::Map100thMM));
}
@@ -66,7 +66,7 @@ void SvxXConnectionPreview::AdaptSize()
SetMapMode(MapMode(MapUnit::Map100thMM));
-OutputDevice* pOD = pView->GetFirstOutputDevice(); // GetWin( 0 );
+OutputDevice* pOD = m_pView->GetFirstOutputDevice(); // GetWin( 0 );
tools::Rectangle aRect = mxSdrPage->GetAllObjBoundRect();
MapMode aMapMode = GetMapMode();
@@ -125,9 +125,9 @@ void SvxXConnectionPreview::AdaptSize()
void SvxXConnectionPreview::Construct()
{
-assert(pView && "No valid view is passed on!");
+assert(m_pView && "No valid view is passed on!");
-const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
+const SdrMarkList& rMarkList = m_pView->GetMarkedObjectList();
const size_t nMarkCount = rMarkList.GetMarkCount();
if( nMarkCount >= 1 )
@@ -148,15 +148,15 @@ void SvxXConnectionPreview::Construct()
if(!mxSdrPage)
{
mxSdrPage = new SdrPage(
-pView->getSdrModelFromSdrView(),
+m_pView->getSdrModelFromSdrView(),
false);
}
const SdrEdgeObj* pTmpEdgeObj = static_cast(pObj);
-pEdgeObj = SdrObject::Clone(*pTmpEdgeObj,
mxSdrPage->getSdrModelFromSdrPage());
+m_pEdgeObj = SdrObject::Clone(*pTmpEdgeObj,
mxSdrPage->getSdrModelFromSdrPage());
-SdrObjConnection& rConn1 = pEdgeObj->GetConnection( true );
-SdrObjConnection& rConn2 = pEdgeObj->GetConnection( false );
+SdrObjConnection& rConn1 = m_pEdgeObj->GetConnection( true );
+SdrObjConnection& rConn2 = m_pEdgeObj->GetConnection( false );
rConn1 = pTmpEdgeObj->GetConnection( true );
rConn2 = pTmpEdgeObj->GetConnection( false );
@@ -168,24 +168,24 @@ void SvxXConnectionPreview::Construct()
{
rtl::Reference pObj1 =
pTmpObj1->CloneSdrObject(mxSdrPage->getSdrModelFromSdrPage());
mxSdrPage->InsertObject( pObj1.get() );
-pEdgeObj->ConnectToNode( true, pObj1.get() );
+m_pEdgeObj->ConnectToNode( true, pObj1.get() );
}
if( pTmpObj2 )
{
rtl::Reference pObj2 =
pTmpObj2->CloneSdrObject(mxSdrPage->getSdrModelFromSdrPage());
mxSdrPage->InsertObject( pObj2.get() );
-pEdgeObj->ConnectToNode( false, pObj2.get() );
+m_pEdgeObj->ConnectToNode( false, pObj2.get() );
}
-mxSdrPage->In
core.git: include/svx svx/source
include/svx/bmpmask.hxx|4 ++--
svx/source/dialog/_bmpmask.cxx | 26 +-
2 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit c9ab6a2411b631cfafdc9b3b4391dd290a32d6c1
Author: Miklos Vajna
AuthorDate: Mon Sep 29 09:03:25 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 29 10:06:51 2025 +0200
svx: prefix members of SvxBmpMask
See tdf#94879 for motivation.
Change-Id: Ie4832890d84db56ea8f49d164506d0bdc2f6dd3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191589
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 001a4b1fd4e9..27dc520ea499 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -123,8 +123,8 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask final :
public SfxDockingWindow
std::unique_ptr m_xData;
-Color aPipetteColor;
-SvxBmpMaskSelectItem aSelItem;
+Color m_aPipetteColor;
+SvxBmpMaskSelectItem m_aSelItem;
virtual boolClose() override;
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 3a4412fa871d..e15230ed5c9d 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -375,8 +375,8 @@ SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx,
SfxChildWindow *pCW, vcl::Window*
, m_xCbxTrans(m_xBuilder->weld_check_button(u"cbx5"_ustr))
, m_xLbColorTrans(new
ColorListBox(m_xBuilder->weld_menu_button(u"color5"_ustr), [this]{ return
GetFrameWeld(); }))
, m_xData(new MaskData(this, *pBindinx))
-, aPipetteColor(COL_WHITE)
-, aSelItem(*this, *pBindinx)
+, m_aPipetteColor(COL_WHITE)
+, m_aSelItem(*this, *pBindinx)
{
SetText(SvxResId(RID_SVXDLG_BMPMASK_STR_TITLE));
@@ -415,28 +415,28 @@ SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx,
SfxChildWindow *pCW, vcl::Window*
m_xQSet1->SetColCount();
m_xQSet1->SetLineCount( 1 );
sColorPaletteN = sColorPalette + " 1";
-m_xQSet1->InsertItem( 1, aPipetteColor, sColorPaletteN);
+m_xQSet1->InsertItem( 1, m_aPipetteColor, sColorPaletteN);
m_xQSet1->SelectItem( 1 );
m_xQSet2->SetStyle( m_xQSet2->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER
);
m_xQSet2->SetColCount();
m_xQSet2->SetLineCount( 1 );
sColorPaletteN = sColorPalette + " 2";
-m_xQSet2->InsertItem( 1, aPipetteColor, sColorPaletteN);
+m_xQSet2->InsertItem( 1, m_aPipetteColor, sColorPaletteN);
m_xQSet2->SelectItem( 0 );
m_xQSet3->SetStyle( m_xQSet3->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER
);
m_xQSet3->SetColCount();
m_xQSet3->SetLineCount( 1 );
sColorPaletteN = sColorPalette + " 3";
-m_xQSet3->InsertItem( 1, aPipetteColor, sColorPaletteN);
+m_xQSet3->InsertItem( 1, m_aPipetteColor, sColorPaletteN);
m_xQSet3->SelectItem( 0 );
m_xQSet4->SetStyle( m_xQSet4->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER
);
m_xQSet4->SetColCount();
m_xQSet4->SetLineCount( 1 );
sColorPaletteN = sColorPalette + " 4";
-m_xQSet4->InsertItem( 1, aPipetteColor, sColorPaletteN);
+m_xQSet4->InsertItem( 1, m_aPipetteColor, sColorPaletteN);
m_xQSet4->SelectItem( 0 );
m_xQSet1->Show();
@@ -479,7 +479,7 @@ void SvxBmpMask::dispose()
m_xLbColor4.reset();
m_xCbxTrans.reset();
m_xLbColorTrans.reset();
-aSelItem.dispose();
+m_aSelItem.dispose();
SfxDockingWindow::dispose();
}
@@ -511,8 +511,8 @@ bool SvxBmpMask::Close()
void SvxBmpMask::SetColor( const Color& rColor )
{
-aPipetteColor = rColor;
-m_xCtlPipette->SetColor( aPipetteColor );
+m_aPipetteColor = rColor;
+m_xCtlPipette->SetColor( m_aPipetteColor );
}
void SvxBmpMask::PipetteClicked()
@@ -521,28 +521,28 @@ void SvxBmpMask::PipetteClicked()
{
m_xCbx1->set_active(true);
m_xData->CbxHdl(*m_xCbx1);
-m_xQSet1->SetItemColor( 1, aPipetteColor );
+m_xQSet1->SetItemColor( 1, m_aPipetteColor );
m_xQSet1->SetFormat();
}
else if( m_xQSet2->GetSelectedItemId() == 1 )
{
m_xCbx2->set_active(true);
m_xData->CbxHdl(*m_xCbx2);
-m_xQSet2->SetItemColor( 1, aPipetteColor );
+m_xQSet2->SetItemColor( 1, m_aPipetteColor );
m_xQSet2->SetFormat();
}
else if( m_xQSet3->GetSelectedItemId() == 1 )
{
m_xCbx3->set_active(true);
m_xData->CbxHdl(*m_xCbx3);
-m_xQSet3->SetItemColor( 1, aPipetteColor );
+m_xQSet3->SetItemColor( 1, m_aPipetteColor );
m_xQSet3->SetFormat();
}
else if( m_xQSet4->GetSelectedItemId() == 1 )
{
m_xCbx4->set_active(true);
m_xData->CbxHdl(*m_xCbx4);
-m_xQSet4->SetItemColor( 1, aPipetteColor );
+m_xQSet4->SetItemColor( 1, m_aPipetteColor );
m_xQSet4->SetFormat();
}
core.git: include/svx svx/source
include/svx/sdr/contact/viewobjectcontact.hxx |1
svx/source/sdr/contact/viewobjectcontact.cxx |4 ---
svx/source/svdraw/sdrhittesthelper.cxx| 27 +++---
3 files changed, 18 insertions(+), 14 deletions(-)
New commits:
commit e6a8c40e5051363d5825bd09131b86cf8a2b659b
Author: Noel Grandin
AuthorDate: Tue Sep 30 14:54:37 2025 +0200
Commit: Noel Grandin
CommitDate: Tue Sep 30 18:22:59 2025 +0200
tdf#116975 Laggy behavior when clicking between table cells in impress
Only compute the object range when we actually need it.
Takes the hit test processing completely off the performance profile,
reducing CPU usage by 50%
Change-Id: I3bc7efa187897274d6ef86e7b259b0dba40dc398
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191667
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx
b/include/svx/sdr/contact/viewobjectcontact.hxx
index fa54bd470580..eab0aed2c093 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -97,6 +97,7 @@ public:
// get the object size range
const basegfx::B2DRange& getObjectRange() const;
+bool hasCachedObjectRange() const { return !maObjectRange.isEmpty(); }
// React on changes of the object of this ViewContact
virtual void ActionChanged();
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx
b/svx/source/sdr/contact/viewobjectcontact.cxx
index aecbd0f9f016..d5cf6e6ae7f7 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -517,9 +517,7 @@ drawinglayer::primitive2d::Primitive2DContainer const &
ViewObjectContact::getPr
// check for animated stuff
const_cast< ViewObjectContact*
>(this)->checkForPrimitive2DAnimations();
-// always update object range when PrimitiveSequence changes
-const drawinglayer::geometry::ViewInformation2D&
rViewInformation2D(GetObjectContact().getViewInformation2D());
-const_cast< ViewObjectContact* >(this)->maObjectRange =
mxPrimitive2DSequence.getB2DRange(rViewInformation2D);
+const_cast< ViewObjectContact* >(this)->maObjectRange.reset();
}
// return current Primitive2DContainer
diff --git a/svx/source/svdraw/sdrhittesthelper.cxx
b/svx/source/svdraw/sdrhittesthelper.cxx
index 72e41dbc2dc8..2262172465d0 100644
--- a/svx/source/svdraw/sdrhittesthelper.cxx
+++ b/svx/source/svdraw/sdrhittesthelper.cxx
@@ -120,20 +120,25 @@ bool ViewObjectContactPrimitiveHit(
bool bTextOnly,
drawinglayer::primitive2d::Primitive2DContainer* pHitContainer)
{
-basegfx::B2DRange aObjectRange(rVOC.getObjectRange());
+// Only use the range if we already have it, computing the range can be
more expensive
+// than running the HitTestProcessor.
+if (rVOC.hasCachedObjectRange())
+{
+basegfx::B2DRange aObjectRange(rVOC.getObjectRange());
-if(aObjectRange.isEmpty())
-return false;
+if(aObjectRange.isEmpty())
+return false;
-// first do a rough B2DRange based HitTest; do not forget to
-// include the HitTolerance if given
-if(rLogicHitTolerance.getX() > 0 || rLogicHitTolerance.getY() > 0)
-{
-aObjectRange.grow(rLogicHitTolerance);
-}
+// first do a rough B2DRange based HitTest; do not forget to
+// include the HitTolerance if given
+if(rLogicHitTolerance.getX() > 0 || rLogicHitTolerance.getY() > 0)
+{
+aObjectRange.grow(rLogicHitTolerance);
+}
-if(!aObjectRange.isInside(rHitPosition))
-return false;
+if(!aObjectRange.isInside(rHitPosition))
+return false;
+}
// get primitive sequence
sdr::contact::DisplayInfo aDisplayInfo;
core.git: include/svx svx/source
include/svx/cuicharmap.hxx |8 +--
svx/source/dialog/cuicharmap.cxx | 96 +++
2 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit 6943c8afe31af97e35ac98a9ed7079f120297740
Author: Miklos Vajna
AuthorDate: Mon Oct 6 09:11:40 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Oct 6 11:58:14 2025 +0200
svx: prefix members of SvxCharacterMap
See tdf#94879 for motivation.
Change-Id: I7b6b3bfd2ba261ae3d0d21d6f70012c95596916c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191937
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/cuicharmap.hxx b/include/svx/cuicharmap.hxx
index 3bd815cb42e9..0b93d1e5c3b9 100644
--- a/include/svx/cuicharmap.hxx
+++ b/include/svx/cuicharmap.hxx
@@ -79,7 +79,7 @@ public:
void DisableFontSelection();
-const vcl::Font& GetCharFont() const { return aFont; }
+const vcl::Font& GetCharFont() const { return m_aFont; }
void SetCharFont(const vcl::Font& rFont);
void SetChar(sal_UCS4);
@@ -128,9 +128,9 @@ private:
DECL_DLLPRIVATE_LINK(UpdateFavHdl, void*, void);
ScopedVclPtr m_xVirDev;
-vcl::Font aFont;
-std::unique_ptr pSubsetMap;
-bool isSearchMode;
+vcl::Font m_aFont;
+std::unique_ptr m_pSubsetMap;
+bool m_isSearchMode;
css::uno::Reference m_xFrame;
SfxCharmapContainer m_aCharmapContents;
SvxShowText m_aShowChar;
diff --git a/svx/source/dialog/cuicharmap.cxx b/svx/source/dialog/cuicharmap.cxx
index aabf313ec9d8..e7597eb2305d 100644
--- a/svx/source/dialog/cuicharmap.cxx
+++ b/svx/source/dialog/cuicharmap.cxx
@@ -57,7 +57,7 @@ SvxCharacterMap::SvxCharacterMap(weld::Widget* pParent, const
SfxItemSet* pSet,
css::uno::Reference
xFrame)
: SfxDialogController(pParent, u"cui/ui/specialcharacters.ui"_ustr,
u"SpecialCharactersDialog"_ustr)
, m_xVirDev(VclPtr::Create())
-, isSearchMode(true)
+, m_isSearchMode(true)
, m_xFrame(std::move(xFrame))
, m_aCharmapContents(*m_xBuilder, m_xVirDev, true)
, m_aShowChar(m_xVirDev)
@@ -145,7 +145,7 @@ short SvxCharacterMap::run()
void SvxCharacterMap::SetChar( sal_UCS4 c )
{
m_xShowSet->SelectCharacter( c );
-setFavButtonState(OUString(&c, 1), aFont.GetFamilyName());
+setFavButtonState(OUString(&c, 1), m_aFont.GetFamilyName());
}
sal_UCS4 SvxCharacterMap::GetChar() const
@@ -169,13 +169,13 @@ IMPL_LINK_NOARG(SvxCharacterMap, UpdateFavHdl, void*,
void)
void SvxCharacterMap::init()
{
-aFont = m_xVirDev->GetFont();
-aFont.SetTransparent( true );
-aFont.SetFamily( FAMILY_DONTKNOW );
-aFont.SetPitch( PITCH_DONTKNOW );
-aFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
+m_aFont = m_xVirDev->GetFont();
+m_aFont.SetTransparent( true );
+m_aFont.SetFamily( FAMILY_DONTKNOW );
+m_aFont.SetPitch( PITCH_DONTKNOW );
+m_aFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
-OUString aDefStr( aFont.GetFamilyName() );
+OUString aDefStr( m_aFont.GetFamilyName() );
OUString aLastName;
int nCount = m_xVirDev->GetFontFaceCollectionCount();
std::vector aEntries;
@@ -320,7 +320,7 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont )
return;
m_xFontLB->set_active_text(sFontFamilyName);
-aFont = std::move(aTmp);
+m_aFont = std::move(aTmp);
FontSelectHdl(*m_xFontLB);
if (m_xSubsetLB->get_count())
m_xSubsetLB->set_active(0);
@@ -343,19 +343,19 @@ void SvxCharacterMap::insertCharToDoc(const OUString&
sGlyph)
if (m_xFrame.is()) {
uno::Sequence aArgs{
comphelper::makePropertyValue(u"Symbols"_ustr, sGlyph),
-comphelper::makePropertyValue(u"FontName"_ustr,
aFont.GetFamilyName())
+comphelper::makePropertyValue(u"FontName"_ustr,
m_aFont.GetFamilyName())
};
comphelper::dispatchCommand(u".uno:InsertSymbol"_ustr, m_xFrame,
aArgs);
-m_aCharmapContents.updateRecentCharacterList(sGlyph,
aFont.GetFamilyName());
+m_aCharmapContents.updateRecentCharacterList(sGlyph,
m_aFont.GetFamilyName());
} else {
sal_UCS4 cChar =
sGlyph.iterateCodePoints(&o3tl::temporary(sal_Int32(0)));
const SfxItemPool* pPool = m_xOutputSet->GetPool();
m_xOutputSet->Put( SfxStringItem( SID_CHARMAP, sGlyph ) );
-m_xOutputSet->Put( SvxFontItem( aFont.GetFamilyTypeMaybeAskConfig(),
aFont.GetFamilyName(),
-aFont.GetStyleName(), aFont.GetPitchMaybeAskConfig(),
aFont.GetCharSet(), pPool->GetWhichIDFromSlotID(SID_ATTR_CHAR_FONT) ) );
-m_xOutputSet->Put( SfxStringItem( SID_FONT_NAME, aFont.GetFamilyName()
) );
+m_xOutputSet->Put( SvxFontItem( m_aFont.GetFamilyTypeMaybeAskConfig(),
m_aFont.GetFamilyName(),
+m_aFont.GetStyleName(), m_aFont.GetPitchMaybeAskConfig(),
m_aFont.GetCharSet(), pPool->GetWhichIDFromSlotID(SID_ATTR_CHAR_FONT) ) );
+m_xOut
core.git: include/svx svx/source
include/svx/bmpmask.hxx|2 +-
svx/source/dialog/_bmpmask.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5cbf139305e8522d4d4de429389da59e3df6ae9e
Author: Miklos Vajna
AuthorDate: Mon Oct 13 09:21:43 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Oct 13 11:11:53 2025 +0200
svx: prefix members of SvxBmpMaskSelectItem
See tdf#94879 for motivation.
Change-Id: I472be084440f8af940dd48b64911350cd2fb56c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192265
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 27dc520ea499..bfd92f76f0f8 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -47,7 +47,7 @@ class SvxBmpMask;
class SvxBmpMaskSelectItem final : public SfxControllerItem
{
-SvxBmpMask &rBmpMask;
+SvxBmpMask &m_rBmpMask;
virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState
eState,
const SfxPoolItem* pState ) override;
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index e15230ed5c9d..4cf053b2ee38 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -317,7 +317,7 @@ void BmpColorWindow::Paint( vcl::RenderContext&
rRenderContext, const tools::Rec
SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( SvxBmpMask& rMask,
SfxBindings& rBindings ) :
SfxControllerItem ( SID_BMPMASK_EXEC, rBindings ),
-rBmpMask( rMask)
+m_rBmpMask( rMask)
{
}
@@ -329,7 +329,7 @@ void SvxBmpMaskSelectItem::StateChangedAtToolBoxControl(
sal_uInt16 nSID, SfxIte
const SfxBoolItem* pStateItem = dynamic_cast(
pItem );
assert(pStateItem); // SfxBoolItem expected
if (pStateItem)
-rBmpMask.SetExecState( pStateItem->GetValue() );
+m_rBmpMask.SetExecState( pStateItem->GetValue() );
}
}
core.git: include/svx svx/source
include/svx/graphctl.hxx |6 +++---
svx/source/dialog/graphctl.cxx | 12 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 3238b0b0a1bad36071e6b2521b858bba6ff21517
Author: Miklos Vajna
AuthorDate: Mon Sep 22 08:29:55 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 22 09:30:54 2025 +0200
svx: prefix members of GraphCtrlView
See tdf#94879 for motivation.
Change-Id: I407003ea450fce845a8c1d9d17581fe04edec280
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191307
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 617386d32911..4a82c3f91b13 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -130,18 +130,18 @@ public:
class GraphCtrlView final : public SdrView
{
-GraphCtrl& rGraphCtrl;
+GraphCtrl& m_rGraphCtrl;
virtual void MarkListHasChanged() override
{
SdrView::MarkListHasChanged();
-rGraphCtrl.MarkListHasChanged();
+m_rGraphCtrl.MarkListHasChanged();
}
public:
GraphCtrlView(SdrModel& rSdrModel, GraphCtrl* pWindow)
: SdrView(rSdrModel, &pWindow->GetDrawingArea()->get_ref_device())
-, rGraphCtrl(*pWindow)
+, m_rGraphCtrl(*pWindow)
{
}
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index be3df92d5831..2a37ca14b654 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -783,10 +783,10 @@ namespace
rtl::Reference
GraphCtrlView::CreateOverlayManager(OutputDevice& rDevice) const
{
-assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device());
+assert(&rDevice == &m_rGraphCtrl.GetDrawingArea()->get_ref_device());
if (rDevice.GetOutDevType() == OUTDEV_VIRDEV)
{
-rtl::Reference xOverlayManager(new
WeldOverlayManager(rGraphCtrl, rDevice));
+rtl::Reference xOverlayManager(new
WeldOverlayManager(m_rGraphCtrl, rDevice));
InitOverlayManager(xOverlayManager);
return xOverlayManager;
}
@@ -795,10 +795,10 @@ rtl::Reference
GraphCtrlView::CreateOverlayManager
void GraphCtrlView::InvalidateOneWin(OutputDevice& rDevice)
{
-assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device());
+assert(&rDevice == &m_rGraphCtrl.GetDrawingArea()->get_ref_device());
if (rDevice.GetOutDevType() == OUTDEV_VIRDEV)
{
-rGraphCtrl.Invalidate();
+m_rGraphCtrl.Invalidate();
return;
}
SdrView::InvalidateOneWin(rDevice);
@@ -806,10 +806,10 @@ void GraphCtrlView::InvalidateOneWin(OutputDevice&
rDevice)
void GraphCtrlView::InvalidateOneWin(OutputDevice& rDevice, const
tools::Rectangle& rArea)
{
-assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device());
+assert(&rDevice == &m_rGraphCtrl.GetDrawingArea()->get_ref_device());
if (rDevice.GetOutDevType() == OUTDEV_VIRDEV)
{
-rGraphCtrl.Invalidate(rArea);
+m_rGraphCtrl.Invalidate(rArea);
return;
}
SdrView::InvalidateOneWin(rDevice, rArea);
core.git: include/svx svx/source
include/svx/svdobj.hxx |1
svx/source/svdraw/svdobj.cxx | 142 +++--
svx/source/svdraw/svdotxdr.cxx | 61 -
3 files changed, 85 insertions(+), 119 deletions(-)
New commits:
commit e9424085769f6143ba7be9a9abb6e7b57e34bf9b
Author: Laurent Balland
AuthorDate: Sun Sep 21 16:06:25 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 22 08:45:15 2025 +0200
follow-up tdf#168318 Remove duplicate code
Removing duplicate code in resizing SdrObject was not incorrect in
https://gerrit.libreoffice.org/184931
After reverting it, this commit fix the problem to avoid tdf#168318
by using correted position point after rotating and shearing
Change-Id: I908918213141fc911c5e709d3301d83ff0652ad7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191294
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index f9dac6e810bb..4c249b8a1048 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -917,6 +917,7 @@ protected:
virtual std::unique_ptr
CreateObjectSpecificViewContact();
+static void ImpCommonDragCalcRect(const SdrDragStat& rDrag,
tools::Rectangle& rTmpRect, const Point& rPos);
tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
// for GetDragComment
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 90e310d14254..32067bb33d47 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1249,71 +1249,95 @@ void SdrObject::addCropHandles(SdrHdlList& /*rTarget*/)
const
// SdrGrafObj and SwVirtFlyDrawObj
}
-tools::Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const
+void SdrObject::ImpCommonDragCalcRect(const SdrDragStat& rDrag,
tools::Rectangle& rTmpRect, const Point& rPos)
{
-tools::Rectangle aTmpRect(GetSnapRect());
-tools::Rectangle aRect(aTmpRect);
-const SdrHdl* pHdl=rDrag.GetHdl();
-SdrHdlKind eHdl=pHdl==nullptr ? SdrHdlKind::Move : pHdl->GetKind();
-bool bEcke=(eHdl==SdrHdlKind::UpperLeft || eHdl==SdrHdlKind::UpperRight ||
eHdl==SdrHdlKind::LowerLeft || eHdl==SdrHdlKind::LowerRight);
-bool bOrtho=rDrag.GetView()!=nullptr && rDrag.GetView()->IsOrtho();
-bool bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho();
-Point aPos(rDrag.GetNow());
-bool bLft=(eHdl==SdrHdlKind::UpperLeft || eHdl==SdrHdlKind::Left ||
eHdl==SdrHdlKind::LowerLeft);
-bool bRgt=(eHdl==SdrHdlKind::UpperRight || eHdl==SdrHdlKind::Right ||
eHdl==SdrHdlKind::LowerRight);
-bool bTop=(eHdl==SdrHdlKind::UpperRight || eHdl==SdrHdlKind::Upper ||
eHdl==SdrHdlKind::UpperLeft);
-bool bBtm=(eHdl==SdrHdlKind::LowerRight || eHdl==SdrHdlKind::Lower ||
eHdl==SdrHdlKind::LowerLeft);
-if (bLft) aTmpRect.SetLeft(aPos.X() );
-if (bRgt) aTmpRect.SetRight(aPos.X() );
-if (bTop) aTmpRect.SetTop(aPos.Y() );
-if (bBtm) aTmpRect.SetBottom(aPos.Y() );
-if (bOrtho) { // Ortho
-tools::Long nWdt0=aRect.Right() -aRect.Left();
-tools::Long nHgt0=aRect.Bottom()-aRect.Top();
-tools::Long nXMul=aTmpRect.Right() -aTmpRect.Left();
-tools::Long nYMul=aTmpRect.Bottom()-aTmpRect.Top();
-tools::Long nXDiv=nWdt0;
-tools::Long nYDiv=nHgt0;
-bool bXNeg=(nXMul<0)!=(nXDiv<0);
-bool bYNeg=(nYMul<0)!=(nYDiv<0);
-nXMul=std::abs(nXMul);
-nYMul=std::abs(nYMul);
-nXDiv=std::abs(nXDiv);
-nYDiv=std::abs(nYDiv);
-Fraction aXFact(nXMul,nXDiv); // fractions for canceling
-Fraction aYFact(nYMul,nYDiv); // and for comparing
-nXMul=aXFact.GetNumerator();
-nYMul=aYFact.GetNumerator();
-nXDiv=aXFact.GetDenominator();
-nYDiv=aYFact.GetDenominator();
-if (bEcke) { // corner point handles
-bool bUseX=(aXFactGetKind());
+bool bCorner = (eHdl==SdrHdlKind::UpperLeft ||
eHdl==SdrHdlKind::UpperRight || eHdl==SdrHdlKind::LowerLeft ||
eHdl==SdrHdlKind::LowerRight);
+bool bOrtho = rDrag.GetView()!=nullptr && rDrag.GetView()->IsOrtho();
+bool bBigOrtho = bCorner && bOrtho && rDrag.GetView()->IsBigOrtho();
+bool bLft = (eHdl==SdrHdlKind::UpperLeft || eHdl==SdrHdlKind::Left ||
eHdl==SdrHdlKind::LowerLeft);
+bool bRgt = (eHdl==SdrHdlKind::UpperRight || eHdl==SdrHdlKind::Right ||
eHdl==SdrHdlKind::LowerRight);
+bool bTop = (eHdl==SdrHdlKind::UpperRight || eHdl==SdrHdlKind::Upper ||
eHdl==SdrHdlKind::UpperLeft);
+bool bBtm = (eHdl==SdrHdlKind::LowerRight || eHdl==SdrHdlKind::Lower ||
eHdl==SdrHdlKind::LowerLeft);
+if (bLft)
+rTmpRect.SetLeft( rPos.X() );
+else if (bRgt)
+rTmpRect.SetRight( rPos.X() );
+if (bTop)
+rTmpRect.SetTop( rPos.Y() );
+else if (bBtm)
+rTmpRect.SetBottom( rPos.Y() );
+if (bOrtho) // Ortho
+{
+tools::Long nWdt0 = aRect.Right() - aRect.Left();
+tools::
core.git: include/svx svx/source
include/svx/annotation/Annotation.hxx | 29 ++
svx/source/annotation/Annotation.cxx | 151 --
2 files changed, 104 insertions(+), 76 deletions(-)
New commits:
commit dedf0c1bcbbf4fc9e2df3acd69906a01da1737e7
Author: Caolán McNamara
AuthorDate: Sun Sep 7 21:27:51 2025 +0100
Commit: Caolán McNamara
CommitDate: Fri Sep 12 09:37:43 2025 +0200
cid#1659918 Data race condition
and
cid#1660133 Data race condition
cid#1660238 Data race condition
etc.
Change-Id: Ic0278e430c62abda92e8ce0e590a4726a4488b30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190791
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/svx/annotation/Annotation.hxx
b/include/svx/annotation/Annotation.hxx
index 56944c97a20a..e0180d72d431 100644
--- a/include/svx/annotation/Annotation.hxx
+++ b/include/svx/annotation/Annotation.hxx
@@ -89,9 +89,6 @@ struct SVXCORE_DLLPUBLIC AnnotationData
OUString m_Initials;
css::util::DateTime m_DateTime;
OUString m_Text;
-
-void get(Annotation& rAnnotation);
-void set(Annotation& rAnnotation);
};
/** Annotation object, responsible for handling of the annotation.
@@ -103,6 +100,11 @@ class SVXCORE_DLLPUBLIC Annotation
: public ::comphelper::WeakComponentImplHelper,
public ::cppu::PropertySetMixin
{
+private:
+css::uno::Reference getTextRangeImpl(const
std::unique_lock& g);
+OUString GetTextImpl(const std::unique_lock& g);
+void SetTextImpl(OUString const& rText, const
std::unique_lock& g);
+
protected:
SdrPage* mpPage;
UniqueID maUniqueID;
@@ -135,20 +137,8 @@ public:
}
// Changes without triggering notification broadcast
-const css::geometry::RealPoint2D& GetPosition() const { return m_Position;
}
-void SetPosition(const css::geometry::RealPoint2D& rValue) { m_Position =
rValue; }
-
-const css::geometry::RealSize2D& GetSize() const { return m_Size; }
-void SetSize(const css::geometry::RealSize2D& rValue) { m_Size = rValue; }
-
-const OUString& GetAuthor() const { return m_Author; }
-void SetAuthor(const OUString& rValue) { m_Author = rValue; }
-
-const OUString& GetInitials() const { return m_Initials; }
-void SetInitials(const OUString& rValue) { m_Initials = rValue; }
-
-const css::util::DateTime& GetDateTime() const { return m_DateTime; }
-void SetDateTime(const css::util::DateTime& rValue) { m_DateTime = rValue;
}
+void SetPosition(const css::geometry::RealPoint2D& rValue);
+void SetSize(const css::geometry::RealSize2D& rValue);
virtual css::uno::Reference SAL_CALL getTextRange()
override;
@@ -160,6 +150,11 @@ public:
OUString GetText();
void SetText(OUString const& rText);
+
+OString ToJSON(CommentNotificationType nType);
+void toData(AnnotationData& rData);
+void fromData(const AnnotationData& rData);
+
const rtl::Reference& getTextApiObject() {
return m_TextRange; }
SdrModel* GetModel() const;
diff --git a/svx/source/annotation/Annotation.cxx
b/svx/source/annotation/Annotation.cxx
index af516a20b535..0d6caa17d4ee 100644
--- a/svx/source/annotation/Annotation.cxx
+++ b/svx/source/annotation/Annotation.cxx
@@ -22,42 +22,6 @@ namespace sdr::annotation
{
namespace
{
-OString lcl_LOKGetCommentPayload(CommentNotificationType nType, Annotation&
rAnnotation)
-{
-tools::JsonWriter aJsonWriter;
-{
-auto aCommentNode = aJsonWriter.startNode("comment");
-
-aJsonWriter.put(
-"action",
-(nType == CommentNotificationType::Add
- ? "Add"
- : (nType == CommentNotificationType::Remove
-? "Remove"
-: (nType == CommentNotificationType::Modify ? "Modify"
: "???";
-aJsonWriter.put("id", rAnnotation.GetId());
-
-if (nType != CommentNotificationType::Remove)
-{
-aJsonWriter.put("id", rAnnotation.GetId());
-aJsonWriter.put("author", rAnnotation.GetAuthor());
-aJsonWriter.put("dateTime",
utl::toISO8601(rAnnotation.GetDateTime()));
-aJsonWriter.put("text", rAnnotation.GetText());
-SdrPage const* pPage = rAnnotation.getPage();
-aJsonWriter.put("parthash", pPage ?
OString::number(pPage->GetUniqueID()) : OString());
-geometry::RealPoint2D const aPoint = rAnnotation.GetPosition();
-geometry::RealSize2D const aSize = rAnnotation.GetSize();
-tools::Rectangle aRectangle(
-Point(std::round(o3tl::toTwips(aPoint.X, o3tl::Length::mm)),
- std::round(o3tl::toTwips(aPoint.Y, o3tl::Length::mm))),
-Size(std::round(o3tl::toTwips(aSize.Width, o3tl::Length::mm)),
- std::round(o3tl::toTwips(aSize.Height,
o3tl::Length::mm;
-aJsonWriter.put("rectangle", aRectangle.toString());
-}
-}
-
core.git: include/svx svx/source
include/svx/graphctl.hxx |4 ++--
svx/source/dialog/graphctl.cxx |6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit d80498bee5a6005e4b601e9f50ddfb8c20e4ce1f
Author: Miklos Vajna
AuthorDate: Mon Sep 15 08:11:48 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 15 11:00:01 2025 +0200
svx: prefix members of GraphCtrlUserCall
See tdf#94879 for motivation.
Change-Id: I0558dc09ac310b2ade7a39c23bcb22d356e5142d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190939
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 369431e262be..617386d32911 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -30,12 +30,12 @@ class GraphCtrl;
class GraphCtrlUserCall final : public SdrObjUserCall
{
-GraphCtrl& rWin;
+GraphCtrl& m_rWin;
public:
GraphCtrlUserCall(GraphCtrl& rGraphWin)
-: rWin(rGraphWin)
+: m_rWin(rGraphWin)
{}
virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const
tools::Rectangle& rOldBoundRect) override;
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index e2b0429d394c..be3df92d5831 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -37,17 +37,17 @@ void GraphCtrlUserCall::Changed( const SdrObject& rObj,
SdrUserCallType eType, c
{
case SdrUserCallType::MoveOnly:
case SdrUserCallType::Resize:
-rWin.SdrObjChanged( rObj );
+m_rWin.SdrObjChanged( rObj );
break;
case SdrUserCallType::Inserted:
-rWin.SdrObjCreated( rObj );
+m_rWin.SdrObjCreated( rObj );
break;
default:
break;
}
-rWin.QueueIdleUpdate();
+m_rWin.QueueIdleUpdate();
}
GraphCtrl::GraphCtrl(weld::Dialog* pDialog)
core.git: include/svx svx/source
include/svx/svdobj.hxx |1
svx/source/svdraw/svdobj.cxx | 140 -
svx/source/svdraw/svdotxdr.cxx | 62 +-
3 files changed, 119 insertions(+), 84 deletions(-)
New commits:
commit 183941f9e0668b0963e0157f2d9c414b58741fd6
Author: Laurent Balland
AuthorDate: Tue Sep 16 19:16:03 2025 +0200
Commit: Laurent Balland
CommitDate: Tue Sep 16 22:48:25 2025 +0200
tdf#168318 Revert "Rezing SdrObject: Remove duplicate code"
This reverts commit edd0991c3cc1c5ae439e33873c2567ee62d0e710.
Reason for revert: unexpected behavior for rotated object (see tdf#168318)
Change-Id: Ie83c8d35dba12ff7eca7429efb0ff195eacd205b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191041
Tested-by: Jenkins
Reviewed-by: Laurent Balland
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 93f4cff8fda9..f9dac6e810bb 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -917,7 +917,6 @@ protected:
virtual std::unique_ptr
CreateObjectSpecificViewContact();
-static void ImpCommonDragCalcRect(const SdrDragStat& rDrag,
tools::Rectangle& rTmpRect);
tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
// for GetDragComment
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index c945d3ee7362..90e310d14254 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1249,95 +1249,71 @@ void SdrObject::addCropHandles(SdrHdlList& /*rTarget*/)
const
// SdrGrafObj and SwVirtFlyDrawObj
}
-void SdrObject::ImpCommonDragCalcRect(const SdrDragStat& rDrag,
tools::Rectangle& rTmpRect)
+tools::Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const
{
-const tools::Rectangle aRect(rTmpRect);
-const SdrHdl* pHdl = rDrag.GetHdl();
-SdrHdlKind eHdl = (pHdl==nullptr ? SdrHdlKind::Move : pHdl->GetKind());
-bool bCorner = (eHdl==SdrHdlKind::UpperLeft ||
eHdl==SdrHdlKind::UpperRight || eHdl==SdrHdlKind::LowerLeft ||
eHdl==SdrHdlKind::LowerRight);
-bool bOrtho = rDrag.GetView()!=nullptr && rDrag.GetView()->IsOrtho();
-bool bBigOrtho = bCorner && bOrtho && rDrag.GetView()->IsBigOrtho();
+tools::Rectangle aTmpRect(GetSnapRect());
+tools::Rectangle aRect(aTmpRect);
+const SdrHdl* pHdl=rDrag.GetHdl();
+SdrHdlKind eHdl=pHdl==nullptr ? SdrHdlKind::Move : pHdl->GetKind();
+bool bEcke=(eHdl==SdrHdlKind::UpperLeft || eHdl==SdrHdlKind::UpperRight ||
eHdl==SdrHdlKind::LowerLeft || eHdl==SdrHdlKind::LowerRight);
+bool bOrtho=rDrag.GetView()!=nullptr && rDrag.GetView()->IsOrtho();
+bool bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho();
Point aPos(rDrag.GetNow());
-bool bLft = (eHdl==SdrHdlKind::UpperLeft || eHdl==SdrHdlKind::Left ||
eHdl==SdrHdlKind::LowerLeft);
-bool bRgt = (eHdl==SdrHdlKind::UpperRight || eHdl==SdrHdlKind::Right ||
eHdl==SdrHdlKind::LowerRight);
-bool bTop = (eHdl==SdrHdlKind::UpperRight || eHdl==SdrHdlKind::Upper ||
eHdl==SdrHdlKind::UpperLeft);
-bool bBtm = (eHdl==SdrHdlKind::LowerRight || eHdl==SdrHdlKind::Lower ||
eHdl==SdrHdlKind::LowerLeft);
-if (bLft)
-rTmpRect.SetLeft(aPos.X() );
-else if (bRgt)
-rTmpRect.SetRight(aPos.X() );
-if (bTop)
-rTmpRect.SetTop(aPos.Y() );
-else if (bBtm)
-rTmpRect.SetBottom(aPos.Y() );
-if (bOrtho) // Ortho
-{
-tools::Long nWdt0 = aRect.Right() - aRect.Left();
-tools::Long nHgt0 = aRect.Bottom()- aRect.Top();
-tools::Long nXMul = rTmpRect.Right() - rTmpRect.Left();
-tools::Long nYMul = rTmpRect.Bottom()- rTmpRect.Top();
-tools::Long nXDiv = nWdt0;
-tools::Long nYDiv = nHgt0;
-bool bXNeg = ((nXMul<0) != (nXDiv<0));
-bool bYNeg = ((nYMul<0) != (nYDiv<0));
-nXMul = std::abs(nXMul);
-nYMul = std::abs(nYMul);
-nXDiv = std::abs(nXDiv);
-nYDiv = std::abs(nYDiv);
-Fraction aXFact(nXMul, nXDiv); // fractions for canceling
-Fraction aYFact(nYMul, nYDiv); // and for comparing
-nXMul = aXFact.GetNumerator();
-nYMul = aYFact.GetNumerator();
-nXDiv = aXFact.GetDenominator();
-nYDiv = aYFact.GetDenominator();
-if (bCorner) // corner point handles
-{
-bool bUseX = ((aXFactGetKind();
+bool bEcke=(eHdl==SdrHdlKind::UpperLeft || eHdl==SdrHdlKind::UpperRight ||
eHdl==SdrHdlKind::LowerLeft || eHdl==SdrHdlKind::LowerRight);
+bool bOrtho=rDrag.GetView()!=nullptr && rDrag.GetView()->IsOrtho();
+bool bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho();
Point aPos(rDrag.GetNow());
// Unrotate:
if (maGeo.m_nRotationAngle)
RotatePoint(aPos,aTmpRect.TopLeft(),-maGeo.mfSinRotationAngle,maGeo.mfCosRotationAngle);
// Unshear:
if (maGeo.m_nShearAngle)
ShearPoint(aPos,aTmpRect.TopLeft(),-maGeo.mfTanShearAngle);
-ImpCommonDragCalcRect( rDra
core.git: include/svx svx/source
include/svx/sidebar/LinePropertyPanelBase.hxx |1 +
svx/source/sidebar/line/LinePropertyPanelBase.cxx |7 +++
2 files changed, 8 insertions(+)
New commits:
commit 830a06afe26279edc3527ccdecb5c9e2b347cfd5
Author: Caolán McNamara
AuthorDate: Sun Sep 14 19:55:01 2025 +0100
Commit: Caolán McNamara
CommitDate: Sun Sep 14 22:02:58 2025 +0200
Resolves: tdf#168306 set current line width at popup time
Change-Id: I82c8151566459d1429cd3b4517b43ace3fbeca60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190934
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx
b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 6ac23b6e3b6b..ebb0e1663718 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -113,6 +113,7 @@ private:
void Initialize();
DECL_DLLPRIVATE_LINK(ToolboxWidthSelectHdl, const OUString&, void);
+DECL_DLLPRIVATE_LINK(ToolboxWidthToggleMenuHdl, const OUString&, void);
DECL_DLLPRIVATE_LINK(ChangeTransparentHdl, weld::MetricSpinButton&, void);
};
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index afbc03983cef..cec5d9a1dc2b 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -124,6 +124,7 @@ void LinePropertyPanelBase::Initialize()
Graphic aGraf(maIMGWidthIcon[0]);
mxTBWidth->set_item_image(SELECTWIDTH, aGraf.GetXGraphic());
mxTBWidth->connect_clicked(LINK(this, LinePropertyPanelBase,
ToolboxWidthSelectHdl));
+mxTBWidth->connect_menu_toggled(LINK(this, LinePropertyPanelBase,
ToolboxWidthToggleMenuHdl));
mxMFTransparent->connect_value_changed(LINK(this, LinePropertyPanelBase,
ChangeTransparentHdl));
@@ -193,6 +194,12 @@ IMPL_LINK_NOARG(LinePropertyPanelBase,
ToolboxWidthSelectHdl, const OUString&, v
mxTBWidth->set_menu_item_active(SELECTWIDTH,
!mxTBWidth->get_menu_item_active(SELECTWIDTH));
}
+IMPL_LINK_NOARG(LinePropertyPanelBase, ToolboxWidthToggleMenuHdl, const
OUString&, void)
+{
+if (mxTBWidth->get_menu_item_active(SELECTWIDTH))
+mxLineWidthPopup->SetWidthSelect(mnWidthCoreValue, mbWidthValuable,
meMapUnit);
+}
+
void LinePropertyPanelBase::EndLineWidthPopup()
{
mxTBWidth->set_menu_item_active(SELECTWIDTH, false);
core.git: include/svx svx/source
include/svx/graphctl.hxx | 52 +++
svx/source/dialog/contwnd.cxx | 44 +++---
svx/source/dialog/graphctl.cxx | 272 -
svx/source/dialog/imapwnd.cxx | 60 -
4 files changed, 214 insertions(+), 214 deletions(-)
New commits:
commit de44e7966df0e0a98da032fcd2552dc22a7e991b
Author: Miklos Vajna
AuthorDate: Mon Sep 8 08:11:36 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 8 09:44:42 2025 +0200
svx: prefix members of GraphCtrl
See tdf#94879 for motivation.
Change-Id: I6284736a206255842d8f54699db4db9881497a38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190651
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 9a59b5b6d3a9..369431e262be 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -48,19 +48,19 @@ class SAL_DLLPUBLIC_RTTI GraphCtrl : public
weld::CustomWidgetController
friend class GraphCtrlView;
friend class GraphCtrlUserCall;
-Graphic aGraphic;
-ScopedVclPtrInstance xVD;
-IdleaUpdateIdle;
-Link aMousePosLink;
-Link aGraphSizeLink;
-Link aUpdateLink;
-MapMode aMap100;
-SizeaGraphSize;
-Point aMousePos;
-std::unique_ptr pUserCall;
-SdrObjKind eObjKind;
-sal_uInt16 nPolyEdit;
-boolbEditMode;
+Graphic maGraphic;
+ScopedVclPtrInstance mxVD;
+IdlemaUpdateIdle;
+Link maMousePosLink;
+Link maGraphSizeLink;
+Link maUpdateLink;
+MapMode maMap100;
+SizemaGraphSize;
+Point maMousePos;
+std::unique_ptr mpUserCall;
+SdrObjKind meObjKind;
+sal_uInt16 mnPolyEdit;
+boolmbEditMode;
boolmbSdrMode;
boolmbInIdleUpdate;
weld::Dialog* mpDialog;
@@ -71,8 +71,8 @@ class SAL_DLLPUBLIC_RTTI GraphCtrl : public
weld::CustomWidgetController
protected:
-std::unique_ptr pModel;
-std::unique_ptr pView;
+std::unique_ptr mpModel;
+std::unique_ptr mpView;
virtual voidPaint( vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect ) override;
virtual voidResize() override;
@@ -89,7 +89,7 @@ protected:
void GraphicToVD();
-SdrObjUserCall* GetSdrUserCall() { return pUserCall.get(); }
+SdrObjUserCall* GetSdrUserCall() { return mpUserCall.get(); }
public:
@@ -98,28 +98,28 @@ public:
SVX_DLLPUBLIC virtual ~GraphCtrl() override;
SVX_DLLPUBLIC void SetGraphic( const Graphic& rGraphic, bool bNewModel =
true );
-const Graphic& GetGraphic() const { return aGraphic; }
-const Size& GetGraphicSize() const { return aGraphSize; }
+const Graphic& GetGraphic() const { return maGraphic; }
+const Size& GetGraphicSize() const { return maGraphSize; }
-const Point&GetMousePos() const { return aMousePos; }
+const Point&GetMousePos() const { return maMousePos; }
voidSetEditMode( const bool bEditMode );
voidSetPolyEditMode( const sal_uInt16 nPolyEdit );
-sal_uInt16 GetPolyEditMode() const { return nPolyEdit; }
+sal_uInt16 GetPolyEditMode() const { return mnPolyEdit; }
voidSetObjKind( const SdrObjKind eObjKind );
-SdrModel* GetSdrModel() const { return pModel.get(); }
-SdrView*GetSdrView() const { return pView.get(); }
+SdrModel* GetSdrModel() const { return mpModel.get(); }
+SdrView*GetSdrView() const { return mpView.get(); }
SdrObject* GetSelectedSdrObject() const;
-boolIsChanged() const { return mbSdrMode &&
pModel->IsChanged(); }
+boolIsChanged() const { return mbSdrMode &&
mpModel->IsChanged(); }
-voidSetMousePosLink( const Link& rLink )
{ aMousePosLink = rLink; }
+voidSetMousePosLink( const Link& rLink )
{ maMousePosLink = rLink; }
-voidSetGraphSizeLink( const Link& rLink )
{ aGraphSizeLink = rLink; }
+voidSetGraphSizeLink( const Link& rLink )
{ maGraphSizeLink = rLink; }
-voidSetUpdateLink( const Link& rLink ) {
aUpdateLink = rLink; }
+voidSetUpdateLink( const Link& rLink ) {
maUpdateLink = rLink; }
voidQueueIdleUpdate();
voidSetSdrMode(bool b);
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 4ff35991031b..0fff4c3a 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -42,7 +42,7 @@ ContourWindow::ContourWindow(weld::Dialog* pDialog)
void ContourWindow::SetPo
core.git: include/svx svx/source
include/svx/charmap.hxx | 32 +++
svx/source/dialog/charmap.cxx | 146 ++--
svx/source/dialog/searchcharmap.cxx | 34
3 files changed, 106 insertions(+), 106 deletions(-)
New commits:
commit 0c4f17416526808e932787e5cba65a58771ad18d
Author: Miklos Vajna
AuthorDate: Mon Sep 1 08:20:18 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 1 09:24:16 2025 +0200
svx: prefix members of SvxShowCharSet
See tdf#94879 for motivation.
Change-Id: I8c65bd1ba1bd143a4a90797ba2f3cec67a51b951
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190456
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 16699f4949a0..7ecdce3af61d 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -67,12 +67,12 @@ public:
virtual sal_UCS4GetCharFromIndex(int index) const;
voidcreateContextMenu(const Point& rPosition);
-voidSetDoubleClickHdl( const Link& rLink
) { aDoubleClkHdl = rLink; }
+voidSetDoubleClickHdl( const Link& rLink
) { maDoubleClkHdl = rLink; }
voidSetReturnKeyPressHdl( const Link&
rLink ) { m_aReturnKeypressHdl = rLink; }
-voidSetSelectHdl( const Link& rHdl ) {
aSelectHdl = rHdl; }
-voidSetHighlightHdl( const Link& rHdl )
{ aHighHdl = rHdl; }
-voidSetPreSelectHdl( const Link& rHdl )
{ aPreSelectHdl = rHdl; }
-voidSetFavClickHdl( const Link& rHdl ) {
aFavClickHdl = rHdl; }
+voidSetSelectHdl( const Link& rHdl ) {
maSelectHdl = rHdl; }
+voidSetHighlightHdl( const Link& rHdl )
{ maHighHdl = rHdl; }
+voidSetPreSelectHdl( const Link& rHdl )
{ maPreSelectHdl = rHdl; }
+voidSetFavClickHdl( const Link& rHdl ) {
maFavClickHdl = rHdl; }
static sal_uInt32& getSelectedChar();
SVX_DLLPUBLIC void SetFont( const vcl::Font& rFont );
vcl::Font const & GetFont() const { return maFont; }
@@ -89,8 +89,8 @@ public:
voidOutputIndex( int index );
voidDeSelect();
static void CopyToClipboard(const OUString& str);
-bool IsSelected(sal_uInt16 _nPos) const { return _nPos ==
nSelectedIndex; }
-sal_uInt16 GetSelectIndexId() const { return
sal::static_int_cast(nSelectedIndex); }
+bool IsSelected(sal_uInt16 _nPos) const { return _nPos ==
mnSelectedIndex; }
+sal_uInt16 GetSelectIndexId() const { return
sal::static_int_cast(mnSelectedIndex); }
static sal_uInt16 GetRowPos(sal_uInt16 _nPos);
static sal_uInt16 GetColumnPos(sal_uInt16 _nPos);
@@ -118,24 +118,24 @@ private:
protected:
typedef std::map >
ItemsMap;
ItemsMapm_aItems;
-Link aDoubleClkHdl;
+Link maDoubleClkHdl;
Link m_aReturnKeypressHdl;
-Link aSelectHdl;
-Link aFavClickHdl;
-Link aHighHdl;
-Link aPreSelectHdl;
+Link maSelectHdl;
+Link maFavClickHdl;
+Link maHighHdl;
+Link maPreSelectHdl;
std::deque maFavCharList;
std::deque maFavCharFontList;
rtl::Reference m_xAccessible;
-tools::LongnX;
-tools::LongnY;
+tools::LongmnX;
+tools::LongmnY;
tools::Longm_nXGap;
tools::Longm_nYGap;
-boolbDrag;
+boolmbDrag;
-sal_Int32 nSelectedIndex;
+sal_Int32 mnSelectedIndex;
FontCharMapRef mxFontCharMap;
SizemaFontSize;
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index c40d8895d22a..71c81261350d 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -67,8 +67,8 @@ FactoryFunction SvxShowCharSet::GetUITestFactory() const
SvxShowCharSet::SvxShowCharSet(std::unique_ptr
pScrolledWindow, const VclPtr& rVirDev)
: mxVirDev(rVirDev)
, mxScrollArea(std::move(pScrolledWindow))
-, nX(0)
-, nY(0)
+, mnX(0)
+, mnY(0)
, maFontSize(0, 0)
, mbRecalculateFont(true)
, mbUpdateForeground(true)
@@ -84,17 +84,17 @@ void SvxShowCharSet::SetDrawingArea(weld::DrawingArea*
pDrawingArea)
Size aSize(COLUMN_COUNT * pDrawingArea->get_approximate_digit_width() *
5.25,
ROW_COUNT * pDrawingArea->get_text_height() * 2);
-nX = aSize.Width() / COLUMN_COUNT;
-nY = aSize.Height() / ROW_COUNT;
+mnX = aSize.Width() / COLUMN_COUNT;
+mnY = aSize.Height() / ROW_COUNT;
// tdf#121232 set a size request that will result in a 0 m_nXGap by default
-mxScrollArea->set_size_request(COLUMN_COUNT * nX +
mxScrollArea->get_scroll_thickness() + 2,
- ROW_COUNT * nY)
core.git: include/svx svx/source
include/svx/dlgctrl.hxx | 16 +--
svx/source/dialog/dlgctrl.cxx | 180 +-
2 files changed, 98 insertions(+), 98 deletions(-)
New commits:
commit 2c03412a023d2f2aa569eb97b21f4006ee9a52dd
Author: Miklos Vajna
AuthorDate: Mon Aug 25 08:38:19 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Aug 25 09:58:39 2025 +0200
svx: prefix members of SvxRectCtl
See tdf#94879 for motivation.
Change-Id: I1819d976751be0f1b2bf8eafc72db7db53595fa7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190150
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index e439fbdca456..803fceb8582c 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -74,13 +74,13 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxRectCtl : public
weld::CustomWidgetContro
{
private:
SvxTabPage* m_pPage;
-rtl::Reference pAccContext;
-sal_uInt16 nBorderWidth;
-Point aPtLT, aPtMT, aPtRT;
-Point aPtLM, aPtMM, aPtRM;
-Point aPtLB, aPtMB, aPtRB;
-Point aPtNew;
-RectPoint eRP, eDefRP;
+rtl::Reference m_pAccContext;
+sal_uInt16 m_nBorderWidth;
+Point m_aPtLT, m_aPtMT, m_aPtRT;
+Point m_aPtLM, m_aPtMM, m_aPtRM;
+Point m_aPtLB, m_aPtMB, m_aPtRB;
+Point m_aPtNew;
+RectPoint m_eRP, m_eDefRP;
Bitmap maBitmap;
CTL_STATE m_nState;
bool mbCompleteDisable : 1;
@@ -115,7 +115,7 @@ public:
virtual void StyleUpdated() override;
voidReset();
-RectPoint GetActualRP() const { return eRP;}
+RectPoint GetActualRP() const { return m_eRP;}
voidSetActualRP( RectPoint eNewRP );
voidSetState( CTL_STATE nState );
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index cdc2396af9dc..2434a26fc911 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -63,9 +63,9 @@ Bitmap& SvxRectCtl::GetRectBitmap()
SvxRectCtl::SvxRectCtl(SvxTabPage* pPage)
: m_pPage(pPage)
-, nBorderWidth(Application::GetDefaultDevice()->LogicToPixel(Size(200, 0),
MapMode(MapUnit::Map100thMM)).Width())
-, eRP(RectPoint::MM)
-, eDefRP(RectPoint::MM)
+, m_nBorderWidth(Application::GetDefaultDevice()->LogicToPixel(Size(200,
0), MapMode(MapUnit::Map100thMM)).Width())
+, m_eRP(RectPoint::MM)
+, m_eDefRP(RectPoint::MM)
, m_nState(CTL_STATE::NONE)
, mbCompleteDisable(false)
{
@@ -82,15 +82,15 @@ void SvxRectCtl::SetDrawingArea(weld::DrawingArea*
pDrawingArea)
void SvxRectCtl::SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder)
{
-nBorderWidth = Application::GetDefaultDevice()->LogicToPixel(Size(nBorder,
0), MapMode(MapUnit::Map100thMM)).Width();
-eDefRP = eRpt;
+m_nBorderWidth =
Application::GetDefaultDevice()->LogicToPixel(Size(nBorder, 0),
MapMode(MapUnit::Map100thMM)).Width();
+m_eDefRP = eRpt;
Resize();
}
SvxRectCtl::~SvxRectCtl()
{
#if !ENABLE_WASM_STRIP_ACCESSIBILITY
-pAccContext.clear();
+m_pAccContext.clear();
#endif
}
@@ -101,17 +101,17 @@ void SvxRectCtl::Resize()
void SvxRectCtl::Resize_Impl(const Size &rSize)
{
-aPtLT = Point( 0 + nBorderWidth, 0 + nBorderWidth );
-aPtMT = Point( rSize.Width() / 2, 0 + nBorderWidth );
-aPtRT = Point( rSize.Width() - nBorderWidth, 0 + nBorderWidth );
+m_aPtLT = Point( 0 + m_nBorderWidth, 0 + m_nBorderWidth );
+m_aPtMT = Point( rSize.Width() / 2, 0 + m_nBorderWidth );
+m_aPtRT = Point( rSize.Width() - m_nBorderWidth, 0 + m_nBorderWidth );
-aPtLM = Point( 0 + nBorderWidth, rSize.Height() / 2 );
-aPtMM = Point( rSize.Width() / 2, rSize.Height() / 2 );
-aPtRM = Point( rSize.Width() - nBorderWidth, rSize.Height() / 2 );
+m_aPtLM = Point( 0 + m_nBorderWidth, rSize.Height() / 2 );
+m_aPtMM = Point( rSize.Width() / 2, rSize.Height() / 2 );
+m_aPtRM = Point( rSize.Width() - m_nBorderWidth, rSize.Height() / 2 );
-aPtLB = Point( 0 + nBorderWidth,rSize.Height() - nBorderWidth );
-aPtMB = Point( rSize.Width() / 2, rSize.Height() - nBorderWidth );
-aPtRB = Point( rSize.Width() - nBorderWidth, rSize.Height() - nBorderWidth
);
+m_aPtLB = Point( 0 + m_nBorderWidth,rSize.Height() - m_nBorderWidth );
+m_aPtMB = Point( rSize.Width() / 2, rSize.Height() - m_nBorderWidth );
+m_aPtRB = Point( rSize.Width() - m_nBorderWidth, rSize.Height() -
m_nBorderWidth );
Reset();
StyleUpdated();
@@ -184,12 +184,12 @@ bool SvxRectCtl::MouseButtonDown(const MouseEvent& rMEvt)
// CompletelyDisabled() added to have a disabled state for SvxRectCtl
if(!IsCompletelyDisabled())
{
-aPtNew = GetApproxLogPtFromPixPt( rMEvt.GetPosPixel() );
-eRP = GetRPFromPoint( aPtNew );
-SetActualRP( eRP );
+m_aPtNew = GetApproxLogPtFromPixPt( rMEvt.GetPosPixel() );
+m_eRP = GetRPFromPoint( m_aPtNew
core.git: include/svx svx/source
include/svx/compatflags.hxx|1
svx/source/svdraw/svdmodel.cxx | 57 +++--
2 files changed, 17 insertions(+), 41 deletions(-)
New commits:
commit b2d3a4dd250ad6156f904d6b755a6faa4bfadd60
Author: Mike Kaganski
AuthorDate: Tue Aug 19 12:59:07 2025 +0200
Commit: Mike Kaganski
CommitDate: Tue Aug 19 16:56:38 2025 +0200
Use enumarray for SdrModel's compat flags
Simplifies adding new flags
Change-Id: I9db6fab29676f620107d3364d7318790e4512e1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189910
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/include/svx/compatflags.hxx b/include/svx/compatflags.hxx
index 9a64bd2bab80..4caecf18be55 100644
--- a/include/svx/compatflags.hxx
+++ b/include/svx/compatflags.hxx
@@ -14,6 +14,7 @@ enum class SdrCompatibilityFlag
LegacyFontwork, ///< for tdf#148000 false == Fontwork works in PowerPoint
compat mode
ConnectorUseSnapRect, ///< for tdf#149756
IgnoreBreakAfterMultilineField, ///< for tdf#148966
+LAST = IgnoreBreakAfterMultilineField /// add new items above
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 7e1948dc0597..c3d3271a99e7 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -70,6 +70,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -85,20 +86,19 @@ struct SdrModelImpl
{
SfxUndoManager* mpUndoManager;
SdrUndoFactory* mpUndoFactory;
-bool mbAnchoredTextOverflowLegacy; // tdf#99729 compatibility flag
-bool mbLegacyFontwork; // tdf#148000 compatibility flag
-bool mbConnectorUseSnapRect; // tdf#149756 compatibility flag
-bool mbIgnoreBreakAfterMultilineField; ///< tdf#148966 compatibility flag
+o3tl::enumarray maCompatFlags;
std::shared_ptr mpTheme;
std::shared_ptr mpThemeColorChanger;
SdrModelImpl()
: mpUndoManager(nullptr)
, mpUndoFactory(nullptr)
-, mbAnchoredTextOverflowLegacy(false)
-, mbLegacyFontwork(false)
-, mbConnectorUseSnapRect(false)
-, mbIgnoreBreakAfterMultilineField(false)
+, maCompatFlags{
+false, // tdf#99729 AnchoredTextOverflowLegacy
+false, // tdf#148000 LegacyFontwork
+false, // tdf#149756 ConnectorUseSnapRect
+false, // tdf#148966 IgnoreBreakAfterMultilineField
+ }
, mpTheme(new model::Theme(u"Office"_ustr))
{}
@@ -1742,38 +1742,12 @@ void SdrModel::SetAddExtLeading( bool bEnabled )
void SdrModel::SetCompatibilityFlag(SdrCompatibilityFlag eFlag, bool bEnabled)
{
-switch (eFlag)
-{
-case SdrCompatibilityFlag::AnchoredTextOverflowLegacy:
-mpImpl->mbAnchoredTextOverflowLegacy = bEnabled;
-break;
-case SdrCompatibilityFlag::LegacyFontwork:
-mpImpl->mbLegacyFontwork = bEnabled;
-break;
-case SdrCompatibilityFlag::ConnectorUseSnapRect:
-mpImpl->mbConnectorUseSnapRect = bEnabled;
-break;
-case SdrCompatibilityFlag::IgnoreBreakAfterMultilineField:
-mpImpl->mbIgnoreBreakAfterMultilineField = bEnabled;
-break;
-}
+mpImpl->maCompatFlags[eFlag] = bEnabled;
}
bool SdrModel::GetCompatibilityFlag(SdrCompatibilityFlag eFlag) const
{
-switch (eFlag)
-{
-case SdrCompatibilityFlag::AnchoredTextOverflowLegacy:
-return mpImpl->mbAnchoredTextOverflowLegacy;
-case SdrCompatibilityFlag::LegacyFontwork:
-return mpImpl->mbLegacyFontwork;
-case SdrCompatibilityFlag::ConnectorUseSnapRect:
-return mpImpl->mbConnectorUseSnapRect;
-case SdrCompatibilityFlag::IgnoreBreakAfterMultilineField:
-return mpImpl->mbIgnoreBreakAfterMultilineField;
-default:
-return false;
-}
+return mpImpl->maCompatFlags[eFlag];
}
void SdrModel::ReformatAllTextObjects()
@@ -1816,7 +1790,7 @@ void SdrModel::ReadUserDataSequenceValue(const
beans::PropertyValue* pValue)
bool bBool = false;
if (pValue->Value >>= bBool)
{
-mpImpl->mbAnchoredTextOverflowLegacy = bBool;
+
SetCompatibilityFlag(SdrCompatibilityFlag::AnchoredTextOverflowLegacy, bBool);
}
}
else if (pValue->Name == "ConnectorUseSnapRect")
@@ -1824,15 +1798,16 @@ void SdrModel::ReadUserDataSequenceValue(const
beans::PropertyValue* pValue)
bool bBool = false;
if (pValue->Value >>= bBool)
{
-mpImpl->mbConnectorUseSnapRect = bBool;
+SetCompatibilityFlag(SdrCompatibilityFlag::ConnectorUseSnapRect,
bBool);
}
}
else if (pValue->Name == "LegacySingleLineFontwork")
{
bool bBool = false;
-if ((pValue->Value >>= b
core.git: include/svx svx/source
include/svx/dlgctrl.hxx | 20
svx/source/dialog/dlgctrl.cxx | 96 +-
2 files changed, 58 insertions(+), 58 deletions(-)
New commits:
commit 5e6a0e785a118b15bbdddc90fd09ce26e7e6da0b
Author: Miklos Vajna
AuthorDate: Mon Aug 18 08:07:06 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Aug 18 09:39:40 2025 +0200
svx: prefix members of SvxPixelCtl
See tdf#94879 for motivation.
Change-Id: Id8d461b1cbb4fd9e0a80bd621aebeac21e68a24f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189838
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 07d6f0d034c4..e439fbdca456 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -147,13 +147,13 @@ private:
SvxTabPage* m_pPage;
-Color aPixelColor;
-Color aBackgroundColor;
-SizeaRectSize;
+Color m_aPixelColor;
+Color m_aBackgroundColor;
+Sizem_aRectSize;
std::array maPixelData;
-boolbPaintable;
+boolm_bPaintable;
//Add member identifying position
-Point aFocusPosition;
+Point m_aFocusPosition;
rtl::Reference m_xAccess;
SAL_DLLPRIVATE tools::Rectangle implCalFocusRect( const Point& aPosition
);
@@ -177,15 +177,15 @@ public:
voidSetXBitmap( const Bitmap& rBitmap );
-voidSetPixelColor( const Color& rCol ) { aPixelColor = rCol; }
-voidSetBackgroundColor( const Color& rCol ) { aBackgroundColor = rCol;
}
+voidSetPixelColor( const Color& rCol ) { m_aPixelColor = rCol; }
+voidSetBackgroundColor( const Color& rCol ) { m_aBackgroundColor =
rCol; }
static sal_uInt16 GetLineCount() { return nLines; }
SAL_DLLPRIVATE sal_uInt8 GetBitmapPixel( const sal_uInt16 nPixelNumber )
const;
std::array const & GetBitmapPixelPtr() const { return
maPixelData; }
-voidSetPaintable( bool bTmp ) { bPaintable = bTmp; }
+voidSetPaintable( bool bTmp ) { m_bPaintable = bTmp; }
voidReset();
css::uno::Reference getAccessibleParent()
const { return GetDrawingArea()->get_accessible_parent(); }
@@ -193,8 +193,8 @@ public:
a11yrelationset get_accessible_relation_set() const { return
GetDrawingArea()->get_accessible_relation_set(); }
static tools::Long GetSquares() { return nSquares ; }
-tools::Long GetWidth() const { return aRectSize.getWidth() ; }
-tools::Long GetHeight() const { return aRectSize.getHeight() ; }
+tools::Long GetWidth() const { return m_aRectSize.getWidth() ; }
+tools::Long GetHeight() const { return m_aRectSize.getHeight() ; }
//Device Pixel .
SAL_DLLPRIVATE tools::Long ShowPosition( const Point &pt);
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 86ea226133d8..84e5ba5a34f5 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -587,8 +587,8 @@ rtl::Reference
SvxPixelCtl::CreateAccessible()
tools::Long SvxPixelCtl::PointToIndex(const Point &aPt) const
{
-tools::Long nX = aPt.X() * nLines / aRectSize.Width();
-tools::Long nY = aPt.Y() * nLines / aRectSize.Height();
+tools::Long nX = aPt.X() * nLines / m_aRectSize.Width();
+tools::Long nY = aPt.Y() * nLines / m_aRectSize.Height();
return nX + nY * nLines ;
}
@@ -601,28 +601,28 @@ Point SvxPixelCtl::IndexToPoint(tools::Long nIndex) const
sal_Int32 nYIndex = nIndex / nLines;
Point aPtTl;
-aPtTl.setY( aRectSize.Height() * nYIndex / nLines + 1 );
-aPtTl.setX( aRectSize.Width() * nXIndex / nLines + 1 );
+aPtTl.setY( m_aRectSize.Height() * nYIndex / nLines + 1 );
+aPtTl.setX( m_aRectSize.Width() * nXIndex / nLines + 1 );
return aPtTl;
}
tools::Long SvxPixelCtl::GetFocusPosIndex() const
{
-return aFocusPosition.getX() + aFocusPosition.getY() * nLines ;
+return m_aFocusPosition.getX() + m_aFocusPosition.getY() * nLines ;
}
tools::Long SvxPixelCtl::ShowPosition( const Point &rPt)
{
-sal_Int32 nX = rPt.X() * nLines / aRectSize.Width();
-sal_Int32 nY = rPt.Y() * nLines / aRectSize.Height();
+sal_Int32 nX = rPt.X() * nLines / m_aRectSize.Width();
+sal_Int32 nY = rPt.Y() * nLines / m_aRectSize.Height();
ChangePixel( nX + nY * nLines );
//Solution:Set new focus position and repaint
-aFocusPosition.setX(nX);
-aFocusPosition.setY(nY);
-Invalidate(tools::Rectangle(Point(0,0),aRectSize));
+m_aFocusPosition.setX(nX);
+m_aFocusPosition.setY(nY);
+Invalidate(tools::Rectangle(Point(0,0),m_aRectSize));
if (m_pPage)
m_pPage->PointChanged(GetDrawingArea(), RectPoint::MM ); // RectPoint
is dummy
@@ -633,8 +633,8 @@ tools::Long SvxPixelCtl::ShowPosition( const Point &rPt)
SvxPixelCtl::SvxPixelCtl(SvxTabPage* pPage)
: m_pPage(pPage)
-, bPaintable(true)
-, aFocusPosition(0,0)
+, m_bP
core.git: include/svx svx/source
include/svx/AccessibleShape.hxx |2 +-
svx/source/accessibility/AccessibleShape.cxx |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 51551c9571c77b22ce8daffb7a3cc77bbd694393
Author: Miklos Vajna
AuthorDate: Wed Aug 13 08:14:48 2025 +0200
Commit: Miklos Vajna
CommitDate: Wed Aug 13 20:34:29 2025 +0200
svx: prefix members of accessibility::AccessibleShape
See tdf#94879 for motivation.
Change-Id: Ie711dc7840fa2a45a808fc5ed957cc6be3c48aa5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189472
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index aa6f7ebb7fe9..e50652ee18c1 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -404,7 +404,7 @@ private:
AccessibleShape (const AccessibleShape&) = delete;
AccessibleShape& operator= (const AccessibleShape&) = delete;
//Old accessible name
-OUString aAccName;
+OUString m_aAccName;
/** Call this method when the title, name, or description of the mxShape
member (may) have been changed.
diff --git a/svx/source/accessibility/AccessibleShape.cxx
b/svx/source/accessibility/AccessibleShape.cxx
index bdbadbacd0d4..8bffd33c8ead 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -920,17 +920,17 @@ OUString AccessibleShape::GetFullAccessibleName
(AccessibleShape *shape)
//If the new produced name if not the same with last,notify name changed
//Event
-if (aAccName != sName && !aAccName.isEmpty())
+if (m_aAccName != sName && !m_aAccName.isEmpty())
{
uno::Any aOldValue, aNewValue;
-aOldValue <<= aAccName;
+aOldValue <<= m_aAccName;
aNewValue <<= sName;
CommitChange(
AccessibleEventId::NAME_CHANGED,
aNewValue,
aOldValue, -1);
}
-aAccName = sName;
+m_aAccName = sName;
return sName;
}
core.git: include/svx svx/source
include/svx/sdr/overlay/overlayanimatedbitmapex.hxx |8
svx/source/sdr/overlay/overlayanimatedbitmapex.cxx | 12 ++--
svx/source/svdraw/svdhdl.cxx| 10 +-
3 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 14348d8d408c6f1c1a67c0b65f612f730af1be3a
Author: Noel Grandin
AuthorDate: Wed Aug 6 09:21:33 2025 +0200
Commit: Noel Grandin
CommitDate: Wed Aug 6 14:43:22 2025 +0200
BitmapEx->Bitmap in OverlayAnimatedBitmapEx
normal that Bitmap can handle transparency
Change-Id: Ia42e20a0c969c34de22ab35c54496ed608593ef6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188990
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index cf1b411366a3..3244a391c3ad 100644
--- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -29,8 +29,8 @@ namespace sdr::overlay
class SVXCORE_DLLPUBLIC OverlayAnimatedBitmapEx final : public
OverlayObjectWithBasePosition
{
// the Bitmaps
-BitmapExmaBitmapEx1;
-BitmapExmaBitmapEx2;
+Bitmap maBitmap1;
+Bitmap maBitmap2;
// position of the basePosition inside the Bitmaps, in pixels
sal_uInt16 mnCenterX1;
@@ -54,8 +54,8 @@ namespace sdr::overlay
public:
OverlayAnimatedBitmapEx(
const basegfx::B2DPoint& rBasePos,
-const BitmapEx& rBitmapEx1,
-const BitmapEx& rBitmapEx2,
+const Bitmap& rBitmap1,
+const Bitmap& rBitmap2,
sal_uInt64 nBlinkTime,
sal_uInt16 nCenX1 = 0,
sal_uInt16 nCenY1 = 0,
diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
index 967e9665b807..2985f613737f 100644
--- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
+++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
@@ -30,7 +30,7 @@ namespace sdr::overlay
{
const drawinglayer::primitive2d::Primitive2DReference
aPrimitive(
new drawinglayer::primitive2d::OverlayBitmapExPrimitive(
-maBitmapEx1,
+BitmapEx(maBitmap1),
getBasePosition(),
mnCenterX1,
mnCenterY1,
@@ -43,7 +43,7 @@ namespace sdr::overlay
{
const drawinglayer::primitive2d::Primitive2DReference
aPrimitive(
new drawinglayer::primitive2d::OverlayBitmapExPrimitive(
-maBitmapEx2,
+BitmapEx(maBitmap2),
getBasePosition(),
mnCenterX2,
mnCenterY2,
@@ -56,8 +56,8 @@ namespace sdr::overlay
OverlayAnimatedBitmapEx::OverlayAnimatedBitmapEx(
const basegfx::B2DPoint& rBasePos,
-const BitmapEx& rBitmapEx1,
-const BitmapEx& rBitmapEx2,
+const Bitmap& rBitmap1,
+const Bitmap& rBitmap2,
sal_uInt64 nBlinkTime,
sal_uInt16 nCenX1,
sal_uInt16 nCenY1,
@@ -66,8 +66,8 @@ namespace sdr::overlay
double fShearX,
double fRotation)
: OverlayObjectWithBasePosition(rBasePos, COL_WHITE),
-maBitmapEx1(rBitmapEx1),
-maBitmapEx2(rBitmapEx2),
+maBitmap1(rBitmap1),
+maBitmap2(rBitmap2),
mnCenterX1(nCenX1), mnCenterY1(nCenY1),
mnCenterX2(nCenX2), mnCenterY2(nCenY2),
mnBlinkTime(impCheckBlinkTimeValueRange(nBlinkTime)),
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index dccb7699cb71..2d15d9aa0a8c 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -861,19 +861,19 @@ std::unique_ptr
SdrHdl::CreateOverlayObject(
if(eKindOfMarker == BitmapMarkerKind::Anchor || eKindOfMarker ==
BitmapMarkerKind::AnchorPressed)
{
// when anchor is used take upper left as reference point inside
the handle
-pRetval.reset(new sdr::overlay::OverlayAnimatedBitmapEx(rPos,
aBmpEx1, aBmpEx2, nBlinkTime));
+pRetval.reset(new sdr::overlay::OverlayAnimatedBitmapEx(rPos,
Bitmap(aBmpEx1), Bitmap(aBmpEx2), nBlinkTime));
}
else if(eKindOfMarker == BitmapMarkerKind::AnchorTR || eKindOfMarker
== BitmapMarkerKind::AnchorPressedTR)
{
// AnchorTR for SW, take top right as (0,0)
-pRetval.reset(new sdr::overlay::OverlayAnimatedBitm
core.git: include/svx svx/source
include/svx/bmpmask.hxx|6 +++---
svx/source/dialog/_bmpmask.cxx | 29 ++---
2 files changed, 17 insertions(+), 18 deletions(-)
New commits:
commit 6348ffb2592ab062ac4e0d30e3305e6dcbb1ba3a
Author: Noel Grandin
AuthorDate: Tue Aug 5 23:25:18 2025 +0200
Commit: Noel Grandin
CommitDate: Wed Aug 6 11:35:03 2025 +0200
BitmapEx->Bitmap in SvxBmpMask
now that Bitmap supports transparency
Change-Id: I42961c57e37340f4a8df83316be5d24126dbb615
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188987
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 1500b8d3bd64..001a4b1fd4e9 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -27,7 +27,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -131,10 +131,10 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask final :
public SfxDockingWindow
sal_uInt16 InitColorArrays( Color* pSrcCols, Color* pDstCols,
sal_uInt8* pTols );
-voidImpMask( BitmapEx& rBitmap );
+voidImpMask( Bitmap& rBitmap );
GDIMetaFile ImpMask( const GDIMetaFile& rMtf );
Animation ImpMask( const Animation& rAnimation );
-BitmapExImpMaskTransparent( const BitmapEx& rBitmapEx,
+Bitmap ImpMaskTransparent( const Bitmap& rBitmapEx,
const Color& rColor,
const sal_uInt8 nTol );
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 031e81af6a17..e3b9c2795f62 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -596,7 +596,7 @@ sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols,
Color* pDstCols, sal_uI
return nCount;
}
-void SvxBmpMask::ImpMask( BitmapEx& rBitmap )
+void SvxBmpMask::ImpMask( Bitmap& rBitmap )
{
Color pSrcCols[4];
Color pDstCols[4];
@@ -608,20 +608,19 @@ void SvxBmpMask::ImpMask( BitmapEx& rBitmap )
LeaveWait();
}
-BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const
Color& rColor, const sal_uInt8 nTol )
+Bitmap SvxBmpMask::ImpMaskTransparent( const Bitmap& rBitmap, const Color&
rColor, const sal_uInt8 nTol )
{
EnterWait();
-BitmapExaBmpEx;
-AlphaMask aMask( rBitmapEx.GetBitmap().CreateAlphaMask( rColor, nTol ) );
+AlphaMask aMask( BitmapEx(rBitmap).GetBitmap().CreateAlphaMask( rColor,
nTol ) );
-if( rBitmapEx.IsAlpha() )
-aMask.AlphaCombineOr( rBitmapEx.GetAlphaMask() );
+if( rBitmap.HasAlpha() )
+aMask.AlphaCombineOr( BitmapEx(rBitmap).GetAlphaMask() );
-aBmpEx = BitmapEx( rBitmapEx.GetBitmap(), aMask );
+Bitmap aBmp(BitmapEx( BitmapEx(rBitmap).GetBitmap(), aMask ));
LeaveWait();
-return aBmpEx;
+return aBmp;
}
@@ -981,21 +980,21 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
// Do we have a transparent color?
if (pDstCols[i] == COL_TRANSPARENT)
{
-BitmapExaBmpEx( ImpMaskTransparent(
aGraphic.GetBitmapEx(),
+BitmapaBmp( ImpMaskTransparent(
Bitmap(aGraphic.GetBitmapEx()),
pSrcCols[ i ], pTols[ i ] ) );
-const Size aSize( aBmpEx.GetSizePixel() );
+const Size aSize( aBmp.GetSizePixel() );
if( aSize.Width() && aSize.Height() )
-aGraphic = aBmpEx;
+aGraphic = aBmp;
}
}
// now replace it again with the normal colors
-BitmapEx aBitmapEx( aGraphic.GetBitmapEx() );
-if ( aBitmapEx.GetSizePixel().Width() &&
aBitmapEx.GetSizePixel().Height() )
+Bitmap aBitmap( aGraphic.GetBitmapEx() );
+if ( aBitmap.GetSizePixel().Width() &&
aBitmap.GetSizePixel().Height() )
{
-ImpMask( aBitmapEx );
-aGraphic = Graphic( aBitmapEx );
+ImpMask( aBitmap );
+aGraphic = Graphic( aBitmap );
}
}
}
core.git: include/svx svx/source
include/svx/gallery.hxx |6 +++---
include/svx/galtheme.hxx|2 +-
svx/source/gallery2/galexpl.cxx |4 ++--
svx/source/gallery2/galtheme.cxx|2 +-
svx/source/tbxctrls/fontworkgallery.cxx |2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit e849e8297c585017ad3fdeadabef465e5d942da0
Author: Noel Grandin
AuthorDate: Fri Aug 1 20:29:17 2025 +0200
Commit: Noel Grandin
CommitDate: Fri Aug 1 21:39:54 2025 +0200
BitmapEx->Bitmap in GalleryTheme
Now that Bitmap can handle transparency
Change-Id: Iebe2c5d51304acf4ed0db08f2ac498043d6497ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188781
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index b03b31a5d322..0776ba6e1d2f 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -91,7 +91,7 @@
class SdrModel;
class Graphic;
-class BitmapEx;
+class Bitmap;
class SVXCORE_DLLPUBLIC GalleryExplorer
{
@@ -118,9 +118,9 @@ public:
static sal_uInt32 GetSdrObjCount( sal_uInt32 nThemeId );
static bool GetSdrObj( std::u16string_view rThemeName,
sal_uInt32 nSdrModelPos,
- SdrModel* pModel, BitmapEx* pThumb
= nullptr );
+ SdrModel* pModel, Bitmap* pThumb =
nullptr );
static bool GetSdrObj( sal_uInt32 nThemeId, sal_uInt32
nSdrModelPos,
- SdrModel* pModel, BitmapEx* pThumb
= nullptr );
+ SdrModel* pModel, Bitmap* pThumb =
nullptr );
static bool BeginLocking( std::u16string_view rThemeName );
static bool BeginLocking( sal_uInt32 nThemeId );
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 94582d77a86f..6f8f38e1d1bd 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -131,7 +131,7 @@ public:
return maGalleryObjectCollection.getURLForPosition(nPos);
}
-SAL_DLLPRIVATE bool GetThumb(sal_uInt32 nPos, BitmapEx& rBmp);
+SAL_DLLPRIVATE bool GetThumb(sal_uInt32 nPos, Bitmap& rBmp);
boolGetGraphic(sal_uInt32 nPos, Graphic& rGraphic);
boolInsertGraphic(const Graphic& rGraphic,
sal_uInt32 nInsertPos);
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index b1e70919c928..9da8b88302f8 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -195,7 +195,7 @@ sal_uInt32 GalleryExplorer::GetSdrObjCount( sal_uInt32
nThemeId )
}
bool GalleryExplorer::GetSdrObj( std::u16string_view rThemeName, sal_uInt32
nSdrModelPos,
- SdrModel* pModel, BitmapEx* pThumb )
+ SdrModel* pModel, Bitmap* pThumb )
{
Gallery*pGal = ::Gallery::GetGalleryInstance();
boolbRet = false;
@@ -230,7 +230,7 @@ bool GalleryExplorer::GetSdrObj( std::u16string_view
rThemeName, sal_uInt32 nSdr
}
bool GalleryExplorer::GetSdrObj( sal_uInt32 nThemeId, sal_uInt32 nSdrModelPos,
- SdrModel* pModel, BitmapEx* pThumb )
+ SdrModel* pModel, Bitmap* pThumb )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
return pGal && GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos,
pModel, pThumb );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 7c9914dc2880..45ed61730d55 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -295,7 +295,7 @@ void GalleryTheme::Actualize( const Link& rActualize
UnlockBroadcaster();
}
-bool GalleryTheme::GetThumb(sal_uInt32 nPos, BitmapEx& rBmp)
+bool GalleryTheme::GetThumb(sal_uInt32 nPos, Bitmap& rBmp)
{
std::unique_ptr pObj = AcquireObject( nPos );
boolbRet = false;
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx
b/svx/source/tbxctrls/fontworkgallery.cxx
index a549698f1336..a6181d3acf8b 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -96,7 +96,7 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId)
for( nModelPos = 0; nModelPos < nFavCount; nModelPos++ )
{
-BitmapEx aThumb;
+Bitmap aThumb;
if (GalleryExplorer::GetSdrObj(nThemeId, nModelPos, pModel, &aThumb)
&& !aThumb.IsEmpty())
{
core.git: include/svx svx/source
include/svx/svdhdl.hxx |2 +-
svx/source/svdraw/svdhdl.cxx | 28 ++--
2 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit eee4f56840900454753bcfba526df4008424f874
Author: Noel Grandin
AuthorDate: Wed Jul 30 15:18:14 2025 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 31 14:13:20 2025 +0200
BitmapEx->Bitmap in SdrCropHdl
now that Bitmap can handle transparency
Change-Id: Ife0de615ca41d621f9055523d506d5b29cdb797c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188614
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index b703bc75e744..3b527c8d3bba 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -494,7 +494,7 @@ private:
// create marker for this kind
virtual void CreateB2dIAObject() override;
-BitmapEx GetBitmapForHandle( const BitmapEx& rBitmap, int nSize );
+Bitmap GetBitmapForHandle( const Bitmap& rBitmap, int nSize );
// evtl. shear and rotation, equal to the object's one to allow adaptation
of
// the visualization handles
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index ccf1c811acd7..c61740579ce8 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -2342,7 +2342,7 @@ SdrCropHdl::SdrCropHdl(
}
-BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize )
+Bitmap SdrCropHdl::GetBitmapForHandle( const Bitmap& rBitmap, int nSize )
{
int nPixelSize = 0, nX = 0, nY = 0, nOffset = 0;
@@ -2377,7 +2377,7 @@ BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx&
rBitmap, int nSize )
tools::Rectangle aSourceRect( Point( nX * nPixelSize + nOffset, nY *
nPixelSize), Size(nPixelSize, nPixelSize) );
-BitmapEx aRetval(rBitmap);
+Bitmap aRetval(rBitmap);
aRetval.Crop(aSourceRect);
return aRetval;
}
@@ -2397,8 +2397,8 @@ void SdrCropHdl::CreateB2dIAObject()
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
int nHdlSize = m_pHdlList->GetHdlSize();
-const BitmapEx aHandlesBitmap(SIP_SA_CROP_MARKERS);
-BitmapEx aBmpEx1( GetBitmapForHandle( aHandlesBitmap, nHdlSize ) );
+const Bitmap aHandlesBitmap((BitmapEx(SIP_SA_CROP_MARKERS)));
+Bitmap aBmp1( GetBitmapForHandle( aHandlesBitmap, nHdlSize ) );
for(sal_uInt32 b(0); b < pPageView->PageWindowCount(); b++)
{
@@ -2419,19 +2419,19 @@ void SdrCropHdl::CreateB2dIAObject()
if( nHdlSize >= 2 )
nHdlSize = 1;
-BitmapEx aBmpEx2( GetBitmapForHandle( aHandlesBitmap,
nHdlSize + 1 ) );
+Bitmap aBmp2( GetBitmapForHandle( aHandlesBitmap, nHdlSize
+ 1 ) );
const sal_uInt64 nBlinkTime =
rStyleSettings.GetCursorBlinkTime();
pOverlayObject.reset(new
sdr::overlay::OverlayAnimatedBitmapEx(
aPosition,
-aBmpEx1,
-aBmpEx2,
+BitmapEx(aBmp1),
+BitmapEx(aBmp2),
nBlinkTime,
-static_cast(aBmpEx1.GetSizePixel().Width()
- 1) >> 1,
-
static_cast(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
-static_cast(aBmpEx2.GetSizePixel().Width()
- 1) >> 1,
-
static_cast(aBmpEx2.GetSizePixel().Height() - 1) >> 1,
+static_cast(aBmp1.GetSizePixel().Width() -
1) >> 1,
+static_cast(aBmp1.GetSizePixel().Height()
- 1) >> 1,
+static_cast(aBmp2.GetSizePixel().Width() -
1) >> 1,
+static_cast(aBmp2.GetSizePixel().Height()
- 1) >> 1,
mfShearX,
mfRotation));
}
@@ -2440,9 +2440,9 @@ void SdrCropHdl::CreateB2dIAObject()
// create centered handle as default
pOverlayObject.reset(new sdr::overlay::OverlayBitmapEx(
aPosition,
-aBmpEx1,
-static_cast(aBmpEx1.GetSizePixel().Width()
- 1) >> 1,
-
static_cast(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
+BitmapEx(aBmp1),
+static_cast(aBmp1.GetSizePixel().Width() -
1) >> 1,
+static_cast(aBmp1.GetSizePixel().Height()
- 1) >> 1,
0.0,
mfShearX,
mfRotation));
core.git: include/svx svx/source
include/svx/galleryobjectcollection.hxx |2 +-
include/svx/galtheme.hxx|4 ++--
svx/source/gallery2/galbrws1.cxx| 24
svx/source/gallery2/galctrl.cxx | 18 +-
svx/source/gallery2/galtheme.cxx|8
5 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit e35f5cbd26a48ebe5413ab4053e022349834e387
Author: Noel Grandin
AuthorDate: Wed Jul 30 14:57:25 2025 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 31 14:12:46 2025 +0200
BitmapEx->Bitmap in GalleryObject
now that Bitmap can handle transparency
Change-Id: I7396610e29f0940cdde265642131f730ea584c98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188612
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/galleryobjectcollection.hxx
b/include/svx/galleryobjectcollection.hxx
index c4c8f245723b..eb0935781982 100644
--- a/include/svx/galleryobjectcollection.hxx
+++ b/include/svx/galleryobjectcollection.hxx
@@ -36,7 +36,7 @@ struct SVXCORE_DLLPUBLIC GalleryObject
bool mbDelete;
//UI visualization buffering
-BitmapEx maPreviewBitmapEx;
+Bitmap maPreviewBitmap;
Size maPreparedSize;
OUString maTitle;
OUString maPath;
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index dc61142fab0c..94582d77a86f 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -160,8 +160,8 @@ public:
static void InsertAllThemes(weld::ComboBox& rListBox);
// for buffering PreviewBitmaps and strings for object and path
-SAL_DLLPRIVATE void GetPreviewBitmapExAndStrings(sal_uInt32 nPos,
BitmapEx& rBitmapEx, Size& rSize, OUString& rTitle, OUString& rPath);
-SAL_DLLPRIVATE void SetPreviewBitmapExAndStrings(sal_uInt32 nPos, const
BitmapEx& rBitmapEx, const Size& rSize, const OUString& rTitle, const OUString&
rPath);
+SAL_DLLPRIVATE void GetPreviewBitmapAndStrings(sal_uInt32 nPos, Bitmap&
rBitmap, Size& rSize, OUString& rTitle, OUString& rPath);
+SAL_DLLPRIVATE void SetPreviewBitmapAndStrings(sal_uInt32 nPos, const
Bitmap& rBitmap, const Size& rSize, const OUString& rTitle, const OUString&
rPath);
};
#endif // INCLUDED_SVX_GALTHEME_HXX
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 8d108918f028..2cb1399a2c1b 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -1096,16 +1096,16 @@ void GalleryBrowser::UpdateRows(bool bVisibleOnly)
return false;
// get the icon for the listview
-BitmapEx aBitmapEx;
+Bitmap aBitmap;
Size aPreparedSize;
OUString sItemTextTitle;
OUString sItemTextPath;
sal_Int32 i = sId.toUInt32();
-mpCurTheme->GetPreviewBitmapExAndStrings(i, aBitmapEx, aPreparedSize,
sItemTextTitle, sItemTextPath);
+mpCurTheme->GetPreviewBitmapAndStrings(i, aBitmap, aPreparedSize,
sItemTextTitle, sItemTextPath);
-bool bNeedToCreate(aBitmapEx.IsEmpty());
+bool bNeedToCreate(aBitmap.IsEmpty());
if (!bNeedToCreate && (sItemTextTitle.isEmpty() || aPreparedSize !=
maPreviewSize))
bNeedToCreate = true;
@@ -1114,31 +1114,31 @@ void GalleryBrowser::UpdateRows(bool bVisibleOnly)
std::unique_ptr xObj = mpCurTheme->AcquireObject(i);
if (xObj)
{
-aBitmapEx = xObj->createPreviewBitmapEx(maPreviewSize);
+aBitmap = Bitmap(xObj->createPreviewBitmapEx(maPreviewSize));
sItemTextTitle = GalleryBrowser::GetItemText(*xObj,
GalleryItemFlags::Title);
sItemTextPath = GalleryBrowser::GetItemText(*xObj,
GalleryItemFlags::Path);
-mpCurTheme->SetPreviewBitmapExAndStrings(i, aBitmapEx,
maPreviewSize, sItemTextTitle, sItemTextPath);
+mpCurTheme->SetPreviewBitmapAndStrings(i, aBitmap,
maPreviewSize, sItemTextTitle, sItemTextPath);
}
}
ScopedVclPtr xDev(mxListView->create_virtual_device());
xDev->SetOutputSizePixel(maPreviewSize);
-if (!aBitmapEx.IsEmpty())
+if (!aBitmap.IsEmpty())
{
-const Size aBitmapExSizePixel(aBitmapEx.GetSizePixel());
+const Size aBitmapSizePixel(aBitmap.GetSizePixel());
const Point aPos(
-((maPreviewSize.Width() - aBitmapExSizePixel.Width()) >> 1),
-((maPreviewSize.Height() - aBitmapExSizePixel.Height()) >> 1));
+((maPreviewSize.Width() - aBitmapSizePixel.Width()) >> 1),
+((maPreviewSize.Height() - aBitmapSizePixel.Height()) >> 1));
-if (aBitmapEx.IsAlpha())
+if (aBitmap.HasAlpha())
{
// draw checkered background
-GalleryIconView::drawTransparenceBackground(*xDev, aPos,
aBitmapExSizePixel);
+GalleryI
core.git: include/svx svx/source
include/svx/xtable.hxx |4 ++--
svx/source/dialog/dlgctrl.cxx |2 +-
svx/source/xoutdev/xtabdash.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 078e511a7b0ef20d7d88e48b577d5d50e19f6407
Author: Noel Grandin
AuthorDate: Wed Jul 30 14:49:55 2025 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 31 11:09:48 2025 +0200
Bitmap->BitmapEx in XDashList
now that Bitmap can handle transparency
Change-Id: Id0b3bae21471f530640e9024431eb3050cb16167
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188610
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index ac7b9c7b764e..4819fba2ca3f 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -278,7 +278,7 @@ public:
class SVXCORE_DLLPUBLIC XDashList final : public XPropertyList
{
private:
-BitmapExmaBitmapSolidLine;
+BitmapmaBitmapSolidLine;
OUStringmaStringSolidLine;
OUStringmaStringNoLine;
@@ -298,7 +298,7 @@ public:
// Special call to get a bitmap for the solid line representation. It
// creates a bitmap fitting in size and style to the ones you get by
// using GetUiBitmap for existing entries.
-BitmapEx const & GetBitmapForUISolidLine() const;
+Bitmap const & GetBitmapForUISolidLine() const;
static Bitmap CreateBitmapForXDash(const XDash* pDash, double
fLineThickness);
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 54bf6f398e76..9826795eecd1 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -941,7 +941,7 @@ void SvxLineLB::Fill( const XDashListRef &pList )
m_xControl->append_text(pList->GetStringForUiNoLine());
// entry for solid line
-const BitmapEx aBitmap = pList->GetBitmapForUISolidLine();
+const Bitmap aBitmap = pList->GetBitmapForUISolidLine();
const Size aBmpSize(aBitmap.GetSizePixel());
pVD->SetOutputSizePixel(aBmpSize, false);
pVD->DrawBitmapEx(Point(), aBitmap);
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 390abd10be4a..3a5b16444e9a 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -189,7 +189,7 @@ Bitmap XDashList::CreateBitmapForUI( tools::Long nIndex )
return CreateBitmapForXDash(&rDash, ImpGetDefaultLineThickness());
}
-BitmapEx const & XDashList::GetBitmapForUISolidLine() const
+Bitmap const & XDashList::GetBitmapForUISolidLine() const
{
if(maBitmapSolidLine.IsEmpty())
{
core.git: include/svx svx/source
include/svx/svdhdl.hxx |2 +-
svx/source/svdraw/svdhdl.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 82081c5ab70f53264349e7450badb8541f443da1
Author: Noel Grandin
AuthorDate: Sun Jul 27 20:32:53 2025 +0200
Commit: Noel Grandin
CommitDate: Mon Jul 28 19:28:12 2025 +0200
BitmapEx->Bitmap in SdrHdlColor::CreateColorDropper
Now that Bitmap can handle transparency.
Change-Id: I136e63c112d1c519f95727ce3cebb7b178d9de5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188448
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index da82e1d64245..b703bc75e744 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -268,7 +268,7 @@ class SVXCORE_DLLPUBLIC SdrHdlColor final : public SdrHdl
SVX_DLLPRIVATE virtual void CreateB2dIAObject() override;
// help functions
-SVX_DLLPRIVATE BitmapEx CreateColorDropper(Color aCol);
+SVX_DLLPRIVATE Bitmap CreateColorDropper(Color aCol);
SVX_DLLPRIVATE static Color GetLuminance(const Color& rCol);
public:
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 9097fdf335ab..ccf1c811acd7 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1169,7 +1169,7 @@ void SdrHdlColor::CreateB2dIAObject()
}
}
-BitmapEx SdrHdlColor::CreateColorDropper(Color aCol)
+Bitmap SdrHdlColor::CreateColorDropper(Color aCol)
{
// get the Bitmap
VclPtr pWrite(VclPtr::Create());
@@ -1206,7 +1206,7 @@ BitmapEx SdrHdlColor::CreateColorDropper(Color aCol)
pWrite->DrawLine(Point(2, nHeight - 2), Point(nWidth - 2, nHeight - 2));
pWrite->DrawLine(Point(nWidth - 2, 2), Point(nWidth - 2, nHeight - 3));
-return BitmapEx(pWrite->GetBitmap(Point(0,0), m_aMarkerSize));
+return pWrite->GetBitmap(Point(0,0), m_aMarkerSize);
}
Color SdrHdlColor::GetLuminance(const Color& rCol)
core.git: include/svx svx/source
include/svx/xbitmap.hxx | 16
svx/source/xoutdev/xattrbmp.cxx | 34 +-
2 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 51a2b6e439d1d3a33d4136f9c505a343a04ce0ef
Author: Miklos Vajna
AuthorDate: Mon Jul 28 08:09:09 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Jul 28 19:22:06 2025 +0200
svx: prefix members of XOBitmap
See tdf#94879 for motivation.
Change-Id: I205654077a24eb97d47a91ef747bae6cee39a9ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188457
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx
index 0fff0a5cecb9..575f05dfc5fd 100644
--- a/include/svx/xbitmap.hxx
+++ b/include/svx/xbitmap.hxx
@@ -28,11 +28,11 @@
class SVXCORE_DLLPUBLIC XOBitmap
{
private:
-std::unique_ptr xGraphicObject;
-std::unique_ptr pPixelArray;
-Color aPixelColor;
-Color aBckgrColor;
-boolbGraphicDirty;
+std::unique_ptr m_xGraphicObject;
+std::unique_ptr m_pPixelArray;
+Color m_aPixelColor;
+Color m_aBckgrColor;
+boolm_bGraphicDirty;
const GraphicObject& GetGraphicObject() const;
@@ -47,11 +47,11 @@ public:
void Bitmap2Array();
void Array2Bitmap();
-void SetPixelColor( const Color& rColor ) { aPixelColor =
rColor; bGraphicDirty = true; }
-void SetBackgroundColor( const Color& rColor ) { aBckgrColor =
rColor; bGraphicDirty = true; }
+void SetPixelColor( const Color& rColor ) { m_aPixelColor =
rColor; m_bGraphicDirty = true; }
+void SetBackgroundColor( const Color& rColor ) { m_aBckgrColor =
rColor; m_bGraphicDirty = true; }
BitmapExGetBitmap() const;
-const Color&GetBackgroundColor() const { return aBckgrColor; }
+const Color&GetBackgroundColor() const { return
m_aBckgrColor; }
};
#endif
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 66e7acb77fb5..a9bd46beb536 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -43,8 +43,8 @@
using namespace ::com::sun::star;
XOBitmap::XOBitmap( const BitmapEx& rBmp ) :
-xGraphicObject (new GraphicObject(rBmp)),
-bGraphicDirty ( false )
+m_xGraphicObject (new GraphicObject(rBmp)),
+m_bGraphicDirty ( false )
{
}
@@ -59,10 +59,10 @@ BitmapEx XOBitmap::GetBitmap() const
const GraphicObject& XOBitmap::GetGraphicObject() const
{
-if( bGraphicDirty )
+if( m_bGraphicDirty )
const_cast(this)->Array2Bitmap();
-return *xGraphicObject;
+return *m_xGraphicObject;
}
void XOBitmap::Bitmap2Array()
@@ -72,26 +72,26 @@ void XOBitmap::Bitmap2Array()
const BitmapEx aBitmap( GetBitmap() );
const sal_Int32 nLines = 8; // type dependent
-if( !pPixelArray )
-pPixelArray.reset( new sal_uInt16[ nLines * nLines ] );
+if( !m_pPixelArray )
+m_pPixelArray.reset( new sal_uInt16[ nLines * nLines ] );
pVDev->SetOutputSizePixel( aBitmap.GetSizePixel() );
pVDev->DrawBitmapEx( Point(), aBitmap );
-aPixelColor = aBckgrColor = pVDev->GetPixel( Point() );
+m_aPixelColor = m_aBckgrColor = pVDev->GetPixel( Point() );
// create array and determine foreground and background color
for (sal_Int32 i = 0; i < nLines; ++i)
{
for (sal_Int32 j = 0; j < nLines; ++j)
{
-if ( pVDev->GetPixel( Point( j, i ) ) == aBckgrColor )
-pPixelArray[ j + i * nLines ] = 0;
+if ( pVDev->GetPixel( Point( j, i ) ) == m_aBckgrColor )
+m_pPixelArray[ j + i * nLines ] = 0;
else
{
-pPixelArray[ j + i * nLines ] = 1;
+m_pPixelArray[ j + i * nLines ] = 1;
if( !bPixelColor )
{
-aPixelColor = pVDev->GetPixel( Point( j, i ) );
+m_aPixelColor = pVDev->GetPixel( Point( j, i ) );
bPixelColor = true;
}
}
@@ -102,7 +102,7 @@ void XOBitmap::Bitmap2Array()
/// convert array, fore- and background color into a bitmap
void XOBitmap::Array2Bitmap()
{
-if (!pPixelArray)
+if (!m_pPixelArray)
return;
ScopedVclPtrInstance< VirtualDevice > pVDev;
@@ -115,15 +115,15 @@ void XOBitmap::Array2Bitmap()
{
for (sal_Int32 j = 0; j < nLines; ++j)
{
-if( pPixelArray[ j + i * nLines ] == 0 )
-pVDev->DrawPixel( Point( j, i ), aBckgrColor );
+if( m_pPixelArray[ j + i * nLines ] == 0 )
+pVDev->DrawPixel( Point( j, i ), m_aBckgrColor );
else
-pVDev->DrawPixel( Point( j, i ), aPixelColor );
+pVDev->DrawPixel( Point( j, i ), m_aPixelColor );
}
}
-
core.git: include/svx svx/source
include/svx/unoprov.hxx|4 +-
svx/source/unodraw/unoprov.cxx | 62 -
2 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit b25dc74888108aa00bc489cce73b516319b7de02
Author: Miklos Vajna
AuthorDate: Mon Jul 14 08:37:51 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Jul 14 12:40:46 2025 +0200
svx: prefix members of SvxUnoPropertyMapProvider
See tdf#94879 for motivation.
Change-Id: Idcafd0e4fa8440678e850db024df2c3c6c2b9892
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187840
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx
index e67cd69d79bc..768a5a120d52 100644
--- a/include/svx/unoprov.hxx
+++ b/include/svx/unoprov.hxx
@@ -81,8 +81,8 @@ public:
class UNLESS_MERGELIBS_MORE(SVXCORE_DLLPUBLIC) SvxUnoPropertyMapProvider
{
-std::span aMapArr[SVXMAP_END];
-std::unique_ptr aSetArr[SVXMAP_END];
+std::span m_aMapArr[SVXMAP_END];
+std::unique_ptr m_aSetArr[SVXMAP_END];
public:
SvxUnoPropertyMapProvider();
~SvxUnoPropertyMapProvider();
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index e4de02447d68..fc376a243dcd 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -886,7 +886,7 @@ SvxUnoPropertyMapProvider& getSvxMapProvider()
SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider()
{
for(sal_uInt16 i=0;i
SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId)
{
assert(nPropertyId < SVXMAP_END);
-if(aMapArr[nPropertyId].empty()) {
+if(m_aMapArr[nPropertyId].empty()) {
switch(nPropertyId) {
-case SVXMAP_SHAPE:
aMapArr[SVXMAP_SHAPE]=ImplGetSvxShapePropertyMap(); break;
-case SVXMAP_CONNECTOR:
aMapArr[SVXMAP_CONNECTOR]=ImplGetSvxConnectorPropertyMap(); break;
-case SVXMAP_DIMENSIONING:
aMapArr[SVXMAP_DIMENSIONING]=ImplGetSvxDimensioningPropertyMap(); break;
-case SVXMAP_CIRCLE:
aMapArr[SVXMAP_CIRCLE]=ImplGetSvxCirclePropertyMap(); break;
-case SVXMAP_POLYPOLYGON:
aMapArr[SVXMAP_POLYPOLYGON]=ImplGetSvxPolyPolygonPropertyMap(); break;
-case SVXMAP_GRAPHICOBJECT:
aMapArr[SVXMAP_GRAPHICOBJECT]=ImplGetSvxGraphicObjectPropertyMap(); break;
-case SVXMAP_3DSCENEOBJECT:
aMapArr[SVXMAP_3DSCENEOBJECT]=ImplGetSvx3DSceneObjectPropertyMap(); break;
-case SVXMAP_3DCUBEOBJECT:
aMapArr[SVXMAP_3DCUBEOBJECT]=ImplGetSvx3DCubeObjectPropertyMap(); break;
-case SVXMAP_3DSPHEREOBJECT:
aMapArr[SVXMAP_3DSPHEREOBJECT]=ImplGetSvx3DSphereObjectPropertyMap(); break;
-case SVXMAP_3DLATHEOBJECT:
aMapArr[SVXMAP_3DLATHEOBJECT]=ImplGetSvx3DLatheObjectPropertyMap(); break;
-case SVXMAP_3DEXTRUDEOBJECT:
aMapArr[SVXMAP_3DEXTRUDEOBJECT]=ImplGetSvx3DExtrudeObjectPropertyMap(); break;
-case SVXMAP_3DPOLYGONOBJECT:
aMapArr[SVXMAP_3DPOLYGONOBJECT]=ImplGetSvx3DPolygonObjectPropertyMap(); break;
-case SVXMAP_ALL: aMapArr[SVXMAP_ALL]=ImplGetSvxAllPropertyMap();
break;
-case SVXMAP_GROUP:
aMapArr[SVXMAP_GROUP]=ImplGetSvxGroupPropertyMap(); break;
-case SVXMAP_CAPTION:
aMapArr[SVXMAP_CAPTION]=ImplGetSvxCaptionPropertyMap(); break;
-case SVXMAP_OLE2:
aMapArr[SVXMAP_OLE2]=ImplGetSvxOle2PropertyMap(); break;
-case SVXMAP_PLUGIN:
aMapArr[SVXMAP_PLUGIN]=ImplGetSvxPluginPropertyMap(); break;
-case SVXMAP_FRAME:
aMapArr[SVXMAP_FRAME]=ImplGetSvxFramePropertyMap(); break;
-case SVXMAP_APPLET:
aMapArr[SVXMAP_APPLET]=ImplGetSvxAppletPropertyMap(); break;
-case SVXMAP_CONTROL:
aMapArr[SVXMAP_CONTROL]=ImplGetSvxControlShapePropertyMap(); break;
-case SVXMAP_TEXT:
aMapArr[SVXMAP_TEXT]=ImplGetSvxTextShapePropertyMap(); break;
-case SVXMAP_CUSTOMSHAPE:
aMapArr[SVXMAP_CUSTOMSHAPE]=ImplGetSvxCustomShapePropertyMap(); break;
-case SVXMAP_MEDIA:
aMapArr[SVXMAP_MEDIA]=ImplGetSvxMediaShapePropertyMap(); break;
-case SVXMAP_TABLE:
aMapArr[SVXMAP_TABLE]=ImplGetSvxTableShapePropertyMap(); break;
-case SVXMAP_PAGE: aMapArr[SVXMAP_PAGE] =
ImplGetSvxPageShapePropertyMap(); break;
+case SVXMAP_SHAPE:
m_aMapArr[SVXMAP_SHAPE]=ImplGetSvxShapePropertyMap(); break;
+case SVXMAP_CONNECTOR:
m_aMapArr[SVXMAP_CONNECTOR]=ImplGetSvxConnectorPropertyMap(); break;
+case SVXMAP_DIMENSIONING:
m_aMapArr[SVXMAP_DIMENSIONING]=ImplGetSvxDimensioningPropertyMap(); break;
+case SVXMAP_CIRCLE:
m_aMapArr[SVXMAP_CIRCLE]=ImplGetSvxCirclePropertyMap(); break;
+case SVXMAP_POLYPOLYGON:
m_aMapArr[SVXMAP_POLYPOLYGON]=ImplGetSvxPolyPolygonPropertyMap(); break;
+case SVXMAP_GRAPHICOBJECT:
m_aMapArr[SVXMAP_GRAPHICOBJECT]=ImplGetSvxGraphicObjectPropertyMap(); break;
+case SVXMAP_3DSCENEOBJECT:
m_aMapArr[SVXMAP_3DSCE
core.git: include/svx svx/source svx/uiconfig
include/svx/dialog/ThemeDialog.hxx |9 +---
svx/source/dialog/ThemeDialog.cxx | 82 +++--
svx/uiconfig/ui/themedialog.ui | 33 +-
3 files changed, 86 insertions(+), 38 deletions(-)
New commits:
commit 2d1192753bf14dc01e81061ed8e9b01443070478
Author: Parth Raiyani
AuthorDate: Wed Jun 18 12:44:28 2025 +0530
Commit: Szymon Kłos
CommitDate: Fri Jul 11 10:11:28 2025 +0200
tdf#167074 Switch to IconView in ThemeDialog for improved UI handling
- Replaces ValueSet with IconView widget in the ThemeDialog.
- Cleans up redundant code related to ValueSet and updates the themedialog
UI file to support IconView.
Change-Id: Ia36aa6174cde2756aadadcbde4c5bdba2201d1a1
Signed-off-by: Parth Raiyani
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186644
Reviewed-by: Szymon Kłos
Tested-by: Jenkins
diff --git a/include/svx/dialog/ThemeDialog.hxx
b/include/svx/dialog/ThemeDialog.hxx
index 6716bbbe2bea..0dbb4ef9b23d 100644
--- a/include/svx/dialog/ThemeDialog.hxx
+++ b/include/svx/dialog/ThemeDialog.hxx
@@ -13,7 +13,6 @@
#include
#include
#include
-#include
namespace model
{
@@ -30,21 +29,21 @@ private:
std::shared_ptr mxSubDialog;
std::vector maColorSets;
-std::unique_ptr mxValueSetThemeColors;
-std::unique_ptr mxValueSetThemeColorsWindow;
+std::unique_ptr mxIconViewThemeColors;
std::unique_ptr mxAdd;
std::shared_ptr mpCurrentColorSet;
void runThemeColorEditDialog();
void initColorSets();
+static VclPtr CreateColorSetPreview(const model::ColorSet&
rColorSet);
public:
ThemeDialog(weld::Window* pParent, model::Theme* pTheme);
virtual ~ThemeDialog() override;
-DECL_LINK(DoubleClickValueSetHdl, ValueSet*, void);
-DECL_LINK(SelectItem, ValueSet*, void);
+DECL_LINK(ItemActivatedHdl, weld::IconView&, bool);
+DECL_LINK(SelectionChangedHdl, weld::IconView&, void);
DECL_LINK(ButtonClicked, weld::Button&, void);
std::shared_ptr const& getCurrentColorSet() { return
mpCurrentColorSet; }
diff --git a/svx/source/dialog/ThemeDialog.cxx
b/svx/source/dialog/ThemeDialog.cxx
index 47e374579662..e293fb46339e 100644
--- a/svx/source/dialog/ThemeDialog.cxx
+++ b/svx/source/dialog/ThemeDialog.cxx
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
namespace svx
{
@@ -20,16 +21,11 @@ ThemeDialog::ThemeDialog(weld::Window* pParent,
model::Theme* pTheme)
: GenericDialogController(pParent, u"svx/ui/themedialog.ui"_ustr,
u"ThemeDialog"_ustr)
, mpWindow(pParent)
, mpTheme(pTheme)
-, mxValueSetThemeColors(new svx::ThemeColorValueSet)
-, mxValueSetThemeColorsWindow(
- new weld::CustomWeld(*m_xBuilder, u"valueset_theme_colors"_ustr,
*mxValueSetThemeColors))
+,
mxIconViewThemeColors(m_xBuilder->weld_icon_view(u"iconview_theme_colors"_ustr))
, mxAdd(m_xBuilder->weld_button(u"button_add"_ustr))
{
-mxValueSetThemeColors->SetColCount(3);
-mxValueSetThemeColors->SetLineCount(4);
-
mxValueSetThemeColors->SetColor(Application::GetSettings().GetStyleSettings().GetFaceColor());
-mxValueSetThemeColors->SetDoubleClickHdl(LINK(this, ThemeDialog,
DoubleClickValueSetHdl));
-mxValueSetThemeColors->SetSelectHdl(LINK(this, ThemeDialog, SelectItem));
+mxIconViewThemeColors->connect_item_activated(LINK(this, ThemeDialog,
ItemActivatedHdl));
+mxIconViewThemeColors->connect_selection_changed(LINK(this, ThemeDialog,
SelectionChangedHdl));
mxAdd->connect_clicked(LINK(this, ThemeDialog, ButtonClicked));
@@ -37,7 +33,7 @@ ThemeDialog::ThemeDialog(weld::Window* pParent, model::Theme*
pTheme)
if (!maColorSets.empty())
{
-mxValueSetThemeColors->SelectItem(1); // ItemId 1, position 0
+mxIconViewThemeColors->select(0);
mpCurrentColorSet = std::make_shared(maColorSets[0]);
}
}
@@ -56,28 +52,74 @@ void ThemeDialog::initColorSets()
auto const& rColorSetVector = ColorSets::get().getColorSetVector();
maColorSets.insert(maColorSets.end(), rColorSetVector.begin(),
rColorSetVector.end());
-for (auto const& rColorSet : maColorSets)
+for (size_t i = 0; i < maColorSets.size(); ++i)
{
-mxValueSetThemeColors->insert(rColorSet);
+auto const& rColorSet = maColorSets[i];
+VclPtr pVirDev = CreateColorSetPreview(rColorSet);
+BitmapEx aBitmapEx = pVirDev->GetBitmapEx(Point(0, 0),
pVirDev->GetOutputSizePixel());
+
+OUString sId = OUString::number(i);
+OUString sName = rColorSet.getName();
+mxIconViewThemeColors->insert(-1, &sName, &sId, &aBitmapEx, nullptr);
}
+}
+
+VclPtr ThemeDialog::CreateColorSetPreview(const
model::ColorSet& rColorSet)
+{
+VclPtr pVDev = VclPtr::Create();
+const Size aSize(100, 50);
+pVDev->SetOutputSizePixel(aSize);
+
+const int nRows = 2;
+const int nCols = 4;
+const int nHorizontalPadding = 9;
+const int n
core.git: include/svx svx/source
include/svx/tbcontrl.hxx |8 +--
svx/source/tbxctrls/tbcontrl.cxx | 98 +++
2 files changed, 53 insertions(+), 53 deletions(-)
New commits:
commit 10850b9ea91807c4f8464e42fee7f33b7c389a77
Author: Miklos Vajna
AuthorDate: Mon Jul 7 08:10:17 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Jul 7 09:16:09 2025 +0200
svx: prefix members of SvxStyleToolBoxControl
See tdf#94879 for motivation.
Change-Id: I9a49b6f7f897f95c6d77aade2b9c97882a58b671
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187458
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index cad153b999b0..63811d9b6f73 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -150,7 +150,7 @@ class SvxStyleToolBoxControl final : public
cppu::ImplInheritanceHelper
{
struct Impl;
-std::unique_ptr pImpl;
+std::unique_ptr m_pImpl;
public:
SvxStyleToolBoxControl();
@@ -179,10 +179,10 @@ public:
private:
#define MAX_FAMILIES 5
-SfxStyleSheetBasePool* pStyleSheetPool;
+SfxStyleSheetBasePool* m_pStyleSheetPool;
rtl::Reference m_xBoundItems[MAX_FAMILIES];
-std::unique_ptr pFamilyState[MAX_FAMILIES];
-sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1
+std::unique_ptr m_pFamilyState[MAX_FAMILIES];
+sal_uInt16 m_nActFamily; // Id in the ToolBox = Position - 1
void Update();
void FillStyleBox();
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2de84acbd3a2..65045ebf7844 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3083,14 +3083,14 @@ constexpr OUString
StyleSlotToStyleCommand[MAX_FAMILIES] =
};
SvxStyleToolBoxControl::SvxStyleToolBoxControl()
-: pImpl(new Impl)
-, pStyleSheetPool(nullptr)
-, nActFamily(0x)
+: m_pImpl(new Impl)
+, m_pStyleSheetPool(nullptr)
+, m_nActFamily(0x)
{
for (sal_uInt16 i = 0; i < MAX_FAMILIES; ++i)
{
m_xBoundItems[i].clear();
-pFamilyState[i] = nullptr;
+m_pFamilyState[i] = nullptr;
}
}
@@ -3107,7 +3107,7 @@ void SAL_CALL SvxStyleToolBoxControl::initialize(const
Sequence& rArguments
if ( !m_xFrame.is() )
return;
-pImpl->InitializeStyles(m_xFrame->getController()->getModel());
+m_pImpl->InitializeStyles(m_xFrame->getController()->getModel());
Reference< XDispatchProvider > xDispatchProvider(
m_xFrame->getController(), UNO_QUERY );
for ( sal_uInt16 i=0; i& rArguments
SID_STYLE_FAMILY_START + i,
StyleSlotToStyleCommand[i],
*this );
-pFamilyState[i] = nullptr;
+m_pFamilyState[i] = nullptr;
}
}
@@ -3125,9 +3125,9 @@ void SAL_CALL SvxStyleToolBoxControl::dispose()
svt::ToolboxController::dispose();
SolarMutexGuard aSolarMutexGuard;
-pImpl->m_xVclBox.disposeAndClear();
-pImpl->m_xWeldBox.reset();
-pImpl->m_pBox = nullptr;
+m_pImpl->m_xVclBox.disposeAndClear();
+m_pImpl->m_xWeldBox.reset();
+m_pImpl->m_pBox = nullptr;
for (rtl::Reference& pBoundItem :
m_xBoundItems)
{
@@ -3151,10 +3151,10 @@ void SAL_CALL SvxStyleToolBoxControl::dispose()
m_xBoundItems[i].clear();
}
-pFamilyState[i].reset();
+m_pFamilyState[i].reset();
}
-pStyleSheetPool = nullptr;
-pImpl.reset();
+m_pStyleSheetPool = nullptr;
+m_pImpl.reset();
}
OUString SvxStyleToolBoxControl::getImplementationName()
@@ -3189,7 +3189,7 @@ void SAL_CALL SvxStyleToolBoxControl::update()
SfxStyleFamily SvxStyleToolBoxControl::GetActFamily() const
{
-switch ( nActFamily-1 + SID_STYLE_FAMILY_START )
+switch ( m_nActFamily-1 + SID_STYLE_FAMILY_START )
{
case SID_STYLE_FAMILY1: return SfxStyleFamily::Char;
case SID_STYLE_FAMILY2: return SfxStyleFamily::Para;
@@ -3205,19 +3205,19 @@ SfxStyleFamily SvxStyleToolBoxControl::GetActFamily()
const
void SvxStyleToolBoxControl::FillStyleBox()
{
-SvxStyleBox_Base* pBox = pImpl->m_pBox;
+SvxStyleBox_Base* pBox = m_pImpl->m_pBox;
-DBG_ASSERT( pStyleSheetPool, "StyleSheetPool not found!" );
+DBG_ASSERT( m_pStyleSheetPool, "StyleSheetPool not found!" );
DBG_ASSERT( pBox,"Control not found!" );
-if ( !(pStyleSheetPool && pBox && nActFamily!=0x) )
+if ( !(m_pStyleSheetPool && pBox && m_nActFamily!=0x) )
return;
const SfxStyleFamilyeFamily = GetActFamily();
SfxStyleSheetBase* pStyle = nullptr;
boolbDoFill = false;
-auto xIter = pStyleSheetPool->CreateIterator(eFamily,
SfxStyleSearchBits::Used);
+auto xIter = m_pStyleSheetPool->CreateI
core.git: include/svx svx/source
include/svx/swframeexample.hxx |4 ++--
svx/source/dialog/swframeexample.cxx | 27 ---
2 files changed, 18 insertions(+), 13 deletions(-)
New commits:
commit 5571d80795253cfa08169520852901c14d22d1f5
Author: Noel Grandin
AuthorDate: Tue Jul 1 08:51:35 2025 +0200
Commit: Noel Grandin
CommitDate: Tue Jul 1 10:39:29 2025 +0200
tdf#166842 do not use FillColor==COL_TRANSPARENT...
.. on OutputDevice if that OutputDevice does not support alpha
Change-Id: I44243118dd38aab0c3c453206da7606d5d067b83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187220
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index fc64982cee3c..1c3256d5c8fe 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -28,7 +28,6 @@
class SVX_DLLPUBLIC SwFrameExample final : public weld::CustomWidgetController
{
-Color m_aTransColor; ///< transparency
Color m_aBgCol; ///< background
Color m_aFrameColor; ///< graphic frame
Color m_aAlignColor; ///< align anchor
@@ -63,7 +62,8 @@ class SVX_DLLPUBLIC SwFrameExample final : public
weld::CustomWidgetController
void InitColors_Impl();
void InitAllRects_Impl(vcl::RenderContext& rRenderContext);
void CalcBoundRect_Impl(const vcl::RenderContext& rRenderContext,
tools::Rectangle &rRect);
-tools::Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext,
const tools::Rectangle &rRect, const Color &rFillColor, const Color
&rBorderColor);
+tools::Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext,
const tools::Rectangle &rRect,
+ std::optional oFillColor, const Color
&rBorderColor);
virtual void StyleUpdated() override;
virtual void Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&) override;
diff --git a/svx/source/dialog/swframeexample.cxx
b/svx/source/dialog/swframeexample.cxx
index 8beb189a40fe..db46cf58a8da 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -36,10 +36,16 @@ constexpr OUString DEMOTEXT = u"Ij"_ustr;
namespace {
void DrawRect_Impl(vcl::RenderContext& rRenderContext, const tools::Rectangle
&rRect,
- const Color &rFillColor, const Color &rLineColor)
+ std::optional oFillColor, std::optional
oLineColor)
{
-rRenderContext.SetFillColor(rFillColor);
-rRenderContext.SetLineColor(rLineColor);
+if (oFillColor)
+rRenderContext.SetFillColor(*oFillColor);
+else
+rRenderContext.SetFillColor();
+if (oLineColor)
+rRenderContext.SetLineColor(*oLineColor);
+else
+rRenderContext.SetLineColor();
rRenderContext.DrawRect(rRect);
}
@@ -74,7 +80,6 @@ void SwFrameExample::InitColors_Impl()
m_aFrameColor = COL_LIGHTGREEN;
m_aAlignColor = COL_LIGHTRED;
-m_aTransColor = COL_TRANSPARENT;
m_aTxtCol = bHC?
svtools::ColorConfig().GetColorValue(svtools::FONTCOLOR).nColor :
@@ -440,9 +445,9 @@ void SwFrameExample::CalcBoundRect_Impl(const
vcl::RenderContext& rRenderContext
}
tools::Rectangle SwFrameExample::DrawInnerFrame_Impl(vcl::RenderContext&
rRenderContext, const tools::Rectangle &rRect,
- const Color &rFillColor,
const Color &rBorderColor)
+ std::optional
oFillColor, const Color &rBorderColor)
{
-DrawRect_Impl(rRenderContext, rRect, rFillColor, rBorderColor);
+DrawRect_Impl(rRenderContext, rRect, oFillColor, rBorderColor);
// determine the area relative to which the positioning happens
tools::Rectangle aRect(rRect); // aPagePrtArea = Default
@@ -459,7 +464,7 @@ tools::Rectangle
SwFrameExample::DrawInnerFrame_Impl(vcl::RenderContext& rRender
{
if (i == nLines - 1)
aTxt.SetSize(Size(aTxt.GetWidth() / 2, aTxt.GetHeight()));
-DrawRect_Impl(rRenderContext, aTxt, m_aTxtCol, m_aTransColor);
+DrawRect_Impl(rRenderContext, aTxt, m_aTxtCol, std::nullopt);
aTxt.Move(0, nStep);
}
}
@@ -477,7 +482,7 @@ void SwFrameExample::Paint(vcl::RenderContext&
rRenderContext, const tools::Rect
DrawRect_Impl(rRenderContext, aPage, m_aBgCol, m_aBorderCol);
// Draw PrintArea
-tools::Rectangle aRect = DrawInnerFrame_Impl(rRenderContext, aPagePrtArea,
m_aTransColor, m_aPrintAreaCol);
+tools::Rectangle aRect = DrawInnerFrame_Impl(rRenderContext, aPagePrtArea,
std::nullopt, m_aPrintAreaCol);
if (nAnchor == RndStdIds::FLY_AT_FLY)
aRect = DrawInnerFrame_Impl(rRenderContext, aFrameAtFrame, m_aBgCol,
m_aBorderCol);
@@ -661,7 +666,7 @@ void SwFrameExample::Paint(vcl::RenderContext&
rRenderContext, const tools::Rect
}
}
core.git: include/svx svx/source
include/svx/colorwindow.hxx |2 +-
svx/source/tbxctrls/tbcontrl.cxx |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c8cb7fe1bb82eba0aad36e7b5f041ff350bb715f
Author: Miklos Vajna
AuthorDate: Mon Jun 23 08:48:05 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Jun 23 10:49:49 2025 +0200
svx: prefix members of ColorWindow
See tdf#94879 for motivation.
Change-Id: I1edae4c6bfd1337433b522f50e90d9caedaf5925
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186809
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 5ec8004cd8f3..a08381711593 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -78,7 +78,7 @@ public:
class SVXCORE_DLLPUBLIC ColorWindow final : public WeldToolbarPopup
{
private:
-const sal_uInt16theSlotId;
+const sal_uInt16mnSlotId;
OUStringmaCommand;
MenuOrToolMenuButton maMenuButton;
std::shared_ptr mxPaletteManager;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 731b928ba53e..2de84acbd3a2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2062,7 +2062,7 @@ ColorWindow::ColorWindow(OUString rCommand,
TopLevelParentFunction aTopLevelParentFunction,
ColorSelectFunction aColorSelectFunction)
: WeldToolbarPopup(rFrame, rMenuButton.get_widget(),
u"svx/ui/colorwindow.ui"_ustr, u"palette_popup_window"_ustr)
-, theSlotId(nSlotId)
+, mnSlotId(nSlotId)
, maCommand(std::move(rCommand))
, maMenuButton(rMenuButton)
, mxPaletteManager(std::move(xPaletteManager))
@@ -2083,7 +2083,7 @@ ColorWindow::ColorWindow(OUString rCommand,
mxColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK
| WB_NO_DIRECTSELECT | WB_TABSTOP) );
mxRecentColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER |
WB_3DLOOK | WB_NO_DIRECTSELECT | WB_TABSTOP) );
-switch ( theSlotId )
+switch ( mnSlotId )
{
case SID_ATTR_CHAR_COLOR_BACKGROUND:
case SID_BACKGROUND_COLOR:
@@ -2299,7 +2299,7 @@ IMPL_LINK_NOARG(ColorWindow, SelectPaletteHdl,
weld::ComboBox&, void)
NamedColor ColorWindow::GetAutoColor() const
{
-return ::GetAutoColor(theSlotId);
+return ::GetAutoColor(mnSlotId);
}
IMPL_LINK(ColorWindow, AutoColorClickHdl, weld::Button&, rButton, void)
core.git: include/svx svx/source
include/svx/SvxPresetListBox.hxx |6 +++---
svx/source/tbxctrls/SvxPresetListBox.cxx |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit ef67a7f264310baf1cc08d8a13a4358b05080325
Author: Miklos Vajna
AuthorDate: Mon Jun 16 08:32:41 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Jun 16 09:43:25 2025 +0200
svx: prefix members of SvxPresetListBox
See tdf#94879 for motivation.
Change-Id: Ic5df0feeaa57bd4ac34fa6b6bc3e13c5e6145e11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186535
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx
index 790578f42b3d..4767c4f3ea14 100644
--- a/include/svx/SvxPresetListBox.hxx
+++ b/include/svx/SvxPresetListBox.hxx
@@ -26,8 +26,8 @@
class SVXCORE_DLLPUBLIC SvxPresetListBox : public ValueSet
{
private:
-static constexpr sal_uInt32 nColCount = 3;
-Size aIconSize;
+static constexpr sal_uInt32 s_nColCount = 3;
+Size m_aIconSize;
sal_uInt16 mnContextMenuItemId;
Link maRenameHdl;
Link maDeleteHdl;
@@ -43,7 +43,7 @@ public:
virtual void Resize() override;
virtual bool Command(const CommandEvent& rEvent) override;
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
-Size const & GetIconSize() const { return aIconSize; }
+Size const & GetIconSize() const { return m_aIconSize; }
sal_uInt16 GetContextMenuItemId() const { return mnContextMenuItemId; }
void SetRenameHdl( const Link& rLink )
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx
b/svx/source/tbxctrls/SvxPresetListBox.cxx
index 39b34e9ae476..45137b68b048 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -25,7 +25,7 @@
SvxPresetListBox::SvxPresetListBox(std::unique_ptr
pWindow)
: ValueSet(std::move(pWindow))
-, aIconSize(60, 64)
+, m_aIconSize(60, 64)
, mnContextMenuItemId(0)
{
SetEdgeBlending(true);
@@ -67,7 +67,7 @@ bool SvxPresetListBox::Command(const CommandEvent& rEvent)
void SvxPresetListBox::DrawLayout()
{
-SetColCount(nColCount);
+SetColCount(s_nColCount);
SetLineCount(5);
}
core.git: include/svx svx/source
include/svx/PaletteManager.hxx |2 +-
svx/source/tbxctrls/PaletteManager.cxx | 16
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 9e1a9d7f43112880ba119a61912f306ff29c7987
Author: Miklos Vajna
AuthorDate: Tue Jun 10 09:18:12 2025 +0200
Commit: Miklos Vajna
CommitDate: Tue Jun 10 11:36:50 2025 +0200
svx: prefix members of PaletteManager
See tdf#94879 for motivation.
Change-Id: I25ae3bd1de7a07f6c8b4ab2977570381ca688fbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186318
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index c09fd73dfbc1..2b39dee9fd8b 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -43,7 +43,7 @@ class SVXCORE_DLLPUBLIC PaletteManager : public
std::enable_shared_from_this maRecentColors;
std::vector> m_Palettes;
diff --git a/svx/source/tbxctrls/PaletteManager.cxx
b/svx/source/tbxctrls/PaletteManager.cxx
index a208b218605c..0e2dd510ec04 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -63,10 +63,10 @@ PaletteManager::PaletteManager() :
{
const SfxPoolItem* pItem = nullptr;
if( nullptr != ( pItem = pDocSh->GetItem(SID_COLOR_TABLE) ) )
-pColorList =
pItem->StaticWhichCast(SID_COLOR_TABLE).GetColorList();
+mpColorList =
pItem->StaticWhichCast(SID_COLOR_TABLE).GetColorList();
}
-if(!pColorList.is())
-pColorList = XColorList::CreateStdColorList();
+if(!mpColorList.is())
+mpColorList = XColorList::CreateStdColorList();
LoadPalettes();
mnNumOfPalettes += m_Palettes.size();
@@ -286,17 +286,17 @@ void PaletteManager::SetPalette( sal_Int32 nPos )
mnCurrentPalette = nPos;
if( nPos != mnNumOfPalettes - 1 && nPos != 0)
{
-pColorList = XPropertyList::AsColorList(
+mpColorList = XPropertyList::AsColorList(
XPropertyList::CreatePropertyListFromURL(
XPropertyListType::Color,
GetSelectedPalettePath()));
auto name = GetPaletteName(); // may change pColorList
-pColorList->SetName(name);
-if(pColorList->Load())
+mpColorList->SetName(name);
+if(mpColorList->Load())
{
SfxObjectShell* pShell = SfxObjectShell::Current();
if (pShell != nullptr)
{
-SvxColorListItem aColorItem(pColorList, SID_COLOR_TABLE);
+SvxColorListItem aColorItem(mpColorList, SID_COLOR_TABLE);
pShell->PutItem( aColorItem );
}
}
@@ -325,7 +325,7 @@ OUString PaletteManager::GetPaletteName()
{
const SfxPoolItem* pItem = nullptr;
if( nullptr != ( pItem = pDocSh->GetItem(SID_COLOR_TABLE) ) )
-pColorList =
pItem->StaticWhichCast(SID_COLOR_TABLE).GetColorList();
+mpColorList =
pItem->StaticWhichCast(SID_COLOR_TABLE).GetColorList();
}
}
return aNames[mnCurrentPalette];
core.git: include/svx svx/source
include/svx/svdpage.hxx |6 ++---
svx/source/svdraw/svdpage.cxx | 46 --
2 files changed, 25 insertions(+), 27 deletions(-)
New commits:
commit 49455ff2fefcc5528a081ae896491c46f4c984a4
Author: Tomaž Vajngerl
AuthorDate: Mon Jun 2 08:02:08 2025 +0200
Commit: Tomaž Vajngerl
CommitDate: Wed Jun 4 17:10:38 2025 +0200
svx: store a ref to SdrPage, not a pointer in SdrPageProperties
The constructor already takes a reference to SdrPage, but for some
reason we store a pointer and then later we check if the pointer
is not nullptr in some cases, which shouldn't be required. This
changes the the pointer to reference and it simplifies the code a
bit.
Change-Id: Ib49f514d95e52a078eb55f08bfaaa70fecbea083
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186121
Reviewed-by: Tomaž Vajngerl
Tested-by: Jenkins
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 3d9c60401544..3d6cc600f775 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -321,10 +321,10 @@ class SVXCORE_DLLPUBLIC SdrPageProperties final : public
SfxListener, public svl
{
private:
// data
-SdrPage*mpSdrPage;
-SfxStyleSheet* mpStyleSheet;
+SdrPage& mrSdrPage;
+SfxStyleSheet* mpStyleSheet;
std::shared_ptr mpTheme;
-SfxItemSet maProperties;
+SfxItemSet maProperties;
// internal helpers
void ImpRemoveStyleSheet();
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 3c16e6421f97..2f754255967c 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1197,7 +1197,10 @@ void SdrPageProperties::ImpAddStyleSheet(SfxStyleSheet&
rNewStyleSheet)
}
}
-static void ImpPageChange(SdrPage& rSdrPage)
+namespace
+{
+
+void ImpPageChange(SdrPage& rSdrPage)
{
rSdrPage.ActionChanged();
rSdrPage.getSdrModelFromSdrPage().SetChanged();
@@ -1205,14 +1208,16 @@ static void ImpPageChange(SdrPage& rSdrPage)
rSdrPage.getSdrModelFromSdrPage().Broadcast(aHint);
}
+} // end anonymous namespace
+
SdrPageProperties::SdrPageProperties(SdrPage& rSdrPage)
-: mpSdrPage(&rSdrPage)
+: mrSdrPage(rSdrPage)
, mpStyleSheet(nullptr)
, maProperties(
-mpSdrPage->getSdrModelFromSdrPage().GetItemPool(),
+mrSdrPage.getSdrModelFromSdrPage().GetItemPool(),
svl::Items)
{
-if (!rSdrPage.IsMasterPage())
+if (!mrSdrPage.IsMasterPage())
{
maProperties.Put(XFillStyleItem(drawing::FillStyle_NONE));
}
@@ -1230,7 +1235,7 @@ void SdrPageProperties::Notify(SfxBroadcaster& /*rBC*/,
const SfxHint& rHint)
case SfxHintId::DataChanged :
{
// notify change, broadcast
-ImpPageChange(*mpSdrPage);
+ImpPageChange(mrSdrPage);
break;
}
case SfxHintId::Dying :
@@ -1245,29 +1250,28 @@ void SdrPageProperties::Notify(SfxBroadcaster& /*rBC*/,
const SfxHint& rHint)
bool SdrPageProperties::isUsedByModel() const
{
-assert(mpSdrPage);
-return mpSdrPage->IsInserted();
+return mrSdrPage.IsInserted();
}
void SdrPageProperties::PutItemSet(const SfxItemSet& rSet)
{
-OSL_ENSURE(!mpSdrPage->IsMasterPage(), "Item set at MasterPage Attributes
(!)");
+OSL_ENSURE(!mrSdrPage.IsMasterPage(), "Item set at MasterPage Attributes
(!)");
maProperties.Put(rSet);
-ImpPageChange(*mpSdrPage);
+ImpPageChange(mrSdrPage);
}
void SdrPageProperties::PutItem(const SfxPoolItem& rItem)
{
-OSL_ENSURE(!mpSdrPage->IsMasterPage(), "Item set at MasterPage Attributes
(!)");
+OSL_ENSURE(!mrSdrPage.IsMasterPage(), "Item set at MasterPage Attributes
(!)");
maProperties.Put(rItem);
-ImpPageChange(*mpSdrPage);
+ImpPageChange(mrSdrPage);
}
void SdrPageProperties::ClearItem(const sal_uInt16 nWhich)
{
maProperties.ClearItem(nWhich);
-ImpPageChange(*mpSdrPage);
+ImpPageChange(mrSdrPage);
}
void SdrPageProperties::SetStyleSheet(SfxStyleSheet* pStyleSheet)
@@ -1281,37 +1285,31 @@ void SdrPageProperties::SetStyleSheet(SfxStyleSheet*
pStyleSheet)
ImpRemoveStyleSheet();
}
-ImpPageChange(*mpSdrPage);
+ImpPageChange(mrSdrPage);
}
void SdrPageProperties::setTheme(std::shared_ptr const& pTheme)
{
-if (!mpSdrPage)
-return;
-
// Only set the theme on a master page, else set it on the model
-if (mpSdrPage->IsMasterPage())
+if (mrSdrPage.IsMasterPage())
{
if (mpTheme != pTheme)
mpTheme = pTheme;
}
else
{
-mpSdrPage->getSdrModelFromSdrPage().setTheme(pTheme);
+mrSdrPage.getSdrModelFromSdrPage().setTheme(pTheme);
}
}
std::shared_ptr const& SdrPageProperties::getTheme() const
{
-// if set - page theme has priority
+// If the page theme is available use that, else get the theme f
core.git: include/svx svx/source
include/svx/fmgridif.hxx |2 --
svx/source/fmcomp/fmgridif.cxx | 30 --
2 files changed, 32 deletions(-)
New commits:
commit cbce194ae57d2c83fa8c191868733cb9f46221fb
Author: Michael Weghorn
AuthorDate: Mon May 26 09:36:05 2025 +0200
Commit: Michael Weghorn
CommitDate: Wed May 28 18:02:09 2025 +0200
svx a11y: Drop FmXGridPeer::CreateAccessibleContext
As far as I can understand, this custom override of
VCLXWindow::CreateAccessibleContext should in the end
have no effect, because VCLXWindow::CreateAccessibleContext
only gets called if the window doesn't have an accessible
yet that's different from the FmXGridPeer, see
Window::GetAccessible.
Change-Id: I958e3634a074bcf9cd6639bd6942ec0fb8ff920b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185840
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index e3011cda8dae..c31297631452 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -426,8 +426,6 @@ public:
// VCLXWindow
virtual void SAL_CALL setProperty( const OUString& PropertyName, const
css::uno::Any& Value ) override;
virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName )
override;
-virtual css::uno::Reference< css::accessibility::XAccessibleContext >
-CreateAccessibleContext() override;
// css::form::XGridControl
virtual void SAL_CALL addGridControlListener( const css::uno::Reference<
css::form::XGridControlListener >& _listener ) override;
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 9326f6b3c6ee..6e5594054364 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1957,36 +1957,6 @@ void FmXGridPeer::setProperty( const OUString&
PropertyName, const Any& Value)
VCLXWindow::setProperty( PropertyName, Value );
}
-
-Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext()
-{
-Reference< XAccessibleContext > xContext;
-
-// use the AccessibleContext provided by the VCL window
-VclPtr pGrid = GetWindow();
-if ( pGrid )
-{
-Reference< XAccessible > xAcc( pGrid->GetAccessible() );
-if ( xAcc.is() )
-xContext = xAcc->getAccessibleContext();
-// TODO: this has a slight conceptual problem:
-
-// We know that the XAccessible and XAccessibleContext implementation
of the browse
-// box is the same (the class implements both interfaces), which,
speaking strictly,
-// is bad here (means when a browse box acts as UnoControl): We (the
FmXGridPeer) are
-// the XAccessible here, and the browse box should be able to provide
us an XAccessibleContext,
-// but it should _not_ be the XAccessible itself.
-// However, as long as no client implementation uses dirty hacks such
as querying an
-// XAccessibleContext for XAccessible, this should not be a problem.
-}
-
-if ( !xContext.is() )
-xContext = VCLXWindow::CreateAccessibleContext( );
-
-return xContext;
-}
-
-
Any FmXGridPeer::getProperty( const OUString& _rPropertyName )
{
Any aProp;
core.git: include/svx svx/source
include/svx/svdobj.hxx |1
svx/source/svdraw/svdobj.cxx | 140 -
svx/source/svdraw/svdotxdr.cxx | 62 --
3 files changed, 84 insertions(+), 119 deletions(-)
New commits:
commit edd0991c3cc1c5ae439e33873c2567ee62d0e710
Author: Laurent Balland
AuthorDate: Thu May 1 19:52:36 2025 +0200
Commit: Miklos Vajna
CommitDate: Tue May 27 14:21:12 2025 +0200
Rezing SdrObject: Remove duplicate code
SdrTextObj::ImpDragCalcRect and SdrObject::ImpDragCalcRect are almost
duplicate
This patch creates an inherited function to avoid duplicate code
Change-Id: I9a9abfeb1fa176e59c1d30b4530781268d84fcb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184931
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 297ee9530a61..21119a4fa5ac 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -913,6 +913,7 @@ protected:
virtual std::unique_ptr
CreateObjectSpecificViewContact();
+static void ImpCommonDragCalcRect(const SdrDragStat& rDrag,
tools::Rectangle& rTmpRect);
tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
// for GetDragComment
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 4eb5146a0c0e..db20c9bb8d58 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1249,71 +1249,95 @@ void SdrObject::addCropHandles(SdrHdlList& /*rTarget*/)
const
// SdrGrafObj and SwVirtFlyDrawObj
}
-tools::Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const
+void SdrObject::ImpCommonDragCalcRect(const SdrDragStat& rDrag,
tools::Rectangle& rTmpRect)
{
-tools::Rectangle aTmpRect(GetSnapRect());
-tools::Rectangle aRect(aTmpRect);
-const SdrHdl* pHdl=rDrag.GetHdl();
-SdrHdlKind eHdl=pHdl==nullptr ? SdrHdlKind::Move : pHdl->GetKind();
-bool bEcke=(eHdl==SdrHdlKind::UpperLeft || eHdl==SdrHdlKind::UpperRight ||
eHdl==SdrHdlKind::LowerLeft || eHdl==SdrHdlKind::LowerRight);
-bool bOrtho=rDrag.GetView()!=nullptr && rDrag.GetView()->IsOrtho();
-bool bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho();
+const tools::Rectangle aRect(rTmpRect);
+const SdrHdl* pHdl = rDrag.GetHdl();
+SdrHdlKind eHdl = (pHdl==nullptr ? SdrHdlKind::Move : pHdl->GetKind());
+bool bCorner = (eHdl==SdrHdlKind::UpperLeft ||
eHdl==SdrHdlKind::UpperRight || eHdl==SdrHdlKind::LowerLeft ||
eHdl==SdrHdlKind::LowerRight);
+bool bOrtho = rDrag.GetView()!=nullptr && rDrag.GetView()->IsOrtho();
+bool bBigOrtho = bCorner && bOrtho && rDrag.GetView()->IsBigOrtho();
Point aPos(rDrag.GetNow());
-bool bLft=(eHdl==SdrHdlKind::UpperLeft || eHdl==SdrHdlKind::Left ||
eHdl==SdrHdlKind::LowerLeft);
-bool bRgt=(eHdl==SdrHdlKind::UpperRight || eHdl==SdrHdlKind::Right ||
eHdl==SdrHdlKind::LowerRight);
-bool bTop=(eHdl==SdrHdlKind::UpperRight || eHdl==SdrHdlKind::Upper ||
eHdl==SdrHdlKind::UpperLeft);
-bool bBtm=(eHdl==SdrHdlKind::LowerRight || eHdl==SdrHdlKind::Lower ||
eHdl==SdrHdlKind::LowerLeft);
-if (bLft) aTmpRect.SetLeft(aPos.X() );
-if (bRgt) aTmpRect.SetRight(aPos.X() );
-if (bTop) aTmpRect.SetTop(aPos.Y() );
-if (bBtm) aTmpRect.SetBottom(aPos.Y() );
-if (bOrtho) { // Ortho
-tools::Long nWdt0=aRect.Right() -aRect.Left();
-tools::Long nHgt0=aRect.Bottom()-aRect.Top();
-tools::Long nXMul=aTmpRect.Right() -aTmpRect.Left();
-tools::Long nYMul=aTmpRect.Bottom()-aTmpRect.Top();
-tools::Long nXDiv=nWdt0;
-tools::Long nYDiv=nHgt0;
-bool bXNeg=(nXMul<0)!=(nXDiv<0);
-bool bYNeg=(nYMul<0)!=(nYDiv<0);
-nXMul=std::abs(nXMul);
-nYMul=std::abs(nYMul);
-nXDiv=std::abs(nXDiv);
-nYDiv=std::abs(nYDiv);
-Fraction aXFact(nXMul,nXDiv); // fractions for canceling
-Fraction aYFact(nYMul,nYDiv); // and for comparing
-nXMul=aXFact.GetNumerator();
-nYMul=aYFact.GetNumerator();
-nXDiv=aXFact.GetDenominator();
-nYDiv=aYFact.GetDenominator();
-if (bEcke) { // corner point handles
-bool bUseX=(aXFactGetKind();
-bool bEcke=(eHdl==SdrHdlKind::UpperLeft || eHdl==SdrHdlKind::UpperRight ||
eHdl==SdrHdlKind::LowerLeft || eHdl==SdrHdlKind::LowerRight);
-bool bOrtho=rDrag.GetView()!=nullptr && rDrag.GetView()->IsOrtho();
-bool bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho();
Point aPos(rDrag.GetNow());
// Unrotate:
if (maGeo.m_nRotationAngle)
RotatePoint(aPos,aTmpRect.TopLeft(),-maGeo.mfSinRotationAngle,maGeo.mfCosRotationAngle);
// Unshear:
if (maGeo.m_nShearAngle)
ShearPoint(aPos,aTmpRect.TopLeft(),-maGeo.mfTanShearAngle);
-
-bool bLft=(eHdl==SdrHdlKind::UpperLeft || eHdl==SdrHdlKind::Left ||
eHdl==SdrHdlKind::LowerLeft);
-bool bRgt=(eHdl==SdrHdlKind::UpperRight || eHdl==SdrHdlKind::Rig
core.git: include/svx svx/source
include/svx/svdetc.hxx | 10 +-
svx/source/svdraw/svdetc.cxx | 30 +++---
2 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 63ac5cadc8e594a7c440b410d747dfb37791c34a
Author: Miklos Vajna
AuthorDate: Tue May 27 08:17:41 2025 +0200
Commit: Miklos Vajna
CommitDate: Tue May 27 10:38:04 2025 +0200
svx: prefix members of OLEObjCache
See tdf#94879 for motivation.
Change-Id: Ifdf360fed1567065ed5efe819aa2aa890f90f179
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185876
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index d7b3d6295ea8..dd01624cc9db 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -151,8 +151,8 @@ class OLEObjCache
{
std::vector maObjs;
-size_t nSize;
-std::unique_ptr pTimer;
+size_t mnSize;
+std::unique_ptr mpTimer;
static bool UnloadObj(SdrOle2Obj& rObj);
DECL_LINK( UnloadCheckHdl, Timer*, void );
@@ -175,14 +175,14 @@ class SVXCORE_DLLPUBLIC SdrGlobalData
SvtSysLocale maSysLocale; // follows always locale settings
public:
std::vector>>
-aUserMakeObjHdl;
-OLEObjCache aOLEObjCache;
+maUserMakeObjHdl;
+OLEObjCache maOLEObjCache;
SAL_DLLPRIVATE SdrGlobalData();
const SvtSysLocale& GetSysLocale() { return maSysLocale; } // follows
always locale settings
const LocaleDataWrapper& GetLocaleData();// follows always SysLocale
-OLEObjCache&GetOLEObjCache() { return aOLEObjCache; }
+OLEObjCache&GetOLEObjCache() { return maOLEObjCache; }
};
SVXCORE_DLLPUBLIC SdrGlobalData & GetSdrGlobalData();
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 29f369cbff44..5d3788789136 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -92,34 +92,34 @@ OLEObjCache::OLEObjCache()
// This limit is only useful on 32-bit windows, where we can run out of
virtual memory (see tdf#95579)
// For everything else, we are better off keeping it in main memory rather
than using our hacky page-out thing
#if defined _WIN32 && !defined _WIN64
-nSize =
officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get();
+mnSize =
officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get();
#else
-nSize = SAL_MAX_INT32; // effectively disable the page-out mechanism
+mnSize = SAL_MAX_INT32; // effectively disable the page-out mechanism
#endif
}
else
-nSize = 100;
-pTimer.reset( new AutoTimer( "svx OLEObjCache pTimer UnloadCheck" ) );
-pTimer->SetInvokeHandler( LINK(this, OLEObjCache, UnloadCheckHdl) );
-pTimer->SetTimeout(2);
-pTimer->SetStatic();
+mnSize = 100;
+mpTimer.reset( new AutoTimer( "svx OLEObjCache pTimer UnloadCheck" ) );
+mpTimer->SetInvokeHandler( LINK(this, OLEObjCache, UnloadCheckHdl) );
+mpTimer->SetTimeout(2);
+mpTimer->SetStatic();
}
OLEObjCache::~OLEObjCache()
{
-pTimer->Stop();
+mpTimer->Stop();
}
IMPL_LINK_NOARG(OLEObjCache, UnloadCheckHdl, Timer*, void)
{
-if (nSize >= maObjs.size())
+if (mnSize >= maObjs.size())
return;
// more objects than configured cache size try to remove objects
// of course not the freshly inserted one at nIndex=0
size_t nCount2 = maObjs.size();
size_t nIndex = nCount2-1;
-while( nIndex && nCount2 > nSize )
+while( nIndex && nCount2 > mnSize )
{
SdrOle2Obj* pUnloadObj = maObjs[nIndex--];
if (!pUnloadObj)
@@ -188,10 +188,10 @@ void OLEObjCache::InsertObj(SdrOle2Obj* pObj)
// if a new object was inserted, recalculate the cache
if (!bFound)
-pTimer->Invoke();
+mpTimer->Invoke();
-if (!bFound || !pTimer->IsActive())
-pTimer->Start();
+if (!bFound || !mpTimer->IsActive())
+mpTimer->Start();
}
void OLEObjCache::RemoveObj(SdrOle2Obj* pObj)
@@ -200,7 +200,7 @@ void OLEObjCache::RemoveObj(SdrOle2Obj* pObj)
if (it != maObjs.end())
maObjs.erase(it);
if (maObjs.empty())
-pTimer->Stop();
+mpTimer->Stop();
}
size_t OLEObjCache::size() const
@@ -364,7 +364,7 @@ std::unique_ptr SdrMakeOutliner(OutlinerMode
nOutlinerMode, SdrMode
std::vector>>&
ImpGetUserMakeObjHdl()
{
SdrGlobalData& rGlobalData=GetSdrGlobalData();
-return rGlobalData.aUserMakeObjHdl;
+return rGlobalData.maUserMakeObjHdl;
}
bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool*
pbOnlyEE)
core.git: include/svx svx/source
include/svx/galmisc.hxx |3 ++-
svx/source/gallery2/galbrws1.cxx | 37 +++--
svx/source/gallery2/galtheme.cxx |3 ++-
3 files changed, 27 insertions(+), 16 deletions(-)
New commits:
commit f8eb5d8503adb589239788f649f93d0ef51c2a47
Author: Oliver Specht
AuthorDate: Tue May 20 17:23:08 2025 +0200
Commit: Oliver Specht
CommitDate: Thu May 22 07:53:33 2025 +0200
tdf#164202 Update gallery data on insert/remove
Fixes crashes introduced with 09c6204b6309321aa25c542f918fde9f5f3f7fe2
Change-Id: Ifca32646c8ba5abce647934e1d2ddac8a8eba2ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185584
Tested-by: Jenkins
Reviewed-by: Oliver Specht
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 9a9eaa1116c6..6e7c5b851d89 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -165,7 +165,8 @@ enum class GalleryHintType
THEME_RENAMED,
THEME_CREATED,
THEME_UPDATEVIEW,
-CLOSE_OBJECT
+CLOSE_OBJECT,
+ADD_OBJECT
};
class GalleryHint final : public SfxHint
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 2346410b3085..537fe88ae16b 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -490,6 +490,13 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const
SfxHint& rHint )
ImplUpdateViews( reinterpret_cast(rGalleryHint.GetData1())
+ 1 );
}
break;
+case GalleryHintType::ADD_OBJECT:
+case GalleryHintType::CLOSE_OBJECT:
+{
+FillThemeEntries();
+ImplUpdateViews(0);
+}
+break;
default:
break;
@@ -1500,26 +1507,28 @@ IMPL_LINK(GalleryBrowser1, SelectTbxHdl,
weld::Toggleable&, rBox, void)
void GalleryBrowser1::FillThemeEntries()
{
-for (size_t i = 0, nCount = mpGallery->GetThemeCount(); i < nCount;
++i)
+maFoundThemeEntries.clear();
+maAllThemeEntries.clear();
+for (size_t i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; ++i)
+{
+const GalleryThemeEntry* pThemeInfo = mpGallery->GetThemeInfo( i );
+OUString aThemeName = pThemeInfo->GetThemeName();
+//sal_uInt32 nId = pThemeInfo->GetId();
+if (GalleryTheme* pTheme = mpGallery->AcquireTheme(aThemeName,
maLocalListener))
{
-const GalleryThemeEntry* pThemeInfo = mpGallery->GetThemeInfo( i );
-OUString aThemeName = pThemeInfo->GetThemeName();
-//sal_uInt32 nId = pThemeInfo->GetId();
-if (GalleryTheme* pTheme = mpGallery->AcquireTheme(aThemeName,
maLocalListener))
+sal_uInt32 nObjectCount = pTheme->GetObjectCount();
+for (size_t nObject = 0; nObject < nObjectCount; ++nObject)
{
-sal_uInt32 nObjectCount = pTheme->GetObjectCount();
-for (size_t nObject = 0; nObject < nObjectCount; ++nObject)
+if (std::unique_ptr xSgaObject =
pTheme->AcquireObject(nObject))
{
-if (std::unique_ptr xSgaObject =
pTheme->AcquireObject(nObject))
-{
-OUString aTitle = GetItemText(*xSgaObject,
GalleryItemFlags::Title);
-maAllThemeEntries.push_back(ThemeEntry(aThemeName,
aTitle, nObject));
-}
+OUString aTitle = GetItemText(*xSgaObject,
GalleryItemFlags::Title);
+maAllThemeEntries.push_back(ThemeEntry(aThemeName, aTitle,
nObject));
}
-mpGallery->ReleaseTheme(pTheme, maLocalListener);
}
+mpGallery->ReleaseTheme(pTheme, maLocalListener);
}
-maFoundThemeEntries.assign(maAllThemeEntries.begin(),
maAllThemeEntries.end());
+}
+maFoundThemeEntries.assign(maAllThemeEntries.begin(),
maAllThemeEntries.end());
}
IMPL_LINK(GalleryBrowser1, SearchHdl, weld::Entry&, searchEdit, void)
{
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index f2d7854d3aa7..846267a15e20 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -134,7 +134,8 @@ bool GalleryTheme::InsertObject(const SgaObject& rObj,
sal_uInt32 nInsertPos)
mpGalleryStorageEngine->insertObject(rObj, pFoundEntry, nInsertPos);
ImplSetModified(true);
-ImplBroadcast(pFoundEntry? iFoundPos: nInsertPos);
+Broadcast( GalleryHint( GalleryHintType::ADD_OBJECT, GetName(),
+reinterpret_cast(static_cast(pFoundEntry?
iFoundPos: nInsertPos)) ) );
return true;
}
core.git: include/svx svx/source
include/svx/AccessibleControlShape.hxx |3 +
svx/source/accessibility/AccessibleControlShape.cxx | 31 +---
2 files changed, 18 insertions(+), 16 deletions(-)
New commits:
commit ffb112e4795756f2ed2da322de7390b65024bd4f
Author: Michael Weghorn
AuthorDate: Wed May 21 16:15:36 2025 +0200
Commit: Michael Weghorn
CommitDate: Thu May 22 05:51:56 2025 +0200
svx a11y: Make static helper a AccessibleControlShape method
... and stop passing `m_xUnoControl` in every invocation,
as that can be directly accessed from within the
method now, renamed to AccessibleControlShape::isControlInAliveMode.
Change-Id: I7d4f8ee0a03511c570f1a10336dc75b817545f6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185621
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/include/svx/AccessibleControlShape.hxx
b/include/svx/AccessibleControlShape.hxx
index cd9b7ab99428..d02ac83b0808 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -165,6 +165,9 @@ private:
*/
voidinitializeComposedState( );
+/// determines whether the control is in alive mode
+bool isControlInAliveMode();
+
AccessibleControlShape(const AccessibleControlShape&) = delete;
AccessibleControlShape& operator= (const AccessibleControlShape&) = delete;
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx
b/svx/source/accessibility/AccessibleControlShape.cxx
index 379156cedd04..0addc4cdedf9 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -89,13 +89,6 @@ namespace
&& ( AccessibleStateType::VISIBLE != _nState )
);
}
-
-/// determines whether the given control is in alive mode
-boolisAliveMode( const Reference< XControl >& _rxControl )
-{
-OSL_PRECOND( _rxControl.is(), "AccessibleControlShape::isAliveMode:
invalid control" );
-return _rxControl.is() && !_rxControl->isDesignMode();
-}
}
AccessibleControlShape::AccessibleControlShape (
@@ -214,7 +207,7 @@ void AccessibleControlShape::Init()
m_aControlContext = WeakReference< XAccessibleContext >(
xNativeControlContext );
// add as listener to the context - we want to multiplex some
states
-if ( isAliveMode( m_xUnoControl ) && xNativeControlContext.is() )
+if (isControlInAliveMode() && xNativeControlContext.is() )
{ // (but only in alive mode)
startStateMultiplexing( );
}
@@ -224,7 +217,7 @@ void AccessibleControlShape::Init()
initializeComposedState();
// some initialization for our child manager, which is used in
alive mode only
-if ( isAliveMode( m_xUnoControl ) )
+if (isControlInAliveMode())
{
sal_Int64 nStates( getAccessibleStateSet( ) );
m_pChildManager->setTransientChildren( nStates &
AccessibleStateType::MANAGES_DESCENDANTS );
@@ -266,7 +259,7 @@ void AccessibleControlShape::Init()
void SAL_CALL AccessibleControlShape::grabFocus()
{
-if ( !m_xUnoControl.is() || !isAliveMode( m_xUnoControl ) )
+if (!m_xUnoControl.is() || !isControlInAliveMode())
{
// in design mode, we simply forward the request to the base class
AccessibleShape::grabFocus();
@@ -486,7 +479,7 @@ sal_Int64 SAL_CALL
AccessibleControlShape::getAccessibleChildCount( )
{
if ( !m_xUnoControl.is() )
return 0;
-else if ( !isAliveMode( m_xUnoControl ) )
+else if (!isControlInAliveMode())
// no special action required when in design mode
return AccessibleShape::getAccessibleChildCount( );
else
@@ -506,7 +499,7 @@ Reference< XAccessible > SAL_CALL
AccessibleControlShape::getAccessibleChild( sa
{
throw IndexOutOfBoundsException();
}
-if ( !isAliveMode( m_xUnoControl ) )
+if (!isControlInAliveMode())
{
// no special action required when in design mode - let the base class
handle this
xChild = AccessibleShape::getAccessibleChild( i );
@@ -679,7 +672,7 @@ void AccessibleControlShape::startStateMultiplexing()
#if OSL_DEBUG_LEVEL > 0
// we should have a control, and it should be in alive mode
-OSL_PRECOND( isAliveMode( m_xUnoControl ),
+OSL_PRECOND(isControlInAliveMode(),
"AccessibleControlShape::startStateMultiplexing: should be done in
alive mode only!" );
#endif
// we should have the native context of the control
@@ -731,7 +724,7 @@ OUString
AccessibleControlShape::getControlModelStringProperty( const OUString&
void AccessibleControlShape::adjustAccessibleRole( )
{
// if we're in design mode, we are a simple SHAPE, in alive mode, we use
the role of our inner context
-if ( !isAliveMode( m_xUnoControl ) )
+if (!isControlInAliveMode())
core.git: include/svx svx/source sw/qa sw/source
include/svx/ctredlin.hxx|2 +
svx/source/dialog/ctredlin.cxx | 34
sw/qa/filter/xml/data/insert-then-format.odt|binary
sw/qa/filter/xml/xml.cxx| 25 +
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 34 +---
5 files changed, 92 insertions(+), 3 deletions(-)
New commits:
commit ff110bb17b7e003bd205438af94badabeca007c6
Author: Miklos Vajna
AuthorDate: Mon May 19 08:30:01 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon May 19 10:49:19 2025 +0200
tdf#166319 sw interdependent redlines: handle ODF import of insert under
format
Open the bugdoc, the ODT file has an insert with a format on top of the
middle, but the format is lost in Writer.
It seems what happens is that the XML parser correctly populates the
RedlineInfo structure, but then XMLRedlineImportHelper::ConvertRedline()
decides to throw away the underlying insert using an explicit condition
that was added in commit 52d244dee88b111631680d8cd4c8b922f9640c15 (-
added: redline import, 2001-01-10).
Fix this by extending it similar to the accept redline's
CanCombineTypesForAcceptReject() by adding a CanCombineTypesForImport()
that now accepts insert-then-format, too.
This is similar to what was fixed for DOCX in commit
ed8257a67d26083c2c6cd60ecac331c9e0df15ed (tdf#166319 sw interdependent
redlines: handle format on top of insert, 2025-04-29). The ODT export
was working already as-is.
Change-Id: I2163b0350ca56264ebed5abd54735ef4d91ee2ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185500
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 9a0551698e95..f6536d9a54fd 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -61,6 +61,8 @@ enum class RedlineType : sal_uInt16
Any = USHRT_MAX // special value to indicate any redline type in some
method calls
};
+SVX_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const
RedlineType& eType);
+
/// Struct for sorting data.
class SAL_WARN_UNUSED SVX_DLLPUBLIC RedlinData
{
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index cdcdeed1ff2a..fb011732aecb 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -30,6 +30,7 @@
#include
#include
+#include
#define WRITER_DATE 2
#define CALC_DATE 3
@@ -1009,4 +1010,37 @@ IMPL_LINK(SvxAcceptChgCtr, DeactivatePageHdl, const
OUString&, rPage, bool)
return true;
}
+std::ostream& operator<<(std::ostream& rStream, const RedlineType& eType)
+{
+switch (eType)
+{
+case RedlineType::Insert:
+return rStream << "RedlineType::Insert";
+case RedlineType::Delete:
+return rStream << "RedlineType::Delete";
+case RedlineType::Format:
+return rStream << "RedlineType::Format";
+case RedlineType::Table:
+return rStream << "RedlineType::Table";
+case RedlineType::FmtColl:
+return rStream << "RedlineType::FmtColl";
+case RedlineType::ParagraphFormat:
+return rStream << "RedlineType::ParagraphFormat";
+case RedlineType::TableRowInsert:
+return rStream << "RedlineType::TableRowInsert";
+case RedlineType::TableRowDelete:
+return rStream << "RedlineType::TableRowDelete";
+case RedlineType::TableCellInsert:
+return rStream << "RedlineType::TableCellInsert";
+case RedlineType::TableCellDelete:
+return rStream << "RedlineType::TableCellDelete";
+case RedlineType::None:
+return rStream << "RedlineType::None";
+case RedlineType::Any:
+return rStream << "RedlineType::Any";
+default:
+O3TL_UNREACHABLE;
+}
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/filter/xml/data/insert-then-format.odt
b/sw/qa/filter/xml/data/insert-then-format.odt
new file mode 100644
index ..f6ebb21bcda9
Binary files /dev/null and b/sw/qa/filter/xml/data/insert-then-format.odt differ
diff --git a/sw/qa/filter/xml/xml.cxx b/sw/qa/filter/xml/xml.cxx
index 9a0d9c1ff59b..472f01bbc410 100644
--- a/sw/qa/filter/xml/xml.cxx
+++ b/sw/qa/filter/xml/xml.cxx
@@ -12,6 +12,9 @@
#include
#include
#include
+#include
+#include
+#include
namespace
{
@@ -74,6 +77,28 @@ CPPUNIT_TEST_FIXTURE(Test, testRedlineRecordFlatExport)
pDoc, "/office:document/office:body/office:text/text:tracked-changes",
"track-changes");
CPPUNIT_ASSERT_EQUAL(u"true"_ustr, aValue);
}
+
+CPPUNIT_TEST_FIXTURE(Test, testInsertThenFormatOdtImport)
+{
+// Given a document with ABC style redlines:
+// When importing that document:
+createSwDoc("insert-then-format.odt");
+
+// Then make sur
core.git: include/svx svx/source
include/svx/xflftrit.hxx |6 +++---
svx/source/xoutdev/xattr.cxx | 12 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 085b0ec9cdd8ffbda91e0f3c8c3e7e714024fdd4
Author: Miklos Vajna
AuthorDate: Mon May 19 08:40:55 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon May 19 09:45:09 2025 +0200
svx: prefix members of XFillFloatTransparenceItem
See tdf#94879 for motivation.
Change-Id: I811466a635bbeb34639f27f63a11ae791768065c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185496
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx
index 44c1d3f0ba08..b8ce18c6713c 100644
--- a/include/svx/xflftrit.hxx
+++ b/include/svx/xflftrit.hxx
@@ -31,7 +31,7 @@ class SVXCORE_DLLPUBLIC XFillFloatTransparenceItem final :
public XFillGradientI
{
private:
-boolbEnabled;
+boolm_bEnabled;
public:
@@ -50,8 +50,8 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit
eCoreMetric,
MapUnit ePresMetric, OUString &rText, const
IntlWrapper& rIntlWrapper ) const override;
-boolIsEnabled() const { return bEnabled; }
-voidSetEnabled( bool bEnable ) { bEnabled = bEnable; }
+boolIsEnabled() const { return m_bEnabled; }
+voidSetEnabled( bool bEnable ) { m_bEnabled = bEnable;
}
static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2
);
std::unique_ptr checkForUniqueItem( SdrModel&
rModel ) const;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index d368d0a7bbdb..aa6f8c7d27b3 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2506,32 +2506,32 @@ SfxPoolItem*
XFillFloatTransparenceItem::CreateDefault() { return new XFillFloat
XFillFloatTransparenceItem::XFillFloatTransparenceItem() :
XFillGradientItem(XATTR_FILLFLOATTRANSPARENCE),
-bEnabled( false )
+m_bEnabled( false )
{
}
XFillFloatTransparenceItem::XFillFloatTransparenceItem(const OUString& rName,
const basegfx::BGradient& rGradient, bool bEnable ) :
XFillGradientItem ( rName, rGradient, XATTR_FILLFLOATTRANSPARENCE ),
-bEnabled( bEnable )
+m_bEnabled( bEnable )
{
}
XFillFloatTransparenceItem::XFillFloatTransparenceItem( const
XFillFloatTransparenceItem& rItem ) :
XFillGradientItem ( rItem ),
-bEnabled( rItem.bEnabled )
+m_bEnabled( rItem.m_bEnabled )
{
}
XFillFloatTransparenceItem::XFillFloatTransparenceItem(const
basegfx::BGradient& rTheGradient, bool bEnable )
: XFillGradientItem ( -1, rTheGradient, XATTR_FILLFLOATTRANSPARENCE ),
-bEnabled( bEnable )
+m_bEnabled( bEnable )
{
}
bool XFillFloatTransparenceItem::operator==( const SfxPoolItem& rItem ) const
{
return ( XFillGradientItem::operator==(rItem) ) &&
- ( bEnabled == static_cast(rItem).bEnabled );
+ ( m_bEnabled == static_cast(rItem).m_bEnabled );
}
XFillFloatTransparenceItem* XFillFloatTransparenceItem::Clone( SfxItemPool*
/*pPool*/) const
@@ -2622,7 +2622,7 @@ boost::property_tree::ptree
XFillFloatTransparenceItem::dumpAsJSON() const
boost::property_tree::ptree aTree = XFillGradientItem::dumpAsJSON();
aTree.put("commandName", ".uno:FillFloatTransparence");
-if (!bEnabled)
+if (!m_bEnabled)
{
boost::property_tree::ptree& rState = aTree.get_child("state");
// When gradient fill is disabled, the intensity fields contain the
core.git: include/svx svx/source sw/qa sw/source
include/svx/svdmodel.hxx |3 ++
include/svx/svdpntv.hxx |1
svx/source/svdraw/svdmodel.cxx|1
svx/source/svdraw/svdpntv.cxx | 10 +++
sw/qa/extras/tiledrendering/data/3pages-shape.odt |binary
sw/qa/extras/tiledrendering/tiledrendering2.cxx | 29 ++
sw/source/core/layout/layact.cxx | 17
7 files changed, 61 insertions(+)
New commits:
commit e60a92164ac2cc35f70efcbf20a7272be1e3f99d
Author: Miklos Vajna
AuthorDate: Thu May 15 09:34:25 2025 +0200
Commit: Miklos Vajna
CommitDate: Thu May 15 16:22:00 2025 +0200
cool#11942 svx lok: handle Writer idle status when starting the paint view
idle
The bugdoc is similar to cool#11785, i.e. a document of 3-400 pages, but
the content is reasonably simple, mostly plain text and bullet points.
The document has a shape, though. Loading this document in COOL does a
full sync layout on load, which is reported to take ~9s on a slower
machine and it takes >1s for me locally (after doc load, before the
render of the first page).
It seems what happens is that idle layout is started, but it's not
interrupted, because moving content between pages in
SwLayAction::Action(), called from the SwLayIdle ctor calls into
SdrPaintView::Notify(), which starts a high priority "idle", so the LOK
client thinks it should not interrupt core jobs, so the idle layout
first completes, and only then we paint the first tile.
Fix the problem by adjusting the priority of
SdrPaintView::maComeBackIdle dynamically. Add a flag in the draw model
to know when we're inside the Writer idle layout and once the svx/ idle
is started, lower the priority in case that's invoked from inside the
Writer idle layout. This gives the LOK client a way to interrupt the
Writer idle layout (via the anyInput callback), now that it seems core
has no high priority jobs in the scheduler. Size of the time window
between the end of doc load and the start of the first tile render,
before: 1617 ms. After: 182 ms
An alternative approach I considered is to interact with the
SdrPaintView that belongs to the current Writer view, but that won't
work. There are typically 2 draw views active right after document
load, one created in SwViewShellImp::MakeDrawView(), but there is also
an additional hidden view created in the SvxDrawPage ctor for UNO
purposes, so if we don't go via SdrModel, we would have to notify both
views that we're entering / leaving the Writer idle layout, which looks
more complicated than what this patch does.
Change-Id: I115ba2c152fe7283804cde564afd511f9fbff707
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185360
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 2d7118be583f..15b756b1c9e1 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -182,6 +182,7 @@ protected:
sal_uInt16 m_nPageNumsDirtyFrom = SAL_MAX_UINT16;
sal_uInt16 m_nMasterPageNumsDirtyFrom = SAL_MAX_UINT16;
boolm_bIsWriter:1;// to clean up pMyPool from 303a
+boolm_bIsWriterIdle:1;
boolm_bThemedControls:1; // If false UnoControls should
not use theme colors
boolmbUndoEnabled:1; // If false no undo is recorded or
we are during the execution of an undo action
boolmbChanged:1;
@@ -567,6 +568,8 @@ public:
void disposeOutliner( std::unique_ptr pOutliner );
bool IsWriter() const { return m_bIsWriter; }
+void SetWriterIdle(bool bIsWriterIdle) { m_bIsWriterIdle = bIsWriterIdle; }
+bool IsWriterIdle() const { return m_bIsWriterIdle; }
bool IsPDFDocument() const { return m_bIsPDFDocument; }
void setPDFDocument(bool bIsPDFDocument)
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index e3c9fc1dcc03..4d641de4dc60 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -230,6 +230,7 @@ public:
SdrPaintWindow* GetPaintWindow(sal_uInt32 nIndex) const;
// Replacement for GetWin(0), may return 0L (!)
OutputDevice* GetFirstOutputDevice() const;
+const Idle& GetComeBackIdle() const { return maComeBackIdle; };
private:
DECL_DLLPRIVATE_LINK(ImpComeBackHdl, Timer*, void);
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index c510ec95b6e0..5259ba3aa0f2 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -129,6 +129,7 @@ SdrModel::SdrModel(SfxItemPool* pPool,
comphelper::IEmbeddedHelper* pEmbeddedHel
, m_pLinkManager(nullptr)
, m_nUndoLevel(0)
, m_bIsWriter(true)
+, m_bIsWriterIdle(false)
, m_bThemedControls(true)
, mbUndoEnabled(true)
core.git: include/svx svx/source
include/svx/svdomeas.hxx |8 +-
svx/source/svdraw/svdomeas.cxx | 138 -
2 files changed, 73 insertions(+), 73 deletions(-)
New commits:
commit c13215d86b5d3a805f5cc0e6721e9babea42ce2c
Author: Miklos Vajna
AuthorDate: Mon May 5 08:23:11 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon May 5 10:09:07 2025 +0200
svx: prefix members of SdrMeasureObj
See tdf#94879 for motivation.
Change-Id: Ie9087a753e871eb684b8dbec2e74a89b7f0f3998
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184950
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 058278f4b1ef..fdff7e43d87a 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -51,9 +51,9 @@ private:
SAL_DLLPRIVATE virtual std::unique_ptr
CreateObjectSpecificViewContact() override;
SAL_DLLPRIVATE virtual std::unique_ptr
CreateObjectSpecificProperties() override;
-Point aPt1;
-Point aPt2;
-boolbTextDirty;
+Point m_aPt1;
+Point m_aPt2;
+boolm_bTextDirty;
SAL_DLLPRIVATE void ImpTakeAttr(ImpMeasureRec& rRec) const;
SAL_DLLPRIVATE OUString TakeRepresentation(SdrMeasureFieldKind
eMeasureFieldKind) const;
@@ -62,7 +62,7 @@ private:
SAL_DLLPRIVATE void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat&
rDrag) const;
void SetTextDirty()
{
-bTextDirty=true;
+m_bTextDirty=true;
SetTextSizeDirty();
if (!getOutRectangle().IsEmpty())
{
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 5647d0331539..218c2ee9985b 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -95,7 +95,7 @@ OUString
SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind
if(eMeasureUnit == FieldUnit::NONE)
eMeasureUnit = eModUIUnit;
-sal_Int32 nLen(GetLen(aPt2 - aPt1));
+sal_Int32 nLen(GetLen(m_aPt2 - m_aPt1));
Fraction aFact(1,1);
if(eMeasureUnit != eModUIUnit)
@@ -197,7 +197,7 @@ std::unique_ptr
SdrMeasureObj::CreateObjectSpecificVi
SdrMeasureObj::SdrMeasureObj(SdrModel& rSdrModel)
: SdrTextObj(rSdrModel),
-bTextDirty(false)
+m_bTextDirty(false)
{
// #i25616#
mbSupportTextIndentingOnLineWidthChange = false;
@@ -205,14 +205,14 @@ SdrMeasureObj::SdrMeasureObj(SdrModel& rSdrModel)
SdrMeasureObj::SdrMeasureObj(SdrModel& rSdrModel, SdrMeasureObj const &
rSource)
: SdrTextObj(rSdrModel, rSource),
-bTextDirty(false)
+m_bTextDirty(false)
{
// #i25616#
mbSupportTextIndentingOnLineWidthChange = false;
-aPt1 = rSource.aPt1;
-aPt2 = rSource.aPt2;
-bTextDirty = rSource.bTextDirty;
+m_aPt1 = rSource.m_aPt1;
+m_aPt2 = rSource.m_aPt2;
+m_bTextDirty = rSource.m_bTextDirty;
}
SdrMeasureObj::SdrMeasureObj(
@@ -220,9 +220,9 @@ SdrMeasureObj::SdrMeasureObj(
const Point& rPt1,
const Point& rPt2)
: SdrTextObj(rSdrModel),
-aPt1(rPt1),
-aPt2(rPt2),
-bTextDirty(false)
+m_aPt1(rPt1),
+m_aPt2(rPt2),
+m_bTextDirty(false)
{
// #i25616#
mbSupportTextIndentingOnLineWidthChange = false;
@@ -316,8 +316,8 @@ struct ImpMeasurePoly
void SdrMeasureObj::ImpTakeAttr(ImpMeasureRec& rRec) const
{
-rRec.aPt1 = aPt1;
-rRec.aPt2 = aPt2;
+rRec.aPt1 = m_aPt1;
+rRec.aPt2 = m_aPt2;
const SfxItemSet& rSet = GetObjectItemSet();
rRec.eWantTextHPos =rSet.Get(SDRATTR_MEASURETEXTHPOS
).GetValue();
@@ -575,7 +575,7 @@ bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem&
rField, sal_Int32 nPara,
void SdrMeasureObj::UndirtyText() const
{
-if (!bTextDirty)
+if (!m_bTextDirty)
return;
SdrOutliner& rOutliner=ImpGetDrawOutliner();
@@ -608,12 +608,12 @@ void SdrMeasureObj::UndirtyText() const
// cast to nonconst three times
const_cast(this)->maTextSize = aSiz;
const_cast(this)->mbTextSizeDirty = false;
-const_cast(this)->bTextDirty = false;
+const_cast(this)->m_bTextDirty = false;
}
void SdrMeasureObj::TakeUnrotatedSnapRect(tools::Rectangle& rRect) const
{
-if (bTextDirty) UndirtyText();
+if (m_bTextDirty) UndirtyText();
ImpMeasureRec aRec;
ImpMeasurePoly aMPol;
ImpTakeAttr(aRec);
@@ -755,8 +755,8 @@ void SdrMeasureObj::AddToHdlList(SdrHdlList& rHdlList) const
switch (nHdlNum) {
case 0: aPt=aMPol.aHelpline1.aP1; break;
case 1: aPt=aMPol.aHelpline2.aP1; break;
-case 2: aPt=aPt1; break;
-case 3: aPt=aPt2; break;
+case 2: aPt=m_aPt1; break;
+case 3: aPt=m_aPt2; break;
case 4: aPt=aMPol.aHelpline1.aP2; break;
c
core.git: include/svx svx/source
include/svx/svdocapt.hxx |2 -
svx/source/svdraw/svdocapt.cxx | 48 -
2 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit be8b65e837af563730064bcf042f3039bd7560b7
Author: Miklos Vajna
AuthorDate: Mon Apr 28 08:13:17 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Apr 28 09:39:55 2025 +0200
svx: prefix members of SdrCaptionObj
See tdf#94879 for motivation.
Change-Id: Ic4cd593ee3605e2c6194ec52e25d27e0e8455b93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184693
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index aa431b57aa53..16683fffd05b 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -55,7 +55,7 @@ private:
SAL_DLLPRIVATE virtual std::unique_ptr
CreateObjectSpecificProperties() override;
SAL_DLLPRIVATE virtual std::unique_ptr
CreateObjectSpecificViewContact() override;
-tools::Polygon aTailPoly; // the whole tail polygon
+tools::Polygon maTailPoly; // the whole tail polygon
boolmbSpecialTextBoxShadow; // for calc special shadow,
default FALSE
boolmbFixedTail;// for calc note box fixed tail,
default FALSE
boolmbSuppressGetBitmap;// tdf#118662
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index f4f8bf828291..d3032f6ba108 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -181,7 +181,7 @@ std::unique_ptr
SdrCaptionObj::CreateObjectSpecificVi
SdrCaptionObj::SdrCaptionObj(SdrModel& rSdrModel)
: SdrRectObj(rSdrModel, SdrObjKind::Text),
-aTailPoly(3), // default size: 3 points = 2 lines
+maTailPoly(3), // default size: 3 points = 2 lines
mbSpecialTextBoxShadow(false),
mbFixedTail(false),
mbSuppressGetBitmap(false)
@@ -192,7 +192,7 @@ SdrCaptionObj::SdrCaptionObj(SdrModel& rSdrModel,
SdrCaptionObj const & rSource)
: SdrRectObj(rSdrModel, rSource),
mbSuppressGetBitmap(false)
{
-aTailPoly = rSource.aTailPoly;
+maTailPoly = rSource.maTailPoly;
mbSpecialTextBoxShadow = rSource.mbSpecialTextBoxShadow;
mbFixedTail = rSource.mbFixedTail;
maFixedTailPos = rSource.maFixedTailPos;
@@ -203,12 +203,12 @@ SdrCaptionObj::SdrCaptionObj(
const tools::Rectangle& rRect,
const Point& rTail)
: SdrRectObj(rSdrModel, SdrObjKind::Text,rRect),
-aTailPoly(3), // default size: 3 points = 2 lines
+maTailPoly(3), // default size: 3 points = 2 lines
mbSpecialTextBoxShadow(false),
mbFixedTail(false),
mbSuppressGetBitmap(false)
{
-aTailPoly[0]=maFixedTailPos=rTail;
+maTailPoly[0]=maFixedTailPos=rTail;
}
SdrCaptionObj::~SdrCaptionObj()
@@ -261,7 +261,7 @@ OUString SdrCaptionObj::TakeObjNamePlural() const
basegfx::B2DPolyPolygon SdrCaptionObj::TakeXorPoly() const
{
basegfx::B2DPolyPolygon aPolyPoly(SdrRectObj::TakeXorPoly());
-aPolyPoly.append(aTailPoly.getB2DPolygon());
+aPolyPoly.append(maTailPoly.getB2DPolygon());
return aPolyPoly;
}
@@ -277,7 +277,7 @@ void SdrCaptionObj::AddToHdlList(SdrHdlList& rHdlList) const
{
SdrRectObj::AddToHdlList(rHdlList);
// Currently only dragging the tail's end is implemented.
-std::unique_ptr pHdl(new SdrHdl(aTailPoly.GetPoint(0),
SdrHdlKind::Poly));
+std::unique_ptr pHdl(new SdrHdl(maTailPoly.GetPoint(0),
SdrHdlKind::Poly));
pHdl->SetPolyNum(1);
pHdl->SetPointNum(0);
rHdlList.AddHdl(std::move(pHdl));
@@ -349,7 +349,7 @@ bool SdrCaptionObj::applySpecialDrag(SdrDragStat& rDrag)
}
else
{
-aTailPoly[0] += aDelta;
+maTailPoly[0] += aDelta;
}
ImpRecalcTail();
@@ -408,7 +408,7 @@ void SdrCaptionObj::ImpRecalcTail()
{
ImpCaptParams aPara;
ImpGetCaptParams(aPara);
-ImpCalcTail(aPara, aTailPoly, getRectangle());
+ImpCalcTail(aPara, maTailPoly, getRectangle());
SetBoundAndSnapRectsDirty();
SetXPolyDirty();
}
@@ -517,8 +517,8 @@ bool SdrCaptionObj::BegCreate(SdrDragStat& rStat)
ImpCaptParams aPara;
ImpGetCaptParams(aPara);
moveRectanglePosition(rStat.GetNow().X(), rStat.GetNow().Y());
-aTailPoly[0]=rStat.GetStart();
-ImpCalcTail(aPara,aTailPoly, getRectangle());
+maTailPoly[0]=rStat.GetStart();
+ImpCalcTail(aPara,maTailPoly, getRectangle());
rStat.SetActionRect(getRectangle());
return true;
}
@@ -528,7 +528,7 @@ bool SdrCaptionObj::MovCreate(SdrDragStat& rStat)
ImpCaptParams aPara;
ImpGetCaptParams(aPara);
moveRectanglePosition(rStat.GetNow().X(), rStat.GetNow().Y());
-ImpCalcTail(aPara,aTailPoly, getRectangle());
+ImpCalcTail(aPara,maTailPoly, getRectangle());
rStat.SetActionRect(getRectangle());
SetBoundRectDirty();
m_bSnapRectDirty=true;
@@ -540,7 +540,7 @@ bool SdrCaptionObj::End
core.git: include/svx svx/source
include/svx/svdoole2.hxx |2 +-
svx/source/svdraw/svdoole2.cxx | 12 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit daf8190858d36e0629fe038ea2bbd243b8eef413
Author: Miklos Vajna
AuthorDate: Mon Apr 14 08:08:00 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Apr 14 10:23:09 2025 +0200
svx: prefix members of SdrEmbedObjectLink
See tdf#94879 for motivation.
Change-Id: Ib8e7b2bca1347304395149c294634341ba7154f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184128
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 2ccdfae6a284..ba414d69f476 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -189,7 +189,7 @@ public:
class SVXCORE_DLLPUBLIC SdrEmbedObjectLink final : public sfx2::SvBaseLink
{
-SdrOle2Obj* pObj;
+SdrOle2Obj* m_pObj;
public:
SAL_DLLPRIVATE explicitSdrEmbedObjectLink(SdrOle2Obj* pObj);
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index dbcb73b2cbe3..74fcadd5a1d5 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -544,7 +544,7 @@ void SdrLightEmbeddedClient_Impl::setWindow(const
uno::Reference< awt::XWindow >
SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject):
::sfx2::SvBaseLink( ::SfxLinkUpdateMode::ONCALL,
SotClipboardFormatId::SVXB ),
-pObj(pObject)
+m_pObj(pObject)
{
SetSynchron( false );
}
@@ -556,10 +556,10 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink()
::sfx2::SvBaseLink::UpdateResult SdrEmbedObjectLink::DataChanged(
const OUString& /*rMimeType*/, const css::uno::Any & /*rValue*/ )
{
-if ( !pObj->UpdateLinkURL_Impl() )
+if ( !m_pObj->UpdateLinkURL_Impl() )
{
// the link URL was not changed
-uno::Reference< embed::XEmbeddedObject > xObject = pObj->GetObjRef();
+uno::Reference< embed::XEmbeddedObject > xObject = m_pObj->GetObjRef();
OSL_ENSURE( xObject.is(), "The object must exist always!" );
if ( xObject.is() )
{
@@ -582,15 +582,15 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink()
}
}
-pObj->GetNewReplacement();
-pObj->SetChanged();
+m_pObj->GetNewReplacement();
+m_pObj->SetChanged();
return SUCCESS;
}
void SdrEmbedObjectLink::Closed()
{
-pObj->BreakFileLink_Impl();
+m_pObj->BreakFileLink_Impl();
SvBaseLink::Closed();
}
core.git: include/svx svx/source
include/svx/svdocirc.hxx |8 +--
svx/source/svdraw/svdocirc.cxx | 106 -
2 files changed, 57 insertions(+), 57 deletions(-)
New commits:
commit cd4e4bf9f958c833387694cff7408efdfb53ff84
Author: Miklos Vajna
AuthorDate: Mon Apr 7 08:12:24 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Apr 7 10:00:02 2025 +0200
svx: prefix members of SdrCircObj
See tdf#94879 for motivation.
Change-Id: I56630c82d7adccdb89f7ca86077c9eadb799383a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183766
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index e6bebc4f49cb..a03bd42a04ec 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -50,8 +50,8 @@ private:
SAL_DLLPRIVATE virtual std::unique_ptr
CreateObjectSpecificProperties() override;
SdrCircKind meCircleKind;
-Degree100 nStartAngle;
-Degree100 nEndAngle;
+Degree100 m_nStartAngle;
+Degree100 m_nEndAngle;
SVX_DLLPRIVATE basegfx::B2DPolygon ImpCalcXPolyCirc(const SdrCircKind
eKind, const tools::Rectangle& rRect1, Degree100 nStart, Degree100 nEnd) const;
SVX_DLLPRIVATE static void ImpSetCreateParams(SdrDragStat& rStat);
@@ -135,8 +135,8 @@ private:
SAL_DLLPRIVATE virtual void SaveGeoData(SdrObjGeoData& rGeo) const
override;
SAL_DLLPRIVATE virtual void RestoreGeoData(const SdrObjGeoData& rGeo)
override;
public:
-Degree100 GetStartAngle() const { return nStartAngle; }
-Degree100 GetEndAngle() const { return nEndAngle; }
+Degree100 GetStartAngle() const { return m_nStartAngle; }
+Degree100 GetEndAngle() const { return m_nEndAngle; }
};
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index a42d8c5c33d7..eed36dbc71c1 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -120,8 +120,8 @@ SdrCircObj::SdrCircObj(
SdrCircKind eNewKind)
: SdrRectObj(rSdrModel)
{
-nStartAngle=0_deg100;
-nEndAngle=36000_deg100;
+m_nStartAngle=0_deg100;
+m_nEndAngle=36000_deg100;
meCircleKind=eNewKind;
m_bClosedObj=eNewKind!=SdrCircKind::Arc;
}
@@ -130,8 +130,8 @@ SdrCircObj::SdrCircObj(SdrModel& rSdrModel, SdrCircObj
const & rSource)
: SdrRectObj(rSdrModel, rSource)
{
meCircleKind = rSource.meCircleKind;
-nStartAngle = rSource.nStartAngle;
-nEndAngle = rSource.nEndAngle;
+m_nStartAngle = rSource.m_nStartAngle;
+m_nEndAngle = rSource.m_nEndAngle;
m_bClosedObj = rSource.m_bClosedObj;
}
@@ -141,8 +141,8 @@ SdrCircObj::SdrCircObj(
const tools::Rectangle& rRect)
: SdrRectObj(rSdrModel, rRect)
{
-nStartAngle=0_deg100;
-nEndAngle=36000_deg100;
+m_nStartAngle=0_deg100;
+m_nEndAngle=36000_deg100;
meCircleKind=eNewKind;
m_bClosedObj=eNewKind!=SdrCircKind::Arc;
}
@@ -156,9 +156,9 @@ SdrCircObj::SdrCircObj(
: SdrRectObj(rSdrModel, rRect)
{
Degree100 nAngleDif=nNewEndAngle-nNewStartAngle;
-nStartAngle=NormAngle36000(nNewStartAngle);
-nEndAngle=NormAngle36000(nNewEndAngle);
-if (nAngleDif==36000_deg100) nEndAngle+=nAngleDif; // full circle
+m_nStartAngle=NormAngle36000(nNewStartAngle);
+m_nEndAngle=NormAngle36000(nNewEndAngle);
+if (nAngleDif==36000_deg100) m_nEndAngle+=nAngleDif; // full circle
meCircleKind=eNewKind;
m_bClosedObj=eNewKind!=SdrCircKind::Arc;
}
@@ -233,7 +233,7 @@ bool SdrCircObj::PaintNeedsXPolyCirc() const
bNeed = eFill != drawing::FillStyle_NONE && eFill !=
drawing::FillStyle_SOLID;
}
-if(!bNeed && meCircleKind != SdrCircKind::Full && nStartAngle == nEndAngle)
+if(!bNeed && meCircleKind != SdrCircKind::Full && m_nStartAngle ==
m_nEndAngle)
bNeed = true; // otherwise we're drawing a full circle
return bNeed;
@@ -313,7 +313,7 @@ basegfx::B2DPolygon SdrCircObj::ImpCalcXPolyCirc(const
SdrCircKind eCircleKind,
void SdrCircObj::RecalcXPoly()
{
-basegfx::B2DPolygon aPolyCirc(ImpCalcXPolyCirc(meCircleKind,
getRectangle(), nStartAngle, nEndAngle));
+basegfx::B2DPolygon aPolyCirc(ImpCalcXPolyCirc(meCircleKind,
getRectangle(), m_nStartAngle, m_nEndAngle));
mpXPoly = XPolygon(aPolyCirc);
}
@@ -377,7 +377,7 @@ rtl::Reference
SdrCircObj::CloneSdrObject(SdrModel& rTargetModel) con
basegfx::B2DPolyPolygon SdrCircObj::TakeXorPoly() const
{
-const basegfx::B2DPolygon aCircPolygon(ImpCalcXPolyCirc(meCircleKind,
getRectangle(), nStartAngle, nEndAngle));
+const basegfx::B2DPolygon aCircPolygon(ImpCalcXPolyCirc(meCircleKind,
getRectangle(), m_nStartAngle, m_nEndAngle));
return basegfx::B2DPolyPolygon(aCircPolygon);
}
@@ -428,12 +428,12 @@ void SdrCircObj::AddToHdlList(SdrHdlList& rHdlList) const
switch (nHdlNum)
{
case 0:
-aPnt = GetAnglePnt(aRe
core.git: include/svx svx/source sw/source
include/svx/sidebar/InspectorTextPanel.hxx|4 +--
svx/source/sidebar/inspector/InspectorTextPanel.cxx | 23 --
sw/source/uibase/sidebar/SwPanelFactory.cxx |2 -
sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx |9 +++
sw/source/uibase/sidebar/WriterInspectorTextPanel.hxx |4 +--
5 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 412da215c1cb7283b121fa6e9332c3fb2b76a1f4
Author: Caolán McNamara
AuthorDate: Wed Apr 2 08:45:09 2025 +0100
Commit: Caolán McNamara
CommitDate: Wed Apr 2 11:24:27 2025 +0200
cid#1645566 Dereference null return value
Change-Id: I27846372fd28aaba66b726e9838d1e674c2f05be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183612
Reviewed-by: Heiko Tietze
Tested-by: Heiko Tietze
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
diff --git a/include/svx/sidebar/InspectorTextPanel.hxx
b/include/svx/sidebar/InspectorTextPanel.hxx
index f47babe14c62..2c875dc99d57 100644
--- a/include/svx/sidebar/InspectorTextPanel.hxx
+++ b/include/svx/sidebar/InspectorTextPanel.hxx
@@ -49,9 +49,9 @@ class SVX_DLLPUBLIC InspectorTextPanel
public:
virtual ~InspectorTextPanel() override;
-static std::unique_ptr Create(weld::Widget* pParent);
+static std::unique_ptr Create(weld::Widget* pParent,
SfxBindings* pBindings);
-InspectorTextPanel(weld::Widget* pParent);
+InspectorTextPanel(weld::Widget* pParent, SfxBindings* pBindings);
void updateEntries(const std::vector& rStore, const sal_Int32
nParIdx);
diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
index 190d95f7d4e7..79f718f9eb19 100644
--- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
@@ -41,22 +41,22 @@ const int MinimumPanelWidth = 250;
namespace svx::sidebar
{
-std::unique_ptr InspectorTextPanel::Create(weld::Widget* pParent)
+std::unique_ptr InspectorTextPanel::Create(weld::Widget* pParent,
+SfxBindings* pBindings)
{
if (pParent == nullptr)
throw lang::IllegalArgumentException(
u"no parent Window given to InspectorTextPanel::Create"_ustr,
nullptr, 0);
-return std::make_unique(pParent);
+return std::make_unique(pParent, pBindings);
}
-InspectorTextPanel::InspectorTextPanel(weld::Widget* pParent)
+InspectorTextPanel::InspectorTextPanel(weld::Widget* pParent, SfxBindings*
pBindings)
: PanelLayout(pParent, u"InspectorTextPanel"_ustr,
u"svx/ui/inspectortextpanel.ui"_ustr)
, mpListBoxStyles(m_xBuilder->weld_tree_view(u"listbox_fonts"_ustr))
-, nSlotDFStyles(
-
SfxViewFrame::Current()->GetDispatcher()->GetSlot(".uno:HighlightCharDF")->GetSlotId())
-, mParaController(SID_SPOTLIGHT_PARASTYLES,
SfxViewFrame::Current()->GetBindings(), *this)
-, mCharController(SID_SPOTLIGHT_CHARSTYLES,
SfxViewFrame::Current()->GetBindings(), *this)
-, mDFController(nSlotDFStyles, SfxViewFrame::Current()->GetBindings(),
*this)
+,
nSlotDFStyles(pBindings->GetDispatcher()->GetSlot(".uno:HighlightCharDF")->GetSlotId())
+, mParaController(SID_SPOTLIGHT_PARASTYLES, *pBindings, *this)
+, mCharController(SID_SPOTLIGHT_CHARSTYLES, *pBindings, *this)
+, mDFController(nSlotDFStyles, *pBindings, *this)
{
mpListBoxStyles->set_size_request(MinimumPanelWidth, -1);
float fWidth = mpListBoxStyles->get_approximate_digit_width();
@@ -71,10 +71,9 @@ InspectorTextPanel::InspectorTextPanel(weld::Widget* pParent)
mpToolbar->set_item_icon_name("directformatting", "sw/res/sr20012.png");
// Setup listening and set initial state
-SfxBindings& pBindings = SfxViewFrame::Current()->GetBindings();
-pBindings.Update(SID_SPOTLIGHT_PARASTYLES);
-pBindings.Update(SID_SPOTLIGHT_CHARSTYLES);
-pBindings.Update(nSlotDFStyles);
+pBindings->Update(SID_SPOTLIGHT_PARASTYLES);
+pBindings->Update(SID_SPOTLIGHT_CHARSTYLES);
+pBindings->Update(nSlotDFStyles);
}
static bool GetPropertyValues(std::u16string_view rPropName, const uno::Any&
rAny,
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx
b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index 31f2a3f60ee2..181858f99f45 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -175,7 +175,7 @@ Reference SAL_CALL
SwPanelFactory::createUIElement (
}
else if (rsResourceURL.endsWith("/WriterInspectorTextPanel"))
{
-std::unique_ptr xPanel =
sw::sidebar::WriterInspectorTextPanel::Create(pParent);
+std::unique_ptr xPanel =
sw::sidebar::WriterInspectorTextPanel::Create(pParent, pBindings);
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL,
xFrame,
diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
b/sw/source/uib
core.git: include/svx svx/source svx/uiconfig
include/svx/sidebar/InspectorTextPanel.hxx | 20 +++
svx/source/sidebar/inspector/InspectorTextPanel.cxx | 77 ++
svx/uiconfig/ui/inspectortextpanel.ui | 104
3 files changed, 183 insertions(+), 18 deletions(-)
New commits:
commit 0d0e5c72e6344de48227b74846a6ff638b803c64
Author: Karthik
AuthorDate: Mon Mar 10 13:34:39 2025 +0530
Commit: Heiko Tietze
CommitDate: Tue Apr 1 11:44:01 2025 +0200
tdf#160194 Add 3 checkboxes in Style InspectorPanel
Add functionality to enable/disable below SportLight features
in Style InspectorPanel
- Paragraph Styles
- Character Styles
- Direct Formatting
Change-Id: I22bc988514ed28dbf309ddb148b1d029bb507b1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182716
Tested-by: Jenkins
Tested-by: Heiko Tietze
Reviewed-by: Heiko Tietze
diff --git a/include/svx/sidebar/InspectorTextPanel.hxx
b/include/svx/sidebar/InspectorTextPanel.hxx
index f6ef0234ade1..f47babe14c62 100644
--- a/include/svx/sidebar/InspectorTextPanel.hxx
+++ b/include/svx/sidebar/InspectorTextPanel.hxx
@@ -18,6 +18,7 @@
*/
#pragma once
+#include
#include
#include
@@ -41,7 +42,9 @@ struct TreeNode
{
}
};
-class SVX_DLLPUBLIC InspectorTextPanel : public PanelLayout
+class SVX_DLLPUBLIC InspectorTextPanel
+: public PanelLayout,
+ public sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
public:
virtual ~InspectorTextPanel() override;
@@ -52,8 +55,23 @@ public:
void updateEntries(const std::vector& rStore, const sal_Int32
nParIdx);
+virtual void NotifyItemUpdate(const sal_uInt16 nSId, const SfxItemState
eState,
+ const SfxPoolItem* pState) override;
+virtual void GetControlState(const sal_uInt16 /*nSId*/,
+ boost::property_tree::ptree& /*rState*/)
override{};
+
private:
std::unique_ptr mpListBoxStyles;
+
+std::unique_ptr mpToolbar;
+
+sal_uInt16 nSlotDFStyles;
+
+sfx2::sidebar::ControllerItem mParaController;
+sfx2::sidebar::ControllerItem mCharController;
+sfx2::sidebar::ControllerItem mDFController;
+
+DECL_LINK(ToolbarHdl, const OUString&, void);
};
} // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
index 4cb05d63d49f..190d95f7d4e7 100644
--- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
@@ -17,6 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+#include
+#include
+#include
+#include
+#include
+#include
#include
#include
@@ -45,12 +52,29 @@ std::unique_ptr
InspectorTextPanel::Create(weld::Widget* pParent)
InspectorTextPanel::InspectorTextPanel(weld::Widget* pParent)
: PanelLayout(pParent, u"InspectorTextPanel"_ustr,
u"svx/ui/inspectortextpanel.ui"_ustr)
, mpListBoxStyles(m_xBuilder->weld_tree_view(u"listbox_fonts"_ustr))
+, nSlotDFStyles(
+
SfxViewFrame::Current()->GetDispatcher()->GetSlot(".uno:HighlightCharDF")->GetSlotId())
+, mParaController(SID_SPOTLIGHT_PARASTYLES,
SfxViewFrame::Current()->GetBindings(), *this)
+, mCharController(SID_SPOTLIGHT_CHARSTYLES,
SfxViewFrame::Current()->GetBindings(), *this)
+, mDFController(nSlotDFStyles, SfxViewFrame::Current()->GetBindings(),
*this)
{
mpListBoxStyles->set_size_request(MinimumPanelWidth, -1);
float fWidth = mpListBoxStyles->get_approximate_digit_width();
std::vector aWidths{ o3tl::narrowing(fWidth * 29) };
// 2nd column will fill remaining space
mpListBoxStyles->set_column_fixed_widths(aWidths);
+
+mpToolbar = m_xBuilder->weld_toolbar(u"toolbar"_ustr);
+mpToolbar->connect_clicked(LINK(this, InspectorTextPanel, ToolbarHdl));
+mpToolbar->set_item_icon_name("paragraphstyles", "sw/res/sf01.png");
+mpToolbar->set_item_icon_name("characterstyles", "sw/res/sf02.png");
+mpToolbar->set_item_icon_name("directformatting", "sw/res/sr20012.png");
+
+// Setup listening and set initial state
+SfxBindings& pBindings = SfxViewFrame::Current()->GetBindings();
+pBindings.Update(SID_SPOTLIGHT_PARASTYLES);
+pBindings.Update(SID_SPOTLIGHT_CHARSTYLES);
+pBindings.Update(nSlotDFStyles);
}
static bool GetPropertyValues(std::u16string_view rPropName, const uno::Any&
rAny,
@@ -157,7 +181,58 @@ void InspectorTextPanel::updateEntries(const
std::vector& rStore, cons
mpListBoxStyles->collapse_row(*pEntry);
}
-InspectorTextPanel::~InspectorTextPanel() {}
+void InspectorTextPanel::NotifyItemUpdate(const sal_uInt16 nSId, const
SfxItemState eState,
+ const SfxPoolItem* pState)
+{
+if (eState >= SfxItemState::DEFAULT)
+{
+if (const SfxBoolItem* pItem = dynamic_cast(pState))
+{
+if
core.git: include/svx svx/source
include/svx/xlndsit.hxx |6 +++---
svx/source/xoutdev/xattr.cxx | 16
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit ce613d65dd3cbf3a6c153201ac81730813691821
Author: Miklos Vajna
AuthorDate: Mon Mar 31 08:09:52 2025 +0200
Commit: Miklos Vajna
CommitDate: Mon Mar 31 10:00:59 2025 +0200
svx: prefix members of XLineDashItem
See tdf#94879 for motivation.
Change-Id: Ib28086416950e6f5ad5d62640ce9cfe4bd1e1872
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183520
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx
index 635769e505fa..8bbf56c61f71 100644
--- a/include/svx/xlndsit.hxx
+++ b/include/svx/xlndsit.hxx
@@ -32,7 +32,7 @@ class SdrModel;
class SVXCORE_DLLPUBLIC XLineDashItem final : public NameOrIndex
{
-XDash aDash;
+XDash m_aDash;
public:
static SfxPoolItem* CreateDefault();
@@ -55,8 +55,8 @@ public:
virtual boolHasMetrics() const override;
virtual voidScaleMetrics(tools::Long nMul, tools::Long nDiv)
override;
-const XDash&GetDashValue() const { return aDash;}
-voidSetDashValue(const XDash& rNew) { aDash = rNew;
Detach(); } // SetValue -> SetDashValue
+const XDash&GetDashValue() const { return m_aDash;}
+voidSetDashValue(const XDash& rNew) { m_aDash =
rNew; Detach(); } // SetValue -> SetDashValue
static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2
);
std::unique_ptr checkForUniqueItem( SdrModel& rModel )
const;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index ab2e53351eec..d368d0a7bbdb 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -665,19 +665,19 @@ SfxPoolItem* XLineDashItem::CreateDefault() {return new
XLineDashItem;}
XLineDashItem::XLineDashItem(const OUString& rName, const XDash& rTheDash) :
NameOrIndex(XATTR_LINEDASH, rName),
-aDash(rTheDash)
+m_aDash(rTheDash)
{
}
XLineDashItem::XLineDashItem(const XLineDashItem& rItem) :
NameOrIndex(rItem),
-aDash(rItem.aDash)
+m_aDash(rItem.m_aDash)
{
}
XLineDashItem::XLineDashItem(const XDash& rTheDash)
: NameOrIndex( XATTR_LINEDASH, -1 ),
-aDash(rTheDash)
+m_aDash(rTheDash)
{
}
@@ -689,7 +689,7 @@ XLineDashItem* XLineDashItem::Clone(SfxItemPool* /*pPool*/)
const
bool XLineDashItem::operator==(const SfxPoolItem& rItem) const
{
return ( NameOrIndex::operator==(rItem) &&
- aDash == static_cast(rItem).aDash );
+ m_aDash == static_cast(rItem).m_aDash );
}
bool XLineDashItem::GetPresentation
@@ -711,9 +711,9 @@ bool XLineDashItem::HasMetrics() const
void XLineDashItem::ScaleMetrics(tools::Long nMul, tools::Long nDiv)
{
-aDash.SetDotLen( BigInt::Scale( aDash.GetDotLen(), nMul, nDiv ) );
-aDash.SetDashLen( BigInt::Scale( aDash.GetDashLen(), nMul, nDiv ) );
-aDash.SetDistance( BigInt::Scale( aDash.GetDistance(), nMul, nDiv ) );
+m_aDash.SetDotLen( BigInt::Scale( m_aDash.GetDotLen(), nMul, nDiv ) );
+m_aDash.SetDashLen( BigInt::Scale( m_aDash.GetDashLen(), nMul, nDiv ) );
+m_aDash.SetDistance( BigInt::Scale( m_aDash.GetDistance(), nMul, nDiv ) );
}
bool XLineDashItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId )
const
@@ -972,7 +972,7 @@ std::unique_ptr
XLineDashItem::checkForUniqueItem( SdrModel& rMod
// if the given name is not valid, replace it!
if( aUniqueName != GetName() )
-return std::make_unique( aUniqueName, aDash );
+return std::make_unique( aUniqueName, m_aDash );
return nullptr;
}
core.git: include/svx svx/source
include/svx/hdft.hxx |1 +
svx/source/dialog/hdft.cxx |3 +++
2 files changed, 4 insertions(+)
New commits:
commit 5ee8258ff3ea660504467397313ae0ff54175b27
Author: Olivier Hallot
AuthorDate: Wed Mar 26 16:32:27 2025 -0300
Commit: Olivier Hallot
CommitDate: Thu Mar 27 20:34:09 2025 +0100
tdf#165836 - Page style header/footer HelpID
+ Page style' header and footer dialog share the same .ui file
+ Under SAL_USE_VCLPLUGIN gen and kf5, the controller send HelpID for
"frame1" widget, thus it was impossible to separate help for header and
footer.
+ added variable m_xFrame to catch frame1 widget and assign HelpId
according to logic in the contructor.
+ Under gnome, use the existing m_xContainer, that is, the issue does
not show.
Note: this is a hack. For gen and kf5/6 it should be like gnome.
Change-Id: Ief6d17689361b1446e7e76bf59dbe962397614cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183353
Reviewed-by: Olivier Hallot
Tested-by: Jenkins
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 091137eed358..1b6d05896a51 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -78,6 +78,7 @@ protected:
std::unique_ptr m_xHeightEdit;
std::unique_ptr m_xHeightDynBtn;
std::unique_ptr m_xBackgroundBtn;
+std::unique_ptr m_xFrame;
std::unique_ptr m_xBspWin;
voidInitHandler();
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 0bce3b3f4381..64576d29e6c8 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -138,12 +138,14 @@ SvxHFPage::SvxHFPage(weld::Container* pPage,
weld::DialogController* pController
, m_xHeightEdit(m_xBuilder->weld_metric_spin_button(u"spinHeight"_ustr,
FieldUnit::CM))
, m_xHeightDynBtn(m_xBuilder->weld_check_button(u"checkAutofit"_ustr))
, m_xBackgroundBtn(m_xBuilder->weld_button(u"buttonMore"_ustr))
+, m_xFrame(m_xBuilder->weld_frame(u"frame1"_ustr))
, m_xBspWin(new weld::CustomWeld(*m_xBuilder, u"drawingareaPageHF"_ustr,
m_aBspWin))
{
//swap header <-> footer in UI
if (nId == SID_ATTR_PAGE_FOOTERSET)
{
m_xContainer->set_help_id(u"svx/ui/headfootformatpage/FFormatPage"_ustr);
+m_xFrame->set_help_id(u"svx/ui/headfootformatpage/FFormatPage"_ustr);
m_xPageLbl = m_xBuilder->weld_label(u"labelFooterFormat"_ustr);
m_xTurnOnBox = m_xBuilder->weld_check_button(u"checkFooterOn"_ustr);
@@ -163,6 +165,7 @@ SvxHFPage::SvxHFPage(weld::Container* pPage,
weld::DialogController* pController
else //Header
{
m_xContainer->set_help_id(u"svx/ui/headfootformatpage/HFormatPage"_ustr);
+m_xFrame->set_help_id(u"svx/ui/headfootformatpage/HFormatPage"_ustr);
m_xPageLbl = m_xBuilder->weld_label(u"labelHeaderFormat"_ustr);
m_xTurnOnBox = m_xBuilder->weld_check_button(u"checkHeaderOn"_ustr);
}
core.git: include/svx svx/source
include/svx/drawitem.hxx | 28 -
svx/source/items/drawitem.cxx | 46 +-
2 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit f16c450acea1256b6f65a66c01cfc768bb91e777
Author: Miklos Vajna
AuthorDate: Mon Mar 24 08:09:14 2025 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 24 09:05:29 2025 +0100
svx: prefix members of SvxBitmapListItem
And the same in a couple of more related classes, so we can still have a
single version of the QUERY_PUT_IMPL() macro.
See tdf#94879 for motivation.
Change-Id: I48e9132cef4983b25bafb8c03f595f7855d60e61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183252
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx
index 50e02e9434e7..adc8162fda7e 100644
--- a/include/svx/drawitem.hxx
+++ b/include/svx/drawitem.hxx
@@ -25,7 +25,7 @@
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxColorListItem final : public
SfxPoolItem
{
-XColorListRef pColorList;
+XColorListRef m_pColorList;
public:
static SfxPoolItem* CreateDefault();
@@ -46,12 +46,12 @@ public:
virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
-const XColorListRef& GetColorList() const { return pColorList; }
+const XColorListRef& GetColorList() const { return m_pColorList; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxGradientListItem final : public
SfxPoolItem
{
-XGradientListRef pGradientList;
+XGradientListRef m_pGradientList;
public:
static SfxPoolItem* CreateDefault();
@@ -72,12 +72,12 @@ public:
virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
-const XGradientListRef& GetGradientList() const { return pGradientList; }
+const XGradientListRef& GetGradientList() const { return m_pGradientList; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxHatchListItem final : public
SfxPoolItem
{
-XHatchListRef pHatchList;
+XHatchListRef m_pHatchList;
public:
static SfxPoolItem* CreateDefault();
@@ -97,12 +97,12 @@ public:
virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
-const XHatchListRef&GetHatchList() const { return pHatchList; }
+const XHatchListRef&GetHatchList() const { return m_pHatchList; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxBitmapListItem final : public
SfxPoolItem
{
-XBitmapListRefpBitmapList;
+XBitmapListRefm_pBitmapList;
public:
static SfxPoolItem* CreateDefault();
@@ -123,12 +123,12 @@ public:
virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
-const XBitmapListRef& GetBitmapList() const { return pBitmapList; }
+const XBitmapListRef& GetBitmapList() const { return m_pBitmapList; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxPatternListItem final : public
SfxPoolItem
{
-XPatternListRefpPatternList;
+XPatternListRefm_pPatternList;
public:
static SfxPoolItem* CreateDefault();
@@ -148,12 +148,12 @@ public:
virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
-const XPatternListRef& GetPatternList() const { return pPatternList; }
+const XPatternListRef& GetPatternList() const { return m_pPatternList; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxDashListItem final : public
SfxPoolItem
{
-XDashListRef pDashList;
+XDashListRef m_pDashList;
public:
static SfxPoolItem* CreateDefault();
@@ -174,12 +174,12 @@ public:
virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
-const XDashListRef& GetDashList() const { return pDashList; }
+const XDashListRef& GetDashList() const { return m_pDashList; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxLineEndListItem final : public
SfxPoolItem
{
-XLineEndListRef pLineEndList;
+XLineEndListRef m_pLineEndList;
public:
static Sf
core.git: include/svx svx/source
include/svx/dialog/ThemeColorEditDialog.hxx |2 +-
include/svx/sdr/contact/viewcontact.hxx |2 +-
include/svx/sdr/contact/viewobjectcontact.hxx |2 +-
include/svx/svdedtv.hxx |2 +-
include/svx/svdundo.hxx |2 +-
svx/source/dialog/ThemeColorEditDialog.cxx|2 +-
svx/source/dialog/framelinkarray.cxx |4 ++--
svx/source/dialog/srchdlg.cxx |2 +-
svx/source/sdr/contact/viewcontact.cxx|2 +-
svx/source/sdr/contact/viewobjectcontact.cxx |2 +-
svx/source/svdraw/svdedtv1.cxx|2 +-
svx/source/svdraw/svdmrkv.cxx |2 +-
svx/source/svdraw/svdundo.cxx |2 +-
svx/source/tbxctrls/tbcontrl.cxx |2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit f3aac8a24148eda2c0f9dc52dd8701f037fb6ccf
Author: Noel Grandin
AuthorDate: Thu Mar 20 08:14:05 2025 +0200
Commit: Noel Grandin
CommitDate: Thu Mar 20 10:52:09 2025 +0100
loplugin:constparam in svx
Change-Id: Ibdac11b615ce28cf0cfbd3ad51ecbc56f5a73154
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183143
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/dialog/ThemeColorEditDialog.hxx
b/include/svx/dialog/ThemeColorEditDialog.hxx
index 067d89d606fa..800cae7f4508 100644
--- a/include/svx/dialog/ThemeColorEditDialog.hxx
+++ b/include/svx/dialog/ThemeColorEditDialog.hxx
@@ -40,7 +40,7 @@ private:
std::unique_ptr mxFollowHyperlink;
public:
-ThemeColorEditDialog(weld::Window* pParent, model::ColorSet& rColorSet);
+ThemeColorEditDialog(weld::Window* pParent, const model::ColorSet&
rColorSet);
virtual ~ThemeColorEditDialog() override;
model::ColorSet getColorSet();
};
diff --git a/include/svx/sdr/contact/viewcontact.hxx
b/include/svx/sdr/contact/viewcontact.hxx
index 9de7b0994b8b..83798789844c 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -122,7 +122,7 @@ public:
virtual void ActionChanged();
// IASS: helpers for IASS invalidates
-void ActionChangedIfDifferentPageView(SdrPageView& rSdrPageView);
+void ActionChangedIfDifferentPageView(const SdrPageView& rSdrPageView);
bool hasMultipleViewObjectContacts() const;
// access to the local primitive. This will ensure that the primitive is
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx
b/include/svx/sdr/contact/viewobjectcontact.hxx
index 393a23599a6e..9ef43e669539 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -101,7 +101,7 @@ public:
virtual void ActionChanged();
// IASS: helper for IASS invalidates
-void ActionChangedIfDifferentPageView(SdrPageView& rSdrPageView);
+void ActionChangedIfDifferentPageView(const SdrPageView& rSdrPageView);
// LazyInvalidate handling
void triggerLazyInvalidate();
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 4520c5411b5e..88125349e08b 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -231,7 +231,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);
+bool IsMarkedObjSizeValid(const 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/svdundo.hxx b/include/svx/svdundo.hxx
index 21cc57e6caac..7bd7056960c2 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -235,7 +235,7 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC)
SdrUndoDiagramModelData final : public
void implUndoRedo(bool bUndo);
public:
-SdrUndoDiagramModelData(SdrObject& rNewObj, std::shared_ptr<
svx::diagram::DiagramDataState >& rStartState);
+SdrUndoDiagramModelData(SdrObject& rNewObj, const std::shared_ptr<
svx::diagram::DiagramDataState >& rStartState);
virtual ~SdrUndoDiagramModelData() override;
virtual void Undo() override;
diff --git a/svx/source/dialog/ThemeColorEditDialog.cxx
b/svx/source/dialog/ThemeColorEditDialog.cxx
index 9ec24b8fa43d..b3845f162bd6 100644
--- a/svx/source/dialog/ThemeColorEditDialog.cxx
+++ b/svx/source/dialog/ThemeColorEditDialog.cxx
@@ -12,7 +12,7 @@
namespace svx
{
-ThemeColorEditDialog::ThemeColorEditDialog(weld::Window* pParent,
model::ColorSet& rColorSet)
+ThemeColorEditDialog::ThemeColorEditDialog(weld::Window* pParent, const
model::ColorSet& rColorSet)
: GenericDialogController(pParent, u"sv
core.git: include/svx svx/source
include/svx/chrtitem.hxx |4 ++--
svx/source/items/chrtitem.cxx | 12 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit a0914d9c21efee21496ac432d2720ebb7b87f0d4
Author: Miklos Vajna
AuthorDate: Mon Mar 17 08:13:39 2025 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 17 10:14:13 2025 +0100
svx: prefix members of SvxDoubleItem
See tdf#94879 for motivation.
Change-Id: I9164d15ee91c5f49d39b97f9bb1ab07b8750e199
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183019
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index b8536817a293..5aa7fb00662d 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -128,7 +128,7 @@ public:
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxDoubleItem final : public
SfxPoolItem
{
-double fVal;
+double m_fVal;
public:
static SfxPoolItem* CreateDefault();
@@ -147,7 +147,7 @@ public:
virtual bool operator == (const SfxPoolItem&) const override;
virtual SvxDoubleItem* Clone(SfxItemPool *pPool = nullptr) const override;
-double GetValue() const { return fVal; }
+double GetValue() const { return m_fVal; }
};
#endif // INCLUDED_SVX_CHRTITEM_HXX
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 44a7631910dd..8b3a4c776ce2 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -100,13 +100,13 @@ bool SvxChartTextOrderItem::PutValue( const
css::uno::Any& rVal, sal_uInt8 /*nMe
SvxDoubleItem::SvxDoubleItem(double fValue, TypedWhichId nId) :
SfxPoolItem(nId),
-fVal(fValue)
+m_fVal(fValue)
{
}
SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) :
SfxPoolItem(rItem),
-fVal(rItem.fVal)
+m_fVal(rItem.m_fVal)
{
}
@@ -115,7 +115,7 @@ bool SvxDoubleItem::GetPresentation
MapUnit /*ePresentationMetric*/, OUString& rText,
const IntlWrapper& rIntlWrapper) const
{
-rText = ::rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4,
+rText = ::rtl::math::doubleToUString( m_fVal, rtl_math_StringFormat_E, 4,
rIntlWrapper.getLocaleData()->getNumDecimalSep()[0], true );
return true;
}
@@ -123,7 +123,7 @@ bool SvxDoubleItem::GetPresentation
bool SvxDoubleItem::operator == (const SfxPoolItem& rItem) const
{
assert(SfxPoolItem::operator==(rItem));
-return static_cast(rItem).fVal == fVal;
+return static_cast(rItem).m_fVal == m_fVal;
}
SvxDoubleItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const
@@ -133,14 +133,14 @@ SvxDoubleItem* SvxDoubleItem::Clone(SfxItemPool*
/*pPool*/) const
bool SvxDoubleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
-rVal <<= fVal;
+rVal <<= m_fVal;
return true;
}
bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
ASSERT_CHANGE_REFCOUNTED_ITEM;
-return rVal >>= fVal;
+return rVal >>= m_fVal;
}
SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient,
core.git: include/svx svx/source
include/svx/unomodel.hxx |4 +-
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 17 +++-
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 12 ++
svx/source/table/accessibletableshape.cxx | 28 +-
svx/source/unodraw/unomod.cxx |7 ++-
svx/source/unogallery/unogalthemeprovider.cxx | 21 +++---
6 files changed, 37 insertions(+), 52 deletions(-)
New commits:
commit 25ac3297b02c2c32e6d6ee661b89ce7361c2f7d2
Author: Noel Grandin
AuthorDate: Fri Mar 7 14:53:58 2025 +0200
Commit: Noel Grandin
CommitDate: Sat Mar 8 17:42:14 2025 +0100
use more concrete UNO in svx
Change-Id: Ie947ba0209f9166ee1cd065f91341292f2b02668
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182621
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx
index 49a634c6617a..41abe4f48c4b 100644
--- a/include/svx/unomodel.hxx
+++ b/include/svx/unomodel.hxx
@@ -30,8 +30,10 @@
#include
#include
#include
+#include
class SdrModel;
+class SvxUnoDrawPagesAccess;
class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SvxUnoDrawingModel
: public SfxBaseModel, // implements SfxListener, OWEAKOBJECT & other
@@ -45,7 +47,7 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SvxUnoDrawingModel
private:
SdrModel* mpDoc;
-css::uno::WeakReference< css::drawing::XDrawPages > mxDrawPagesAccess;
+unotools::WeakReference< SvxUnoDrawPagesAccess > mxDrawPagesAccess;
css::uno::Reference< css::uno::XInterface > mxDashTable;
css::uno::Reference< css::uno::XInterface > mxGradientTable;
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 38a643a2b1f4..c6914c5242e2 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -64,9 +64,9 @@ uno::Reference< XAccessible >
SvxPixelCtlAccessible::getAccessibleChild( sal_Int
::osl::MutexGuard aGuard( m_aMutex );
if ( i < 0 || i >= getAccessibleChildCount())
throw lang::IndexOutOfBoundsException();
-Reference< XAccessible > xChild;
-if (mpPixelCtl)
-xChild = CreateChild(i, mpPixelCtl->IndexToPoint(i));
+if (!mpPixelCtl)
+return nullptr;
+rtl::Reference< SvxPixelCtlAccessibleChild > xChild = CreateChild(i,
mpPixelCtl->IndexToPoint(i));
return xChild;
}
@@ -131,13 +131,10 @@ uno::Reference SAL_CALL
SvxPixelCtlAccessible::getAccessibleAtPoin
{
::osl::MutexGuard aGuard( m_aMutex );
-Reference< XAccessible >xRet;
-
-if (mpPixelCtl)
-{
-tools::Long nIndex = mpPixelCtl->PointToIndex(Point(rPoint.X,
rPoint.Y));
-xRet = CreateChild(nIndex, mpPixelCtl->IndexToPoint(nIndex));
-}
+if (!mpPixelCtl)
+return nullptr;
+tools::Long nIndex = mpPixelCtl->PointToIndex(Point(rPoint.X, rPoint.Y));
+rtl::Reference< SvxPixelCtlAccessibleChild > xRet = CreateChild(nIndex,
mpPixelCtl->IndexToPoint(nIndex));
return xRet;
}
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 13155cb681d4..0bbb73ae40e6 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -335,14 +335,12 @@ Reference< drawing::XShape > SAL_CALL
EnhancedCustomShapeEngine::render()
xRenderedShape.get());
}
-Reference< drawing::XShape > xShape;
+if (!xRenderedShape)
+return nullptr;
-if (xRenderedShape)
-{
-aCustomShape2d.ApplyGluePoints(xRenderedShape.get());
-xShape = SvxDrawPage::CreateShapeByTypeAndInventor(
xRenderedShape->GetObjIdentifier(),
-xRenderedShape->GetObjInventor(), xRenderedShape.get() );
-}
+aCustomShape2d.ApplyGluePoints(xRenderedShape.get());
+rtl::Reference< SvxShape > xShape =
SvxDrawPage::CreateShapeByTypeAndInventor( xRenderedShape->GetObjIdentifier(),
+xRenderedShape->GetObjInventor(), xRenderedShape.get() );
return xShape;
}
diff --git a/svx/source/table/accessibletableshape.cxx
b/svx/source/table/accessibletableshape.cxx
index 2ef0efef4fd7..a46ee0be467e 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -484,31 +484,23 @@ sal_Int32 SAL_CALL
AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32
Reference< XAccessibleTable > SAL_CALL
AccessibleTableShape::getAccessibleRowHeaders( )
{
-Reference< XAccessibleTable > xRet;
SvxTableController* pController = getTableController();
-if( pController )
-{
-if( pController->isRowHeader() )
-{
-xRet = new AccessibleTableHeaderShape( this, true );
-}
-}
-return xRet;
+if( !pContro
