core.git: sd/inc
sd/inc/sdattr.hrc |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 46b497f5462848c51c8dd204a45128f606425637 Author: Gabor Kelemen AuthorDate: Tue May 21 08:56:47 2024 +0200 Commit: Gabor Kelemen CommitDate: Wed May 22 16:26:58 2024 +0200 Drop unused ATTR_OPTIONS_SNAP after commit 563573068fe0835b1fa132d18b53f991be0e15a0 Change-Id: Iafa5ec21cd833ed9b8ebbdaea03086f4fa1784c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167884 Reviewed-by: Gabor Kelemen Tested-by: Jenkins diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc index 20958e1b39d6..3bc08b04de81 100644 --- a/sd/inc/sdattr.hrc +++ b/sd/inc/sdattr.hrc @@ -102,8 +102,7 @@ class XColorItem; #define ATTR_OPTIONS_START ATTR_SNAPLINE_END + 1 #define ATTR_OPTIONS_LAYOUT ATTR_OPTIONS_START + 1 #define ATTR_OPTIONS_MISC TypedWhichId(ATTR_OPTIONS_START + 2) -#define ATTR_OPTIONS_SNAP ATTR_OPTIONS_START + 3 -#define ATTR_OPTIONS_PRINT TypedWhichId(ATTR_OPTIONS_START + 4) +#define ATTR_OPTIONS_PRINT TypedWhichId(ATTR_OPTIONS_START + 3) #define ATTR_OPTIONS_ENDATTR_OPTIONS_PRINT #define ATTR_OPTIONS_SCALE_STARTATTR_OPTIONS_END + 1
core.git: sd/inc sd/source
sd/inc/sdattr.hrc |2
sd/source/ui/app/optsitem.cxx | 167 --
sd/source/ui/app/sdmod2.cxx | 10 --
sd/source/ui/inc/optsitem.hxx | 69 -
4 files changed, 2 insertions(+), 246 deletions(-)
New commits:
commit 563573068fe0835b1fa132d18b53f991be0e15a0
Author: Gabor Kelemen
AuthorDate: Sun May 12 09:30:02 2024 +0200
Commit: Gabor Kelemen
CommitDate: Sat May 18 11:52:37 2024 +0200
Drop now unused SdOptionsSnap, SdOptionsSnapItem classes
Change-Id: Ifa2a7b7447e3659ea331ca4c3ec5c05dcc9a5841
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167542
Reviewed-by: Gabor Kelemen
Tested-by: Jenkins
diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index 35f53e47ca9d..20958e1b39d6 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
@@ -102,7 +102,7 @@ class XColorItem;
#define ATTR_OPTIONS_START ATTR_SNAPLINE_END + 1
#define ATTR_OPTIONS_LAYOUT ATTR_OPTIONS_START + 1
#define ATTR_OPTIONS_MISC
TypedWhichId(ATTR_OPTIONS_START + 2)
-#define ATTR_OPTIONS_SNAP
TypedWhichId(ATTR_OPTIONS_START + 3)
+#define ATTR_OPTIONS_SNAP ATTR_OPTIONS_START + 3
#define ATTR_OPTIONS_PRINT
TypedWhichId(ATTR_OPTIONS_START + 4)
#define ATTR_OPTIONS_ENDATTR_OPTIONS_PRINT
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index ac67a935e16d..9b1ec49f85a5 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -515,171 +515,6 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts )
const
pOpts->SetDragThreshold( maOptionsMisc.GetDragThresholdPixels() );
}
-/*
-|*
-|* SdOptionsSnap
-|*
-\/
-
-SdOptionsSnap::SdOptionsSnap( bool bImpress, bool bUseConfig ) :
-SdOptionsGeneric( bImpress, bUseConfig ?
- ( bImpress ?
-OUString( "Office.Impress/Snap" ) :
-OUString( "Office.Draw/Snap" ) ) :
- OUString() ),
-bSnapHelplines( true ),
-bSnapBorder( true ),
-bSnapFrame( false ),
-bSnapPoints( false ),
-bOrtho( false ),
-bBigOrtho( true ),
-bRotate( false ),
-nSnapArea( 5 ),
-nAngle( 1500 ),
-nBezAngle( 1500 )
-
-{
-EnableModify( true );
-}
-
-bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const
-{
-return( IsSnapHelplines() == rOpt.IsSnapHelplines() &&
-IsSnapBorder() == rOpt.IsSnapBorder() &&
-IsSnapFrame() == rOpt.IsSnapFrame() &&
-IsSnapPoints() == rOpt.IsSnapPoints() &&
-IsOrtho() == rOpt.IsOrtho() &&
-IsBigOrtho() == rOpt.IsBigOrtho() &&
-IsRotate() == rOpt.IsRotate() &&
-GetSnapArea() == rOpt.GetSnapArea() &&
-GetAngle() == rOpt.GetAngle() &&
-GetEliminatePolyPointLimitAngle() ==
rOpt.GetEliminatePolyPointLimitAngle() );
-}
-
-void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount
) const
-{
-static const char* aPropNames[] =
-{
-"Object/SnapLine",
-"Object/PageMargin",
-"Object/ObjectFrame",
-"Object/ObjectPoint",
-"Position/CreatingMoving",
-"Position/ExtendEdges",
-"Position/Rotating",
-"Object/Range",
-"Position/RotatingValue",
-"Position/PointReduction"
-};
-
-rCount = SAL_N_ELEMENTS(aPropNames);
-ppNames = aPropNames;
-}
-
-bool SdOptionsSnap::ReadData( const Any* pValues )
-{
-if( pValues[0].hasValue() ) SetSnapHelplines(
*o3tl::doAccess(pValues[ 0 ]) );
-if( pValues[1].hasValue() ) SetSnapBorder( *o3tl::doAccess(pValues[
1 ]) );
-if( pValues[2].hasValue() ) SetSnapFrame( *o3tl::doAccess(pValues[ 2
]) );
-if( pValues[3].hasValue() ) SetSnapPoints( *o3tl::doAccess(pValues[
3 ]) );
-if( pValues[4].hasValue() ) SetOrtho( *o3tl::doAccess(pValues[ 4 ])
);
-if( pValues[5].hasValue() ) SetBigOrtho( *o3tl::doAccess(pValues[ 5
]) );
-if( pValues[6].hasValue() ) SetRotate( *o3tl::doAccess(pValues[ 6 ])
);
-if( pValues[7].hasValue() ) SetSnapArea(
static_cast(*o3tl::doAccess(pValues[ 7 ])) );
-if( pValues[8].hasValue() ) SetAngle(
Degree100(*o3tl::doAccess(pValues[ 8 ])) );
-if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle(
Degree100(*o3tl::doAccess(pValues[ 9 ])) );
-
-return true;
-}
-
-bool SdOptionsSnap::WriteData( Any* pValues ) const
-{
-pValues[ 0 ] <<= IsSnapHelplines();
-pValues[ 1 ] <<= IsSnapBorder();
-pValues[ 2 ] <<= IsSnapFrame();
core.git: sd/source
sd/source/ui/dlg/tpoption.cxx | 49 +++---
sd/source/ui/view/frmview.cxx |3 +-
2 files changed, 25 insertions(+), 27 deletions(-)
New commits:
commit 5e88d86d8c41b6790a365fddadbcea76712c11f3
Author: Gabor Kelemen
AuthorDate: Sun May 12 09:15:18 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri May 17 16:33:45 2024 +0200
Use less SdOptionsSnapItem->Get/SetEliminatePolyPointLimitAngle
in favor of officecfg
Change-Id: I8a8d910578a438b494567eed30a632db6f191101
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167541
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index f25649536060..fdd199f6a7d5 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -57,7 +57,6 @@ SdTpOptionsSnap::~SdTpOptionsSnap()
bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
{
SvxGridTabPage::FillItemSet(rAttrs);
-SdOptionsSnapItem aOptsItem;
bool bDrawMode = SvxGridTabPage::IsDrawMode();
std::shared_ptr batch(
@@ -74,6 +73,7 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
officecfg::Office::Draw::Snap::Position::Rotating::set(
m_xCbxRotate->get_active(), batch );
officecfg::Office::Draw::Snap::Object::Range::set(
static_cast(m_xMtrFldSnapArea->get_value(FieldUnit::PIXEL)), batch );
officecfg::Office::Draw::Snap::Position::RotatingValue::set(
static_cast(Degree100(m_xMtrFldAngle->get_value(FieldUnit::DEGREE))),
batch );
+officecfg::Office::Draw::Snap::Position::PointReduction::set (
static_cast(Degree100(m_xMtrFldBezAngle->get_value(FieldUnit::DEGREE))),
batch );
}
else
{
@@ -86,11 +86,9 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
officecfg::Office::Impress::Snap::Position::Rotating::set(
m_xCbxRotate->get_active(), batch );
officecfg::Office::Impress::Snap::Object::Range::set(
static_cast(m_xMtrFldSnapArea->get_value(FieldUnit::PIXEL)), batch );
officecfg::Office::Impress::Snap::Position::RotatingValue::set(
static_cast(Degree100(m_xMtrFldAngle->get_value(FieldUnit::DEGREE))),
batch );
+officecfg::Office::Impress::Snap::Position::PointReduction::set (
static_cast(Degree100(m_xMtrFldBezAngle->get_value(FieldUnit::DEGREE))),
batch );
}
-
aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle(Degree100(m_xMtrFldBezAngle->get_value(FieldUnit::DEGREE)));
-
-rAttrs->Put( aOptsItem );
batch->commit();
// we get a possible existing GridItem, this ensures that we do not set
@@ -102,8 +100,6 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
{
SvxGridTabPage::Reset(rAttrs);
-SdOptionsSnapItem aOptsItem( rAttrs->Get( ATTR_OPTIONS_SNAP ) );
-
bool bDrawMode = SvxGridTabPage::IsDrawMode();
if (bDrawMode)
{
@@ -116,6 +112,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
m_xCbxRotate->set_active(
officecfg::Office::Draw::Snap::Position::Rotating::get() );
m_xMtrFldSnapArea->set_value(
officecfg::Office::Draw::Snap::Object::Range::get(), FieldUnit::PIXEL);
m_xMtrFldAngle->set_value(
officecfg::Office::Draw::Snap::Position::RotatingValue::get(),
FieldUnit::DEGREE);
+m_xMtrFldBezAngle->set_value(
officecfg::Office::Draw::Snap::Position::PointReduction::get(),
FieldUnit::DEGREE);
}
else
{
@@ -128,6 +125,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
m_xCbxRotate->set_active(
officecfg::Office::Impress::Snap::Position::Rotating::get() );
m_xMtrFldSnapArea->set_value(
officecfg::Office::Impress::Snap::Object::Range::get(), FieldUnit::PIXEL);
m_xMtrFldAngle->set_value(
officecfg::Office::Impress::Snap::Position::RotatingValue::get(),
FieldUnit::DEGREE);
+m_xMtrFldBezAngle->set_value(
officecfg::Office::Impress::Snap::Position::PointReduction::get(),
FieldUnit::DEGREE);
}
bool bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::SnapLine::isReadOnly() :
@@ -176,7 +174,6 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Position::PointReduction::isReadOnly() :
officecfg::Office::Impress::Snap::Position::PointReduction::isReadOnly();
-
m_xMtrFldBezAngle->set_value(aOptsItem.GetOptionsSnap().GetEliminatePolyPointLimitAngle().get(),
FieldUnit::DEGREE);
m_xMtrFldBezAngle->set_sensitive(!bReadOnly);
m_xMtrFldBezAngleImg->set_visible(bReadOnly);
@@ -248,20 +245,20 @@ bool SdTpOptionsContents::FillItemSet( SfxItemSet* )
if (m_bDrawMode)
{
-officecfg::Office::Draw::Layout::Display::Ruler::set(
m_xCbxRuler->get_active(), batch );
-officecfg::Office::Draw::Layout::Display::Contour::set(
m_xCbxMoveO
core.git: sd/source
sd/source/ui/dlg/tpoption.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit fa16f9e19ea9ff29086e1759a8e66ccabf553ac0 Author: Gabor Kelemen AuthorDate: Fri May 17 13:07:37 2024 +0200 Commit: Gabor Kelemen CommitDate: Fri May 17 16:05:40 2024 +0200 Add missing officecfg call accidentally omitted from f1c91993e54858f9bc7ed78d25485a09157c04be Change-Id: I19a95e4e767792543bf04bbd8ca572017eee8992 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167772 Reviewed-by: Gabor Kelemen Tested-by: Jenkins diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 73542633a8af..f25649536060 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -114,6 +114,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs ) m_xCbxOrtho->set_active( officecfg::Office::Draw::Snap::Position::CreatingMoving::get() ); m_xCbxBigOrtho->set_active( officecfg::Office::Draw::Snap::Position::ExtendEdges::get() ); m_xCbxRotate->set_active( officecfg::Office::Draw::Snap::Position::Rotating::get() ); +m_xMtrFldSnapArea->set_value( officecfg::Office::Draw::Snap::Object::Range::get(), FieldUnit::PIXEL); m_xMtrFldAngle->set_value( officecfg::Office::Draw::Snap::Position::RotatingValue::get(), FieldUnit::DEGREE); } else
core.git: sd/source
sd/source/ui/dlg/tpoption.cxx |7 ---
sd/source/ui/view/frmview.cxx |3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 56f4272f407fed0e013ef694276e640955add154
Author: Gabor Kelemen
AuthorDate: Sat May 11 22:38:12 2024 +0200
Commit: Gabor Kelemen
CommitDate: Thu May 16 21:49:36 2024 +0200
Use less SdOptionsSnapItem->GetAngle/SetAngle
in favor of officecfg
Change-Id: I3196fb36a1513fed983998a33acce05e03a20cbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167540
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index d66536348a8f..73542633a8af 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -73,6 +73,7 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
officecfg::Office::Draw::Snap::Position::ExtendEdges::set(
m_xCbxBigOrtho->get_active(), batch );
officecfg::Office::Draw::Snap::Position::Rotating::set(
m_xCbxRotate->get_active(), batch );
officecfg::Office::Draw::Snap::Object::Range::set(
static_cast(m_xMtrFldSnapArea->get_value(FieldUnit::PIXEL)), batch );
+officecfg::Office::Draw::Snap::Position::RotatingValue::set(
static_cast(Degree100(m_xMtrFldAngle->get_value(FieldUnit::DEGREE))),
batch );
}
else
{
@@ -84,9 +85,9 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
officecfg::Office::Impress::Snap::Position::ExtendEdges::set(
m_xCbxBigOrtho->get_active(), batch );
officecfg::Office::Impress::Snap::Position::Rotating::set(
m_xCbxRotate->get_active(), batch );
officecfg::Office::Impress::Snap::Object::Range::set(
static_cast(m_xMtrFldSnapArea->get_value(FieldUnit::PIXEL)), batch );
+officecfg::Office::Impress::Snap::Position::RotatingValue::set(
static_cast(Degree100(m_xMtrFldAngle->get_value(FieldUnit::DEGREE))),
batch );
}
-
aOptsItem.GetOptionsSnap().SetAngle(Degree100(m_xMtrFldAngle->get_value(FieldUnit::DEGREE)));
aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle(Degree100(m_xMtrFldBezAngle->get_value(FieldUnit::DEGREE)));
rAttrs->Put( aOptsItem );
@@ -113,7 +114,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
m_xCbxOrtho->set_active(
officecfg::Office::Draw::Snap::Position::CreatingMoving::get() );
m_xCbxBigOrtho->set_active(
officecfg::Office::Draw::Snap::Position::ExtendEdges::get() );
m_xCbxRotate->set_active(
officecfg::Office::Draw::Snap::Position::Rotating::get() );
-
+m_xMtrFldAngle->set_value(
officecfg::Office::Draw::Snap::Position::RotatingValue::get(),
FieldUnit::DEGREE);
}
else
{
@@ -125,6 +126,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
m_xCbxBigOrtho->set_active(
officecfg::Office::Impress::Snap::Position::ExtendEdges::get() );
m_xCbxRotate->set_active(
officecfg::Office::Impress::Snap::Position::Rotating::get() );
m_xMtrFldSnapArea->set_value(
officecfg::Office::Impress::Snap::Object::Range::get(), FieldUnit::PIXEL);
+m_xMtrFldAngle->set_value(
officecfg::Office::Impress::Snap::Position::RotatingValue::get(),
FieldUnit::DEGREE);
}
bool bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::SnapLine::isReadOnly() :
@@ -169,7 +171,6 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Position::RotatingValue::isReadOnly() :
officecfg::Office::Impress::Snap::Position::RotatingValue::isReadOnly();
-m_xMtrFldAngle->set_value(aOptsItem.GetOptionsSnap().GetAngle().get(),
FieldUnit::DEGREE);
m_xMtrFldAngle->set_sensitive(!bReadOnly);
bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Position::PointReduction::isReadOnly() :
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 1a543d0afc06..f6ef9c350428 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -298,6 +298,7 @@ void FrameView::Update(SdOptions const * pOptions)
SetOPntSnap(
officecfg::Office::Impress::Snap::Object::ObjectPoint::get() );
SetOrtho(
officecfg::Office::Impress::Snap::Position::CreatingMoving::get() );
SetPlusHandlesAlwaysVisible(
officecfg::Office::Impress::Layout::Display::Bezier::get() );
+SetSnapAngle(
Degree100(officecfg::Office::Impress::Snap::Position::RotatingValue::get()) );
SetSnapMagneticPixel(
officecfg::Office::Impress::Snap::Object::Range::get() );
}
else
@@ -314,11 +315,11 @@ void FrameView::Update(SdOptions const * pOptions)
SetOPntSnap( officecfg::Office::Draw::Snap::Object::ObjectPoint::get()
);
SetOrtho(
officecfg::Office::Draw::Snap::Position::CreatingMoving::get() );
SetPlusHandlesAlwaysVisible(
officecfg::Off
core.git: sd/source
sd/source/ui/dlg/tpoption.cxx |6 --
sd/source/ui/view/frmview.cxx |3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit f1c91993e54858f9bc7ed78d25485a09157c04be
Author: Gabor Kelemen
AuthorDate: Sat May 11 22:31:37 2024 +0200
Commit: Gabor Kelemen
CommitDate: Thu May 16 19:15:16 2024 +0200
Use less SdOptionsSnapItem->GetSnapArea/SetSnapArea
in favor of officecfg
Change-Id: I0457f565f3f5d68018a307de7afbed9dbd009d42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167539
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index ac35cbeea34f..d66536348a8f 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -72,6 +72,7 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
officecfg::Office::Draw::Snap::Position::CreatingMoving::set(
m_xCbxOrtho->get_active(), batch );
officecfg::Office::Draw::Snap::Position::ExtendEdges::set(
m_xCbxBigOrtho->get_active(), batch );
officecfg::Office::Draw::Snap::Position::Rotating::set(
m_xCbxRotate->get_active(), batch );
+officecfg::Office::Draw::Snap::Object::Range::set(
static_cast(m_xMtrFldSnapArea->get_value(FieldUnit::PIXEL)), batch );
}
else
{
@@ -82,9 +83,9 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
officecfg::Office::Impress::Snap::Position::CreatingMoving::set(
m_xCbxOrtho->get_active(), batch );
officecfg::Office::Impress::Snap::Position::ExtendEdges::set(
m_xCbxBigOrtho->get_active(), batch );
officecfg::Office::Impress::Snap::Position::Rotating::set(
m_xCbxRotate->get_active(), batch );
+officecfg::Office::Impress::Snap::Object::Range::set(
static_cast(m_xMtrFldSnapArea->get_value(FieldUnit::PIXEL)), batch );
}
-
aOptsItem.GetOptionsSnap().SetSnapArea(static_cast(m_xMtrFldSnapArea->get_value(FieldUnit::PIXEL)));
aOptsItem.GetOptionsSnap().SetAngle(Degree100(m_xMtrFldAngle->get_value(FieldUnit::DEGREE)));
aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle(Degree100(m_xMtrFldBezAngle->get_value(FieldUnit::DEGREE)));
@@ -112,6 +113,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
m_xCbxOrtho->set_active(
officecfg::Office::Draw::Snap::Position::CreatingMoving::get() );
m_xCbxBigOrtho->set_active(
officecfg::Office::Draw::Snap::Position::ExtendEdges::get() );
m_xCbxRotate->set_active(
officecfg::Office::Draw::Snap::Position::Rotating::get() );
+
}
else
{
@@ -122,6 +124,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
m_xCbxOrtho->set_active(
officecfg::Office::Impress::Snap::Position::CreatingMoving::get() );
m_xCbxBigOrtho->set_active(
officecfg::Office::Impress::Snap::Position::ExtendEdges::get() );
m_xCbxRotate->set_active(
officecfg::Office::Impress::Snap::Position::Rotating::get() );
+m_xMtrFldSnapArea->set_value(
officecfg::Office::Impress::Snap::Object::Range::get(), FieldUnit::PIXEL);
}
bool bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::SnapLine::isReadOnly() :
@@ -161,7 +164,6 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::Range::isReadOnly() :
officecfg::Office::Impress::Snap::Object::Range::isReadOnly();
-m_xMtrFldSnapArea->set_value(aOptsItem.GetOptionsSnap().GetSnapArea(),
FieldUnit::PIXEL);
m_xMtrFldSnapArea->set_sensitive(!bReadOnly);
m_xMtrFldSnapAreaImg->set_visible(bReadOnly);
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 318cd0be5f55..1a543d0afc06 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -298,6 +298,7 @@ void FrameView::Update(SdOptions const * pOptions)
SetOPntSnap(
officecfg::Office::Impress::Snap::Object::ObjectPoint::get() );
SetOrtho(
officecfg::Office::Impress::Snap::Position::CreatingMoving::get() );
SetPlusHandlesAlwaysVisible(
officecfg::Office::Impress::Layout::Display::Bezier::get() );
+SetSnapMagneticPixel(
officecfg::Office::Impress::Snap::Object::Range::get() );
}
else
{
@@ -313,12 +314,12 @@ void FrameView::Update(SdOptions const * pOptions)
SetOPntSnap( officecfg::Office::Draw::Snap::Object::ObjectPoint::get()
);
SetOrtho(
officecfg::Office::Draw::Snap::Position::CreatingMoving::get() );
SetPlusHandlesAlwaysVisible(
officecfg::Office::Draw::Layout::Display::Bezier::get() );
+SetSnapMagneticPixel(
officecfg::Office::Draw::Snap::Object::Range::get() );
}
SetGridVisible( pOptions->IsGridVisible() );
SetSnapAngle( pOptions->GetAngle() );
SetGridSnap( pOptions->IsUseGridSnap() );
-SetSnapMagne
core.git: drawinglayer/source svx/source uui/source vcl/unx
drawinglayer/source/primitive3d/groupprimitive3d.cxx |3 ---
drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx |3 ---
drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx |3 ---
drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx|3 ---
drawinglayer/source/primitive3d/sdrprimitive3d.cxx|3 ---
drawinglayer/source/primitive3d/shadowprimitive3d.cxx |3 ---
drawinglayer/source/primitive3d/transformprimitive3d.cxx |3 ---
drawinglayer/source/processor2d/baseprocessor2d.cxx |3 ---
drawinglayer/source/processor2d/contourextractor2d.cxx|3 ---
drawinglayer/source/processor2d/linegeometryextractor2d.cxx |3 ---
drawinglayer/source/processor2d/objectinfoextractor2d.cxx |2 --
drawinglayer/source/processor2d/processor2dtools.cxx |2 --
drawinglayer/source/processor3d/geometry2dextractor.cxx |3 ---
svx/source/sidebar/paragraph/ParaSpacingWindow.hxx|2 --
uui/source/logindlg.cxx |2 --
vcl/unx/generic/app/gensys.cxx|2 --
16 files changed, 43 deletions(-)
New commits:
commit 8cda679913bac83324c222c31c417f2ee7e2924b
Author: Gabor Kelemen
AuthorDate: Wed Apr 10 19:50:20 2024 +0200
Commit: Gabor Kelemen
CommitDate: Thu May 16 08:35:34 2024 +0200
tdf#146619 Drop unused 'using namespace com::sun::star'
now that find-unused-includes was expanded with detecting these
Change-Id: I9f21ad1a85c1e3178cad98464b2ba407d909b62d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167638
Reviewed-by: Gabor Kelemen
Tested-by: Jenkins
diff --git a/drawinglayer/source/primitive3d/groupprimitive3d.cxx
b/drawinglayer/source/primitive3d/groupprimitive3d.cxx
index a3056e3ed432..c50e29f04d8c 100644
--- a/drawinglayer/source/primitive3d/groupprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/groupprimitive3d.cxx
@@ -22,9 +22,6 @@
#include
-using namespace com::sun::star;
-
-
namespace drawinglayer::primitive3d
{
GroupPrimitive3D::GroupPrimitive3D( Primitive3DContainer aChildren )
diff --git a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
index 1a367e501d29..8d69d8741097 100644
--- a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
@@ -21,9 +21,6 @@
#include
-using namespace com::sun::star;
-
-
namespace drawinglayer::primitive3d
{
HiddenGeometryPrimitive3D::HiddenGeometryPrimitive3D(
diff --git a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
index 54fa166f055d..64ae9b949ca1 100644
--- a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
@@ -22,9 +22,6 @@
#include
-using namespace com::sun::star;
-
-
namespace drawinglayer::primitive3d
{
ModifiedColorPrimitive3D::ModifiedColorPrimitive3D(
diff --git a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
index 09c8fb515933..5a03a89841e0 100644
--- a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
@@ -23,9 +23,6 @@
#include
-using namespace com::sun::star;
-
-
namespace drawinglayer::primitive3d
{
PolyPolygonMaterialPrimitive3D::PolyPolygonMaterialPrimitive3D(
diff --git a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
index b4007f1a8705..7a6feb946ebc 100644
--- a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
@@ -23,9 +23,6 @@
#include
-using namespace com::sun::star;
-
-
namespace drawinglayer::primitive3d
{
basegfx::B3DRange SdrPrimitive3D::getStandard3DRange() const
diff --git a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
index 3c3a07ef7a2f..c32d17dbc69e 100644
--- a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
@@ -22,9 +22,6 @@
#include
-using namespace com::sun::star;
-
-
namespace drawinglayer::primitive3d
{
ShadowPrimitive3D::ShadowPrimitive3D(
diff --git a/drawinglayer/source/primitive3d/transformprimitive3d.cxx
b/drawinglayer/source/primitive3d/transformprimitive3d.cxx
index c7b926d8dc18..135cba2c55ab 100644
--- a/drawinglayer/source/primitive3d/transformprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/transformprimitive3d.cxx
@@ -22,9 +22,6 @@
#include
-using namespace com::sun::star;
-
-
namespace drawinglayer::primitive3d
{
TransformPrimitive3D
core.git: chart2/source dbaccess/source forms/source sc/source sd/source uui/source xmloff/source
chart2/source/controller/accessibility/AccessibleChartElement.cxx |1 -
chart2/source/controller/accessibility/AccessibleChartView.cxx |2 --
chart2/source/controller/accessibility/AccessibleTextHelper.cxx |1 -
chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx |1 -
chart2/source/controller/main/ChartController_Insert.cxx|1 -
chart2/source/controller/main/ObjectHierarchy.cxx |1 -
chart2/source/model/main/UndoManager.cxx|2 --
chart2/source/tools/CachedDataSequence.cxx |1 -
chart2/source/tools/UncachedDataSequence.cxx|1 -
dbaccess/source/core/dataaccess/databaseregistrations.cxx |1 -
forms/source/helper/windowstateguard.cxx|1 -
sc/source/filter/excel/xiescher.cxx |1 -
sd/source/core/CustomAnimationPreset.cxx|1 -
uui/source/iahndl.cxx |3 ---
xmloff/source/text/XMLIndexTOCContext.cxx |1 -
15 files changed, 19 deletions(-)
New commits:
commit e3ca92bcfda624136af5ba741fef8f732f2856fc
Author: Gabor Kelemen
AuthorDate: Wed Apr 10 17:44:02 2024 +0200
Commit: Gabor Kelemen
CommitDate: Thu May 16 08:35:11 2024 +0200
Drop unneeded 'using' instances
found with bin/find-unused-using.sh
Change-Id: I647f493ee313e79e7a9967960ea089b729de59a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167637
Reviewed-by: Gabor Kelemen
Tested-by: Jenkins
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index ddc727277978..2ed0d06e29c4 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
namespace chart
{
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx
b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index fe83052f472b..73645a82e2a9 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -40,10 +40,8 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::WeakReference;
-using ::com::sun::star::uno::Any;
using osl::MutexGuard;
namespace chart
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index 6fc26b1c82ad..a117186f4521 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
namespace chart
{
diff --git
a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index ef0a1fc4c098..bbbee7cf318a 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -38,7 +38,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
namespace chart::wrapper {
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx
b/chart2/source/controller/main/ChartController_Insert.cxx
index 3ec8b62c1ecb..d74ede874b36 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -67,7 +67,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
namespace
{
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx
b/chart2/source/controller/main/ObjectHierarchy.cxx
index f2d130aa014c..5cf427133a9e 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -53,7 +53,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
namespace
{
diff --git a/chart2/source/model/main/UndoManager.cxx
b/chart2/source/model/main/UndoManager.cxx
index 3688863b3883
core.git: sd/source
sd/source/ui/dlg/tpoption.cxx |6 --
sd/source/ui/view/frmview.cxx |3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ffd199021ec24e3fb2028708a6a191bf5dd49e41
Author: Gabor Kelemen
AuthorDate: Tue May 7 13:10:40 2024 +0200
Commit: Gabor Kelemen
CommitDate: Wed May 15 19:22:33 2024 +0200
Use less SdOptionsSnapItem->IsRotate/SetRotate
in favor of officecfg
Change-Id: I7c08ed5154d8f3c369c28d05381e551fa9639ecb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167538
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 41dd2545c6de..ac35cbeea34f 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -71,6 +71,7 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
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 );
+officecfg::Office::Draw::Snap::Position::Rotating::set(
m_xCbxRotate->get_active(), batch );
}
else
{
@@ -80,9 +81,9 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
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 );
+officecfg::Office::Impress::Snap::Position::Rotating::set(
m_xCbxRotate->get_active(), batch );
}
-aOptsItem.GetOptionsSnap().SetRotate( m_xCbxRotate->get_active() );
aOptsItem.GetOptionsSnap().SetSnapArea(static_cast(m_xMtrFldSnapArea->get_value(FieldUnit::PIXEL)));
aOptsItem.GetOptionsSnap().SetAngle(Degree100(m_xMtrFldAngle->get_value(FieldUnit::DEGREE)));
aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle(Degree100(m_xMtrFldBezAngle->get_value(FieldUnit::DEGREE)));
@@ -110,6 +111,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
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() );
+m_xCbxRotate->set_active(
officecfg::Office::Draw::Snap::Position::Rotating::get() );
}
else
{
@@ -119,6 +121,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
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() );
+m_xCbxRotate->set_active(
officecfg::Office::Impress::Snap::Position::Rotating::get() );
}
bool bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::SnapLine::isReadOnly() :
@@ -153,7 +156,6 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Position::Rotating::isReadOnly() :
officecfg::Office::Impress::Snap::Position::Rotating::isReadOnly();
-m_xCbxRotate->set_active( aOptsItem.GetOptionsSnap().IsRotate() );
m_xCbxRotate->set_sensitive(!bReadOnly);
m_xCbxRotateImg->set_visible(bReadOnly);
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 8d7cff7d904b..318cd0be5f55 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();
+SetAngleSnapEnabled(
officecfg::Office::Impress::Snap::Position::Rotating::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() );
@@ -301,6 +302,7 @@ void FrameView::Update(SdOptions const * pOptions)
else
{
mbRuler = officecfg::Office::Draw::Layout::Display::Ruler::get();
+SetAngleSnapEnabled(
officecfg::Office::Draw::Snap::Position::Rotating::get() );
SetBigOrtho(
officecfg::Office::Draw::Snap::Position::ExtendEdges::get() );
SetBordSnap( officecfg::Office::Draw::Snap::Object::PageMargin::get()
);
SetDragStripes( off
core.git: sfx2/source
sfx2/source/dialog/backingwindow.cxx | 30 +-
1 file changed, 9 insertions(+), 21 deletions(-)
New commits:
commit ad7e95531d791e9c16a38aeeeb17ecaea44d69e3
Author: Gabor Kelemen
AuthorDate: Mon May 13 09:14:06 2024 +0200
Commit: Gabor Kelemen
CommitDate: Wed May 15 08:58:04 2024 +0200
Drop unnecessary ConfigurationAccess
Change-Id: I8ae3273ab048df66fa6a7006cb00af7a4958e337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167569
Reviewed-by: Gabor Kelemen
Tested-by: Jenkins
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 0cb8bc258023..e3761327ee60 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -62,8 +62,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::document;
-constexpr OUStringLiteral SERVICENAME_CFGREADACCESS =
u"com.sun.star.configuration.ConfigurationAccess";
-
class BrandImage final : public weld::CustomWidgetController
{
private:
@@ -535,26 +533,16 @@ IMPL_LINK(BackingWindow, ExtLinkClickHdl, weld::Button&,
rButton,void)
try
{
-uno::Sequence args(comphelper::InitAnyPropertySequence(
-{
-{"nodepath",
uno::Any(u"/org.openoffice.Office.Common/Help/StartCenter"_ustr)}
-}));
+OUString sURL(officecfg::Office::Common::Menus::ExtensionsURL::get() +
+"?LOvers=" + utl::ConfigManager::getProductVersion() +
+"=" +
LanguageTag(utl::ConfigManager::getUILocale()).getBcp47() );
-Reference xConfig =
configuration::theDefaultProvider::get(
comphelper::getProcessComponentContext() );
-Reference
xNameAccess(xConfig->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,
args), UNO_QUERY);
-if (xNameAccess.is())
-{
-OUString
sURL(officecfg::Office::Common::Menus::ExtensionsURL::get() +
-"?LOvers=" + utl::ConfigManager::getProductVersion() +
-"=" +
LanguageTag(utl::ConfigManager::getUILocale()).getBcp47() );
-
-Reference const
-xSystemShellExecute(
-css::system::SystemShellExecute::create(
-::comphelper::getProcessComponentContext()));
-xSystemShellExecute->execute(sURL, OUString(),
-css::system::SystemShellExecuteFlags::URIS_ONLY);
-}
+Reference const
+xSystemShellExecute(
+css::system::SystemShellExecute::create(
+::comphelper::getProcessComponentContext()));
+xSystemShellExecute->execute(sURL, OUString(),
+css::system::SystemShellExecuteFlags::URIS_ONLY);
}
catch (const Exception&)
{
core.git: 2 commits - sd/source ucb/source
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 658a212585c56540a17c4e6829716d4ef4e3
Author: Gabor Kelemen
AuthorDate: Tue May 7 10:58:23 2024 +0200
Commit: Gabor Kelemen
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
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(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::Impre
core.git: bin/find-unused-using.sh
bin/find-unused-using.sh |1 - 1 file changed, 1 deletion(-) New commits: commit b09e436a8b821d6a31d29de99ca610eaf8619c43 Author: Gabor Kelemen AuthorDate: Wed Apr 10 17:42:52 2024 +0200 Commit: Gabor Kelemen CommitDate: Wed May 15 00:01:31 2024 +0200 Remove obsolete TODO This was implemented recently with find-unneeded-includes --ns Change-Id: I703f68890f383a474ca33e0b2e122f9f0420a829 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167636 Reviewed-by: Gabor Kelemen Tested-by: Jenkins diff --git a/bin/find-unused-using.sh b/bin/find-unused-using.sh index 3521f64f49fd..5aa6e34abcb6 100755 --- a/bin/find-unused-using.sh +++ b/bin/find-unused-using.sh @@ -5,7 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. #!/bin/bash -# TODO search also for 'using namespace com/::com/css' - this is likely the fattest target and clang-tidy can't do it for ns in accessibility basegfx chart com css cppu comphelper connectivity formula dbtools editeng rtl sfx2 svt osl oox sax_fastparser sal sd ucbhelper utl vcl xmloff; do echo "Searching for namespace: $ns"; # search in cxx files, excluding URE headers, plus some files with false positives
core.git: sd/source
sd/source/ui/dlg/tpoption.cxx |6 --
sd/source/ui/view/frmview.cxx |3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit bcc1b9f22d4b2772c735176e78dfa1e7c8c39b3a
Author: Gabor Kelemen
AuthorDate: Tue May 7 10:49:30 2024 +0200
Commit: Gabor Kelemen
CommitDate: Tue May 14 16:19:34 2024 +0200
Use less SdOptionsSnapItem->IsOrtho/SetOrtho
in favor of officecfg
Change-Id: Iff78afb987bab8829ea595248b8ad434fe9b4cd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167536
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 597fe5705dd1..499b5e31a58f 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -69,6 +69,7 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
officecfg::Office::Draw::Snap::Object::PageMargin::set(
m_xCbxSnapBorder->get_active(), batch );
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 );
}
else
{
@@ -76,9 +77,9 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
officecfg::Office::Impress::Snap::Object::PageMargin::set(
m_xCbxSnapBorder->get_active(), batch );
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 );
}
-aOptsItem.GetOptionsSnap().SetOrtho( m_xCbxOrtho->get_active() );
aOptsItem.GetOptionsSnap().SetBigOrtho( m_xCbxBigOrtho->get_active() );
aOptsItem.GetOptionsSnap().SetRotate( m_xCbxRotate->get_active() );
aOptsItem.GetOptionsSnap().SetSnapArea(static_cast(m_xMtrFldSnapArea->get_value(FieldUnit::PIXEL)));
@@ -106,6 +107,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
m_xCbxSnapBorder->set_active(
officecfg::Office::Draw::Snap::Object::PageMargin::get() );
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() );
}
else
{
@@ -113,6 +115,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
m_xCbxSnapBorder->set_active(
officecfg::Office::Impress::Snap::Object::PageMargin::get() );
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() );
}
bool bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::SnapLine::isReadOnly() :
@@ -137,7 +140,6 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Position::CreatingMoving::isReadOnly() :
officecfg::Office::Impress::Snap::Position::CreatingMoving::isReadOnly();
-m_xCbxOrtho->set_active( aOptsItem.GetOptionsSnap().IsOrtho() );
m_xCbxOrtho->set_sensitive(!bReadOnly);
m_xCbxOrthoImg->set_visible(bReadOnly);
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index dfb73b027b71..6bd8d31df9f0 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -294,6 +294,7 @@ void FrameView::Update(SdOptions const * pOptions)
SetNoDragXorPolys (
!officecfg::Office::Impress::Layout::Display::Contour::get() );
SetOFrmSnap(
officecfg::Office::Impress::Snap::Object::ObjectFrame::get() );
SetOPntSnap(
officecfg::Office::Impress::Snap::Object::ObjectPoint::get() );
+SetOrtho(
officecfg::Office::Impress::Snap::Position::CreatingMoving::get() );
SetPlusHandlesAlwaysVisible(
officecfg::Office::Impress::Layout::Display::Bezier::get() );
}
else
@@ -306,6 +307,7 @@ void FrameView::Update(SdOptions const * pOptions)
SetNoDragXorPolys (
!officecfg::Office::Draw::Layout::Display::Contour::get() );
SetOFrmSnap( officecfg::Office::Draw::Snap::Object::ObjectFrame::get()
);
SetOPntSnap( officecfg::Office::Draw::Snap::Object::ObjectPoint::get()
);
+SetOrtho(
officecfg::Office::Draw::Snap::Position::CreatingMoving::get() );
SetPlusHandlesAlwaysVisible(
officecfg::Office::Draw::Layout::Displ
core.git: sd/source
sd/source/ui/dlg/tpoption.cxx |6 --
sd/source/ui/view/drviewsg.cxx |5 -
sd/source/ui/view/frmview.cxx |3 ++-
3 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 25e53d411097849ae9a00af40c6d786fa1daf2b6
Author: Gabor Kelemen
AuthorDate: Tue May 7 09:21:15 2024 +0200
Commit: Gabor Kelemen
CommitDate: Mon May 13 21:40:12 2024 +0200
Use less SdOptionsSnapItem->IsSnapPoints/SetSnapPoints
in favor of officecfg
Change-Id: I578fa667f3a21ebdfacb8602c009558a03facd97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167535
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index a45ba6fbf49a..597fe5705dd1 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -68,15 +68,16 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
officecfg::Office::Draw::Snap::Object::SnapLine::set(
m_xCbxSnapHelplines->get_active(), batch );
officecfg::Office::Draw::Snap::Object::PageMargin::set(
m_xCbxSnapBorder->get_active(), batch );
officecfg::Office::Draw::Snap::Object::ObjectFrame::set(
m_xCbxSnapFrame->get_active(), batch );
+officecfg::Office::Draw::Snap::Object::ObjectPoint::set(
m_xCbxSnapPoints->get_active(), batch );
}
else
{
officecfg::Office::Impress::Snap::Object::SnapLine::set(
m_xCbxSnapHelplines->get_active(), batch );
officecfg::Office::Impress::Snap::Object::PageMargin::set(
m_xCbxSnapBorder->get_active(), batch );
officecfg::Office::Impress::Snap::Object::ObjectFrame::set(
m_xCbxSnapFrame->get_active(), batch );
+officecfg::Office::Impress::Snap::Object::ObjectPoint::set(
m_xCbxSnapPoints->get_active(), batch );
}
-aOptsItem.GetOptionsSnap().SetSnapPoints( m_xCbxSnapPoints->get_active() );
aOptsItem.GetOptionsSnap().SetOrtho( m_xCbxOrtho->get_active() );
aOptsItem.GetOptionsSnap().SetBigOrtho( m_xCbxBigOrtho->get_active() );
aOptsItem.GetOptionsSnap().SetRotate( m_xCbxRotate->get_active() );
@@ -104,12 +105,14 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
m_xCbxSnapHelplines->set_active(
officecfg::Office::Draw::Snap::Object::SnapLine::get() );
m_xCbxSnapBorder->set_active(
officecfg::Office::Draw::Snap::Object::PageMargin::get() );
m_xCbxSnapFrame->set_active(
officecfg::Office::Draw::Snap::Object::ObjectFrame::get() );
+m_xCbxSnapPoints->set_active(
officecfg::Office::Draw::Snap::Object::ObjectPoint::get() );
}
else
{
m_xCbxSnapHelplines->set_active(
officecfg::Office::Impress::Snap::Object::SnapLine::get() );
m_xCbxSnapBorder->set_active(
officecfg::Office::Impress::Snap::Object::PageMargin::get() );
m_xCbxSnapFrame->set_active(
officecfg::Office::Impress::Snap::Object::ObjectFrame::get() );
+m_xCbxSnapPoints->set_active(
officecfg::Office::Impress::Snap::Object::ObjectPoint::get() );
}
bool bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::SnapLine::isReadOnly() :
@@ -129,7 +132,6 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::ObjectPoint::isReadOnly() :
officecfg::Office::Impress::Snap::Object::ObjectPoint::isReadOnly();
-m_xCbxSnapPoints->set_active( aOptsItem.GetOptionsSnap().IsSnapPoints() );
m_xCbxSnapPoints->set_sensitive(!bReadOnly);
m_xCbxSnapPointsImg->set_visible(bReadOnly);
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 36324d7c8909..94fc13e6c606 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -174,7 +174,10 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
case SID_SNAP_POINTS:
{
-pOptions->SetSnapPoints( !mpDrawView->IsOPntSnap() );
+if ( GetDoc()->GetDocumentType() == DocumentType::Impress )
+officecfg::Office::Impress::Snap::Object::ObjectPoint::set(
!mpDrawView->IsOPntSnap(), batch );
+else
+officecfg::Office::Draw::Snap::Object::ObjectPoint::set(
!mpDrawView->IsOPntSnap(), batch );
}
break;
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 7e9a8ec31ab8..dfb73b027b71 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -293,6 +293,7 @@ void FrameView::Update(SdOptions const * pOptions)
SetHlplVisible(
officecfg::Office::Impress::Layout::Display::Helpline::get() );
SetNoDragXorPolys (
!officecfg::Office::Impress::Layout::Display::Contour::get() );
SetOFrmSnap(
officecfg::Office::Impress::Snap::Object::ObjectFrame::get() );
+SetOPntSnap(
officecfg::Office::Impress::Snap::Obje
core.git: sd/source
sd/source/ui/dlg/tpoption.cxx |6 --
sd/source/ui/view/drviewsg.cxx |5 -
sd/source/ui/view/frmview.cxx |3 ++-
3 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit d9d699756125db28bd45d7c92d4c9c2dc243f418
Author: Gabor Kelemen
AuthorDate: Fri May 3 11:57:10 2024 +0200
Commit: Gabor Kelemen
CommitDate: Mon May 13 09:15:04 2024 +0200
Use less SdOptionsSnapItem->IsSnapFrame/SetSnapFrame
in favor of officecfg
Change-Id: Ia9d36f3c2d0f85250da6f3483176c551226164a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167534
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 2708d8d933fa..a45ba6fbf49a 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -67,14 +67,15 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
{
officecfg::Office::Draw::Snap::Object::SnapLine::set(
m_xCbxSnapHelplines->get_active(), batch );
officecfg::Office::Draw::Snap::Object::PageMargin::set(
m_xCbxSnapBorder->get_active(), batch );
+officecfg::Office::Draw::Snap::Object::ObjectFrame::set(
m_xCbxSnapFrame->get_active(), batch );
}
else
{
officecfg::Office::Impress::Snap::Object::SnapLine::set(
m_xCbxSnapHelplines->get_active(), batch );
officecfg::Office::Impress::Snap::Object::PageMargin::set(
m_xCbxSnapBorder->get_active(), batch );
+officecfg::Office::Impress::Snap::Object::ObjectFrame::set(
m_xCbxSnapFrame->get_active(), batch );
}
-aOptsItem.GetOptionsSnap().SetSnapFrame( m_xCbxSnapFrame->get_active() );
aOptsItem.GetOptionsSnap().SetSnapPoints( m_xCbxSnapPoints->get_active() );
aOptsItem.GetOptionsSnap().SetOrtho( m_xCbxOrtho->get_active() );
aOptsItem.GetOptionsSnap().SetBigOrtho( m_xCbxBigOrtho->get_active() );
@@ -102,11 +103,13 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
{
m_xCbxSnapHelplines->set_active(
officecfg::Office::Draw::Snap::Object::SnapLine::get() );
m_xCbxSnapBorder->set_active(
officecfg::Office::Draw::Snap::Object::PageMargin::get() );
+m_xCbxSnapFrame->set_active(
officecfg::Office::Draw::Snap::Object::ObjectFrame::get() );
}
else
{
m_xCbxSnapHelplines->set_active(
officecfg::Office::Impress::Snap::Object::SnapLine::get() );
m_xCbxSnapBorder->set_active(
officecfg::Office::Impress::Snap::Object::PageMargin::get() );
+m_xCbxSnapFrame->set_active(
officecfg::Office::Impress::Snap::Object::ObjectFrame::get() );
}
bool bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::SnapLine::isReadOnly() :
@@ -121,7 +124,6 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::ObjectFrame::isReadOnly() :
officecfg::Office::Impress::Snap::Object::ObjectFrame::isReadOnly();
-m_xCbxSnapFrame->set_active( aOptsItem.GetOptionsSnap().IsSnapFrame() );
m_xCbxSnapFrame->set_sensitive(!bReadOnly);
m_xCbxSnapFrameImg->set_visible(bReadOnly);
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 20a7814abbee..36324d7c8909 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -165,7 +165,10 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
case SID_SNAP_FRAME:
{
-pOptions->SetSnapFrame( !mpDrawView->IsOFrmSnap() );
+if ( GetDoc()->GetDocumentType() == DocumentType::Impress )
+
officecfg::Office::Impress::Snap::Object::ObjectFrame::set(!mpDrawView->IsOFrmSnap(),
batch);
+else
+
officecfg::Office::Draw::Snap::Object::ObjectFrame::set(!mpDrawView->IsOFrmSnap(),
batch);
}
break;
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index c252b6183a6a..7e9a8ec31ab8 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -292,6 +292,7 @@ void FrameView::Update(SdOptions const * pOptions)
SetHlplSnap( officecfg::Office::Impress::Snap::Object::SnapLine::get()
);
SetHlplVisible(
officecfg::Office::Impress::Layout::Display::Helpline::get() );
SetNoDragXorPolys (
!officecfg::Office::Impress::Layout::Display::Contour::get() );
+SetOFrmSnap(
officecfg::Office::Impress::Snap::Object::ObjectFrame::get() );
SetPlusHandlesAlwaysVisible(
officecfg::Office::Impress::Layout::Display::Bezier::get() );
}
else
@@ -302,13 +303,13 @@ void FrameView::Update(SdOptions const * pOptions)
SetHlplSnap( officecfg::Office::Draw::Snap::Object::SnapLine::get() );
SetHlplVisible(
officecfg::Office::Draw::Layout::Display::Helpline::get() );
SetNoDragXorPolys (
!officecfg::O
core.git: sd/source
sd/source/ui/dlg/tpoption.cxx |6 --
sd/source/ui/view/drviewsg.cxx |5 -
sd/source/ui/view/frmview.cxx |3 ++-
3 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 3df9a50322dc9f24c87d0095316aadf1ad09ec3e
Author: Gabor Kelemen
AuthorDate: Fri May 3 11:41:49 2024 +0200
Commit: Gabor Kelemen
CommitDate: Sun May 12 21:18:01 2024 +0200
Use less SdOptionsSnapItem->IsSnapBorder/SetSnapBorder
in favor of officecfg
Change-Id: Iaa6801ef773de7d3dcb1f08d4eac4a4f62ac656b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167533
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 1a2bfee07646..2708d8d933fa 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -66,13 +66,14 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
if (bDrawMode)
{
officecfg::Office::Draw::Snap::Object::SnapLine::set(
m_xCbxSnapHelplines->get_active(), batch );
+officecfg::Office::Draw::Snap::Object::PageMargin::set(
m_xCbxSnapBorder->get_active(), batch );
}
else
{
officecfg::Office::Impress::Snap::Object::SnapLine::set(
m_xCbxSnapHelplines->get_active(), batch );
+officecfg::Office::Impress::Snap::Object::PageMargin::set(
m_xCbxSnapBorder->get_active(), batch );
}
-aOptsItem.GetOptionsSnap().SetSnapBorder( m_xCbxSnapBorder->get_active() );
aOptsItem.GetOptionsSnap().SetSnapFrame( m_xCbxSnapFrame->get_active() );
aOptsItem.GetOptionsSnap().SetSnapPoints( m_xCbxSnapPoints->get_active() );
aOptsItem.GetOptionsSnap().SetOrtho( m_xCbxOrtho->get_active() );
@@ -100,10 +101,12 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
if (bDrawMode)
{
m_xCbxSnapHelplines->set_active(
officecfg::Office::Draw::Snap::Object::SnapLine::get() );
+m_xCbxSnapBorder->set_active(
officecfg::Office::Draw::Snap::Object::PageMargin::get() );
}
else
{
m_xCbxSnapHelplines->set_active(
officecfg::Office::Impress::Snap::Object::SnapLine::get() );
+m_xCbxSnapBorder->set_active(
officecfg::Office::Impress::Snap::Object::PageMargin::get() );
}
bool bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::SnapLine::isReadOnly() :
@@ -113,7 +116,6 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::PageMargin::isReadOnly() :
officecfg::Office::Impress::Snap::Object::PageMargin::isReadOnly();
-m_xCbxSnapBorder->set_active( aOptsItem.GetOptionsSnap().IsSnapBorder() );
m_xCbxSnapBorder->set_sensitive(!bReadOnly);
m_xCbxSnapBorderImg->set_visible(bReadOnly);
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index e256ef926172..20a7814abbee 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -156,7 +156,10 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
case SID_SNAP_BORDER:
{
-pOptions->SetSnapBorder( !mpDrawView->IsBordSnap() );
+if ( GetDoc()->GetDocumentType() == DocumentType::Impress )
+officecfg::Office::Impress::Snap::Object::PageMargin::set(
!mpDrawView->IsBordSnap(), batch );
+else
+officecfg::Office::Draw::Snap::Object::PageMargin::set(
!mpDrawView->IsBordSnap(), batch );
}
break;
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index ad500cfb4eed..c252b6183a6a 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();
+SetBordSnap(
officecfg::Office::Impress::Snap::Object::PageMargin::get() );
SetDragStripes(
officecfg::Office::Impress::Layout::Display::Guide::get() );
SetHlplSnap( officecfg::Office::Impress::Snap::Object::SnapLine::get()
);
SetHlplVisible(
officecfg::Office::Impress::Layout::Display::Helpline::get() );
@@ -296,6 +297,7 @@ void FrameView::Update(SdOptions const * pOptions)
else
{
mbRuler = officecfg::Office::Draw::Layout::Display::Ruler::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() );
SetHlplVisible(
officecfg::Office::Draw::Layout::Display::Helpline::get() );
@@ -306,7 +308,6 @@ void FrameView::Update(SdOptions const * pOptions)
SetGridVisible( pOptions->IsGridVisible() );
SetSnapAngle( pOptions->GetAngle() );
SetGridSn
core.git: sd/source
sd/source/ui/dlg/tpoption.cxx | 25 +++--
sd/source/ui/view/drviewsg.cxx |5 -
sd/source/ui/view/frmview.cxx |3 ++-
3 files changed, 29 insertions(+), 4 deletions(-)
New commits:
commit c24f8262c884d9587ca40f3abb6b1a760c6522da
Author: Gabor Kelemen
AuthorDate: Fri May 3 11:27:31 2024 +0200
Commit: Gabor Kelemen
CommitDate: Sun May 12 13:17:56 2024 +0200
Use less SdOptionsSnapItem->IsSnapHelplines/SetSnapHelplines
in favor of officecfg
Change-Id: I3f9d62380449c888b47020b4ffc765e9e8aa36ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167532
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index fb16a14bebaf..1a2bfee07646 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -58,8 +58,20 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
{
SvxGridTabPage::FillItemSet(rAttrs);
SdOptionsSnapItem aOptsItem;
+bool bDrawMode = SvxGridTabPage::IsDrawMode();
+
+std::shared_ptr batch(
+comphelper::ConfigurationChanges::create());
+
+if (bDrawMode)
+{
+officecfg::Office::Draw::Snap::Object::SnapLine::set(
m_xCbxSnapHelplines->get_active(), batch );
+}
+else
+{
+officecfg::Office::Impress::Snap::Object::SnapLine::set(
m_xCbxSnapHelplines->get_active(), batch );
+}
-aOptsItem.GetOptionsSnap().SetSnapHelplines(
m_xCbxSnapHelplines->get_active() );
aOptsItem.GetOptionsSnap().SetSnapBorder( m_xCbxSnapBorder->get_active() );
aOptsItem.GetOptionsSnap().SetSnapFrame( m_xCbxSnapFrame->get_active() );
aOptsItem.GetOptionsSnap().SetSnapPoints( m_xCbxSnapPoints->get_active() );
@@ -71,6 +83,7 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs )
aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle(Degree100(m_xMtrFldBezAngle->get_value(FieldUnit::DEGREE)));
rAttrs->Put( aOptsItem );
+batch->commit();
// we get a possible existing GridItem, this ensures that we do not set
// some default values by accident
@@ -84,9 +97,17 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
SdOptionsSnapItem aOptsItem( rAttrs->Get( ATTR_OPTIONS_SNAP ) );
bool bDrawMode = SvxGridTabPage::IsDrawMode();
+if (bDrawMode)
+{
+m_xCbxSnapHelplines->set_active(
officecfg::Office::Draw::Snap::Object::SnapLine::get() );
+}
+else
+{
+m_xCbxSnapHelplines->set_active(
officecfg::Office::Impress::Snap::Object::SnapLine::get() );
+}
+
bool bReadOnly = bDrawMode ?
officecfg::Office::Draw::Snap::Object::SnapLine::isReadOnly() :
officecfg::Office::Impress::Snap::Object::SnapLine::isReadOnly();
-m_xCbxSnapHelplines->set_active(
aOptsItem.GetOptionsSnap().IsSnapHelplines() );
m_xCbxSnapHelplines->set_sensitive(!bReadOnly);
m_xCbxSnapHelplinesImg->set_visible(bReadOnly);
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 33cb8391..e256ef926172 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -138,7 +138,10 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
case SID_HELPLINES_USE:
{
-pOptions->SetSnapHelplines( !mpDrawView->IsHlplSnap() );
+if (GetDoc()->GetDocumentType() == DocumentType::Impress)
+
officecfg::Office::Impress::Snap::Object::SnapLine::set(!mpDrawView->IsHlplSnap(),
batch);
+else
+
officecfg::Office::Draw::Snap::Object::SnapLine::set(!mpDrawView->IsHlplSnap(),
batch);
}
break;
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 1116f7d791f3..ad500cfb4eed 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -288,6 +288,7 @@ void FrameView::Update(SdOptions const * pOptions)
{
mbRuler = officecfg::Office::Impress::Layout::Display::Ruler::get();
SetDragStripes(
officecfg::Office::Impress::Layout::Display::Guide::get() );
+SetHlplSnap( officecfg::Office::Impress::Snap::Object::SnapLine::get()
);
SetHlplVisible(
officecfg::Office::Impress::Layout::Display::Helpline::get() );
SetNoDragXorPolys (
!officecfg::Office::Impress::Layout::Display::Contour::get() );
SetPlusHandlesAlwaysVisible(
officecfg::Office::Impress::Layout::Display::Bezier::get() );
@@ -296,6 +297,7 @@ void FrameView::Update(SdOptions const * pOptions)
{
mbRuler = officecfg::Office::Draw::Layout::Display::Ruler::get();
SetDragStripes( officecfg::Office::Draw::Layout::Display::Guide::get()
);
+SetHlplSnap( officecfg::Office::Draw::Snap::Object::SnapLine::get() );
SetHlplVisible(
officecfg::Office::Draw::Layout::Display::Helpline::get() );
SetNoDrag
core.git: compilerplugins/clang sd/source
compilerplugins/clang/mergeclasses.results |1
sd/source/ui/app/optsitem.cxx | 55 -
sd/source/ui/inc/optsitem.hxx | 23
3 files changed, 1 insertion(+), 78 deletions(-)
New commits:
commit c2ec1708ea58cb723c9dc2f35683dc2f318136d3
Author: Gabor Kelemen
AuthorDate: Thu Apr 25 10:24:13 2024 +0200
Commit: Gabor Kelemen
CommitDate: Sat May 11 21:09:01 2024 +0200
Drop now unused SdOptionsZoom class
Change-Id: I73100a18f9edb37bb93b7612e7e34fdf510a5308
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166630
Reviewed-by: Gabor Kelemen
Tested-by: Jenkins
diff --git a/compilerplugins/clang/mergeclasses.results
b/compilerplugins/clang/mergeclasses.results
index 1801fcd073af..00f3238b0bb0 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -177,7 +177,6 @@ merge SceneObject with (anonymous namespace)::Iris
maybe merge SdImportTestSkia with testTdf156856, in modules sd and workdir
merge SdNavigatorWin with sd::sidebar::NavigatorWrapper
merge SdOptionsGrid with SdOptions
-merge SdOptionsZoom with SdOptions
merge SdTransferable::UserData with
sd::slidesorter::controller::TransferableData
merge SdUnoSearchReplaceShape with SdGenericDrawPage
merge SdrCreateView with SdrView
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 2ad6448099fc..ac67a935e16d 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -680,59 +680,6 @@ void SdOptionsSnapItem::SetOptions( SdOptions* pOpts )
const
pOpts->SetEliminatePolyPointLimitAngle(
maOptionsSnap.GetEliminatePolyPointLimitAngle() );
}
-/*
-|*
-|* SdOptionsZoom
-|*
-\/
-
-SdOptionsZoom::SdOptionsZoom( bool bImpress ) :
-SdOptionsGeneric( bImpress, bImpress ?
- OUString() :
- OUString("Office.Draw/Zoom") ),
-nX( 1 ),
-nY( 1 )
-
-{
-EnableModify( true );
-}
-
-void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount
) const
-{
-static const char* aPropNames[] =
-{
-"ScaleX",
-"ScaleY"
-};
-
-rCount = !IsImpress() ? SAL_N_ELEMENTS(aPropNames) : 0;
-ppNames = aPropNames;
-}
-
-bool SdOptionsZoom::ReadData( const Any* pValues )
-{
-sal_Int32 x = 1, y = 1;
-
-if( pValues[0].hasValue() ) x = *o3tl::doAccess(pValues[ 0 ]);
-if( pValues[1].hasValue() ) y = *o3tl::doAccess(pValues[ 1 ]);
-
-SetScale( x, y );
-
-return true;
-}
-
-bool SdOptionsZoom::WriteData( Any* pValues ) const
-{
-sal_Int32 x, y;
-
-GetScale( x, y );
-
-pValues[ 0 ] <<= x;
-pValues[ 1 ] <<= y;
-
-return true;
-}
-
/*
|*
|* SdOptionsGrid
@@ -1136,7 +1083,6 @@ void SdOptionsPrintItem::SetOptions( SdOptions* pOpts )
const
SdOptions::SdOptions(bool bImpress) :
SdOptionsMisc( bImpress, true ),
SdOptionsSnap( bImpress, true ),
-SdOptionsZoom( bImpress ),
SdOptionsGrid( bImpress ),
SdOptionsPrint( bImpress, true )
{
@@ -1150,7 +1096,6 @@ void SdOptions::StoreConfig()
{
SdOptionsMisc::Store();
SdOptionsSnap::Store();
-SdOptionsZoom::Store();
SdOptionsGrid::Store();
SdOptionsPrint::Store();
}
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 7e02cb2ceb4b..403c7b88e312 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -321,27 +321,6 @@ private:
SdOptionsSnap maOptionsSnap;
};
-class SdOptionsZoom : public SdOptionsGeneric
-{
-private:
-
-sal_Int32 nX; // Zoom/ScaleX
-sal_Int32 nY; // Zoom/ScaleY
-
-protected:
-
-virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
const override;
-virtual bool ReadData( const css::uno::Any* pValues ) override;
-virtual bool WriteData( css::uno::Any* pValues ) const override;
-
-public:
-
-explicit SdOptionsZoom(bool bImpress);
-
-voidGetScale( sal_Int32& rX, sal_Int32& rY ) const { Init(); rX = nX;
rY = nY; }
-voidSetScale( sal_Int32 nInX, sal_Int32 nInY ) { if( nX != nInX || nY
!= nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } }
-};
-
class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid
{
protected:
@@ -488,7 +467,7 @@ private:
class SdOptions final :
public SdOptionsMisc, public SdOptionsSnap,
- public SdOptionsZoom, public SdOptionsGrid,
+ public SdOptionsGrid,
public SdOptionsPrint
{
public:
core.git: bin/find-can-be-private-symbols.functions.results compilerplugins/clang sd/inc sd/source
bin/find-can-be-private-symbols.functions.results |5
compilerplugins/clang/unusedmethods.results |2
sd/inc/sdattr.hrc |2
sd/source/ui/app/optsitem.cxx | 161 --
sd/source/ui/app/sdmod2.cxx |9 -
sd/source/ui/inc/optsitem.hxx | 59
6 files changed, 2 insertions(+), 236 deletions(-)
New commits:
commit 9921b0b99aae17e15eb5daf56f0c3125f725a547
Author: Gabor Kelemen
AuthorDate: Wed Apr 24 17:49:35 2024 +0200
Commit: Gabor Kelemen
CommitDate: Sat May 11 09:01:58 2024 +0200
Drop now unused SdOptionsLayout, SdOptionsLayoutItem classes
Change-Id: I5d4e77f8377eead4581f590a4cc160a3fa97e2a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166601
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/bin/find-can-be-private-symbols.functions.results
b/bin/find-can-be-private-symbols.functions.results
index dd3bb5ba4b4c..332b99ad4cd3 100644
--- a/bin/find-can-be-private-symbols.functions.results
+++ b/bin/find-can-be-private-symbols.functions.results
@@ -2724,11 +2724,6 @@ SdOptionsLayout::ReadData(com::sun::star::uno::Any
const*)
SdOptionsLayout::SdOptionsLayout(bool, bool)
SdOptionsLayout::WriteData(com::sun::star::uno::Any*) const
SdOptionsLayout::operator==(SdOptionsLayout const&) const
-SdOptionsLayoutItem::Clone(SfxItemPool*) const
-SdOptionsLayoutItem::SdOptionsLayoutItem()
-SdOptionsLayoutItem::SdOptionsLayoutItem(SdOptions const*, sd::FrameView
const*)
-SdOptionsLayoutItem::SetOptions(SdOptions*) const
-SdOptionsLayoutItem::operator==(SfxPoolItem const&) const
SdOptionsMisc::GetDisplay() const
SdOptionsMisc::GetDragThresholdPixels() const
SdOptionsMisc::GetPropNameArray(char const**&, unsigned long&) const
diff --git a/compilerplugins/clang/unusedmethods.results
b/compilerplugins/clang/unusedmethods.results
index be4adf18f3be..8fe388967ee5 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -1234,8 +1234,6 @@ include/svl/typedwhich.hxx:31
TypedWhichId::TypedWhichId(TypedWhichId,typename
enable_if, int>::type)
include/svl/typedwhich.hxx:31
TypedWhichId::TypedWhichId(TypedWhichId,typename
enable_if, int>::type)
-include/svl/typedwhich.hxx:31
- TypedWhichId::TypedWhichId(TypedWhichId,typename
enable_if, int>::type)
include/svl/typedwhich.hxx:31
TypedWhichId::TypedWhichId(TypedWhichId,typename
enable_if, int>::type)
include/svl/typedwhich.hxx:31
diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index 409838dea996..35f53e47ca9d 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
@@ -100,7 +100,7 @@ class XColorItem;
#define ATTR_SNAPLINE_END ATTR_SNAPLINE_Y
#define ATTR_OPTIONS_START ATTR_SNAPLINE_END + 1
-#define ATTR_OPTIONS_LAYOUT
TypedWhichId(ATTR_OPTIONS_START + 1)
+#define ATTR_OPTIONS_LAYOUT ATTR_OPTIONS_START + 1
#define ATTR_OPTIONS_MISC
TypedWhichId(ATTR_OPTIONS_START + 2)
#define ATTR_OPTIONS_SNAP
TypedWhichId(ATTR_OPTIONS_START + 3)
#define ATTR_OPTIONS_PRINT
TypedWhichId(ATTR_OPTIONS_START + 4)
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 5f93655f1fb1..2ad6448099fc 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -177,165 +177,6 @@ bool SdOptionsGeneric::isMetricSystem()
return ( eSys == MeasurementSystem::Metric );
}
-/*
-|*
-|* SdOptionsLayout
-|*
-\/
-
-SdOptionsLayout::SdOptionsLayout(bool bImpress, bool bUseConfig) :
-SdOptionsGeneric( bImpress, bUseConfig ?
- ( bImpress ?
-OUString( "Office.Impress/Layout" ) :
-OUString( "Office.Draw/Layout" ) ) :
- OUString() ),
-bRuler( true ),
-bMoveOutline( true ),
-bDragStripes( false ),
-bHandlesBezier( false ),
-bHelplines( true ),
-nMetric(static_cast(isMetricSystem() ? FieldUnit::CM :
FieldUnit::INCH)),
-nDefTab( 1250 )
-{
-EnableModify( true );
-}
-
-bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const
-{
-return( IsRulerVisible() == rOpt.IsRulerVisible() &&
-IsMoveOutline() == rOpt.IsMoveOutline() &&
-IsDragStripes() == rOpt.IsDragStripes() &&
-IsHandlesBezier() == rOpt.IsHandlesBezier() &&
-IsHelplines() == rOpt.IsHelplines() &&
-GetMetric() == rOpt.GetMetric() &&
-GetDefTab() == rOpt.GetDefTab() );
-}
-
-void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong&
rCount ) const
-{
-if( isMet
core.git: sd/source
sd/source/core/drawdoc.cxx |3 ++-
sd/source/ui/app/sdmod2.cxx | 10 --
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit edcfc1ba8ea4159c3c6f24b43f65ffe0b7b897a3
Author: Gabor Kelemen
AuthorDate: Thu Apr 25 10:21:21 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri May 10 14:11:23 2024 +0200
Use less SdOptionsZoom->GetScale/SetScale in favor of officecfg
Change-Id: I34fca9ba9546f10268d22f92aaa5249d88f607d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166629
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 55e3a1fe6240..237deadabd30 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -158,7 +158,8 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
// Set measuring unit (of the application) and scale (of SdMod)
sal_Int32 nX, nY;
SdOptions* pOptions = SD_MOD()->GetSdOptions(meDocType);
-pOptions->GetScale( nX, nY );
+nX = officecfg::Office::Draw::Zoom::ScaleX::get();
+nY = officecfg::Office::Draw::Zoom::ScaleY::get();
SvtSysLocale aSysLocale;
// Allow UI scale only for draw documents.
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 7e98287c2bc7..a30c4f303016 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -543,7 +543,8 @@ std::optional SdModule::CreateItemSet(
sal_uInt16 nSlot )
else
{
// Get options from configuration file
-pOptions->GetScale( nX, nY );
+nX = officecfg::Office::Draw::Zoom::ScaleX::get();
+nY = officecfg::Office::Draw::Zoom::ScaleY::get();
}
aRet.Put( SfxInt32Item( ATTR_OPTIONS_SCALE_X, nX ) );
@@ -660,7 +661,12 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const
SfxItemSet& rSet )
if( pItem )
{
sal_Int32 nY = pItem->GetValue();
-pOptions->SetScale( nX, nY );
+std::shared_ptr batch(
+comphelper::ConfigurationChanges::create());
+
+officecfg::Office::Draw::Zoom::ScaleX::set(nX, batch);
+officecfg::Office::Draw::Zoom::ScaleY::set(nY, batch);
+batch->commit();
// Apply to document only if doc type match
if( pDocSh && pDoc && eDocType == pDoc->GetDocumentType() )
core.git: sd/source
sd/source/core/drawdoc.cxx | 14 +---
sd/source/ui/app/sdmod2.cxx | 49 ++--
2 files changed, 54 insertions(+), 9 deletions(-)
New commits:
commit dd8cf8a3f061d77ed7781a8b591cee86067ab973
Author: Gabor Kelemen
AuthorDate: Wed Apr 24 12:54:26 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri May 10 14:11:06 2024 +0200
Use less SdOptionsLayout->Get/SetDefTab in favor of officecfg
Change-Id: I028790b7e5750893f38ef7775cac1671104cd603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166600
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index b759f9b4e883..55e3a1fe6240 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -171,7 +171,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
if (aSysLocale.GetLocaleData().getMeasurementSystemEnum() ==
MeasurementSystem::Metric)
SetUIUnit(
static_cast(officecfg::Office::Impress::Layout::Other::MeasureUnit::Metric::get()),
Fraction( 1, 1 ) );// default
else
-SetUIUnit(
static_cast(officecfg::Office::Impress::Layout::Other::MeasureUnit::NonMetric::get()),
Fraction( 1, 1 ) );// default
+SetUIUnit(
static_cast(officecfg::Office::Impress::Layout::Other::MeasureUnit::NonMetric::get()),
Fraction( 1, 1 ) );// default
SetScaleUnit(MapUnit::Map100thMM);
SetDefaultFontHeight(o3tl::convert(24, o3tl::Length::pt,
o3tl::Length::mm100));
@@ -219,8 +219,16 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
}
// Set DefTab and SpellOptions for the SD module
-sal_uInt16 nDefTab = pOptions->GetDefTab();
-SetDefaultTabulator( nDefTab );
+if (eType == DocumentType::Impress)
+if (aSysLocale.GetLocaleData().getMeasurementSystemEnum() ==
MeasurementSystem::Metric)
+SetDefaultTabulator(
static_cast(officecfg::Office::Impress::Layout::Other::TabStop::Metric::get())
);
+else
+SetDefaultTabulator(
static_cast(officecfg::Office::Impress::Layout::Other::TabStop::NonMetric::get())
);
+else
+if (aSysLocale.GetLocaleData().getMeasurementSystemEnum() ==
MeasurementSystem::Metric)
+SetDefaultTabulator(
static_cast(officecfg::Office::Draw::Layout::Other::TabStop::Metric::get())
);
+else
+SetDefaultTabulator(
static_cast(officecfg::Office::Draw::Layout::Other::TabStop::NonMetric::get())
);
try
{
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index c33ea3c3f5a8..7e98287c2bc7 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -466,14 +466,28 @@ std::optional SdModule::CreateItemSet(
sal_uInt16 nSlot )
aRet.Put( SdOptionsLayoutItem( pOptions, pFrameView ) );
sal_uInt16 nDefTab = 0;
+SvtSysLocale aSysLocale;
+
if( pFrameView)
nDefTab = pDoc->GetDefaultTabulator();
else
-nDefTab = pOptions->GetDefTab();
+{
+if (eDocType == DocumentType::Impress)
+if (aSysLocale.GetLocaleData().getMeasurementSystemEnum() ==
MeasurementSystem::Metric)
+nDefTab =
officecfg::Office::Impress::Layout::Other::TabStop::Metric::get();
+else
+nDefTab =
officecfg::Office::Impress::Layout::Other::TabStop::NonMetric::get();
+else
+if (aSysLocale.GetLocaleData().getMeasurementSystemEnum() ==
MeasurementSystem::Metric)
+nDefTab =
officecfg::Office::Draw::Layout::Other::TabStop::Metric::get();
+else
+nDefTab =
officecfg::Office::Draw::Layout::Other::TabStop::NonMetric::get();
+}
+
aRet.Put( SfxUInt16Item( SID_ATTR_DEFTABSTOP, nDefTab ) );
FieldUnit nMetric = FieldUnit(0x);
-SvtSysLocale aSysLocale;
+
if( pFrameView)
nMetric = pDoc->GetUIUnit();
else
@@ -551,6 +565,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const
SfxItemSet& rSet )
bool bNewDefTab = false;
bool bNewPrintOptions = false;
bool bMiscOptions = false;
+SvtSysLocale aSysLocale;
::sd::DrawDocShell* pDocSh = dynamic_cast< ::sd::DrawDocShell *>(
SfxObjectShell::Current() );
SdDrawDocument* pDoc = nullptr;
@@ -588,7 +603,6 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const
SfxItemSet& rSet )
if( pDoc && eDocType == pDoc->GetDocumentType() )
PutItem( *pItem );
-SvtSysLocale aSysLocale;
std::shared_ptr batch(
comphelper::ConfigurationChanges::create());
if (eDocType == DocumentType::Impress)
@@ -604,12 +618,36 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const
SfxItemSet& rSet )
batch->commit();
}
-sal_uInt16 nDefTab = pOptions->GetDefTab();
+sal_uInt16 n
core.git: sd/source
sd/source/ui/view/drviewsg.cxx |5 -
sd/source/ui/view/frmview.cxx |3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 58a9c936bb065384d50e122ee2ac9037dd60cc32
Author: Gabor Kelemen
AuthorDate: Wed Apr 24 09:13:31 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri May 10 09:33:49 2024 +0200
Use less SdOptionsLayout->IsHelplines/SetHelplines in favor of officecfg
Change-Id: Ic6d0c80a4f95a08d969b8400704f25fc50147ad5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166599
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 7dfd06e2177c..33cb8391 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -129,7 +129,10 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
case SID_HELPLINES_VISIBLE: // not here yet!
{
-pOptions->SetHelplines( !mpDrawView->IsHlplVisible() );
+if ( GetDoc()->GetDocumentType() == DocumentType::Impress )
+
officecfg::Office::Impress::Layout::Display::Guide::set(!mpDrawView->IsHlplVisible(),
batch);
+else
+
officecfg::Office::Draw::Layout::Display::Guide::set(!mpDrawView->IsHlplVisible(),
batch);
}
break;
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 250a088bffb1..1116f7d791f3 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -288,6 +288,7 @@ void FrameView::Update(SdOptions const * pOptions)
{
mbRuler = officecfg::Office::Impress::Layout::Display::Ruler::get();
SetDragStripes(
officecfg::Office::Impress::Layout::Display::Guide::get() );
+SetHlplVisible(
officecfg::Office::Impress::Layout::Display::Helpline::get() );
SetNoDragXorPolys (
!officecfg::Office::Impress::Layout::Display::Contour::get() );
SetPlusHandlesAlwaysVisible(
officecfg::Office::Impress::Layout::Display::Bezier::get() );
}
@@ -295,6 +296,7 @@ void FrameView::Update(SdOptions const * pOptions)
{
mbRuler = officecfg::Office::Draw::Layout::Display::Ruler::get();
SetDragStripes( officecfg::Office::Draw::Layout::Display::Guide::get()
);
+SetHlplVisible(
officecfg::Office::Draw::Layout::Display::Helpline::get() );
SetNoDragXorPolys (
!officecfg::Office::Draw::Layout::Display::Contour::get() );
SetPlusHandlesAlwaysVisible(
officecfg::Office::Draw::Layout::Display::Bezier::get() );
}
@@ -306,7 +308,6 @@ void FrameView::Update(SdOptions const * pOptions)
SetHlplSnap( pOptions->IsSnapHelplines() );
SetOFrmSnap( pOptions->IsSnapFrame() );
SetOPntSnap( pOptions->IsSnapPoints() );
-SetHlplVisible( pOptions->IsHelplines() );
SetSnapMagneticPixel( pOptions->GetSnapArea() );
SetMarkedHitMovesAlways( pOptions->IsMarkedHitMovesAlways() );
SetMoveOnlyDragging( pOptions->IsMoveOnlyDragging() );
core.git: sd/source
sd/source/ui/view/frmview.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5ce5ffe817479faecf7889d0024e91c8a2ad6a2c
Author: Gabor Kelemen
AuthorDate: Wed Apr 24 09:08:37 2024 +0200
Commit: Thorsten Behrens
CommitDate: Thu May 9 00:31:09 2024 +0200
Use less SdOptionsLayout->IsHandlesBezier in favor of officecfg
Change-Id: Id2f005413f255b4a0f0e0cd240cb8700c27ee204
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166598
Reviewed-by: Thorsten Behrens
Tested-by: Jenkins
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 1fa0c4eba45d..250a088bffb1 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -289,12 +289,14 @@ void FrameView::Update(SdOptions const * pOptions)
mbRuler = officecfg::Office::Impress::Layout::Display::Ruler::get();
SetDragStripes(
officecfg::Office::Impress::Layout::Display::Guide::get() );
SetNoDragXorPolys (
!officecfg::Office::Impress::Layout::Display::Contour::get() );
+SetPlusHandlesAlwaysVisible(
officecfg::Office::Impress::Layout::Display::Bezier::get() );
}
else
{
mbRuler = officecfg::Office::Draw::Layout::Display::Ruler::get();
SetDragStripes( officecfg::Office::Draw::Layout::Display::Guide::get()
);
SetNoDragXorPolys (
!officecfg::Office::Draw::Layout::Display::Contour::get() );
+SetPlusHandlesAlwaysVisible(
officecfg::Office::Draw::Layout::Display::Bezier::get() );
}
SetGridVisible( pOptions->IsGridVisible() );
@@ -305,7 +307,6 @@ void FrameView::Update(SdOptions const * pOptions)
SetOFrmSnap( pOptions->IsSnapFrame() );
SetOPntSnap( pOptions->IsSnapPoints() );
SetHlplVisible( pOptions->IsHelplines() );
-SetPlusHandlesAlwaysVisible( pOptions->IsHandlesBezier() );
SetSnapMagneticPixel( pOptions->GetSnapArea() );
SetMarkedHitMovesAlways( pOptions->IsMarkedHitMovesAlways() );
SetMoveOnlyDragging( pOptions->IsMoveOnlyDragging() );
core.git: sd/source
sd/source/core/drawdoc.cxx | 14 +++-
sd/source/ui/app/sdmod.cxx | 12 ---
sd/source/ui/app/sdmod1.cxx | 36 -
sd/source/ui/app/sdmod2.cxx | 48 +---
4 files changed, 88 insertions(+), 22 deletions(-)
New commits:
commit 055e7d866680390dca6e18864ca4297cc0ebda84
Author: Gabor Kelemen
AuthorDate: Tue Apr 23 20:04:43 2024 +0200
Commit: Thorsten Behrens
CommitDate: Thu May 9 00:30:52 2024 +0200
Use less SdOptionsLayout->GetMetric/SetMetric in favor of officecfg
Change-Id: I12c9f69e0db1bf3e726b7d642e9a6855b031d3b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166597
Reviewed-by: Thorsten Behrens
Tested-by: Jenkins
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 5def1937684d..b759f9b4e883 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
#include
@@ -53,6 +54,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -156,12 +159,19 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
sal_Int32 nX, nY;
SdOptions* pOptions = SD_MOD()->GetSdOptions(meDocType);
pOptions->GetScale( nX, nY );
+SvtSysLocale aSysLocale;
// Allow UI scale only for draw documents.
if( eType == DocumentType::Draw )
-SetUIUnit( static_cast(pOptions->GetMetric()), Fraction(
nX, nY ) ); // user-defined
+if (aSysLocale.GetLocaleData().getMeasurementSystemEnum() ==
MeasurementSystem::Metric)
+SetUIUnit(
static_cast(officecfg::Office::Draw::Layout::Other::MeasureUnit::Metric::get()),
Fraction( nX, nY ) ); // user-defined
+else
+SetUIUnit(
static_cast(officecfg::Office::Draw::Layout::Other::MeasureUnit::NonMetric::get()),
Fraction( nX, nY ) ); // user-defined
else
-SetUIUnit( static_cast(pOptions->GetMetric()), Fraction( 1,
1 ) );// default
+if (aSysLocale.GetLocaleData().getMeasurementSystemEnum() ==
MeasurementSystem::Metric)
+SetUIUnit(
static_cast(officecfg::Office::Impress::Layout::Other::MeasureUnit::Metric::get()),
Fraction( 1, 1 ) );// default
+else
+SetUIUnit(
static_cast(officecfg::Office::Impress::Layout::Other::MeasureUnit::NonMetric::get()),
Fraction( 1, 1 ) );// default
SetScaleUnit(MapUnit::Map100thMM);
SetDefaultFontHeight(o3tl::convert(24, o3tl::Length::pt,
o3tl::Length::mm100));
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index f18dd647a209..d534fe51aa23 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -141,18 +141,6 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType)
pOptions = pImpressOptions;
}
-if( pOptions )
-{
-sal_uInt16 nMetric = pOptions->GetMetric();
-
-::sd::DrawDocShell* pDocSh = dynamic_cast< ::sd::DrawDocShell *>(
SfxObjectShell::Current() );
-SdDrawDocument* pDoc = nullptr;
-if (pDocSh)
-pDoc = pDocSh->GetDoc();
-
-if( nMetric != 0x && pDoc && eDocType == pDoc->GetDocumentType() )
-PutItem( SfxUInt16Item( SID_ATTR_METRIC, nMetric ) );
-}
return pOptions;
}
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 14f507fb1a1d..023e44a7c1e6 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -21,7 +21,9 @@
#include
#include
#include
+#include
#include
+#include
#include
#include
#include
@@ -53,6 +55,9 @@
#include
#include
+#include
+#include
+
using ::sd::framework::FrameworkHelper;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::frame::XFrame;
@@ -126,9 +131,21 @@ void SdModule::Execute(SfxRequest& rReq)
DocumentType eDocType =
pDocSh->GetDoc()->GetDocumentType();
PutItem( *pItem );
-SdOptions* pOptions = GetSdOptions( eDocType );
-if(pOptions)
-pOptions->SetMetric(
static_cast(eUnit) );
+SvtSysLocale aSysLocale;
+
std::shared_ptr batch(
+
comphelper::ConfigurationChanges::create());
+
+if (eDocType == DocumentType::Impress)
+if
(aSysLocale.GetLocaleData().getMeasurementSystemEnum() ==
MeasurementSystem::Metric)
+
officecfg::Office::Impress::Layout::Other::MeasureUnit::Metric::set(static_cast(eUnit),
batch);
+else
+
officecfg::Office::Impress::L
core.git: sd/source
sd/source/core/CustomAnimationPreset.cxx | 12 ++--
sd/source/core/TransitionPreset.cxx | 13 ++---
2 files changed, 4 insertions(+), 21 deletions(-)
New commits:
commit a83b7cd01cb804d6138b4ca7de0e1d7a8abfe31d
Author: Gabor Kelemen
AuthorDate: Fri Apr 26 16:04:09 2024 +0200
Commit: Gabor Kelemen
CommitDate: Sun Apr 28 17:10:31 2024 +0200
Use less ConfigurationAccess in favor of officecfg
Change-Id: I9bb0165aabb0d5ff2caac33ec948a04d96eb3316
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166756
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/core/CustomAnimationPreset.cxx
b/sd/source/core/CustomAnimationPreset.cxx
index 1d63b5d217b9..8c4a3dcfc927 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
#include
#include
@@ -252,17 +253,8 @@ void CustomAnimationPresets::importEffects()
configuration::theDefaultProvider::get( xContext );
// read path to transition effects files from config
-uno::Sequence aArgs(comphelper::InitAnyPropertySequence(
-{
-{"nodepath",
uno::Any(OUString("/org.openoffice.Office.Impress/Misc"))}
-}));
-Reference xNameAccess(
-xConfigProvider->createInstanceWithArguments(
-"com.sun.star.configuration.ConfigurationAccess",
-aArgs ), UNO_QUERY_THROW );
uno::Sequence< OUString > aFiles;
-xNameAccess->getByName( "EffectFiles" ) >>= aFiles;
-
+aFiles = officecfg::Office::Impress::Misc::EffectFiles::get();
for (const auto& rFile : aFiles)
{
OUString aURL = comphelper::getExpandedUri(xContext, rFile);
diff --git a/sd/source/core/TransitionPreset.cxx
b/sd/source/core/TransitionPreset.cxx
index 03adee6e79ff..b92f9ce5ca18 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
@@ -329,18 +330,8 @@ bool TransitionPreset::importTransitionPresetList(
TransitionPresetList& rList )
configuration::theDefaultProvider::get( xContext );
// read path to transition effects files from config
-uno::Sequence aArgs(comphelper::InitAnyPropertySequence(
-{
-{"nodepath",
uno::Any(OUString("/org.openoffice.Office.Impress/Misc"))}
-}));
-Reference xNameAccess(
-xConfigProvider->createInstanceWithArguments(
-"com.sun.star.configuration.ConfigurationAccess",
-aArgs),
-UNO_QUERY_THROW );
uno::Sequence< OUString > aFiles;
-xNameAccess->getByName("TransitionFiles") >>= aFiles;
-
+aFiles = officecfg::Office::Impress::Misc::TransitionFiles::get();
for (const auto& rFile : aFiles)
{
OUString aURL = comphelper::getExpandedUri(xContext, rFile);
core.git: compilerplugins/clang sd/Library_sd.mk sd/source solenv/clang-format
compilerplugins/clang/unnecessarylocking.cxx |2
sd/Library_sd.mk |1
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx|7
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 17 -
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 144 ---
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx | 68 ---
sd/source/ui/tools/SdGlobalResourceContainer.cxx |4
solenv/clang-format/excludelist |1
8 files changed, 8 insertions(+), 236 deletions(-)
New commits:
commit 924d7b64f07a3bd1d9d3195eb3ce923b616bfb45
Author: Gabor Kelemen
AuthorDate: Fri Apr 26 13:39:44 2024 +0200
Commit: Gabor Kelemen
CommitDate: Sun Apr 28 17:08:29 2024 +0200
Drop CacheConfiguration in favor of officecfg
Also the key path was wrong in SlsCacheConfiguration.cxx:
MultiPaneGUI/SlideSorter/PreviewCache
but in Impress.xcs we have
MultiPaneGUI/SlideSorterBar/PreviewCache
hierarchy so this may actually now start to work :)
Change-Id: I4b552be713e6e157edb45692ba78101429aa1c85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166755
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/compilerplugins/clang/unnecessarylocking.cxx
b/compilerplugins/clang/unnecessarylocking.cxx
index 40b15518571d..b578f8da229d 100644
--- a/compilerplugins/clang/unnecessarylocking.cxx
+++ b/compilerplugins/clang/unnecessarylocking.cxx
@@ -115,8 +115,6 @@ bool UnnecessaryLocking::VisitCompoundStmt(const
CompoundStmt* compoundStmt)
&& !loplugin::isSamePathname(fn,
SRCDIR
"/desktop/source/deployment/gui/dp_gui_dialog2.cxx")
&& !loplugin::isSamePathname(fn, SRCDIR
"/desktop/source/lib/init.cxx")
-&& !loplugin::isSamePathname(
- fn, SRCDIR
"/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx")
// needs to lock around access to methods in vcl
&& !loplugin::isSamePathname(fn, SRCDIR
"/basctl/source/basicide/unomodel.cxx")
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 12296242bedb..643cce60ff82 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -375,7 +375,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/slidesorter/cache/SlsBitmapCompressor \
sd/source/ui/slidesorter/cache/SlsBitmapFactory \
sd/source/ui/slidesorter/cache/SlsCacheCompactor \
- sd/source/ui/slidesorter/cache/SlsCacheConfiguration \
sd/source/ui/slidesorter/cache/SlsGenericPageCache \
sd/source/ui/slidesorter/cache/SlsPageCache \
sd/source/ui/slidesorter/cache/SlsPageCacheManager \
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 89acdc564bf5..ca0bd8cf4b8b 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -17,12 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
#include
#include
#include "SlsBitmapCache.hxx"
#include "SlsCacheCompactor.hxx"
#include "SlsBitmapCompressor.hxx"
-#include "SlsCacheConfiguration.hxx"
#include
@@ -126,9 +127,7 @@ BitmapCache::BitmapCache ()
mnMaximalNormalCacheSize(MAXIMAL_CACHE_SIZE),
mbIsFull(false)
{
-Any aCacheSize (CacheConfiguration::Instance()->GetValue("CacheSize"));
-if (aCacheSize.has())
-aCacheSize >>= mnMaximalNormalCacheSize;
+mnMaximalNormalCacheSize =
officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::PreviewCache::CacheSize::get();
mpCacheCompactor = CacheCompactor::Create(*this,mnMaximalNormalCacheSize);
}
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index f5fa8690af20..74262f1f224c 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -22,11 +22,10 @@
#include "SlsBitmapCompressor.hxx"
#include "SlsBitmapCache.hxx"
-#include "SlsCacheConfiguration.hxx"
#include
#include
-#include
+#include
#include
using namespace ::com::sun::star::uno;
@@ -86,27 +85,21 @@ namespace sd::slidesorter::cache {
static const char sNone[] = "None";
std::shared_ptr pCompressor;
-OUString sCompressionPolicy("PNGCompression");
-Any aCompressionPolicy
(CacheConfiguration::Instance()->GetValue("CompressionPolicy"));
-if (aCompressionPolicy.has())
-aCompressionPolicy >>= sCompressionPolicy;
+OUString sCompressionPolicy =
officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Previ
core.git: sd/inc
sd/inc/glob.hxx |4 1 file changed, 4 deletions(-) New commits: commit 2f5ab5b8e7bd7dd06e00153abb77a69e5d192dd2 Author: Gabor Kelemen AuthorDate: Fri Apr 26 10:10:46 2024 +0200 Commit: Gabor Kelemen CommitDate: Sat Apr 27 22:47:25 2024 +0200 Drop now unused option-stream identifiers Change-Id: Id08e41e11b8027339e58ab182739087030e66eef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166754 Reviewed-by: Gabor Kelemen Tested-by: Jenkins diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index ad4ce9f3584c..5905601507b6 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -50,8 +50,4 @@ // Separator between layout name and template name of presentation templates inline constexpr OUString SD_LT_SEPARATOR = u"~LT~"_ustr; -// option-stream identifier -#define SD_OPTION_MORPHING u"Morph" -#define SD_OPTION_VECTORIZE u"Vectorize" - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
core.git: sd/source
sd/source/ui/view/drviewsg.cxx | 10 +-
sd/source/ui/view/frmview.cxx |3 ++-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit fe0d8555150949bb8729c656af62917ffc48bbf8
Author: Gabor Kelemen
AuthorDate: Tue Apr 23 16:28:52 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri Apr 26 17:01:25 2024 +0200
Use less SdOptionsLayout->IsDragStripes/SetDragStripes in favor of officecfg
Change-Id: I0c0e2dd57d1f1408f85bca4b6ee3bfcebae1cf22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166596
Reviewed-by: Gabor Kelemen
Tested-by: Jenkins
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 2563168433d8..7dfd06e2177c 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -26,6 +26,8 @@
#include
#include
#include
+#include
+#include
#include
@@ -103,6 +105,8 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
sal_uInt16 nSlot = rReq.GetSlot();
SdOptions* pOptions = SD_MOD()->GetSdOptions(GetDoc()->GetDocumentType());
+std::shared_ptr batch(
+comphelper::ConfigurationChanges::create());
switch( nSlot )
{
@@ -137,7 +141,10 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
case SID_HELPLINES_MOVE:
{
-pOptions->SetDragStripes( !mpDrawView->IsDragStripes() );
+if ( GetDoc()->GetDocumentType() == DocumentType::Impress )
+
officecfg::Office::Impress::Layout::Display::Guide::set(!mpDrawView->IsDragStripes(),
batch);
+else
+
officecfg::Office::Draw::Layout::Display::Guide::set(!mpDrawView->IsDragStripes(),
batch);
}
break;
@@ -192,6 +199,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
if( bDefault )
return;
+batch->commit();
pOptions->StoreConfig();
// Saves the configuration IMMEDIATELY
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 4071ee2734bf..88ae6825738b 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -286,11 +286,13 @@ void FrameView::Update(SdOptions const * pOptions)
if (pDrawDocument->GetDocumentType() == DocumentType::Impress)
{
mbRuler = officecfg::Office::Impress::Layout::Display::Ruler::get();
+SetDragStripes(
officecfg::Office::Impress::Layout::Display::Guide::get() );
SetNoDragXorPolys (
!officecfg::Office::Impress::Layout::Display::Contour::get() );
}
else
{
mbRuler = officecfg::Office::Draw::Layout::Display::Ruler::get();
+SetDragStripes( officecfg::Office::Draw::Layout::Display::Guide::get()
);
SetNoDragXorPolys (
!officecfg::Office::Draw::Layout::Display::Contour::get() );
}
@@ -302,7 +304,6 @@ void FrameView::Update(SdOptions const * pOptions)
SetOFrmSnap( pOptions->IsSnapFrame() );
SetOPntSnap( pOptions->IsSnapPoints() );
SetHlplVisible( pOptions->IsHelplines() );
-SetDragStripes( pOptions->IsDragStripes() );
SetPlusHandlesAlwaysVisible( pOptions->IsHandlesBezier() );
SetSnapMagneticPixel( pOptions->GetSnapArea() );
SetMarkedHitMovesAlways( pOptions->IsMarkedHitMovesAlways() );
core.git: sd/source
sd/source/ui/view/frmview.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c724b81b033a9ff968a1a63d66005d48a6b97e57
Author: Gabor Kelemen
AuthorDate: Tue Apr 23 15:39:59 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri Apr 26 16:59:49 2024 +0200
Use less SdOptionsLayout->IsMoveOutline in favor of officecfg
Change-Id: I848e11a64a42b670254c88b791d0b2a2534d112f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166595
Reviewed-by: Gabor Kelemen
Tested-by: Jenkins
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 6d8fad05af9d..4071ee2734bf 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -286,10 +286,12 @@ void FrameView::Update(SdOptions const * pOptions)
if (pDrawDocument->GetDocumentType() == DocumentType::Impress)
{
mbRuler = officecfg::Office::Impress::Layout::Display::Ruler::get();
+SetNoDragXorPolys (
!officecfg::Office::Impress::Layout::Display::Contour::get() );
}
else
{
mbRuler = officecfg::Office::Draw::Layout::Display::Ruler::get();
+SetNoDragXorPolys (
!officecfg::Office::Draw::Layout::Display::Contour::get() );
}
SetGridVisible( pOptions->IsGridVisible() );
@@ -306,7 +308,6 @@ void FrameView::Update(SdOptions const * pOptions)
SetMarkedHitMovesAlways( pOptions->IsMarkedHitMovesAlways() );
SetMoveOnlyDragging( pOptions->IsMoveOnlyDragging() );
SetSlantButShear( pOptions->IsMoveOnlyDragging() );
-SetNoDragXorPolys ( !pOptions->IsMoveOutline() );
SetCrookNoContortion( pOptions->IsCrookNoContortion() );
SetAngleSnapEnabled( pOptions->IsRotate() );
SetBigOrtho( pOptions->IsBigOrtho() );
core.git: sd/inc sd/source
sd/inc/sdmod.hxx |8
sd/source/ui/app/sdmod.cxx | 43 ---
2 files changed, 51 deletions(-)
New commits:
commit 48e07052be600a5abf8ef4cbec20e1122e703b7e
Author: Gabor Kelemen
AuthorDate: Thu Apr 25 16:52:14 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri Apr 26 15:16:05 2024 +0200
Drop now unused GetOptionStream class
Change-Id: Iddb1fbb437f0f66c551e9231d79511caf1edafb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166635
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 5008fc001f0b..b872ebf0913d 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -51,12 +51,6 @@ namespace com::sun::star::frame {
class XFrame;
}
-enum class SdOptionStreamMode
-{
-Load = 0,
-Store = 1
-};
-
struct SdExtPropertySetInfoCacheCompare
{
bool operator()(const std::span& lhs, const
std::span& rhs) const
@@ -104,7 +98,6 @@ public:
voidGetState(SfxItemSet&);
SdOptions* GetSdOptions(DocumentType eDocType);
-SD_DLLPUBLIC rtl::Reference GetOptionStream(
std::u16string_view rOptionName, SdOptionStreamMode eMode );
boolGetWaterCan() const { return bWaterCan; }
voidSetWaterCan( bool bWC ) { bWaterCan = bWC; }
@@ -140,7 +133,6 @@ private:
SdOptions* pDrawOptions;
std::unique_ptr pSearchItem;
std::unique_ptr pNumberFormatter;
-rtl::Reference xOptionStorage;
boolbWaterCan;
std::unique_ptr mpErrorHdl;
/** This device is used for printer independent layout. It is virtual
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index f1b9a9bbe8a1..f18dd647a209 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -157,49 +157,6 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType)
return pOptions;
}
-/**
- * Open and return option stream for internal options;
- * if the stream is opened for reading but does not exist, an 'empty'
- * RefObject is returned
- */
-rtl::Reference SdModule::GetOptionStream(
std::u16string_view rOptionName,
- SdOptionStreamMode eMode )
-{
-::sd::DrawDocShell* pDocSh = dynamic_cast< ::sd::DrawDocShell *>(
SfxObjectShell::Current() );
-rtl::Reference xStm;
-
-if( pDocSh )
-{
-DocumentTypeeType = pDocSh->GetDoc()->GetDocumentType();
-
-if( !xOptionStorage.is() )
-{
-INetURLObject aURL( SvtPathOptions().GetUserConfigPath() );
-
-aURL.Append( u"drawing.cfg" );
-
-std::unique_ptr pStm =
::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL(
INetURLObject::DecodeMechanism::NONE ), StreamMode::READWRITE );
-
-if( pStm )
-xOptionStorage = new SotStorage( pStm.release(), true );
-}
-
-OUStringaStmName;
-
-if( DocumentType::Draw == eType )
-aStmName = "Draw_";
-else
-aStmName = "Impress_";
-
-aStmName += rOptionName;
-
-if( SdOptionStreamMode::Store == eMode || xOptionStorage->IsContained(
aStmName ) )
-xStm = xOptionStorage->OpenSotStream( aStmName );
-}
-
-return xStm;
-}
-
SvNumberFormatter* SdModule::GetNumberFormatter()
{
if( !pNumberFormatter )
core.git: sd/inc sd/Library_sd.mk sd/source solenv/clang-format
sd/Library_sd.mk|1
sd/inc/sdiocmpt.hxx | 57 ---
sd/source/core/sdiocmpt.cxx | 117
solenv/clang-format/excludelist |2
4 files changed, 177 deletions(-)
New commits:
commit 7437b842c420a43b85156f34146f27fc6b34c729
Author: Gabor Kelemen
AuthorDate: Thu Apr 25 16:45:26 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri Apr 26 12:24:27 2024 +0200
Drop now unused sdiocmpt.cxx
Change-Id: Ibba331a536bbd6f228df005c3488a722a3631d4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166634
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index dc9b38f011f3..12296242bedb 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -165,7 +165,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/core/drawdoc4 \
sd/source/core/drawdoc_animations \
sd/source/core/pglink \
- sd/source/core/sdiocmpt \
sd/source/core/sdpage \
sd/source/core/sdpage2 \
sd/source/core/sdpage_animations \
diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx
deleted file mode 100644
index 9f1395fd7c22..
--- a/sd/inc/sdiocmpt.hxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include
-#include "sddllapi.h"
-
-
-class old_SdrDownCompat
-{
-protected:
-SvStream& rStream;
-sal_uInt32 nSubRecSiz;
-sal_uInt32 nSubRecPos;
-StreamMode nMode;
-boolbOpen;
-
-protected:
-void Write();
-
-public:
-old_SdrDownCompat(SvStream& rNewStream, StreamMode nNewMode);
-~old_SdrDownCompat();
-void OpenSubRecord();
-void CloseSubRecord();
-};
-
-#define SDIOCOMPAT_VERSIONDONTKNOW sal_uInt16(0x)
-
-class SD_DLLPUBLIC SdIOCompat : public old_SdrDownCompat
-{
-public:
-// nNewMode: StreamMode::READ or StreamMode::WRITE
-// nVer: specify only when writing
-SdIOCompat(SvStream& rNewStream, StreamMode nNewMode,
- sal_uInt16 nVer = SDIOCOMPAT_VERSIONDONTKNOW);
-~SdIOCompat();
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx
deleted file mode 100644
index 67de6a64d71d..
--- a/sd/source/core/sdiocmpt.cxx
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include
-
-#include
-
-old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, StreamMode nNewMode)
-: rStream(rNewStream),
-nSubRecSiz(0),
-nSubRecPos(0),
-nMode(nNewMode),
-bOpen(false)
-{
-OpenSubRecord();
-}
-
-old_SdrDownCompat::~old_SdrDownCompat()
-{
-if(bOpen)
-CloseSubRecord();
-}
-
-void old_SdrDownCompat::Write()
-{
-rStream.WriteUInt32( nSubRecSiz );
-}
-
-void old_SdrDownCompat::OpenSubRecord()
-{
-if(rStream.GetError())
-return;
-
-nSubRecPos = rStream.Tell();
-
-if(nMode == StreamMode::READ)
-{
-rStream.ReadUInt32( nSubRecSiz );
core.git: sd/source
sd/source/ui/dlg/vectdlg.cxx | 49 ++-
1 file changed, 12 insertions(+), 37 deletions(-)
New commits:
commit d119f504bf279a1bbe2e5840cfd5cbfa295fca8f
Author: Gabor Kelemen
AuthorDate: Thu Apr 25 16:07:49 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri Apr 26 09:41:37 2024 +0200
tdf#158305 Store Convert to Polygon dialog settings correctly
Change-Id: I4d732adb8365cd4ecddf372b5646c14c7ffe828c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166631
Reviewed-by: Gabor Kelemen
Tested-by: Jenkins
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 93e9c3ed6e73..30760381e58f 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
#include
#include
#include
@@ -25,8 +26,6 @@
#include
#include
-#include
-#include
#include
#define VECTORIZE_MAX_EXTENT 512
@@ -294,47 +293,23 @@ IMPL_LINK_NOARG(SdVectorizeDlg, MetricModifyHdl,
weld::MetricSpinButton&, void)
void SdVectorizeDlg::LoadSettings()
{
-rtl::Reference xIStm( SD_MOD()->GetOptionStream(
- SD_OPTION_VECTORIZE ,
- SdOptionStreamMode::Load ) );
-sal_uInt16 nLayers;
-sal_uInt16 nReduce;
-sal_uInt16 nFillHoles;
-boolbFillHoles;
-
-if( xIStm.is() )
-{
-SdIOCompat aCompat( *xIStm, StreamMode::READ );
-xIStm->ReadUInt16( nLayers ).ReadUInt16( nReduce ).ReadUInt16(
nFillHoles ).ReadCharAsBool( bFillHoles );
-}
-else
-{
-nLayers = 8;
-nReduce = 0;
-nFillHoles = 32;
-bFillHoles = false;
-}
-
-m_xNmLayers->set_value(nLayers);
-m_xMtReduce->set_value(nReduce, FieldUnit::NONE);
-m_xMtFillHoles->set_value(nFillHoles, FieldUnit::NONE);
-m_xCbFillHoles->set_active(bFillHoles);
+
m_xNmLayers->set_value(officecfg::Office::Common::Vectorize::ColorCount::get());
+
m_xMtReduce->set_value(officecfg::Office::Common::Vectorize::PointReduce::get(),
FieldUnit::NONE);
+
m_xCbFillHoles->set_active(officecfg::Office::Common::Vectorize::FillHole::get());
+
m_xMtFillHoles->set_value(officecfg::Office::Common::Vectorize::TileExtent::get(),
FieldUnit::NONE);
ToggleHdl(*m_xCbFillHoles);
}
void SdVectorizeDlg::SaveSettings() const
{
-rtl::Reference xOStm( SD_MOD()->GetOptionStream(
- SD_OPTION_VECTORIZE ,
- SdOptionStreamMode::Store ) );
-
-if( xOStm.is() )
-{
-SdIOCompat aCompat( *xOStm, StreamMode::WRITE, 1 );
-xOStm->WriteUInt16( m_xNmLayers->get_value()
).WriteUInt16(m_xMtReduce->get_value(FieldUnit::NONE));
-xOStm->WriteUInt16( m_xMtFillHoles->get_value(FieldUnit::NONE)
).WriteBool(m_xCbFillHoles->get_active());
-}
+std::shared_ptr batch(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Vectorize::ColorCount::set(m_xNmLayers->get_value(),batch);
+
officecfg::Office::Common::Vectorize::PointReduce::set(m_xMtReduce->get_value(FieldUnit::NONE),batch);
+
officecfg::Office::Common::Vectorize::FillHole::set(m_xCbFillHoles->get_active(),batch);
+
officecfg::Office::Common::Vectorize::TileExtent::set(m_xMtFillHoles->get_value(FieldUnit::NONE),batch);
+batch->commit();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
core.git: sd/source
sd/source/ui/dlg/morphdlg.cxx | 44 ++
1 file changed, 11 insertions(+), 33 deletions(-)
New commits:
commit 7bd190858f5f044225eaad03ef41f736bfbbd8da
Author: Gabor Kelemen
AuthorDate: Thu Apr 25 16:33:37 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri Apr 26 09:41:19 2024 +0200
tdf#158304 Store Cross-Fading dialog settings correctly
Change-Id: I3b8de3590a83def6fd6c77a504c69085dc2f0361
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166633
Reviewed-by: Gabor Kelemen
Tested-by: Jenkins
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index 96ed63f0b52d..0e9b7ddf5558 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -19,14 +19,13 @@
#include
-#include
-#include
#include
#include
#include
#include
#include
#include
+#include
using namespace com::sun::star;
@@ -61,45 +60,24 @@ MorphDlg::MorphDlg(weld::Window* pParent, const SdrObject*
pObj1, const SdrObjec
MorphDlg::~MorphDlg()
{
+SaveSettings();
}
void MorphDlg::LoadSettings()
{
-rtl::Reference xIStm( SD_MOD()->GetOptionStream(
SD_OPTION_MORPHING ,
- SdOptionStreamMode::Load ) );
-sal_uInt16 nSteps;
-boolbOrient, bAttrib;
-
-if( xIStm.is() )
-{
-SdIOCompat aCompat( *xIStm, StreamMode::READ );
-
-xIStm->ReadUInt16( nSteps ).ReadCharAsBool( bOrient ).ReadCharAsBool(
bAttrib );
-}
-else
-{
-nSteps = 16;
-bOrient = bAttrib = true;
-}
-
-m_xMtfSteps->set_value(nSteps);
-m_xCbxOrientation->set_active(bOrient);
-m_xCbxAttributes->set_active(bAttrib);
+
m_xMtfSteps->set_value(officecfg::Office::Draw::Misc::CrossFading::Steps::get());
+
m_xCbxOrientation->set_active(officecfg::Office::Draw::Misc::CrossFading::Orientation::get());
+
m_xCbxAttributes->set_active(officecfg::Office::Draw::Misc::CrossFading::Attributes::get());
}
void MorphDlg::SaveSettings() const
{
-rtl::Reference xOStm( SD_MOD()->GetOptionStream(
SD_OPTION_MORPHING ,
- SdOptionStreamMode::Store ) );
-
-if( xOStm.is() )
-{
-SdIOCompat aCompat( *xOStm, StreamMode::WRITE, 1 );
-
-xOStm->WriteUInt16( m_xMtfSteps->get_value() )
- .WriteBool( m_xCbxOrientation->get_active() )
- .WriteBool( m_xCbxAttributes->get_active() );
-}
+std::shared_ptr batch(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Draw::Misc::CrossFading::Steps::set(m_xMtfSteps->get_value(),batch);
+
officecfg::Office::Draw::Misc::CrossFading::Orientation::set(m_xCbxOrientation->get_active(),batch);
+
officecfg::Office::Draw::Misc::CrossFading::Attributes::set(m_xCbxAttributes->get_active(),batch);
+batch->commit();
}
} // end of namespace sd
core.git: sd/source
sd/source/filter/html/pubdlg.cxx | 315 ---
1 file changed, 315 deletions(-)
New commits:
commit febb429d5e02c2d6082194320ea689e8a01a3180
Author: Gabor Kelemen
AuthorDate: Thu Apr 25 16:15:45 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri Apr 26 09:40:16 2024 +0200
Drop stale pubdlg.cxx file
Seems to be unused since
commit 28b6480c6bdd179f3943f768926b7f196226c768
tdf#105303: Drop html export wizard
Change-Id: I9d7aa80d64df6f68af51cd026ef49d6a61cf9cfa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166632
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
deleted file mode 100644
index 5b42d3c8cfad..
--- a/sd/source/filter/html/pubdlg.cxx
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include "htmlattr.hxx"
-#include "htmlpublishmode.hxx"
-#include
-#include "buttonset.hxx"
-#include
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::beans;
-
-#define NOOFPAGES 6
-
-//ID for the config-data with the HTML-settings
-const sal_uInt16 nMagic = sal_uInt16(0x1977);
-
-// Key for the soffice.ini
-constexpr OUStringLiteral KEY_QUALITY = u"JPG-EXPORT-QUALITY";
-
-static SvStream& operator>>(SvStream& rIn, SdPublishingDesign& rDesign);
-
-static SvStream& WriteSdPublishingDesign(SvStream& rOut, const
SdPublishingDesign& rDesign);
-
-// This class has all the settings for the HTML-export autopilot
-class SdPublishingDesign
-{
-public:
-OUString m_aDesignName;
-
-HtmlPublishMode m_eMode;
-
-// special WebCast options
-PublishingScript m_eScript;
-OUString m_aCGI;
-OUString m_aURL;
-
-// special Kiosk options
-bool m_bAutoSlide;
-sal_uInt32 m_nSlideDuration;
-bool m_bEndless;
-
-// special HTML options
-bool m_bContentPage;
-bool m_bNotes;
-
-// misc options
-sal_uInt16 m_nResolution;
-OUString m_aCompression;
-PublishingFormat m_eFormat;
-bool m_bSlideSound;
-bool m_bHiddenSlides;
-
-// title page information
-OUString m_aAuthor;
-OUString m_aEMail;
-OUString m_aWWW;
-OUString m_aMisc;
-bool m_bDownload;
-bool m_bCreated; // not used
-
-// buttons and colorscheme
-sal_Int16 m_nButtonThema;
-bool m_bUserAttr;
-Color m_aBackColor;
-Color m_aTextColor;
-Color m_aLinkColor;
-Color m_aVLinkColor;
-Color m_aALinkColor;
-bool m_bUseAttribs;
-bool m_bUseColor;
-
-SdPublishingDesign();
-
-bool operator==(const SdPublishingDesign& rDesign) const;
-friend SvStream& operator>>(SvStream& rIn, SdPublishingDesign& rDesign);
-friend SvStream& WriteSdPublishingDesign(SvStream& rOut, const
SdPublishingDesign& rDesign);
-};
-
-// load Default-settings
-SdPublishingDesign::SdPublishingDesign()
-: m_eMode(PUBLISH_HTML)
-, m_eScript(SCRIPT_ASP)
-, m_bAutoSlide(true)
-, m_nSlideDuration(15)
-, m_bEndless(true)
-, m_bContentPage(true)
-, m_bNotes(true)
-, m_nResolution(PUB_LOWRES_WIDTH)
-, m_eFormat(FORMAT_PNG)
-, m_bSlideSound(true)
-, m_bHiddenSlides(false)
-, m_bDownload(false)
-, m_bCreated(false)
-, m_nButtonThema(-1)
-, m_bUserAttr(false)
-, m_aBackColor(COL_WHITE)
-, m_aTextColor(COL_BLACK)
-, m_aLinkColor(COL_BLUE)
-, m_aVLinkColor(COL_LIGHTGRAY)
-, m_aALinkColor(COL_GRAY)
-, m_bUseAttribs(true)
-, m_bUseColor(true)
-{
-FilterConfigItem
aFilterConfigItem(u"Office.Common/Filter/Graphic/Export/JPG");
-sal_Int32 nCompression = aFilterConfigItem.ReadInt32(KEY_QUALITY, 75);
-m_aCompression = OUString::number(nCompression) + "%";
-
-
core.git: sd/source
sd/source/ui/view/drviewse.cxx | 15 ---
sd/source/ui/view/frmview.cxx | 13 -
2 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit 3029019cd930fd672ceda413376a26a33fdbad38
Author: Gabor Kelemen
AuthorDate: Tue Apr 16 14:16:19 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri Apr 26 09:38:25 2024 +0200
Use less SdOptionsLayout->IsRulerVisible/SetRulerVisible in favor of
officecfg
Change-Id: I0f6b38d364fb880e8dcd3cae08f2c5298cb7a5bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166594
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index a49ce83b15e3..d7cc62eb9ce0 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -96,6 +96,8 @@
#include
#include
#include
+#include
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1117,12 +1119,19 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if(bOldHasRuler != bHasRuler)
{
-SdOptions* pOptions =
SD_MOD()->GetSdOptions(GetDoc()->GetDocumentType());
+std::shared_ptr batch(
+comphelper::ConfigurationChanges::create());
-if(pOptions && pOptions->IsRulerVisible() != bHasRuler)
+if (GetDoc()->GetDocumentType() == DocumentType::Impress)
{
-pOptions->SetRulerVisible(bHasRuler);
+
officecfg::Office::Impress::Layout::Display::Ruler::set(bHasRuler, batch);
}
+else
+{
+
officecfg::Office::Draw::Layout::Display::Ruler::set(bHasRuler, batch);
+}
+
+batch->commit();
}
Invalidate (SID_RULER);
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 50cf9d636396..6d8fad05af9d 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
#include
using namespace ::com::sun::star;
@@ -280,7 +281,17 @@ void FrameView::Update(SdOptions const * pOptions)
if (!pOptions)
return;
-mbRuler = pOptions->IsRulerVisible();
+SdDrawDocument* pDrawDocument = dynamic_cast(());
+
+if (pDrawDocument->GetDocumentType() == DocumentType::Impress)
+{
+mbRuler = officecfg::Office::Impress::Layout::Display::Ruler::get();
+}
+else
+{
+mbRuler = officecfg::Office::Draw::Layout::Display::Ruler::get();
+}
+
SetGridVisible( pOptions->IsGridVisible() );
SetSnapAngle( pOptions->GetAngle() );
SetGridSnap( pOptions->IsUseGridSnap() );
core.git: sd/source
sd/source/ui/dlg/tpoption.cxx | 47 +-
1 file changed, 33 insertions(+), 14 deletions(-)
New commits:
commit cb80115f79e59720406ea245d7d914487ab343d8
Author: Gabor Kelemen
AuthorDate: Sat Apr 13 09:09:08 2024 +0200
Commit: Gabor Kelemen
CommitDate: Fri Apr 26 09:37:43 2024 +0200
Use less SdOptionsLayoutItem in Options - Impress - View
in favor of officecfg
Change-Id: I3aea51bf0c1a2184163c07bf42b26164311843de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166593
Reviewed-by: Gabor Kelemen
Tested-by: Jenkins
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 812d39ffd8aa..39f04d15a915 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -197,7 +197,7 @@ OUString SdTpOptionsContents::GetAllStrings()
return sAllStrings.replaceAll("_", "");
}
-bool SdTpOptionsContents::FillItemSet( SfxItemSet* rAttrs )
+bool SdTpOptionsContents::FillItemSet( SfxItemSet* )
{
bool bModified = false;
@@ -206,27 +206,46 @@ bool SdTpOptionsContents::FillItemSet( SfxItemSet* rAttrs
)
m_xCbxDragStripes->get_state_changed_from_saved() ||
m_xCbxHandlesBezier->get_state_changed_from_saved() )
{
-SdOptionsLayoutItem aOptsItem;
+std::shared_ptr batch(
+comphelper::ConfigurationChanges::create());
-aOptsItem.GetOptionsLayout().SetRulerVisible(
m_xCbxRuler->get_active() );
-aOptsItem.GetOptionsLayout().SetMoveOutline(
m_xCbxMoveOutline->get_active() );
-aOptsItem.GetOptionsLayout().SetDragStripes(
m_xCbxDragStripes->get_active() );
-aOptsItem.GetOptionsLayout().SetHandlesBezier(
m_xCbxHandlesBezier->get_active() );
+if (m_bDrawMode)
+{
+officecfg::Office::Draw::Layout::Display::Ruler::set(
m_xCbxRuler->get_active(), batch );
+officecfg::Office::Draw::Layout::Display::Contour::set(
m_xCbxMoveOutline->get_active(), batch );
+officecfg::Office::Draw::Layout::Display::Guide::set(
m_xCbxDragStripes->get_active(), batch );
+officecfg::Office::Draw::Layout::Display::Bezier::set(
m_xCbxHandlesBezier->get_active(), batch );
+}
+else
+{
+officecfg::Office::Impress::Layout::Display::Ruler::set(
m_xCbxRuler->get_active(), batch );
+officecfg::Office::Impress::Layout::Display::Contour::set(
m_xCbxMoveOutline->get_active(), batch );
+officecfg::Office::Impress::Layout::Display::Guide::set(
m_xCbxDragStripes->get_active(), batch );
+officecfg::Office::Impress::Layout::Display::Bezier::set(
m_xCbxHandlesBezier->get_active(), batch );
+}
-rAttrs->Put( aOptsItem );
+batch->commit();
bModified = true;
}
return bModified;
}
-void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs )
+void SdTpOptionsContents::Reset( const SfxItemSet* )
{
-SdOptionsLayoutItem aLayoutItem( rAttrs->Get( ATTR_OPTIONS_LAYOUT ) );
-
-m_xCbxRuler->set_active( aLayoutItem.GetOptionsLayout().IsRulerVisible() );
-m_xCbxMoveOutline->set_active(
aLayoutItem.GetOptionsLayout().IsMoveOutline() );
-m_xCbxDragStripes->set_active(
aLayoutItem.GetOptionsLayout().IsDragStripes() );
-m_xCbxHandlesBezier->set_active(
aLayoutItem.GetOptionsLayout().IsHandlesBezier() );
+if (m_bDrawMode)
+{
+m_xCbxRuler->set_active(
officecfg::Office::Draw::Layout::Display::Ruler::get() );
+m_xCbxMoveOutline->set_active(
officecfg::Office::Draw::Layout::Display::Contour::get() );
+m_xCbxDragStripes->set_active(
officecfg::Office::Draw::Layout::Display::Guide::get() );
+m_xCbxHandlesBezier->set_active(
officecfg::Office::Draw::Layout::Display::Bezier::get() );
+}
+else
+{
+
m_xCbxRuler->set_active(officecfg::Office::Impress::Layout::Display::Ruler::get()
);
+
m_xCbxMoveOutline->set_active(officecfg::Office::Impress::Layout::Display::Contour::get()
);
+
m_xCbxDragStripes->set_active(officecfg::Office::Impress::Layout::Display::Guide::get()
);
+
m_xCbxHandlesBezier->set_active(officecfg::Office::Impress::Layout::Display::Bezier::get()
);
+}
bool bReadOnly = m_bDrawMode ?
officecfg::Office::Draw::Layout::Display::Ruler::isReadOnly() :
officecfg::Office::Impress::Layout::Display::Ruler::isReadOnly();
core.git: 2 commits - officecfg/registry sd/source
officecfg/registry/schema/org/openoffice/Office/Draw.xcs|4
officecfg/registry/schema/org/openoffice/Office/Impress.xcs |4
sd/source/ui/app/optsitem.cxx | 50
sd/source/ui/inc/optsitem.hxx | 18
4 files changed, 9 insertions(+), 67 deletions(-)
New commits:
commit 88ccd5e71143e3a3676fb1eaeb9e16f522a90784
Author: Gabor Kelemen
AuthorDate: Wed Apr 3 22:32:38 2024 +0200
Commit: Gabor Kelemen
CommitDate: Sat Apr 13 09:41:11 2024 +0200
Mark obsolete Impress/Draw config keys as deprecated
Practically unused since 2007 commit
56ca5814a1843a31d23b249f1960a31532c6b5bd
Change-Id: Idd7cf4f239efed16a151fc4c755c249947d927f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165859
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index c7ce19c2d6f4..dc6fa42f9e04 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -187,6 +187,7 @@
Indicates whether to show only outlines of graphical
objects.
Image placeholders
+Not used anymore
false
@@ -195,6 +196,7 @@
Indicates whether to show only outlines of draw
objects.
Contour mode
+Not used anymore
false
@@ -203,6 +205,7 @@
Indicates whether to use placeholders for text in draw
objects.
Text placeholders
+Not used anymore
false
@@ -211,6 +214,7 @@
Indicates whether to show only hairlines instead of an
object's linestyle.
Line contour only
+Not used anymore
false
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 876780d1bd09..e6bda773491f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -290,6 +290,7 @@
Indicates whether to show only the bounding box of
graphic-objects like bitmaps and drawings.
Image placeholders
+Not used anymore
false
@@ -298,6 +299,7 @@
Indicates whether to show only outlines of objects such as
filled rectangles and filled ellipses.
Contour mode
+Not used anymore
false
@@ -306,6 +308,7 @@
Indicates whether to show only a placeholder for text in
graphical objects.
Text placeholders
+Not used anymore
false
@@ -314,6 +317,7 @@
Indicates whether to show only hairlines instead of the true
line styles.
Line contour only
+Not used anymore
false
commit 912aa66a0623787eb2e29d01780140be6cccf27e
Author: Gabor Kelemen
AuthorDate: Wed Apr 3 20:52:15 2024 +0200
Commit: Gabor Kelemen
CommitDate: Sat Apr 13 09:40:57 2024 +0200
Drop unused SdOptionsContents class
seems to be practically out of use since 2007 commit
56ca5814a1843a31d23b249f1960a31532c6b5bd
part of patch series '#i80528# Removal of draft paint modes'
Change-Id: I770bab8b1973bec099ffdaa3243f1c0d2995ee52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165858
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 925cfaa15662..1aee9d7d7afc 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -336,54 +336,6 @@ void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts )
const
}
}
-/*
-|*
-|* SdOptionsContents
-|*
-\/
-
-SdOptionsContents::SdOptionsContents(bool bImpress) :
-SdOptionsGeneric( bImpress, bImpress ?
-OUString( "Office.Impress/Content" ) :
-OUString( "Office.Draw/Content" ) )
-{
-EnableModify( true );
-}
-
-bool SdOptionsContents::operator==(const SdOptionsContents&) const
-{
-return true;
-}
-
-void SdOptionsContents::GetPropNameArray( const char**& ppNames, sal_uLong&
rCount ) const
-{
-static const char* aPropNames[] =
-{
-"Display/PicturePlaceholder",
-"Display/ContourMode",
-"Display/LineContour",
-"Display/TextPlaceholde
core.git: sc/qa
sc/qa/unit/helper/debughelper.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit fa42bdabcab05bd6c671b9e255f4ffe6293bc0e9 Author: Gabor Kelemen AuthorDate: Tue Apr 9 19:10:33 2024 +0200 Commit: Gabor Kelemen CommitDate: Wed Apr 10 13:31:03 2024 +0200 Drop unused define CALC_TEST_PERF Seems to be not used since 2016 commit 52871b360c73efd59bfbc811b8b89a02b6375b29 Change-Id: Ie1f95ece6d9b6efe93dd16adcdacd644deb21fdb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165914 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/sc/qa/unit/helper/debughelper.hxx b/sc/qa/unit/helper/debughelper.hxx index 2a16d532128a..0132c03640fa 100644 --- a/sc/qa/unit/helper/debughelper.hxx +++ b/sc/qa/unit/helper/debughelper.hxx @@ -20,7 +20,6 @@ #endif #define CALC_DEBUG_OUTPUT 0 -#define CALC_TEST_PERF 0 #include
core.git: sw/qa sw/source
sw/qa/core/test_ToxMiscTest.cxx|2 -- sw/qa/extras/accessibility/accessible_relation_set.cxx |1 - sw/qa/extras/uiwriter/uiwriter6.cxx|1 - sw/source/core/access/accpara.cxx |1 - sw/source/core/bastyp/SwSmartTagMgr.cxx|1 - sw/source/core/crsr/crsrsh.cxx |1 - sw/source/core/doc/docdraw.cxx |1 - sw/source/core/doc/docedt.cxx |1 - sw/source/core/doc/docfld.cxx |2 -- sw/source/core/doc/docfmt.cxx |1 - sw/source/core/doc/poolfmt.cxx |1 - sw/source/core/doc/tblrwcl.cxx |1 - sw/source/core/edit/edtab.cxx |1 - sw/source/core/edit/edtox.cxx |1 - sw/source/core/fields/reffld.cxx |1 - sw/source/core/text/txthyph.cxx|1 - sw/source/core/txtnode/thints.cxx |2 -- sw/source/core/undo/unovwr.cxx |1 - sw/source/filter/ww8/wrtw8esh.cxx |1 - sw/source/filter/ww8/wrtw8num.cxx |2 -- sw/source/filter/ww8/ww8par3.cxx |1 - sw/source/filter/xml/wrtxml.cxx|1 - sw/source/filter/xml/xmlexp.cxx|3 --- sw/source/filter/xml/xmlfmte.cxx |3 --- sw/source/filter/xml/xmlfonte.cxx |4 sw/source/filter/xml/xmlimp.cxx|1 - sw/source/filter/xml/xmliteme.cxx |1 - sw/source/filter/xml/xmlmeta.cxx |3 --- sw/source/filter/xml/xmlscript.cxx |2 -- sw/source/filter/xml/xmltble.cxx |2 -- sw/source/filter/xml/xmltexte.cxx |2 -- sw/source/ui/chrdlg/chardlg.cxx|1 - sw/source/ui/chrdlg/drpcps.cxx |1 - sw/source/ui/config/mailconfigpage.cxx |2 -- sw/source/ui/config/optcomp.cxx|1 - sw/source/ui/dbui/mailmergewizard.cxx |1 - sw/source/ui/dbui/mmdocselectpage.cxx |1 - sw/source/ui/dbui/mmgreetingspage.cxx |1 - sw/source/ui/dbui/mmlayoutpage.cxx |2 -- sw/source/ui/dbui/mmresultdialogs.cxx |1 - sw/source/ui/envelp/envlop1.cxx|2 -- sw/source/ui/envelp/labelexp.cxx |1 - sw/source/ui/envelp/labfmt.cxx |2 -- sw/source/ui/fldui/changedb.cxx|1 - sw/source/ui/index/cntex.cxx |2 -- sw/source/ui/misc/contentcontrollistitemdlg.cxx|2 -- sw/source/ui/misc/glossary.cxx |1 - sw/source/ui/misc/srtdlg.cxx |1 - sw/source/uibase/app/docsh2.cxx|1 - sw/source/uibase/app/swmodul1.cxx |2 -- sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx |2 -- sw/source/uibase/docvw/romenu.cxx |3 --- sw/source/uibase/fldui/fldmgr.cxx |1 - sw/source/uibase/fldui/xfldui.cxx |1 - sw/source/uibase/lingu/hhcwrp.cxx |1 - sw/source/uibase/shells/basesh.cxx |1 - sw/source/uibase/shells/drawdlg.cxx|2 -- sw/source/uibase/shells/drwbassh.cxx |1 - sw/source/uibase/shells/grfshex.cxx|2 -- sw/source/uibase/shells/textsh2.cxx|3 --- sw/source/uibase/uiview/view.cxx |1 - sw/source/uibase/uiview/view2.cxx |1 - sw/source/uibase/uiview/viewmdi.cxx|2 -- sw/source/uibase/uiview/viewsrch.cxx |2 -- sw/source/uibase/utlui/numfmtlb.cxx|3 --- 65 files changed, 99 deletions(-) New commits: commit 1a91641fd6fd84eb0bfae75db54f35c7771a2a1c Author: Gabor Kelemen AuthorDate: Mon Apr 1 10:33:57 2024 +0200 Commit: Gabor Kelemen CommitDate: Wed Apr 10 09:19:42 2024 +0200 tdf#146619 Drop unused 'using namespace' in: sw/ Change-Id: I56463130ab617b0e11e237718cb8456913373818 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165696 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/sw/qa/core/test_ToxMiscTest.cxx b/sw/qa/core/test_ToxMiscTest.cxx index c7e6223b927b..3e75f06b16bd 100644 --- a/sw/qa/core/test_ToxMiscTest.cxx +++ b/sw/qa/core/test_ToxMiscTest.cxx @@ -12,8 +12,6 @@ #include #include -using namespace sw; - class
core.git: sc/qa sc/source
sc/qa/extras/htmlexporttest.cxx |5 -
sc/qa/extras/sccheck_data_pilot_field.cxx |1 -
sc/qa/extras/sccheck_data_pilot_table.cxx |1 -
sc/qa/extras/sccheck_xcell_ranges_query.cxx |1 -
sc/qa/unit/dataproviders_test.cxx |1 -
sc/qa/unit/filters-test.cxx |1 -
sc/qa/unit/helper/debughelper.hxx |2 --
sc/qa/unit/opencl-test-1.cxx |1 -
sc/qa/unit/opencl-test-2.cxx |1 -
sc/qa/unit/pivottable_filters_test.cxx|1 -
sc/qa/unit/subsequent_filters_test.cxx|1 -
sc/qa/unit/ucalc_parallelism.cxx |1 -
sc/source/core/opencl/op_addin.cxx|2 --
sc/source/core/opencl/op_array.cxx|2 --
sc/source/core/opencl/op_financial.cxx|2 --
sc/source/core/opencl/op_logical.cxx |2 --
sc/source/core/opencl/op_statistical.cxx |2 --
sc/source/core/tool/formulaparserpool.cxx |1 -
sc/source/filter/excel/xepivot.cxx|2 --
sc/source/filter/oox/commentsbuffer.cxx |2 --
sc/source/filter/oox/pivotcachefragment.cxx |1 -
sc/source/filter/oox/workbooksettings.cxx |1 -
sc/source/ui/Accessibility/AccessibilityHints.cxx |2 --
sc/source/ui/dataprovider/sqldataprovider.cxx |1 -
sc/source/ui/dataprovider/xmldataprovider.cxx |2 --
sc/source/ui/dbgui/dapitype.cxx |2 --
sc/source/ui/drawfunc/drawsh2.cxx |1 -
sc/source/ui/unoobj/drdefuno.cxx |2 --
sc/source/ui/view/formatsh.cxx|2 --
29 files changed, 46 deletions(-)
New commits:
commit d70f461d83e72bfea63526706a07c1e0c4dea66d
Author: Gabor Kelemen
AuthorDate: Mon Apr 1 09:11:08 2024 +0200
Commit: Gabor Kelemen
CommitDate: Wed Apr 10 09:19:27 2024 +0200
tdf#146619 Drop unused 'using namespace' in: sc/
Change-Id: I03478dd4c8e3c2ac88c0fe5e51efd53b09888475
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165695
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sc/qa/extras/htmlexporttest.cxx b/sc/qa/extras/htmlexporttest.cxx
index 75d7d9e758ce..859b5a90d008 100644
--- a/sc/qa/extras/htmlexporttest.cxx
+++ b/sc/qa/extras/htmlexporttest.cxx
@@ -12,11 +12,6 @@
#include
#include
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::frame;
-using namespace utl;
-
class ScHTMLExportTest : public UnoApiXmlTest, public HtmlTestTools
{
public:
diff --git a/sc/qa/extras/sccheck_data_pilot_field.cxx
b/sc/qa/extras/sccheck_data_pilot_field.cxx
index 52cc34481958..6d65b0e12a27 100644
--- a/sc/qa/extras/sccheck_data_pilot_field.cxx
+++ b/sc/qa/extras/sccheck_data_pilot_field.cxx
@@ -25,7 +25,6 @@
//check the DataPilot of Calc.
using namespace css;
-using namespace css::lang;
namespace sc_apitest
{
diff --git a/sc/qa/extras/sccheck_data_pilot_table.cxx
b/sc/qa/extras/sccheck_data_pilot_table.cxx
index 92494fb5833f..1f60ab72d191 100644
--- a/sc/qa/extras/sccheck_data_pilot_table.cxx
+++ b/sc/qa/extras/sccheck_data_pilot_table.cxx
@@ -27,7 +27,6 @@
//check the DataPilot of Calc.
using namespace css;
-using namespace css::lang;
namespace sc_apitest
{
diff --git a/sc/qa/extras/sccheck_xcell_ranges_query.cxx
b/sc/qa/extras/sccheck_xcell_ranges_query.cxx
index f0de7f7deff7..d5e9a5c8905f 100644
--- a/sc/qa/extras/sccheck_xcell_ranges_query.cxx
+++ b/sc/qa/extras/sccheck_xcell_ranges_query.cxx
@@ -17,7 +17,6 @@
#include
using namespace css;
-using namespace css::lang;
namespace sc_apitest
{
diff --git a/sc/qa/unit/dataproviders_test.cxx
b/sc/qa/unit/dataproviders_test.cxx
index 5b1aa76b95ed..7de2e4597262 100644
--- a/sc/qa/unit/dataproviders_test.cxx
+++ b/sc/qa/unit/dataproviders_test.cxx
@@ -19,7 +19,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
class ScDataProvidersTest : public ScModelTestBase
{
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 671f9760d197..4c8661822c4a 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -23,7 +23,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
/* Implementation of Filters test */
diff --git a/sc/qa/unit/helper/debughelper.hxx
b/sc/qa/unit/helper/debughelper.hxx
index 56e9f075f933..2a16d532128a 100644
--- a/sc/qa/unit/helper/debughelper.hxx
+++ b/sc/qa/unit/helper/debughelper.hxx
@@ -24,6 +24,4 @@
#include
-using namespace ::com::sun::star;
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/unit/opencl-test-1.cxx b/sc/qa/unit/opencl-test-1.cxx
index 03b4b27230e8..0c450d521120 100644
--- a/sc/qa/unit/opencl-test-1.cxx
+++ b/sc/qa/unit/opencl-test-1.cxx
@@ -8,7 +8,6 @@
#include
using namespace ::com::sun
core.git: scripting/source
scripting/source/basprov/baslibnode.cxx |1 -
scripting/source/dlgprov/DialogModelProvider.cxx |2 --
2 files changed, 3 deletions(-)
New commits:
commit 098f366895d2b224ddcd791d10a2e61fbc5fae94
Author: Gabor Kelemen
AuthorDate: Sun Mar 31 20:48:52 2024 +0200
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 18:53:50 2024 +0200
tdf#146619 Drop unused 'using namespace' in: scripting/
Change-Id: I84194df451ea990c515ae914741078c80e53e45b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165694
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/scripting/source/basprov/baslibnode.cxx
b/scripting/source/basprov/baslibnode.cxx
index 566883757b48..72d464f5caf0 100644
--- a/scripting/source/basprov/baslibnode.cxx
+++ b/scripting/source/basprov/baslibnode.cxx
@@ -28,7 +28,6 @@
using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::script;
diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx
b/scripting/source/dlgprov/DialogModelProvider.cxx
index e49ed058d475..ceb46f53c103 100644
--- a/scripting/source/dlgprov/DialogModelProvider.cxx
+++ b/scripting/source/dlgprov/DialogModelProvider.cxx
@@ -28,10 +28,8 @@
namespace dlgprov {
using namespace ::com::sun::star;
-using namespace awt;
using namespace lang;
using namespace uno;
-using namespace script;
using namespace beans;
core.git: 2 commits - bin/find-unneeded-includes starmath/qa starmath/source
bin/find-unneeded-includes |2 +-
starmath/qa/cppunit/test_cursor.cxx |2 --
starmath/qa/cppunit/test_nodetotextvisitors.cxx |2 --
starmath/qa/cppunit/test_parse.cxx |2 --
starmath/source/edit.cxx|1 -
starmath/source/mathml/import.cxx |1 -
starmath/source/mathml/mathmlimport.cxx |1 -
7 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit ff9373bd7271f37fd4cc8c35987a2477c5913b22
Author: Gabor Kelemen
AuthorDate: Sun Mar 31 20:47:39 2024 +0200
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 18:53:23 2024 +0200
tdf#146619 Drop unused 'using namespace' in: starmath/
Change-Id: I382ca117484b0928580f4bed765799e915e7b8a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165693
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/starmath/qa/cppunit/test_cursor.cxx
b/starmath/qa/cppunit/test_cursor.cxx
index 002a445745c9..89d4e6fe9a8e 100644
--- a/starmath/qa/cppunit/test_cursor.cxx
+++ b/starmath/qa/cppunit/test_cursor.cxx
@@ -23,8 +23,6 @@
typedef rtl::Reference SmDocShellRef;
-using namespace ::com::sun::star;
-
namespace
{
class Test : public test::BootstrapFixture
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index d4981445d8bb..0fbcfa1a81a1 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -25,8 +25,6 @@
typedef rtl::Reference SmDocShellRef;
-using namespace ::com::sun::star;
-
namespace
{
class Test : public test::BootstrapFixture
diff --git a/starmath/qa/cppunit/test_parse.cxx
b/starmath/qa/cppunit/test_parse.cxx
index cb158a15491d..2e240c04a2ac 100644
--- a/starmath/qa/cppunit/test_parse.cxx
+++ b/starmath/qa/cppunit/test_parse.cxx
@@ -21,8 +21,6 @@
namespace {
-using namespace ::com::sun::star;
-
typedef rtl::Reference SmDocShellRef;
class ParseTest : public test::BootstrapFixture
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index f36634a16b14..464498262b2f 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -42,7 +42,6 @@
#include
#include
-using namespace com::sun::star::accessibility;
using namespace com::sun::star;
diff --git a/starmath/source/mathml/import.cxx
b/starmath/source/mathml/import.cxx
index d857e56930d6..31d92a355cc7 100644
--- a/starmath/source/mathml/import.cxx
+++ b/starmath/source/mathml/import.cxx
@@ -58,7 +58,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
diff --git a/starmath/source/mathml/mathmlimport.cxx
b/starmath/source/mathml/mathmlimport.cxx
index 7bc3e5b913e3..d6a9b8d10ad8 100644
--- a/starmath/source/mathml/mathmlimport.cxx
+++ b/starmath/source/mathml/mathmlimport.cxx
@@ -74,7 +74,6 @@ one go*/
#include
using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
commit 6f10dc11015ed1640b847e7f0c0be5498b777c5b
Author: Gabor Kelemen
AuthorDate: Mon Apr 1 10:41:39 2024 +0200
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 18:53:11 2024 +0200
find-unneeded-includes: improve grepping for namespaces
for example this was not found:
extensions/source/update/check/updatecheck.cxx:58:namespace frame =
com::sun::star::frame ;
due to the missing using and the space before the semicolon
but IWYU correctly detected it as unused
Change-Id: I404c93d41aec1a571c9ac49db7b7c7e8da824bf6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165698
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index 99c77b654d3e..718ee67a2561 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -392,7 +392,7 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName,
noexclude, checknamespa
print("WARNING:", fileName, "This 'using namespace' is
likely unnecessary:", nameSpace)
# Get the row number, normal IWYU output does not contain
this info
-subprocess.run(["git", "grep", "-n", "using
namespace.*"+nameSpace+";", fileName])
+subprocess.run(["git", "grep", "-n",
"namespace.*[^a-zA-Z]"+nameSpace+" *;", fileName])
for remove in sorted(toRemove):
print("ERROR: %s: remove not needed include" % remove)
core.git: reportdesign/source
reportdesign/source/core/api/services.cxx |1 -
reportdesign/source/core/sdr/UndoActions.cxx |2 --
reportdesign/source/core/sdr/UndoEnv.cxx |2 --
reportdesign/source/filter/xml/xmlAutoStyle.cxx |1 -
reportdesign/source/filter/xml/xmlCell.cxx|1 +
reportdesign/source/filter/xml/xmlComponent.cxx |1 -
reportdesign/source/filter/xml/xmlCondPrtExpr.cxx |1 -
reportdesign/source/filter/xml/xmlExport.cxx |1 -
reportdesign/source/filter/xml/xmlExport.hxx |4
reportdesign/source/filter/xml/xmlFixedContent.cxx|2 ++
reportdesign/source/filter/xml/xmlFormatCondition.cxx |1 -
reportdesign/source/filter/xml/xmlHelper.cxx |1 -
reportdesign/source/filter/xml/xmlPropertyHandler.cxx |4
reportdesign/source/filter/xml/xmlfilter.cxx |1 -
reportdesign/source/filter/xml/xmlfilter.hxx |5 -
reportdesign/source/ui/dlg/AddField.cxx |1 -
reportdesign/source/ui/dlg/DateTime.cxx |1 -
reportdesign/source/ui/dlg/Navigator.cxx |1 -
reportdesign/source/ui/misc/RptUndo.cxx |2 --
reportdesign/source/ui/misc/UITools.cxx |1 -
reportdesign/source/ui/report/DesignView.cxx |3 ---
reportdesign/source/ui/report/ReportController.cxx|1 -
reportdesign/source/ui/report/ViewsWindow.cxx |1 -
23 files changed, 3 insertions(+), 36 deletions(-)
New commits:
commit a919a0aa4c434c906aa0301d842b1234bf287a9d
Author: Gabor Kelemen
AuthorDate: Sun Mar 31 14:00:06 2024 +0200
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 18:52:56 2024 +0200
tdf#146619 Drop unused 'using namespace' in: reportdesign/
Change-Id: Iaf246112014d5b5da751570ca55a179232a1e9d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165692
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/reportdesign/source/core/api/services.cxx
b/reportdesign/source/core/api/services.cxx
index de07c51e8c22..1f0a0a6f2fe8 100644
--- a/reportdesign/source/core/api/services.cxx
+++ b/reportdesign/source/core/api/services.cxx
@@ -32,7 +32,6 @@
//
using namespace ::reportdesign;
-using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx
b/reportdesign/source/core/sdr/UndoActions.cxx
index a63161a1b977..5aaa412cf1ff 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -36,10 +36,8 @@ namespace rptui
using namespace ::com::sun::star;
using namespace uno;
using namespace lang;
-using namespace script;
using namespace beans;
using namespace awt;
-using namespace util;
using namespace container;
using namespace report;
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx
b/reportdesign/source/core/sdr/UndoEnv.cxx
index bba8d5ae91f1..a2cdddafbdae 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -45,9 +45,7 @@ namespace rptui
using namespace ::com::sun::star;
using namespace uno;
using namespace lang;
-using namespace script;
using namespace beans;
-using namespace awt;
using namespace util;
using namespace container;
using namespace report;
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx
b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
index d292b84bd4be..cceb85a45b5f 100644
--- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx
+++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
@@ -24,7 +24,6 @@
namespace rptxml
{
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::xml::sax;
void OXMLAutoStylePoolP::exportStyleAttributes(
comphelper::AttributeList& rAttrList,
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx
b/reportdesign/source/filter/xml/xmlCell.cxx
index c504204db7f8..3d34a8c241a6 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -44,6 +44,7 @@ namespace rptxml
using namespace ::com::sun::star;
using namespace uno;
using namespace beans;
+using namespace lang;
using namespace xml::sax;
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx
b/reportdesign/source/filter/xml/xmlComponent.cxx
index 896d8b2ab324..0e17dff666d4 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -27,7 +27,6 @@ namespace rptxml
{
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::report;
using names
core.git: bin/find-unneeded-includes
bin/find-unneeded-includes |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 83f1a6f8172ab5688bb3e3883e33ed8295d3f5b7 Author: Gabor Kelemen AuthorDate: Mon Apr 1 10:37:45 2024 +0200 Commit: Gabor Kelemen CommitDate: Tue Apr 9 10:43:59 2024 +0200 find-unneeded-includes: improve list of namespaces Add 'star' for com::sun::star instances Add some vcl-specific ones 'PackageKit' gave always a false warning due to the similarity in org/freedesktop/PackageKit/*hpp and officecfg::Office::Common::PackageKit::* Change-Id: I109e7a2e8d7588d62b2a6bec2e55ec32e993e49e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165697 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes index 509331cd5ff3..99c77b654d3e 100755 --- a/bin/find-unneeded-includes +++ b/bin/find-unneeded-includes @@ -342,7 +342,6 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName, noexclude, checknamespa 'oox|core|drawingml|ole|vml|' 'OpenStormBento|' 'osl|' -'PackageKit|' 'pdfi|pdfparse|' 'ppt|' 'pyuno|' @@ -359,6 +358,7 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName, noexclude, checknamespa 'sfx2|DocTempl|' 'sidebar|' # for sfx2::sidebar 'skeletonmaker|' +'star|' # for com::sun::star 'std|chrono_literals|literals|' 'stoc_sec|' 'store|' @@ -374,7 +374,7 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName, noexclude, checknamespa 'unopkg|' 'util|db|qe|' # for xmlsearch:: 'utl|' -'vcl|' +'vcl|psp|x11|' 'writerfilter|' 'xforms|' 'xmloff|token|EnhancedCustomShapeToken' # for xmloff::
core.git: xmlsecurity/source
xmlsecurity/source/gpg/CipherContext.cxx |1 -
xmlsecurity/source/gpg/DigestContext.cxx |1 -
xmlsecurity/source/gpg/XMLEncryption.cxx |1 -
3 files changed, 3 deletions(-)
New commits:
commit 4aa43e62e45d418540e352370215c199d97cdfe7
Author: Gabor Kelemen
AuthorDate: Sun Mar 31 09:40:03 2024 +0200
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 10:43:32 2024 +0200
tdf#146619 Drop unused 'using namespace' in: xmlsecurity/
Change-Id: I95b84eff5d8bb288aa704620db328d89062efdf4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165689
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/xmlsecurity/source/gpg/CipherContext.cxx
b/xmlsecurity/source/gpg/CipherContext.cxx
index 291db0ba66c8..b7f81bc9ee3e 100644
--- a/xmlsecurity/source/gpg/CipherContext.cxx
+++ b/xmlsecurity/source/gpg/CipherContext.cxx
@@ -11,7 +11,6 @@
using namespace css;
using namespace css::uno;
-using namespace css::lang;
Sequence
SAL_CALL CipherContext::convertWithCipherContext(const Sequence&
/*aData*/)
diff --git a/xmlsecurity/source/gpg/DigestContext.cxx
b/xmlsecurity/source/gpg/DigestContext.cxx
index 4864191bb85e..79ff98710691 100644
--- a/xmlsecurity/source/gpg/DigestContext.cxx
+++ b/xmlsecurity/source/gpg/DigestContext.cxx
@@ -11,7 +11,6 @@
using namespace css;
using namespace css::uno;
-using namespace css::lang;
void SAL_CALL DigestContext::updateDigest(const Sequence& /*aData*/)
{}
diff --git a/xmlsecurity/source/gpg/XMLEncryption.cxx
b/xmlsecurity/source/gpg/XMLEncryption.cxx
index 65083ff68bac..98f7aa6dc46d 100644
--- a/xmlsecurity/source/gpg/XMLEncryption.cxx
+++ b/xmlsecurity/source/gpg/XMLEncryption.cxx
@@ -11,7 +11,6 @@
using namespace css::uno;
using namespace css::lang;
-using namespace css::xml::wrapper;
using namespace css::xml::crypto;
XMLEncryptionGpg::XMLEncryptionGpg() {
core.git: chart2/source
chart2/source/controller/chartapiwrapper/GridWrapper.cxx |1 -
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx |1 -
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx |1 -
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx |1 -
chart2/source/controller/dialogs/TitleDialogData.cxx |1 -
chart2/source/controller/dialogs/dlg_ChartType.cxx |1 -
chart2/source/controller/dialogs/dlg_DataSource.cxx|1 -
chart2/source/controller/dialogs/dlg_View3D.cxx|1 -
chart2/source/controller/main/ChartController_Position.cxx |1 -
chart2/source/inc/ChartResourceGroups.hxx |1 -
chart2/source/model/main/ChartModel.cxx|1 -
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx |1 -
chart2/source/model/template/FilledNetChartType.cxx|1 -
chart2/source/model/template/StockChartTypeTemplate.cxx|1 -
chart2/source/tools/ColorPerPointHelper.cxx|1 -
chart2/source/view/axes/VPolarAngleAxis.cxx|1 -
chart2/source/view/axes/VPolarAxis.cxx |1 -
chart2/source/view/axes/VPolarCoordinateSystem.cxx |1 -
chart2/source/view/charttypes/BarPositionHelper.cxx|1 -
chart2/source/view/charttypes/BubbleChart.cxx |1 -
chart2/source/view/charttypes/CandleStickChart.cxx |1 -
chart2/source/view/main/LabelPositionHelper.cxx|1 -
chart2/source/view/main/PlotterBase.cxx|1 -
chart2/source/view/main/PolarLabelPositionHelper.cxx |1 -
24 files changed, 24 deletions(-)
New commits:
commit 6e1647699fb7de69b7b14498dbc9b133c24508d4
Author: Gabor Kelemen
AuthorDate: Sat Mar 30 21:25:06 2024 +0100
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 10:43:12 2024 +0200
tdf#146619 Drop unused 'using namespace' in: chart2/
Change-Id: I632d0dda0e62e5b1bf0956e731ab5ed6417db1ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165688
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 8a9f4267e785..5f75aa686a69 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -34,7 +34,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 4f98fa5923f2..d0cb5eab6552 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -32,7 +32,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 9fa2e5132168..c63090d81ac8 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -32,7 +32,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index dc5742aef63b..9c8a6f61afb0 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -31,7 +31,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx
b/chart2/source/controller/dialogs/TitleDialogData.cxx
index b8f3ed6d9429..75d59bbb43b4 100644
--- a/chart2/source/controller/dialogs/TitleDialogData.cxx
+++ b/chart2/source/controller/dialogs/TitleDialogData.cxx
@@ -28,7 +28,6 @@
namespace chart
{
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
TitleDialogData::TitleDialogData( std::optional
pRefSizeProvider )
: aPossibilityList{ true, true, true, true, true, true, true }
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx
b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index e6e88dae42b8..a1f52f5169a5 100644
--- a/chart2/source/controller/dialogs
core.git: forms/source
forms/source/component/CheckBox.cxx |2 +-
forms/source/component/Date.cxx |2 +-
forms/source/component/FormattedField.cxx |2 +-
forms/source/component/ImageButton.cxx|2 +-
forms/source/component/ImageControl.cxx |4 ++--
forms/source/component/Numeric.cxx|2 +-
forms/source/component/Pattern.cxx|2 +-
forms/source/component/RadioButton.cxx|2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 4c1d626d7265b0bfce709e41e62d7c789022ef6d
Author: Gabor Kelemen
AuthorDate: Sun Mar 31 11:33:43 2024 +0200
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 08:46:04 2024 +0200
Fix typo: compytibility
Change-Id: I989d0a9510e6a3691a4c1ba89dd3f04e62906292
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165691
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/forms/source/component/CheckBox.cxx
b/forms/source/component/CheckBox.cxx
index 064a156b1a95..ff3f2058ffcc 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -57,7 +57,7 @@ css::uno::Sequence SAL_CALL
OCheckBoxControl::getSupportedServiceNames
OCheckBoxModel::OCheckBoxModel(const Reference& _rxFactory)
:OReferenceValueComponent( _rxFactory, VCL_CONTROLMODEL_CHECKBOX,
FRM_SUN_CONTROL_CHECKBOX )
-// use the old control name for compytibility reasons
+// use the old control name for compatibility reasons
{
m_nClassId = FormComponentType::CHECKBOX;
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index acae4629b168..a349cd064cd1 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -69,7 +69,7 @@ Sequence ODateModel::_getTypes()
ODateModel::ODateModel(const Reference& _rxFactory)
: OEditBaseModel(_rxFactory, VCL_CONTROLMODEL_DATEFIELD,
FRM_SUN_CONTROL_DATEFIELD, true, true)
-// use the old control name for compytibility reasons
+// use the old control name for compatibility reasons
, OLimitedFormats(_rxFactory, FormComponentType::DATEFIELD)
, m_bDateTimeField(false)
{
diff --git a/forms/source/component/FormattedField.cxx
b/forms/source/component/FormattedField.cxx
index ad89f38706ca..fa1fdb216b2b 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -266,7 +266,7 @@ void OFormattedModel::implConstruct()
}
OFormattedModel::OFormattedModel(const Reference&
_rxFactory)
:OEditBaseModel(_rxFactory, VCL_CONTROLMODEL_FORMATTEDFIELD,
FRM_SUN_CONTROL_FORMATTEDFIELD, true, true )
-// use the old control name for compytibility reasons
+// use the old control name for compatibility reasons
,OErrorBroadcaster( OComponentHelper::rBHelper )
{
implConstruct();
diff --git a/forms/source/component/ImageButton.cxx
b/forms/source/component/ImageButton.cxx
index 8d42232a8423..1dd66ca0dbdc 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::util;
// OImageButtonModel
OImageButtonModel::OImageButtonModel(const Reference&
_rxFactory)
:OClickableImageBaseModel( _rxFactory,
VCL_CONTROLMODEL_IMAGEBUTTON, FRM_SUN_CONTROL_IMAGEBUTTON )
-// use the old control name for compytibility reasons
+// use the old control name for compatibility reasons
{
m_nClassId = FormComponentType::IMAGEBUTTON;
}
diff --git a/forms/source/component/ImageControl.cxx
b/forms/source/component/ImageControl.cxx
index 0a2de4a63deb..0f48eecf5496 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -129,7 +129,7 @@ Sequence OImageControlModel::_getTypes()
OImageControlModel::OImageControlModel(const Reference&
_rxFactory)
:OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_IMAGECONTROL,
FRM_SUN_CONTROL_IMAGECONTROL, false, false, false )
-// use the old control name for compytibility reasons
+// use the old control name for compatibility reasons
,m_bExternalGraphic( true )
,m_bReadOnly( false )
{
@@ -142,7 +142,7 @@ OImageControlModel::OImageControlModel(const
Reference& _rxFa
OImageControlModel::OImageControlModel( const OImageControlModel* _pOriginal,
const Reference< XComponentContext >& _rxFactory )
:OBoundControlModel( _pOriginal, _rxFactory )
-// use the old control name for compytibility reasons
+// use the old control name for compatibility reasons
,m_bExternalGraphic( true )
,m_bReadOnly( _pOriginal->m_bReadOnly )
,m_sImageURL( _pOriginal->m_sImageURL )
diff --git a/forms/source/component/Numeric.cxx
b/forms/source/component/Numeric.cxx
index e0fdaa70dab6..b3465d7c940c 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.
core.git: oox/source
oox/source/core/filterbase.cxx |1 - oox/source/core/xmlfilterbase.cxx|1 - oox/source/drawingml/chart/chartspaceconverter.cxx |1 - oox/source/drawingml/chart/objectformatter.cxx |1 - oox/source/drawingml/chart/titleconverter.cxx|1 - oox/source/drawingml/clrschemecontext.cxx|2 -- oox/source/drawingml/connectorshapecontext.cxx |4 oox/source/drawingml/diagram/constraintlistcontext.cxx |2 -- oox/source/drawingml/diagram/datamodelcontext.cxx|1 - oox/source/drawingml/diagram/diagramdefinitioncontext.cxx|2 -- oox/source/drawingml/diagram/diagramfragmenthandler.cxx |2 -- oox/source/drawingml/diagram/layoutatomvisitorbase.cxx |1 - oox/source/drawingml/diagram/layoutatomvisitors.cxx |2 -- oox/source/drawingml/diagram/layoutnodecontext.cxx |2 -- oox/source/drawingml/effectpropertiescontext.cxx |1 - oox/source/drawingml/graphicshapecontext.cxx |3 --- oox/source/drawingml/guidcontext.cxx |2 -- oox/source/drawingml/hyperlinkcontext.cxx|2 -- oox/source/drawingml/linepropertiescontext.cxx |2 -- oox/source/drawingml/misccontexts.cxx|1 - oox/source/drawingml/objectdefaultcontext.cxx|2 -- oox/source/drawingml/scene3dcontext.cxx |2 -- oox/source/drawingml/shape3dproperties.cxx |2 -- oox/source/drawingml/shapecontext.cxx|4 oox/source/drawingml/shapegroupcontext.cxx |3 --- oox/source/drawingml/shapepropertiescontext.cxx |2 -- oox/source/drawingml/shapestylecontext.cxx |2 -- oox/source/drawingml/spdefcontext.cxx|1 - oox/source/drawingml/table/tablebackgroundstylecontext.cxx |1 - oox/source/drawingml/table/tablepartstylecontext.cxx |2 -- oox/source/drawingml/table/tablerow.cxx |3 --- oox/source/drawingml/table/tablestylecellstylecontext.cxx|1 - oox/source/drawingml/table/tablestylecontext.cxx |2 -- oox/source/drawingml/table/tablestylelistfragmenthandler.cxx |1 - oox/source/drawingml/table/tablestylepart.cxx|1 - oox/source/drawingml/table/tablestyletextstylecontext.cxx|2 -- oox/source/drawingml/textbodypropertiescontext.cxx |1 - oox/source/drawingml/textcharacterpropertiescontext.cxx |2 -- oox/source/drawingml/textfieldcontext.cxx|2 -- oox/source/drawingml/textliststylecontext.cxx|2 -- oox/source/drawingml/textspacingcontext.cxx |1 - oox/source/drawingml/texttabstoplistcontext.cxx |1 - oox/source/drawingml/themeelementscontext.cxx|1 - oox/source/dump/dumperbase.cxx |2 -- oox/source/export/shapes.cxx |1 - oox/source/helper/containerhelper.cxx|1 - oox/source/helper/graphichelper.cxx |1 - oox/source/helper/zipstorage.cxx |1 - oox/source/ole/vbahelper.cxx |2 -- oox/source/ole/vbamodule.cxx |1 - oox/source/ppt/animationtypes.cxx|1 - oox/source/ppt/animvariantcontext.cxx|1 - oox/source/ppt/backgroundproperties.cxx |2 -- oox/source/ppt/extdrawingfragmenthandler.cxx |2 -- oox/source/ppt/headerfootercontext.cxx |2 -- oox/source/ppt/layoutfragmenthandler.cxx |3 --- oox/source/ppt/pptgraphicshapecontext.cxx|1 - oox/source/ppt/pptshapecontext.cxx |1 - oox/source/ppt/pptshapegroupcontext.cxx |2 -- oox/source/ppt/pptshapepropertiescontext.cxx |1 - oox/source/ppt/slidemastertextstylescontext.cxx |1 - oox/source/ppt/slidetimingcontext.cxx|4 oox/source/ppt/slidetransitioncontext.cxx|3 --- oox/source/ppt/soundactioncontext.cxx|1 - oox/source/ppt/timeanimvaluecontext.cxx |2 -- oox/source/ppt/timenodelistcontext.cxx |1 - oox/source/ppt/timetargetelementcontext.cxx |1 - 67 files changed, 113 deletions(-) New commits: commit 9a4eead9958d887d37a5c9bab9465cc6ddd0b213 Author: Gabor Kelemen AuthorDate: Sun Mar 31 11:30:14 2024 +0200 Commit: Gabor Kelemen
core.git: cui/source
cui/source/options/treeopt.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 3b50600e8f817409f5a21249871d9f82728e4987 Author: Gabor Kelemen AuthorDate: Fri Mar 29 22:20:08 2024 +0100 Commit: Thorsten Behrens CommitDate: Tue Apr 9 07:45:39 2024 +0200 Use some nicer assert string Change-Id: I49b5950a63b7c1decb07f3093e8962fc3eada0bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165569 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 5fe43e57f6ab..6ab767bb8044 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1841,7 +1841,7 @@ void OfaTreeOptionsDialog::writerOptions(const std::vector& vPageId) sal_uInt16 nPageId = 0; OUString aFactory = getCurrentFactory_Impl( m_xFrame ); -DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "S H I T!!!" ); +DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "This should not happen" ); SvtModuleOptions aModuleOpt; if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) @@ -1901,7 +1901,7 @@ void OfaTreeOptionsDialog::writerWebOptions(const std::vector& vPage sal_uInt16 nPageId = 0; OUString aFactory = getCurrentFactory_Impl( m_xFrame ); -DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "S H I T!!!" ); +DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "This should not happen" ); SvtModuleOptions aModuleOpt; if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) @@ -1955,7 +1955,7 @@ void OfaTreeOptionsDialog::calcOptions(const std::vector& vPageId) sal_uInt16 nPageId = 0; OUString aFactory = getCurrentFactory_Impl( m_xFrame ); -DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "S H I T!!!" ); +DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "This should not happen" ); SvtModuleOptions aModuleOpt; // Calc options @@ -1995,7 +1995,7 @@ void OfaTreeOptionsDialog::impressOptions(const std::vector& vPageId sal_uInt16 nPageId = 0; OUString aFactory = getCurrentFactory_Impl( m_xFrame ); -DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "S H I T!!!" ); +DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "This should not happen" ); SvtModuleOptions aModuleOpt; // Impress options @@ -2035,7 +2035,7 @@ void OfaTreeOptionsDialog::drawOptions(const std::vector& vPageId) sal_uInt16 nPageId = 0; OUString aFactory = getCurrentFactory_Impl( m_xFrame ); -DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "S H I T!!!" ); +DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "This should not happen" ); SvtModuleOptions aModuleOpt; // Draw options @@ -2076,7 +2076,7 @@ void OfaTreeOptionsDialog::mathOptions(const std::vector& vPageId) sal_uInt16 nPageId = 0; OUString aFactory = getCurrentFactory_Impl( m_xFrame ); -DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "S H I T!!!" ); +DBG_ASSERT( GetModuleIdentifier( m_xFrame ) == aFactory, "This should not happen" ); SvtModuleOptions aModuleOpt; // Math options
core.git: filter/source
filter/source/odfflatxml/OdfFlatXml.cxx |2 -- filter/source/pdf/pdfexport.cxx |1 - filter/source/svg/svgexport.cxx |2 +- filter/source/svg/svgwriter.cxx |1 + filter/source/svg/svgwriter.hxx |1 - filter/source/t602/t602filter.cxx |2 -- filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx |1 - filter/source/xsltdialog/xmlfilterdialogcomponent.cxx |2 -- filter/source/xsltdialog/xmlfiltertabpagexslt.cxx |3 --- filter/source/xsltfilter/XSLTFilter.cxx |1 - 10 files changed, 2 insertions(+), 14 deletions(-) New commits: commit c7362f365b7d4699740729e6bf263e1217577797 Author: Gabor Kelemen AuthorDate: Fri Mar 29 14:09:58 2024 +0100 Commit: Gabor Kelemen CommitDate: Mon Apr 8 15:10:16 2024 +0200 tdf#146619 Drop unused 'using namespace' in: filter/ Change-Id: Id7801c4690b9f095f7f246e8b3a2072c24e6e58c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165544 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index 4c838ab5f40e..755f14ec6be2 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -38,13 +38,11 @@ #include using namespace ::cppu; -using namespace ::osl; using namespace ::sax; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::registry; using namespace ::com::sun::star::xml; using namespace ::com::sun::star::xml::sax; diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index a73d122282e1..03ecbf576c56 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -75,7 +75,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::view; -using namespace ::com::sun::star::graphic; PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc, diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index d2a42321cf02..c6325f282a2e 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -74,7 +74,7 @@ using namespace css::animations; using namespace css::presentation; using namespace ::com::sun::star::graphic; -using namespace ::com::sun::star::geometry; +using namespace ::com::sun::star::style; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index e2079304abbc..adfdda948f76 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -52,6 +52,7 @@ #include +using namespace ::com::sun::star::style; constexpr OUString aPrefixClipPathId = u"clip_path_"_ustr; diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 85c931fb1763..1bcf8a87b4c9 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::text; -using namespace ::com::sun::star::style; using namespace ::com::sun::star::svg; using namespace ::com::sun::star::xml::sax; diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index d97bc3d5e5de..e215b465b925 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -37,11 +37,9 @@ #include using namespace ::cppu; -using namespace ::osl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::registry; using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::awt; diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 525f567b67c0..1f246433a4ae 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -48,7 +48,6 @@ using namespace comphelper; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using namespace com::sun::star::io; using namespace com::sun::star::beans; using namespace com::sun::star::container; using namespace com::sun::star::document; diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 5cf047d07e41..64b02feb2d78 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filt
core.git: 2 commits - editeng/source extensions/source
editeng/source/editeng/edtspell.cxx |1 - editeng/source/editeng/textconv.cxx |2 -- editeng/source/items/xmlcnitm.cxx|1 - editeng/source/misc/splwrap.cxx |1 - editeng/source/misc/unolingu.cxx |1 - editeng/source/xml/xmltxtexp.cxx |2 -- editeng/source/xml/xmltxtimp.cxx |2 -- extensions/source/abpilot/abpfinalpage.cxx |4 extensions/source/abpilot/abspage.cxx|1 - extensions/source/abpilot/abspilot.cxx |1 - extensions/source/abpilot/admininvokationimpl.cxx|1 - extensions/source/abpilot/unodialogabp.cxx |1 - extensions/source/bibliography/bibconfig.cxx |1 - extensions/source/bibliography/bibcont.cxx |1 - extensions/source/bibliography/bibmod.cxx|4 extensions/source/bibliography/bibview.cxx |1 - extensions/source/dbpilots/commonpagesdbp.cxx|1 - extensions/source/dbpilots/controlwizard.cxx |1 - extensions/source/dbpilots/gridwizard.cxx|1 - extensions/source/dbpilots/groupboxwiz.cxx |1 - extensions/source/dbpilots/listcombowizard.cxx |1 - extensions/source/propctrlr/MasterDetailLinkDialog.cxx |1 - extensions/source/propctrlr/buttonnavigationhandler.cxx |3 --- extensions/source/propctrlr/cellbindinghandler.cxx |1 - extensions/source/propctrlr/cellbindinghelper.cxx|1 - extensions/source/propctrlr/controlfontdialog.cxx|1 - extensions/source/propctrlr/editpropertyhandler.cxx |2 -- extensions/source/propctrlr/eformspropertyhandler.cxx|1 - extensions/source/propctrlr/formcomponenthandler.cxx |1 - extensions/source/propctrlr/formlinkdialog.cxx |1 - extensions/source/propctrlr/pcrcommon.cxx|3 --- extensions/source/propctrlr/pcrunodialogs.cxx|1 - extensions/source/propctrlr/propcontroller.cxx |2 -- extensions/source/propctrlr/propertyhandler.cxx |1 - extensions/source/propctrlr/submissionhandler.cxx|2 -- extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx |2 -- extensions/source/update/check/updatecheck.cxx |1 - 37 files changed, 54 deletions(-) New commits: commit 6b4552e325b38748cb75d3df269082fb8a38751a Author: Gabor Kelemen AuthorDate: Fri Mar 29 14:06:23 2024 +0100 Commit: Gabor Kelemen CommitDate: Mon Apr 8 15:10:01 2024 +0200 tdf#146619 Drop unused 'using namespace' in: editeng/ Change-Id: Ifbad3b15b462a0586eda219f16698d0b42109832 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165535 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 514e70f93025..b989755d8be4 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -32,7 +32,6 @@ #include using namespace com::sun::star::uno; -using namespace com::sun::star::beans; using namespace com::sun::star::linguistic2; diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 0534d3420cc4..3d4c03e1ddeb 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -29,8 +29,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; -using namespace com::sun::star::beans; -using namespace com::sun::star::linguistic2; TextConvWrapper::TextConvWrapper( weld::Widget* pWindow, const Reference< XComponentContext >& rxContext, diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 7507ed2afdd0..71f75a910246 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; -using namespace ::com::sun::star::lang; using namespace ::com::sun::star::xml; diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index dd59113a6975..67c3dc28e64a 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; using namespace ::com::sun::star::linguistic2; diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index bd1fae50654e..e252dc3233e6 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -
core.git: basctl/source
basctl/source/basicide/basobj3.cxx |1 -
basctl/source/dlged/managelang.cxx |1 -
basctl/source/inc/bastype2.hxx |1 -
3 files changed, 3 deletions(-)
New commits:
commit 95fab3f7dc1d7b802dce94d934b8ec95def92bf2
Author: Gabor Kelemen
AuthorDate: Sat Mar 30 20:54:12 2024 +0100
Commit: Gabor Kelemen
CommitDate: Mon Apr 8 10:06:39 2024 +0200
tdf#146619 Drop unused 'using namespace' in: basctl/
Change-Id: I7df9fa0e7de3cf7ee39ce96bf9ff32c54db14763
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165687
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/basctl/source/basicide/basobj3.cxx
b/basctl/source/basicide/basobj3.cxx
index 4672cdd52c2b..5d5bacf0e88d 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -48,7 +48,6 @@
namespace basctl
{
-using namespace comphelper;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
diff --git a/basctl/source/dlged/managelang.cxx
b/basctl/source/dlged/managelang.cxx
index 69f366ed6656..1dc44b0f09cf 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -40,7 +40,6 @@
namespace basctl
{
-using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::resource;
using namespace ::com::sun::star::uno;
diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx
index 0161797f16a2..22321b309757 100644
--- a/basctl/source/inc/bastype2.hxx
+++ b/basctl/source/inc/bastype2.hxx
@@ -45,7 +45,6 @@ namespace o3tl {
namespace basctl
{
-using namespace ::com::sun::star::uno;
enum EntryType
{
core.git: cui/source
cui/source/customize/SvxNotebookbarConfigPage.cxx |2 --
cui/source/dialogs/SignSignatureLineDialog.cxx|2 --
cui/source/dialogs/cuifmsearch.cxx|2 --
cui/source/dialogs/hldocntp.cxx |1 -
cui/source/dialogs/hltpbase.cxx |2 --
cui/source/dialogs/insdlg.cxx |1 -
cui/source/dialogs/multipat.cxx |1 -
cui/source/options/dbregister.cxx |2 --
cui/source/options/dbregisterednamesconfig.cxx|1 -
cui/source/options/optjava.cxx|2 --
cui/source/options/optjsearch.cxx |2 --
cui/source/options/optpath.cxx|1 -
cui/source/options/optsave.cxx|1 -
cui/source/options/personalization.cxx|1 -
cui/source/options/treeopt.cxx|1 -
cui/source/tabpages/autocdlg.cxx |1 -
cui/source/tabpages/numpages.cxx |1 -
17 files changed, 24 deletions(-)
New commits:
commit aa11db227da2830accac7c523c534b2b86a86bb2
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 21:52:52 2024 +0100
Commit: Gabor Kelemen
CommitDate: Fri Apr 5 13:45:28 2024 +0200
tdf#146619 Drop unused 'using namespace' in: cui/
Change-Id: I311423b045a504b268cffdf740db1fe82aea2810
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165568
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index d41ecf389e59..7389d05b91d2 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -45,10 +45,8 @@
namespace uno = com::sun::star::uno;
namespace frame = com::sun::star::frame;
-namespace lang = com::sun::star::lang;
namespace container = com::sun::star::container;
namespace beans = com::sun::star::beans;
-namespace graphic = com::sun::star::graphic;
static bool isCategoryAvailable(std::u16string_view sClassId,
std::u16string_view sUIItemId,
std::u16string_view sActiveCategory, bool&
isCategory)
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 4088b40e1765..d3e0bfb5b65e 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -41,8 +41,6 @@ using namespace css;
using namespace css::uno;
using namespace css::beans;
using namespace css::frame;
-using namespace css::io;
-using namespace css::lang;
using namespace css::frame;
using namespace css::text;
using namespace css::graphic;
diff --git a/cui/source/dialogs/cuifmsearch.cxx
b/cui/source/dialogs/cuifmsearch.cxx
index bb3bfaf5cac5..eff48a747fe7 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -34,10 +34,8 @@
#include
using namespace css::uno;
-using namespace css::i18n;
using namespace ::svxform;
using namespace css::sdbc;
-using namespace css::util;
#define MAX_HISTORY_ENTRIES 50
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 3b3352315dd1..d58077a431f4 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -43,7 +43,6 @@
#include
#include
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 24621538caec..7f2230e1d87a 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -39,8 +39,6 @@
#include
#include
-using namespace ::ucbhelper;
-
namespace {
OUString CreateUiNameFromURL( const OUString& aStrURL )
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 3cb50c2a6066..e4c1c6687768 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -58,7 +58,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
using namespace ::com::sun::star::ui::dialogs;
bool InsertObjectDialog_Impl::IsCreateNew() const
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 085d21f995de..e385a6ccface 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -36,7 +36,6 @@
#include
#include
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
diff --git a/cui/source/options/dbregister.cxx
b/cui/source/options/dbregister.cxx
index 8386cc546595..6aa9213efd92 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -45,9 +45,7 @@ namespace svx
{
-using namespace ::com::s
core.git: forms/source
forms/source/component/Button.cxx |1 - forms/source/component/CheckBox.cxx |4 forms/source/component/Columns.cxx |1 - forms/source/component/ComboBox.cxx |2 -- forms/source/component/Currency.cxx |4 forms/source/component/Date.cxx |4 forms/source/component/Edit.cxx |1 - forms/source/component/EditBase.cxx |5 - forms/source/component/File.cxx |2 -- forms/source/component/Filter.cxx |2 -- forms/source/component/FixedText.cxx|3 --- forms/source/component/FormattedField.cxx |2 -- forms/source/component/FormattedFieldWrapper.cxx|4 forms/source/component/FormsCollection.cxx |2 -- forms/source/component/GroupBox.cxx |3 --- forms/source/component/Hidden.cxx |3 --- forms/source/component/ImageButton.cxx |1 - forms/source/component/Numeric.cxx |5 - forms/source/component/RadioButton.cxx |3 --- forms/source/component/Time.cxx |4 forms/source/component/clickableimage.cxx |1 - forms/source/component/formcontrolfont.cxx |1 - forms/source/component/navigationbar.cxx|2 -- forms/source/component/refvaluecomponent.cxx|1 - forms/source/component/scrollbar.cxx|3 --- forms/source/component/spinbutton.cxx |3 --- forms/source/helper/controlfeatureinterception.cxx |1 - forms/source/richtext/attributedispatcher.cxx |1 - forms/source/richtext/parametrizedattributedispatcher.cxx |1 - forms/source/richtext/richtextcontrol.cxx |1 - forms/source/richtext/richtextmodel.cxx |1 - forms/source/richtext/richtextunowrapper.cxx|2 -- forms/source/richtext/specialdispatchers.cxx|1 - forms/source/solar/component/navbarcontrol.cxx |1 - forms/source/xforms/submission/serialization_urlencoded.cxx |1 - forms/source/xforms/submission/submission_get.cxx |1 - forms/source/xforms/submission/submission_post.cxx |1 - forms/source/xforms/submission/submission_put.cxx |1 - forms/source/xforms/xpathlib/extension.cxx |1 - 39 files changed, 81 deletions(-) New commits: commit ad640dedd269dc1e03cf362e11975bbd6d963120 Author: Gabor Kelemen AuthorDate: Fri Mar 29 22:48:22 2024 +0100 Commit: Gabor Kelemen CommitDate: Fri Apr 5 13:45:10 2024 +0200 tdf#146619 Drop unused 'using namespace' in: forms Change-Id: I5d81e8c359100da2a7dd98e75a1f79bbb73d9521 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165570 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 28cac777ea43..58a6627119ed 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::container; using namespace ::com::sun::star::form; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::io; diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index fcfdabc53ae1..064a156b1a95 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -31,13 +31,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::container; using namespace ::com::sun::star::form; -using namespace ::com::sun::star::awt; using namespace ::com::sun::star::io; -using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; -using namespace ::com::sun::star::form::binding; OCheckBoxControl::OCheckBoxControl(const Reference& _rxFactory) :OBoundControl(_rxFactory, VCL_CONTROL_CHECKBOX) diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 56be293fc549..1ba457d567a7 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::
core.git: toolkit/source
toolkit/source/awt/vclxspinbutton.cxx |1 -
toolkit/source/awt/vclxtabpagecontainer.cxx|1 -
toolkit/source/controls/dialogcontrol.cxx |1 -
toolkit/source/controls/eventcontainer.cxx |1 -
toolkit/source/controls/filectrl.cxx |1 -
toolkit/source/controls/table/tablecontrol.cxx |1 -
toolkit/source/controls/tabpagecontainer.cxx |1 -
7 files changed, 7 deletions(-)
New commits:
commit b0edb1909b9deb1a170497f935a528f8118c8308
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 14:08:31 2024 +0100
Commit: Gabor Kelemen
CommitDate: Wed Apr 3 19:07:48 2024 +0200
tdf#146619 Drop unused 'using namespace' in: toolkit/
Change-Id: Idab290ebc1394587c17dbec0c110bfa759cbdb8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165540
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/toolkit/source/awt/vclxspinbutton.cxx
b/toolkit/source/awt/vclxspinbutton.cxx
index cc4747dc20f4..5da0c3ad0649 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.cxx
@@ -32,7 +32,6 @@ namespace toolkit
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
namespace
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index f9f4779a2603..9df3a701c8a0 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::view;
void VCLXTabPageContainer::GetPropertyIds( std::vector< sal_uInt16 > )
diff --git a/toolkit/source/controls/dialogcontrol.cxx
b/toolkit/source/controls/dialogcontrol.cxx
index ba954a15412a..8adc7af9c41b 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -56,7 +56,6 @@ using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::util;
constexpr OUStringLiteral PROPERTY_DIALOGSOURCEURL = u"DialogSourceURL";
constexpr OUStringLiteral PROPERTY_IMAGEURL = u"ImageURL";
diff --git a/toolkit/source/controls/eventcontainer.cxx
b/toolkit/source/controls/eventcontainer.cxx
index 7611e0f2fe5f..e51b076d80fb 100644
--- a/toolkit/source/controls/eventcontainer.cxx
+++ b/toolkit/source/controls/eventcontainer.cxx
@@ -26,7 +26,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
-using namespace com::sun::star::registry;
using namespace com::sun::star::script;
using namespace cppu;
diff --git a/toolkit/source/controls/filectrl.cxx
b/toolkit/source/controls/filectrl.cxx
index f1b476220bcd..25835bf063ab 100644
--- a/toolkit/source/controls/filectrl.cxx
+++ b/toolkit/source/controls/filectrl.cxx
@@ -30,7 +30,6 @@
#include
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui;
diff --git a/toolkit/source/controls/table/tablecontrol.cxx
b/toolkit/source/controls/table/tablecontrol.cxx
index 42b314569e82..7e609601722a 100644
--- a/toolkit/source/controls/table/tablecontrol.cxx
+++ b/toolkit/source/controls/table/tablecontrol.cxx
@@ -33,7 +33,6 @@
using namespace ::com::sun::star::uno;
using ::com::sun::star::accessibility::XAccessible;
using namespace ::com::sun::star::accessibility;
-using namespace ::com::sun::star::lang;
namespace svt::table
{
diff --git a/toolkit/source/controls/tabpagecontainer.cxx
b/toolkit/source/controls/tabpagecontainer.cxx
index 367b5c4f2211..2a3ace044023 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.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::container;
-using namespace ::com::sun::star::view;
using ::com::sun::star::awt::tab::XTabPageModel;
constexpr OUStringLiteral WRONG_TYPE_EXCEPTION = u"Type must be
css::awt::tab::XTabPageModel!";
core.git: sd/source
sd/source/console/PresenterPane.cxx |1 -
sd/source/console/PresenterSpritePane.cxx |1 -
sd/source/core/drawdoc.cxx|1 -
sd/source/core/drawdoc4.cxx |1 -
sd/source/core/sdpage2.cxx|1 -
sd/source/filter/cgm/sdcgmfilter.cxx |1 -
sd/source/filter/eppt/pptx-animations-cond.cxx|1 -
sd/source/filter/grf/sdgrffilter.cxx |1 -
sd/source/filter/html/htmlex.cxx |3 ---
sd/source/filter/xml/sdtransform.cxx |2 --
sd/source/ui/accessibility/AccessiblePresentationShape.cxx|1 -
sd/source/ui/annotations/annotationmanager.cxx|6 --
sd/source/ui/annotations/annotationtag.cxx|3 ---
sd/source/ui/app/sdxfer.cxx |2 --
sd/source/ui/controller/slidelayoutcontroller.cxx |1 -
sd/source/ui/dlg/present.cxx |1 -
sd/source/ui/dlg/tpaction.cxx |1 -
sd/source/ui/docshell/docshel3.cxx|2 --
sd/source/ui/framework/module/DrawModule.cxx |1 -
sd/source/ui/framework/module/ImpressModule.cxx |1 -
sd/source/ui/framework/module/PresentationModule.cxx |1 -
sd/source/ui/func/futext.cxx |2 --
sd/source/ui/remotecontrol/Receiver.cxx |1 -
sd/source/ui/remotecontrol/Server.cxx |1 -
sd/source/ui/sidebar/MasterPageContainerFiller.cxx|1 -
sd/source/ui/sidebar/MasterPagesSelector.cxx |2 --
sd/source/ui/sidebar/PanelFactory.cxx |1 -
sd/source/ui/slideshow/slideshow.cxx |1 -
sd/source/ui/slideshow/slideshowimpl.cxx |1 -
sd/source/ui/slidesorter/controller/SlideSorterController.cxx |1 -
sd/source/ui/slidesorter/controller/SlsPageSelector.cxx |1 -
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx|1 -
sd/source/ui/slidesorter/view/SlideSorterView.cxx |1 -
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx|2 --
sd/source/ui/table/TableDesignPane.cxx|1 -
sd/source/ui/table/tablefunction.cxx |5 -
sd/source/ui/unoidl/UnoDocumentSettings.cxx |2 --
sd/source/ui/view/ViewShellImplementation.cxx |3 ---
sd/source/ui/view/drviews7.cxx|1 -
sd/source/ui/view/drviewsf.cxx|1 -
sd/source/ui/view/outlnvs2.cxx|3 ---
sd/source/ui/view/outlnvsh.cxx|1 -
sd/source/ui/view/presvish.cxx|4
sd/source/ui/view/sdview3.cxx |1 -
44 files changed, 71 deletions(-)
New commits:
commit 6dc092045c0e8bb46c0f5e90f529a9285727f93f
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 21:45:08 2024 +0100
Commit: Gabor Kelemen
CommitDate: Wed Apr 3 19:03:25 2024 +0200
tdf#146619 Drop unused 'using namespace' in: sd/
Change-Id: I7e48be1962d1e643c49c8cc0d6ca01ffbbb97429
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165567
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sd/source/console/PresenterPane.cxx
b/sd/source/console/PresenterPane.cxx
index ad35315438e8..41420843971f 100644
--- a/sd/source/console/PresenterPane.cxx
+++ b/sd/source/console/PresenterPane.cxx
@@ -24,7 +24,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
namespace sdext::presenter {
diff --git a/sd/source/console/PresenterSpritePane.cxx
b/sd/source/console/PresenterSpritePane.cxx
index c90f250fb192..a1a2f7148168 100644
--- a/sd/source/console/PresenterSpritePane.cxx
+++ b/sd/source/console/PresenterSpritePane.cxx
@@ -23,7 +23,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
namespace sdext::presenter {
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index ea32e0f5e8d6..1ed511467158 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -87,7 +87,6 @@ namespace com::sun::star::linguistic2 { class XSpellChecker1;
}
using namespace ::sd;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::linguistic2;
using namespace com::sun::star::xml::dom;
diff --git a/sd/source
core.git: test/source
test/source/unoapixml_test.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 1c9c748c71f7adff6b6ba1a893950c4ad3a4d1ff Author: Gabor Kelemen AuthorDate: Fri Mar 29 14:20:48 2024 +0100 Commit: Gabor Kelemen CommitDate: Wed Apr 3 19:02:48 2024 +0200 tdf#146619 Drop unused 'using namespace' in: test/ Change-Id: I2b10b005a1f8ac9d4aa6af7516bca98e6dcd41c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165566 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/test/source/unoapixml_test.cxx b/test/source/unoapixml_test.cxx index bf0f830a7355..d07c97351066 100644 --- a/test/source/unoapixml_test.cxx +++ b/test/source/unoapixml_test.cxx @@ -19,7 +19,6 @@ #include using namespace css; -using namespace css::uno; UnoApiXmlTest::UnoApiXmlTest(OUString path) : UnoApiTest(std::move(path))
core.git: svtools/source
svtools/source/brwbox/brwbox3.cxx |2 --
svtools/source/config/accessibilityoptions.cxx |3 ---
svtools/source/config/miscopt.cxx |1 -
svtools/source/config/printoptions.cxx |3 ---
svtools/source/control/inettbc.cxx |1 -
svtools/source/control/ruler.cxx |1 -
svtools/source/control/toolbarmenu.cxx |1 -
svtools/source/control/valueset.cxx|1 -
svtools/source/dialogs/addresstemplate.cxx |1 -
svtools/source/dialogs/colrdlg.cxx |1 -
svtools/source/misc/dialogclosedlistener.cxx |1 -
svtools/source/misc/stringtransfer.cxx |1 -
svtools/source/uno/addrtempuno.cxx |1 -
svtools/source/uno/framestatuslistener.cxx |1 -
14 files changed, 19 deletions(-)
New commits:
commit 2c2c1d274fe6336f4f88dd2fb9f716c1d1b092d2
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 14:08:57 2024 +0100
Commit: Gabor Kelemen
CommitDate: Wed Apr 3 08:58:06 2024 +0200
tdf#146619 Drop unused 'using namespace' in: svtools/
Change-Id: Ia74e293ba140d7e204a2706b8e2827669bfdfb1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165541
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/svtools/source/brwbox/brwbox3.cxx
b/svtools/source/brwbox/brwbox3.cxx
index 32ab1807ac69..1237060a1b89 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -35,8 +35,6 @@ using namespace ::com::sun::star::accessibility;
namespace svt
{
-using namespace ::com::sun::star::lang;
-
static Reference< XAccessible > getHeaderCell(
BrowseBoxImpl::THeaderCellMap& _raHeaderCells,
sal_Int32 _nPos,
AccessibleBrowseBoxObjType _eType,
diff --git a/svtools/source/config/accessibilityoptions.cxx
b/svtools/source/config/accessibilityoptions.cxx
index 949404491805..f931bf4aa890 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -35,9 +35,6 @@
#include
-using namespace utl;
-using namespace com::sun::star::uno;
-
#define HELP_TIP_TIMEOUT 0x // max. timeout setting to pretend a
non-timeout
namespace SvtAccessibilityOptions
diff --git a/svtools/source/config/miscopt.cxx
b/svtools/source/config/miscopt.cxx
index ca8537b1c38c..31257615c2b1 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -37,7 +37,6 @@
#include
using namespace ::utl ;
-using namespace ::osl ;
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star;
diff --git a/svtools/source/config/printoptions.cxx
b/svtools/source/config/printoptions.cxx
index 3f6293813a09..769afbde2cb1 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -27,9 +27,6 @@ const sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
#define DPI_COUNT (SAL_N_ELEMENTS(aDPIArray))
-using namespace ::osl;
-using namespace ::com::sun::star::uno;
-
namespace svtools
{
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index 0ffad5414c08..fb98ebb45182 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -60,7 +60,6 @@ using namespace ::ucbhelper;
using namespace ::utl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::ucb;
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 5dbe5014f94b..f26240107f9f 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -37,7 +37,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility;
#define RULER_OFF 3
diff --git a/svtools/source/control/toolbarmenu.cxx
b/svtools/source/control/toolbarmenu.cxx
index 92519ad356ad..8a1761a7006e 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -31,7 +31,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::accessibility;
namespace {
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index 87696d1a7886..0127ea7a1901 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -43,7 +43,6 @@
#include
using namespace css::uno;
-using namespace css::lang;
using namespace css::accessibility;
namespace
diff --git a/svtools/source/dialogs/addresstemplate.cxx
b/svtools/sour
core.git: svgio/source
svgio/source/svgreader/svgtextposition.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 28d6c626fd0039413daa31ab37c006c64a63e05e
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 14:08:03 2024 +0100
Commit: Gabor Kelemen
CommitDate: Wed Apr 3 08:57:49 2024 +0200
tdf#146619 Drop unused 'using namespace' in: svgio/
Change-Id: I4db608823faf4588e65e53fd099c9bc76bf39f68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165539
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/svgio/source/svgreader/svgtextposition.cxx
b/svgio/source/svgreader/svgtextposition.cxx
index 50a896ba2204..fe83b801dd47 100644
--- a/svgio/source/svgreader/svgtextposition.cxx
+++ b/svgio/source/svgreader/svgtextposition.cxx
@@ -19,8 +19,6 @@
#include
-using namespace drawinglayer::primitive2d;
-
namespace svgio::svgreader
{
SvgTextPosition::SvgTextPosition(SvgTextPosition* pParent, const SvgTspanNode&
rSvgTspanNode)
core.git: dbaccess/qa dbaccess/source
/source/ui/dlg/UserAdminDlg.cxx|2 -- dbaccess/source/ui/dlg/adminpages.cxx |3 --- dbaccess/source/ui/dlg/dbadmin.cxx |3 --- dbaccess/source/ui/dlg/dbwiz.cxx |1 - dbaccess/source/ui/dlg/dbwizsetup.cxx |1 - dbaccess/source/ui/dlg/detailpages.cxx |5 - dbaccess/source/ui/dlg/dlgsave.cxx |2 -- dbaccess/source/ui/dlg/dsselect.cxx|5 - dbaccess/source/ui/dlg/paramdialog.cxx |2 -- dbaccess/source/ui/dlg/queryfilter.cxx |3 --- dbaccess/source/ui/dlg/queryorder.cxx |3 --- dbaccess/source/ui/dlg/tablespage.cxx |3 --- dbaccess/source/ui/misc/RowSetDrop.cxx |4 dbaccess/source/ui/misc/TableCopyHelper.cxx|2 -- dbaccess/source/ui/misc/UITools.cxx|1 - dbaccess/source/ui/misc/WCPage.cxx |1 - dbaccess/source/ui/misc/WColumnSelect.cxx |3 --- dbaccess/source/ui/misc/WTypeSelect.cxx|1 - dbaccess/source/ui/misc/dsmeta.cxx |1 - dbaccess/source/ui/misc/linkeddocuments.cxx|3 --- dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx|1 - dbaccess/source/ui/querydesign/JAccess.cxx |1 - dbaccess/source/ui/querydesign/JoinController.cxx |4 dbaccess/source/ui/querydesign/JoinDesignView.cxx |5 - dbaccess/source/ui/querydesign/JoinExchange.cxx|1 - dbaccess/source/ui/querydesign/JoinTableView.cxx |1 - dbaccess/source/ui/querydesign/QTableWindow.cxx|1 - dbaccess/source/ui/querydesign/QueryDesignView.cxx |2 -- dbaccess/source/ui/querydesign/QueryTextView.cxx |2 -- dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |2 -- dbaccess/source/ui/querydesign/TableConnection.cxx |2 -- dbaccess/source/ui/querydesign/TableFieldDescription.cxx |1 - dbaccess/source/ui/querydesign/TableWindow.cxx |4 dbaccess/source/ui/querydesign/TableWindowAccess.cxx |1 - dbaccess/source/ui/querydesign/TableWindowTitle.cxx|2 -- dbaccess/source/ui/querydesign/querycontainerwindow.cxx|1 - dbaccess/source/ui/querydesign/querycontroller.cxx |2 -- dbaccess/source/ui/relationdesign/RTableConnectionData.cxx |1 - dbaccess/source/ui/relationdesign/RelationController.cxx |3 --- dbaccess/source/ui/relationdesign/RelationDesignView.cxx |4 dbaccess/source/ui/relationdesign/RelationTableView.cxx|1 - dbaccess/source/ui/tabledesign/TEditControl.cxx|4 dbaccess/source/ui/tabledesign/TableController.cxx |2 -- dbaccess/source/ui/tabledesign/TableDesignView.cxx |1 - dbaccess/source/ui/tabledesign/TableRow.cxx|2 -- dbaccess/source/ui/tabledesign/TableRowExchange.cxx|1 - dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx |1 - dbaccess/source/ui/uno/ColumnControl.cxx |1 - dbaccess/source/ui/uno/ColumnPeer.cxx |2 -- dbaccess/source/ui/uno/DBTypeWizDlg.cxx|1 - dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx |2 -- dbaccess/source/ui/uno/TableFilterDlg.cxx |1 - dbaccess/source/ui/uno/UserSettingsDlg.cxx |1 - dbaccess/source/ui/uno/admindlg.cxx|1 - dbaccess/source/ui/uno/composerdialogs.cxx |1 - dbaccess/source/ui/uno/dbinteraction.cxx |2 -- dbaccess/source/ui/uno/unoDirectSql.cxx|2 -- dbaccess/source/ui/uno/unoadmin.cxx|1 - 129 files changed, 276 deletions(-) New commits: commit 69303d5d09cb8ec49d90e19eaf16eabb24f77725 Author: Gabor Kelemen AuthorDate: Fri Mar 29 14:09:38 2024 +0100 Commit: Gabor Kelemen CommitDate: Wed Apr 3 08:57:28 2024 +0200 tdf#146619 Drop unused 'using namespace' in: dbaccess/ Change-Id: If006c5f0002b9d5981220efa22873bf0adb169bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165543 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx index a48115ed418d..c2f75fa3c8f6 100644 --- a/dbaccess/qa/extras/macros-test.cxx +++ b/dbaccess/qa/extras/macros-test.cxx @@ -11,7 +11,6 @@ #include using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; #if !defined(MACOSX) && !defined(_WIN32) diff --git a/dbaccess/qa/extras/rowsetclones.cxx b/dbaccess/qa/extras/rowsetclones.cxx index 0afc
core.git: svx/source
svx/source/dialog/dlgctrl.cxx |1 - svx/source/dialog/fntctrl.cxx |3 --- svx/source/dialog/searchcharmap.cxx |2 -- svx/source/dialog/srchdlg.cxx |2 -- svx/source/fmcomp/dbaexchange.cxx |1 - svx/source/fmcomp/dbaobjectex.cxx |2 -- svx/source/form/dataaccessdescriptor.cxx|1 - svx/source/form/fmdocumentclassification.cxx|1 - svx/source/form/fmobj.cxx |2 -- svx/source/form/fmshell.cxx |1 - svx/source/form/fmtextcontrolshell.cxx |1 - svx/source/form/fmtools.cxx |4 svx/source/form/fmview.cxx |3 --- svx/source/form/navigatortreemodel.cxx |3 --- svx/source/form/sdbdatacolumn.cxx |2 -- svx/source/form/sqlparserclient.cxx |2 -- svx/source/sidebar/media/MediaPlaybackPanel.hxx |1 - svx/source/sidebar/nbdtmg.cxx |1 - svx/source/table/accessiblecell.cxx |1 - svx/source/table/accessibletableshape.cxx |2 -- svx/source/table/cell.cxx |1 - svx/source/table/cellrange.cxx |1 - svx/source/table/tablecolumns.cxx |1 - svx/source/table/tablelayouter.cxx |1 - svx/source/table/tablerows.cxx |1 - svx/source/table/tableundo.cxx |1 - svx/source/tbxctrls/extrusioncontrols.cxx |1 - svx/source/tbxctrls/fillctrl.cxx|2 -- svx/source/tbxctrls/fontworkgallery.cxx |1 - svx/source/tbxctrls/grafctrl.cxx|2 -- svx/source/tbxctrls/itemwin.cxx |1 - svx/source/tbxctrls/linectrl.cxx|1 - svx/source/tbxctrls/linewidthctrl.cxx |5 - svx/source/toolbars/extrusionbar.cxx|1 - svx/source/toolbars/fontworkbar.cxx |1 - svx/source/unodraw/UnoGraphicExporter.cxx |1 - svx/source/unodraw/tableshape.cxx |3 --- svx/source/unodraw/unoshap2.cxx |1 - svx/source/unodraw/unoshap4.cxx |1 - svx/source/unodraw/unoshape.cxx |1 - svx/source/xml/xmleohlp.cxx |1 - svx/source/xml/xmlxtimp.cxx |1 - 42 files changed, 66 deletions(-) New commits: commit 704e71b9d13054a7e21a037663de4feacae2ef25 Author: Gabor Kelemen AuthorDate: Fri Mar 29 14:09:14 2024 +0100 Commit: Gabor Kelemen CommitDate: Wed Apr 3 08:50:52 2024 +0200 tdf#146619 Drop unused 'using namespace' in: svx/ Change-Id: Ic8b925a3ec55166a9d5da05827d2cb335943b665 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165542 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 456a369fcd16..d68a68faa4d3 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; // Control for display and selection of the corner points and diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index b0723c8e65c1..ad9c5fc62c49 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -66,9 +66,6 @@ //an arbitrary number of characters #define TEXT_WIDTH 80 -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; - // small helper functions to set fonts diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx index 7284bfd0874b..c1c289d6366d 100644 --- a/svx/source/dialog/searchcharmap.cxx +++ b/svx/source/dialog/searchcharmap.cxx @@ -31,8 +31,6 @@ #include -using namespace ::com::sun::star::accessibility; -using namespace ::com::sun::star::uno; using namespace ::com::sun::star; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 93d593d8729f..481124e3c963 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -76,9 +76,7 @@ #include #include -using namespace com::sun::star::i18n; using namespace com::sun::star::uno; -using namespace com::sun::star::accessibility; using namespace com::sun::star; using namespace comphelper; diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 904740e38877..8b2c869fd611 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -38,7 +38,6 @@ namespace svx using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::lang; using namespace
core.git: i18npool/source
i18npool/source/breakiterator/breakiterator_cjk.cxx|1 -
i18npool/source/breakiterator/breakiterator_th.cxx |1 -
i18npool/source/calendar/calendar_hijri.cxx|2 --
i18npool/source/calendar/calendar_jewish.cxx |2 --
i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx |2 --
i18npool/source/localedata/LocaleNode.hxx |1 -
i18npool/source/registerservices/registerservices.cxx |1 -
i18npool/source/transliteration/chartonum.cxx |2 --
i18npool/source/transliteration/fullwidthToHalfwidth.cxx |1 -
i18npool/source/transliteration/halfwidthToFullwidth.cxx |1 -
i18npool/source/transliteration/hiraganaToKatakana.cxx |3 ---
i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx |2 --
i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx |3 ---
i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx |1 -
i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx |1 -
i18npool/source/transliteration/ignoreKana.cxx |1 -
i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx |1 -
i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx |1 -
i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx |3 ---
i18npool/source/transliteration/ignoreSize_ja_JP.cxx |1 -
i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx |3 ---
i18npool/source/transliteration/ignoreWidth.cxx|1 -
i18npool/source/transliteration/largeToSmall_ja_JP.cxx |3 ---
i18npool/source/transliteration/smallToLarge_ja_JP.cxx |3 ---
i18npool/source/transliteration/texttonum.cxx |2 --
25 files changed, 43 deletions(-)
New commits:
commit aacdc24be7a256ea66d45f9ab3d275721c8bafbf
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 14:07:28 2024 +0100
Commit: Gabor Kelemen
CommitDate: Tue Apr 2 17:28:22 2024 +0200
tdf#146619 Drop unused 'using namespace' in: i18npool/
Change-Id: I3c4ca1083f8ef4053d1b4202bf9617b9373312bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165537
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx
b/i18npool/source/breakiterator/breakiterator_cjk.cxx
index f657daab0e2f..00dc5e9db0f6 100644
--- a/i18npool/source/breakiterator/breakiterator_cjk.cxx
+++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx
@@ -23,7 +23,6 @@
#include
#include
-using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx
b/i18npool/source/breakiterator/breakiterator_th.cxx
index d7accc160f7d..531107b2a102 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -24,7 +24,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
diff --git a/i18npool/source/calendar/calendar_hijri.cxx
b/i18npool/source/calendar/calendar_hijri.cxx
index ed64c80db68c..c1223cc3f767 100644
--- a/i18npool/source/calendar/calendar_hijri.cxx
+++ b/i18npool/source/calendar/calendar_hijri.cxx
@@ -26,8 +26,6 @@
#include
#include
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::i18n;
namespace i18npool {
diff --git a/i18npool/source/calendar/calendar_jewish.cxx
b/i18npool/source/calendar/calendar_jewish.cxx
index 19b55eaf8789..faeb7f74b13a 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -24,9 +24,7 @@
#include
#include
-using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::lang;
namespace i18npool {
diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
index 184662f9e56f..53b25d8ed28f 100644
--- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
@@ -24,8 +24,6 @@
#include "data/indexdata_ja_phonetic.h"
#include
-using namespace ::com::sun::star::i18n;
-
namespace i18npool {
OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const
OUString& rIndexEntry,
diff --git a/i18npool/source/localedata/LocaleNode.hxx
b/i18npool/source/localedata/LocaleNode.hxx
index 495c696b4291..9bb3bee2a5f4 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNod
core.git: basic/source
basic/source/classes/eventatt.cxx|1 -
basic/source/runtime/iosys.cxx |2 --
basic/source/runtime/runtime.cxx |1 -
basic/source/uno/dlgcont.cxx |1 -
basic/source/uno/modsizeexceeded.cxx |1 -
basic/source/uno/namecont.cxx|1 -
basic/source/uno/scriptcont.cxx |2 --
7 files changed, 9 deletions(-)
New commits:
commit 49a6a819651caf493038a7d333764ff5cb370a23
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 14:06:47 2024 +0100
Commit: Gabor Kelemen
CommitDate: Tue Apr 2 08:32:46 2024 +0200
tdf#146619 Drop unused 'using namespace' in: basic/
Change-Id: I55bd0c89880dd97307dde5a5b670e63f3ea66355
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165536
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/basic/source/classes/eventatt.cxx
b/basic/source/classes/eventatt.cxx
index 93399726ef11..6cf371f3869a 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -58,7 +58,6 @@ using namespace ::com::sun::star::script;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::reflection;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::io;
using namespace ::cppu;
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 3d03274c46c0..015ed8abc29b 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -40,10 +40,8 @@
#include
using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
using namespace com::sun::star::ucb;
using namespace com::sun::star::io;
-using namespace com::sun::star::bridge;
namespace {
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 35627045eda8..5d8a2ba2ffc3 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -76,7 +76,6 @@ using com::sun::star::uno::Reference;
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
using namespace com::sun::star::lang;
-using namespace com::sun::star::beans;
using namespace com::sun::star::script;
using namespace ::com::sun::star;
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 170a5c0c01cd..533deb182d58 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -53,7 +53,6 @@ using namespace com::sun::star::io;
using namespace com::sun::star::uno;
using namespace com::sun::star::ucb;
using namespace com::sun::star::lang;
-using namespace com::sun::star::script;
using namespace com::sun::star::xml::sax;
using namespace com::sun::star;
using namespace cppu;
diff --git a/basic/source/uno/modsizeexceeded.cxx
b/basic/source/uno/modsizeexceeded.cxx
index b85f285d820f..4210184b37d6 100644
--- a/basic/source/uno/modsizeexceeded.cxx
+++ b/basic/source/uno/modsizeexceeded.cxx
@@ -25,7 +25,6 @@
using namespace com::sun::star;
using namespace cppu;
-using namespace osl;
ModuleSizeExceeded::ModuleSizeExceeded(const std::vector& sModules)
{
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 2d1dea85fc67..228220182811 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -90,7 +90,6 @@ using namespace com::sun::star::frame;
using namespace com::sun::star::deployment;
using namespace com::sun::star;
using namespace cppu;
-using namespace osl;
using com::sun::star::uno::Reference;
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 2f5cb5f15198..d078deddece4 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -51,7 +51,6 @@
namespace basic
{
-using namespace com::sun::star::document;
using namespace com::sun::star::container;
using namespace com::sun::star::io;
using namespace com::sun::star::uno;
@@ -61,7 +60,6 @@ using namespace com::sun::star::script;
using namespace com::sun::star::xml::sax;
using namespace com::sun::star;
using namespace cppu;
-using namespace osl;
// Implementation class SfxScriptLibraryContainer
core.git: sfx2/source
sfx2/source/appl/appbas.cxx|1 -
sfx2/source/appl/appbaslib.cxx |1 -
sfx2/source/appl/appcfg.cxx|2 --
sfx2/source/appl/appmisc.cxx |1 -
sfx2/source/appl/newhelp.cxx |1 -
sfx2/source/appl/opengrf.cxx |1 -
sfx2/source/appl/sfxhelp.cxx |2 --
sfx2/source/appl/sfxpicklist.cxx |2 --
sfx2/source/bastyp/helper.cxx |1 -
sfx2/source/control/recentdocsview.cxx |2 --
sfx2/source/control/thumbnailview.cxx |1 -
sfx2/source/dialog/mailmodel.cxx |1 -
sfx2/source/doc/objmisc.cxx|1 -
sfx2/source/doc/objserv.cxx|1 -
sfx2/source/doc/objstor.cxx|1 -
sfx2/source/doc/templatedlg.cxx|1 -
sfx2/source/inet/inettbc.cxx |1 -
sfx2/source/sidebar/ControllerItem.cxx |1 -
sfx2/source/sidebar/Deck.cxx |1 -
sfx2/source/toolbox/tbxitem.cxx|3 ---
sfx2/source/view/frame2.cxx|2 --
sfx2/source/view/viewfrm2.cxx |2 --
sfx2/source/view/viewsh.cxx|1 -
23 files changed, 31 deletions(-)
New commits:
commit b77ad21d445783d77697470796be5c43f9fc5cd3
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 14:07:48 2024 +0100
Commit: Gabor Kelemen
CommitDate: Tue Apr 2 08:32:20 2024 +0200
tdf#146619 Drop unused 'using namespace' in: sfx2/
Change-Id: I3748612644c9c4eb88d7fb6e2d512954de9c1002
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165538
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index d26f9577ee27..8929ccf908cf 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -48,7 +48,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::script;
using ::basic::BasicManagerRepository;
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index bfeafa1b1b60..2d32e59ee9bc 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -28,7 +28,6 @@
#include
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::script;
using namespace ::com::sun::star::embed;
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index f18b93792236..074ad93b6f74 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -52,8 +52,6 @@
#include "shutdownicon.hxx"
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::beans;
namespace {
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 948a1de40fd0..01b278b16506 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -52,7 +52,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
SFX_IMPL_INTERFACE(SfxApplication,SfxShell)
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 7e51602371c1..925ed3a808ad 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -104,7 +104,6 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::view;
-using namespace ::com::sun::star::ui;
using namespace ::comphelper;
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 3c94ca7ffbc5..16e0731f310b 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -44,7 +44,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-using namespace ::cppu;
static TranslateId SvxOpenGrfErr2ResId( ErrCode err )
{
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index b297c27578dd..85d60828d2ba 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -83,8 +83,6 @@
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::lang;
namespace {
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 9453d8ee8b2c..bd7a0a091189 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -42,8 +42,6 @@
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::util;
class SfxPickListImpl : public SfxListener
{
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 27
core.git: desktop/source
desktop/source/app/app.cxx |1 -
desktop/source/app/appinit.cxx |2 --
desktop/source/deployment/misc/dp_resource.cxx |1 -
3 files changed, 4 deletions(-)
New commits:
commit 9f3d3cec7cd3b8c6e79f52028c89e0abd9b5eec0
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 14:05:52 2024 +0100
Commit: Gabor Kelemen
CommitDate: Mon Apr 1 20:47:52 2024 +0200
tdf#146619 Drop unused 'using namespace' in: desktop/
Change-Id: I120471364834dfd0702b6ce15f79a8327cac26b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165534
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d59855e58b03..0a893b9adc28 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -157,7 +157,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::view;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::system;
using namespace ::com::sun::star::ui;
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 1a0681f0d163..76bd04347ad6 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -51,8 +51,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::ucb;
namespace desktop
diff --git a/desktop/source/deployment/misc/dp_resource.cxx
b/desktop/source/deployment/misc/dp_resource.cxx
index 682c90e52458..30caef8d9a7d 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -22,7 +22,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
namespace dp_misc
{
core.git: 2 commits - lingucomponent/source linguistic/source
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx |1 - lingucomponent/source/spellcheck/spell/sspellimp.cxx |1 - lingucomponent/source/thesaurus/libnth/nthesdta.cxx |1 - linguistic/source/convdicxml.cxx |3 --- linguistic/source/hhconvdic.cxx |1 - linguistic/source/hyphdta.cxx |1 - linguistic/source/lngopt.cxx |1 - linguistic/source/spelldta.cxx|1 - 8 files changed, 10 deletions(-) New commits: commit 5a408044f924b1d7d221994ba901dbfe52b00c22 Author: Gabor Kelemen AuthorDate: Fri Mar 29 14:05:20 2024 +0100 Commit: Gabor Kelemen CommitDate: Mon Apr 1 20:47:37 2024 +0200 tdf#146619 Drop unused 'using namespace' in: lingucomponent/ Change-Id: I98f6edf1da4915ff43312c187e92891371833fc2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165533 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx index 63a0255c015b..4007c1b42555 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx @@ -61,7 +61,6 @@ // XML-header to query SPELLML support constexpr OUStringLiteral SPELLML_SUPPORT = u""; -using namespace utl; using namespace osl; using namespace com::sun::star; using namespace com::sun::star::beans; diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 075667f05bcb..468c9066aea0 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -52,7 +52,6 @@ #include #include -using namespace utl; using namespace osl; using namespace com::sun::star; using namespace com::sun::star::beans; diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx index e69df4ab4c38..b84eb90173eb 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx @@ -25,7 +25,6 @@ using namespace osl; using namespace com::sun::star; -using namespace com::sun::star::beans; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; commit 5bf63cdc6ad7b8549610ddb31fde482ff2160161 Author: Gabor Kelemen AuthorDate: Fri Mar 29 14:05:00 2024 +0100 Commit: Gabor Kelemen CommitDate: Mon Apr 1 20:47:27 2024 +0200 tdf#146619 Drop unused 'using namespace' in: linguistic/ Change-Id: Ib4df4e592e6b485dc087eddb49f59fc24c710380 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165532 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 370629925a45..dd21122c0794 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -34,12 +34,9 @@ #include "convdicxml.hxx" #include -using namespace utl; using namespace com::sun::star; -using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; -using namespace linguistic; constexpr OUStringLiteral XML_NAMESPACE_TCD_STRING = u"http://openoffice.org/2003/text-conversion-dictionary;; diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index e7712ee66be4..8752bbb046ea 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -36,7 +36,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; -using namespace i18n; constexpr OUString SN_HH_CONV_DICTIONARY = u"com.sun.star.linguistic2.HangulHanjaConversionDictionary"_ustr; diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index d19d8834006e..dc3787bc081e 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -27,7 +27,6 @@ #include #include -using namespace osl; using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::uno; diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 42bb6df95719..0ecf4d455a53 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -31,7 +31,6 @@ #include #include -using namespace utl; using namespace osl; using namespace com::sun::star; using namespace com::sun::star::beans; diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index 6aa99f8b70f6..91bd0c94cde8 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -34,7 +34,6 @@ using namespace osl; using namespace com::sun::star; -using name
core.git: framework/source
framework/source/fwe/xml/menuconfiguration.cxx |1 - framework/source/fwe/xml/statusbarconfiguration.cxx |1 - framework/source/fwe/xml/toolboxconfiguration.cxx |1 - framework/source/fwi/helper/mischelper.cxx |2 -- framework/source/helper/dockingareadefaultacceptor.cxx |2 -- framework/source/helper/ocomponentaccess.cxx|1 - framework/source/helper/ocomponentenumeration.cxx |1 - framework/source/helper/oframes.cxx |2 -- framework/source/uiconfiguration/imagemanager.cxx |2 -- framework/source/uiconfiguration/moduleuicfgsupplier.cxx|3 --- framework/source/uiconfiguration/uicategorydescription.cxx |1 - framework/source/uielement/FixedImageToolbarController.cxx |4 framework/source/uielement/FixedTextToolbarController.cxx |3 --- framework/source/uielement/comboboxtoolbarcontroller.cxx|2 -- framework/source/uielement/complextoolbarcontroller.cxx |1 - framework/source/uielement/controlmenucontroller.cxx|1 - framework/source/uielement/dropdownboxtoolbarcontroller.cxx |3 --- framework/source/uielement/edittoolbarcontroller.cxx|2 -- framework/source/uielement/fontmenucontroller.cxx |1 - framework/source/uielement/footermenucontroller.cxx |5 - framework/source/uielement/genericstatusbarcontroller.cxx |2 -- framework/source/uielement/headermenucontroller.cxx |1 - framework/source/uielement/imagebuttontoolbarcontroller.cxx |3 --- framework/source/uielement/langselectionmenucontroller.cxx |1 - framework/source/uielement/langselectionstatusbarcontroller.cxx |2 -- framework/source/uielement/macrosmenucontroller.cxx |3 --- framework/source/uielement/newmenucontroller.cxx|1 - framework/source/uielement/objectmenucontroller.cxx |3 --- framework/source/uielement/spinfieldtoolbarcontroller.cxx |2 -- framework/source/uielement/statusbarwrapper.cxx |1 - framework/source/uielement/statusindicatorinterfacewrapper.cxx |1 - framework/source/uielement/togglebuttontoolbarcontroller.cxx|2 -- framework/source/uielement/toolbarmodemenucontroller.cxx|3 --- framework/source/uifactory/addonstoolbarfactory.cxx |1 - framework/source/uifactory/menubarfactory.cxx |1 - framework/source/uifactory/statusbarfactory.cxx |2 -- framework/source/uifactory/toolbarfactory.cxx |1 - framework/source/uifactory/uicontrollerfactory.cxx |1 - 38 files changed, 70 deletions(-) New commits: commit 7c18a0bb37fc2cd50bd3fa4386b02d88fbedb773 Author: Gabor Kelemen AuthorDate: Fri Mar 29 14:04:32 2024 +0100 Commit: Gabor Kelemen CommitDate: Mon Apr 1 11:46:16 2024 +0200 tdf#146619 Drop unused 'using namespace' in: framework/ Change-Id: I03d2d3d07d0d71800df624510b5e20bd5e0588e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165531 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index d2131c8a8deb..1047422ed775 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::beans; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::container; using namespace ::com::sun::star::io; diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index ce974237b286..98130700ef26 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; using namespace ::com::sun::star::container; diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index d9e34baabc98..c88b3c01da2d 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; using namespace ::com::sun::star::container; diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx index e9c664d474df..af83c5867356
core.git: drawinglayer/source
drawinglayer/source/tools/emfpimageattributes.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit df58dfef115fe4589dfbfd6e6d348f24ce7ef2e9
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 14:02:42 2024 +0100
Commit: Gabor Kelemen
CommitDate: Mon Apr 1 11:45:46 2024 +0200
tdf#146619 Drop unused 'using namespace' in: drawinglayer/
Change-Id: I6d034b6c191885b25ad34f0d75ed870970b5fd77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165527
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/drawinglayer/source/tools/emfpimageattributes.cxx
b/drawinglayer/source/tools/emfpimageattributes.cxx
index c13da361bf1a..11c1f47173e4 100644
--- a/drawinglayer/source/tools/emfpimageattributes.cxx
+++ b/drawinglayer/source/tools/emfpimageattributes.cxx
@@ -22,7 +22,6 @@
#include "emfpimageattributes.hxx"
using namespace ::com::sun::star;
-using namespace ::basegfx;
namespace emfplushelper
{
core.git: 2 commits - accessibility/source connectivity/source
|4 connectivity/source/drivers/file/FDatabaseMetaData.cxx |1 - connectivity/source/drivers/file/FResultSetMetaData.cxx|1 - connectivity/source/drivers/file/FTables.cxx |2 -- connectivity/source/drivers/file/fanalyzer.cxx |1 - connectivity/source/drivers/file/fcode.cxx |1 - connectivity/source/drivers/firebird/Columns.cxx |2 -- connectivity/source/drivers/firebird/Tables.cxx|1 - connectivity/source/drivers/firebird/Users.cxx |2 -- connectivity/source/drivers/flat/ECatalog.cxx |1 - connectivity/source/drivers/flat/EColumns.cxx |4 connectivity/source/drivers/flat/EConnection.cxx |1 - connectivity/source/drivers/flat/EPreparedStatement.cxx|1 - connectivity/source/drivers/flat/EStatement.cxx|1 - connectivity/source/drivers/flat/ETables.cxx |7 --- connectivity/source/drivers/hsqldb/HCatalog.cxx|3 --- connectivity/source/drivers/hsqldb/HColumns.cxx|4 connectivity/source/drivers/hsqldb/HDriver.cxx |1 - connectivity/source/drivers/hsqldb/HStorageAccess.cxx |3 --- connectivity/source/drivers/hsqldb/HTables.cxx |1 - connectivity/source/drivers/hsqldb/HTerminateListener.cxx |1 - connectivity/source/drivers/hsqldb/HUsers.cxx |2 -- connectivity/source/drivers/hsqldb/HViews.cxx |3 --- connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx|2 -- connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx |4 connectivity/source/drivers/jdbc/CallableStatement.cxx |1 - connectivity/source/drivers/jdbc/DatabaseMetaData.cxx |3 --- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx|2 -- connectivity/source/drivers/jdbc/Object.cxx|2 -- connectivity/source/drivers/jdbc/PreparedStatement.cxx |1 - connectivity/source/drivers/jdbc/ResultSetMetaData.cxx |3 --- connectivity/source/drivers/jdbc/SQLException.cxx |1 - connectivity/source/drivers/jdbc/tools.cxx |1 - connectivity/source/drivers/mysql_jdbc/YCatalog.cxx|3 --- connectivity/source/drivers/mysql_jdbc/YColumns.cxx|4 connectivity/source/drivers/mysql_jdbc/YTables.cxx |1 - connectivity/source/drivers/mysql_jdbc/YUsers.cxx |2 -- connectivity/source/drivers/mysql_jdbc/YViews.cxx |3 --- connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx |1 - connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |1 - connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx|2 -- connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx|1 - connectivity/source/drivers/mysqlc/mysqlc_statement.cxx|2 -- connectivity/source/drivers/mysqlc/mysqlc_users.cxx|2 -- connectivity/source/drivers/odbc/OConnection.cxx |1 - connectivity/source/drivers/odbc/ODatabaseMetaData.cxx |2 -- connectivity/source/drivers/odbc/OPreparedStatement.cxx|2 -- connectivity/source/drivers/odbc/OResultSetMetaData.cxx|1 - connectivity/source/drivers/odbc/OStatement.cxx|2 -- connectivity/source/sdbcx/VDescriptor.cxx |1 - connectivity/source/sdbcx/VGroup.cxx |1 - connectivity/source/sdbcx/VIndex.cxx |1 - connectivity/source/sdbcx/VKey.cxx |1 - connectivity/source/sdbcx/VUser.cxx|1 - connectivity/source/sdbcx/VView.cxx|1 - 115 files changed, 223 deletions(-) New commits: commit b4a83e5b3ba1db9ce615a7c1fa1145ab64bd727e Author: Gabor Kelemen AuthorDate: Fri Mar 29 14:04:01 2024 +0100 Commit: Gabor Kelemen CommitDate: Mon Apr 1 10:03:56 2024 +0200 tdf#146619 Drop unused 'using namespace' in: accessibility/ Change-Id: I92662f0577c0f90ec0dc5eba1b685fbb7ac3da39 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165530 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/accessibility
core.git: xmlscript/qa xmlscript/source
xmlscript/qa/cppunit/test.cxx |1 - xmlscript/source/xml_helper/xml_byteseq.cxx |1 - xmlscript/source/xml_helper/xml_impctx.cxx |1 - 3 files changed, 3 deletions(-) New commits: commit d7acb0fc227732d4537111eb88308bca922b1bc2 Author: Gabor Kelemen AuthorDate: Fri Mar 29 14:03:18 2024 +0100 Commit: Gabor Kelemen CommitDate: Mon Apr 1 10:03:25 2024 +0200 tdf#146619 Drop unused 'using namespace' in: xmlscript/ Change-Id: Ic9874b77bdbb1d30fb587c5c8bbd62e4811c71e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165528 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/xmlscript/qa/cppunit/test.cxx b/xmlscript/qa/cppunit/test.cxx index f29c9bb7ba59..6db22be43738 100644 --- a/xmlscript/qa/cppunit/test.cxx +++ b/xmlscript/qa/cppunit/test.cxx @@ -33,7 +33,6 @@ #include #include -using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx index 2ae8ecea1661..a4cca34e2649 100644 --- a/xmlscript/source/xml_helper/xml_byteseq.cxx +++ b/xmlscript/source/xml_helper/xml_byteseq.cxx @@ -24,7 +24,6 @@ #include #include -using namespace osl; using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index 27a5e746a854..e9255e91a3bc 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -36,7 +36,6 @@ #include #include -using namespace ::osl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno;
core.git: sdext/IwyuFilter_sdext.yaml sdext/qa sdext/source
sdext/IwyuFilter_sdext.yaml|2 +-
sdext/qa/unit/pdfimport.cxx|1 -
sdext/source/minimizer/fileopendialog.cxx |1 -
sdext/source/minimizer/impoptimizer.cxx|1 -
sdext/source/minimizer/informationdialog.cxx |3 ---
sdext/source/minimizer/optimizerdialog.cxx |3 ---
sdext/source/minimizer/optimizerdialogcontrols.cxx |3 ---
sdext/source/minimizer/pagecollector.cxx |2 --
8 files changed, 1 insertion(+), 15 deletions(-)
New commits:
commit 3b85fd8a27edb7b9a0d92bad7969ef551d11450f
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 14:01:43 2024 +0100
Commit: Gabor Kelemen
CommitDate: Sun Mar 31 19:22:57 2024 +0200
tdf#146619 Drop unused 'using namespace' in: sdext/
Change-Id: I8c5012958f6e59ec11c8a7bd52592e30cce4117a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165525
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sdext/IwyuFilter_sdext.yaml b/sdext/IwyuFilter_sdext.yaml
index 9a0aaea804cc..2b00c256b4d2 100644
--- a/sdext/IwyuFilter_sdext.yaml
+++ b/sdext/IwyuFilter_sdext.yaml
@@ -1,5 +1,5 @@
---
-assumeFilename: sdext/source/presenter/PresenterSlideSorter.cxx
+assumeFilename: sdext/source/pdfimport/pdfiadaptor.cxx
excludelist:
sdext/source/pdfimport/odf/odfemitter.cxx:
# Actually in use
diff --git a/sdext/qa/unit/pdfimport.cxx b/sdext/qa/unit/pdfimport.cxx
index 18988d6845de..462edf2e7772 100644
--- a/sdext/qa/unit/pdfimport.cxx
+++ b/sdext/qa/unit/pdfimport.cxx
@@ -54,7 +54,6 @@
#include
#include
-using namespace ::pdfparse;
using namespace ::pdfi;
using namespace ::com::sun::star;
diff --git a/sdext/source/minimizer/fileopendialog.cxx
b/sdext/source/minimizer/fileopendialog.cxx
index 44dfb51bc74f..7ae877b13549 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::view;
using namespace ::com::sun::star::ui::dialogs;
FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >&
rxContext )
diff --git a/sdext/source/minimizer/impoptimizer.cxx
b/sdext/source/minimizer/impoptimizer.cxx
index c46617175e1c..abf54e296a77 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -63,7 +63,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::graphic;
-using namespace ::com::sun::star::document;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::presentation;
diff --git a/sdext/source/minimizer/informationdialog.cxx
b/sdext/source/minimizer/informationdialog.cxx
index caea0fc1d787..9872990a0f45 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -29,13 +29,10 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::ui;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
static OUString ImpValueOfInMB( sal_Int64 rVal )
{
diff --git a/sdext/source/minimizer/optimizerdialog.cxx
b/sdext/source/minimizer/optimizerdialog.cxx
index 773970a41b05..7efef618af9b 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -47,13 +47,10 @@
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::ui;
using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
IntroPage::IntroPage(weld::Container* pPage, OptimizerDialog& rOptimizerDialog)
: vcl::OWizardPage(pPage, ,
"modules/simpress/ui/pmintropage.ui", "PMIntroPage")
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx
b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 5ed2dd942b7e..d2c4e49f3b95 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -37,10 +37,7 @@
#include
#include
-using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::
core.git: fpicker/source
fpicker/source/office/OfficeFilePicker.cxx |1 -
fpicker/source/office/OfficeFolderPicker.cxx |1 -
fpicker/source/office/fileview.cxx |1 -
fpicker/source/office/fpsmartcontent.cxx |1 -
fpicker/source/office/iodlg.cxx |1 -
fpicker/source/office/iodlgimp.cxx |2 --
6 files changed, 7 deletions(-)
New commits:
commit 193bb41859a8b29904685bc6c544809fcb4b8f50
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 14:02:09 2024 +0100
Commit: Gabor Kelemen
CommitDate: Sun Mar 31 19:22:40 2024 +0200
tdf#146619 Drop unused 'using namespace' in: fpicker/
Change-Id: Ie090afbe19bffc493918ca19318ed16ac569bb83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165526
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/fpicker/source/office/OfficeFilePicker.cxx
b/fpicker/source/office/OfficeFilePicker.cxx
index 723a8a279918..c0ba40632a0c 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::awt;
-using namespace ::utl;
struct FilterEntry
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx
b/fpicker/source/office/OfficeFolderPicker.cxx
index c941d6cb63c3..779bbffda7ad 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -30,7 +30,6 @@
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
SvtFolderPicker::SvtFolderPicker()
{
diff --git a/fpicker/source/office/fileview.cxx
b/fpicker/source/office/fileview.cxx
index 1fa1c4dafcd3..6a77f9154ac8 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -64,7 +64,6 @@
#include
#include "fileview.hxx"
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::ucb;
diff --git a/fpicker/source/office/fpsmartcontent.cxx
b/fpicker/source/office/fpsmartcontent.cxx
index 4cc504ddaa14..66f531ec5732 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -38,7 +38,6 @@ namespace svt
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::ucb;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index b3e279f6b471..801bf0080917 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -81,7 +81,6 @@
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::task;
diff --git a/fpicker/source/office/iodlgimp.cxx
b/fpicker/source/office/iodlgimp.cxx
index 5b2a67e38de5..1802d9c8d65b 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -33,8 +33,6 @@
#include
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::utl;
SvtFileDialogFilter_Impl::SvtFileDialogFilter_Impl( OUString aName, OUString
aType )
: m_aName(std::move( aName ))
core.git: vcl/qt5 vcl/source vcl/unx
vcl/qt5/QtAccessibleWidget.cxx |1 -
vcl/source/app/svdata.cxx |2 --
vcl/source/cnttype/mcnttfactory.cxx |1 -
vcl/source/control/fmtfield.cxx |1 -
vcl/source/filter/FilterConfigItem.cxx |1 -
vcl/source/font/fontmetric.cxx |1 -
vcl/source/gdi/configsettings.cxx |1 -
vcl/source/gdi/oldprintadaptor.cxx |1 -
vcl/source/helper/displayconnectiondispatch.cxx |1 -
vcl/source/helper/svtaccessiblefactory.cxx |1 -
vcl/source/window/accessibility.cxx |1 -
vcl/source/window/printdlg.cxx |1 -
vcl/source/window/stacking.cxx |1 -
vcl/source/window/syswin.cxx|1 -
vcl/unx/generic/app/i18n_im.cxx |2 --
vcl/unx/generic/dtrans/X11_clipboard.cxx|1 -
vcl/unx/generic/dtrans/X11_service.cxx |1 -
vcl/unx/generic/dtrans/X11_transferable.cxx |2 --
vcl/unx/generic/dtrans/config.cxx |1 -
vcl/unx/generic/fontmanager/fontconfig.cxx |1 -
vcl/unx/generic/fontmanager/fontmanager.cxx |3 ---
vcl/unx/generic/printer/cpdmgr.cxx |1 -
22 files changed, 27 deletions(-)
New commits:
commit da4f91bd4042f2c0ddd65c76d4ad5c35dbf3e1aa
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 14:00:41 2024 +0100
Commit: Gabor Kelemen
CommitDate: Sun Mar 31 11:31:09 2024 +0200
tdf#146619 Drop unused 'using namespace' in: vcl/
Change-Id: Id25d5e3dbf84dea1f9aca5a6ec921d30cbe84bf7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165524
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx
index 790e200929b1..4065e6ca2307 100644
--- a/vcl/qt5/QtAccessibleWidget.cxx
+++ b/vcl/qt5/QtAccessibleWidget.cxx
@@ -58,7 +58,6 @@
using namespace css;
using namespace css::accessibility;
-using namespace css::beans;
using namespace css::uno;
QtAccessibleWidget::QtAccessibleWidget(const Reference
xAccessible, QObject* pObject)
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index e919bfda7c3d..26bf023ce848 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -57,8 +57,6 @@
#include
using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::awt;
namespace
{
diff --git a/vcl/source/cnttype/mcnttfactory.cxx
b/vcl/source/cnttype/mcnttfactory.cxx
index 4a3e6fbb4d95..de8f3489d95a 100644
--- a/vcl/source/cnttype/mcnttfactory.cxx
+++ b/vcl/source/cnttype/mcnttfactory.cxx
@@ -22,7 +22,6 @@
#include "mcnttfactory.hxx"
#include "mcnttype.hxx"
-using namespace ::osl;
using namespace ::cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index e8b02a29c111..b8c561e206b3 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -45,7 +45,6 @@
#include
using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
// hmm. No support for regular expression. Well, I always (not really :)
wanted to write a finite automat
// so here comes a finite automat ...
diff --git a/vcl/source/filter/FilterConfigItem.cxx
b/vcl/source/filter/FilterConfigItem.cxx
index 41eaac04e1d4..5137a2f87016 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star::lang ; //
XMultiServiceFactory
using namespace ::com::sun::star::beans ; // PropertyValue
using namespace ::com::sun::star::uno ; // Reference
using namespace ::com::sun::star::util ; // XChangesBatch
-using namespace ::com::sun::star::awt ; // Size
using namespace ::com::sun::star::container ;
using namespace ::com::sun::star::configuration;
using namespace ::com::sun::star::task ; // XStatusIndicator
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 3c6e5be96f8a..6ce4b1309e43 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -40,7 +40,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::rtl;
-using namespace ::utl;
FontMetric::FontMetric()
: mnAscent( 0 ),
diff --git a/vcl/source/gdi/configsettings.cxx
b/vcl/source/gdi/configsettings.cxx
index 5586f67a610a..b39adbf54118 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -30,7 +30,6 @@
using namespace utl;
using namespace vcl;
using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
diff --git a/vcl/source/gdi/oldprintadaptor.c
core.git: 2 commits - package/source svl/source
package/source/manifest/ManifestReader.cxx |1 - package/source/manifest/ManifestWriter.cxx |1 - svl/source/config/cjkoptions.cxx |2 -- svl/source/numbers/supservs.cxx|1 - svl/source/passwordcontainer/passwordcontainer.cxx |2 -- 5 files changed, 7 deletions(-) New commits: commit 35fbbbe12d101a626fcb1679cc6c0d79922a4cc3 Author: Gabor Kelemen AuthorDate: Fri Mar 29 14:00:11 2024 +0100 Commit: Gabor Kelemen CommitDate: Sun Mar 31 09:41:44 2024 +0200 tdf#146619 Drop unused 'using namespace' in: svl/ Change-Id: I5629f6d5940ebc76be72970606111459d21ee1fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165523 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index e43d379f7e66..3cc774e4268c 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -26,8 +26,6 @@ #include #include -using namespace ::com::sun::star::uno; - static void SvtCJKOptions_Load(); namespace SvtCJKOptions diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 5a51158a2beb..e5402f0fdb06 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; -using namespace ::utl; SvNumberFormatsSupplierServiceObject::SvNumberFormatsSupplierServiceObject(css::uno::Reference< css::uno::XComponentContext > _xORB) diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 68afc328935d..4d93a8aa3a7e 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -43,11 +43,9 @@ #include #include -using namespace osl; using namespace utl; using namespace com::sun::star; using namespace com::sun::star::uno; -using namespace com::sun::star::registry; using namespace com::sun::star::lang; using namespace com::sun::star::task; using namespace com::sun::star::ucb; commit 9a5b67ea271afc4449638207eecc52e88a7a891e Author: Gabor Kelemen AuthorDate: Fri Mar 29 13:59:40 2024 +0100 Commit: Gabor Kelemen CommitDate: Sun Mar 31 09:41:32 2024 +0200 tdf#146619 Drop unused 'using namespace' in: package/ Change-Id: I635a5c4bc988bff5a99f7d8487eb7c0f67c15d0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165522 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx index 2a60feff02d4..d21748889082 100644 --- a/package/source/manifest/ManifestReader.cxx +++ b/package/source/manifest/ManifestReader.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::registry; using namespace ::com::sun::star::packages; using namespace ::com::sun::star::xml::sax; diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx index 5515cc26df07..e4a4b480dfbb 100644 --- a/package/source/manifest/ManifestWriter.cxx +++ b/package/source/manifest/ManifestWriter.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::registry; using namespace ::com::sun::star::packages; using namespace ::com::sun::star::xml::sax;
core.git: 2 commits - sax/source unoxml/source
sax/source/expatwrap/sax_expat.cxx |1 -
sax/source/expatwrap/saxwriter.cxx |2 --
sax/source/tools/converter.cxx |1 -
unoxml/source/xpath/xpathapi.cxx |1 -
4 files changed, 5 deletions(-)
New commits:
commit 828ad91196826cda970f3894de516f91a82fd7de
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 13:59:24 2024 +0100
Commit: Gabor Kelemen
CommitDate: Sun Mar 31 09:41:18 2024 +0200
tdf#146619 Drop unused 'using namespace' in: sax/
Change-Id: I1959402cb06f051ffe5f4a7e2e9f591b4908ea21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165521
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sax/source/expatwrap/sax_expat.cxx
b/sax/source/expatwrap/sax_expat.cxx
index 9a82b8703644..885e2910ba0c 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -46,7 +46,6 @@
#include
#include
-using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::xml::sax;
diff --git a/sax/source/expatwrap/saxwriter.cxx
b/sax/source/expatwrap/saxwriter.cxx
index 55608101faf5..c1f9db44330d 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -43,12 +43,10 @@
#include
-using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::util;
using namespace ::com::sun::star::io;
#define LINEFEED 10
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 818d04a9bd1a..09156a0a9405 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -42,7 +42,6 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::util;
-using namespace ::com::sun::star::i18n;
namespace sax {
commit 2f068b2182955362526641da3b1e9f3207aab4b3
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 13:31:26 2024 +0100
Commit: Gabor Kelemen
CommitDate: Sun Mar 31 09:41:07 2024 +0200
tdf#146619 Drop unused 'using namespace' in: unoxml/
Change-Id: I66da7093f1ccb144e2831c6e20220cbd27e58c46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165518
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
index c2b753783176..e20282565644 100644
--- a/unoxml/source/xpath/xpathapi.cxx
+++ b/unoxml/source/xpath/xpathapi.cxx
@@ -41,7 +41,6 @@
#include
#include
-using namespace css::io;
using namespace css::uno;
using namespace css::xml::dom;
using namespace css::xml::xpath;
core.git: shell/source
shell/source/cmdmail/cmdmailmsg.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit f7ccf46b13ddf4501d5952ec38b1c680398f2101 Author: Gabor Kelemen AuthorDate: Fri Mar 29 13:30:24 2024 +0100 Commit: Gabor Kelemen CommitDate: Sat Mar 30 20:50:06 2024 +0100 tdf#146619 Drop unused 'using namespace' in: shell/ Change-Id: I4194a1e3b92ec5bd25a8f313f7ff441566079bac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165517 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx index 8d6c0865a609..b62d99ab9a0b 100644 --- a/shell/source/cmdmail/cmdmailmsg.cxx +++ b/shell/source/cmdmail/cmdmailmsg.cxx @@ -22,7 +22,6 @@ using com::sun::star::container::NoSuchElementException; using com::sun::star::container::XNameAccess; -using namespace cppu; using namespace com::sun::star::uno;
core.git: UnoControls/source
UnoControls/source/controls/progressbar.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit a98fd3a9ae8740ba66b5b98dd18c27a83b475efc
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 13:32:06 2024 +0100
Commit: Gabor Kelemen
CommitDate: Sat Mar 30 19:54:17 2024 +0100
tdf#146619 Drop unused 'using namespace' in: UnoControls/
Change-Id: I6739c80a76289b042607a5b50ac04482f65b5a40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165520
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/UnoControls/source/controls/progressbar.cxx
b/UnoControls/source/controls/progressbar.cxx
index 1cf0bc08a36f..85653c1cc1a3 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -27,7 +27,6 @@
using namespace ::cppu;
using namespace ::osl;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::awt;
namespace unocontrols {
core.git: unotools/source
unotools/source/config/compatibility.cxx|2 --
unotools/source/config/confignode.cxx |1 -
unotools/source/config/configvaluecontainer.cxx |1 -
unotools/source/config/eventcfg.cxx |1 -
unotools/source/config/fontcfg.cxx |1 -
unotools/source/config/pathoptions.cxx |1 -
unotools/source/config/saveopt.cxx |3 ---
unotools/source/config/syslocaleoptions.cxx |1 -
unotools/source/misc/syslocale.cxx |1 -
unotools/source/ucbhelper/localfilehelper.cxx |1 -
10 files changed, 13 deletions(-)
New commits:
commit 8c84193d101dba72c74b92e8afa05c085b063713
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 13:31:53 2024 +0100
Commit: Gabor Kelemen
CommitDate: Sat Mar 30 19:53:58 2024 +0100
tdf#146619 Drop unused 'using namespace' in: unotools/
Change-Id: I7af4b514dac89b3dbacdc21705a90a91458b4487
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165519
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/unotools/source/config/compatibility.cxx
b/unotools/source/config/compatibility.cxx
index 2597d79a084e..8451759e1328 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -31,8 +31,6 @@
#include
-using namespace ::utl;
-using namespace ::osl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --git a/unotools/source/config/confignode.cxx
b/unotools/source/config/confignode.cxx
index 93b89532072d..12d939e03159 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -39,7 +39,6 @@ namespace utl
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::configuration;
diff --git a/unotools/source/config/configvaluecontainer.cxx
b/unotools/source/config/configvaluecontainer.cxx
index 6852674a95fa..0ac1be06f4db 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -31,7 +31,6 @@ namespace utl
{
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
//= NodeValueAccessor
diff --git a/unotools/source/config/eventcfg.cxx
b/unotools/source/config/eventcfg.cxx
index 49232f9026fc..c6c0f63e42a6 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -38,7 +38,6 @@
#include
using namespace ::utl;
-using namespace ::osl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
diff --git a/unotools/source/config/fontcfg.cxx
b/unotools/source/config/fontcfg.cxx
index 295a8742ffbb..14bfb646fb75 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -41,7 +41,6 @@
using namespace utl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using namespace com::sun::star::beans;
using namespace com::sun::star::container;
using namespace com::sun::star::configuration;
diff --git a/unotools/source/config/pathoptions.cxx
b/unotools/source/config/pathoptions.cxx
index 4234ec903df9..be02f7c8f2ac 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -50,7 +50,6 @@ using namespace utl;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
using namespace com::sun::star::util;
-using namespace com::sun::star::lang;
#define SEARCHPATH_DELIMITER ';'
#define SIGN_STARTVARIABLE"$("
diff --git a/unotools/source/config/saveopt.cxx
b/unotools/source/config/saveopt.cxx
index b91ba8639619..42e52bb2147f 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -25,9 +25,6 @@
#include
-using namespace utl;
-using namespace com::sun::star::uno;
-
void SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion eVersion, const
std::shared_ptr& xChanges )
{
sal_Int16 nTmp = (eVersion == SvtSaveOptions::ODFVER_LATEST) ? sal_Int16(
3 ) : sal_Int16( eVersion );
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index 52760b87c673..c9f2df163522 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -36,7 +36,6 @@
using namespace osl;
using namespace utl;
using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
namespace
{
diff --git a/unotools/source/misc/syslocale.cxx
b/unotools/source/misc/syslocale.cxx
index 31b448e6583a..63b98f9f1614 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -35,7 +35,6 @@
#include
#include
-using namespace osl;
using namespace com::sun::star;
namespace {
diff --
core.git: 2 commits - comphelper/source eventattacher/source
comphelper/source/container/namecontainer.cxx |1 -
comphelper/source/eventattachermgr/eventattachermgr.cxx |1 -
comphelper/source/misc/accessibleselectionhelper.cxx|2 --
comphelper/source/misc/accessibletexthelper.cxx |1 -
comphelper/source/processfactory/processfactory.cxx |1 -
comphelper/source/property/genericpropertyset.cxx |1 -
comphelper/source/property/propertycontainer.cxx|1 -
comphelper/source/property/propertysetinfo.cxx |1 -
comphelper/source/property/propertystatecontainer.cxx |1 -
comphelper/source/property/propshlp.cxx |1 -
comphelper/source/streaming/memorystream.cxx|1 -
comphelper/source/streaming/seqstream.cxx |1 -
comphelper/source/xml/attributelist.cxx |1 -
eventattacher/source/eventattacher.cxx |2 --
14 files changed, 16 deletions(-)
New commits:
commit 13250e1aa589453534d113442da1ac8a2cbb71b9
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 13:21:13 2024 +0100
Commit: Gabor Kelemen
CommitDate: Sat Mar 30 10:03:44 2024 +0100
tdf#146619 Drop unused 'using namespace' in: comphelper/
Change-Id: I96982faf40e7654b0f8f26b666a17cbd057886a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165516
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/comphelper/source/container/namecontainer.cxx
b/comphelper/source/container/namecontainer.cxx
index c13ee7486e80..cfa958a0272b 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.cxx
@@ -66,7 +66,6 @@ namespace comphelper
}
using namespace ::comphelper;
-using namespace ::osl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx
b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 50085c5ce6e4..9a6d4af5afe5 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -58,7 +58,6 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::script;
using namespace com::sun::star::reflection;
using namespace cppu;
-using namespace osl;
namespace comphelper
diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx
b/comphelper/source/misc/accessibleselectionhelper.cxx
index 67ce5aadd1ba..ff880a76ee98 100644
--- a/comphelper/source/misc/accessibleselectionhelper.cxx
+++ b/comphelper/source/misc/accessibleselectionhelper.cxx
@@ -26,8 +26,6 @@ namespace comphelper
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility;
OCommonAccessibleSelection::OCommonAccessibleSelection( )
diff --git a/comphelper/source/misc/accessibletexthelper.cxx
b/comphelper/source/misc/accessibletexthelper.cxx
index 06752ba88ded..02cd77fc766d 100644
--- a/comphelper/source/misc/accessibletexthelper.cxx
+++ b/comphelper/source/misc/accessibletexthelper.cxx
@@ -39,7 +39,6 @@ namespace comphelper
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::accessibility;
diff --git a/comphelper/source/processfactory/processfactory.cxx
b/comphelper/source/processfactory/processfactory.cxx
index c503b8ff1e88..eddff2d45e04 100644
--- a/comphelper/source/processfactory/processfactory.cxx
+++ b/comphelper/source/processfactory/processfactory.cxx
@@ -30,7 +30,6 @@ namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using namespace osl;
namespace comphelper
{
diff --git a/comphelper/source/property/genericpropertyset.cxx
b/comphelper/source/property/genericpropertyset.cxx
index 65a3b9f476c1..747023d2be87 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -32,7 +32,6 @@
#include
#include
-using namespace ::osl;
using namespace ::cppu;
using namespace ::comphelper;
using namespace ::com::sun::star;
diff --git a/comphelper/source/property/propertycontainer.cxx
b/comphelper/source/property/propertycontainer.cxx
index 2b5685405604..ad24c5f30aa7 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.cxx
@@ -26,7 +26,6 @@ namespace comphelper
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
OPropertyContainer::OPropertyContainer(::cppu::OBroadcastHelper& _rBHelper)
diff --git a/comphelper/source/prop
core.git: stoc/source
stoc/source/implementationregistration/implreg.cxx |1 -
stoc/source/implementationregistration/mergekeys.cxx |1 -
stoc/source/invocation/invocation.cxx|1 -
stoc/source/loader/dllcomponentloader.cxx|1 -
stoc/source/namingservice/namingservice.cxx |1 -
stoc/source/typeconv/convert.cxx |1 -
6 files changed, 6 deletions(-)
New commits:
commit f3be365d71d8613165abf751d295b4d83a0caddc
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 13:19:52 2024 +0100
Commit: Gabor Kelemen
CommitDate: Sat Mar 30 09:49:07 2024 +0100
tdf#146619 Drop unused 'using namespace' in: stoc/
Change-Id: I86e2dd229e377995e52d323b1b5be5a9a280b68f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165514
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/stoc/source/implementationregistration/implreg.cxx
b/stoc/source/implementationregistration/implreg.cxx
index 074137324727..14c5c8e65a51 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -53,7 +53,6 @@ using namespace css::beans;
using namespace css::lang;
using namespace css::registry;
using namespace cppu;
-using namespace osl;
namespace {
diff --git a/stoc/source/implementationregistration/mergekeys.cxx
b/stoc/source/implementationregistration/mergekeys.cxx
index dde219b9ada7..fe052bb1f7f8 100644
--- a/stoc/source/implementationregistration/mergekeys.cxx
+++ b/stoc/source/implementationregistration/mergekeys.cxx
@@ -27,7 +27,6 @@
#include "mergekeys.hxx"
-using namespace ::osl;
using namespace css::uno;
using namespace ::com::sun::star;
diff --git a/stoc/source/invocation/invocation.cxx
b/stoc/source/invocation/invocation.cxx
index 314b63104fc7..44aa91f6cb9e 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -54,7 +54,6 @@ using namespace css::reflection;
using namespace css::beans;
using namespace css::container;
using namespace cppu;
-using namespace osl;
namespace stoc_inv
{
diff --git a/stoc/source/loader/dllcomponentloader.cxx
b/stoc/source/loader/dllcomponentloader.cxx
index 43f20ad0a5e4..b32e833214c6 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -40,7 +40,6 @@ using namespace css::loader;
using namespace css::lang;
using namespace css::registry;
using namespace cppu;
-using namespace osl;
namespace {
diff --git a/stoc/source/namingservice/namingservice.cxx
b/stoc/source/namingservice/namingservice.cxx
index acabb7370c6b..0013f7455ad1 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -29,7 +29,6 @@
#include
using namespace cppu;
-using namespace osl;
using namespace css::uno;
using namespace css::lang;
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index c3cd1b999726..a9b4e0d46e50 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -49,7 +49,6 @@ using namespace css::uno;
using namespace css::lang;
using namespace css::script;
using namespace cppu;
-using namespace osl;
namespace stoc_tcv
{
core.git: ucbhelper/source
ucbhelper/source/client/commandenvironment.cxx |1 - ucbhelper/source/provider/contentidentifier.cxx |1 - 2 files changed, 2 deletions(-) New commits: commit 4f13c6c5cbd958cbd3cb79385335abe512bb6de2 Author: Gabor Kelemen AuthorDate: Fri Mar 29 13:19:08 2024 +0100 Commit: Gabor Kelemen CommitDate: Fri Mar 29 21:21:23 2024 +0100 tdf#146619 Drop unused 'using namespace' in: ucbhelper/ Change-Id: I9083ff77bc80fb1eb35305cbd3fb55bb25817b49 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165513 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx index 37956b2c468f..fdde9a2afc6d 100644 --- a/ucbhelper/source/client/commandenvironment.cxx +++ b/ucbhelper/source/client/commandenvironment.cxx @@ -20,7 +20,6 @@ #include #include -using namespace com::sun::star::lang; using namespace com::sun::star::task; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index 2a5da953d99c..e545adc84983 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -20,7 +20,6 @@ #include using namespace com::sun::star::uno; -using namespace com::sun::star::lang; using namespace com::sun::star::ucb;
core.git: 2 commits - cppuhelper/source cppu/source io/source
cppu/source/threadpool/current.cxx |1 -
cppuhelper/source/access_control.cxx|1 -
cppuhelper/source/component_context.cxx |1 -
cppuhelper/source/exc_thrower.cxx |1 -
cppuhelper/source/implbase_ex.cxx |1 -
cppuhelper/source/macro_expander.cxx|1 -
cppuhelper/source/weak.cxx |1 -
io/source/TextInputStream/TextInputStream.cxx |1 -
io/source/TextOutputStream/TextOutputStream.cxx |1 -
io/source/stm/odata.cxx |1 -
io/source/stm/omark.cxx |1 -
io/source/stm/opump.cxx |1 -
12 files changed, 12 deletions(-)
New commits:
commit 6d3f6e77e1a21e53343339545502feecc69e6c78
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 13:18:22 2024 +0100
Commit: Gabor Kelemen
CommitDate: Fri Mar 29 21:21:02 2024 +0100
tdf#146619 Drop unused 'using namespace' in: io/
Change-Id: I5cfd37be41e1d364f8d50b3a547453d418abb86d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165512
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/io/source/TextInputStream/TextInputStream.cxx
b/io/source/TextInputStream/TextInputStream.cxx
index 1ce12a6e796e..29699e9adf9c 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -36,7 +36,6 @@
namespace com::sun::star::uno { class XComponentContext; }
-using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx
b/io/source/TextOutputStream/TextOutputStream.cxx
index 1271c4d09c96..e8706b407843 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -31,7 +31,6 @@
namespace com::sun::star::uno { class XComponentContext; }
-using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 6b19585da942..881b0cda132a 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -39,7 +39,6 @@
#include
using namespace ::cppu;
-using namespace ::osl;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 3507eb0a0729..9cc5959f1f13 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -42,7 +42,6 @@
#include
using namespace ::cppu;
-using namespace ::osl;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index df3e6132319d..62f6e85c3b95 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -35,7 +35,6 @@
#include
#include
-using namespace osl;
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
commit b6f5472ea147230b07a04f5677e1de8ea149cea5
Author: Gabor Kelemen
AuthorDate: Fri Mar 29 13:16:58 2024 +0100
Commit: Gabor Kelemen
CommitDate: Fri Mar 29 21:20:50 2024 +0100
tdf#146619 Drop unused 'using namespace' in: cppu/ cppuhelper/
Change-Id: I4658c2a5c780fa5e8dd83381eb9978510973e0a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165511
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/cppu/source/threadpool/current.cxx
b/cppu/source/threadpool/current.cxx
index 64e6bfb8f64c..46fdc8c253f3 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -30,7 +30,6 @@
#include "current.hxx"
-using namespace ::osl;
using namespace ::rtl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
diff --git a/cppuhelper/source/access_control.cxx
b/cppuhelper/source/access_control.cxx
index da8343648a95..9b8b907df6b6 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/cppuhelper/source/access_control.cxx
@@ -26,7 +26,6 @@
#include
#include
-using namespace ::osl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/cppuhelper/source/component_context.cxx
b/cppuhelper/source/component_context.cxx
index da070bdf027c..47dbd0b3773e 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -51,7 +51,6 @@ constexpr OUString SMGR_SINGLETON =
u"/singletons/com.sun.star.lang.theServiceMa
constexpr OUStringLiteral TDMGR_SINGLETON =
u"/singletons/com.sun.star.reflection.theTypeDescriptionManager";
constexpr OUStringLiteral AC_SINGLETON =
u"/singletons/com.sun.star.security.theAccessController";
-using namespace ::osl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::sta
core.git: xmloff/source
xmloff/source/draw/QRCodeContext.cxx|1 - xmloff/source/draw/descriptionimp.cxx |1 - xmloff/source/forms/formattributes.cxx |1 - xmloff/source/forms/formcellbinding.cxx |1 - xmloff/source/style/DrawAspectHdl.cxx |1 - xmloff/source/style/PageMasterExportPropMapper.cxx |1 - xmloff/source/style/PageMasterPropHdlFactory.cxx|1 - xmloff/source/style/PageMasterPropMapper.cxx|2 -- xmloff/source/style/XMLBackgroundImageContext.cxx |1 - xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx |1 - xmloff/source/text/XMLSectionSourceDDEImportContext.cxx |1 - xmloff/source/text/XMLTextNumRuleInfo.cxx |1 - xmloff/source/text/txtftne.cxx |1 - xmloff/source/text/txtparae.cxx |1 - xmloff/source/transform/Oasis2OOo.cxx |1 - xmloff/source/transform/PersAttrListTContext.cxx|1 - 16 files changed, 17 deletions(-) New commits: commit e2e9eeb822928255b3f2a31dfe98344f6d8e81cd Author: Gabor Kelemen AuthorDate: Sat Mar 16 18:09:20 2024 +0100 Commit: Gabor Kelemen CommitDate: Fri Mar 29 21:19:32 2024 +0100 tdf#146619 Recheck xmloff/*cxx with IWYU after cleaning up unused 'using namespace' clauses Change-Id: I9e4cd3790408ae6b0379819a8275feaf67e860cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164941 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/xmloff/source/draw/QRCodeContext.cxx b/xmloff/source/draw/QRCodeContext.cxx index 434065b5f203..580e4e8b9a41 100644 --- a/xmloff/source/draw/QRCodeContext.cxx +++ b/xmloff/source/draw/QRCodeContext.cxx @@ -10,7 +10,6 @@ #include "QRCodeContext.hxx" #include -#include #include #include diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx index c553bb655287..e17980f55baa 100644 --- a/xmloff/source/draw/descriptionimp.cxx +++ b/xmloff/source/draw/descriptionimp.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 0b8b84d0f299..3a979f2599ab 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -20,7 +20,6 @@ #include "formattributes.hxx" #include -#include #include #include diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx index 2a7a26bb71b0..9b19d2c3651e 100644 --- a/xmloff/source/forms/formcellbinding.cxx +++ b/xmloff/source/forms/formcellbinding.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx index 10cc762ec954..cc38523c8d06 100644 --- a/xmloff/source/style/DrawAspectHdl.cxx +++ b/xmloff/source/style/DrawAspectHdl.cxx @@ -21,7 +21,6 @@ #include #include -#include using namespace ::com::sun::star; diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index 9b7ff71874e8..7e5d2bcbee6e 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -19,7 +19,6 @@ #include "PageMasterExportPropMapper.hxx" #include -#include #include #include #include diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx index 1cb396803aba..1617584839ab 100644 --- a/xmloff/source/style/PageMasterPropHdlFactory.cxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx @@ -33,7 +33,6 @@ #include #include #include -#include #include #include diff --git a/xmloff/source/style/PageMasterPropMapper.cxx b/xmloff/source/style/PageMasterPropMapper.cxx index 40f33139351c..6e7a4be35bba 100644 --- a/xmloff/source/style/PageMasterPropMapper.cxx +++ b/xmloff/source/style/PageMasterPropMapper.cxx @@ -23,8 +23,6 @@ #include #include -#include - using namespace ::com::sun::star; XMLPageMasterPropSetMapper::XMLPageMasterPropSetMapper(): diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index fb655d132385..686edd7ed1ed 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -18,7 +18,6 @@ */ -#include #include #include diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index d1e435abc0c8..1be742637df0 100644 --- a/xmloff/source/text/XMLIndexBibliography
core.git: svx/inc svx/source svx/uiconfig
svx/inc/helpids.h |5 -
svx/source/gallery2/galbrws1.cxx |8
svx/source/gallery2/galctrl.cxx |5 -
svx/uiconfig/ui/sidebargallery.ui | 25 +++--
4 files changed, 23 insertions(+), 20 deletions(-)
New commits:
commit 69a8adcc76de2d827d109d2c66e1d0c64a1e6a52
Author: Gabor Kelemen
AuthorDate: Mon Mar 18 08:43:41 2024 +0100
Commit: Gabor Kelemen
CommitDate: Fri Mar 29 14:26:47 2024 +0100
Use default HIDs in Gallery, simplify code
and copy relevant help texts from helpcontent to .ui file
Change-Id: I3791f7843d6d8a0285d0d3369c867e6b165a582f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165021
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/svx/inc/helpids.h b/svx/inc/helpids.h
index 30e12062db47..01ca23ff058f 100644
--- a/svx/inc/helpids.h
+++ b/svx/inc/helpids.h
@@ -27,11 +27,6 @@ inline constexpr OUString HID_CTRL3D_HSCROLL =
u"SVX_HID_CTRL3D_HSCROLL"_ustr;
inline constexpr OUString HID_CTRL3D_SWITCHER =
u"SVX_HID_CTRL3D_SWITCHER"_ustr;
inline constexpr OUString HID_CTRL3D_VSCROLL = u"SVX_HID_CTRL3D_VSCROLL"_ustr;
inline constexpr OUString HID_CTRL_COLOR = u"SVX_HID_CTRL_COLOR"_ustr;
-inline constexpr OUString HID_GALLERY_ICONVIEW =
u"SVX_HID_GALLERY_ICONVIEW"_ustr;
-inline constexpr OUString HID_GALLERY_LISTVIEW =
u"SVX_HID_GALLERY_LISTVIEW"_ustr;
-inline constexpr OUString HID_GALLERY_NEWTHEME =
u"SVX_HID_GALLERY_NEWTHEME"_ustr;
-inline constexpr OUString HID_GALLERY_THEMELIST =
u"SVX_HID_GALLERY_THEMELIST"_ustr;
-inline constexpr OUString HID_GALLERY_WINDOW = u"SVX_HID_GALLERY_WINDOW"_ustr;
inline constexpr OUString HID_POPUP_COLOR = u"SVX_HID_POPUP_COLOR"_ustr;
inline constexpr OUString HID_POPUP_COLOR_CTRL =
u"SVX_HID_POPUP_COLOR_CTRL"_ustr;
inline constexpr OUString HID_POPUP_FRAME = u"SVX_HID_POPUP_FRAME"_ustr;
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 443d9be4adec..18c2dae8e39a 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -32,7 +32,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -148,11 +147,9 @@ GalleryBrowser1::GalleryBrowser1(
, meLastMode ( GALLERYBROWSERMODE_NONE )
, m_aCharacterClassficator( ::comphelper::getProcessComponentContext(),
SvtSysLocale().GetLanguageTag() )
{
-mxNewTheme->set_help_id(HID_GALLERY_NEWTHEME);
mxNewTheme->connect_clicked( LINK( this, GalleryBrowser1, ClickNewThemeHdl
) );
mxThemes->make_sorted();
-mxThemes->set_help_id( HID_GALLERY_THEMELIST );
mxThemes->connect_changed( LINK( this, GalleryBrowser1, SelectThemeHdl ) );
mxThemes->connect_popup_menu(LINK(this, GalleryBrowser1, PopupMenuHdl1));
mxThemes->connect_key_press(LINK(this, GalleryBrowser1, KeyInputHdl1));
@@ -180,9 +177,6 @@ GalleryBrowser1::GalleryBrowser1(
"com.sun.star.util.URLTransformer", m_xContext ),
css::uno::UNO_QUERY );
-mxIconButton->set_help_id(HID_GALLERY_ICONVIEW);
-mxListButton->set_help_id(HID_GALLERY_LISTVIEW);
-
mxIconButton->connect_toggled( LINK( this, GalleryBrowser1, SelectTbxHdl )
);
mxListButton->connect_toggled( LINK( this, GalleryBrowser1, SelectTbxHdl )
);
@@ -197,8 +191,6 @@ GalleryBrowser1::GalleryBrowser1(
mxListView->connect_drag_begin(LINK(this, GalleryBrowser1, DragBeginHdl));
mxSearchField->connect_changed( LINK( this, GalleryBrowser1, SearchHdl));
-mxListView->set_help_id(HID_GALLERY_WINDOW);
-
SetMode( ( GALLERYBROWSERMODE_PREVIEW != GalleryBrowser1::meInitMode ) ?
GalleryBrowser1::meInitMode : GALLERYBROWSERMODE_ICON );
FillThemeEntries();
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 05b64117577e..b753dbfac069 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -23,7 +23,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -66,8 +65,6 @@ void GalleryPreview::SetDrawingArea(weld::DrawingArea*
pDrawingArea)
pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
SetOutputSizePixel(aSize);
-pDrawingArea->set_help_id(HID_GALLERY_WINDOW);
-
mxDragDropTargetHelper.reset(new GalleryDragDrop(mpParent,
pDrawingArea->get_drop_target()));
}
@@ -227,7 +224,6 @@ void
DialogGalleryPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
CustomWidgetController::SetDrawingArea(pDrawingArea);
Size aSize(pDrawingArea->get_ref_device().LogicToPixel(Size(70, 88),
MapMode(MapUnit::MapAppFont)));
pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
-pDrawingArea->set_help_id(HID_GALLERY_WINDOW);
}
bool DialogGalleryPreview::SetGraphic( const I
core.git: bin/update_pch xmlsecurity/inc xmlsecurity/IwyuFilter_xmlsecurity.yaml xmlsecurity/source
bin/update_pch|1 xmlsecurity/IwyuFilter_xmlsecurity.yaml |3 xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |1 xmlsecurity/inc/xmlsec-wrapper.h | 43 -- xmlsecurity/source/gpg/SecurityEnvironment.cxx|1 xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx |2 xmlsecurity/source/xmlsec/biginteger.cxx |1 xmlsecurity/source/xmlsec/errorcallback.cxx |1 xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx |1 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |3 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx |4 xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx |1 xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx |2 xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx|3 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |2 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx |1 xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx|1 xmlsecurity/source/xmlsec/xmlsec_init.cxx |1 xmlsecurity/source/xmlsec/xmlstreamio.cxx |2 19 files changed, 10 insertions(+), 64 deletions(-) New commits: commit 50897e3fe001aeae5a6091ede155088461c798f3 Author: Gabor Kelemen AuthorDate: Thu Mar 28 01:54:23 2024 +0100 Commit: Gabor Kelemen CommitDate: Thu Mar 28 12:51:00 2024 +0100 Drop transitional header xmlsecurity/xmlsec-wrapper.h It was introduced with commit ec52e5e5a204862905b555cdc1f7393aede1f7d8 and the reason of that was the XMLSEC_NO_SIZE_T behavior consolidation. But this was removed later with commit bfd479abf0d1d8ce36c3b0dcc6c824216f88a95b Change-Id: Ib5350d9ab5554d1412821b762cd3ee7906b65b64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165440 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/bin/update_pch b/bin/update_pch index 4719e5f9269f..73be15f0bf97 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -438,7 +438,6 @@ def filter_ignore(line, module): if module == 'xmlsecurity': ignore_list += [ 'xmlsec/*', -'xmlsecurity/xmlsec-wrapper.h', ] if module == 'external/pdfium': ignore_list += [ diff --git a/xmlsecurity/IwyuFilter_xmlsecurity.yaml b/xmlsecurity/IwyuFilter_xmlsecurity.yaml index b27a552751a6..76c774e71e7b 100644 --- a/xmlsecurity/IwyuFilter_xmlsecurity.yaml +++ b/xmlsecurity/IwyuFilter_xmlsecurity.yaml @@ -95,9 +95,6 @@ excludelist: - com/sun/star/lang/XServiceInfo.hpp - com/sun/star/lang/XUnoTunnel.hpp - com/sun/star/xml/wrapper/XXMLElementWrapper.hpp -xmlsecurity/source/xmlsec/errorcallback.cxx: -# Needed for xmlsec/errors.h -- xmlsec-wrapper.h xmlsecurity/source/xmlsec/xmlstreamio.cxx: # comphelper::ScopeGuard is in use but not noticed by IWYU - comphelper/scopeguard.hxx diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index d69f3120e0ca..5e3d1f0b40be 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx @@ -136,7 +136,6 @@ #include #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 -#include #include #endif // PCH_LEVEL >= 4 diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h deleted file mode 100644 index 3ad705400c52.. --- a/xmlsecurity/inc/xmlsec-wrapper.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifde
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f0a9ead35c0da606d7ccab2f0c96e103a3b6be06 Author: Gabor Kelemen AuthorDate: Sat Mar 23 12:40:52 2024 +0100 Commit: Gerrit Code Review CommitDate: Sat Mar 23 12:40:52 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 1e3c2cb1ffa55b44e2b77d14ac5f5ce217630b8a - Use default HIDs in Gallery sidebar help page Change-Id: I7ab1d18d25c290320f3c0ebfdf3da1837cdf007a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/165023 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index b010f7c91670..1e3c2cb1ffa5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b010f7c91670f60ab8c637b321507b67d1bc4a63 +Subproject commit 1e3c2cb1ffa55b44e2b77d14ac5f5ce217630b8a
help.git: source/text
source/text/shared/01/gallery.xhp | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) New commits: commit 1e3c2cb1ffa55b44e2b77d14ac5f5ce217630b8a Author: Gabor Kelemen AuthorDate: Mon Mar 18 21:21:00 2024 +0100 Commit: Olivier Hallot CommitDate: Sat Mar 23 12:40:52 2024 +0100 Use default HIDs in Gallery sidebar help page Change-Id: I7ab1d18d25c290320f3c0ebfdf3da1837cdf007a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/165023 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/gallery.xhp b/source/text/shared/01/gallery.xhp index 25ec161a3f..34ace37727 100644 --- a/source/text/shared/01/gallery.xhp +++ b/source/text/shared/01/gallery.xhp @@ -27,10 +27,10 @@ - -Displays the contents of the Gallery as icons. - -Displays the contents of the Gallery as small icons, with title and path information. + +Displays the contents of the Gallery as icons. + +Displays the contents of the Gallery as small icons, with title and path information. @@ -71,20 +71,21 @@ - -Themes are listed on the left side of the Gallery.Click a theme to view the objects associated with the theme. - -To insert a Gallery object, select the object, and then drag it into the document. + +Themes are listed on the left side of the Gallery.Click a theme to view the objects associated with the theme. + + +To insert a Gallery object, select the object, and then drag it into the document. Adding a New File to the Gallery To add a file to the Gallery, right-click a theme, choose Properties, click the Files tab, and then click Add. You can also click an object in the current document, hold, and then drag it to the Gallery window. - New theme -Adds a new theme to the Gallery and lets you choose the files to include in the theme. + +Adds a new theme to the Gallery and lets you choose the files to include in the theme. To access the following commands, right-click a theme in the Gallery:
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ce7af0dc500efce2975576b1cd401ffc7121c529 Author: Gabor Kelemen AuthorDate: Wed Mar 20 09:35:47 2024 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 20 09:35:47 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 41a513b0355e7af1c2cde0ae95cc6fc7c23d0526 - Fix an ahelp in the New Gallery dialogs help Change-Id: I7f454ff043683c26337ea63468bd0f0b26944633 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/165022 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index e48c06ba931d..41a513b0355e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e48c06ba931d5da0371c2e9b64158aebfbbd9f49 +Subproject commit 41a513b0355e7af1c2cde0ae95cc6fc7c23d0526
help.git: source/text
source/text/shared/01/gallery_files.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 41a513b0355e7af1c2cde0ae95cc6fc7c23d0526 Author: Gabor Kelemen AuthorDate: Mon Mar 18 21:17:34 2024 +0100 Commit: Gabor Kelemen CommitDate: Wed Mar 20 09:35:47 2024 +0100 Fix an ahelp in the New Gallery dialogs help Change-Id: I7f454ff043683c26337ea63468bd0f0b26944633 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/165022 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/source/text/shared/01/gallery_files.xhp b/source/text/shared/01/gallery_files.xhp index bb4d9325a2..4448f18fbd 100644 --- a/source/text/shared/01/gallery_files.xhp +++ b/source/text/shared/01/gallery_files.xhp @@ -55,8 +55,8 @@ Adds all of the files in the list to the current theme. Preview -Displays or hides a preview of the selected file.UFI: removed help id +Displays or hides a preview of the selected file. Preview box -Displays a preview of the selected file. +Displays a preview of the selected file.
core.git: xmloff/source
xmloff/source/core/XMLBase64ImportContext.cxx |1 - xmloff/source/core/XMLEmbeddedObjectImportContext.cxx |1 - xmloff/source/core/xmluconv.cxx |1 - xmloff/source/draw/QRCodeContext.cxx|1 - xmloff/source/draw/animimp.cxx |1 - xmloff/source/draw/descriptionimp.cxx |3 --- xmloff/source/draw/eventimp.cxx |2 -- xmloff/source/draw/layerexp.cxx |2 -- xmloff/source/draw/layerimp.cxx |2 -- xmloff/source/draw/ximpshow.cxx |1 - xmloff/source/forms/elementexport.cxx |1 - xmloff/source/forms/formattributes.cxx |2 -- xmloff/source/forms/formcellbinding.cxx |1 - xmloff/source/forms/formlayerexport.cxx |2 -- xmloff/source/forms/formlayerimport.cxx |2 -- xmloff/source/forms/propertyexport.cxx |1 - xmloff/source/script/xmlscripti.cxx |1 - xmloff/source/style/DrawAspectHdl.cxx |1 - xmloff/source/style/PageMasterExportPropMapper.cxx |1 - xmloff/source/style/PageMasterPropHdlFactory.cxx|1 - xmloff/source/style/PageMasterPropMapper.cxx|2 -- xmloff/source/style/StyleMap.cxx|3 --- xmloff/source/style/XMLBackgroundImageContext.cxx |1 - xmloff/source/style/XMLFontStylesContext.cxx|2 -- xmloff/source/style/xmlexppr.cxx|1 - xmloff/source/style/xmlprmap.cxx|2 -- xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx |1 - xmloff/source/text/XMLSectionSourceDDEImportContext.cxx |1 - xmloff/source/text/XMLTextListAutoStylePool.cxx |1 - xmloff/source/text/XMLTextNumRuleInfo.cxx |1 - xmloff/source/text/XMLTextTableContext.cxx |3 --- xmloff/source/text/txtftne.cxx |1 - xmloff/source/text/txtparae.cxx |1 - xmloff/source/text/txtprmap.cxx |1 - xmloff/source/text/txtstyle.cxx |1 - xmloff/source/transform/ControlOOoTContext.cxx |1 - xmloff/source/transform/Oasis2OOo.cxx |2 -- xmloff/source/transform/PersAttrListTContext.cxx|1 - xmloff/source/transform/TransformerActions.cxx |2 -- xmloff/source/transform/TransformerBase.cxx |1 - 40 files changed, 57 deletions(-) New commits: commit 4496544f5d7ea9eaf83478a8846e14455d5dda3c Author: Gabor Kelemen AuthorDate: Thu Mar 14 23:14:31 2024 +0100 Commit: Gabor Kelemen CommitDate: Tue Mar 19 09:28:41 2024 +0100 Remove unused namespaces from xmloff Change-Id: Id46c9512b8024c9dc50edfb200599b1901fbf3c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164940 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx index 1476733642a3..6997a08340a6 100644 --- a/xmloff/source/core/XMLBase64ImportContext.cxx +++ b/xmloff/source/core/XMLBase64ImportContext.cxx @@ -26,7 +26,6 @@ #include using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::io; diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index 980dd8e0572d..d9d57af9f664 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::document; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 544bea50d3c5..27ed06144f54 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -54,7 +54,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; -using namespace com::sun::star::lang; using namespace com::sun::star::text; using namespace com::sun::star::style; using namespace ::com::sun::star::i18n; diff --git a/xmloff/source/draw/QRCodeContext.cxx b/xmloff/source/draw/QRCodeContext.cxx index 06477be637e0..434065b5f203 100644 --- a/xmloff
core.git: bin/find-unneeded-includes
bin/find-unneeded-includes | 208 +++--
1 file changed, 200 insertions(+), 8 deletions(-)
New commits:
commit a741dd2cd5059e3d6a06307fb7c6c016b4099c81
Author: Gabor Kelemen
AuthorDate: Thu Mar 14 12:40:53 2024 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 18 09:21:27 2024 +0100
find-unneeded-includes: add option to detect unneeded namespaces
Sometimes there are unneeded namespaces included, these can be detected
from the IWYU output.
This mode makes a suggestion to remove these, then in a subsequent normal
run some more headers can be detected as unnecessary, whose presence was
justified by the "using namespace" statement.
Change-Id: I45616537925ec0d09039edf3d9237ffbd13e2410
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164939
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index 12659fa82a31..439bb5230418 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -153,11 +153,12 @@ def unwrapInclude(include):
return include[1:-1]
-def processIWYUOutput(iwyuOutput, moduleRules, fileName, noexclude):
+def processIWYUOutput(iwyuOutput, moduleRules, fileName, noexclude,
checknamespaces):
inAdd = False
toAdd = []
inRemove = False
toRemove = []
+inFull = False
currentFileName = None
for line in iwyuOutput:
@@ -174,6 +175,9 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName,
noexclude):
if inAdd:
inAdd = False
continue
+if inFull:
+inFull = False
+continue
shouldAdd = fileName + " should add these lines:"
match = re.match(shouldAdd, line)
@@ -189,6 +193,12 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName,
noexclude):
inRemove = True
continue
+if checknamespaces:
+match = re.match("The full include-list for " + fileName, line)
+if match:
+inFull = True
+continue
+
if inAdd:
match = re.match('#include ([^ ]+)', line)
if match:
@@ -198,7 +208,7 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName,
noexclude):
# Forward declaration.
toAdd.append(line)
-if inRemove:
+if inRemove and not checknamespaces:
match = re.match("- #include (.*) // lines (.*)-.*", line)
if match:
# Only suggest removals for now. Removing fwd decls is more
complex: they may be
@@ -209,25 +219,203 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName,
noexclude):
if not ignoreRemoval(include, toAdd, currentFileName,
moduleRules, noexclude):
toRemove.append("%s:%s: %s" % (currentFileName, lineno,
include))
+if inFull:
+if checknamespaces:
+# match for all possible URE/UNO namespaces, created with:
+# find udkapi/com/sun/star/ -type d | sort| xargs basename -a
| tr '
' '|'
+# find offapi/com/sun/star/ -type d | sort | xargs basename -a
| tr '
' '|'
+# and ooo::vba namespaces
+# plus a few popular ones about other modules
+ns = re.compile(
+'.*for\ ('
+# URE namespaces
+'beans|'
+'bridge|oleautomation|'
+'connection|'
+'container|'
+'io|'
+'java|'
+'lang|'
+'loader|'
+'reflection|'
+'registry|'
+'script|'
+'security|'
+'task|'
+'uno|'
+'uri|'
+'util|'
+# UNO namespaces
+'accessibility|'
+'animations|'
+'auth|'
+'awt|tab|tree|grid|'
+'chart|'
+'chart2|data|'
+'configuration|bootstrap|backend|xml|'
+'cui|'
+'datatransfer|clipboard|dnd|'
+'deployment|test|ui|'
+'document|'
+
core.git: xmlsecurity/source
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 29 -
1 file changed, 29 deletions(-)
New commits:
commit f35ff76607041798823ac985b50ee40d5c670260
Author: Gabor Kelemen
AuthorDate: Mon Mar 11 09:40:08 2024 +0100
Commit: Thorsten Behrens
CommitDate: Tue Mar 12 18:49:26 2024 +0100
Remove SaveODFItem class
This is effectively unused since:
commit d22ab7b444a4e16dc2bd1f7d15fa36a848eaaaed
Change-Id: I6f646b7daf845035196fc9dde4ff270b8143d37a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164645
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index ba16a3618e7f..8064a8266988 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -85,34 +85,6 @@ using namespace css;
namespace
{
-class SaveODFItem: public utl::ConfigItem
-{
-private:
-virtual void ImplCommit() override;
-
-public:
-virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames
) override;
-SaveODFItem();
-};
-
-void SaveODFItem::ImplCommit() {}
-void SaveODFItem::Notify( const css::uno::Sequence< OUString >& ) {}
-
-SaveODFItem::SaveODFItem(): utl::ConfigItem("Office.Common/Save")
-{
-OUString sDef("ODF/DefaultVersion");
-Sequence< css::uno::Any > aValues = GetProperties(
Sequence(,1) );
-if ( aValues.getLength() != 1)
-throw uno::RuntimeException(
-"[xmlsecurity] Could not open property
Office.Common/Save/ODF/DefaultVersion",
-nullptr);
-
-sal_Int16 nTmp = 0;
-if ( !(aValues[0] >>= nTmp) )
-throw uno::RuntimeException(
-"[xmlsecurity]SaveODFItem::SaveODFItem(): Wrong Type!",
-nullptr );
-}
#ifdef _WIN32
constexpr std::u16string_view aGUIServers[]
@@ -377,7 +349,6 @@ bool DigitalSignaturesDialog::canAddRemove()
OSL_ASSERT(maSignatureManager.getStore().is());
bool bDoc1_1 = DocumentSignatureHelper::isODFPre_1_2(m_sODFVersion);
-SaveODFItem item;
// see specification
//cvs: specs/www/appwide/security/Electronic_Signatures_and_Security.sxw
core.git: xmloff/IwyuFilter_xmloff.yaml xmloff/qa xmloff/source
|1 xmloff/source/transform/DocumentTContext.cxx|2 xmloff/source/transform/MetaTContext.cxx|2 xmloff/source/transform/MutableAttrList.cxx |1 xmloff/source/transform/NotesTContext.cxx |2 xmloff/source/transform/OOo2Oasis.cxx |4 xmloff/source/transform/Oasis2OOo.cxx |1 xmloff/source/transform/StyleOASISTContext.cxx |2 xmloff/source/transform/StyleOOoTContext.cxx|2 xmloff/source/transform/TransformerBase.cxx |1 xmloff/source/transform/TransformerContext.cxx |2 xmloff/source/xforms/SchemaContext.cxx |1 xmloff/source/xforms/SchemaRestrictionContext.cxx |3 xmloff/source/xforms/SchemaSimpleTypeContext.cxx|3 xmloff/source/xforms/TokenContext.cxx |3 xmloff/source/xforms/XFormsBindContext.cxx |2 xmloff/source/xforms/XFormsInstanceContext.cxx |3 xmloff/source/xforms/XFormsModelContext.cxx |3 xmloff/source/xforms/XFormsSubmissionContext.cxx|3 155 files changed, 205 insertions(+), 304 deletions(-) New commits: commit 7da8fce0cd13a83a34b732615e95f477f4c4857e Author: Gabor Kelemen AuthorDate: Tue Mar 5 00:47:59 2024 +0100 Commit: Thorsten Behrens CommitDate: Tue Mar 12 10:37:31 2024 +0100 tdf#146619 Recheck xmloff/*cxx with IWYU Change-Id: I6e39a223fd567d70254998e55de5110db87ab4fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164486 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/xmloff/IwyuFilter_xmloff.yaml b/xmloff/IwyuFilter_xmloff.yaml index b187263736d0..5418a4bca412 100644 --- a/xmloff/IwyuFilter_xmloff.yaml +++ b/xmloff/IwyuFilter_xmloff.yaml @@ -23,9 +23,206 @@ excludelist: xmloff/source/core/fasttokenhandler.cxx: # Needed for special array initialization - tokennames.inc +xmloff/source/chart/SchXMLCalculationSettingsContext.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +xmloff/source/chart/SchXMLDataTableContext.cxx: +# Complete type is needed +- com/sun/star/chart/XChartDocument.hpp +xmloff/source/chart/SchXMLChartContext.cxx: +# Complete type is needed +- SchXMLImport.hxx +xmloff/source/chart/SchXMLImport.cxx: +# Actually used +- com/sun/star/uno/XComponentContext.hpp +xmloff/source/chart/SchXMLPlotAreaContext.cxx: +# Complete type is needed +- SchXMLImport.hxx +xmloff/source/chart/XMLChartStyleContext.cxx: +# Actually used +- com/sun/star/beans/XPropertySet.hpp +xmloff/source/core/DocumentSettingsContext.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +xmloff/source/draw/SignatureLineContext.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +xmloff/source/draw/XMLImageMapContext.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +xmloff/source/draw/XMLGraphicsDefaultStyle.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +xmloff/source/draw/layerexp.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +xmloff/source/draw/layerimp.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp xmloff/source/draw/sdpropls.cxx: # Needed for extern type definitions at linking time - enummaps.hxx +xmloff/source/draw/ximppage.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +xmloff/source/draw/ximpshow.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +xmloff/source/draw/ximpshap.cxx: +# Complete type is needed +- com/sun/star/graphic/XGraphic.hpp +xmloff/source/draw/ximpstyl.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +xmloff/source/forms/formlayerimport.cxx: +# Actually used +- com/sun/star/beans/PropertyValue.hpp +xmloff/source/forms/gridcolumnproptranslator.cxx: +# Actually used +- com/sun/star/beans/XPropertySetInfo.hpp +xmloff/source/forms/layerexport.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +xmloff/source/forms/officeforms.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +xmloff/source/style/PageMasterImportContext.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +# Needed for extern variable +- xmloff/XMLTextMasterPageContext.hxx +xmloff/source/style/PageMasterImportPropMapper.cxx: +# Complete type is needed +- com/sun/star/frame/XModel.hpp +xmloff/source/style/XMLRtlGutterPropertyHandler.cxx: +# without this a static assertion fails in elsa.h +- frozen/bits
core.git: animations/source
animations/source/animcore/animcore.cxx |4 1 file changed, 4 deletions(-) New commits: commit 4f680db872ae42912a417ca8d68f68e6acc8d3dd Author: Gabor Kelemen AuthorDate: Thu Feb 22 12:03:04 2024 +0100 Commit: Gabor Kelemen CommitDate: Fri Mar 8 09:13:28 2024 +0100 tdf#146619 Recheck animations/ with IWYU Change-Id: I72a2f335ba2a786ddd0b59ecad76bfa039e5cdec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164487 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index a8511a4051f2..9e097ec98733 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -45,16 +45,12 @@ #include #include #include -#include -#include #include #include #include -#include #include -#include #include #include #include
core.git: animations/Library_animcore.mk basegfx/CppunitTest_basegfx.mk binaryurp/CppunitTest_binaryurp_test-cache.mk binaryurp/CppunitTest_binaryurp_test-unmarshal.mk binaryurp/Library_binaryurp.mk c
animations/Library_animcore.mk |2 -- basegfx/CppunitTest_basegfx.mk |2 -- binaryurp/CppunitTest_binaryurp_test-cache.mk |2 -- binaryurp/CppunitTest_binaryurp_test-unmarshal.mk |2 -- binaryurp/Library_binaryurp.mk |2 -- comphelper/CppunitTest_comphelper_parallelsort_test.mk |6 +- comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk |4 comphelper/CppunitTest_comphelper_threadpool_test.mk|4 comphelper/CppunitTest_comphelper_variadictemplates_test.mk |4 cppu/CppunitTest_cppu_qa_any.mk |2 -- cppu/CppunitTest_cppu_qa_reference.mk |2 -- cppu/CppunitTest_cppu_test_cppumaker.mk |2 -- cppu/Library_cppu.mk|2 -- cppu/Library_log_uno_uno.mk |2 -- helpcompiler/Executable_HelpLinker.mk |1 - helpcompiler/Library_helplinker.mk |1 - hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk |2 -- hwpfilter/Library_hwp.mk|1 - i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk |2 -- i18nlangtag/Library_i18nlangtag.mk |1 - i18npool/CppunitTest_i18npool_defaultnumberingprovider.mk |4 i18npool/Library_i18npool.mk|1 - i18nutil/Library_i18nutil.mk|1 - io/Library_io.mk|2 -- jvmfwk/Library_jvmfwk.mk|1 - o3tl/CppunitTest_o3tl_tests.mk |2 -- opencl/Library_opencl.mk|1 - package/Library_package2.mk |1 - pyuno/Library_pythonloader.mk |1 - pyuno/Library_pyuno.mk |1 - registry/Library_reg.mk |2 -- salhelper/CppunitTest_salhelper_testapi.mk |2 -- sax/CppunitTest_sax.mk |2 -- sax/CppunitTest_sax_parser.mk |4 sax/CppunitTest_sax_xmlimport.mk|4 sax/Library_sax.mk |3 --- scaddins/Library_analysis.mk|2 -- scaddins/Library_date.mk|2 -- scaddins/Library_pricing.mk |2 -- sccomp/CppunitTest_sccomp_solver.mk |4 sccomp/CppunitTest_sccomp_swarmsolvertest.mk|4 sccomp/Library_solver.mk|1 - sot/Library_sot.mk |2 -- store/Library_store.mk |2 -- unotools/CppunitTest_unotools_fontcvt.mk|2 -- unotools/CppunitTest_unotools_fontdefs.mk |2 -- xmlhelp/Library_ucpchelp1.mk|1 - xmlreader/Library_xmlreader.mk |2 -- 48 files changed, 1 insertion(+), 103 deletions(-) New commits: commit ab95ed2c4b1eddc2188bd455653a77140aa3816c Author: Gabor Kelemen AuthorDate: Tue Mar 5 22:35:50 2024 +0100 Commit: Thorsten Behrens CommitDate: Wed Mar 6 21:23:17 2024 +0100 Use less boost_headers in low level libraries Most of these don't use boost themselves, nor do they need it transitively since the use of boost::optional was removed Change-Id: Ic9dee1c4e160b313ec5b91677b02ffdea6c5779d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164440 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index ff35201c19d0..f0c8dab926ff 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Library_Library,animcore)) -$(eval $(call gb_Library_use_external,animcore,boost_headers)) - $(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore,services)) $(eval $(call gb_Library_use_sdk_api,animcore)) diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index 219025e8e3e6..dde57afb7a62 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -9,8 +9,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,basegfx)) -$(eval $(call gb_CppunitTest_use_external,basegfx,boost_headers)) - $(eval $(call gb_CppunitTest_use_sdk_api,basegfx)) $(eval $(call gb_CppunitTest_use_libraries,basegfx,\ diff --git a/binaryurp
core.git: Branch 'distro/collabora/co-24.04' - drawinglayer/Library_drawinglayer.mk drawinglayer/source include/svtools svtools/source svx/source
drawinglayer/Library_drawinglayer.mk|4 ++
drawinglayer/source/primitive2d/controlprimitive2d.cxx |4 +-
drawinglayer/source/primitive2d/sceneprimitive2d.cxx|3 +
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |6 +--
include/svtools/optionsdrawinglayer.hxx |6 ---
svtools/source/config/optionsdrawinglayer.cxx | 31
svx/source/sdr/overlay/overlayselection.cxx |3 +
svx/source/svdraw/svddrgv.cxx |6 +--
8 files changed, 16 insertions(+), 47 deletions(-)
New commits:
commit 94dc600334cbadeb5d37205893688b29ce856e90
Author: Gabor Kelemen
AuthorDate: Mon Nov 13 02:36:26 2023 +0100
Commit: Caolán McNamara
CommitDate: Fri Feb 23 11:04:32 2024 +0100
Drop some wrapper methods from SvtOptionsDrawinglayer
just use the wrapped officecfg methods instead of:
IsSolidDragCreate
IsRenderDecoratedTextDirect
IsRenderSimpleTextDirect
GetQuadratic3DRenderLimit
GetQuadraticFormControlRenderLimit
IsTransparentSelection
Change-Id: Ie0f3ec0f8fdbbf08facfff1a372c666c8a0c8979
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160654
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163792
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
diff --git a/drawinglayer/Library_drawinglayer.mk
b/drawinglayer/Library_drawinglayer.mk
index c654275bdd11..e5c02487741a 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -57,6 +57,10 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\
vcl \
))
+$(eval $(call gb_Library_use_custom_headers,drawinglayer,\
+officecfg/registry \
+))
+
ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,drawinglayer,\
gdi32 \
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index c8448efa981f..fc6f69be521d 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -37,10 +37,10 @@
#include
#include
#include
-#include
#include
#include
#include
+#include
using namespace com::sun::star;
@@ -99,7 +99,7 @@ namespace drawinglayer::primitive2d
basegfx::B2DVector
aDiscreteSize(rViewInformation.getObjectToViewTransformation() * aScale);
// limit to a maximum square size, e.g. 300x150 pixels
(45000)
-const double
fDiscreteMax(SvtOptionsDrawinglayer::GetQuadraticFormControlRenderLimit());
+const double
fDiscreteMax(officecfg::Office::Common::Drawinglayer::QuadraticFormControlRenderLimit::get());
const double fDiscreteQuadratic(aDiscreteSize.getX() *
aDiscreteSize.getY());
const bool bScaleUsed(fDiscreteQuadratic > fDiscreteMax);
double fFactor(1.0);
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index e2f44b690aa5..78402a22ba3f 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
using namespace com::sun::star;
@@ -243,7 +244,7 @@ namespace drawinglayer::primitive2d
double fViewSizeX(aVisibleDiscreteRange.getWidth());
double fViewSizeY(aVisibleDiscreteRange.getHeight());
const double fViewVisibleArea(fViewSizeX * fViewSizeY);
-const double
fMaximumVisibleArea(SvtOptionsDrawinglayer::GetQuadratic3DRenderLimit());
+const double
fMaximumVisibleArea(officecfg::Office::Common::Drawinglayer::Quadratic3DRenderLimit::get());
double fReduceFactor(1.0);
if(fViewVisibleArea > fMaximumVisibleArea)
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 8748b78cd34e..f9b0e0df6159 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -63,7 +63,7 @@
#include
#include
-#include
+#include
#include
using namespace com::sun::star;
@@ -403,7 +403,7 @@ void
VclPixelProcessor2D::processTextSimplePortionPrimitive2D(
const DrawModeFlags nOriginalDrawMode(mpOutputDevice->GetDrawMode());
adaptTextToFillDrawMode();
-if (SvtOptionsDrawinglayer::IsRenderSimpleTextDirect())
+if (officecfg::Office::Common::Drawinglayer::RenderSimpleTextDirect::get())
{
RenderTextSimpleOrDecoratedPortionPrimitive2D(rCandidate);
}
@@ -423,7 +423,7 @@ void
VclPixelProcessor2D::processTextDecoratedPortionPrimitive2D(
const DrawModeFlags nOriginalDrawMode(mpOut
core.git: Branch 'distro/collabora/co-23.05' - drawinglayer/Library_drawinglayer.mk drawinglayer/source include/svtools svtools/source svx/source
drawinglayer/Library_drawinglayer.mk|4 ++
drawinglayer/source/primitive2d/controlprimitive2d.cxx |4 +-
drawinglayer/source/primitive2d/sceneprimitive2d.cxx|3 +
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |6 +--
include/svtools/optionsdrawinglayer.hxx |6 ---
svtools/source/config/optionsdrawinglayer.cxx | 31
svx/source/sdr/overlay/overlayselection.cxx |3 +
svx/source/svdraw/svddrgv.cxx |6 +--
8 files changed, 16 insertions(+), 47 deletions(-)
New commits:
commit a87b0e96447e7554eb47d0e1969a85d05837acd1
Author: Gabor Kelemen
AuthorDate: Mon Nov 13 02:36:26 2023 +0100
Commit: Miklos Vajna
CommitDate: Fri Feb 23 11:02:44 2024 +0100
Drop some wrapper methods from SvtOptionsDrawinglayer
just use the wrapped officecfg methods instead of:
IsSolidDragCreate
IsRenderDecoratedTextDirect
IsRenderSimpleTextDirect
GetQuadratic3DRenderLimit
GetQuadraticFormControlRenderLimit
IsTransparentSelection
Change-Id: Ie0f3ec0f8fdbbf08facfff1a372c666c8a0c8979
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160654
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163793
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/drawinglayer/Library_drawinglayer.mk
b/drawinglayer/Library_drawinglayer.mk
index 8945e1c462c8..8b0b8f19ea5b 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -52,6 +52,10 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\
vcl \
))
+$(eval $(call gb_Library_use_custom_headers,drawinglayer,\
+officecfg/registry \
+))
+
$(eval $(call gb_Library_add_exception_objects,drawinglayer,\
drawinglayer/source/animation/animationtiming \
drawinglayer/source/attribute/fillgraphicattribute \
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index 765a21afacfb..09f9b5cb59e8 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -36,10 +36,10 @@
#include
#include
#include
-#include
#include
#include
#include
+#include
using namespace com::sun::star;
@@ -98,7 +98,7 @@ namespace drawinglayer::primitive2d
basegfx::B2DVector
aDiscreteSize(rViewInformation.getObjectToViewTransformation() * aScale);
// limit to a maximum square size, e.g. 300x150 pixels
(45000)
-const double
fDiscreteMax(SvtOptionsDrawinglayer::GetQuadraticFormControlRenderLimit());
+const double
fDiscreteMax(officecfg::Office::Common::Drawinglayer::QuadraticFormControlRenderLimit::get());
const double fDiscreteQuadratic(aDiscreteSize.getX() *
aDiscreteSize.getY());
const bool bScaleUsed(fDiscreteQuadratic > fDiscreteMax);
double fFactor(1.0);
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index e2f44b690aa5..78402a22ba3f 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
using namespace com::sun::star;
@@ -243,7 +244,7 @@ namespace drawinglayer::primitive2d
double fViewSizeX(aVisibleDiscreteRange.getWidth());
double fViewSizeY(aVisibleDiscreteRange.getHeight());
const double fViewVisibleArea(fViewSizeX * fViewSizeY);
-const double
fMaximumVisibleArea(SvtOptionsDrawinglayer::GetQuadratic3DRenderLimit());
+const double
fMaximumVisibleArea(officecfg::Office::Common::Drawinglayer::Quadratic3DRenderLimit::get());
double fReduceFactor(1.0);
if(fViewVisibleArea > fMaximumVisibleArea)
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 43b8a4fa55bc..b812060d712e 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -63,7 +63,7 @@
#include
#include
-#include
+#include
#include
using namespace com::sun::star;
@@ -403,7 +403,7 @@ void
VclPixelProcessor2D::processTextSimplePortionPrimitive2D(
const DrawModeFlags nOriginalDrawMode(mpOutputDevice->GetDrawMode());
adaptTextToFillDrawMode();
-if (SvtOptionsDrawinglayer::IsRenderSimpleTextDirect())
+if (officecfg::Office::Common::Drawinglayer::RenderSimpleTextDirect::get())
{
RenderTextSimpleOrDecoratedPortionPrimitive2D(rCandidate);
}
@@ -423,7 +423,7 @@ void
VclPixelPr
core.git: bridges/IwyuFilter_bridges.yaml
bridges/IwyuFilter_bridges.yaml |3 +++ 1 file changed, 3 insertions(+) New commits: commit 7be51eca1e509723e66973ed644f4c49cb27b608 Author: Gabor Kelemen AuthorDate: Thu Feb 22 09:19:22 2024 +0100 Commit: Gabor Kelemen CommitDate: Fri Feb 23 09:32:48 2024 +0100 Update IwyuFilter in bridges after commit 4b0c46dc61df243cda94f4a0af8946e076d1af54 Change-Id: If7c1d2a2b0d459271c0835f8fcdf084aa3482990 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163719 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/bridges/IwyuFilter_bridges.yaml b/bridges/IwyuFilter_bridges.yaml index 00fbd47b3e87..92bb94d9a1e4 100644 --- a/bridges/IwyuFilter_bridges.yaml +++ b/bridges/IwyuFilter_bridges.yaml @@ -4,6 +4,9 @@ excludelist: bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx: # No .hxx -> .h replacement in URE headers - typelib/typedescription.hxx +bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx: +# Actually needed to not crash in fuzzing +- cxxabi.h bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx: # No .hxx -> .h replacement in URE headers - typelib/typedescription.hxx
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/sidebartableedit.ui | 265 +++-- 1 file changed, 144 insertions(+), 121 deletions(-) New commits: commit f4a726ddac042497b9553c7eb64372ed60fccaea Author: Gabor Kelemen AuthorDate: Fri Feb 9 18:36:15 2024 +0100 Commit: Gabor Kelemen CommitDate: Sat Feb 10 01:08:55 2024 +0100 Resave with newer Glade Change-Id: I2f0704d924f37e61330240065a63faedb6645025 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163201 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/sw/uiconfig/swriter/ui/sidebartableedit.ui b/sw/uiconfig/swriter/ui/sidebartableedit.ui index 37c8ec58f551..55c4a839ef30 100644 --- a/sw/uiconfig/swriter/ui/sidebartableedit.ui +++ b/sw/uiconfig/swriter/ui/sidebartableedit.ui @@ -1,72 +1,73 @@ - + 100 -1 -10 +1 +10 100 -1 -10 +1 +10 True -False +False - + True -False +False True -6 +6 vertical -3 -6 -True +3 +6 +True True -True -Row Height +True +Row Height True 0 True adjustment1 -0 -6 +0 +6 True -False +False start Insert: -True -insert +True +insert -0 -0 +0 +0 True -True -icons -False +True +icons +False 2 True -True +False +True False @@ -76,7 +77,8 @@ True -True +False +True False @@ -86,7 +88,8 @@ True -True +False +True False @@ -96,7 +99,8 @@ True -True +False +True False @@ -105,35 +109,36 @@ -0 -1 +0 +1 True -False +False start Select: -True -select +True +select -0 -2 +0 +2 True -True -icons -False +True +icons +False 2 True -True +False +True False @@ -143,7 +148,8 @@ True -True +False +True False @@ -153,7 +159,8 @@ True -True +False +True False @@ -163,7 +170,8 @@ True -True +False +True False @@ -172,77 +180,78 @@ -0 -3 +0 +3 True -False +False -0 -4 +0 +4 2 True -True -Column Width +True +Column Width True 0 True adjustment2 -1 -6 +1 +6 True -False +False start center Row height: -True -rowheight +True +rowheight -0 -5 +0 +5
core.git: bridges/IwyuFilter_bridges.yaml bridges/source
bridges/IwyuFilter_bridges.yaml | 13 +
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx |1 -
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx |4
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx |1 +
bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx|2 +-
bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx |2 --
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |4
bridges/source/cpp_uno/shared/bridge.cxx |1 -
bridges/source/cpp_uno/shared/component.cxx |2 --
bridges/source/cpp_uno/shared/vtablefactory.cxx |2 --
bridges/source/jni_uno/jni_base.h|4
bridges/source/jni_uno/jni_bridge.cxx|2 +-
bridges/source/jni_uno/jni_bridge.h |7 ++-
bridges/source/jni_uno/jni_data.cxx |1 +
bridges/source/jni_uno/jni_info.cxx |3 +--
bridges/source/jni_uno/jni_info.h|1 -
bridges/source/jni_uno/jni_java2uno.cxx |5 +++--
bridges/source/jni_uno/jni_uno2java.cxx |3 +--
18 files changed, 24 insertions(+), 34 deletions(-)
New commits:
commit f93ae0455c4d515be1ca663725a6e58d64a7e393
Author: Gabor Kelemen
AuthorDate: Sat Feb 3 18:03:45 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Feb 8 15:19:14 2024 +0100
Check bridges with IWYU
Only the parts tha build on x64 arch
See tdf#42949 for motivation
Change-Id: Ifa3c5107887f5ab7837beee83d9603e8c883a7a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162961
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/bridges/IwyuFilter_bridges.yaml b/bridges/IwyuFilter_bridges.yaml
new file mode 100644
index ..071db0504370
--- /dev/null
+++ b/bridges/IwyuFilter_bridges.yaml
@@ -0,0 +1,13 @@
+---
+assumeFilename: bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
+excludelist:
+bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx:
+# No .hxx -> .h replacement in URE headers
+- typelib/typedescription.hxx
+bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx:
+# No .hxx -> .h replacement in URE headers
+- typelib/typedescription.hxx
+bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:
+# Actually needed
+- callvirtualmethod.hxx
+- share.hxx
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
index 243e42d057e8..4f724dbb6861 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
@@ -55,7 +55,6 @@
#include "abi.hxx"
#include
-#include
using namespace x86_64;
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index bd6d9e61796d..eb57c2ac92c5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -18,9 +18,6 @@
*/
-#include
-
-#include
#include
#include
@@ -36,7 +33,6 @@
#include "abi.hxx"
#include "call.hxx"
-#include "rtti.hxx"
#include "share.hxx"
using namespace ::com::sun::star::uno;
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index daee12731ef1..ed62f404f439 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -28,6 +28,7 @@
#include "rtti.hxx"
#include "share.hxx"
+#include
using namespace ::std;
using namespace ::com::sun::star::uno;
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index 9bce77bc8468..eeff17303990 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
#include
#include
@@ -36,7 +37,6 @@
#include
#include "rtti.hxx"
-#include "share.hxx"
namespace {
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
index d7657bcc04be..6752eeaf6c3d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
@@ -21,9 +21,7 @@
#include
#include
-#include
-#include
#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
#define _GLIBCXX_CDTOR_CALLABI
#endif
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 496702120ab4..25277857f82e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -17,13 +17,9 @@
* the License at ht
