summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 09:21:53 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 08:11:34 +0000
commit538f276ae0414ea34ede6090b5f56e8fecd6fc65 (patch)
treeefbfb952f3236a6f56540ddae6a896c8c73774a0 /sd
parentf12e483589888f87843026ceff5ae3c1e615ca02 (diff)
Formatting changes across all modules
+ Removed comment cruft + Tab formatting in number of files + Some commented out code removed + Tab characters replaced with spaces + Newline cleanup in quite a few files + Tweak header guard #endifs Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc Reviewed-on: https://gerrit.libreoffice.org/22221 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx1
-rw-r--r--sd/source/filter/html/HtmlOptionsDialog.cxx1
-rw-r--r--sd/source/filter/html/sdhtmlfilter.cxx1
-rw-r--r--sd/source/filter/ppt/pptanimations.hxx2
-rw-r--r--sd/source/filter/sdfilter.cxx2
-rw-r--r--sd/source/filter/sdpptwrp.cxx2
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx1
-rw-r--r--sd/source/ui/app/optsitem.cxx2
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx1
-rw-r--r--sd/source/ui/docshell/sdclient.cxx2
-rw-r--r--sd/source/ui/framework/factories/BasicPaneFactory.cxx2
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx1
-rw-r--r--sd/source/ui/view/GraphicObjectBar.cxx1
-rw-r--r--sd/source/ui/view/MediaObjectBar.cxx1
-rw-r--r--sd/source/ui/view/drviewsa.cxx1
-rw-r--r--sd/source/ui/view/outlview.cxx2
-rw-r--r--sd/source/ui/view/sdview2.cxx1
-rw-r--r--sd/source/ui/view/sdview3.cxx1
-rw-r--r--sd/source/ui/view/tabcontr.cxx1
20 files changed, 4 insertions, 24 deletions
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 07899819f54c..90b3baaf3076 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -121,7 +121,6 @@ void SdGRFFilter_ImplInteractionHdl::handle( const css::uno::Reference< css::tas
m_xInter->handle( xRequest );
}
-// - SdPPTFilter -
SdGRFFilter::SdGRFFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) :
SdFilter( rMedium, rDocShell, true )
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 5566b47b9bbc..aabe2f0b4332 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -99,7 +99,6 @@ public:
};
-// - SdHtmlOptionsDialog -
SdHtmlOptionsDialog::SdHtmlOptionsDialog() :
meDocType ( DOCUMENT_TYPE_DRAW )
{
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index c1f0c8eba237..c4bc08522ac9 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -38,7 +38,6 @@
#include "htmlex.hxx"
#include "sdhtmlfilter.hxx"
-// - SdPPTFilter -
SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) :
SdFilter( rMedium, rDocShell, bShowProgress )
diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx
index 56033c7516d1..599af58b01d7 100644
--- a/sd/source/filter/ppt/pptanimations.hxx
+++ b/sd/source/filter/ppt/pptanimations.hxx
@@ -114,7 +114,7 @@ namespace ppt
#define DFF_ANIM_GROUP_ID 19
#define DFF_ANIM_NODE_TYPE 20
#define DFF_ANIM_VOLUME 22
-#define DFF_ANIM_PROPERTY_ID_COUNT (DFF_ANIM_VOLUME + 1)
+#define DFF_ANIM_PROPERTY_ID_COUNT (DFF_ANIM_VOLUME + 1)
// property types
#define DFF_ANIM_PROP_TYPE_BYTE 0
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index ac29715ba607..990691d10af7 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -35,13 +35,11 @@
#include "drawdoc.hxx"
#include "sdfilter.hxx"
-// - Namespaces -
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::frame;
-// - SdFilter -
SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress )
: mxModel( rDocShell.GetModel() )
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index f5318b0d6047..98a74536cde6 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -32,7 +32,6 @@
#include "DrawDocShell.hxx"
#include <tools/urlobj.hxx>
-// - Namespaces -
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -61,7 +60,6 @@ extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& );
#endif
-// - SdPPTFilter -
SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) :
SdFilter( rMedium, rDocShell, bShowProgress ),
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 5e522ef963b6..98ae6551da02 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -156,7 +156,6 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer )
return &gServices[ (bImport ? 2 : 0) + ((nStoreVer == SOFFICE_FILEFORMAT_60) ? 4 : 0) + (bDraw ? 1 : 0 ) ];
}
-// - SdXMLWrapper -
SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) :
SdFilter( rMedium, rDocShell, bShowProgress ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer )
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index d18cb77eca31..c80cf870690b 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -42,7 +42,6 @@ template< class T > T getSafeValue( const Any& rAny )
return value;
}
-// - SdOptionsItem -
SdOptionsItem::SdOptionsItem( const SdOptionsGeneric& rParent, const OUString& rSubTree ) :
ConfigItem ( rSubTree ),
@@ -78,7 +77,6 @@ void SdOptionsItem::SetModified()
ConfigItem::SetModified();
}
-// - SdOptionsGeneric -
SdOptionsGeneric::SdOptionsGeneric(sal_uInt16 nConfigId, const OUString& rSubTree)
: maSubTree(rSubTree)
, mpCfgItem( nullptr)
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 21c58dc7529e..8253ee14c0a7 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -221,7 +221,7 @@ IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
sal_uInt16 aPos = 0;
for (std::vector<OUString>::iterator it = maLayoutNames.begin();
- it != maLayoutNames.end() && !bExists; ++it, ++aPos)
+ it != maLayoutNames.end() && !bExists; ++it, ++aPos)
{
if( aCompareStr == *it )
{
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index ed3ee16746bc..27979f8dfefd 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -81,7 +81,6 @@ bool SdPageObjsTLB::IsInDrag()
SotClipboardFormatId SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = static_cast<SotClipboardFormatId>(SAL_MAX_UINT32);
-// - SdPageObjsTLB::SdPageObjsTransferable -
SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable(
SdPageObjsTLB& rParent,
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index 55f3295834e8..1588c9f94a03 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -105,7 +105,7 @@ void Client::ObjectAreaChanged()
if (rMarkList.GetMarkCount() == 1)
{
SdrMark* pMark = rMarkList.GetMark(0);
- SdrOle2Obj* pObj = dynamic_cast< SdrOle2Obj* >(pMark->GetMarkedSdrObj());
+ SdrOle2Obj* pObj = dynamic_cast< SdrOle2Obj* >(pMark->GetMarkedSdrObj());
if(pObj)
{
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 14d2a02c4c79..807119d65ec6 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -329,7 +329,7 @@ void SAL_CALL BasicPaneFactory::notifyConfigurationChange (
const ConfigurationChangeEvent& /* rEvent */ )
throw (RuntimeException, std::exception)
{
- // FIXME: nothing to do
+ // FIXME: nothing to do
}
//===== lang::XEventListener ==================================================
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 75ac9109e38a..f5108afe0f7b 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -72,7 +72,6 @@ void RegisterInterfaces(SfxModule* pMod)
TableObjectBar::RegisterInterface(pMod);
}
-// - TableObjectBar -
SFX_IMPL_INTERFACE(TableObjectBar, SfxShell)
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index 21c691968a3a..52f77cb429f7 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -52,7 +52,6 @@ using namespace sd;
namespace sd {
-// - GraphicObjectBar -
SFX_IMPL_INTERFACE(GraphicObjectBar, SfxShell)
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 46a11572163f..721ce106654d 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -48,7 +48,6 @@ using namespace sd;
namespace sd {
-// - MediaObjectBar -
SFX_IMPL_INTERFACE(MediaObjectBar, SfxShell)
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 7545856d4857..3bfe60fc63c9 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -80,7 +80,6 @@ namespace sd {
bool DrawViewShell::mbPipette = false;
-// - ScannerEventListener -
class ScannerEventListener : public ::cppu::WeakImplHelper< lang::XEventListener >
{
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 7834bf19d8ba..0e6a8de22d80 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1791,7 +1791,6 @@ void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
}
}
-// - OutlineViewModelChangeGuard -
OutlineViewModelChangeGuard::OutlineViewModelChangeGuard( OutlineView& rView )
: mrView( rView )
@@ -1804,7 +1803,6 @@ OutlineViewModelChangeGuard::~OutlineViewModelChangeGuard()
mrView.EndModelChange();
}
-// - OutlineViewPageChangesGuard -
OutlineViewPageChangesGuard::OutlineViewPageChangesGuard( OutlineView* pView )
: mpView( pView )
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 598faf4e9fa7..486535fa248d 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -71,7 +71,6 @@ namespace sd {
using namespace ::com::sun::star;
-// - SdNavigatorDropEvent -
struct SdNavigatorDropEvent : public ExecuteDropEvent
{
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 5b89c81f0d94..0a162e5b9fbb 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -78,7 +78,6 @@
#include <svx/xbtmpit.hxx>
#include <memory>
-// - Namespaces -
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index b5f1e57e40a3..bb7c51de6708 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -42,7 +42,6 @@
namespace sd {
-// - SdTabControl::SdPageObjsTransferable -
TabControl::TabControlTransferable::~TabControlTransferable()
{