sd/source/ui/dlg/tpoption.cxx | 6 ++++--
sd/source/ui/view/frmview.cxx | 3 ++-
ucb/source/cacher/cachedcontentresultsetstub.cxx | 1 -
ucb/source/core/FileAccess.cxx | 2 --
ucb/source/core/identify.cxx | 1 -
ucb/source/ucp/cmis/cmis_resultset.cxx | 1 -
ucb/source/ucp/file/filinsreq.cxx | 1 -
ucb/source/ucp/file/filprp.cxx | 1 -
ucb/source/ucp/file/prov.cxx | 1 -
ucb/source/ucp/gio/gio_resultset.cxx | 1 -
10 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit 658a212585c56540a17c41111e6829716d4ef4e3
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Tue May 7 10:58:23 2024 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Wed May 15 00:02:43 2024 +0200
Use less SdOptionsSnapItem->IsBigOrtho/SetBigOrtho
in favor of officecfg
Change-Id: Id8b995bba0567108bb372ea9548e58c5f192f3ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167537
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 499b5e31a58f..41dd2545c6de 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -70,6 +70,7 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
officecfg::Office::Draw::Snap::Object::ObjectFrame::set(
m_xCbxSnapFrame->get_active(), batch );
officecfg::Office::Draw::Snap::Object::ObjectPoint::set(
m_xCbxSnapPoints->get_active(), batch );
officecfg::Office::Draw::Snap::Position::CreatingMoving::set(
m_xCbxOrtho->get_active(), batch );
+ officecfg::Office::Draw::Snap::Position::ExtendEdges::set(
m_xCbxBigOrtho->get_active(), batch );
}
else
{
@@ -78,9 +79,9 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
officecfg::Office::Impress::Snap::Object::ObjectFrame::set(
m_xCbxSnapFrame->get_active(), batch );
officecfg::Office::Impress::Snap::Object::ObjectPoint::set(
m_xCbxSnapPoints->get_active(), batch );
officecfg::Office::Impress::Snap::Position::CreatingMoving::set(
m_xCbxOrtho->get_active(), batch );
+ officecfg::Office::Impress::Snap::Position::ExtendEdges::set(
m_xCbxBigOrtho->get_active(), batch );
}
- aOptsItem.GetOptionsSnap().SetBigOrtho( m_xCbxBigOrtho->get_active() );
aOptsItem.GetOptionsSnap().SetRotate( m_xCbxRotate->get_active() );
aOptsItem.GetOptionsSnap().SetSnapArea(static_cast<sal_Int16>(m_xMtrFldSnapArea->get_value(FieldUnit::PIXEL)));
aOptsItem.GetOptionsSnap().SetAngle(Degree100(m_xMtrFldAngle->get_value(FieldUnit::DEGREE)));
@@ -108,6 +109,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
m_xCbxSnapFrame->set_active(
officecfg::Office::Draw::Snap::Object::ObjectFrame::get() );
m_xCbxSnapPoints->set_active(
officecfg::Office::Draw::Snap::Object::ObjectPoint::get() );
m_xCbxOrtho->set_active(
officecfg::Office::Draw::Snap::Position::CreatingMoving::get() );
+ m_xCbxBigOrtho->set_active(
officecfg::Office::Draw::Snap::Position::ExtendEdges::get() );
}
else
{
@@ -116,6 +118,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
m_xCbxSnapFrame->set_active(
officecfg::Office::Impress::Snap::Object::ObjectFrame::get() );
m_xCbxSnapPoints->set_active(
officecfg::Office::Impress::Snap::Object::ObjectPoint::get() );
m_xCbxOrtho->set_active(
officecfg::Office::Impress::Snap::Position::CreatingMoving::get() );
+ m_xCbxBigOrtho->set_active(
officecfg::Office::Impress::Snap::Position::ExtendEdges::get() );
}
bool bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::SnapLine::isReadOnly() :
@@ -145,7 +148,6 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Position::ExtendEdges::isReadOnly() :
officecfg::Office::Impress::Snap::Position::ExtendEdges::isReadOnly();
- m_xCbxBigOrtho->set_active( aOptsItem.GetOptionsSnap().IsBigOrtho() );
m_xCbxBigOrtho->set_sensitive(!bReadOnly);
m_xCbxBigOrthoImg->set_visible(bReadOnly);
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 6bd8d31df9f0..8d7cff7d904b 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -287,6 +287,7 @@ void FrameView::Update(SdOptions const * pOptions)
if (bImpress)
{
mbRuler = officecfg::Office::Impress::Layout::Display::Ruler::get();
+ SetBigOrtho(
officecfg::Office::Impress::Snap::Position::ExtendEdges::get() );
SetBordSnap(
officecfg::Office::Impress::Snap::Object::PageMargin::get() );
SetDragStripes(
officecfg::Office::Impress::Layout::Display::Guide::get() );
SetHlplSnap( officecfg::Office::Impress::Snap::Object::SnapLine::get()
);
@@ -300,6 +301,7 @@ void FrameView::Update(SdOptions const * pOptions)
else
{
mbRuler = officecfg::Office::Draw::Layout::Display::Ruler::get();
+ SetBigOrtho(
officecfg::Office::Draw::Snap::Position::ExtendEdges::get() );
SetBordSnap( officecfg::Office::Draw::Snap::Object::PageMargin::get()
);
SetDragStripes( officecfg::Office::Draw::Layout::Display::Guide::get()
);
SetHlplSnap( officecfg::Office::Draw::Snap::Object::SnapLine::get() );
@@ -320,7 +322,6 @@ void FrameView::Update(SdOptions const * pOptions)
SetSlantButShear( pOptions->IsMoveOnlyDragging() );
SetCrookNoContortion( pOptions->IsCrookNoContortion() );
SetAngleSnapEnabled( pOptions->IsRotate() );
- SetBigOrtho( pOptions->IsBigOrtho() );
SetEliminatePolyPointLimitAngle(
pOptions->GetEliminatePolyPointLimitAngle() );
GetModel().SetPickThroughTransparentTextFrames( pOptions->IsPickThrough()
);
commit d7365c0ff8f5b1ed62e3e2c50511d9255b79ee04
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Wed Apr 10 19:57:50 2024 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Wed May 15 00:02:29 2024 +0200
tdf#146619 Drop unused 'using namespace' in: ucb
Change-Id: Id415488b11e4d1ee3399388851775d97cc317b25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167639
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Tested-by: Jenkins
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx
b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index d1b96abf432b..5679d49bb622 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -31,7 +31,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::sdbc;
using namespace com::sun::star::ucb;
using namespace com::sun::star::uno;
-using namespace com::sun::star::util;
using namespace cppu;
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 889655dc3ef2..319af18a6c23 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -63,8 +63,6 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::registry;
-using namespace ::com::sun::star::container;
using ::std::vector;
diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx
index 1094f8fd53e3..e9a9db0f58b7 100644
--- a/ucb/source/core/identify.cxx
+++ b/ucb/source/core/identify.cxx
@@ -27,7 +27,6 @@
#include "identify.hxx"
-using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::ucb;
diff --git a/ucb/source/ucp/cmis/cmis_resultset.cxx
b/ucb/source/ucp/cmis/cmis_resultset.cxx
index 782953b65af8..602071c590ed 100644
--- a/ucb/source/ucp/cmis/cmis_resultset.cxx
+++ b/ucb/source/ucp/cmis/cmis_resultset.cxx
@@ -10,7 +10,6 @@
#include "cmis_datasupplier.hxx"
#include "cmis_resultset.hxx"
-using namespace com::sun::star::lang;
using namespace com::sun::star::ucb;
using namespace com::sun::star::uno;
diff --git a/ucb/source/ucp/file/filinsreq.cxx
b/ucb/source/ucp/file/filinsreq.cxx
index 0b8ebfb5395e..eb914e080320 100644
--- a/ucb/source/ucp/file/filinsreq.cxx
+++ b/ucb/source/ucp/file/filinsreq.cxx
@@ -31,7 +31,6 @@
using namespace cppu;
using namespace com::sun::star;
using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
using namespace com::sun::star::task;
using namespace com::sun::star::ucb;
using namespace com::sun::star::beans;
diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx
index ed352a9e9a23..5c2baa8e3f3e 100644
--- a/ucb/source/ucp/file/filprp.cxx
+++ b/ucb/source/ucp/file/filprp.cxx
@@ -25,7 +25,6 @@
using namespace fileaccess;
using namespace com::sun::star;
using namespace com::sun::star::uno;
-using namespace com::sun::star::ucb;
XPropertySetInfo_impl::XPropertySetInfo_impl( TaskManager* pMyShell,const
OUString& aUnqPath )
: m_pMyShell( pMyShell ),
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index eab4ec5300b7..03cf3e1534e0 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -38,7 +38,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::ucb;
-using namespace com::sun::star::container;
#if OSL_DEBUG_LEVEL > 0
#define THROW_WHERE SAL_WHERE
diff --git a/ucb/source/ucp/gio/gio_resultset.cxx
b/ucb/source/ucp/gio/gio_resultset.cxx
index a91c552b79a3..7e0494929c68 100644
--- a/ucb/source/ucp/gio/gio_resultset.cxx
+++ b/ucb/source/ucp/gio/gio_resultset.cxx
@@ -22,7 +22,6 @@
#include "gio_datasupplier.hxx"
#include "gio_resultset.hxx"
-using namespace com::sun::star::lang;
using namespace com::sun::star::ucb;
using namespace com::sun::star::uno;
