summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sd/inc/Outliner.hxx48
-rw-r--r--sd/inc/SdShapeTypes.hxx4
-rw-r--r--sd/qa/unit/HtmlExportTest.cxx6
-rw-r--r--sd/source/core/typemap.cxx3
-rw-r--r--sd/source/filter/html/buttonset.hxx4
-rw-r--r--sd/source/filter/xml/sdtransform.hxx2
-rw-r--r--sd/source/ui/inc/MutexOwner.hxx4
-rw-r--r--sd/source/ui/inc/dlg_char.hxx4
-rw-r--r--sd/source/ui/inc/paragr.hxx2
-rw-r--r--sd/source/ui/inc/unokywds.hxx5
-rw-r--r--solenv/clang-format/blacklist10
11 files changed, 43 insertions, 49 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.
*/
diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx
index 343461f493bd..914ccb00981b 100644
--- a/sd/qa/unit/HtmlExportTest.cxx
+++ b/sd/qa/unit/HtmlExportTest.cxx
@@ -17,7 +17,7 @@ using namespace css;
class SdHTMLFilterTest : public SdModelTestBase, public XmlTestTools, public HtmlTestTools
{
private:
- htmlDocPtr exportAndParseHtml(sd::DrawDocShellRef const & xDocShRef)
+ htmlDocPtr exportAndParseHtml(sd::DrawDocShellRef const& xDocShRef)
{
FileFormat* pFormat = getFormat(HTML);
OUString aExt = "." + OUString::createFromAscii(pFormat->pName);
@@ -28,10 +28,10 @@ private:
}
public:
-
void testHTMLExport()
{
- sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/HtmlExportTestDocument.odp"), ODP);
+ sd::DrawDocShellRef xDocShRef = loadURL(
+ m_directories.getURLFromSrc("/sd/qa/unit/data/HtmlExportTestDocument.odp"), ODP);
htmlDocPtr htmlDoc = exportAndParseHtml(xDocShRef);
assertXPath(htmlDoc, "/html", 1);
diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx
index 60392f6671c8..9353a808cbb4 100644
--- a/sd/source/core/typemap.cxx
+++ b/sd/source/core/typemap.cxx
@@ -83,7 +83,7 @@
#include <svl/lckbitem.hxx>
-#define avmedia_MediaItem ::avmedia::MediaItem
+#define avmedia_MediaItem ::avmedia::MediaItem
#include <sfx2/tplpitem.hxx>
#include <svl/ptitem.hxx>
#include <svl/rectitem.hxx>
@@ -97,5 +97,4 @@
#define SFX_TYPEMAP
#include <sdslots.hxx>
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/html/buttonset.hxx b/sd/source/filter/html/buttonset.hxx
index 3342c17b4aa1..5e384276dbb7 100644
--- a/sd/source/filter/html/buttonset.hxx
+++ b/sd/source/filter/html/buttonset.hxx
@@ -37,8 +37,8 @@ public:
int getCount() const;
- bool getPreview( int nSet, const std::vector< OUString >& rButtons, Image& rImage );
- bool exportButton( int nSet, const OUString& rPath, const OUString& rName );
+ bool getPreview(int nSet, const std::vector<OUString>& rButtons, Image& rImage);
+ bool exportButton(int nSet, const OUString& rPath, const OUString& rName);
private:
std::unique_ptr<ButtonSetImpl> mpImpl;
diff --git a/sd/source/filter/xml/sdtransform.hxx b/sd/source/filter/xml/sdtransform.hxx
index 381020461418..d1f8ae038f07 100644
--- a/sd/source/filter/xml/sdtransform.hxx
+++ b/sd/source/filter/xml/sdtransform.hxx
@@ -24,7 +24,7 @@
#include <drawdoc.hxx>
-void TransformOOo2xDocument( SdDrawDocument* pDocument );
+void TransformOOo2xDocument(SdDrawDocument* pDocument);
#endif
diff --git a/sd/source/ui/inc/MutexOwner.hxx b/sd/source/ui/inc/MutexOwner.hxx
index bf740f1af039..f941798c5d8f 100644
--- a/sd/source/ui/inc/MutexOwner.hxx
+++ b/sd/source/ui/inc/MutexOwner.hxx
@@ -22,8 +22,8 @@
#include <osl/mutex.hxx>
-namespace sd {
-
+namespace sd
+{
/** This class provides a mutex to derived classes. It exists to
satisfy some helper classes from cppuhelper who expect a mutex as
argument to their constructor.
diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx
index f56a2e6e64cf..f8ae2d583cb7 100644
--- a/sd/source/ui/inc/dlg_char.hxx
+++ b/sd/source/ui/inc/dlg_char.hxx
@@ -31,9 +31,9 @@ class SfxObjectShell;
class SdCharDlg : public SfxTabDialogController
{
private:
- const SfxObjectShell& rDocShell;
+ const SfxObjectShell& rDocShell;
- virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+ virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
public:
SdCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell);
diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx
index 29cbf9b0c7e8..0e33f1a442fe 100644
--- a/sd/source/ui/inc/paragr.hxx
+++ b/sd/source/ui/inc/paragr.hxx
@@ -28,7 +28,7 @@
class SdParagraphDlg : public SfxTabDialogController
{
private:
- virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+ virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
public:
SdParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr);
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index c28d26e05e4b..66dfcafc21d9 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -65,7 +65,8 @@ inline const char sUNO_Service_ConnectorProperties[] = "com.sun.star.drawing.Con
inline const char sUNO_Service_MeasureProperties[] = "com.sun.star.drawing.MeasureProperties";
inline const char sUNO_Service_PageBackground[] = "com.sun.star.drawing.PageBackground";
inline const char sUNO_Service_GraphicObjectShape[] = "com.sun.star.drawing.GraphicObjectShape";
-inline const char sUNO_Service_ImageMapRectangleObject[] = "com.sun.star.image.ImageMapRectangleObject";
+inline const char sUNO_Service_ImageMapRectangleObject[]
+ = "com.sun.star.image.ImageMapRectangleObject";
inline const char sUNO_Service_ImageMapCircleObject[] = "com.sun.star.image.ImageMapCircleObject";
inline const char sUNO_Service_ImageMapPolygonObject[] = "com.sun.star.image.ImageMapPolygonObject";
@@ -107,7 +108,7 @@ inline const char sUNO_View_IsShowPreviewInPageMode[] = "IsShowPreviewInPageMode
inline const char sUNO_View_IsShowPreviewInMasterPageMode[] = "IsShowPreviewInMasterPageMode";
inline const char sUNO_View_SetShowPreviewInOutlineMode[] = "SetShowPreviewInOutlineMode";
inline const char sUNO_View_EditMode[] = "EditMode";
-inline const char sUNO_View_EditModeStandard[] = "EditModeStandard"; // To be deprecated
+inline const char sUNO_View_EditModeStandard[] = "EditModeStandard"; // To be deprecated
// inline const char sUNO_View_EditModeNotes[] = "EditModeNotes";
// inline const char sUNO_View_EditModeHandout[] = "EditModeHandout";
inline const char sUNO_View_VisArea[] = "VisArea";
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index be440c697a3f..5e874dc1fe9e 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -11015,9 +11015,7 @@ sd/inc/CustomAnimationEffect.hxx
sd/inc/CustomAnimationPreset.hxx
sd/inc/EffectMigration.hxx
sd/inc/FactoryIds.hxx
-sd/inc/Outliner.hxx
sd/inc/OutlinerIterator.hxx
-sd/inc/SdShapeTypes.hxx
sd/inc/TransitionPreset.hxx
sd/inc/animations.hxx
sd/inc/anminfo.hxx
@@ -11062,7 +11060,6 @@ sd/inc/undo/undofactory.hxx
sd/inc/undo/undomanager.hxx
sd/inc/undo/undoobjects.hxx
sd/inc/undoanim.hxx
-sd/qa/unit/HtmlExportTest.cxx
sd/qa/unit/SVGExportTests.cxx
sd/qa/unit/activex-controls-tests.cxx
sd/qa/unit/dialogs-test.cxx
@@ -11102,7 +11099,6 @@ sd/source/core/stlfamily.cxx
sd/source/core/stlpool.cxx
sd/source/core/stlsheet.cxx
sd/source/core/text/textapi.cxx
-sd/source/core/typemap.cxx
sd/source/core/undo/undofactory.cxx
sd/source/core/undo/undomanager.cxx
sd/source/core/undo/undoobjects.cxx
@@ -11130,7 +11126,6 @@ sd/source/filter/eppt/text.hxx
sd/source/filter/grf/sdgrffilter.cxx
sd/source/filter/html/HtmlOptionsDialog.cxx
sd/source/filter/html/buttonset.cxx
-sd/source/filter/html/buttonset.hxx
sd/source/filter/html/htmlattr.cxx
sd/source/filter/html/htmlattr.hxx
sd/source/filter/html/htmlex.cxx
@@ -11151,7 +11146,6 @@ sd/source/filter/ppt/propread.hxx
sd/source/filter/sdfilter.cxx
sd/source/filter/sdpptwrp.cxx
sd/source/filter/xml/sdtransform.cxx
-sd/source/filter/xml/sdtransform.hxx
sd/source/filter/xml/sdxmlwrp.cxx
sd/source/helper/simplereferencecomponent.cxx
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -11394,7 +11388,6 @@ sd/source/ui/inc/ImpressViewShellBase.hxx
sd/source/ui/inc/LayerTabBar.hxx
sd/source/ui/inc/MasterPageObserver.hxx
sd/source/ui/inc/MediaObjectBar.hxx
-sd/source/ui/inc/MutexOwner.hxx
sd/source/ui/inc/NavigatorChildWindow.hxx
sd/source/ui/inc/OutlineBulletDlg.hxx
sd/source/ui/inc/OutlineView.hxx
@@ -11443,7 +11436,6 @@ sd/source/ui/inc/createtabledesignpanel.hxx
sd/source/ui/inc/createtableobjectbar.hxx
sd/source/ui/inc/custsdlg.hxx
sd/source/ui/inc/diactrl.hxx
-sd/source/ui/inc/dlg_char.hxx
sd/source/ui/inc/dlgfield.hxx
sd/source/ui/inc/dlgpage.hxx
sd/source/ui/inc/dlgsnap.hxx
@@ -11517,7 +11509,6 @@ sd/source/ui/inc/masterlayoutdlg.hxx
sd/source/ui/inc/morphdlg.hxx
sd/source/ui/inc/navigatr.hxx
sd/source/ui/inc/optsitem.hxx
-sd/source/ui/inc/paragr.hxx
sd/source/ui/inc/present.hxx
sd/source/ui/inc/prltempl.hxx
sd/source/ui/inc/prntopts.hxx
@@ -11553,7 +11544,6 @@ sd/source/ui/inc/undopage.hxx
sd/source/ui/inc/unmodpg.hxx
sd/source/ui/inc/unmovss.hxx
sd/source/ui/inc/unoaprms.hxx
-sd/source/ui/inc/unokywds.hxx
sd/source/ui/inc/unomodel.hxx
sd/source/ui/inc/unopage.hxx
sd/source/ui/inc/unoprnms.hxx
generated by cgit (git 2.34.1) at 2025-01-15 00:56:55 +0000