include/oox/drawingml/shape.hxx | 4 ++--
include/svx/clipboardctl.hxx | 3 ++-
oox/source/drawingml/shape.cxx | 2 +-
svx/source/mnuctrls/clipboardctl.cxx | 11 +++++------
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 860d18034f47e2b34b60137b0f7a1fa149988cd7
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Nov 8 14:36:09 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Nov 10 12:35:48 2023 +0100
loplugin:fieldcast in oox::drawingml::Shape
Change-Id: I0e5642f4f7dbb3f95d92fbb4dcf5b17f4becf503
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159224
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index aa1b1dbf2289..7c58bfbf014e 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -69,7 +69,7 @@ struct FillProperties;
struct GraphicProperties;
struct LineProperties;
struct Shape3DProperties;
-
+class AdvancedDiagramHelper;
class CustomShapeProperties;
typedef std::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr;
@@ -415,7 +415,7 @@ private:
// temporary space for DiagramHelper in preparation for collecting data
// Note: I tried to use a unique_ptr here, but existing constructor func
does not allow that
- svx::diagram::IDiagramHelper* mpDiagramHelper;
+ AdvancedDiagramHelper* mpDiagramHelper;
// association-ID to identify the Diagram ModelData
OUString msDiagramDataModelID;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index ff3d203f96ea..c38da7787ec3 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -233,7 +233,7 @@ void Shape::propagateDiagramHelper()
if(pAnchorObj)
{
-
static_cast<AdvancedDiagramHelper*>(mpDiagramHelper)->doAnchor(*pAnchorObj,
*this);
+ mpDiagramHelper->doAnchor(*pAnchorObj, *this);
mpDiagramHelper = nullptr;
}
}
commit 651b8080d1dc921e6ffbb8e176935bcc9d1b0b0f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Nov 8 13:41:39 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Nov 10 12:35:40 2023 +0100
loplugin:fieldcast in SvxClipBoardControl
Change-Id: I5877e1dd8c17c36a5233457030d54349f11ab04f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159223
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index 44c79040de9d..63cf80a0c7ec 100644
--- a/include/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
@@ -28,10 +28,11 @@
class SfxModule;
class ToolBox;
+class SvxClipboardFormatItem;
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxClipBoardControl final : public
SfxToolBoxControl
{
- std::unique_ptr<SfxPoolItem> pClipboardFmtItem;
+ std::unique_ptr<SvxClipboardFormatItem> pClipboardFmtItem;
bool bDisabled;
public:
diff --git a/svx/source/mnuctrls/clipboardctl.cxx
b/svx/source/mnuctrls/clipboardctl.cxx
index b5b55535f13a..0659d195de67 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -57,17 +57,16 @@ SvxClipBoardControl::~SvxClipBoardControl()
void SvxClipBoardControl::CreatePopupWindow()
{
- const SvxClipboardFormatItem* pFmtItem =
dynamic_cast<SvxClipboardFormatItem*>( pClipboardFmtItem.get() );
- if ( pFmtItem )
+ if ( pClipboardFmtItem )
{
std::unique_ptr<weld::Builder>
xBuilder(Application::CreateBuilder(nullptr, "svx/ui/clipboardmenu.ui"));
std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu("menu"));
- sal_uInt16 nCount = pFmtItem->Count();
+ sal_uInt16 nCount = pClipboardFmtItem->Count();
for (sal_uInt16 i = 0; i < nCount; ++i)
{
- SotClipboardFormatId nFmtID = pFmtItem->GetClipbrdFormatId( i );
- OUString aFmtStr( pFmtItem->GetClipbrdFormatName( i ) );
+ SotClipboardFormatId nFmtID =
pClipboardFmtItem->GetClipbrdFormatId( i );
+ OUString aFmtStr( pClipboardFmtItem->GetClipbrdFormatName( i ) );
if (aFmtStr.isEmpty())
aFmtStr = SvPasteObjectHelper::GetSotFormatUIName( nFmtID );
xPopup->append(OUString::number(static_cast<sal_uInt32>(nFmtID)),
aFmtStr);
@@ -102,7 +101,7 @@ void SvxClipBoardControl::StateChangedAtToolBoxControl(
sal_uInt16 nSID, SfxItem
pClipboardFmtItem.reset();
if ( eState >= SfxItemState::DEFAULT )
{
- pClipboardFmtItem.reset( pState->Clone() );
+ pClipboardFmtItem.reset(
static_cast<SvxClipboardFormatItem*>(pState->Clone()) );
GetToolBox().SetItemBits( GetId(), GetToolBox().GetItemBits(
GetId() ) | ToolBoxItemBits::DROPDOWN );
}
else if ( !bDisabled )
