[Libreoffice-commits] core.git: 2 commits - configmgr/source sd/inc sd/qa sd/source solenv/clang-format
Philipp Hofer (via logerrit)
logerrit at kemper.freedesktop.org
Sun Nov 22 00:57:50 UTC 2020
configmgr/source/additions.hxx | 6
configmgr/source/config_map.hxx | 6
configmgr/source/defaultprovider.cxx | 16
configmgr/source/defaultprovider.hxx | 8
configmgr/source/groupnode.hxx | 21
configmgr/source/localizedpropertynode.hxx | 23
configmgr/source/localizedvaluenode.hxx | 19
configmgr/source/lock.cxx | 7
configmgr/source/lock.hxx | 7
configmgr/source/modifications.hxx | 17
configmgr/source/nodemap.cxx | 16
configmgr/source/rootnode.hxx | 12
sd/inc/AnnotationEnumeration.hxx | 13
sd/inc/CustomAnimationCloner.hxx | 6
sd/inc/createpresentation.hxx | 9
sd/inc/createunopageimpl.hxx | 7
sd/inc/cusshow.hxx | 22
sd/inc/helper/simplereferencecomponent.hxx | 9
sd/inc/randomnode.hxx | 5
sd/inc/sdattr.hxx | 29
sd/inc/sddllapi.h | 4
sd/inc/sdenumdef.hxx | 7
sd/inc/sdgrffilter.hxx | 8
sd/inc/sdhtmlfilter.hxx | 6
sd/inc/undo/undoobjects.hxx | 23
sd/inc/undoanim.hxx | 11
sd/qa/unit/import-tests-smartart.cxx | 305 +++++-----
sd/source/core/drawdoc_animations.cxx | 10
sd/source/filter/html/sdhtmlfilter.cxx | 15
sd/source/filter/ppt/pptatom.hxx | 50 -
sd/source/helper/simplereferencecomponent.cxx | 24
sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx | 27
sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx | 27
sd/source/ui/accessibility/AccessiblePresentationShape.cxx | 23
sd/source/ui/accessibility/AccessibleViewForwarder.cxx | 35 -
sd/source/ui/controller/slidelayoutcontroller.hxx | 8
sd/source/ui/dlg/RemoteDialog.cxx | 6
sd/source/ui/dlg/RemoteDialog.hxx | 3
sd/source/ui/dlg/dlgpage.cxx | 45 -
sd/source/ui/dlg/ins_paste.cxx | 9
sd/source/ui/dlg/sdabstdlg.cxx | 12
sd/source/ui/dlg/sduiexp.cxx | 11
sd/source/ui/docshell/grdocsh.cxx | 19
sd/source/ui/framework/configuration/ChangeRequestQueue.cxx | 6
sd/source/ui/framework/configuration/ChangeRequestQueue.hxx | 11
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx | 24
sd/source/ui/framework/configuration/ConfigurationClassifier.hxx | 47 -
sd/source/ui/framework/configuration/ConfigurationTracer.hxx | 25
sd/source/ui/framework/configuration/ConfigurationUpdater.hxx | 57 +
sd/source/ui/framework/configuration/UpdateRequest.cxx | 20
sd/source/ui/framework/factories/FrameWindowPane.cxx | 19
sd/source/ui/framework/factories/FrameWindowPane.hxx | 17
sd/source/ui/framework/module/CenterViewFocusModule.hxx | 37 -
sd/source/ui/framework/module/DrawModule.cxx | 10
sd/source/ui/framework/module/PresentationModule.cxx | 6
sd/source/ui/framework/module/ShellStackGuard.hxx | 34 -
sd/source/ui/func/sdundogr.cxx | 15
sd/source/ui/inc/AccessibleViewForwarder.hxx | 17
sd/source/ui/inc/BezierObjectBar.hxx | 9
sd/source/ui/inc/BreakDlg.hxx | 8
sd/source/ui/inc/Client.hxx | 16
sd/source/ui/inc/ClientView.hxx | 11
sd/source/ui/inc/EventMultiplexer.hxx | 22
sd/source/ui/inc/FormShellManager.hxx | 23
sd/source/ui/inc/GraphicDocShell.hxx | 7
sd/source/ui/inc/GraphicViewShell.hxx | 21
sd/source/ui/inc/GraphicViewShellBase.hxx | 11
sd/source/ui/inc/ImpressViewShellBase.hxx | 11
sd/source/ui/inc/MasterPageObserver.hxx | 39 -
sd/source/ui/inc/OutlineBulletDlg.hxx | 10
sd/source/ui/inc/OutlineViewShellBase.hxx | 9
sd/source/ui/inc/PaneShells.hxx | 10
sd/source/ui/inc/PresentationViewShell.hxx | 18
sd/source/ui/inc/PresentationViewShellBase.hxx | 9
sd/source/ui/inc/ShellFactory.hxx | 11
sd/source/ui/inc/SlideSorterViewShellBase.hxx | 9
sd/source/ui/inc/SpellDialogChildWindow.hxx | 17
sd/source/ui/inc/TemplateScanner.hxx | 33 -
sd/source/ui/inc/ViewClipboard.hxx | 20
sd/source/ui/inc/ViewShellHint.hxx | 14
sd/source/ui/inc/ViewShellImplementation.hxx | 28
sd/source/ui/inc/ViewShellManager.hxx | 51 -
sd/source/ui/inc/Window.hxx | 84 +-
sd/source/ui/inc/WindowUpdater.hxx | 28
sd/source/ui/inc/annotationmanager.hxx | 10
sd/source/ui/inc/bulmaper.hxx | 5
sd/source/ui/inc/copydlg.hxx | 12
sd/source/ui/inc/createtabledesignpanel.hxx | 12
sd/source/ui/inc/createtableobjectbar.hxx | 14
sd/source/ui/inc/diactrl.hxx | 15
sd/source/ui/inc/filedlg.hxx | 8
sd/source/ui/inc/framework/DrawModule.hxx | 17
sd/source/ui/inc/framework/ImpressModule.hxx | 17
sd/source/ui/inc/framework/PresentationModule.hxx | 17
sd/source/ui/inc/gluectrl.hxx | 16
sd/source/ui/inc/prntopts.hxx | 18
sd/source/ui/inc/pubdlg.hxx | 74 +-
sd/source/ui/inc/registerinterfaces.hxx | 7
sd/source/ui/inc/smarttag.hxx | 55 -
sd/source/ui/inc/tablefunction.hxx | 7
sd/source/ui/inc/tools/AsynchronousCall.hxx | 11
sd/source/ui/inc/tools/AsynchronousTask.hxx | 4
sd/source/ui/inc/tools/IconCache.hxx | 7
sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx | 22
sd/source/ui/inc/uiobject.hxx | 6
sd/source/ui/inc/unchss.hxx | 5
sd/source/ui/inc/view/viewoverlaymanager.hxx | 27
sd/source/ui/inc/zoomlist.hxx | 19
sd/source/ui/presenter/CanvasUpdateRequester.hxx | 26
sd/source/ui/remotecontrol/OSXNetworkService.h | 16
sd/source/ui/sidebar/IDisposable.hxx | 4
sd/source/ui/sidebar/ISidebarReceiver.hxx | 4
sd/source/ui/sidebar/LayoutMenu.hxx | 50 -
sd/source/ui/sidebar/MasterPageContainer.hxx | 80 +-
sd/source/ui/sidebar/MasterPageContainerFiller.hxx | 20
sd/source/ui/sidebar/MasterPageContainerProviders.hxx | 44 -
sd/source/ui/sidebar/PreviewValueSet.hxx | 18
sd/source/ui/slideshow/PaneHider.cxx | 22
sd/source/ui/slideshow/PaneHider.hxx | 19
sd/source/ui/slideshow/SlideShowRestarter.hxx | 26
sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx | 49 -
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx | 39 -
sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx | 9
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx | 13
sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx | 8
sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx | 4
sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx | 24
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx | 17
sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx | 20
sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx | 19
sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx | 33 -
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 94 +--
sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx | 32 -
sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx | 37 -
sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx | 48 -
sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx | 51 -
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx | 40 -
sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx | 32 -
sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx | 16
sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx | 40 -
sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx | 22
sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx | 53 -
sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx | 9
sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx | 24
sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx | 10
sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx | 4
sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx | 10
sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx | 10
sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx | 13
sd/source/ui/slidesorter/model/SlsVisualState.cxx | 16
sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx | 28
sd/source/ui/tools/AsynchronousCall.cxx | 14
sd/source/ui/tools/IconCache.cxx | 20
sd/source/ui/uitest/uiobject.cxx | 33 -
sd/source/ui/unoidl/UnoDocumentSettings.hxx | 8
sd/source/ui/unoidl/unopool.hxx | 3
sd/source/ui/view/GraphicViewShellBase.cxx | 35 -
sd/source/ui/view/ViewShellHint.cxx | 10
sd/source/ui/view/clview.cxx | 14
sd/source/ui/view/drvwshrg.cxx | 12
sd/source/ui/view/zoomlist.cxx | 33 -
solenv/clang-format/excludelist | 161 -----
162 files changed, 1823 insertions(+), 1898 deletions(-)
New commits:
commit 315f270d2db7541e9400852b070afb30f371f644
Author: Philipp Hofer <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 12:52:11 2020 +0100
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Sun Nov 22 01:57:11 2020 +0100
tdf#123936 Formatting files in module configmgr with clang-format
Change-Id: I51bd9777e51e4d8b745791bdde41e142db217d32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105655
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Jenkins
diff --git a/configmgr/source/additions.hxx b/configmgr/source/additions.hxx
index 6dedf1b5303e..9f50f187813b 100644
--- a/configmgr/source/additions.hxx
+++ b/configmgr/source/additions.hxx
@@ -25,10 +25,10 @@
#include <vector>
-namespace configmgr {
+namespace configmgr
+{
// Additions is a list of configuration node paths
-typedef std::vector< std::vector<OUString> > Additions;
-
+typedef std::vector<std::vector<OUString>> Additions;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/config_map.hxx b/configmgr/source/config_map.hxx
index 0bba60020253..af15f23ae9cf 100644
--- a/configmgr/source/config_map.hxx
+++ b/configmgr/source/config_map.hxx
@@ -19,7 +19,7 @@
struct LengthContentsCompare
{
- bool operator()( const OUString &a, const OUString &b ) const
+ bool operator()(const OUString& a, const OUString& b) const
{
if (a.getLength() == b.getLength())
return a < b;
@@ -28,7 +28,9 @@ struct LengthContentsCompare
}
};
-template< class T > struct config_map : public std::map< OUString, T, LengthContentsCompare > { };
+template <class T> struct config_map : public std::map<OUString, T, LengthContentsCompare>
+{
+};
#endif // CONFIG_MAP_HXX
diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx
index 131f548a039e..59f02af38107 100644
--- a/configmgr/source/defaultprovider.cxx
+++ b/configmgr/source/defaultprovider.cxx
@@ -34,22 +34,20 @@ com_sun_star_comp_configuration_DefaultProvider_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
{
osl::MutexGuard guard(*configmgr::lock());
- css::uno::Reference< css::uno::XInterface > singleton(
+ css::uno::Reference<css::uno::XInterface> singleton(
configmgr::configuration_provider::createDefault(context));
singleton->acquire();
return singleton.get();
}
-namespace configmgr::default_provider {
-
-OUString getImplementationName() {
- return "com.sun.star.comp.configuration.DefaultProvider";
-}
+namespace configmgr::default_provider
+{
+OUString getImplementationName() { return "com.sun.star.comp.configuration.DefaultProvider"; }
-css::uno::Sequence< OUString > getSupportedServiceNames() {
- return css::uno::Sequence< OUString > { "com.sun.star.configuration.DefaultProvider" };
+css::uno::Sequence<OUString> getSupportedServiceNames()
+{
+ return css::uno::Sequence<OUString>{ "com.sun.star.configuration.DefaultProvider" };
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/defaultprovider.hxx b/configmgr/source/defaultprovider.hxx
index 7c5af3100cdf..d20ba200beaf 100644
--- a/configmgr/source/defaultprovider.hxx
+++ b/configmgr/source/defaultprovider.hxx
@@ -23,13 +23,11 @@
#include <com/sun/star/uno/Sequence.hxx>
-namespace configmgr::default_provider {
-
+namespace configmgr::default_provider
+{
OUString getImplementationName();
-css::uno::Sequence< OUString >
-getSupportedServiceNames();
-
+css::uno::Sequence<OUString> getSupportedServiceNames();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/groupnode.hxx b/configmgr/source/groupnode.hxx
index 6d1f300817cd..12e18b37bc90 100644
--- a/configmgr/source/groupnode.hxx
+++ b/configmgr/source/groupnode.hxx
@@ -27,15 +27,16 @@
#include "node.hxx"
#include "nodemap.hxx"
-namespace configmgr {
-
-class GroupNode: public Node {
+namespace configmgr
+{
+class GroupNode : public Node
+{
public:
- GroupNode(int layer, bool extensible, OUString const & templateName);
+ GroupNode(int layer, bool extensible, OUString const& templateName);
- virtual rtl::Reference< Node > clone(bool keepTemplateName) const override;
+ virtual rtl::Reference<Node> clone(bool keepTemplateName) const override;
- virtual NodeMap & getMembers() override;
+ virtual NodeMap& getMembers() override;
virtual OUString getTemplateName() const override;
@@ -43,10 +44,10 @@ public:
virtual int getMandatory() const override;
- bool isExtensible() const { return extensible_;}
+ bool isExtensible() const { return extensible_; }
private:
- GroupNode(GroupNode const & other, bool keepTemplateName);
+ GroupNode(GroupNode const& other, bool keepTemplateName);
virtual ~GroupNode() override;
@@ -54,11 +55,9 @@ private:
bool extensible_;
NodeMap members_;
- OUString templateName_;
- // non-empty if this node is a template, free node, or set member
+ OUString templateName_; // non-empty if this node is a template, free node, or set member
int mandatory_;
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/localizedpropertynode.hxx b/configmgr/source/localizedpropertynode.hxx
index 1da1d3b66e52..c54a6c521231 100644
--- a/configmgr/source/localizedpropertynode.hxx
+++ b/configmgr/source/localizedpropertynode.hxx
@@ -27,35 +27,34 @@
#include "nodemap.hxx"
#include "type.hxx"
-
-namespace configmgr {
-
-class LocalizedPropertyNode: public Node {
+namespace configmgr
+{
+class LocalizedPropertyNode : public Node
+{
public:
LocalizedPropertyNode(int layer, Type staticType, bool nillable);
- virtual rtl::Reference< Node > clone(bool keepTemplateName) const override;
+ virtual rtl::Reference<Node> clone(bool keepTemplateName) const override;
- virtual NodeMap & getMembers() override;
+ virtual NodeMap& getMembers() override;
- Type getStaticType() const { return staticType_;}
+ Type getStaticType() const { return staticType_; }
- bool isNillable() const { return nillable_;}
+ bool isNillable() const { return nillable_; }
private:
- LocalizedPropertyNode(LocalizedPropertyNode const & other);
+ LocalizedPropertyNode(LocalizedPropertyNode const& other);
virtual ~LocalizedPropertyNode() override;
virtual Kind kind() const override;
Type staticType_;
- // as specified in the component-schema (TYPE_ANY, ...,
- // TYPE_HEXBINARY_LIST; not TYPE_ERROR or TYPE_NIL)
+ // as specified in the component-schema (TYPE_ANY, ...,
+ // TYPE_HEXBINARY_LIST; not TYPE_ERROR or TYPE_NIL)
bool nillable_;
NodeMap members_;
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx
index 55ad0979eae5..34fe2815365a 100644
--- a/configmgr/source/localizedvaluenode.hxx
+++ b/configmgr/source/localizedvaluenode.hxx
@@ -26,26 +26,26 @@
#include "node.hxx"
-
-namespace configmgr {
-
-class LocalizedValueNode: public Node {
+namespace configmgr
+{
+class LocalizedValueNode : public Node
+{
public:
explicit LocalizedValueNode(int layer);
- LocalizedValueNode(int layer, css::uno::Any const & value);
+ LocalizedValueNode(int layer, css::uno::Any const& value);
- virtual rtl::Reference< Node > clone(bool keepTemplateName) const override;
+ virtual rtl::Reference<Node> clone(bool keepTemplateName) const override;
virtual OUString getTemplateName() const override;
- const css::uno::Any& getValue() const { return value_;}
- css::uno::Any *getValuePtr(int layer)
+ const css::uno::Any& getValue() const { return value_; }
+ css::uno::Any* getValuePtr(int layer)
{
setLayer(layer);
return &value_;
}
- void setValue(int layer, css::uno::Any const & value);
+ void setValue(int layer, css::uno::Any const& value);
private:
LocalizedValueNode(LocalizedValueNode const&) = default;
@@ -56,7 +56,6 @@ private:
css::uno::Any value_;
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/lock.cxx b/configmgr/source/lock.cxx
index 40a7536b8ab7..28220c15af89 100644
--- a/configmgr/source/lock.cxx
+++ b/configmgr/source/lock.cxx
@@ -23,14 +23,13 @@
#include "lock.hxx"
-namespace configmgr {
-
-std::shared_ptr<osl::Mutex> const & lock()
+namespace configmgr
+{
+std::shared_ptr<osl::Mutex> const& lock()
{
static std::shared_ptr<osl::Mutex> theLock = std::make_shared<osl::Mutex>();
return theLock;
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/lock.hxx b/configmgr/source/lock.hxx
index e100a4648e79..195dbf5e72c4 100644
--- a/configmgr/source/lock.hxx
+++ b/configmgr/source/lock.hxx
@@ -23,10 +23,9 @@
#include <osl/mutex.hxx>
#include <memory>
-namespace configmgr {
-
-std::shared_ptr<osl::Mutex> const & lock();
-
+namespace configmgr
+{
+std::shared_ptr<osl::Mutex> const& lock();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx
index 0bc3ebb499f0..22e608ac7d72 100644
--- a/configmgr/source/modifications.hxx
+++ b/configmgr/source/modifications.hxx
@@ -28,11 +28,13 @@
#include <boost/unordered_map.hpp>
#include <config_dconf.h>
-namespace configmgr {
-
-class Modifications {
+namespace configmgr
+{
+class Modifications
+{
public:
- struct Node {
+ struct Node
+ {
typedef boost::unordered_map<OUString, Node, OUStringHash> Children;
Children children;
@@ -42,9 +44,9 @@ public:
~Modifications();
- void add(std::vector<OUString> const & path);
+ void add(std::vector<OUString> const& path);
- void remove(std::vector<OUString> const & path);
+ void remove(std::vector<OUString> const& path);
#if ENABLE_DCONF
void clear() { root_.children.clear(); }
@@ -52,7 +54,7 @@ public:
bool empty() const { return root_.children.empty(); }
- Node const & getRoot() const { return root_;}
+ Node const& getRoot() const { return root_; }
private:
Modifications(const Modifications&) = delete;
@@ -60,7 +62,6 @@ private:
Node root_;
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/nodemap.cxx b/configmgr/source/nodemap.cxx
index defbc6868b32..e21578b2880b 100644
--- a/configmgr/source/nodemap.cxx
+++ b/configmgr/source/nodemap.cxx
@@ -26,13 +26,13 @@
#include "node.hxx"
#include "nodemap.hxx"
-namespace configmgr {
-
-void NodeMap::cloneInto(NodeMap * target) const
+namespace configmgr
+{
+void NodeMap::cloneInto(NodeMap* target) const
{
assert(target != nullptr && target->empty());
NodeMapImpl clone(maImpl);
- for (auto & elem : clone)
+ for (auto& elem : clone)
{
elem.second = elem.second->clone(true);
}
@@ -40,16 +40,14 @@ void NodeMap::cloneInto(NodeMap * target) const
target->clearCache();
}
-rtl::Reference< Node > NodeMap::findNode(int layer, OUString const & name) const
+rtl::Reference<Node> NodeMap::findNode(int layer, OUString const& name) const
{
const_iterator i;
if (maCache == end() || maCache->first != name)
- maCache = const_cast< NodeMap *>(this)->maImpl.find(name);
+ maCache = const_cast<NodeMap*>(this)->maImpl.find(name);
i = maCache;
- return i == end() || i->second->getLayer() > layer
- ? rtl::Reference< Node >() : i->second;
+ return i == end() || i->second->getLayer() > layer ? rtl::Reference<Node>() : i->second;
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/rootnode.hxx b/configmgr/source/rootnode.hxx
index 4f53bffb72ad..84e10ef2667e 100644
--- a/configmgr/source/rootnode.hxx
+++ b/configmgr/source/rootnode.hxx
@@ -16,9 +16,10 @@
#include "node.hxx"
#include "nodemap.hxx"
-namespace configmgr {
-
-class RootNode: public Node {
+namespace configmgr
+{
+class RootNode : public Node
+{
public:
RootNode();
@@ -27,13 +28,12 @@ private:
virtual Kind kind() const override;
- virtual rtl::Reference< Node > clone(bool keepTemplateName) const override;
+ virtual rtl::Reference<Node> clone(bool keepTemplateName) const override;
- virtual NodeMap & getMembers() override;
+ virtual NodeMap& getMembers() override;
NodeMap members_;
};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 07611653db8d..03d316ce0032 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -1716,14 +1716,12 @@ compilerplugins/clang/weakobject.cxx
configmgr/qa/unit/test.cxx
configmgr/source/access.cxx
configmgr/source/access.hxx
-configmgr/source/additions.hxx
configmgr/source/broadcaster.cxx
configmgr/source/broadcaster.hxx
configmgr/source/childaccess.cxx
configmgr/source/childaccess.hxx
configmgr/source/components.cxx
configmgr/source/components.hxx
-configmgr/source/config_map.hxx
configmgr/source/configurationprovider.cxx
configmgr/source/configurationprovider.hxx
configmgr/source/configurationregistry.cxx
@@ -1731,21 +1729,12 @@ configmgr/source/data.cxx
configmgr/source/data.hxx
configmgr/source/dconf.cxx
configmgr/source/dconf.hxx
-configmgr/source/defaultprovider.cxx
-configmgr/source/defaultprovider.hxx
configmgr/source/groupnode.cxx
-configmgr/source/groupnode.hxx
configmgr/source/localizedpropertynode.cxx
-configmgr/source/localizedpropertynode.hxx
configmgr/source/localizedvaluenode.cxx
-configmgr/source/localizedvaluenode.hxx
-configmgr/source/lock.cxx
-configmgr/source/lock.hxx
configmgr/source/modifications.cxx
-configmgr/source/modifications.hxx
configmgr/source/node.cxx
configmgr/source/node.hxx
-configmgr/source/nodemap.cxx
configmgr/source/nodemap.hxx
configmgr/source/parsemanager.cxx
configmgr/source/parsemanager.hxx
@@ -1759,7 +1748,6 @@ configmgr/source/readwriteaccess.cxx
configmgr/source/rootaccess.cxx
configmgr/source/rootaccess.hxx
configmgr/source/rootnode.cxx
-configmgr/source/rootnode.hxx
configmgr/source/setnode.cxx
configmgr/source/setnode.hxx
configmgr/source/type.cxx
commit 1e17165f6643afe583bb97a40fb25ecb7bab24d9
Author: Philipp Hofer <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 13:14:09 2020 +0100
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Sun Nov 22 01:56:52 2020 +0100
tdf#123936 Formatting files in module sd with clang-format
Change-Id: Ieb02e9ae91123bcf1decc141a43fe7e985bf47f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105703
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Jenkins
diff --git a/sd/inc/AnnotationEnumeration.hxx b/sd/inc/AnnotationEnumeration.hxx
index cc053f9db947..3acc18e9a131 100644
--- a/sd/inc/AnnotationEnumeration.hxx
+++ b/sd/inc/AnnotationEnumeration.hxx
@@ -24,14 +24,15 @@
#include "sdpage.hxx"
-namespace com::sun::star::office {
- class XAnnotationEnumeration;
+namespace com::sun::star::office
+{
+class XAnnotationEnumeration;
}
-namespace sd {
-
-css::uno::Reference< css::office::XAnnotationEnumeration > createAnnotationEnumeration( const AnnotationVector& );
-
+namespace sd
+{
+css::uno::Reference<css::office::XAnnotationEnumeration>
+createAnnotationEnumeration(const AnnotationVector&);
}
#endif
diff --git a/sd/inc/CustomAnimationCloner.hxx b/sd/inc/CustomAnimationCloner.hxx
index 86b4e6b1fcd5..52b727c97289 100644
--- a/sd/inc/CustomAnimationCloner.hxx
+++ b/sd/inc/CustomAnimationCloner.hxx
@@ -26,9 +26,9 @@ class SdPage;
namespace sd
{
- css::uno::Reference< css::animations::XAnimationNode > Clone(
- const css::uno::Reference< css::animations::XAnimationNode >& xSourceNode,
- const SdPage* pSource = nullptr, const SdPage* pTarget = nullptr );
+css::uno::Reference<css::animations::XAnimationNode>
+Clone(const css::uno::Reference<css::animations::XAnimationNode>& xSourceNode,
+ const SdPage* pSource = nullptr, const SdPage* pTarget = nullptr);
}
#endif // INCLUDED_SD_INC_CUSTOMANIMATIONCLONER_HXX
diff --git a/sd/inc/createpresentation.hxx b/sd/inc/createpresentation.hxx
index 77e45243c678..de1a79c71d55 100644
--- a/sd/inc/createpresentation.hxx
+++ b/sd/inc/createpresentation.hxx
@@ -24,13 +24,14 @@
#include <com/sun/star/uno/Reference.hxx>
-namespace com::sun::star::presentation {
- class XPresentation2;
+namespace com::sun::star::presentation
+{
+class XPresentation2;
}
class SdDrawDocument;
-css::uno::Reference<css::presentation::XPresentation2> CreatePresentation(
- SdDrawDocument const & rDocument);
+css::uno::Reference<css::presentation::XPresentation2>
+CreatePresentation(SdDrawDocument const& rDocument);
#endif
diff --git a/sd/inc/createunopageimpl.hxx b/sd/inc/createunopageimpl.hxx
index cc134fb45fb9..2d8159f0fe2e 100644
--- a/sd/inc/createunopageimpl.hxx
+++ b/sd/inc/createunopageimpl.hxx
@@ -22,10 +22,13 @@
#include <com/sun/star/uno/Reference.hxx>
-namespace com::sun::star::uno { class XInterface; }
+namespace com::sun::star::uno
+{
+class XInterface;
+}
class SdPage;
-css::uno::Reference< css::uno::XInterface > createUnoPageImpl( SdPage* pPage );
+css::uno::Reference<css::uno::XInterface> createUnoPageImpl(SdPage* pPage);
#endif
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index b8dafdd373aa..a30894c943a4 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -32,35 +32,35 @@ public:
typedef ::std::vector<const SdPage*> PageVec;
private:
- PageVec maPages;
- OUString aName;
+ PageVec maPages;
+ OUString aName;
// this is a weak reference to a possible living api wrapper for this custom show
- css::uno::WeakReference< css::uno::XInterface > mxUnoCustomShow;
+ css::uno::WeakReference<css::uno::XInterface> mxUnoCustomShow;
public:
SdCustomShow();
- SdCustomShow(css::uno::Reference< css::uno::XInterface > const & xShow );
+ SdCustomShow(css::uno::Reference<css::uno::XInterface> const& xShow);
~SdCustomShow();
// @@@ copy ctor, but no copy assignment? @@@
- SdCustomShow( const SdCustomShow& rShow );
+ SdCustomShow(const SdCustomShow& rShow);
- SdCustomShow& operator=( const SdCustomShow& rShow ) = delete;
+ SdCustomShow& operator=(const SdCustomShow& rShow) = delete;
/** Provides a direct access to the collection of the SdPage objects. */
- PageVec& PagesVector() { return maPages;}
+ PageVec& PagesVector() { return maPages; }
/**
* Replaces all occurrences of pOldPage with pNewPage.
* If pNewPage is 0 then removes all occurrences of pOldPage.
*/
- void ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage );
+ void ReplacePage(const SdPage* pOldPage, const SdPage* pNewPage);
- void SetName(const OUString& rName);
- const OUString& GetName() const { return aName;}
+ void SetName(const OUString& rName);
+ const OUString& GetName() const { return aName; }
- css::uno::Reference< css::uno::XInterface > getUnoCustomShow();
+ css::uno::Reference<css::uno::XInterface> getUnoCustomShow();
};
#endif // INCLUDED_SD_INC_CUSSHOW_HXX
diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx
index 53ad24a9ef6a..153d8573da42 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
@@ -24,8 +24,8 @@
#include <sddllapi.h>
-namespace sd {
-
+namespace sd
+{
/** A simple base implementation for reference-counted components.
acts like sal::SimpleReferenceObject but calls the virtual disposing()
methods before the ref count switches from 1 to zero.
@@ -56,12 +56,11 @@ protected:
private:
oslInterlockedCount m_nCount;
- SimpleReferenceComponent(SimpleReferenceComponent const &) = delete;
- void operator =(SimpleReferenceComponent const &) = delete;
+ SimpleReferenceComponent(SimpleReferenceComponent const&) = delete;
+ void operator=(SimpleReferenceComponent const&) = delete;
bool mbDisposed;
};
-
}
#endif // _SALHELPER_SimpleReferenceComponent_HXX_
diff --git a/sd/inc/randomnode.hxx b/sd/inc/randomnode.hxx
index 2a30b448541e..62cd3805747c 100644
--- a/sd/inc/randomnode.hxx
+++ b/sd/inc/randomnode.hxx
@@ -27,11 +27,10 @@
#include "sddllapi.h"
-namespace sd {
-
+namespace sd
+{
SD_DLLPUBLIC css::uno::Reference<css::uno::XInterface>
RandomAnimationNode_createInstance(sal_Int16 nPresetClass);
-
}
#endif
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index a7b0614114e2..44e0eb0d20a4 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -26,40 +26,37 @@
#include "sdattr.hrc"
// layer attributes
-inline SfxStringItem makeSdAttrLayerName( const OUString& aStr )
+inline SfxStringItem makeSdAttrLayerName(const OUString& aStr)
{
- return SfxStringItem( ATTR_LAYER_NAME, aStr );
+ return SfxStringItem(ATTR_LAYER_NAME, aStr);
}
-inline SfxStringItem makeSdAttrLayerTitle( const OUString& aStr = OUString() )
+inline SfxStringItem makeSdAttrLayerTitle(const OUString& aStr = OUString())
{
- return SfxStringItem( ATTR_LAYER_TITLE, aStr );
+ return SfxStringItem(ATTR_LAYER_TITLE, aStr);
}
-inline SfxStringItem makeSdAttrLayerDesc( const OUString& aStr = OUString() )
+inline SfxStringItem makeSdAttrLayerDesc(const OUString& aStr = OUString())
{
- return SfxStringItem( ATTR_LAYER_DESC, aStr );
+ return SfxStringItem(ATTR_LAYER_DESC, aStr);
}
-inline SfxBoolItem makeSdAttrLayerVisible( bool bValue = true )
+inline SfxBoolItem makeSdAttrLayerVisible(bool bValue = true)
{
- return SfxBoolItem( ATTR_LAYER_VISIBLE, bValue );
+ return SfxBoolItem(ATTR_LAYER_VISIBLE, bValue);
}
-inline SfxBoolItem makeSdAttrLayerPrintable( bool bValue = true )
+inline SfxBoolItem makeSdAttrLayerPrintable(bool bValue = true)
{
- return SfxBoolItem( ATTR_LAYER_PRINTABLE, bValue );
+ return SfxBoolItem(ATTR_LAYER_PRINTABLE, bValue);
}
-inline SfxBoolItem makeSdAttrLayerLocked( bool bValue = false )
+inline SfxBoolItem makeSdAttrLayerLocked(bool bValue = false)
{
- return SfxBoolItem( ATTR_LAYER_LOCKED, bValue );
+ return SfxBoolItem(ATTR_LAYER_LOCKED, bValue);
}
-inline SfxBoolItem makeSdAttrLayerThisPage()
-{
- return SfxBoolItem( ATTR_LAYER_THISPAGE, false );
-}
+inline SfxBoolItem makeSdAttrLayerThisPage() { return SfxBoolItem(ATTR_LAYER_THISPAGE, false); }
#endif // INCLUDED_SD_INC_SDATTR_HXX
diff --git a/sd/inc/sddllapi.h b/sd/inc/sddllapi.h
index e12e28613abe..bcf377dbff25 100644
--- a/sd/inc/sddllapi.h
+++ b/sd/inc/sddllapi.h
@@ -23,9 +23,9 @@
#include <sal/types.h>
#if defined(SD_DLLIMPLEMENTATION)
-#define SD_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#define SD_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define SD_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define SD_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#endif // INCLUDED_SD_INC_SDDLLAPI_H
diff --git a/sd/inc/sdenumdef.hxx b/sd/inc/sdenumdef.hxx
index d042c7671f12..d307f3d7128e 100644
--- a/sd/inc/sdenumdef.hxx
+++ b/sd/inc/sdenumdef.hxx
@@ -22,7 +22,12 @@
#define RET_SNAP_DELETE 111
-enum class SnapKind { Horizontal, Vertical, Point };
+enum class SnapKind
+{
+ Horizontal,
+ Vertical,
+ Point
+};
#endif
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx
index 2ec180a52bf3..90366e2df7da 100644
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
@@ -27,14 +27,14 @@ class ErrCode;
class SdGRFFilter final : public SdFilter
{
public:
- SdGRFFilter ( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell );
+ SdGRFFilter(SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell);
virtual ~SdGRFFilter() override;
- bool Import();
- bool Export() override;
+ bool Import();
+ bool Export() override;
- static void HandleGraphicFilterError( ErrCode nFilterError, ErrCode nStreamError );
+ static void HandleGraphicFilterError(ErrCode nFilterError, ErrCode nStreamError);
};
#endif // INCLUDED_SD_INC_SDGRFFILTER_HXX
diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx
index c55d24150b71..788a87ed569a 100644
--- a/sd/inc/sdhtmlfilter.hxx
+++ b/sd/inc/sdhtmlfilter.hxx
@@ -26,12 +26,10 @@
class SdHTMLFilter final : public SdFilter
{
public:
- SdHTMLFilter (
- SfxMedium& rMedium,
- ::sd::DrawDocShell& rDocShell);
+ SdHTMLFilter(SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell);
virtual ~SdHTMLFilter() override;
- virtual bool Export() override;
+ virtual bool Export() override;
};
#endif // INCLUDED_SD_INC_SDHTMLFILTER_HXX
diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx
index be3c5584c95d..5670002345f2 100644
--- a/sd/inc/undo/undoobjects.hxx
+++ b/sd/inc/undo/undoobjects.hxx
@@ -30,20 +30,19 @@ class SdPage;
namespace sd
{
-
class UndoRemovePresObjectImpl
{
protected:
- UndoRemovePresObjectImpl( SdrObject& rObject );
+ UndoRemovePresObjectImpl(SdrObject& rObject);
virtual ~UndoRemovePresObjectImpl();
virtual void Undo();
virtual void Redo();
private:
- std::unique_ptr<SfxUndoAction> mpUndoUsercall;
- std::unique_ptr<SfxUndoAction> mpUndoAnimation;
- std::unique_ptr<SfxUndoAction> mpUndoPresObj;
+ std::unique_ptr<SfxUndoAction> mpUndoUsercall;
+ std::unique_ptr<SfxUndoAction> mpUndoAnimation;
+ std::unique_ptr<SfxUndoAction> mpUndoPresObj;
};
class UndoRemoveObject final : public SdrUndoRemoveObj, public UndoRemovePresObjectImpl
@@ -61,7 +60,7 @@ private:
class UndoDeleteObject final : public SdrUndoDelObj, public UndoRemovePresObjectImpl
{
public:
- UndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect );
+ UndoDeleteObject(SdrObject& rObject, bool bOrdNumDirect);
virtual void Undo() override;
virtual void Redo() override;
@@ -73,7 +72,7 @@ private:
class UndoReplaceObject final : public SdrUndoReplaceObj, public UndoRemovePresObjectImpl
{
public:
- UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject );
+ UndoReplaceObject(SdrObject& rOldObject, SdrObject& rNewObject);
virtual void Undo() override;
virtual void Redo() override;
@@ -85,7 +84,7 @@ private:
class UndoObjectSetText final : public SdrUndoObjSetText
{
public:
- UndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText );
+ UndoObjectSetText(SdrObject& rNewObj, sal_Int32 nText);
virtual ~UndoObjectSetText() override;
virtual void Undo() override;
@@ -93,7 +92,7 @@ public:
private:
std::unique_ptr<SfxUndoAction> mpUndoAnimation;
- bool mbNewEmptyPresObj;
+ bool mbNewEmptyPresObj;
::tools::WeakReference<SdrObject> mxSdrObject;
};
@@ -136,7 +135,7 @@ private:
class UndoAutoLayoutPosAndSize final : public SfxUndoAction
{
public:
- UndoAutoLayoutPosAndSize( SdPage& rPage );
+ UndoAutoLayoutPosAndSize(SdPage& rPage);
virtual void Undo() override;
virtual void Redo() override;
@@ -148,7 +147,7 @@ private:
class UndoGeoObject final : public SdrUndoGeoObj
{
public:
- UndoGeoObject( SdrObject& rNewObj );
+ UndoGeoObject(SdrObject& rNewObj);
virtual void Undo() override;
virtual void Redo() override;
@@ -161,7 +160,7 @@ private:
class UndoAttrObject final : public SdrUndoAttrObj
{
public:
- UndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText );
+ UndoAttrObject(SdrObject& rObject, bool bStyleSheet1, bool bSaveText);
virtual void Undo() override;
virtual void Redo() override;
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index 68169b686a5c..44b0fa67fcac 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx
@@ -30,13 +30,12 @@ class SdPage;
namespace sd
{
-
struct UndoAnimationImpl;
class UndoAnimation final : public SdrUndoAction
{
public:
- UndoAnimation( SdDrawDocument* pDoc, SdPage* pThePage );
+ UndoAnimation(SdDrawDocument* pDoc, SdPage* pThePage);
virtual ~UndoAnimation() override;
virtual void Undo() override;
@@ -45,14 +44,15 @@ public:
virtual OUString GetComment() const override;
private:
- std::unique_ptr<UndoAnimationImpl> mpImpl;
+ std::unique_ptr<UndoAnimationImpl> mpImpl;
};
struct UndoAnimationPathImpl;
class UndoAnimationPath final : public SdrUndoAction
{
public:
- UndoAnimationPath( SdDrawDocument* pDoc, SdPage* pThePage, const css::uno::Reference< css::animations::XAnimationNode >& xNode );
+ UndoAnimationPath(SdDrawDocument* pDoc, SdPage* pThePage,
+ const css::uno::Reference<css::animations::XAnimationNode>& xNode);
virtual ~UndoAnimationPath() override;
virtual void Undo() override;
@@ -69,7 +69,7 @@ struct UndoTransitionImpl;
class UndoTransition final : public SdUndoAction
{
public:
- UndoTransition( SdDrawDocument* pDoc, SdPage* pThePage );
+ UndoTransition(SdDrawDocument* pDoc, SdPage* pThePage);
virtual ~UndoTransition() override;
virtual void Undo() override;
@@ -80,7 +80,6 @@ public:
private:
std::unique_ptr<UndoTransitionImpl> mpImpl;
};
-
}
#endif // INCLUDED_SD_INC_UNDOANIM_HXX
diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx
index 6cb1e91f7307..2a3dcda08983 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -27,7 +27,8 @@ using namespace ::com::sun::star;
namespace
{
/// Gets one child of xShape, which one is specified by nIndex.
-uno::Reference<drawing::XShape> getChildShape(const uno::Reference<drawing::XShape>& xShape, sal_Int32 nIndex)
+uno::Reference<drawing::XShape> getChildShape(const uno::Reference<drawing::XShape>& xShape,
+ sal_Int32 nIndex)
{
uno::Reference<container::XIndexAccess> xGroup(xShape, uno::UNO_QUERY);
CPPUNIT_ASSERT(xGroup.is());
@@ -171,8 +172,10 @@ public:
void SdImportTestSmartArt::testBase()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart1.pptx"), PPTX);
- uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart1.pptx"), PPTX);
+ uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef),
+ uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), xShapeGroup->getCount());
uno::Reference<text::XText> xText0(xShapeGroup->getByIndex(1), uno::UNO_QUERY_THROW);
@@ -196,28 +199,32 @@ void SdImportTestSmartArt::testBase()
uno::Reference<text::XTextRange> xParagraph(getParagraphFromShape(0, xShape));
uno::Reference<beans::XPropertySet> xPropSet(xParagraph, uno::UNO_QUERY_THROW);
xPropSet->getPropertyValue("ParaAdjust") >>= nParaAdjust;
- CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, static_cast<style::ParagraphAdjust>(nParaAdjust));
+ CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER,
+ static_cast<style::ParagraphAdjust>(nParaAdjust));
uno::Reference<drawing::XShape> xShape0(xShapeGroup->getByIndex(1), uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShape> xShape1(xShapeGroup->getByIndex(2), uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShape> xShape2(xShapeGroup->getByIndex(3), uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShape> xShape3(xShapeGroup->getByIndex(4), uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShape> xShape4(xShapeGroup->getByIndex(5), uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_EQUAL(xShape0->getPosition().Y,xShape1->getPosition().Y);
- CPPUNIT_ASSERT_EQUAL(xShape2->getPosition().Y,xShape3->getPosition().Y);
+ CPPUNIT_ASSERT_EQUAL(xShape0->getPosition().Y, xShape1->getPosition().Y);
+ CPPUNIT_ASSERT_EQUAL(xShape2->getPosition().Y, xShape3->getPosition().Y);
CPPUNIT_ASSERT(xShape2->getPosition().Y > xShape0->getPosition().Y);
CPPUNIT_ASSERT(xShape4->getPosition().Y > xShape2->getPosition().Y);
CPPUNIT_ASSERT(xShape0->getPosition().X < xShape1->getPosition().X);
CPPUNIT_ASSERT(xShape2->getPosition().X < xShape3->getPosition().X);
- CPPUNIT_ASSERT((xShape2->getPosition().X < xShape4->getPosition().X) && (xShape3->getPosition().X > xShape4->getPosition().X));
+ CPPUNIT_ASSERT((xShape2->getPosition().X < xShape4->getPosition().X)
+ && (xShape3->getPosition().X > xShape4->getPosition().X));
xDocShRef->DoClose();
}
void SdImportTestSmartArt::testChildren()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-children.pptx"), PPTX);
- uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-children.pptx"), PPTX);
+ uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef),
+ uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xShapeGroup->getCount());
uno::Reference<drawing::XShapes> xShapeGroup0(xShapeGroup->getByIndex(1), uno::UNO_QUERY_THROW);
@@ -253,8 +260,10 @@ void SdImportTestSmartArt::testChildren()
void SdImportTestSmartArt::testText()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-text.pptx"), PPTX);
- uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-text.pptx"), PPTX);
+ uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef),
+ uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShapes> xShapeGroup2(xShapeGroup->getByIndex(1), uno::UNO_QUERY_THROW);
uno::Reference<text::XText> xText0(xShapeGroup2->getByIndex(0), uno::UNO_QUERY_THROW);
@@ -268,11 +277,13 @@ void SdImportTestSmartArt::testText()
void SdImportTestSmartArt::testCnt()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-cnt.pptx"), PPTX);
- uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-cnt.pptx"), PPTX);
+ uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef),
+ uno::UNO_QUERY_THROW);
sal_Int32 nCount = xShapeGroup->getCount();
sal_Int32 nCorrect = 0;
- for (sal_Int32 i=0; i<nCount; i++)
+ for (sal_Int32 i = 0; i < nCount; i++)
{
uno::Reference<text::XText> xText(xShapeGroup->getByIndex(i), uno::UNO_QUERY);
if (xText.is() && !xText->getString().isEmpty())
@@ -285,8 +296,10 @@ void SdImportTestSmartArt::testCnt()
void SdImportTestSmartArt::testDir()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-dir.pptx"), PPTX);
- uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-dir.pptx"), PPTX);
+ uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef),
+ uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xShapeGroup->getCount());
uno::Reference<drawing::XShape> xShape0(xShapeGroup->getByIndex(1), uno::UNO_QUERY_THROW);
@@ -298,8 +311,10 @@ void SdImportTestSmartArt::testDir()
void SdImportTestSmartArt::testMaxDepth()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-maxdepth.pptx"), PPTX);
- uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-maxdepth.pptx"), PPTX);
+ uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef),
+ uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xShapeGroup->getCount());
uno::Reference<text::XText> xText0(xShapeGroup->getByIndex(1), uno::UNO_QUERY_THROW);
@@ -309,24 +324,29 @@ void SdImportTestSmartArt::testMaxDepth()
uno::Reference<drawing::XShape> xShape0(xShapeGroup->getByIndex(1), uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShape> xShape1(xShapeGroup->getByIndex(2), uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_EQUAL(xShape0->getPosition().Y , xShape1->getPosition().Y); // Confirms shapes are in same Y axis-level.
+ CPPUNIT_ASSERT_EQUAL(xShape0->getPosition().Y,
+ xShape1->getPosition().Y); // Confirms shapes are in same Y axis-level.
xDocShRef->DoClose();
}
void SdImportTestSmartArt::testRotation()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-rotation.pptx"), PPTX);
- uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-rotation.pptx"), PPTX);
+ uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef),
+ uno::UNO_QUERY_THROW);
uno::Reference<beans::XPropertySet> xShape0(xShapeGroup->getByIndex(1), uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xShape0->getPropertyValue("RotateAngle").get<sal_Int32>());
uno::Reference<beans::XPropertySet> xShape1(xShapeGroup->getByIndex(2), uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(24000), xShape1->getPropertyValue("RotateAngle").get<sal_Int32>());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(24000),
+ xShape1->getPropertyValue("RotateAngle").get<sal_Int32>());
uno::Reference<beans::XPropertySet> xShape2(xShapeGroup->getByIndex(3), uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(12000), xShape2->getPropertyValue("RotateAngle").get<sal_Int32>());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(12000),
+ xShape2->getPropertyValue("RotateAngle").get<sal_Int32>());
xDocShRef->DoClose();
}
@@ -365,58 +385,58 @@ void SdImportTestSmartArt::testTextAutoRotation()
};
// Slide 1: absent autoTxRot => defaults to "upr"
- testText(0, 0, "a", 0, 0);
- testText(0, 1, "b", 33750, 0);
- testText(0, 2, "c", 31500, 0);
- testText(0, 3, "d", 29250, 90);
- testText(0, 4, "e", 27000, 90);
- testText(0, 5, "f", 24750, 90);
- testText(0, 6, "g", 22500, 180);
- testText(0, 7, "h", 20250, 180);
- testText(0, 8, "i", 18000, 180);
- testText(0, 9, "j", 15750, 180);
+ testText(0, 0, "a", 0, 0);
+ testText(0, 1, "b", 33750, 0);
+ testText(0, 2, "c", 31500, 0);
+ testText(0, 3, "d", 29250, 90);
+ testText(0, 4, "e", 27000, 90);
+ testText(0, 5, "f", 24750, 90);
+ testText(0, 6, "g", 22500, 180);
+ testText(0, 7, "h", 20250, 180);
+ testText(0, 8, "i", 18000, 180);
+ testText(0, 9, "j", 15750, 180);
testText(0, 10, "k", 13500, 180);
testText(0, 11, "l", 11250, 270);
- testText(0, 12, "m", 9000, 270);
- testText(0, 13, "n", 6750, 270);
- testText(0, 14, "o", 4500, 0);
- testText(0, 15, "p", 2250, 0);
+ testText(0, 12, "m", 9000, 270);
+ testText(0, 13, "n", 6750, 270);
+ testText(0, 14, "o", 4500, 0);
+ testText(0, 15, "p", 2250, 0);
// Slide 2: autoTxRot == "none"
- testText(1, 0, "a", 0, 0);
- testText(1, 1, "b", 33750, 0);
- testText(1, 2, "c", 31500, 0);
- testText(1, 3, "d", 29250, 0);
- testText(1, 4, "e", 27000, 0);
- testText(1, 5, "f", 24750, 0);
- testText(1, 6, "g", 22500, 0);
- testText(1, 7, "h", 20250, 0);
- testText(1, 8, "i", 18000, 0);
- testText(1, 9, "j", 15750, 0);
+ testText(1, 0, "a", 0, 0);
+ testText(1, 1, "b", 33750, 0);
+ testText(1, 2, "c", 31500, 0);
+ testText(1, 3, "d", 29250, 0);
+ testText(1, 4, "e", 27000, 0);
+ testText(1, 5, "f", 24750, 0);
+ testText(1, 6, "g", 22500, 0);
+ testText(1, 7, "h", 20250, 0);
+ testText(1, 8, "i", 18000, 0);
+ testText(1, 9, "j", 15750, 0);
testText(1, 10, "k", 13500, 0);
testText(1, 11, "l", 11250, 0);
- testText(1, 12, "m", 9000, 0);
- testText(1, 13, "n", 6750, 0);
- testText(1, 14, "o", 4500, 0);
- testText(1, 15, "p", 2250, 0);
+ testText(1, 12, "m", 9000, 0);
+ testText(1, 13, "n", 6750, 0);
+ testText(1, 14, "o", 4500, 0);
+ testText(1, 15, "p", 2250, 0);
// Slide 3: autoTxRot == "grav"
- testText(2, 0, "a", 0, 0);
- testText(2, 1, "b", 33750, 0);
- testText(2, 2, "c", 31500, 0);
- testText(2, 3, "d", 29250, 0);
- testText(2, 4, "e", 27000, 0);
- testText(2, 5, "f", 24750, 180);
- testText(2, 6, "g", 22500, 180);
- testText(2, 7, "h", 20250, 180);
- testText(2, 8, "i", 18000, 180);
- testText(2, 9, "j", 15750, 180);
+ testText(2, 0, "a", 0, 0);
+ testText(2, 1, "b", 33750, 0);
+ testText(2, 2, "c", 31500, 0);
+ testText(2, 3, "d", 29250, 0);
+ testText(2, 4, "e", 27000, 0);
+ testText(2, 5, "f", 24750, 180);
+ testText(2, 6, "g", 22500, 180);
+ testText(2, 7, "h", 20250, 180);
+ testText(2, 8, "i", 18000, 180);
+ testText(2, 9, "j", 15750, 180);
testText(2, 10, "k", 13500, 180);
testText(2, 11, "l", 11250, 180);
- testText(2, 12, "m", 9000, 0);
- testText(2, 13, "n", 6750, 0);
- testText(2, 14, "o", 4500, 0);
- testText(2, 15, "p", 2250, 0);
+ testText(2, 12, "m", 9000, 0);
+ testText(2, 13, "n", 6750, 0);
+ testText(2, 14, "o", 4500, 0);
+ testText(2, 15, "p", 2250, 0);
xDocShRef->DoClose();
}
@@ -433,8 +453,10 @@ void SdImportTestSmartArt::testPyramid()
void SdImportTestSmartArt::testChevron()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-chevron.pptx"), PPTX);
- uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-chevron.pptx"), PPTX);
+ uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef),
+ uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xShapeGroup->getCount());
uno::Reference<text::XText> xText0(xShapeGroup->getByIndex(1), uno::UNO_QUERY_THROW);
@@ -448,7 +470,8 @@ void SdImportTestSmartArt::testChevron()
uno::Reference<drawing::XShape> xShape1(xShapeGroup->getByIndex(2), uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShape> xShape2(xShapeGroup->getByIndex(3), uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xShape0->getPosition().X < xShape1->getPosition().X && xShape1->getPosition().X < xShape2->getPosition().X);
+ CPPUNIT_ASSERT(xShape0->getPosition().X < xShape1->getPosition().X
+ && xShape1->getPosition().X < xShape2->getPosition().X);
CPPUNIT_ASSERT_EQUAL(xShape0->getPosition().Y, xShape1->getPosition().Y);
CPPUNIT_ASSERT_EQUAL(xShape1->getPosition().Y, xShape2->getPosition().Y);
@@ -457,8 +480,8 @@ void SdImportTestSmartArt::testChevron()
void SdImportTestSmartArt::testCycle()
{
- sd::DrawDocShellRef xDocShRef = loadURL(
- m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-cycle.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-cycle.pptx"), PPTX);
uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
CPPUNIT_ASSERT(xGroup.is());
@@ -477,9 +500,11 @@ void SdImportTestSmartArt::testCycle()
// xShapeConn is connector between shapes 0 and 2
// it should lay between them and be rotated 0 -> 2
CPPUNIT_ASSERT(xShape0->getPosition().X < xShapeConn->getPosition().X);
- CPPUNIT_ASSERT(xShape0->getPosition().Y < xShapeConn->getPosition().Y && xShapeConn->getPosition().Y < xShape2->getPosition().Y);
+ CPPUNIT_ASSERT(xShape0->getPosition().Y < xShapeConn->getPosition().Y
+ && xShapeConn->getPosition().Y < xShape2->getPosition().Y);
uno::Reference<beans::XPropertySet> xPropSetConn(xShapeConn, uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(32400), xPropSetConn->getPropertyValue("RotateAngle").get<sal_Int32>());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(32400),
+ xPropSetConn->getPropertyValue("RotateAngle").get<sal_Int32>());
// Make sure that we have an arrow shape between the two shapes
comphelper::SequenceAsHashMap aCustomShapeGeometry(
@@ -513,8 +538,8 @@ void SdImportTestSmartArt::testMultidirectional()
{
// similar document as cycle, but arrows are pointing in both directions
- sd::DrawDocShellRef xDocShRef
- = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-multidirectional.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef = loadURL(
+ m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-multidirectional.pptx"), PPTX);
uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
CPPUNIT_ASSERT(xGroup.is());
@@ -552,8 +577,11 @@ void SdImportTestSmartArt::testSegmentedCycle()
void SdImportTestSmartArt::testBaseRtoL()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-rightoleftblockdiagram.pptx"), PPTX);
- uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW);
+ sd::DrawDocShellRef xDocShRef = loadURL(
+ m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-rightoleftblockdiagram.pptx"),
+ PPTX);
+ uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef),
+ uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), xShapeGroup->getCount());
uno::Reference<text::XText> xText0(xShapeGroup->getByIndex(1), uno::UNO_QUERY_THROW);
@@ -577,20 +605,22 @@ void SdImportTestSmartArt::testBaseRtoL()
uno::Reference<text::XTextRange> xParagraph(getParagraphFromShape(0, xShape));
uno::Reference<beans::XPropertySet> xPropSet(xParagraph, uno::UNO_QUERY_THROW);
xPropSet->getPropertyValue("ParaAdjust") >>= nParaAdjust;
- CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, static_cast<style::ParagraphAdjust>(nParaAdjust));
+ CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER,
+ static_cast<style::ParagraphAdjust>(nParaAdjust));
uno::Reference<drawing::XShape> xShape0(xShapeGroup->getByIndex(1), uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShape> xShape1(xShapeGroup->getByIndex(2), uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShape> xShape2(xShapeGroup->getByIndex(3), uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShape> xShape3(xShapeGroup->getByIndex(4), uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShape> xShape4(xShapeGroup->getByIndex(5), uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_EQUAL(xShape0->getPosition().Y,xShape1->getPosition().Y);
- CPPUNIT_ASSERT_EQUAL(xShape2->getPosition().Y,xShape3->getPosition().Y);
+ CPPUNIT_ASSERT_EQUAL(xShape0->getPosition().Y, xShape1->getPosition().Y);
+ CPPUNIT_ASSERT_EQUAL(xShape2->getPosition().Y, xShape3->getPosition().Y);
CPPUNIT_ASSERT(xShape2->getPosition().Y > xShape0->getPosition().Y);
CPPUNIT_ASSERT(xShape4->getPosition().Y > xShape2->getPosition().Y);
CPPUNIT_ASSERT(xShape0->getPosition().X > xShape1->getPosition().X);
CPPUNIT_ASSERT(xShape2->getPosition().X > xShape3->getPosition().X);
- CPPUNIT_ASSERT((xShape2->getPosition().X > xShape4->getPosition().X) && (xShape3->getPosition().X < xShape4->getPosition().X));
+ CPPUNIT_ASSERT((xShape2->getPosition().X > xShape4->getPosition().X)
+ && (xShape3->getPosition().X < xShape4->getPosition().X));
xDocShRef->DoClose();
}
@@ -650,8 +680,8 @@ void SdImportTestSmartArt::testVerticalBracketList()
void SdImportTestSmartArt::testTableList()
{
- sd::DrawDocShellRef xDocShRef = loadURL(
- m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/table-list.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/table-list.pptx"), PPTX);
uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
CPPUNIT_ASSERT(xShapeGroup.is());
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(4), xShapeGroup->getCount());
@@ -804,8 +834,7 @@ void SdImportTestSmartArt::testOrgChart()
{
// Simple org chart with 1 manager and 1 employee only.
sd::DrawDocShellRef xDocShRef = loadURL(
- m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-org-chart.pptx"),
- PPTX);
+ m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-org-chart.pptx"), PPTX);
uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
CPPUNIT_ASSERT(xGroup.is());
@@ -892,8 +921,8 @@ void SdImportTestSmartArt::testOrgChart()
CPPUNIT_ASSERT_GREATER(aAssistantPos.Y, aEmployeePos.Y);
// Make sure the connector of the assistant is above the shape.
- uno::Reference<drawing::XShape> xAssistantConnector =
- getChildShape(getChildShape(getChildShape(xGroup, 1), 1), 0);
+ uno::Reference<drawing::XShape> xAssistantConnector
+ = getChildShape(getChildShape(getChildShape(xGroup, 1), 1), 0);
CPPUNIT_ASSERT(xAssistantConnector.is());
//awt::Point aAssistantConnectorPos = xAssistantConnector->getPosition();
// This failed, the vertical positions of the connector and the shape of
@@ -1158,8 +1187,10 @@ void SdImportTestSmartArt::testBackgroundDrawingmlFallback()
{
// same as testBackground, but test file contains drawingML fallback
- sd::DrawDocShellRef xDocShRef = loadURL(
- m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-background-drawingml-fallback.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc(
+ "/sd/qa/unit/data/pptx/smartart-background-drawingml-fallback.pptx"),
+ PPTX);
uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
CPPUNIT_ASSERT(xGroup.is());
@@ -1252,7 +1283,8 @@ void SdImportTestSmartArt::testFontSize()
void SdImportTestSmartArt::testVerticalBlockList()
{
sd::DrawDocShellRef xDocShRef = loadURL(
- m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-vertical-block-list.pptx"), PPTX);
+ m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-vertical-block-list.pptx"),
+ PPTX);
uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
CPPUNIT_ASSERT(xGroup.is());
@@ -1266,7 +1298,8 @@ void SdImportTestSmartArt::testVerticalBlockList()
CPPUNIT_ASSERT_EQUAL(OUString("b\nc"), xTextBC->getString());
uno::Reference<beans::XPropertySet> xPropSetBC(xShapeBC, uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(27000), xPropSetBC->getPropertyValue("RotateAngle").get<sal_Int32>());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(27000),
+ xPropSetBC->getPropertyValue("RotateAngle").get<sal_Int32>());
// BC shape is rotated 90*, so width and height is swapped
CPPUNIT_ASSERT_GREATER(xShapeA->getSize().Width, xShapeBC->getSize().Height);
@@ -1283,7 +1316,8 @@ void SdImportTestSmartArt::testVerticalBlockList()
CPPUNIT_ASSERT_EQUAL(xShapeA->getSize().Width, xShapeEmpty->getSize().Width);
CPPUNIT_ASSERT_EQUAL(xShapeA->getSize().Height, xShapeEmpty->getSize().Height);
CPPUNIT_ASSERT_EQUAL(xShapeA->getPosition().X, xShapeEmpty->getPosition().X);
- CPPUNIT_ASSERT_GREATER(xShapeA->getPosition().Y + 2*xShapeA->getSize().Height, xShapeEmpty->getPosition().Y);
+ CPPUNIT_ASSERT_GREATER(xShapeA->getPosition().Y + 2 * xShapeA->getSize().Height,
+ xShapeEmpty->getPosition().Y);
uno::Reference<drawing::XShape> xGroupShape(xGroup, uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(xGroupShape->getPosition().Y + xGroupShape->getSize().Height,
@@ -1295,8 +1329,7 @@ void SdImportTestSmartArt::testVerticalBlockList()
void SdImportTestSmartArt::testMissingBulletAndIndent()
{
sd::DrawDocShellRef xDocShRef = loadURL(
- m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-missing-bullet.pptx"),
- PPTX);
+ m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-missing-bullet.pptx"), PPTX);
uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
uno::Reference<drawing::XShapes> xGroup1(xGroup->getByIndex(2), uno::UNO_QUERY);
uno::Reference<drawing::XShapes> xGroup2(xGroup1->getByIndex(0), uno::UNO_QUERY);
@@ -1305,23 +1338,23 @@ void SdImportTestSmartArt::testMissingBulletAndIndent()
uno::Reference<container::XEnumerationAccess> xParasAccess(xText, uno::UNO_QUERY);
uno::Reference<container::XEnumeration> xParas = xParasAccess->createEnumeration();
- xParas->nextElement();// skip parent
+ xParas->nextElement(); // skip parent
uno::Reference<beans::XPropertySet> xPara1(xParas->nextElement(), uno::UNO_QUERY);
CPPUNIT_ASSERT(xPara1.is());
sal_Int16 nNumberingLevel = -1;
- xPara1->getPropertyValue("NumberingLevel")>>= nNumberingLevel;
+ xPara1->getPropertyValue("NumberingLevel") >>= nNumberingLevel;
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), nNumberingLevel);
- uno::Reference< container::XIndexAccess > xNumRule;
+ uno::Reference<container::XIndexAccess> xNumRule;
xPara1->getPropertyValue("NumberingRules") >>= xNumRule;
uno::Sequence<beans::PropertyValue> aBulletProps;
xNumRule->getByIndex(1) >>= aBulletProps;
- for (beans::PropertyValue const & rProp : std::as_const(aBulletProps))
+ for (beans::PropertyValue const& rProp : std::as_const(aBulletProps))
{
- if(rProp.Name == "LeftMargin")
+ if (rProp.Name == "LeftMargin")
CPPUNIT_ASSERT_EQUAL(sal_Int32(309), rProp.Value.get<sal_Int32>());
}
}
@@ -1329,8 +1362,7 @@ void SdImportTestSmartArt::testMissingBulletAndIndent()
void SdImportTestSmartArt::testBulletList()
{
sd::DrawDocShellRef xDocShRef = loadURL(
- m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-bullet-list.pptx"),
- PPTX);
+ m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-bullet-list.pptx"), PPTX);
uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
CPPUNIT_ASSERT(xGroup.is());
@@ -1341,12 +1373,14 @@ void SdImportTestSmartArt::testBulletList()
// child levels should have bullets
uno::Reference<beans::XPropertySet> xPara1(xParas->nextElement(), uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess> xRules1(xPara1->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess> xRules1(xPara1->getPropertyValue("NumberingRules"),
+ uno::UNO_QUERY);
comphelper::SequenceAsHashMap aRule1(xRules1->getByIndex(1));
CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8(u8"•"), aRule1["BulletChar"].get<OUString>());
uno::Reference<beans::XPropertySet> xPara2(xParas->nextElement(), uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess> xRules2(xPara2->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess> xRules2(xPara2->getPropertyValue("NumberingRules"),
+ uno::UNO_QUERY);
comphelper::SequenceAsHashMap aRule2(xRules2->getByIndex(2));
CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8(u8"•"), aRule2["BulletChar"].get<OUString>());
@@ -1376,9 +1410,11 @@ void SdImportTestSmartArt::testRecursion()
CPPUNIT_ASSERT_EQUAL(OUString("B1"), xTextB1->getString());
uno::Reference<drawing::XShape> xGroupC12(xGroupB1->getByIndex(1), uno::UNO_QUERY);
- uno::Reference<text::XText> xTextC1(getChildShape(getChildShape(getChildShape(xGroupC12, 0), 0), 0), uno::UNO_QUERY);
+ uno::Reference<text::XText> xTextC1(
+ getChildShape(getChildShape(getChildShape(xGroupC12, 0), 0), 0), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("C1"), xTextC1->getString());
- uno::Reference<text::XText> xTextC2(getChildShape(getChildShape(getChildShape(xGroupC12, 1), 0), 0), uno::UNO_QUERY);
+ uno::Reference<text::XText> xTextC2(
+ getChildShape(getChildShape(getChildShape(xGroupC12, 1), 0), 0), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("C2"), xTextC2->getString());
uno::Reference<drawing::XShapes> xGroupB2(xGroupB->getByIndex(5), uno::UNO_QUERY);
@@ -1388,7 +1424,8 @@ void SdImportTestSmartArt::testRecursion()
CPPUNIT_ASSERT_EQUAL(OUString("B2"), xTextB2->getString());
uno::Reference<drawing::XShape> xGroupC3(xGroupB2->getByIndex(1), uno::UNO_QUERY);
- uno::Reference<text::XText> xTextC3(getChildShape(getChildShape(getChildShape(xGroupC3, 0), 0), 0), uno::UNO_QUERY);
+ uno::Reference<text::XText> xTextC3(
+ getChildShape(getChildShape(getChildShape(xGroupC3, 0), 0), 0), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("C3"), xTextC3->getString());
xDocShRef->DoClose();
@@ -1407,34 +1444,41 @@ void SdImportTestSmartArt::testDataFollow()
uno::Reference<drawing::XShapes> xGroupLeft(xGroup->getByIndex(1), uno::UNO_QUERY);
uno::Reference<drawing::XShape> xGroupB(xGroupLeft->getByIndex(1), uno::UNO_QUERY);
- uno::Reference<drawing::XShape> xShapeB1 = getChildShape(getChildShape(getChildShape(xGroupB, 1), 0), 0);
+ uno::Reference<drawing::XShape> xShapeB1
+ = getChildShape(getChildShape(getChildShape(xGroupB, 1), 0), 0);
uno::Reference<text::XText> xTextB1(xShapeB1, uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("B1"), xTextB1->getString());
- uno::Reference<drawing::XShape> xShapeB2 = getChildShape(getChildShape(getChildShape(xGroupB, 3), 0), 0);
+ uno::Reference<drawing::XShape> xShapeB2
+ = getChildShape(getChildShape(getChildShape(xGroupB, 3), 0), 0);
uno::Reference<text::XText> xTextB2(xShapeB2, uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("B2"), xTextB2->getString());
CPPUNIT_ASSERT_EQUAL(xShapeB1->getPosition().Y, xShapeB2->getPosition().Y);
- CPPUNIT_ASSERT_GREATEREQUAL(xShapeB1->getPosition().X + xShapeB1->getSize().Width, xShapeB2->getPosition().X);
+ CPPUNIT_ASSERT_GREATEREQUAL(xShapeB1->getPosition().X + xShapeB1->getSize().Width,
+ xShapeB2->getPosition().X);
uno::Reference<drawing::XShapes> xGroupRight(xGroup->getByIndex(2), uno::UNO_QUERY);
uno::Reference<drawing::XShape> xGroupC(xGroupRight->getByIndex(1), uno::UNO_QUERY);
- uno::Reference<drawing::XShape> xShapeC1 = getChildShape(getChildShape(getChildShape(xGroupC, 3), 0), 0);
+ uno::Reference<drawing::XShape> xShapeC1
+ = getChildShape(getChildShape(getChildShape(xGroupC, 3), 0), 0);
uno::Reference<text::XText> xTextC1(xShapeC1, uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("C1"), xTextC1->getString());
- uno::Reference<drawing::XShape> xShapeC2 = getChildShape(getChildShape(getChildShape(xGroupC, 5), 0), 0);
+ uno::Reference<drawing::XShape> xShapeC2
+ = getChildShape(getChildShape(getChildShape(xGroupC, 5), 0), 0);
uno::Reference<text::XText> xTextC2(xShapeC2, uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("C2"), xTextC2->getString());
CPPUNIT_ASSERT_EQUAL(xShapeC1->getPosition().X, xShapeC2->getPosition().X);
- CPPUNIT_ASSERT_GREATEREQUAL(xShapeC1->getPosition().Y + xShapeC1->getSize().Height, xShapeC2->getPosition().Y);
+ CPPUNIT_ASSERT_GREATEREQUAL(xShapeC1->getPosition().Y + xShapeC1->getSize().Height,
+ xShapeC2->getPosition().Y);
xDocShRef->DoClose();
}
void SdImportTestSmartArt::testOrgChart2()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-org-chart2.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef = loadURL(
+ m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-org-chart2.pptx"), PPTX);
uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
uno::Reference<drawing::XShape> xShapeC1 = findChildShapeByText(xGroup, "C1");
@@ -1452,31 +1496,37 @@ void SdImportTestSmartArt::testOrgChart2()
CPPUNIT_ASSERT(xShapeD2.is());
CPPUNIT_ASSERT_EQUAL(xShapeC1->getPosition().Y, xShapeC2->getPosition().Y);
- CPPUNIT_ASSERT_GREATEREQUAL(xShapeC1->getPosition().X + xShapeC1->getSize().Width, xShapeC2->getPosition().X);
+ CPPUNIT_ASSERT_GREATEREQUAL(xShapeC1->getPosition().X + xShapeC1->getSize().Width,
+ xShapeC2->getPosition().X);
CPPUNIT_ASSERT_EQUAL(xShapeC3->getPosition().X, xShapeC4->getPosition().X);
- CPPUNIT_ASSERT_GREATEREQUAL(xShapeC3->getPosition().Y + xShapeC3->getSize().Height, xShapeC4->getPosition().Y);
+ CPPUNIT_ASSERT_GREATEREQUAL(xShapeC3->getPosition().Y + xShapeC3->getSize().Height,
+ xShapeC4->getPosition().Y);
CPPUNIT_ASSERT_EQUAL(xShapeD1->getPosition().X, xShapeD2->getPosition().X);
- CPPUNIT_ASSERT_GREATEREQUAL(xShapeD1->getPosition().Y + xShapeD1->getSize().Height, xShapeD2->getPosition().Y);
+ CPPUNIT_ASSERT_GREATEREQUAL(xShapeD1->getPosition().Y + xShapeD1->getSize().Height,
+ xShapeD2->getPosition().Y);
CPPUNIT_ASSERT_GREATEREQUAL(xShapeC2->getPosition().X, xShapeD1->getPosition().X);
- CPPUNIT_ASSERT_GREATEREQUAL(xShapeC2->getPosition().Y + xShapeC2->getSize().Height, xShapeD1->getPosition().Y);
+ CPPUNIT_ASSERT_GREATEREQUAL(xShapeC2->getPosition().Y + xShapeC2->getSize().Height,
+ xShapeD1->getPosition().Y);
- CPPUNIT_ASSERT_GREATEREQUAL(xShapeD1->getPosition().X + xShapeD1->getSize().Width, xShapeC4->getPosition().X);
+ CPPUNIT_ASSERT_GREATEREQUAL(xShapeD1->getPosition().X + xShapeD1->getSize().Width,
+ xShapeC4->getPosition().X);
xDocShRef->DoClose();
}
void SdImportTestSmartArt::testTdf131553()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf131553.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf131553.pptx"), PPTX);
uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
- const SdrPage *pPage = GetPage(1, xDocShRef);
- const SdrObjGroup *pObjGroup = dynamic_cast<SdrObjGroup *>(pPage->GetObj(0));
+ const SdrPage* pPage = GetPage(1, xDocShRef);
+ const SdrObjGroup* pObjGroup = dynamic_cast<SdrObjGroup*>(pPage->GetObj(0));
CPPUNIT_ASSERT(pObjGroup);
- const SdrObject *pObj = pObjGroup->GetSubList()->GetObj(1);
+ const SdrObject* pObj = pObjGroup->GetSubList()->GetObj(1);
CPPUNIT_ASSERT_MESSAGE("no object", pObj != nullptr);
CPPUNIT_ASSERT_EQUAL(OBJ_OLE2, pObj->GetObjIdentifier());
@@ -1520,7 +1570,8 @@ void SdImportTestSmartArt::testFillColorList()
void SdImportTestSmartArt::testTdf134221()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-tdf134221.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef = loadURL(
+ m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-tdf134221.pptx"), PPTX);
xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
uno::Reference<drawing::XShape> xShapeB = findChildShapeByText(xGroup, "B");
@@ -1528,14 +1579,15 @@ void SdImportTestSmartArt::testTdf134221()
uno::Reference<beans::XPropertySet> xTxtProps(xShapeB, uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(736),
- xTxtProps->getPropertyValue("TextUpperDistance").get<sal_Int32>());
+ xTxtProps->getPropertyValue("TextUpperDistance").get<sal_Int32>());
xDocShRef->DoClose();
}
void SdImportTestSmartArt::testLinearRule()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-linear-rule.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef = loadURL(
+ m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-linear-rule.pptx"), PPTX);
uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
// Last child, then first child inside that.
@@ -1572,7 +1624,8 @@ void SdImportTestSmartArt::testLinearRule()
void SdImportTestSmartArt::testLinearRuleVert()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-linear-rule-vert.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef = loadURL(
+ m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-linear-rule-vert.pptx"), PPTX);
uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
// Get the P1 shape.
@@ -1621,7 +1674,7 @@ void SdImportTestSmartArt::testAutofitSync()
// i.e. the 3rd shape had font size as direct formatting, but its automatic text scale was not
// disabled.
uno::Reference<beans::XPropertySet> xThirdInner(getChildShape(getChildShape(xMiddle, 4), 0),
- uno::UNO_QUERY);
+ uno::UNO_QUERY);
drawing::TextFitToSizeType eType{};
CPPUNIT_ASSERT(xThirdInner->getPropertyValue("TextFitToSize") >>= eType);
CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_NONE, eType);
diff --git a/sd/source/core/drawdoc_animations.cxx b/sd/source/core/drawdoc_animations.cxx
index f4d2d51fcab8..9fab403d50b5 100644
--- a/sd/source/core/drawdoc_animations.cxx
+++ b/sd/source/core/drawdoc_animations.cxx
@@ -30,9 +30,9 @@ using namespace ::com::sun::star::presentation;
/** replaces a slide from all custom shows with a new one or removes a slide from
all custom shows if pNewPage is 0.
*/
-void SdDrawDocument::ReplacePageInCustomShows( const SdPage* pOldPage, const SdPage* pNewPage )
+void SdDrawDocument::ReplacePageInCustomShows(const SdPage* pOldPage, const SdPage* pNewPage)
{
- if ( mpCustomShowList )
+ if (mpCustomShowList)
{
for (sal_uLong i = 0; i < mpCustomShowList->size(); i++)
{
@@ -42,11 +42,11 @@ void SdDrawDocument::ReplacePageInCustomShows( const SdPage* pOldPage, const SdP
}
}
-const Reference< XPresentation2 >& SdDrawDocument::getPresentation() const
+const Reference<XPresentation2>& SdDrawDocument::getPresentation() const
{
- if( !mxPresentation.is() )
+ if (!mxPresentation.is())
{
- const_cast< SdDrawDocument* >( this )->mxPresentation = CreatePresentation(*this);
+ const_cast<SdDrawDocument*>(this)->mxPresentation = CreatePresentation(*this);
}
return mxPresentation;
}
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index a722d1c53d53..6e9488c04278 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -24,28 +24,25 @@
#include "htmlex.hxx"
#include <sdhtmlfilter.hxx>
-
-SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) :
- SdFilter( rMedium, rDocShell )
+SdHTMLFilter::SdHTMLFilter(SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell)
+ : SdFilter(rMedium, rDocShell)
{
}
-SdHTMLFilter::~SdHTMLFilter()
-{
-}
+SdHTMLFilter::~SdHTMLFilter() {}
bool SdHTMLFilter::Export()
{
mrMedium.Close();
mrMedium.Commit();
- SfxItemSet *pSet = mrMedium.GetItemSet();
+ SfxItemSet* pSet = mrMedium.GetItemSet();
- css::uno::Sequence< css::beans::PropertyValue > aParams;
+ css::uno::Sequence<css::beans::PropertyValue> aParams;
const SfxPoolItem* pItem;
- if ( pSet->GetItemState( SID_FILTER_DATA, false, &pItem ) == SfxItemState::SET )
+ if (pSet->GetItemState(SID_FILTER_DATA, false, &pItem) == SfxItemState::SET)
static_cast<const SfxUnoAnyItem*>(pItem)->GetValue() >>= aParams;
HtmlExport aExport(mrMedium.GetName(), aParams, &mrDocument, &mrDocShell);
diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx
index a177c443da3c..6976e2c70cc8 100644
--- a/sd/source/filter/ppt/pptatom.hxx
+++ b/sd/source/filter/ppt/pptatom.hxx
@@ -24,29 +24,28 @@
namespace ppt
{
-
class Atom
{
public:
~Atom();
/** imports this atom and its child atoms */
- static Atom* import( const DffRecordHeader& rRootRecordHeader, SvStream& rStCtrl );
+ static Atom* import(const DffRecordHeader& rRootRecordHeader, SvStream& rStCtrl);
/** @return true if at least one atom with the given nRecType is found */
- inline bool hasChildAtom( sal_uInt16 nRecType ) const;
+ inline bool hasChildAtom(sal_uInt16 nRecType) const;
/** @return the first child atom with nRecType or NULL */
- inline const Atom* findFirstChildAtom( sal_uInt16 nRecType ) const;
+ inline const Atom* findFirstChildAtom(sal_uInt16 nRecType) const;
/** @return the next child atom after pLast with nRecType or NULL */
- const Atom* findNextChildAtom( sal_uInt16 nRecType, const Atom* pLast ) const;
+ const Atom* findNextChildAtom(sal_uInt16 nRecType, const Atom* pLast) const;
/** @return the first child atom or NULL */
inline const Atom* findFirstChildAtom() const;
/** @return the next child atom after pLast or NULL */
- static inline const Atom* findNextChildAtom( const Atom* pLast );
+ static inline const Atom* findNextChildAtom(const Atom* pLast);
/** @return true if this atom is a container */
inline bool isContainer() const;
@@ -64,7 +63,7 @@ public:
inline sal_uInt32 getLength() const;
private:
- Atom( const DffRecordHeader& rRecordHeader, SvStream& rStCtrl );
+ Atom(const DffRecordHeader& rRecordHeader, SvStream& rStCtrl);
SvStream& mrStream;
DffRecordHeader maRecordHeader;
@@ -72,51 +71,36 @@ private:
Atom* mpNextAtom;
};
-inline bool Atom::hasChildAtom( sal_uInt16 nRecType ) const
+inline bool Atom::hasChildAtom(sal_uInt16 nRecType) const
{
- return findFirstChildAtom( nRecType ) != nullptr;
+ return findFirstChildAtom(nRecType) != nullptr;
}
-inline const Atom* Atom::findFirstChildAtom( sal_uInt16 nRecType ) const
+inline const Atom* Atom::findFirstChildAtom(sal_uInt16 nRecType) const
{
- return findNextChildAtom( nRecType, nullptr );
+ return findNextChildAtom(nRecType, nullptr);
}
-inline const Atom* Atom::findFirstChildAtom() const
-{
- return mpFirstChild;
-}
+inline const Atom* Atom::findFirstChildAtom() const { return mpFirstChild; }
-inline const Atom* Atom::findNextChildAtom( const Atom* pLast )
+inline const Atom* Atom::findNextChildAtom(const Atom* pLast)
{
return pLast ? pLast->mpNextAtom : pLast;
}
-inline bool Atom::isContainer() const
-{
- return maRecordHeader.IsContainer();
-}
+inline bool Atom::isContainer() const { return maRecordHeader.IsContainer(); }
inline bool Atom::seekToContent() const
{
- maRecordHeader.SeekToContent( mrStream );
+ maRecordHeader.SeekToContent(mrStream);
return mrStream.GetError() == ERRCODE_NONE;
}
-inline sal_uInt16 Atom::getType() const
-{
- return maRecordHeader.nRecType;
-}
+inline sal_uInt16 Atom::getType() const { return maRecordHeader.nRecType; }
-inline sal_uInt16 Atom::getInstance() const
-{
- return maRecordHeader.nRecInstance;
-}
+inline sal_uInt16 Atom::getInstance() const { return maRecordHeader.nRecInstance; }
-inline sal_uInt32 Atom::getLength() const
-{
- return maRecordHeader.nRecLen;
-}
+inline sal_uInt32 Atom::getLength() const { return maRecordHeader.nRecLen; }
} // namespace ppt
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx
index f405bc8ae485..740c2629bbd4 100644
--- a/sd/source/helper/simplereferencecomponent.cxx
+++ b/sd/source/helper/simplereferencecomponent.cxx
@@ -27,8 +27,8 @@ using com::sun::star::uno::RuntimeException;
using sd::SimpleReferenceComponent;
SimpleReferenceComponent::SimpleReferenceComponent()
-: m_nCount(0)
-, mbDisposed(false)
+ : m_nCount(0)
+ , mbDisposed(false)
{
}
@@ -38,39 +38,35 @@ SimpleReferenceComponent::~SimpleReferenceComponent()
OSL_ASSERT(mbDisposed);
}
-void SimpleReferenceComponent::acquire()
-{
- osl_atomic_increment(&m_nCount);
-}
+void SimpleReferenceComponent::acquire() { osl_atomic_increment(&m_nCount); }
void SimpleReferenceComponent::release()
{
- if((1 == m_nCount) && !mbDisposed)
+ if ((1 == m_nCount) && !mbDisposed)
{
try
{
Dispose();
}
- catch (RuntimeException const &) // don't break throw ()
+ catch (RuntimeException const&) // don't break throw ()
{
- TOOLS_WARN_EXCEPTION( "sd", "" );
+ TOOLS_WARN_EXCEPTION("sd", "");
}
}
- if(osl_atomic_decrement(&m_nCount) == 0) delete this;
+ if (osl_atomic_decrement(&m_nCount) == 0)
+ delete this;
}
void SimpleReferenceComponent::Dispose()
{
- if( !mbDisposed )
+ if (!mbDisposed)
{
mbDisposed = true;
disposing();
}
}
-void SimpleReferenceComponent::disposing()
-{
-}
+void SimpleReferenceComponent::disposing() {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
index 909f13a156b0..a5bb8ef68581 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
@@ -29,36 +29,31 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-namespace accessibility {
-
+namespace accessibility
+{
//===== internal ============================================================
-AccessiblePresentationGraphicShape::AccessiblePresentationGraphicShape (
- const AccessibleShapeInfo& rShapeInfo,
- const AccessibleShapeTreeInfo& rShapeTreeInfo)
- : AccessibleGraphicShape (rShapeInfo, rShapeTreeInfo)
+AccessiblePresentationGraphicShape::AccessiblePresentationGraphicShape(
+ const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo)
+ : AccessibleGraphicShape(rShapeInfo, rShapeTreeInfo)
{
}
-AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape()
-{
-}
+AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape() {}
// XServiceInfo
-OUString SAL_CALL
- AccessiblePresentationGraphicShape::getImplementationName()
+OUString SAL_CALL AccessiblePresentationGraphicShape::getImplementationName()
{
return "AccessiblePresentationGraphicShape";
}
/// Set this object's name if is different to the current name.
-OUString
- AccessiblePresentationGraphicShape::CreateAccessibleBaseName()
+OUString AccessiblePresentationGraphicShape::CreateAccessibleBaseName()
{
OUString sName;
- ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
+ ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId(mxShape);
switch (nShapeType)
{
case PRESENTATION_GRAPHIC_OBJECT:
@@ -73,9 +68,9 @@ OUString
return sName;
}
-sal_Int16 SAL_CALL AccessiblePresentationGraphicShape::getAccessibleRole ()
+sal_Int16 SAL_CALL AccessiblePresentationGraphicShape::getAccessibleRole()
{
- return AccessibleRole::GRAPHIC ;
+ return AccessibleRole::GRAPHIC;
}
} // end of namespace accessibility
diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
index 0cdba64548c4..be98d89711f6 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
@@ -29,36 +29,31 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-namespace accessibility {
-
+namespace accessibility
+{
//===== internal ============================================================
-AccessiblePresentationOLEShape::AccessiblePresentationOLEShape (
- const AccessibleShapeInfo& rShapeInfo,
- const AccessibleShapeTreeInfo& rShapeTreeInfo)
- : AccessibleOLEShape (rShapeInfo, rShapeTreeInfo)
+AccessiblePresentationOLEShape::AccessiblePresentationOLEShape(
+ const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo)
+ : AccessibleOLEShape(rShapeInfo, rShapeTreeInfo)
{
}
-AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape()
-{
-}
+AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape() {}
// XServiceInfo
-OUString SAL_CALL
- AccessiblePresentationOLEShape::getImplementationName()
+OUString SAL_CALL AccessiblePresentationOLEShape::getImplementationName()
{
return "AccessiblePresentationOLEShape";
}
/// Set this object's name if it is different to the current name.
-OUString
- AccessiblePresentationOLEShape::CreateAccessibleBaseName()
+OUString AccessiblePresentationOLEShape::CreateAccessibleBaseName()
{
OUString sName;
- ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
+ ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId(mxShape);
switch (nShapeType)
{
case PRESENTATION_OLE:
@@ -80,9 +75,9 @@ OUString
}
// Return this object's role.
-sal_Int16 SAL_CALL AccessiblePresentationOLEShape::getAccessibleRole ()
+sal_Int16 SAL_CALL AccessiblePresentationOLEShape::getAccessibleRole()
{
- return AccessibleRole::EMBEDDED_OBJECT ;
+ return AccessibleRole::EMBEDDED_OBJECT;
}
} // end of namespace accessibility
diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
index d6e157a374fc..a0713fe857ca 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
@@ -31,25 +31,21 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-namespace accessibility {
-
+namespace accessibility
+{
//===== internal ============================================================
-AccessiblePresentationShape::AccessiblePresentationShape (
- const AccessibleShapeInfo& rShapeInfo,
- const AccessibleShapeTreeInfo& rShapeTreeInfo)
- : AccessibleShape (rShapeInfo, rShapeTreeInfo)
+AccessiblePresentationShape::AccessiblePresentationShape(
+ const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo)
+ : AccessibleShape(rShapeInfo, rShapeTreeInfo)
{
}
-AccessiblePresentationShape::~AccessiblePresentationShape()
-{
-}
+AccessiblePresentationShape::~AccessiblePresentationShape() {}
// XServiceInfo
-OUString SAL_CALL
- AccessiblePresentationShape::getImplementationName()
+OUString SAL_CALL AccessiblePresentationShape::getImplementationName()
{
return "AccessiblePresentationShape";
}
@@ -59,7 +55,7 @@ OUString AccessiblePresentationShape::CreateAccessibleBaseName()
{
OUString sName;
- ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
+ ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId(mxShape);
switch (nShapeType)
{
case PRESENTATION_TITLE:
@@ -105,7 +101,7 @@ OUString AccessiblePresentationShape::GetStyle()
{
OUString sName;
- ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
+ ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId(mxShape);
switch (nShapeType)
{
case PRESENTATION_TITLE:
@@ -145,7 +141,6 @@ OUString AccessiblePresentationShape::GetStyle()
}
return sName;
-
}
} // end of namespace accessibility
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index e7cf58debcc6..25810ab7dc09 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -23,8 +23,8 @@
#include <svx/sdrpaintwindow.hxx>
#include <osl/diagnose.h>
-namespace accessibility {
-
+namespace accessibility
+{
/** For the time being, the implementation of this class will not use the
member mrDevice. Instead the device is retrieved from the view
every time it is used. This is necessary because the device has to stay
@@ -32,17 +32,17 @@ namespace accessibility {
May change in the future.
*/
-AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice)
- : mpView (pView),
- mnWindowId (0)
+AccessibleViewForwarder::AccessibleViewForwarder(SdrPaintView* pView, OutputDevice& rDevice)
+ : mpView(pView)
+ , mnWindowId(0)
{
// Search the output device to determine its id.
- for(sal_uInt32 a(0); a < mpView->PaintWindowCount(); a++)
+ for (sal_uInt32 a(0); a < mpView->PaintWindowCount(); a++)
{
SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow(a);
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
- if(&rOutDev == &rDevice)
+ if (&rOutDev == &rDevice)
{
mnWindowId = static_cast<sal_uInt16>(a);
break;
@@ -59,7 +59,7 @@ AccessibleViewForwarder::~AccessibleViewForwarder()
{
::tools::Rectangle aVisibleArea;
- if(static_cast<sal_uInt32>(mnWindowId) < mpView->PaintWindowCount())
+ if (static_cast<sal_uInt32>(mnWindowId) < mpView->PaintWindowCount())
{
SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow(static_cast<sal_uInt32>(mnWindowId));
aVisibleArea = pPaintWindow->GetVisibleArea();
@@ -72,28 +72,29 @@ AccessibleViewForwarder::~AccessibleViewForwarder()
coordinates of the window origin are added to make the point coordinates
absolute.
*/
-Point AccessibleViewForwarder::LogicToPixel (const Point& rPoint) const
+Point AccessibleViewForwarder::LogicToPixel(const Point& rPoint) const
{
- OSL_ASSERT (mpView != nullptr);
- if(static_cast<sal_uInt32>(mnWindowId) < mpView->PaintWindowCount())
+ OSL_ASSERT(mpView != nullptr);
+ if (static_cast<sal_uInt32>(mnWindowId) < mpView->PaintWindowCount())
{
SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow(static_cast<sal_uInt32>(mnWindowId));
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
- ::tools::Rectangle aBBox(static_cast<vcl::Window&>(rOutDev).GetWindowExtentsRelative(nullptr));
- return rOutDev.LogicToPixel (rPoint) + aBBox.TopLeft();
+ ::tools::Rectangle aBBox(
+ static_cast<vcl::Window&>(rOutDev).GetWindowExtentsRelative(nullptr));
+ return rOutDev.LogicToPixel(rPoint) + aBBox.TopLeft();
}
else
return Point();
}
-Size AccessibleViewForwarder::LogicToPixel (const Size& rSize) const
+Size AccessibleViewForwarder::LogicToPixel(const Size& rSize) const
{
- OSL_ASSERT (mpView != nullptr);
- if(static_cast<sal_uInt32>(mnWindowId) < mpView->PaintWindowCount())
+ OSL_ASSERT(mpView != nullptr);
+ if (static_cast<sal_uInt32>(mnWindowId) < mpView->PaintWindowCount())
{
SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow(static_cast<sal_uInt32>(mnWindowId));
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
- return rOutDev.LogicToPixel (rSize);
+ return rOutDev.LogicToPixel(rSize);
}
else
return Size();
diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx
index d4f6ca791aae..bff9eed17962 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.hxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.hxx
@@ -24,7 +24,6 @@
namespace sd
{
-
class SlideLayoutController : public svt::PopupWindowController
{
public:
@@ -32,19 +31,18 @@ public:
bool bInsertPage);
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
- virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override;
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+ virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& aArguments) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
bool mbInsertPage;
};
-
}
#endif // INCLUDED_SD_SOURCE_UI_CONTROLLER_SLIDELAYOUTCONTROLLER_HXX
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index 56f5754a5900..e54b130c3a57 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -13,7 +13,7 @@
using namespace ::sd;
using namespace ::std;
-RemoteDialog::RemoteDialog(weld::Window *pWindow)
+RemoteDialog::RemoteDialog(weld::Window* pWindow)
: GenericDialogController(pWindow, "modules/simpress/ui/remotedialog.ui", "RemoteDialog")
, m_xButtonConnect(m_xBuilder->weld_button("ok"))
, m_xClientBox(new sd::ClientBox(m_xBuilder->weld_scrolled_window("scroll"),
@@ -22,9 +22,7 @@ RemoteDialog::RemoteDialog(weld::Window *pWindow)
m_xButtonConnect->connect_clicked(LINK(this, RemoteDialog, HandleConnectButton));
}
-RemoteDialog::~RemoteDialog()
-{
-}
+RemoteDialog::~RemoteDialog() {}
IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton, weld::Button&, void)
{
diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx
index ea0c492f6440..20644ed3fa68 100644
--- a/sd/source/ui/dlg/RemoteDialog.hxx
+++ b/sd/source/ui/dlg/RemoteDialog.hxx
@@ -15,7 +15,6 @@
namespace sd
{
-
class RemoteDialog : public weld::GenericDialogController
{
private:
@@ -23,12 +22,12 @@ private:
std::unique_ptr<ClientBox> m_xClientBox;
DECL_LINK(HandleConnectButton, weld::Button&, void);
+
public:
explicit RemoteDialog(weld::Window* pWindow);
virtual short run() override;
virtual ~RemoteDialog() override;
};
-
}
#endif // INCLUDED_SD_SOURCE_UI_DLG_REMOTEDIALOG_HXX
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index 04915721d8f6..a149a65ce74e 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -36,16 +36,16 @@
/**
* Constructor of tab dialog: appends pages to the dialog
*/
-SdPageDlg::SdPageDlg(SfxObjectShell const * pDocSh, weld::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage, bool bIsImpressDoc)
+SdPageDlg::SdPageDlg(SfxObjectShell const* pDocSh, weld::Window* pParent, const SfxItemSet* pAttr,
+ bool bAreaPage, bool bIsImpressDoc)
: SfxTabDialogController(pParent, "modules/sdraw/ui/drawpagedialog.ui", "DrawPageDialog", pAttr)
, mbIsImpressDoc(bIsImpressDoc)
{
-
- SvxColorListItem const * pColorListItem = pDocSh->GetItem( SID_COLOR_TABLE );
- SvxGradientListItem const * pGradientListItem = pDocSh->GetItem( SID_GRADIENT_LIST );
- SvxBitmapListItem const * pBitmapListItem = pDocSh->GetItem( SID_BITMAP_LIST );
- SvxPatternListItem const * pPatternListItem = pDocSh->GetItem( SID_PATTERN_LIST );
- SvxHatchListItem const * pHatchListItem = pDocSh->GetItem( SID_HATCH_LIST );
+ SvxColorListItem const* pColorListItem = pDocSh->GetItem(SID_COLOR_TABLE);
+ SvxGradientListItem const* pGradientListItem = pDocSh->GetItem(SID_GRADIENT_LIST);
+ SvxBitmapListItem const* pBitmapListItem = pDocSh->GetItem(SID_BITMAP_LIST);
+ SvxPatternListItem const* pPatternListItem = pDocSh->GetItem(SID_PATTERN_LIST);
+ SvxHatchListItem const* pHatchListItem = pDocSh->GetItem(SID_HATCH_LIST);
mpColorList = pColorListItem->GetColorList();
mpGradientList = pGradientListItem->GetGradientList();
@@ -57,9 +57,10 @@ SdPageDlg::SdPageDlg(SfxObjectShell const * pDocSh, weld::Window* pParent, const
AddTabPage("RID_SVXPAGE_PAGE", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PAGE), nullptr);
AddTabPage("RID_SVXPAGE_AREA", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_AREA), nullptr);
- AddTabPage("RID_SVXPAGE_TRANSPARENCE", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TRANSPARENCE), nullptr);
+ AddTabPage("RID_SVXPAGE_TRANSPARENCE", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TRANSPARENCE),
+ nullptr);
- if (!bAreaPage) // I have to add the page before I remove it !
+ if (!bAreaPage) // I have to add the page before I remove it !
{
RemoveTabPage("RID_SVXPAGE_AREA");
RemoveTabPage("RID_SVXPAGE_TRANSPARENCE");
@@ -77,9 +78,9 @@ void SdPageDlg::PageCreated(const OString& rId, SfxTabPage& rPage)
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
if (rId == "RID_SVXPAGE_PAGE")
{
- aSet.Put (SfxUInt16Item(sal_uInt16(SID_ENUM_PAGE_MODE), SVX_PAGE_MODE_PRESENTATION));
- aSet.Put (SfxUInt16Item(SID_PAPER_START, PAPER_A0));
- aSet.Put (SfxUInt16Item(SID_PAPER_END, PAPER_E));
+ aSet.Put(SfxUInt16Item(sal_uInt16(SID_ENUM_PAGE_MODE), SVX_PAGE_MODE_PRESENTATION));
+ aSet.Put(SfxUInt16Item(SID_PAPER_START, PAPER_A0));
+ aSet.Put(SfxUInt16Item(SID_PAPER_END, PAPER_E));
if (mbIsImpressDoc)
aSet.Put(SfxBoolItem(SID_IMPRESS_DOC, true));
@@ -88,20 +89,20 @@ void SdPageDlg::PageCreated(const OString& rId, SfxTabPage& rPage)
}
else if (rId == "RID_SVXPAGE_AREA")
{
- aSet.Put (SvxColorListItem(mpColorList,SID_COLOR_TABLE));
- aSet.Put (SvxGradientListItem(mpGradientList,SID_GRADIENT_LIST));
- aSet.Put (SvxHatchListItem(mpHatchingList,SID_HATCH_LIST));
- aSet.Put (SvxBitmapListItem(mpBitmapList,SID_BITMAP_LIST));
- aSet.Put (SvxPatternListItem(mpPatternList,SID_PATTERN_LIST));
- aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0));
- aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1));
- aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0));
+ aSet.Put(SvxColorListItem(mpColorList, SID_COLOR_TABLE));
+ aSet.Put(SvxGradientListItem(mpGradientList, SID_GRADIENT_LIST));
+ aSet.Put(SvxHatchListItem(mpHatchingList, SID_HATCH_LIST));
+ aSet.Put(SvxBitmapListItem(mpBitmapList, SID_BITMAP_LIST));
+ aSet.Put(SvxPatternListItem(mpPatternList, SID_PATTERN_LIST));
+ aSet.Put(SfxUInt16Item(SID_PAGE_TYPE, 0));
+ aSet.Put(SfxUInt16Item(SID_DLG_TYPE, 1));
+ aSet.Put(SfxUInt16Item(SID_TABPAGE_POS, 0));
rPage.PageCreated(aSet);
}
else if (rId == "RID_SVXPAGE_TRANSPARENCE")
{
- aSet.Put(SfxUInt16Item(SID_PAGE_TYPE,0));
- aSet.Put(SfxUInt16Item(SID_DLG_TYPE,1));
+ aSet.Put(SfxUInt16Item(SID_PAGE_TYPE, 0));
+ aSet.Put(SfxUInt16Item(SID_DLG_TYPE, 1));
rPage.PageCreated(aSet);
}
}
diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx
index a0b6f305d404..f1020c0cb286 100644
--- a/sd/source/ui/dlg/ins_paste.cxx
+++ b/sd/source/ui/dlg/ins_paste.cxx
@@ -27,13 +27,8 @@ SdInsertPasteDlg::SdInsertPasteDlg(weld::Window* pWindow)
m_xRbAfter->set_active(true);
}
-SdInsertPasteDlg::~SdInsertPasteDlg()
-{
-}
+SdInsertPasteDlg::~SdInsertPasteDlg() {}
-bool SdInsertPasteDlg::IsInsertBefore() const
-{
- return m_xRbBefore->get_active();
-}
+bool SdInsertPasteDlg::IsInsertBefore() const { return m_xRbBefore->get_active(); }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index e79289b503da..cfb80456e011 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -26,7 +26,9 @@ typedef SdAbstractDialogFactory* (*SdFuncPtrCreateDialogFactory)();
#ifndef DISABLE_DYNLOADING
-extern "C" { static void thisModule() {} }
+extern "C" {
+static void thisModule() {}
+}
#else
@@ -40,13 +42,13 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
#ifndef DISABLE_DYNLOADING
static ::osl::Module aDialogLibrary;
static constexpr OUStringLiteral sLibName(u"" SDUI_DLL_NAME);
- if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) )
- fp = reinterpret_cast<SdAbstractDialogFactory* (SAL_CALL*)()>(
- aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" ));
+ if (aDialogLibrary.is() || aDialogLibrary.loadRelative(&thisModule, sLibName))
+ fp = reinterpret_cast<SdAbstractDialogFactory*(SAL_CALL*)()>(
+ aDialogLibrary.getFunctionSymbol("SdCreateDialogFactory"));
#else
fp = SdCreateDialogFactory;
#endif
- if ( fp )
+ if (fp)
return fp();
return nullptr;
}
diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx
index 14a4351ba06b..62901c70d0aa 100644
--- a/sd/source/ui/dlg/sduiexp.cxx
+++ b/sd/source/ui/dlg/sduiexp.cxx
@@ -22,13 +22,12 @@
class SdAbstractDialogFactory;
-extern "C"
+extern "C" {
+SAL_DLLPUBLIC_EXPORT SdAbstractDialogFactory* SdCreateDialogFactory()
{
- SAL_DLLPUBLIC_EXPORT SdAbstractDialogFactory* SdCreateDialogFactory()
- {
- static SdAbstractDialogFactory_Impl aFactory;
- return &aFactory;
- }
+ static SdAbstractDialogFactory_Impl aFactory;
+ return &aFactory;
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx
index 7dc8a7d6f615..f0f5af956288 100644
--- a/sd/source/ui/docshell/grdocsh.cxx
+++ b/sd/source/ui/docshell/grdocsh.cxx
@@ -33,7 +33,6 @@ using namespace sd;
namespace sd
{
-
SFX_IMPL_SUPERCLASS_INTERFACE(GraphicDocShell, SfxObjectShell)
void GraphicDocShell::InitInterface_Impl()
@@ -41,23 +40,21 @@ void GraphicDocShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG);
}
-SFX_IMPL_OBJECTFACTORY( GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), "sdraw" )
+SFX_IMPL_OBJECTFACTORY(GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), "sdraw")
-GraphicDocShell::GraphicDocShell(SfxObjectCreateMode eMode) :
- DrawDocShell(eMode, /*bDataObject*/true, DocumentType::Draw)
+GraphicDocShell::GraphicDocShell(SfxObjectCreateMode eMode)
+ : DrawDocShell(eMode, /*bDataObject*/ true, DocumentType::Draw)
{
- SetStyleFamily( SfxStyleFamily::Para );
+ SetStyleFamily(SfxStyleFamily::Para);
}
-GraphicDocShell::GraphicDocShell(SfxModelFlags nModelCreationFlags) :
- DrawDocShell(nModelCreationFlags, /*bDataObject*/false, DocumentType::Draw)
+GraphicDocShell::GraphicDocShell(SfxModelFlags nModelCreationFlags)
+ : DrawDocShell(nModelCreationFlags, /*bDataObject*/ false, DocumentType::Draw)
{
- SetStyleFamily( SfxStyleFamily::Para );
+ SetStyleFamily(SfxStyleFamily::Para);
}
-GraphicDocShell::~GraphicDocShell()
-{
-}
+GraphicDocShell::~GraphicDocShell() {}
} // end of namespace sd
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx
index 8b74200eed74..0168c162b50c 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx
@@ -19,11 +19,9 @@
#include "ChangeRequestQueue.hxx"
-namespace sd::framework {
-
-ChangeRequestQueue::ChangeRequestQueue()
+namespace sd::framework
{
-}
+ChangeRequestQueue::ChangeRequestQueue() {}
} // end of namespace sd::framework
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
index 4961f0dc2cbb..27fa5d2b6abf 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
@@ -24,16 +24,19 @@
#include <queue>
-namespace com::sun::star::drawing::framework { class XConfigurationChangeRequest; }
-
-namespace sd::framework {
+namespace com::sun::star::drawing::framework
+{
+class XConfigurationChangeRequest;
+}
+namespace sd::framework
+{
/** The ChangeRequestQueue stores the pending requests for changes to the
requested configuration. It is the task of the
ChangeRequestQueueProcessor to process these requests.
*/
class ChangeRequestQueue
- : public ::std::queue<css::uno::Reference< css::drawing::framework::XConfigurationChangeRequest> >
+ : public ::std::queue<css::uno::Reference<css::drawing::framework::XConfigurationChangeRequest>>
{
public:
/** Create an empty queue.
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
index fcd433b8f2ae..ebb08b41cfd7 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
@@ -27,13 +27,19 @@
#include <memory>
-namespace com::sun::star::drawing::framework { class XConfiguration; }
-namespace com::sun::star::drawing::framework { class XConfigurationChangeRequest; }
+namespace com::sun::star::drawing::framework
+{
+class XConfiguration;
+}
+namespace com::sun::star::drawing::framework
+{
+class XConfigurationChangeRequest;
+}
struct ImplSVEvent;
-namespace sd::framework {
-
+namespace sd::framework
+{
class ConfigurationUpdater;
/** The ChangeRequestQueueProcessor owns the ChangeRequestQueue and
@@ -52,22 +58,22 @@ public:
ConfigurationController so that its UpdateConfiguration() method can
be called when the queue becomes empty.
*/
- explicit ChangeRequestQueueProcessor (
- const std::shared_ptr<ConfigurationUpdater>& rpUpdater);
+ explicit ChangeRequestQueueProcessor(const std::shared_ptr<ConfigurationUpdater>& rpUpdater);
~ChangeRequestQueueProcessor();
/** Sets the configuration who will be changed by subsequent change
requests. This method should be called only by the configuration
controller who owns the configuration.
*/
- void SetConfiguration (
+ void SetConfiguration(
const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration);
/** The given request is appended to the end of the queue and will
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list