summaryrefslogtreecommitdiff
path: root/sd/inc
diff options
context:
space:
mode:
authorMuhammet Kara <muhammet.kara@collabora.com>2020-03-07 12:21:32 +0300
committerMuhammet Kara <muhammet.kara@collabora.com>2020-03-07 11:33:42 +0100
commitbe22ca7cc69ba905c86e05f0413c05ca0bd42556 (patch)
treeeefb559205257b9d04bb39bd5bfa48b295240263 /sd/inc
parent0e4dd381478e0e5b004015a473f981692171df16 (diff)
clang-format sd with under 5-percent lines of change
Files which could become clang-format conformant with under 5-percent lines of change relative to the total count of lines in the file are found by using bin/find-clang-format.py, and fixed with /opt/lo/bin/clang-format -i <path-of-the-file> There will be follow-up patches to fix all 'under-5-percent' files. Change-Id: I08c01d7069b041964614c233d452d70f332228f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90145 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
Diffstat (limited to 'sd/inc')
-rw-r--r--sd/inc/Outliner.hxx48
-rw-r--r--sd/inc/SdShapeTypes.hxx4
2 files changed, 28 insertions, 24 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 27ec4d80127d..11d79a2a1199 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -30,12 +30,13 @@ class SdrObject;
class SdrTextObj;
class SdDrawDocument;
-namespace weld {
+namespace weld
+{
class Window;
}
-namespace sd {
-
+namespace sd
+{
class View;
class ViewShell;
class Window;
@@ -61,7 +62,6 @@ struct SearchSelection
} // end of namespace sd
-
/** The main purpose of this class is searching and replacing as well as
spelling of impress documents. The main part of both tasks lies in
iterating over the pages and view modes of a document and apply the
@@ -114,8 +114,7 @@ struct SearchSelection
queried. This is only sufficient for searching the outline view.
</p>
*/
-class SdOutliner
- : public SdrOutliner
+class SdOutliner : public SdrOutliner
{
public:
friend class ::sd::outliner::OutlinerContainer;
@@ -131,7 +130,7 @@ public:
<const>OutlinerMode::OutlineView</const> are defined in
editeng/outliner.hxx.
*/
- SdOutliner( SdDrawDocument* pDoc, OutlinerMode nMode );
+ SdOutliner(SdDrawDocument* pDoc, OutlinerMode nMode);
virtual ~SdOutliner() override;
/// Forbid copy construction and copy assignment
SdOutliner(const Outliner&) = delete;
@@ -156,7 +155,7 @@ public:
indicated by user input to the search dialog). A </sal_False> value
indicates that another call to this method is required.
*/
- bool StartSearchAndReplace (const SvxSearchItem* pSearchItem);
+ bool StartSearchAndReplace(const SvxSearchItem* pSearchItem);
/** Iterate over the sentences in all text shapes and stop at the
next sentence with spelling errors. While doing so the view
@@ -174,8 +173,8 @@ public:
/** Starts the text conversion (hangul/hanja or Chinese simplified/traditional)
for the current viewshell */
- void StartConversion( LanguageType nSourceLanguage, LanguageType nTargetLanguage,
- const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive );
+ void StartConversion(LanguageType nSourceLanguage, LanguageType nTargetLanguage,
+ const vcl::Font* pTargetFont, sal_Int32 nOptions, bool bIsInteractive);
/** This is called internally when text conversion is started.
The position of current view mode/page/object/caret position
@@ -186,9 +185,9 @@ public:
/** Release all resources that have been created during the conversion */
void EndConversion();
- int GetIgnoreCurrentPageChangesLevel() const { return mnIgnoreCurrentPageChangesLevel; };
- void IncreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel++; };
- void DecreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel--; };
+ int GetIgnoreCurrentPageChangesLevel() const { return mnIgnoreCurrentPageChangesLevel; };
+ void IncreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel++; };
+ void DecreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel--; };
SdDrawDocument* GetDoc() const { return mpDrawDocument; }
private:
@@ -197,7 +196,12 @@ private:
/// Specifies whether to search and replace, to spell check or to do a
/// text conversion.
- enum mode {SEARCH, SPELL, TEXT_CONVERSION} meMode;
+ enum mode
+ {
+ SEARCH,
+ SPELL,
+ TEXT_CONVERSION
+ } meMode;
/// The view which displays the searched objects.
::sd::View* mpView;
@@ -207,7 +211,7 @@ private:
*/
std::weak_ptr<::sd::ViewShell> mpWeakViewShell;
/// This window contains the view.
- VclPtr< ::sd::Window> mpWindow;
+ VclPtr<::sd::Window> mpWindow;
/// The document on whose objects and pages this class operates.
SdDrawDocument* mpDrawDocument;
@@ -335,7 +339,7 @@ private:
objects. If it differs from the current direction the iterator
is reversed.
*/
- void Initialize (bool bDirectionIsForward);
+ void Initialize(bool bDirectionIsForward);
/** Do search and replace for whole document.
*/
@@ -408,7 +412,7 @@ private:
@param aPosition
The object for which to test whether it is a valid text object.
*/
- static bool IsValidTextObject (const ::sd::outliner::IteratorPosition& rPosition);
+ static bool IsValidTextObject(const ::sd::outliner::IteratorPosition& rPosition);
/** Put text of current text object into outliner so that the text can
be searched/spell checked.
@@ -436,7 +440,7 @@ private:
@param ePageKind
Specifies the new view mode.
*/
- void SetViewMode (PageKind ePageKind);
+ void SetViewMode(PageKind ePageKind);
/** Switch to the page or master page specified by the
<member>mnPage</member> index. Master page mode is specified by
@@ -446,11 +450,11 @@ private:
@param nPageIndex
The new page index.
*/
- void SetPage (EditMode eEditMode, sal_uInt16 nPageIndex);
+ void SetPage(EditMode eEditMode, sal_uInt16 nPageIndex);
/** Switch on edit mode for the currently selected text object.
*/
- void EnterEditMode (bool bGrabFocus);
+ void EnterEditMode(bool bGrabFocus);
/** Return the position at which a new search is started with respect to
the search direction as specified by the argument.
@@ -491,13 +495,13 @@ private:
@return
Return a pointer to the <type>SdrObject</type>.
*/
- SdrObject* SetObject (const ::sd::outliner::IteratorPosition& rPosition);
+ SdrObject* SetObject(const ::sd::outliner::IteratorPosition& rPosition);
/** Use this method when the view shell in which to search has changed.
It handles i.e. registering at the associated view as selection
change listener.
*/
- void SetViewShell (const std::shared_ptr<::sd::ViewShell>& rpViewShell);
+ void SetViewShell(const std::shared_ptr<::sd::ViewShell>& rpViewShell);
/** Activate or deactivate the search in the current selection. Call
this method whenever the selection has changed. This method creates
diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx
index df89b4499f44..daf11f6d4b96 100644
--- a/sd/inc/SdShapeTypes.hxx
+++ b/sd/inc/SdShapeTypes.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_SD_INC_SDSHAPETYPES_HXX
#define INCLUDED_SD_INC_SDSHAPETYPES_HXX
-namespace accessibility {
-
+namespace accessibility
+{
/** Register the SD presentation shape types with the ShapeTypeHandler singleton.
This method is usually called while loading the sd library.
*/