core.git: chart2/source include/svx svx/source svx/uiconfig
chart2/source/controller/sidebar/ChartLinePanel.cxx | 17 -
chart2/source/controller/sidebar/ChartLinePanel.hxx |4
include/svx/sidebar/LinePropertyPanelBase.hxx | 17 -
svx/source/sidebar/line/LinePropertyPanel.cxx | 26 --
svx/source/sidebar/line/LinePropertyPanel.hxx |4
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 200
svx/uiconfig/ui/sidebarline.ui | 133 +
7 files changed, 29 insertions(+), 372 deletions(-)
New commits:
commit 8cd4cd31e9cffb593ccfba765fa28c2494a2d6f7
Author: AkshayWarrier
AuthorDate: Mon Jan 22 20:31:16 2024 +0530
Commit: Hossein
CommitDate: Tue Feb 20 20:54:17 2024 +0100
tdf#157882 svx: Remove cap/corner styles and move arrowhead control to new
row
Change-Id: Ifa38ec7ba9969627ff26abe22c58d06ec373ecb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162403
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 453c573e5198..c029d70b1619 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -232,23 +232,6 @@ void
ChartLinePanel::updateModel(css::uno::Reference xModel)
doUpdateModel(pModel);
}
-void ChartLinePanel::setLineJoint(const XLineJointItem* pItem)
-{
-css::uno::Reference xPropSet =
-getPropSet(mxModel);
-
-if (!xPropSet.is())
-return;
-
-PreventUpdate aPreventUpdate(mbUpdate);
-if (pItem)
-xPropSet->setPropertyValue("LineJoint",
css::uno::Any(pItem->GetValue()));
-}
-
-void ChartLinePanel::setLineCap(const XLineCapItem* /*pItem*/)
-{
-}
-
void ChartLinePanel::setLineTransparency(const XLineTransparenceItem& rItem)
{
css::uno::Reference xPropSet =
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.hxx
b/chart2/source/controller/sidebar/ChartLinePanel.hxx
index 002ca51cc139..ca3d8be14244 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.hxx
@@ -16,10 +16,8 @@
#include "ChartSidebarSelectionListener.hxx"
#include "ChartColorWrapper.hxx"
-class XLineCapItem;
class XLineDashItem;
class XLineEndItem;
-class XLineJointItem;
class XLineStartItem;
class XLineStyleItem;
class XLineTransparenceItem;
@@ -62,8 +60,6 @@ public:
protected:
virtual void setLineTransparency(const XLineTransparenceItem& rItem)
override;
-virtual void setLineJoint(const XLineJointItem* pItem) override;
-virtual void setLineCap(const XLineCapItem* pItem) override;
virtual void updateLineWidth(bool bDisabled, bool bSetOrDefault, const
SfxPoolItem* pItem) override;
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx
b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 7fc9d92da357..f15f0de9fc2b 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -34,8 +34,6 @@ class XLineStartItem;
class XLineWidthItem;
class XLineEndItem;
class XLineEndList;
-class XLineJointItem;
-class XLineCapItem;
class XLineTransparenceItem;
class XDashList;
@@ -73,13 +71,9 @@ protected:
void ActivateControls();
virtual void setLineTransparency(const XLineTransparenceItem& rItem) = 0;
-virtual void setLineJoint(const XLineJointItem* pItem) = 0;
-virtual void setLineCap(const XLineCapItem* pItem) = 0;
void updateLineTransparence(bool bDisabled, bool bSetOrDefault, const
SfxPoolItem* pItem);
virtual void updateLineWidth(bool bDisabled, bool bSetOrDefault, const
SfxPoolItem* pItem);
-void updateLineJoint(bool bDisabled, bool bSetOrDefault, const
SfxPoolItem* pItem);
-void updateLineCap(bool bDisabled, bool bSetOrDefault, const SfxPoolItem*
pItem);
void setMapUnit(MapUnit eMapUnit);
@@ -101,12 +95,9 @@ private:
std::unique_ptr mxTBWidth;
std::unique_ptr mxFTTransparency;
std::unique_ptr mxMFTransparent;
-std::unique_ptr mxFTEdgeStyle;
-std::unique_ptr mxLBEdgeStyle;
-std::unique_ptr mxFTCapStyle;
-std::unique_ptr mxLBCapStyle;
-std::unique_ptr mxGridLineProps;
-std::unique_ptr mxBoxArrowProps;
+std::unique_ptr mxArrowHeadStyleFT;
+std::unique_ptr mxArrowHeadStyleTB;
+std::unique_ptr mxArrowHeadStyleDispatch;
//popup windows
std::unique_ptr mxLineWidthPopup;
@@ -129,8 +120,6 @@ private:
DECL_DLLPRIVATE_LINK(ToolboxWidthSelectHdl, const OUString&, void);
DECL_DLLPRIVATE_LINK(ChangeTransparentHdl, weld::MetricSpinButton&, void);
-DECL_DLLPRIVATE_LINK(ChangeEdgeStyleHdl, weld::ComboBox&, void);
-DECL_DLLPRIVATE_LINK(ChangeCapStyleHdl, weld::ComboBox&, void);
};
} // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx
b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 83a33b922888..53b4e0b325d7 100644
---
core.git: comphelper/source
comphelper/source/container/embeddedobjectcontainer.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 488cd78f3b30f8b43007a3250d0c11fd0416dde9
Author: AkshayWarrier
AuthorDate: Sat Jan 20 22:42:58 2024 +0530
Commit: Hossein
CommitDate: Tue Feb 13 19:54:07 2024 +0100
tdf#158237 comphelper: Use C++20 contains() instead of find() and end()
Change-Id: I99c27c2269051c6c145dbfd2ec12790d4bb1d5e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162338
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index d20e99d6632b..a66ac2dec527 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -238,8 +238,7 @@ bool EmbeddedObjectContainer::HasEmbeddedObjects() const
bool EmbeddedObjectContainer::HasEmbeddedObject( const OUString& rName )
{
-auto aIt = pImpl->maNameToObjectMap.find( rName );
-if (aIt != pImpl->maNameToObjectMap.end())
+if (pImpl->maNameToObjectMap.contains(rName))
return true;
if (!pImpl->mxStorage.is())
return false;
@@ -256,8 +255,7 @@ bool
EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const OUString& rNa
// allows to detect whether the object was already instantiated
// currently the filter instantiate it on loading, so this method allows
// to avoid objects pointing to the same persistence
-auto aIt = pImpl->maNameToObjectMap.find( rName );
-return ( aIt != pImpl->maNameToObjectMap.end() );
+return pImpl->maNameToObjectMap.contains(rName);
}
OUString EmbeddedObjectContainer::GetEmbeddedObjectName( const
css::uno::Reference < css::embed::XEmbeddedObject >& xObj ) const
core.git: include/sfx2 include/svx officecfg/registry sd/inc sd/sdi sd/source sd/uiconfig svx/Library_svx.mk svx/sdi svx/source svx/uiconfig svx/UIConfig_svx.mk sw/inc sw/Library_sw.mk sw/sdi sw/sourc
include/sfx2/sfxsids.hrc |
2
include/svx/dialog/gotodlg.hxx |
32 +--
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
19 +
sd/inc/strings.hrc |
2
sd/sdi/_drvwsh.sdi |
5
sd/source/ui/func/funavig.cxx|
27 ++
sd/source/ui/inc/DrawViewShell.hxx |
3
sd/source/ui/inc/SlideSorterViewShell.hxx|
2
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |
16 +
sd/source/ui/view/drviews3.cxx |
7
sd/source/ui/view/drviewsa.cxx |
11 +
sd/uiconfig/sdraw/menubar/menubar.xml|
1
sd/uiconfig/simpress/menubar/menubar.xml |
1
svx/Library_svx.mk |
1
svx/UIConfig_svx.mk |
1
svx/sdi/svx.sdi |
17 +
svx/source/dialog/gotodlg.cxx|
66 ++
svx/uiconfig/ui/gotopagedialog.ui|
2
sw/Library_sw.mk |
1
sw/UIConfig_swriter.mk |
1
sw/inc/cmdid.h |
2
sw/inc/strings.hrc |
1
sw/sdi/_viewsh.sdi |
2
sw/sdi/swriter.sdi |
17 -
sw/source/uibase/uiview/view2.cxx|
13 -
sw/source/uibase/utlui/gotodlg.cxx |
105 --
26 files changed, 202 insertions(+), 155 deletions(-)
New commits:
commit ace21b4b2537a3cf2301fca2ac6f78d0612e911f
Author: AkshayWarrier
AuthorDate: Fri Feb 2 02:18:24 2024 +0530
Commit: Jim Raykowski
CommitDate: Sat Feb 10 02:05:55 2024 +0100
tdf#159372 svx: Add goto dialog
Adds a goto page/slide dialog for Impress and Draw similar to Writer.
To avoid duplicating code and ui, the dialog is created in svx/ and used in
other modules.
The old goto dialog in Writer has now been replaced with this dialog.
Change-Id: I28f819f0d0734fb2bb08a7b99a628217ef66dba9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162913
Tested-by: Heiko Tietze
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 176e500c55b3..e2fafac7321a 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -228,7 +228,7 @@ class SvxZoomItem;
#define SID_UNPACK
TypedWhichId(SID_SFX_START + 1662)
// (SID_SFX_START + 1663) used further down
#define SID_ATTR_TARGETLANG_STR (SID_SFX_START + 1664)
-// FREE
+#define SID_GO_TO_PAGE (SID_SFX_START + 1665)
#define SID_OUTPUTSTREAM
TypedWhichId(SID_SFX_START + 1666)
#define SID_IMAGE_ORIENTATION
TypedWhichId(SID_SFX_START + 1667)
diff --git a/sw/inc/gotodlg.hxx b/include/svx/dialog/gotodlg.hxx
similarity index 64%
rename from sw/inc/gotodlg.hxx
rename to include/svx/dialog/gotodlg.hxx
index 0d10da367f68..304f1352b0db 100644
--- a/sw/inc/gotodlg.hxx
+++ b/include/svx/dialog/gotodlg.hxx
@@ -17,38 +17,30 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GOTODLG_HXX
-#define INCLUDED_SW_SOURCE_UIBASE_INC_GOTODLG_HXX
+#pragma once
-#include
+#include
#include
-class SwView;
-
-class SwGotoPageDlg final : public weld::GenericDialogController
+namespace svx
+{
+class SVX_DLLPUBLIC GotoPageDlg final : public weld::GenericDialogController
{
public:
-SwGotoPageDlg(weld::Window *parent, SfxBindings& rBindings);
+GotoPageDlg(weld::Window* pParent, const OUString& title, const OUString&
label,
+sal_uInt16 curPagePos, sal_uInt16 pageCnt);
-sal_uInt16 GetPageSelection() const
-{
-return mxMtrPageCtrl->get_text().toUInt32();
-}
+sal_uInt16 GetPageSelection() const { return
mxMtrPageCtrl->get_text().toUInt32(); }
private:
-SwView *m_pCreateView;
-SfxBindings& m_rBindings;
-sal_uInt16 mnMaxPageCnt;
+sal_uInt16 mnMaxPageCnt;
std::unique_ptr mxMtrPageCtrl;
std::unique_ptr mxPageNumberLbl;
+std::unique_ptr mxPageLbl;
-SwView*
core.git: cui/uiconfig
cui/uiconfig/ui/lineendstabpage.ui | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) New commits: commit e531242f62d27000ab5fefd6d63023d4a1060c75 Author: AkshayWarrier AuthorDate: Sun Jan 21 22:35:25 2024 +0530 Commit: Heiko Tietze CommitDate: Mon Jan 22 14:34:56 2024 +0100 tdf#148702 cui: Place dropdown before entry in Arrow Styles tab of Line dialog Change-Id: I4a0060422b55f681c3f4f0eb9a908d3b30faeb32 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162347 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/lineendstabpage.ui b/cui/uiconfig/ui/lineendstabpage.ui index 292159657ac0..93f8815fbc6c 100644 --- a/cui/uiconfig/ui/lineendstabpage.ui +++ b/cui/uiconfig/ui/lineendstabpage.ui @@ -60,12 +60,11 @@ 6 12 - + True False -Style _name: +Arrow _style: True -EDT_NAME 0 @@ -74,11 +73,12 @@ - + True False -Arrow _style: +Style _name: True +EDT_NAME 0 @@ -86,19 +86,6 @@ 1 - - -True -True -start -30 -True - - -1 -0 - - True @@ -119,6 +106,19 @@ + +1 +0 + + + + +True +True +start +30 +True + 1 1
core.git: basegfx/source chart2/source include/basegfx
basegfx/source/matrix/b3dhommatrix.cxx |5 -
chart2/source/inc/ObjectIdentifier.hxx |1 -
chart2/source/tools/ObjectIdentifier.cxx |5 -
include/basegfx/matrix/b3dhommatrix.hxx |1 -
4 files changed, 12 deletions(-)
New commits:
commit dad0ea5c75445dc8ca316c4e5af1a9d6875699c1
Author: AkshayWarrier
AuthorDate: Sat Jan 20 22:03:50 2024 +0530
Commit: Mike Kaganski
CommitDate: Sun Jan 21 04:46:31 2024 +0100
tdf#157664 Drop operator != where respective == is defined
Change-Id: I9eb0ea94f10126270f6e7c4433227ea60c21db79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162336
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basegfx/source/matrix/b3dhommatrix.cxx
b/basegfx/source/matrix/b3dhommatrix.cxx
index f9018c69793f..96edab9158b6 100644
--- a/basegfx/source/matrix/b3dhommatrix.cxx
+++ b/basegfx/source/matrix/b3dhommatrix.cxx
@@ -142,11 +142,6 @@ namespace basegfx
return mpImpl->isEqual(*rMat.mpImpl);
}
-bool B3DHomMatrix::operator!=(const B3DHomMatrix& rMat) const
-{
-return !(*this == rMat);
-}
-
void B3DHomMatrix::rotate(double fAngleX,double fAngleY,double fAngleZ)
{
if(fTools::equalZero(fAngleX) && fTools::equalZero(fAngleY) &&
fTools::equalZero(fAngleZ))
diff --git a/chart2/source/inc/ObjectIdentifier.hxx
b/chart2/source/inc/ObjectIdentifier.hxx
index c6d0c724bd3c..aefbd4c8a6e7 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -105,7 +105,6 @@ public:
ObjectIdentifier( const css::uno::Any& rAny );
bool operator==( const ObjectIdentifier& rOID ) const;
-bool operator!=( const ObjectIdentifier& rOID ) const;
bool operator<( const ObjectIdentifier& rOID ) const;
static OUString createClassifiedIdentifierForObject(
diff --git a/chart2/source/tools/ObjectIdentifier.cxx
b/chart2/source/tools/ObjectIdentifier.cxx
index 6e7631c8a9e4..0b071d7d4041 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -259,11 +259,6 @@ bool ObjectIdentifier::operator==( const ObjectIdentifier&
rOID ) const
( m_xAdditionalShape == rOID.m_xAdditionalShape );
}
-bool ObjectIdentifier::operator!=( const ObjectIdentifier& rOID ) const
-{
-return !operator==( rOID );
-}
-
bool ObjectIdentifier::operator<( const ObjectIdentifier& rOID ) const
{
bool bReturn = false;
diff --git a/include/basegfx/matrix/b3dhommatrix.hxx
b/include/basegfx/matrix/b3dhommatrix.hxx
index 29603f88ebdb..773898ccf65e 100644
--- a/include/basegfx/matrix/b3dhommatrix.hxx
+++ b/include/basegfx/matrix/b3dhommatrix.hxx
@@ -99,7 +99,6 @@ namespace basegfx
// comparison
bool operator==(const B3DHomMatrix& rMat) const;
-bool operator!=(const B3DHomMatrix& rMat) const;
// multiplication, division by constant value
B3DHomMatrix& operator*=(double fValue);
core.git: svx/source
svx/source/dialog/ClassificationEditView.hxx |5 +
svx/source/dialog/SafeModeDialog.hxx |5 +
svx/source/dialog/contimp.hxx|6 +-
svx/source/dialog/contwnd.hxx|6 +-
svx/source/dialog/crashreportdlg.hxx |5 +
5 files changed, 5 insertions(+), 22 deletions(-)
New commits:
commit 3f0dd3d635507e4505cab4dac6e493f9dc985c23
Author: AkshayWarrier
AuthorDate: Fri Jan 19 16:25:15 2024 +0530
Commit: Ilmari Lauhakangas
CommitDate: Fri Jan 19 15:50:28 2024 +0100
tdf#143148 Use pragma once in svx
Change-Id: I0317c57ec99a36d9f5153dadb556390a5d8858ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162302
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas
Reviewed-by: Ilmari Lauhakangas
diff --git a/svx/source/dialog/ClassificationEditView.hxx
b/svx/source/dialog/ClassificationEditView.hxx
index 225efe1243db..4e9a036a0989 100644
--- a/svx/source/dialog/ClassificationEditView.hxx
+++ b/svx/source/dialog/ClassificationEditView.hxx
@@ -8,8 +8,7 @@
*
*/
-#ifndef INCLUDED_SVX_CLASSIFICATIONEDITVIEW_HXX
-#define INCLUDED_SVX_CLASSIFICATIONEDITVIEW_HXX
+#pragma once
#include
#include
@@ -49,6 +48,4 @@ public:
} // end svx namespace
-#endif // INCLUDED_SVX_CLASSIFICATIONEDITVIEW_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/SafeModeDialog.hxx
b/svx/source/dialog/SafeModeDialog.hxx
index dd7db077e084..1d4df62ff566 100644
--- a/svx/source/dialog/SafeModeDialog.hxx
+++ b/svx/source/dialog/SafeModeDialog.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SVX_SOURCE_DIALOG_SAFEMODEDIALOG_HXX
-#define INCLUDED_SVX_SOURCE_DIALOG_SAFEMODEDIALOG_HXX
+#pragma once
#include
#include
@@ -61,6 +60,4 @@ private:
DECL_LINK(DialogBtnHdl, weld::Button&, void);
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 2bf5aca4d1e8..268e64695249 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SOURCE_DIALOG_CONTIMP_HXX
-#define INCLUDED_SVX_SOURCE_DIALOG_CONTIMP_HXX
+#pragma once
#include
#include "contwnd.hxx"
@@ -126,7 +125,4 @@ public:
void* pEditingObj );
};
-
-#endif // INCLUDED_SVX_SOURCE_DIALOG_CONTIMP_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 1bad623c05d6..a6b6efff1a7d 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SOURCE_DIALOG_CONTWND_HXX
-#define INCLUDED_SVX_SOURCE_DIALOG_CONTWND_HXX
+#pragma once
#include
#include
@@ -64,7 +63,4 @@ public:
voidSetWorkplaceClickHdl( const Link&
rLink ) { aWorkplaceClickLink = rLink; }
};
-
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/crashreportdlg.hxx
b/svx/source/dialog/crashreportdlg.hxx
index 3f2d9cb121c5..f7000e88557d 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SVX_SOURCE_DIALOG_CRASHREPORTDLG_HXX
-#define INCLUDED_SVX_SOURCE_DIALOG_CRASHREPORTDLG_HXX
+#pragma once
#include
@@ -37,6 +36,4 @@ private:
vcl::ILibreOfficeKitNotifier*);
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
