summaryrefslogtreecommitdiffstats
path: root/svx/source/sidebar
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 /svx/source/sidebar
parentfix crash on export of fdo60365-2.ods to xlsx (diff)
downloadcore-71b809959bb8f775d83dc52628448bb8b8322b28.tar.gz
core-71b809959bb8f775d83dc52628448bb8b8322b28.zip
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 'svx/source/sidebar')
-rw-r--r--svx/source/sidebar/ColorPanel.hxx6
-rw-r--r--svx/source/sidebar/EmptyPanel.cxx4
-rw-r--r--svx/source/sidebar/EmptyPanel.hxx4
-rw-r--r--svx/source/sidebar/PanelFactory.cxx8
-rw-r--r--svx/source/sidebar/SelectionChangeHandler.cxx10
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.hxx6
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientControl.cxx2
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientControl.hxx2
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx2
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx2
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.hxx2
-rw-r--r--svx/source/sidebar/insert/InsertPropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/insert/InsertPropertyPanel.hxx2
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.hxx6
-rw-r--r--svx/source/sidebar/line/LineWidthControl.cxx2
-rw-r--r--svx/source/sidebar/line/LineWidthControl.hxx2
-rw-r--r--svx/source/sidebar/line/LineWidthPopup.cxx4
-rw-r--r--svx/source/sidebar/line/LineWidthPopup.hxx4
-rw-r--r--svx/source/sidebar/line/LineWidthValueSet.cxx2
-rw-r--r--svx/source/sidebar/line/LineWidthValueSet.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.hxx2
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.hxx2
-rw-r--r--svx/source/sidebar/possize/SidebarDialControl.cxx2
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingPopup.cxx4
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingPopup.hxx4
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.cxx8
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.hxx8
-rw-r--r--svx/source/sidebar/text/TextUnderlinePopup.cxx2
-rw-r--r--svx/source/sidebar/text/TextUnderlinePopup.hxx2
-rw-r--r--svx/source/sidebar/tools/Popup.cxx10
-rw-r--r--svx/source/sidebar/tools/PopupContainer.cxx2
-rw-r--r--svx/source/sidebar/tools/PopupControl.cxx2
-rw-r--r--svx/source/sidebar/tools/ValueSetWithTextControl.cxx2
37 files changed, 68 insertions, 68 deletions
diff --git a/svx/source/sidebar/ColorPanel.hxx b/svx/source/sidebar/ColorPanel.hxx
index d4dc6980c71f..b41b12672d05 100644
--- a/svx/source/sidebar/ColorPanel.hxx
+++ b/svx/source/sidebar/ColorPanel.hxx
@@ -34,10 +34,10 @@ class ColorPanel
{
public:
ColorPanel (vcl::Window* pParent);
- virtual ~ColorPanel (void);
+ virtual ~ColorPanel();
// From vcl::Window
- virtual void Resize (void);
+ virtual void Resize();
virtual void DataChanged (const DataChangedEvent& rEvent);
private:
@@ -48,7 +48,7 @@ private:
items.
*/
int CalculateRowCount (const Size& rItemSize, int nColumnCount);
- void Fill (void);
+ void Fill();
};
} } // end of namespace ::svx::sidebar
diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx
index 2d28f8a99ba2..784949a7ea3a 100644
--- a/svx/source/sidebar/EmptyPanel.cxx
+++ b/svx/source/sidebar/EmptyPanel.cxx
@@ -46,14 +46,14 @@ EmptyPanel::EmptyPanel (vcl::Window* pParent)
-EmptyPanel::~EmptyPanel (void)
+EmptyPanel::~EmptyPanel()
{
}
-void EmptyPanel::Resize (void)
+void EmptyPanel::Resize()
{
const Size aSize (GetSizePixel());
maMessageControl.SetSizePixel(aSize);
diff --git a/svx/source/sidebar/EmptyPanel.hxx b/svx/source/sidebar/EmptyPanel.hxx
index de166cf80953..1242d13ce8b8 100644
--- a/svx/source/sidebar/EmptyPanel.hxx
+++ b/svx/source/sidebar/EmptyPanel.hxx
@@ -35,9 +35,9 @@ class EmptyPanel
{
public:
EmptyPanel (vcl::Window* pParent);
- virtual ~EmptyPanel (void);
+ virtual ~EmptyPanel();
- virtual void Resize (void) SAL_OVERRIDE;
+ virtual void Resize() SAL_OVERRIDE;
private:
FixedText maMessageControl;
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index e5a0cad0085b..ecc22dc7a6fc 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -65,8 +65,8 @@ class PanelFactory
public PanelFactoryInterfaceBase
{
public:
- PanelFactory (void);
- virtual ~PanelFactory (void);
+ PanelFactory();
+ virtual ~PanelFactory();
// XUIElementFactory
css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement (
@@ -90,7 +90,7 @@ public:
{ return css::uno::Sequence<OUString>{"com.sun.star.ui.UIElementFactory"}; }
};
-PanelFactory::PanelFactory (void)
+PanelFactory::PanelFactory()
: PanelFactoryInterfaceBase(m_aMutex)
{
}
@@ -98,7 +98,7 @@ PanelFactory::PanelFactory (void)
-PanelFactory::~PanelFactory (void)
+PanelFactory::~PanelFactory()
{
}
diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx
index bf62a1dc2314..b25011fd6586 100644
--- a/svx/source/sidebar/SelectionChangeHandler.cxx
+++ b/svx/source/sidebar/SelectionChangeHandler.cxx
@@ -33,7 +33,7 @@ using namespace sfx2::sidebar;
namespace svx { namespace sidebar {
SelectionChangeHandler::SelectionChangeHandler (
- const boost::function<rtl::OUString(void)>& rSelectionChangeCallback,
+ const boost::function<rtl::OUString()>& rSelectionChangeCallback,
const Reference<frame::XController>& rxController,
const EnumContext::Context eDefaultContext)
: SelectionChangeHandlerInterfaceBase(m_aMutex),
@@ -47,7 +47,7 @@ SelectionChangeHandler::SelectionChangeHandler (
-SelectionChangeHandler::~SelectionChangeHandler (void)
+SelectionChangeHandler::~SelectionChangeHandler()
{
}
@@ -80,7 +80,7 @@ void SAL_CALL SelectionChangeHandler::disposing (const lang::EventObject&)
-void SAL_CALL SelectionChangeHandler::disposing (void)
+void SAL_CALL SelectionChangeHandler::disposing()
throw (uno::RuntimeException)
{
if (mbIsConnected)
@@ -90,7 +90,7 @@ void SAL_CALL SelectionChangeHandler::disposing (void)
-void SelectionChangeHandler::Connect (void)
+void SelectionChangeHandler::Connect()
{
uno::Reference<view::XSelectionSupplier> xSupplier (mxController, uno::UNO_QUERY);
if (xSupplier.is())
@@ -103,7 +103,7 @@ void SelectionChangeHandler::Connect (void)
-void SelectionChangeHandler::Disconnect (void)
+void SelectionChangeHandler::Disconnect()
{
uno::Reference<view::XSelectionSupplier> xSupplier (mxController, uno::UNO_QUERY);
if (xSupplier.is())
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 024ed48b2e33..ab4a4ff4e516 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -490,7 +490,7 @@ PopupControl* AreaPropertyPanel::CreateTransparencyGradientControl (PopupContain
-void AreaPropertyPanel::SetupIcons(void)
+void AreaPropertyPanel::SetupIcons()
{
if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons))
{
@@ -1262,7 +1262,7 @@ void AreaPropertyPanel::SetGradient (const XGradient& rGradient)
-sal_Int32 AreaPropertyPanel::GetSelectedTransparencyTypeIndex (void) const
+sal_Int32 AreaPropertyPanel::GetSelectedTransparencyTypeIndex() const
{
return mpLBTransType->GetSelectEntryPos();
}
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index a2a9f42ffca0..39a491d34080 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -78,7 +78,7 @@ public:
XGradient GetGradient (const css::awt::GradientStyle eStyle) const;
void SetGradient (const XGradient& rGradient);
- sal_Int32 GetSelectedTransparencyTypeIndex (void) const;
+ sal_Int32 GetSelectedTransparencyTypeIndex() const;
private:
sal_uInt16 meLastXFS;
@@ -151,9 +151,9 @@ private:
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
- virtual ~AreaPropertyPanel(void);
+ virtual ~AreaPropertyPanel();
- void SetupIcons(void);
+ void SetupIcons();
void Initialize();
void Update();
void ImpUpdateTransparencies();
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
index ebe4210ce688..61bd9f120243 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
@@ -108,7 +108,7 @@ AreaTransparencyGradientControl::AreaTransparencyGradientControl (
-AreaTransparencyGradientControl::~AreaTransparencyGradientControl (void)
+AreaTransparencyGradientControl::~AreaTransparencyGradientControl()
{
}
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
index 8a526175b999..3486508cb133 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
@@ -41,7 +41,7 @@ public:
AreaTransparencyGradientControl (
vcl::Window* pParent,
AreaPropertyPanel& rPanel);
- virtual ~AreaTransparencyGradientControl (void);
+ virtual ~AreaTransparencyGradientControl();
void Rearrange(XFillFloatTransparenceItem* pGradientItem);
void InitStatus(XFillFloatTransparenceItem* pGradientItem);
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
index 5a1971ad4e68..6a132b69a2d8 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
@@ -32,7 +32,7 @@ AreaTransparencyGradientPopup::AreaTransparencyGradientPopup (
{
}
-AreaTransparencyGradientPopup::~AreaTransparencyGradientPopup (void)
+AreaTransparencyGradientPopup::~AreaTransparencyGradientPopup()
{
}
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
index 5d6ac9e8ec7c..ebbd1987bc2e 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
@@ -36,7 +36,7 @@ public :
AreaTransparencyGradientPopup (
vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
- virtual ~AreaTransparencyGradientPopup (void);
+ virtual ~AreaTransparencyGradientPopup();
void Rearrange (XFillFloatTransparenceItem* pItem);
};
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index dd371dfa0861..55caa6c2feba 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -207,7 +207,7 @@ IMPL_LINK(GraphicPropertyPanel, GammaHdl, void *, EMPTYARG)
-void GraphicPropertyPanel::SetupIcons(void)
+void GraphicPropertyPanel::SetupIcons()
{
if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons))
{
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index 8f3babcd40e8..a44f357674d5 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -100,7 +100,7 @@ private:
SfxBindings* pBindings);
virtual ~GraphicPropertyPanel();
- void SetupIcons(void);
+ void SetupIcons();
void Initialize();
};
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index 7f4925b22e51..cbf133f32eca 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -75,7 +75,7 @@ InsertPropertyPanel::InsertPropertyPanel (
-InsertPropertyPanel::~InsertPropertyPanel (void)
+InsertPropertyPanel::~InsertPropertyPanel()
{
// Remove window child listener.
vcl::Window* pTopWindow = this;
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hxx b/svx/source/sidebar/insert/InsertPropertyPanel.hxx
index b0a5426b84d5..bef58fd1919c 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.hxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.hxx
@@ -41,7 +41,7 @@ public:
InsertPropertyPanel (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame);
- virtual ~InsertPropertyPanel (void);
+ virtual ~InsertPropertyPanel();
private:
ToolBox* mpStandardShapesToolBox;
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 052e16e7f47b..02d7f3389aec 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -255,7 +255,7 @@ void LinePropertyPanel::Initialize()
mpLBCapStyle->SetAccessibleName(OUString("Cap Style"));
}
-void LinePropertyPanel::SetupIcons(void)
+void LinePropertyPanel::SetupIcons()
{
if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons))
{
@@ -755,7 +755,7 @@ PopupControl* LinePropertyPanel::CreateLineWidthPopupControl (PopupContainer* pP
return new LineWidthControl(pParent, *this);
}
-void LinePropertyPanel::EndLineWidthPopupMode (void)
+void LinePropertyPanel::EndLineWidthPopupMode()
{
maLineWidthPopup.Hide();
}
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index 586573f506ed..bfa573a81ce8 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -80,7 +80,7 @@ public:
void SetWidthIcon(int n);
void SetWidthIcon();
- void EndLineWidthPopupMode (void);
+ void EndLineWidthPopupMode();
private:
//ui controls
@@ -136,7 +136,7 @@ private:
/// bitfield
bool mbWidthValuable : 1;
- void SetupIcons(void);
+ void SetupIcons();
void Initialize();
void FillLineEndList();
void FillLineStyleList();
@@ -157,7 +157,7 @@ private:
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
- virtual ~LinePropertyPanel(void);
+ virtual ~LinePropertyPanel();
PopupControl* CreateLineWidthPopupControl (PopupContainer* pParent);
};
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx
index bf87a3d9b193..98fb8d2e9b1f 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -64,7 +64,7 @@ LineWidthControl::LineWidthControl (
-LineWidthControl::~LineWidthControl (void)
+LineWidthControl::~LineWidthControl()
{
delete[] rStr;
}
diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx
index c2904381647a..4afa1e595c88 100644
--- a/svx/source/sidebar/line/LineWidthControl.hxx
+++ b/svx/source/sidebar/line/LineWidthControl.hxx
@@ -37,7 +37,7 @@ class LineWidthControl
{
public:
LineWidthControl (vcl::Window* pParent, LinePropertyPanel& rPanel);
- virtual ~LineWidthControl (void);
+ virtual ~LineWidthControl();
virtual void GetFocus() SAL_OVERRIDE;
virtual void Paint(const Rectangle& rect) SAL_OVERRIDE;
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index 5e587821b21a..686850e327e2 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -38,7 +38,7 @@ LineWidthPopup::LineWidthPopup (
SetPopupModeEndHandler(::boost::bind(&LineWidthPopup::PopupModeEndCallback, this));
}
-LineWidthPopup::~LineWidthPopup (void)
+LineWidthPopup::~LineWidthPopup()
{
}
@@ -51,7 +51,7 @@ void LineWidthPopup::SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMa
pControl->SetWidthSelect(lValue, bValuable, eMapUnit);
}
-void LineWidthPopup::PopupModeEndCallback (void)
+void LineWidthPopup::PopupModeEndCallback()
{
LineWidthControl* pControl = dynamic_cast<LineWidthControl*>(mxControl.get());
if (pControl != NULL)
diff --git a/svx/source/sidebar/line/LineWidthPopup.hxx b/svx/source/sidebar/line/LineWidthPopup.hxx
index 8cbe0e5ee960..7a2fe7b5c8f4 100644
--- a/svx/source/sidebar/line/LineWidthPopup.hxx
+++ b/svx/source/sidebar/line/LineWidthPopup.hxx
@@ -35,12 +35,12 @@ public :
LineWidthPopup (
vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
- virtual ~LineWidthPopup (void);
+ virtual ~LineWidthPopup();
void SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMapUnit);
private:
- void PopupModeEndCallback (void);
+ void PopupModeEndCallback();
};
} } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx
index d9af174bc253..fb17d25cc84d 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.cxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.cxx
@@ -39,7 +39,7 @@ LineWidthValueSet::LineWidthValueSet (
-LineWidthValueSet::~LineWidthValueSet (void)
+LineWidthValueSet::~LineWidthValueSet()
{
delete pVDev;
delete[] strUnit;
diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx
index 75c2b69286a1..4fe20e46208f 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.hxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.hxx
@@ -29,7 +29,7 @@ class LineWidthValueSet
{
public:
LineWidthValueSet (vcl::Window* pParent, const ResId& rResId);
- virtual ~LineWidthValueSet (void);
+ virtual ~LineWidthValueSet();
void SetUnit(OUString* str);
void SetSelItem(sal_uInt16 nSel);
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index a6b3f74cf6d5..c110d74502fd 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -113,7 +113,7 @@ private:
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
- virtual ~ParaPropertyPanel (void);
+ virtual ~ParaPropertyPanel();
DECL_LINK(ModifyIndentHdl_Impl, void*);
DECL_LINK(ClickIndent_IncDec_Hdl_Impl, ToolBox*);
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index d4011d67c0dc..b9c3c3cd5b6f 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -199,7 +199,7 @@ void PosSizePropertyPanel::Initialize()
-void PosSizePropertyPanel::SetupIcons(void)
+void PosSizePropertyPanel::SetupIcons()
{
if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons))
{
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index e9d665673773..1d2af6c7c916 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -148,7 +148,7 @@ private:
DECL_LINK( RotationHdl, void * );
DECL_LINK( FlipHdl, ToolBox * );
- void SetupIcons(void);
+ void SetupIcons();
void Initialize();
void executePosX();
void executePosY();
diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx
index 2f422a9b5166..dc30100751e6 100644
--- a/svx/source/sidebar/possize/SidebarDialControl.cxx
+++ b/svx/source/sidebar/possize/SidebarDialControl.cxx
@@ -35,7 +35,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarDialControl(vcl
return new SidebarDialControl(pParent, WB_TABSTOP);
}
-SidebarDialControl::~SidebarDialControl (void)
+SidebarDialControl::~SidebarDialControl()
{
}
diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
index 57ea21ad0c52..1137cdb41aaa 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
@@ -34,7 +34,7 @@ TextCharacterSpacingPopup::TextCharacterSpacingPopup (
SetPopupModeEndHandler(::boost::bind(&TextCharacterSpacingPopup::PopupModeEndCallback, this));
}
-TextCharacterSpacingPopup::~TextCharacterSpacingPopup (void)
+TextCharacterSpacingPopup::~TextCharacterSpacingPopup()
{
}
@@ -47,7 +47,7 @@ void TextCharacterSpacingPopup::Rearrange (bool bLBAvailable,bool bAvailable, lo
pControl->Rearrange(bLBAvailable,bAvailable,nKerning);
}
-void TextCharacterSpacingPopup::PopupModeEndCallback (void)
+void TextCharacterSpacingPopup::PopupModeEndCallback()
{
ProvideContainerAndControl();
TextCharacterSpacingControl* pControl = dynamic_cast<TextCharacterSpacingControl*>(mxControl.get());
diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
index 17ad29cfd09f..9a55c0faa8d4 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
@@ -32,11 +32,11 @@ public :
TextCharacterSpacingPopup (
vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
- virtual ~TextCharacterSpacingPopup (void);
+ virtual ~TextCharacterSpacingPopup();
void Rearrange (bool bLBAvailable,bool bAvailable, long nKerning);
private:
- void PopupModeEndCallback (void);
+ void PopupModeEndCallback();
};
} } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 5744f0a1449c..b069099feb56 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -114,7 +114,7 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Ref
mlKerning = 0;
}
-TextPropertyPanel::~TextPropertyPanel (void)
+TextPropertyPanel::~TextPropertyPanel()
{
}
@@ -168,12 +168,12 @@ void TextPropertyPanel::DataChanged (const DataChangedEvent& /*rEvent*/)
SetupToolboxItems();
}
-void TextPropertyPanel::EndSpacingPopupMode (void)
+void TextPropertyPanel::EndSpacingPopupMode()
{
maCharSpacePopup.Hide();
}
-void TextPropertyPanel::EndUnderlinePopupMode (void)
+void TextPropertyPanel::EndUnderlinePopupMode()
{
maUnderlinePopup.Hide();
}
@@ -194,7 +194,7 @@ void TextPropertyPanel::InitToolBoxSpacing()
mpToolBoxSpacing->SetSelectHdl( aLink );
}
-void TextPropertyPanel::SetupToolboxItems (void)
+void TextPropertyPanel::SetupToolboxItems()
{
maUnderlineControl.SetupToolBoxItem(*mpToolBoxFont, mpToolBoxFont->GetItemId(UNO_UNDERLINE));
maSpacingControl.SetupToolBoxItem(*mpToolBoxSpacing, mpToolBoxSpacing->GetItemId(UNO_SPACING));
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx
index f0734dab09a7..7d7a229ddcfc 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -56,8 +56,8 @@ public:
::sfx2::sidebar::ControllerItem& GetSpaceController() { return maSpacingControl;}
long GetSelFontSize();
- void EndSpacingPopupMode (void);
- void EndUnderlinePopupMode (void);
+ void EndSpacingPopupMode();
+ void EndUnderlinePopupMode();
Color& GetUnderlineColor() { return meUnderlineColor;}
@@ -102,7 +102,7 @@ private:
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
const ::sfx2::sidebar::EnumContext& rContext);
- virtual ~TextPropertyPanel (void);
+ virtual ~TextPropertyPanel();
PopupControl* CreateCharacterSpacingControl (PopupContainer* pParent);
@@ -110,7 +110,7 @@ private:
DECL_LINK(SpacingClickHdl, ToolBox*);
DECL_LINK(UnderlineClickHdl, ToolBox* );
- void SetupToolboxItems (void);
+ void SetupToolboxItems();
void InitToolBoxFont();
void InitToolBoxSpacing();
};
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx
index 0aab2b4e58a9..f9ce1bc4e674 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.cxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx
@@ -32,7 +32,7 @@ TextUnderlinePopup::TextUnderlinePopup (
{
}
-TextUnderlinePopup::~TextUnderlinePopup (void)
+TextUnderlinePopup::~TextUnderlinePopup()
{
}
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.hxx b/svx/source/sidebar/text/TextUnderlinePopup.hxx
index ce4caa0b28f9..0643d927abb0 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.hxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.hxx
@@ -32,7 +32,7 @@ public :
TextUnderlinePopup (
vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
- virtual ~TextUnderlinePopup (void);
+ virtual ~TextUnderlinePopup();
void Rearrange (FontUnderline eLine);
};
diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx
index 18109ec39f9d..8647fb398b16 100644
--- a/svx/source/sidebar/tools/Popup.cxx
+++ b/svx/source/sidebar/tools/Popup.cxx
@@ -40,7 +40,7 @@ Popup::Popup (
OSL_ASSERT(maControlCreator);
}
-Popup::~Popup (void)
+Popup::~Popup()
{
mxControl.reset();
mxContainer.reset();
@@ -77,21 +77,21 @@ void Popup::Show (ToolBox& rToolBox)
}
}
-void Popup::Hide (void)
+void Popup::Hide()
{
if (mxContainer)
if (mxContainer->IsInPopupMode())
mxContainer->EndPopupMode();
}
-void Popup::SetPopupModeEndHandler (const ::boost::function<void(void)>& rCallback)
+void Popup::SetPopupModeEndHandler (const ::boost::function<void()>& rCallback)
{
maPopupModeEndCallback = rCallback;
if (mxContainer)
mxContainer->SetPopupModeEndHdl(LINK(this, Popup, PopupModeEndHandler));
}
-void Popup::ProvideContainerAndControl (void)
+void Popup::ProvideContainerAndControl()
{
if ( ! (mxContainer && mxControl)
&& mpParent!=NULL
@@ -101,7 +101,7 @@ void Popup::ProvideContainerAndControl (void)
}
}
-void Popup::CreateContainerAndControl (void)
+void Popup::CreateContainerAndControl()
{
mxContainer.reset(new PopupContainer(mpParent));
mxContainer->SetAccessibleName(msAccessibleName);
diff --git a/svx/source/sidebar/tools/PopupContainer.cxx b/svx/source/sidebar/tools/PopupContainer.cxx
index 1c37b6c6bbf0..675e80fbabf1 100644
--- a/svx/source/sidebar/tools/PopupContainer.cxx
+++ b/svx/source/sidebar/tools/PopupContainer.cxx
@@ -30,7 +30,7 @@ PopupContainer::PopupContainer (vcl::Window* pParent)
-PopupContainer::~PopupContainer (void)
+PopupContainer::~PopupContainer()
{
}
diff --git a/svx/source/sidebar/tools/PopupControl.cxx b/svx/source/sidebar/tools/PopupControl.cxx
index d8c686546e29..48a908b4938f 100644
--- a/svx/source/sidebar/tools/PopupControl.cxx
+++ b/svx/source/sidebar/tools/PopupControl.cxx
@@ -38,7 +38,7 @@ PopupControl::PopupControl (
-PopupControl::~PopupControl (void)
+PopupControl::~PopupControl()
{
}
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 5ef7f36ca384..3927029ad371 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -42,7 +42,7 @@ ValueSetWithTextControl::ValueSetWithTextControl(
}
-ValueSetWithTextControl::~ValueSetWithTextControl(void)
+ValueSetWithTextControl::~ValueSetWithTextControl()
{
}