diff options
Diffstat (limited to 'sw/source/ui/vba')
30 files changed, 6 insertions, 54 deletions
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index 8880d03c7f97..f1fbdc8b0359 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -21,9 +21,8 @@ #include "com/sun/star/registry/XRegistryKey.hpp" #include "comphelper/servicedecl.hxx" -// ============================================================================= // component exports -// ============================================================================= + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index 5e928afed2bd..e6bf8707b043 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -93,7 +93,6 @@ SwVbaAutoTextEntry::getServiceNames() return aServiceNames; } - SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ), mxAutoTextEntryAccess( xIndexAccess ) { } diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index 5e07936138d4..6d7975fa3932 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -46,7 +46,6 @@ public: virtual css::uno::Sequence<OUString> getServiceNames(); }; - /* class SwVbaAutoTextEntries */ typedef CollTestImplHelper< ooo::vba::word::XAutoTextEntries > SwVbaAutoTextEntries_BASE; diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 90bd3e0847ad..33ac997c4226 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangeBorders_Base; typedef InheritedHelperInterfaceImpl1<word::XBorder > SwVbaBorder_Base; diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index d46e20b67ee5..4963ba7578f1 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -393,7 +393,6 @@ public: } }; - typedef boost::unordered_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo; class BuiltInIndexHelper @@ -441,7 +440,6 @@ public: MSOIndexToOODocPropInfo& getDocPropInfoMap() { return m_docPropInfoMap; } }; - typedef InheritedHelperInterfaceImpl1< ooo::vba::XDocumentProperty > SwVbaDocumentProperty_BASE; class SwVbaBuiltInDocumentProperty : public SwVbaDocumentProperty_BASE @@ -486,7 +484,6 @@ public: }; - SwVbaCustomDocumentProperty::SwVbaCustomDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ) : SwVbaBuiltInDocumentProperty( xParent, xContext, rInfo ) { } @@ -882,7 +879,6 @@ public: }; - SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaBuiltinDocumentProperties( xParent, xContext, xModel ) { // replace the m_xIndexAccess implementation ( we need a virtual init ) diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index be2af5b3dc3e..83eda1d9fec0 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -19,14 +19,12 @@ #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX #define INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX - #include <vbahelper/vbacollectionimpl.hxx> #include <ooo/vba/word/XDocuments.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <vbahelper/vbadocumentsbase.hxx> #include "wordvbahelper.hxx" - typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::word::XDocuments > SwVbaDocuments_BASE; class SwVbaDocuments : public SwVbaDocuments_BASE diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx index 2e0e533be8a3..257c829b9c48 100644 --- a/sw/source/ui/vba/vbaeventshelper.cxx +++ b/sw/source/ui/vba/vbaeventshelper.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::script::vba::VBAEventId; using namespace ::ooo::vba; -// ============================================================================ - SwVbaEventsHelper::SwVbaEventsHelper( uno::Sequence< css::uno::Any > const& aArgs, uno::Reference< uno::XComponentContext > const& xContext ) : VbaEventsHelperBase( aArgs, xContext ) { @@ -82,8 +80,6 @@ OUString SwVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& / return OUString( "ThisDocument" ); } -// ============================================================================ - namespace vbaeventshelper { namespace sdecl = comphelper::service_decl; @@ -94,6 +90,4 @@ extern sdecl::ServiceDecl const serviceDecl( "com.sun.star.document.vba.VBATextEventProcessor" ); } -// ============================================================================ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx index 0093cf916e8f..8927a978f121 100644 --- a/sw/source/ui/vba/vbaeventshelper.hxx +++ b/sw/source/ui/vba/vbaeventshelper.hxx @@ -22,8 +22,6 @@ #include <vbahelper/vbaeventshelperbase.hxx> -// ============================================================================ - class SwVbaEventsHelper : public VbaEventsHelperBase { public: @@ -39,8 +37,6 @@ protected: virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); }; -// ============================================================================ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 91ea2546e17a..5c7122d36ebe 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -116,7 +116,6 @@ SwVbaReadFieldParams::~SwVbaReadFieldParams() { } - OUString SwVbaReadFieldParams::GetResult() const { return (-1 == nFnd) @@ -161,9 +160,9 @@ long SwVbaReadFieldParams::SkipToNextToken() // FindNextPara is searching for the next Backslash-Parameter or the next string // until blank or the next "\" or until the closing quotation mark // or until the string end of pStr. -// + // Output ppNext (if ppNext != 0) beginning of the search for the next parameter or 0 -// + // Return value: 0 if String-End reached, otherwise begin of the paramater or the string sal_Int32 SwVbaReadFieldParams::FindNextStringPiece(const sal_Int32 nStart) diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index f0ffd6bd9c77..fd2922f44ba5 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -232,5 +232,4 @@ SwVbaFont::getServiceNames() return aServiceNames; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index 7c6308784eaa..a996dd795d62 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -30,10 +30,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::ooo::vba; - -// ============================================================================= // SwVbaGlobals -// ============================================================================= SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "WordDocumentContext" ) { @@ -52,9 +49,8 @@ SwVbaGlobals::~SwVbaGlobals() OSL_TRACE("SwVbaGlobals::~SwVbaGlobals"); } -// ============================================================================= // XGlobals -// ============================================================================= + uno::Reference<word::XApplication > SwVbaGlobals::getApplication() throw (uno::RuntimeException) { diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index 6fcafddd35a2..92df9b43825c 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -31,10 +31,7 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbaglobalbase.hxx> -// ============================================================================= // class SwVbaGlobals -// ============================================================================= - typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE; diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx index 1143921198ca..12762c77b9b7 100644 --- a/sw/source/ui/vba/vbalistformat.hxx +++ b/sw/source/ui/vba/vbalistformat.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/text/XTextRange.hpp> #include "vbalisthelper.hxx" - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListFormat > SwVbaListFormat_BASE; class SwVbaListFormat : public SwVbaListFormat_BASE diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx index 540df4c2514a..720c4691ceeb 100644 --- a/sw/source/ui/vba/vbalistgallery.hxx +++ b/sw/source/ui/vba/vbalistgallery.hxx @@ -24,7 +24,6 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextDocument.hpp> - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListGallery > SwVbaListGallery_BASE; class SwVbaListGallery : public SwVbaListGallery_BASE diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx index 3eb38b86d642..24f2bf56125d 100644 --- a/sw/source/ui/vba/vbalisthelper.hxx +++ b/sw/source/ui/vba/vbalisthelper.hxx @@ -15,7 +15,6 @@ #include <com/sun/star/text/XTextDocument.hpp> #include <boost/shared_ptr.hpp> - class SwVbaListHelper; typedef ::boost::shared_ptr< SwVbaListHelper > SwVbaListHelperRef; diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx index f3b6d9c937b6..9f850fe9030a 100644 --- a/sw/source/ui/vba/vbalistlevel.hxx +++ b/sw/source/ui/vba/vbalistlevel.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/text/XTextDocument.hpp> #include "vbalisthelper.hxx" - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListLevel > SwVbaListLevel_BASE; class SwVbaListLevel : public SwVbaListLevel_BASE diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx index c3d2d23f8ba5..f4285eda59af 100644 --- a/sw/source/ui/vba/vbalistlevels.hxx +++ b/sw/source/ui/vba/vbalistlevels.hxx @@ -24,7 +24,6 @@ #include <vbahelper/vbahelperinterface.hxx> #include "vbalisthelper.hxx" - typedef CollTestImplHelper< ooo::vba::word::XListLevels > SwVbaListLevels_BASE; class SwVbaListLevels : public SwVbaListLevels_BASE diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx index 8c6f6ecaf87e..a9b831e6adf9 100644 --- a/sw/source/ui/vba/vbalisttemplate.hxx +++ b/sw/source/ui/vba/vbalisttemplate.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/text/XTextDocument.hpp> #include "vbalisthelper.hxx" - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListTemplate > SwVbaListTemplate_BASE; class SwVbaListTemplate : public SwVbaListTemplate_BASE diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index 22f28c0a75c0..7ae4a74de57f 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/text/XTextDocument.hpp> - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XParagraph > SwVbaParagraph_BASE; class SwVbaParagraph : public SwVbaParagraph_BASE @@ -50,7 +49,6 @@ public: virtual css::uno::Sequence<OUString> getServiceNames(); }; - /* class SwVbaParagraphs */ typedef CollTestImplHelper< ooo::vba::word::XParagraphs > SwVbaParagraphs_BASE; diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 062b15354140..aa5d0c9b12ba 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/style/BreakType.hpp> #include "vbatabstops.hxx" - using namespace ::ooo::vba; using namespace ::com::sun::star; diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx index e1326a5fa6f1..b522c44ce788 100644 --- a/sw/source/ui/vba/vbarangehelper.cxx +++ b/sw/source/ui/vba/vbarangehelper.cxx @@ -60,7 +60,6 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u return xRange; } - void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException ) { sal_Int32 nlastIndex = 0; diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx index 95c6357356ea..78e9b3003b20 100644 --- a/sw/source/ui/vba/vbarevisions.hxx +++ b/sw/source/ui/vba/vbarevisions.hxx @@ -24,7 +24,6 @@ #include <vbahelper/vbahelperinterface.hxx> #include <com/sun/star/text/XTextRange.hpp> - typedef CollTestImplHelper< ooo::vba::word::XRevisions > SwVbaRevisions_BASE; class SwVbaRevisions : public SwVbaRevisions_BASE diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index 62a18f4cc253..55bf3f442a10 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -30,7 +30,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; - SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel>& xModel, const uno::Reference< beans::XPropertySet >& _xPropertySet ) throw ( script::BasicErrorException, uno::RuntimeException ) : SwVbaStyle_BASE( xParent, xContext ) , mxModel( xModel ), mxStyleProps( _xPropertySet ) { mxStyle.set( _xPropertySet, uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index d71ee2673a03..3a9c87e57d4c 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -27,7 +27,6 @@ #include <ooo/vba/word/XFont.hpp> #include <ooo/vba/word/XListTemplate.hpp> - typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XStyle > SwVbaStyle_BASE; class SwVbaStyle : public SwVbaStyle_BASE diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx index a224258d0dfc..3c0291b51b29 100644 --- a/sw/source/ui/vba/vbatableofcontents.cxx +++ b/sw/source/ui/vba/vbatableofcontents.cxx @@ -30,7 +30,6 @@ SwVbaTableOfContents::SwVbaTableOfContents( const uno::Reference< ooo::vba::XHel mxTocProps.set( mxDocumentIndex, uno::UNO_QUERY_THROW ); } - SwVbaTableOfContents::~SwVbaTableOfContents() { } diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 2f48f5ef2414..ae94ba1194be 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -159,7 +159,6 @@ SwVbaTables::SwVbaTables( const uno::Reference< XHelperInterface >& xParent, con { } - uno::Reference< word::XTable > SAL_CALL SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& /*DefaultTableBehavior*/, const uno::Any& /*AutoFitBehavior*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx index 368e33dc1ffe..4d78a5dc514c 100644 --- a/sw/source/ui/vba/vbatables.hxx +++ b/sw/source/ui/vba/vbatables.hxx @@ -23,7 +23,6 @@ #include <ooo/vba/word/XTables.hpp> #include <vbahelper/vbacollectionimpl.hxx> - typedef CollTestImplHelper< ov::word::XTables > SwVbaTables_BASE; class SwVbaTables : public SwVbaTables_BASE diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index 8a75916668c9..02880f48c95f 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -45,13 +45,11 @@ static OUString lcl_CheckGroupName( const OUString& rGroupName ) return comphelper::string::strip(sRet, ' '); } - SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rFullUrl ) : SwVbaTemplate_BASE( rParent, rContext ), mxModel( rModel ), msFullUrl( rFullUrl ) { } - SwVbaTemplate::~SwVbaTemplate() { } diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx index cc54c363a44f..cc9ffec06050 100644 --- a/sw/source/ui/vba/vbawrapformat.cxx +++ b/sw/source/ui/vba/vbawrapformat.cxx @@ -240,5 +240,4 @@ extern sdecl::ServiceDecl const serviceDecl( "ooo.vba.word.WrapFormat" ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx index be3443da93f6..7bf49e6e2836 100644 --- a/sw/source/ui/vba/wordvbahelper.cxx +++ b/sw/source/ui/vba/wordvbahelper.cxx @@ -176,7 +176,7 @@ bool gotoSelectedObjectAnchor( const uno::Reference< frame::XModel>& xModel ) th } } // word -} // -} // +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |