diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 17:13:43 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 17:19:54 +0200 |
commit | c4c51709eaa02a5c9a2af3e5d436790307109813 (patch) | |
tree | c67362b4f2c3d3f34655ca65ec10d54e1509cf73 /sc/source/ui/vba | |
parent | c78f918a7cb267a713804b8feacc3425196d4428 (diff) |
whitespace cleanup in sc
Change-Id: Id1dcadcac179c52977e48a6912ce4d5fd542f60c
Diffstat (limited to 'sc/source/ui/vba')
-rw-r--r-- | sc/source/ui/vba/excelvbahelper.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/vba/excelvbahelper.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaapplication.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaeventshelper.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaeventshelper.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/vba/vbafont.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaglobals.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/vba/vbahyperlink.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/vba/vbahyperlinks.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/vba/vbahyperlinks.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/vba/vbarange.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/vba/vbarange.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/vba/vbasheetobject.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/vba/vbasheetobject.hxx | 10 | ||||
-rw-r--r-- | sc/source/ui/vba/vbasheetobjects.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/vba/vbasheetobjects.hxx | 10 | ||||
-rw-r--r-- | sc/source/ui/vba/vbastyle.cxx | 2 |
17 files changed, 0 insertions, 116 deletions
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index cb724e0a99d3..8bf4ba9e19a1 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -43,8 +43,6 @@ namespace ooo { namespace vba { namespace excel { - - uno::Reference< sheet::XUnnamedDatabaseRanges > GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) { @@ -377,8 +375,6 @@ ScVbaCellRangeAccess::GetDataSet( ScCellRangesBase* pRangeObj ) return pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : 0; } - - } // namespace excel } // namespace vba } // namespace ooo diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 47301b14bc8e..a59bee0fd1db 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -36,8 +36,6 @@ namespace ooo { namespace vba { namespace excel { - - // nTabs empty means apply zoom to all sheets void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs ); void implnCopy( const css::uno::Reference< css::frame::XModel>& xModel ); @@ -61,8 +59,6 @@ css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const cs ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException ); void setUpDocumentModules( const css::uno::Reference< css::sheet::XSpreadsheetDocument >& xDoc ); - - class ScVbaCellRangeAccess { public: diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 93c9fa50ce07..1953f704fb85 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -100,8 +100,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY; - - /** Global application settings shared by all open workbooks. */ struct ScVbaAppSettings { @@ -128,8 +126,6 @@ ScVbaAppSettings::ScVbaAppSettings() : struct ScVbaStaticAppSettings : public ::rtl::Static< ScVbaAppSettings, ScVbaStaticAppSettings > {}; - - ScVbaApplication::ScVbaApplication( const uno::Reference<uno::XComponentContext >& xContext ) : ScVbaApplication_BASE( xContext ), mrAppSettings( ScVbaStaticAppSettings::get() ) @@ -1113,8 +1109,6 @@ uno::Reference< excel::XRange > lclCreateVbaRange( } // namespace - - uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect( const uno::Reference< excel::XRange >& rArg1, const uno::Reference< excel::XRange >& rArg2, const uno::Any& rArg3, const uno::Any& rArg4, const uno::Any& rArg5, const uno::Any& rArg6, diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index e48e25764714..607a1cba58ca 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star::script::vba::VBAEventId; using namespace ::ooo::vba; - - namespace { /** Extracts a sheet index from the specified element of the passed sequence. @@ -110,8 +108,6 @@ uno::Reference< awt::XWindow > lclGetWindowForController( const uno::Reference< } // namespace - - typedef ::cppu::WeakImplHelper4< awt::XTopWindowListener, awt::XWindowListener, frame::XBorderResizeListener, util::XChangesListener > ScVbaEventListener_BASE; // This class is to process Workbook window related event @@ -180,8 +176,6 @@ private: bool mbDisposed; }; - - ScVbaEventListener::ScVbaEventListener( ScVbaEventsHelper& rVbaEvents, const uno::Reference< frame::XModel >& rxModel, ScDocShell* pDocShell ) : mrVbaEvents( rVbaEvents ), mxModel( rxModel ), @@ -511,8 +505,6 @@ IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, Window*, EMPTYARG pWind return 0; } - - ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& xContext ) : VbaEventsHelperBase( rArgs, xContext ), mbOpened( false ) diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 16d226041a55..be75085e1ddc 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -27,8 +27,6 @@ class ScVbaEventListener; - - class ScVbaEventsHelper : public VbaEventsHelperBase { public: @@ -67,8 +65,6 @@ private: bool mbOpened; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index e0ebb059aa31..8edd73f4cce0 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -75,8 +75,6 @@ public: }; - - #endif /* SC_VBA_FONT_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 6c2fb0520a81..30983e5579fb 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -35,8 +35,6 @@ using namespace ::com::sun::star::uno; using namespace ::ooo::vba; - - // ScVbaGlobals @@ -79,8 +77,6 @@ ScVbaGlobals::getExcel() throw (uno::RuntimeException, std::exception) return getApplication(); } - - uno::Reference< excel::XWorkbook > SAL_CALL ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index 420c1a8123ac..af6fbec8a7bd 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -30,8 +30,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; - - ScVbaHyperlink::ScVbaHyperlink( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& rxContext ) throw (lang::IllegalArgumentException) : HyperlinkImpl_BASE( getXSomethingFromArgs< XHelperInterface >( rArgs, 0 ), rxContext ), @@ -233,6 +231,4 @@ extern sdecl::ServiceDecl const serviceDecl( "ooo.vba.excel.Hyperlink" ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 68185d8ed7f8..bad71e7c81ae 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -28,8 +28,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; - - namespace { /** Returns true, if every range of rxInner is contained in any range of rScOuter. */ @@ -45,8 +43,6 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan return true; } - - /** Functor to decide whether the anchors of two Hyperlink objects are equal. */ struct EqualAnchorFunctor { @@ -102,8 +98,6 @@ bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& } // namespace - - namespace detail { class ScVbaHlinkContainer : public ::cppu::WeakImplHelper1< container::XIndexAccess > @@ -130,8 +124,6 @@ private: HyperlinkVector maHlinks; }; - - ScVbaHlinkContainer::ScVbaHlinkContainer() throw (uno::RuntimeException) { // TODO FIXME: fill with existing hyperlinks @@ -185,8 +177,6 @@ sal_Bool SAL_CALL ScVbaHlinkContainer::hasElements() throw (uno::RuntimeExceptio return !maHlinks.empty(); } - - ScVbaHlinkContainerMember::ScVbaHlinkContainerMember( ScVbaHlinkContainer* pContainer ) : mxContainer( pContainer ) { @@ -198,8 +188,6 @@ ScVbaHlinkContainerMember::~ScVbaHlinkContainerMember() } // namespace detail - - ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext ) throw (uno::RuntimeException) : detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer ), @@ -281,6 +269,4 @@ uno::Any ScVbaHyperlinks::createCollectionObject( const uno::Any& rSource ) VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaHyperlinks, "ooo.vba.excel.Hyperlinks" ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx index baeca71f49a6..32d082b9564c 100644 --- a/sc/source/ui/vba/vbahyperlinks.hxx +++ b/sc/source/ui/vba/vbahyperlinks.hxx @@ -26,8 +26,6 @@ class ScRangeList; - - namespace detail { class ScVbaHlinkContainer; @@ -46,8 +44,6 @@ struct ScVbaHlinkContainerMember } // namespace detail - - class ScVbaHyperlinks; typedef ::rtl::Reference< ScVbaHyperlinks > ScVbaHyperlinksRef; @@ -137,8 +133,6 @@ private: ScVbaHyperlinksRef mxSheetHlinks; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 05cdda11d05f..d71551fb2fbd 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -339,8 +339,6 @@ public: }; - - class RangesEnumerationImpl : public EnumerationHelperImpl { bool mbIsRows; @@ -1015,8 +1013,6 @@ public: } }; - - class Dim2ArrayValueSetter : public ArrayVisitor { uno::Sequence< uno::Sequence< uno::Any > > aMatrix; @@ -1276,8 +1272,6 @@ getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const return new ScVbaRange( xFixThisParent, xContext, xRanges ); } - - namespace { template< typename RangeType > @@ -1382,8 +1376,6 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC } // namespace - - css::uno::Reference< excel::XRange > ScVbaRange::getRangeObjectForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sRangeName, diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 800a59de9f96..9f37431c40de 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -76,8 +76,6 @@ public: virtual const css::uno::Any& getValue() const = 0; }; - - class ScVbaRange : public ScVbaRange_BASE { css::uno::Reference< ov::XCollection > m_Areas; diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 5f1badf94afd..582bb9797d45 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -36,8 +36,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - - ScVbaButtonCharacters::ScVbaButtonCharacters( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -152,8 +150,6 @@ void ScVbaButtonCharacters::setFullString( const OUString& rString ) throw (uno: mxPropSet->setPropertyValue( "Label", uno::Any( rString ) ); } - - ScVbaSheetObjectBase::ScVbaSheetObjectBase( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -291,8 +287,6 @@ void ScVbaSheetObjectBase::implSetDefaultProperties() throw (uno::RuntimeExcepti { } - - ScVbaControlObjectBase::ScVbaControlObjectBase( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -419,8 +413,6 @@ sal_Int32 ScVbaControlObjectBase::getModelIndexInForm() const throw (uno::Runtim throw uno::RuntimeException(); } - - ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -535,6 +527,4 @@ void ScVbaButton::implSetDefaultProperties() throw (uno::RuntimeException) setCaption( getName() ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index 6a8f6f11d5e9..5987576871ac 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -31,8 +31,6 @@ namespace com { namespace sun { namespace star { namespace drawing { class XControlShape; } } } } - - typedef InheritedHelperInterfaceImpl1< ov::excel::XCharacters > ScVbaButtonCharacters_BASE; /** Simple implementation of the Characters symbol for drawing button objects. */ @@ -75,8 +73,6 @@ private: sal_Int32 mnLength; }; - - typedef InheritedHelperInterfaceImpl1< ov::excel::XSheetObject > ScVbaSheetObject_BASE; /** Base class for drawing objects embedded in sheets. */ @@ -121,8 +117,6 @@ protected: css::uno::Reference< css::beans::XPropertySet > mxShapeProps; }; - - typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectBase, ov::excel::XControlObject > ScVbaControlObject_BASE; class ScVbaControlObjectBase : public ScVbaControlObject_BASE @@ -168,8 +162,6 @@ protected: OUString maEventMethod; }; - - typedef ::cppu::ImplInheritanceHelper1< ScVbaControlObjectBase, ov::excel::XButton > ScVbaButton_BASE; class ScVbaButton : public ScVbaButton_BASE @@ -206,8 +198,6 @@ protected: virtual void implSetDefaultProperties() throw (css::uno::RuntimeException) SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 25878d962a75..05ec0f23a8d0 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -35,8 +35,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - - namespace { template< typename Type > @@ -134,8 +132,6 @@ private: ShapeVector maShapes; }; - - ScVbaObjectContainer::ScVbaObjectContainer( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -239,8 +235,6 @@ void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XS { } - - class ScVbaObjectEnumeration : public SimpleEnumerationBase { public: @@ -251,8 +245,6 @@ private: ScVbaObjectContainerRef mxContainer; }; - - ScVbaObjectEnumeration::ScVbaObjectEnumeration( const ScVbaObjectContainerRef& rxContainer ) : SimpleEnumerationBase( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ), mxContainer( rxContainer ) @@ -264,8 +256,6 @@ uno::Any ScVbaObjectEnumeration::createCollectionObject( const uno::Any& rSource return mxContainer->createCollectionObject( rSource ); } - - ScVbaSheetObjectsBase::ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException) : ScVbaSheetObjects_BASE( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ), mxContainer( rxContainer ) @@ -371,8 +361,6 @@ protected: sal_Int16 mnComponentType; }; - - ScVbaControlContainer::ScVbaControlContainer( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -473,8 +461,6 @@ protected: virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const SAL_OVERRIDE; }; - - ScVbaButtonContainer::ScVbaButtonContainer( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -501,8 +487,6 @@ bool ScVbaButtonContainer::implCheckProperties( const uno::Reference< beans::XPr return lclGetProperty( bToggle, rxModelProps, "Toggle" ) && !bToggle; } - - ScVbaButtons::ScVbaButtons( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -514,6 +498,4 @@ ScVbaButtons::ScVbaButtons( VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaButtons, "ooo.vba.excel.Buttons" ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index 5a5489840761..152c6d6f0727 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -30,13 +30,9 @@ namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; } } } } - - class ScVbaObjectContainer; typedef ::rtl::Reference< ScVbaObjectContainer > ScVbaObjectContainerRef; - - typedef CollTestImplHelper< ov::XCollection > ScVbaSheetObjects_BASE; /** Base class for collections containing a specific type of drawing object @@ -65,8 +61,6 @@ protected: ScVbaObjectContainerRef mxContainer; }; - - typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectsBase, ov::excel::XGraphicObjects > ScVbaGraphicObjects_BASE; /** Base class for collections containing a specific type of graphic object @@ -85,8 +79,6 @@ public: const css::uno::Any& rHeight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - - /** Collection containing all button controls from a sheet (not ActiveX controls). */ class ScVbaButtons : public ScVbaGraphicObjectsBase { @@ -100,8 +92,6 @@ public: VBAHELPER_DECL_XHELPERINTERFACE }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index a930bc3327a8..3a9f8b6cd38d 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -25,8 +25,6 @@ using namespace ::com::sun::star; static OUString DISPLAYNAME("DisplayName"); - - uno::Reference< container::XNameAccess > ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) { |