summaryrefslogtreecommitdiff
path: root/sd/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 12:44:47 +0200
committerNoel Grandin <noel@peralex.com>2015-04-15 11:47:12 +0200
commit71b809959bb8f775d83dc52628448bb8b8322b28 (patch)
treef9aa4308050eb7d55611068602c0cf0e3c1b3690 /sd/inc
parent135907f2061550624ee1859745d94eee01849070 (diff)
remove unnecessary use of void in function declarations
ie. void f(void); becomes void f(); I used the following command to make the changes: git grep -lP '\(\s*void\s*\)' -- *.cxx \ | xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;' and ran it for both .cxx and .hxx files. Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
Diffstat (limited to 'sd/inc')
-rw-r--r--sd/inc/Outliner.hxx52
-rw-r--r--sd/inc/OutlinerIterator.hxx18
-rw-r--r--sd/inc/SdShapeTypes.hxx2
-rw-r--r--sd/inc/drawdoc.hxx2
-rw-r--r--sd/inc/sdcgmfilter.hxx2
-rw-r--r--sd/inc/sdgrffilter.hxx2
-rw-r--r--sd/inc/sdhtmlfilter.hxx2
-rw-r--r--sd/inc/sdmod.hxx2
-rw-r--r--sd/inc/sdpage.hxx2
-rw-r--r--sd/inc/sdpptwrp.hxx2
-rw-r--r--sd/inc/sdxmlwrp.hxx2
-rw-r--r--sd/inc/stlpool.hxx4
-rw-r--r--sd/inc/undo/undomanager.hxx2
13 files changed, 47 insertions, 47 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 4999b48d1dac..f4b1a6f64deb 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -120,12 +120,12 @@ public:
search mode, may be restored after finishing searching/spell
checking.
*/
- void PrepareSpelling (void);
+ void PrepareSpelling();
/** Initialize a spell check but do not start it yet. This method
is a better candidate for the name PrepareSpelling.
*/
- void StartSpelling (void);
+ void StartSpelling();
/** Proxy for method from base class to avoid compiler warning */
void StartSpelling(EditView&, unsigned char);
@@ -142,15 +142,15 @@ public:
next sentence with spelling errors. While doing so the view
mode may be changed and text shapes are set into edit mode.
*/
- ::svx::SpellPortions GetNextSpellSentence (void);
+ ::svx::SpellPortions GetNextSpellSentence();
/** Release all resources that have been created during the find&replace
or spell check.
*/
- void EndSpelling (void);
+ void EndSpelling();
/** callback for textconversion */
- bool ConvertNextDocument (void) SAL_OVERRIDE;
+ bool ConvertNextDocument() SAL_OVERRIDE;
/** Starts the text conversion (hangul/hanja or Chinese simplified/traditional)
for the current viewshell */
@@ -161,10 +161,10 @@ public:
The position of current view mode/page/object/caret position
is remembered and will be restored after conversion.
*/
- void BeginConversion (void);
+ void BeginConversion();
/** Release all resources that have been created during the conversion */
- void EndConversion (void);
+ void EndConversion();
DECL_LINK( SpellError, void * );
@@ -354,14 +354,14 @@ private:
/** Do search and replace for whole document.
*/
- bool SearchAndReplaceAll (void);
+ bool SearchAndReplaceAll();
/** Do search and replace for next match.
@return
The return value specifies whether the search ended (</sal_True>) or
another call to this method is required (</sal_False>).
*/
- bool SearchAndReplaceOnce (void);
+ bool SearchAndReplaceOnce();
/** Detect changes of the document or view and react accordingly. Such
changes may occur because different calls to
@@ -370,50 +370,50 @@ private:
button but may include any other action some of which affect the
search.
*/
- void DetectChange (void);
+ void DetectChange();
/** Detect whether the selection has changed.
@return
Return <TRUE/> when the selection has been changed since the
last call to this method.
*/
- bool DetectSelectionChange (void);
+ bool DetectSelectionChange();
/** Remember the current edited object/caret position/page/view mode
when starting to search/spell check so that it can be restored on
termination.
*/
- void RememberStartPosition (void);
+ void RememberStartPosition();
/** Restore the position stored in the last call of
<member>RememberStartPositiony</member>.
*/
- void RestoreStartPosition (void);
+ void RestoreStartPosition();
/** Provide next object to search or spell check as text object in edit
mode on the current page. This skips all objects that do not
match or are no text object.
*/
- void ProvideNextTextObject (void);
+ void ProvideNextTextObject();
/** Handle the situation that the iterator has reached the last object.
This may result in setting the <member>mbEndOfSearch</member> flag
back to </sal_False>. This method may show either the end-of-search
dialog or the wrap-around dialog.
*/
- void EndOfSearch (void);
+ void EndOfSearch();
/** Show a dialog that tells the user that the search has ended either
because there are no more matches after finding at least one or that
no match has been found at all.
*/
- void ShowEndOfSearchDialog (void);
+ void ShowEndOfSearchDialog();
/** Show a dialog that asks the user whether to wrap around to the
beginning/end of the document and continue with the search/spell
check.
*/
- bool ShowWrapArroundDialog (void);
+ bool ShowWrapArroundDialog();
/** Check whether the object pointed to by the iterator is a valid text
object.
@@ -425,23 +425,23 @@ private:
/** Put text of current text object into outliner so that the text can
be searched/spell checked.
*/
- void PutTextIntoOutliner (void);
+ void PutTextIntoOutliner();
/** Prepare to do spell checking on the current text object. This
includes putting it into edit mode. Under certain conditions this
method sets <member>mbEndOfSearch</member> to <TRUE/>.
*/
- void PrepareSpellCheck (void);
+ void PrepareSpellCheck();
/** Prepare to search and replace on the current text object. This
includes putting it into edit mode.
*/
- void PrepareSearchAndReplace (void);
+ void PrepareSearchAndReplace();
/** Prepare to do a text conversion on the current text
object. This includes putting it into edit mode.
*/
- void PrepareConversion (void);
+ void PrepareConversion();
/** Switch to a new view mode. Try to restore the original edit mode
before doing so.
@@ -470,7 +470,7 @@ private:
The position mentioned above in form of a selection with start
equals end.
*/
- ESelection GetSearchStartPosition (void);
+ ESelection GetSearchStartPosition();
/** Detect whether there exists a previous match. Note that only the
absence of such a match can be detected reliably. An existing match
@@ -481,7 +481,7 @@ private:
Returns </True> when there is no previous match and </False>
when there may be one.
*/
- bool HasNoPreviousMatch (void);
+ bool HasNoPreviousMatch();
/** Handle a failed search (with or without replace) for the outline
mode. Show message boxes when the search failed completely,
@@ -492,7 +492,7 @@ private:
search shall take place. If that is so, then it is the caller's
responsibility to set the cursor position accordingly.
*/
- bool HandleFailedSearch (void);
+ bool HandleFailedSearch();
/** Take a position as returned by an object iterator and switch to the
view and page on which the object specified by this position is
@@ -516,7 +516,7 @@ private:
a copy of the current selection and reassigns the object iterator to
the current() iterator.
*/
- void HandleChangedSelection (void);
+ void HandleChangedSelection();
/** Initiate the spell check of the next relevant text object.
When the outline view is active then this method is called
@@ -526,7 +526,7 @@ private:
required. When all text objects have been processed then
<FALSE/> is returned.
*/
- virtual bool SpellNextDocument (void) SAL_OVERRIDE;
+ virtual bool SpellNextDocument() SAL_OVERRIDE;
/** Show the given message box and make it modal. It is assumed that
the parent of the given dialog is NULL, i.e. the application
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index d056ed412267..81f48c16e510 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -85,7 +85,7 @@ enum IteratorType {SELECTION,SINGLE_VIEW,DOCUMENT};
class Iterator
{
public:
- Iterator (void);
+ Iterator();
/** The copy constructor creates a new iterator by copying the
implementation object.
@@ -99,7 +99,7 @@ public:
*/
explicit Iterator (IteratorImplBase* pObject);
- ~Iterator (void);
+ ~Iterator();
/** Assign the iterator from the given one. The implementation object
of this iterator will be a copy of the given iterator.
@@ -152,7 +152,7 @@ public:
/** Reverse the direction of iteration. The position of the iterator is
not changed. Thus calling this method twice returns to the old state.
*/
- void Reverse (void);
+ void Reverse();
private:
/// The implementation object to which most of the methods are forwarded.
@@ -186,7 +186,7 @@ public:
The returned iterator points either to the first (forward
search) or to the last object (backward search) of the set.
*/
- Iterator begin (void);
+ Iterator begin();
/** Return an iterator that marks the end of the iteration. This takes
also into account the direction of iteration. The object pointed to
@@ -196,7 +196,7 @@ public:
one (forward search) or to the one in front of the first
(backward search).
*/
- Iterator end (void);
+ Iterator end();
/** Return an iterator that points to the current object of one of the
sets described above. This takes also into account the direction of
@@ -207,7 +207,7 @@ public:
selected objects or of the current page if the search set spans
more than one page.
*/
- Iterator current (void);
+ Iterator current();
private:
/// The wrapped outliner that is represented as object container.
@@ -292,7 +292,7 @@ private:
// Do not allow default constructor and copying of outliner containers.
OutlinerContainer (const OutlinerContainer&) {};
- OutlinerContainer (void) {};
+ OutlinerContainer() {};
OutlinerContainer& operator= (const OutlinerContainer&) {return *this;};
};
@@ -306,7 +306,7 @@ public:
These values should not be accessed. The only use of the object as
it is as a marker in comparisons.
*/
- IteratorPosition (void);
+ IteratorPosition();
/** Create a new object with all data members set from the given
position.
@param aPosition
@@ -316,7 +316,7 @@ public:
IteratorPosition (const IteratorPosition& aPosition);
/// The destructor is a no-op at the moment.
- ~IteratorPosition (void);
+ ~IteratorPosition();
/** Assign the content of the given position to this one.
@param aPosition
This is the position object from which to take the values of all
diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx
index ff2223479152..307a8cf1251b 100644
--- a/sd/inc/SdShapeTypes.hxx
+++ b/sd/inc/SdShapeTypes.hxx
@@ -29,7 +29,7 @@ namespace accessibility {
/** Register the SD presentation shape types with the ShapeTypeHandler singleton.
This method is usually called while loading the sd library.
*/
-void RegisterImpressShapeTypes (void);
+void RegisterImpressShapeTypes();
/** Enum describing all shape types known in the SD project.
*/
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 47c4fe719020..394f62f82286 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -405,7 +405,7 @@ public:
scope="com::sun::star::document::PrinterIndependentLayout">DISABLED</const>
when formatting depends on the current printer metrics.
*/
- SAL_DLLPRIVATE sal_Int32 GetPrinterIndependentLayout (void) { return mnPrinterIndependentLayout;}
+ SAL_DLLPRIVATE sal_Int32 GetPrinterIndependentLayout() { return mnPrinterIndependentLayout;}
SAL_DLLPRIVATE void SetOnlineSpell( bool bIn );
SAL_DLLPRIVATE bool GetOnlineSpell() const { return mbOnlineSpell; }
diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx
index 144f0a03a3cb..4ac21541a1b4 100644
--- a/sd/inc/sdcgmfilter.hxx
+++ b/sd/inc/sdcgmfilter.hxx
@@ -30,7 +30,7 @@ public:
SfxMedium& rMedium,
::sd::DrawDocShell& rDocShell,
bool bShowProgress );
- virtual ~SdCGMFilter (void);
+ virtual ~SdCGMFilter();
bool Import();
bool Export() SAL_OVERRIDE;
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx
index d4d87c4b8fb4..c14662441cec 100644
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
@@ -31,7 +31,7 @@ class SdGRFFilter : public SdFilter
public:
SdGRFFilter ( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell );
- virtual ~SdGRFFilter (void);
+ virtual ~SdGRFFilter();
bool Import();
bool Export() SAL_OVERRIDE;
diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx
index 130f84a7b07e..356d3a2dce09 100644
--- a/sd/inc/sdhtmlfilter.hxx
+++ b/sd/inc/sdhtmlfilter.hxx
@@ -31,7 +31,7 @@ public:
SfxMedium& rMedium,
::sd::DrawDocShell& rDocShell,
bool bShowProgress);
- virtual ~SdHTMLFilter (void);
+ virtual ~SdHTMLFilter();
virtual bool Export() SAL_OVERRIDE;
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 624b0a8b492e..5ad63fd081ee 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -112,7 +112,7 @@ public:
The returned pointer is NULL when the device could not be
created when this modules was instantiated.
*/
- OutputDevice* GetVirtualRefDevice (void) { return mpVirtualRefDevice;}
+ OutputDevice* GetVirtualRefDevice() { return mpVirtualRefDevice;}
/** Deprecated alias to <member>GetVirtualRefDevice</member>.
@param rDocShell
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 87d2e7ee7ba2..6e6a354408b1 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -376,7 +376,7 @@ public:
When this method returns <TRUE/> for a master page then this
master page should not be deleted automatically.
*/
- bool IsPrecious (void) const { return mbIsPrecious; }
+ bool IsPrecious() const { return mbIsPrecious; }
void createAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation );
void addAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, int nIndex = -1 );
diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx
index 01432bd0df70..823a3b3d4c50 100644
--- a/sd/inc/sdpptwrp.hxx
+++ b/sd/inc/sdpptwrp.hxx
@@ -30,7 +30,7 @@ public:
SfxMedium& rMedium,
::sd::DrawDocShell& rDocShell,
bool bShowProgress);
- virtual ~SdPPTFilter (void);
+ virtual ~SdPPTFilter();
/// these methods are necessary for the export to PowerPoint
bool Import();
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index 8945ab1fac78..f144461ae4f1 100644
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -39,7 +39,7 @@ public:
bool bShowProgress,
SdXMLFilterMode eFilterMode = SDXMLMODE_Normal,
sal_uLong nStoreVer = SOFFICE_FILEFORMAT_8 );
- virtual ~SdXMLFilter (void);
+ virtual ~SdXMLFilter();
bool Import( ErrCode& nError );
bool Export() SAL_OVERRIDE;
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 33255377e06e..5a22993fd36f 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -121,8 +121,8 @@ public:
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire (void) throw () SAL_OVERRIDE;
- virtual void SAL_CALL release (void) throw () SAL_OVERRIDE;
+ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE;
+ virtual void SAL_CALL release() throw () SAL_OVERRIDE;
protected:
void RenameAndCopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix);
void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily );
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index a3f68f929b03..470609ffea88 100644
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -55,7 +55,7 @@ private:
outline view seems to have a bug. Therefore this method is called
whenever a new undo action is added.
*/
- void ClearLinkedRedoActions (void);
+ void ClearLinkedRedoActions();
};
}