summaryrefslogtreecommitdiff
path: root/svx
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 /svx
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 'svx')
-rw-r--r--svx/inc/galbrws2.hxx5
-rw-r--r--svx/source/accessibility/charmapacc.cxx4
-rw-r--r--svx/source/dialog/grfflt.cxx1
-rw-r--r--svx/source/dialog/imapimp.hxx1
-rw-r--r--svx/source/gallery2/codec.cxx1
-rw-r--r--svx/source/gallery2/galbrws1.cxx4
-rw-r--r--svx/source/gallery2/galbrws1.hxx3
-rw-r--r--svx/source/gallery2/galexpl.cxx1
-rw-r--r--svx/source/gallery2/gallery1.cxx4
-rw-r--r--svx/source/gallery2/galtheme.cxx1
-rw-r--r--svx/source/sdr/contact/sdrmediawindow.cxx1
-rw-r--r--svx/source/sdr/contact/sdrmediawindow.hxx1
-rw-r--r--svx/source/svdraw/svdibrow.cxx3
-rw-r--r--svx/source/svdraw/svdomedia.cxx1
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx1
-rw-r--r--svx/source/unodraw/unoshap4.cxx6
-rw-r--r--svx/source/unodraw/unoshape.cxx2
-rw-r--r--svx/source/unogallery/unogalitem.cxx2
-rw-r--r--svx/source/unogallery/unogalitem.hxx2
-rw-r--r--svx/source/unogallery/unogaltheme.cxx1
-rw-r--r--svx/source/unogallery/unogaltheme.hxx1
21 files changed, 4 insertions, 42 deletions
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index e21cd19e9eb9..a248d1352368 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -35,7 +35,6 @@
#include <com/sun/star/util/XURLTransformer.hpp>
-// - GalleryBrowserMode -
enum GalleryBrowserMode
@@ -47,7 +46,6 @@ enum GalleryBrowserMode
};
-// - GalleryTravel -
enum GalleryBrowserTravel
@@ -60,7 +58,6 @@ enum GalleryBrowserTravel
};
-// - GalleryItemTextFlags -
#define GALLERY_ITEM_THEMENAME 0x00000001
@@ -68,7 +65,6 @@ enum GalleryBrowserTravel
#define GALLERY_ITEM_PATH 0x00000004
-// - GalleryToolBox -
class GalleryToolBox : public ToolBox
@@ -83,7 +79,6 @@ public:
};
-// - GalleryBrowser2 -
class Gallery;
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 9be840d2f054..452c9302d5db 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -40,7 +40,6 @@ namespace svx
using namespace ::com::sun::star::accessibility;
-// - SvxShowCharSetVirtualAcc -
SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) : OAccessibleComponentHelper(new VCLExternalSolarLock())
,mpParent( pParent )
@@ -225,7 +224,6 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing()
}
-// - SvxShowCharSetItem -
SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos ) :
@@ -272,7 +270,6 @@ void SvxShowCharSetItem::ClearAccessible()
-// - SvxShowCharSetAcc -
SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAccessibleSelectionHelper(new VCLExternalSolarLock())
@@ -603,7 +600,6 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex
-// - SvxShowCharSetItemAcc -
SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : OAccessibleComponentHelper(new VCLExternalSolarLock())
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 25e82dea2b97..049cdb67bf30 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -30,7 +30,6 @@
#include <memory>
-// - SvxGraphicFilter -
sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx
index 9bae1589a63e..591d67d45003 100644
--- a/svx/source/dialog/imapimp.hxx
+++ b/svx/source/dialog/imapimp.hxx
@@ -22,7 +22,6 @@
#define INCLUDED_SVX_SOURCE_DIALOG_IMAPIMP_HXX
-// - IMapOwnData -
class IMapOwnData
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index 40412ed1270f..a0a880a7fca1 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -23,7 +23,6 @@
#include "codec.hxx"
#include <memory>
-// - GalleryCodec -
GalleryCodec::GalleryCodec( SvStream& rIOStm ) :
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 440c5eaf8ea5..024eeac29848 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -40,11 +40,9 @@
#include <svx/svxdlg.hxx>
#include <memory>
-// - Namespaces -
using namespace ::com::sun::star;
-// - GalleryButton -
GalleryButton::GalleryButton( GalleryBrowser1* pParent, WinBits nWinBits ) :
PushButton( pParent, nWinBits )
@@ -57,7 +55,6 @@ void GalleryButton::KeyInput( const KeyEvent& rKEvt )
PushButton::KeyInput( rKEvt );
}
-// - GalleryThemeListBox -
GalleryThemeListBox::GalleryThemeListBox( GalleryBrowser1* pParent, WinBits nWinBits ) :
ListBox( pParent, nWinBits )
@@ -102,7 +99,6 @@ bool GalleryThemeListBox::PreNotify( NotifyEvent& rNEvt )
return( bDone || ListBox::PreNotify( rNEvt ) );
}
-// - GalleryBrowser1 -
GalleryBrowser1::GalleryBrowser1(
vcl::Window* pParent,
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 3ebce43f4fef..abc9c4cae342 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -30,7 +30,6 @@
class GalleryBrowser1;
-// - GalleryButton -
class GalleryButton : public PushButton
{
@@ -43,7 +42,6 @@ public:
GalleryButton( GalleryBrowser1* pParent, WinBits nWinBits );
};
-// - GalleryThemeListBox -
class GalleryThemeListBox : public ListBox
{
@@ -59,7 +57,6 @@ public:
GalleryThemeListBox( GalleryBrowser1* pParent, WinBits nWinBits );
};
-// - GalleryBrowser1 -
class Gallery;
class GalleryThemeEntry;
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index de551660565d..a12417505e7f 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -31,7 +31,6 @@ namespace
class theLockListener : public rtl::Static< SfxListener, theLockListener > {};
}
-// - GalleryExplorer -
bool GalleryExplorer::FillThemeList( std::vector<OUString>& rThemeList )
{
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 389a98204663..cd54857f9b21 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -45,11 +45,9 @@
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <memory>
-// - Namespaces -
using namespace ::com::sun::star;
-// - GalleryThemeEntry -
static bool FileExists( const INetURLObject &rURL, const rtl::OUString &rExt )
{
@@ -144,7 +142,6 @@ void GalleryThemeEntry::SetId( sal_uInt32 nNewId, bool bResetThemeName )
bThemeNameFromResource = ( nId && bResetThemeName );
}
-// - GalleryThemeCacheEntry -
class GalleryThemeCacheEntry
{
@@ -163,7 +160,6 @@ public:
GalleryTheme* GetTheme() const { return mpTheme; }
};
-// - Gallery -
Gallery::Gallery( const OUString& rMultiPath )
: bMultiPath ( false )
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index a54d30e1e041..ba65baa2719a 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -59,7 +59,6 @@
using namespace ::com::sun::star;
-// - SgaTheme -
GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry )
diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx
index 09adf9835a88..808efb39617e 100644
--- a/svx/source/sdr/contact/sdrmediawindow.cxx
+++ b/svx/source/sdr/contact/sdrmediawindow.cxx
@@ -27,7 +27,6 @@
namespace sdr { namespace contact {
-// - SdrMediaWindow -
SdrMediaWindow::SdrMediaWindow( vcl::Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ) :
diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx
index ceacf966f963..4995ecdc8309 100644
--- a/svx/source/sdr/contact/sdrmediawindow.hxx
+++ b/svx/source/sdr/contact/sdrmediawindow.hxx
@@ -25,7 +25,6 @@
namespace sdr { namespace contact {
-// - SdrMediaWindow -
class ViewObjectContactOfSdrMediaObj;
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index d27967b77325..55524839631f 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -75,7 +75,6 @@ enum ItemType {
ITEM_FONT, ITEM_FONTHEIGHT, ITEM_FONTWIDTH, ITEM_FIELD
};
-// - ImpItemListRow -
class ImpItemListRow
{
@@ -161,7 +160,6 @@ bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const
&& nMax==rEntry.nMax);
}
-// - ImpItemEdit -
class ImpItemEdit: public Edit
{
@@ -1071,7 +1069,6 @@ void _SdrItemBrowserWindow::GetFocus()
aBrowse->GrabFocus();
}
-// - SdrItemBrowser -
SdrItemBrowser::SdrItemBrowser(SdrView& rView):
_SdrItemBrowserWindow(ImpGetViewWin(rView)),
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 939ac77b4abe..229c0f18fc62 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -47,7 +47,6 @@
using namespace ::com::sun::star;
-// - SdrMediaObj -
// Note: the temp file is read only, until it is deleted!
// It may be shared between multiple documents in case of copy/paste,
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 74d847605906..f29dacf195e1 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -42,7 +42,6 @@
using namespace com::sun::star;
-// - SvxColorValueSetData -
class SvxColorValueSetData : public TransferableHelper
{
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 093d16418268..23dc42862f19 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -81,7 +81,7 @@ SvxOle2Shape::~SvxOle2Shape() throw()
css::uno::Any SAL_CALL SvxOle2Shape::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
{
- return SvxShapeText::queryAggregation( rType );
+ return SvxShapeText::queryAggregation( rType );
}
//XPropertySet
@@ -670,7 +670,7 @@ void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, c
void SAL_CALL SvxPluginShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
- SvxShape::setPropertyValues( aPropertyNames, rValues );
+ SvxShape::setPropertyValues( aPropertyNames, rValues );
resetModifiedState();
}
@@ -743,7 +743,7 @@ void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, co
void SAL_CALL SvxFrameShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
- SvxShape::setPropertyValues( aPropertyNames, rValues );
+ SvxShape::setPropertyValues( aPropertyNames, rValues );
resetModifiedState();
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 3bbdff48a8e8..58dbc2d09ff1 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -963,7 +963,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
case OBJ_TEXT:
case OBJ_CAPTION:
case OBJ_TABLE:
- case OBJ_OLE2: // #i118485# Moved to shapes with text
+ case OBJ_OLE2: // #i118485# Moved to shapes with text
default:
{
static css::uno::Sequence< css::uno::Type > aTypeSequence;
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 8abfe5c3339c..cb6c65df63b4 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -49,7 +49,6 @@ using namespace ::com::sun::star;
namespace unogallery {
-// - GalleryItem -
GalleryItem::GalleryItem( ::unogallery::GalleryTheme& rTheme, const GalleryObject& rObject ) :
@@ -414,7 +413,6 @@ void GalleryItem::implSetInvalid()
}
-// - GalleryDrawingModel -
GalleryDrawingModel::GalleryDrawingModel( SdrModel* pDoc )
diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx
index d761677ae438..ddbc014a4122 100644
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
@@ -34,7 +34,6 @@ namespace unogallery { class GalleryTheme; }
namespace unogallery {
-// - GalleryItem -
class GalleryItem : public ::cppu::OWeakAggObject,
@@ -100,7 +99,6 @@ private:
};
-// - GalleryDrawingModel -
class GalleryDrawingModel : public SvxUnoDrawingModel
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 085cdb118958..fcd614a5b5ff 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star;
namespace unogallery {
-// - GalleryTheme -
GalleryTheme::GalleryTheme( const OUString& rThemeName )
diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx
index f99c87eb6533..8f92b0cf4b04 100644
--- a/svx/source/unogallery/unogaltheme.hxx
+++ b/svx/source/unogallery/unogaltheme.hxx
@@ -35,7 +35,6 @@ namespace unogallery { class GalleryItem; }
namespace unogallery {
-// - GalleryTheme -
class GalleryTheme : public ::cppu::WeakImplHelper<