sd/source/filter/eppt/pptx-animations.cxx | 15 +++++++--------
svx/source/accessibility/AccessibleFrameSelector.cxx | 3 ---
svx/source/accessibility/charmapacc.cxx | 3 ---
svx/source/inc/AccessibleFrameSelector.hxx | 11 +++--------
svx/source/inc/charmapacc.hxx | 14 +++++---------
5 files changed, 15 insertions(+), 31 deletions(-)
New commits:
commit 28f3aeff99fa635f7d59ab88f1f41ff6a036bebb
Author: Mark Hung <mark...@gmail.com>
AuthorDate: Fri Jan 27 20:56:55 2023 +0800
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Jan 28 17:43:54 2023 +0000
sd/source/filter refactor pptx animation export.
Refactor "Any NodeContext::getCondition(bool bBegin) const" to
"const Reference<XAnimationNode>& NodeContext::getNodeForCondition()
const", to get rid of the bool arguement of getCondition.
Change-Id: Ic61d2caecaad2d3ada38556346f66aedb258e554
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146291
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/filter/eppt/pptx-animations.cxx
b/sd/source/filter/eppt/pptx-animations.cxx
index 1d53833fa89f..03c8e6cc7b49 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -572,7 +572,7 @@ public:
const OUString& getEffectPresetSubType() const { return
msEffectPresetSubType; }
bool isValid() const { return mbValid; }
const std::vector<NodeContextPtr>& getChildNodes() const { return
maChildNodes; };
- Any getCondition(bool bBegin) const;
+ const Reference<XAnimationNode>& getNodeForCondition() const;
};
struct Cond
@@ -1101,8 +1101,8 @@ void
PPTXAnimationExport::WriteAnimationNodeCommonPropsStart()
sax_fastparser::UseIf(OString::number(nPresetSubType),
bPresetSubType), XML_repeatCount,
sRepeatCount);
- WriteAnimationCondList(mpContext->getCondition(true), XML_stCondLst);
- WriteAnimationCondList(mpContext->getCondition(false), XML_endCondLst);
+ WriteAnimationCondList(mpContext->getNodeForCondition()->getBegin(),
XML_stCondLst);
+ WriteAnimationCondList(mpContext->getNodeForCondition()->getEnd(),
XML_endCondLst);
if (rXNode->getType() == AnimationNodeType::ITERATE)
{
@@ -1287,8 +1287,8 @@ void PPTXAnimationExport::WriteAnimationNodeMedia()
{
mpFS->startElementNS(XML_p, XML_cTn);
}
- WriteAnimationCondList(mpContext->getCondition(true), XML_stCondLst);
- WriteAnimationCondList(mpContext->getCondition(false), XML_endCondLst);
+ WriteAnimationCondList(mpContext->getNodeForCondition()->getBegin(),
XML_stCondLst);
+ WriteAnimationCondList(mpContext->getNodeForCondition()->getEnd(),
XML_endCondLst);
mpFS->endElementNS(XML_p, XML_cTn);
mpFS->startElementNS(XML_p, XML_tgtEl);
@@ -1528,13 +1528,12 @@ bool NodeContext::initChildNodes()
return bValid;
}
-Any NodeContext::getCondition(bool bBegin) const
+const Reference<XAnimationNode>& NodeContext::getNodeForCondition() const
{
const bool bParent
= (mnEffectNodeType != EffectNodeType::INTERACTIVE_SEQUENCE ||
maChildNodes.empty());
const Reference<XAnimationNode>& rNode = bParent ? mxNode :
maChildNodes[0]->getNode();
-
- return bBegin ? rNode->getBegin() : rNode->getEnd();
+ return rNode;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 131904c23ab539a3eb2aba5467cbbeee0650632b
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 27 15:44:13 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sat Jan 28 17:43:52 2023 +0000
Use ImplInheritanceHelper in SvxShowCharSetAcc
Change-Id: I9009b6168c66a1b340a34aaf804e097bfe614d21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146279
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svx/source/accessibility/charmapacc.cxx
b/svx/source/accessibility/charmapacc.cxx
index 46fe8b11ac15..89e0b62199dc 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -91,9 +91,6 @@ void SAL_CALL SvxShowCharSetAcc::disposing()
m_pParent = nullptr;
}
-IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetAcc, OAccessibleSelectionHelper,
OAccessibleHelper_Base )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc,
OAccessibleSelectionHelper, OAccessibleHelper_Base )
-
bool SvxShowCharSetAcc::implIsSelected( sal_Int64 nAccessibleChildIndex )
{
if (!m_pParent)
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index e94567e8c32d..339192ced108 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -23,6 +23,7 @@
#include <comphelper/accessibleselectionhelper.hxx>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <tools/gen.hxx>
@@ -60,17 +61,15 @@ namespace svx
};
- typedef ::cppu::ImplHelper2 < css::accessibility::XAccessible,
- css::accessibility::XAccessibleTable
- > OAccessibleHelper_Base;
-
// - SvxShowCharSetAcc -
/** The table implementation of the vcl control.
*/
- class SvxShowCharSetAcc final : public
::comphelper::OAccessibleSelectionHelper,
- public OAccessibleHelper_Base
+ class SvxShowCharSetAcc final : public cppu::ImplInheritanceHelper<
+
::comphelper::OAccessibleSelectionHelper,
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleTable>
{
::std::vector< css::uno::Reference< css::accessibility::XAccessible >
> m_aChildren;
SvxShowCharSet* m_pParent; // the vcl control
@@ -78,9 +77,6 @@ namespace svx
public:
SvxShowCharSetAcc(SvxShowCharSet* pParent);
- DECLARE_XINTERFACE( )
- DECLARE_XTYPEPROVIDER( )
-
// XAccessibleComponent
virtual void SAL_CALL grabFocus( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
commit e71c718426e4f5694df04c91d391c7d064573b34
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 27 15:39:35 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sat Jan 28 17:43:45 2023 +0000
Use ImplInheritanceHelper in AccFrameSelectorChild
Change-Id: Idab295d97650b158c34f0a11be79c932540e7526
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146278
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx
b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 8c684865cf84..46fcb2242896 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -233,9 +233,6 @@ AccFrameSelectorChild::~AccFrameSelectorChild()
{
}
-IMPLEMENT_FORWARD_XINTERFACE2( AccFrameSelectorChild,
OAccessibleComponentHelper, OAccessibleHelper_Base )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccFrameSelectorChild,
OAccessibleComponentHelper, OAccessibleHelper_Base )
-
Reference< XAccessibleContext > AccFrameSelectorChild::getAccessibleContext( )
{
return this;
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx
b/svx/source/inc/AccessibleFrameSelector.hxx
index 26dfec6d2e6b..37ed1aa06103 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -23,7 +23,6 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase1.hxx>
#include<comphelper/accessiblecomponenthelper.hxx>
#include <svx/framebordertype.hxx>
@@ -33,8 +32,6 @@ class FrameSelector;
namespace a11y {
-typedef ::cppu::ImplHelper1<css::accessibility::XAccessible>
OAccessibleHelper_Base;
-
class AccFrameSelector final : public cppu::ImplInheritanceHelper<
::comphelper::OAccessibleComponentHelper,
css::accessibility::XAccessible>
@@ -77,17 +74,15 @@ private:
FrameSelector* mpFrameSel;
};
-class AccFrameSelectorChild final : public
::comphelper::OAccessibleComponentHelper,
- public OAccessibleHelper_Base
+class AccFrameSelectorChild final : public cppu::ImplInheritanceHelper<
+
::comphelper::OAccessibleComponentHelper,
+ css::accessibility::XAccessible>
{
public:
explicit AccFrameSelectorChild( FrameSelector& rFrameSel,
FrameBorderType eBorder );
virtual ~AccFrameSelectorChild() override;
- DECLARE_XINTERFACE( )
- DECLARE_XTYPEPROVIDER( )
-
//XAccessibleComponent
virtual void SAL_CALL grabFocus( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
