diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-06 10:51:51 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-11-06 11:55:09 +0200 |
commit | 2633976ef3406d48907bd922f067ea04e39c94f1 (patch) | |
tree | c29440a174d106805b686299fcaa4a3bacf23592 /sw/source/ui/vba | |
parent | 41d83eb8cd8e9544641182ff19a8c635760e75dc (diff) |
com::sun::star->css in sw/source/core
Change-Id: I30016977f1be8fb53dd239367d043de92a9467d9
Diffstat (limited to 'sw/source/ui/vba')
-rw-r--r-- | sw/source/ui/vba/vbaapplication.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaautotextentry.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbabookmarks.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbadocumentproperties.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaeventshelper.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbafont.cxx | 36 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaglobals.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaparagraph.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbavariables.cxx | 2 |
9 files changed, 32 insertions, 32 deletions
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index 2c23b717a878..a641a87e1ea0 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -38,9 +38,9 @@ using namespace ::ooo; using namespace ::ooo::vba; using namespace ::com::sun::star; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::uno::UNO_QUERY; +using css::uno::Reference; +using css::uno::UNO_QUERY_THROW; +using css::uno::UNO_QUERY; SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): SwVbaApplication_BASE( xContext ) { diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index 4bf5b59e4340..538492195d6b 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -93,7 +93,7 @@ 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 ) +SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::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/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index 9af6c7c17f73..5a295b99c285 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -105,7 +105,7 @@ public: } }; -SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BookmarkCollectionHelper( xBookmarks ) ) ), mxModel( xModel ) +SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BookmarkCollectionHelper( xBookmarks ) ) ), mxModel( xModel ) { mxBookmarksSupplier.set( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 4629ceb9a615..a44c14702421 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -631,14 +631,14 @@ SwVbaBuiltInDocumentProperty::getServiceNames() } return aServiceNames; } -typedef ::cppu::WeakImplHelper< com::sun::star::container::XIndexAccess - ,com::sun::star::container::XNameAccess - ,com::sun::star::container::XEnumerationAccess +typedef ::cppu::WeakImplHelper< css::container::XIndexAccess + ,css::container::XNameAccess + ,css::container::XEnumerationAccess > PropertiesImpl_BASE; typedef std::unordered_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps; -class DocPropEnumeration : public ::cppu::WeakImplHelper< com::sun::star::container::XEnumeration > +class DocPropEnumeration : public ::cppu::WeakImplHelper< css::container::XEnumeration > { DocProps mDocProps; DocProps::iterator mIt; diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx index 71e2f99c8a31..f26e8d945b4d 100644 --- a/sw/source/ui/vba/vbaeventshelper.cxx +++ b/sw/source/ui/vba/vbaeventshelper.cxx @@ -23,13 +23,13 @@ #include <vbahelper/helperdecl.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::script::vba::VBAEventId; +using namespace css::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 ) { - using namespace ::com::sun::star::script::ModuleType; + using namespace css::script::ModuleType; registerEventHandler( DOCUMENT_NEW, DOCUMENT, "Document_New" ); registerEventHandler( AUTO_NEW, NORMAL, "AutoNew" ); registerEventHandler( DOCUMENT_OPEN, DOCUMENT, "Document_Open" ); diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index b9b75ab9dd9f..82988820e2b5 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -37,24 +37,24 @@ struct MapPair }; static MapPair UnderLineTable[] = { - { word::WdUnderline::wdUnderlineNone, com::sun::star::awt::FontUnderline::NONE }, - { word::WdUnderline::wdUnderlineSingle, com::sun::star::awt::FontUnderline::SINGLE }, - { word::WdUnderline::wdUnderlineWords, com::sun::star::awt::FontUnderline::SINGLE }, - { word::WdUnderline::wdUnderlineDouble, com::sun::star::awt::FontUnderline::DOUBLE }, - { word::WdUnderline::wdUnderlineDotted, com::sun::star::awt::FontUnderline::DOTTED }, - { word::WdUnderline::wdUnderlineThick, com::sun::star::awt::FontUnderline::BOLDDASH }, - { word::WdUnderline::wdUnderlineDash, com::sun::star::awt::FontUnderline::DASH }, - { word::WdUnderline::wdUnderlineDotDash, com::sun::star::awt::FontUnderline::DASHDOT }, - { word::WdUnderline::wdUnderlineDotDotDash, com::sun::star::awt::FontUnderline::DASHDOTDOT }, - { word::WdUnderline::wdUnderlineWavy, com::sun::star::awt::FontUnderline::WAVE }, - { word::WdUnderline::wdUnderlineDottedHeavy, com::sun::star::awt::FontUnderline::BOLDDOTTED }, - { word::WdUnderline::wdUnderlineDashHeavy, com::sun::star::awt::FontUnderline::BOLDDASH }, - { word::WdUnderline::wdUnderlineDotDashHeavy, com::sun::star::awt::FontUnderline::BOLDDASHDOT }, - { word::WdUnderline::wdUnderlineDotDotDashHeavy, com::sun::star::awt::FontUnderline::BOLDDASHDOTDOT }, - { word::WdUnderline::wdUnderlineWavyHeavy, com::sun::star::awt::FontUnderline::BOLDWAVE }, - { word::WdUnderline::wdUnderlineDashLong, com::sun::star::awt::FontUnderline::LONGDASH }, - { word::WdUnderline::wdUnderlineWavyDouble, com::sun::star::awt::FontUnderline::DOUBLEWAVE }, - { word::WdUnderline::wdUnderlineDashLongHeavy, com::sun::star::awt::FontUnderline::BOLDLONGDASH }, + { word::WdUnderline::wdUnderlineNone, css::awt::FontUnderline::NONE }, + { word::WdUnderline::wdUnderlineSingle, css::awt::FontUnderline::SINGLE }, + { word::WdUnderline::wdUnderlineWords, css::awt::FontUnderline::SINGLE }, + { word::WdUnderline::wdUnderlineDouble, css::awt::FontUnderline::DOUBLE }, + { word::WdUnderline::wdUnderlineDotted, css::awt::FontUnderline::DOTTED }, + { word::WdUnderline::wdUnderlineThick, css::awt::FontUnderline::BOLDDASH }, + { word::WdUnderline::wdUnderlineDash, css::awt::FontUnderline::DASH }, + { word::WdUnderline::wdUnderlineDotDash, css::awt::FontUnderline::DASHDOT }, + { word::WdUnderline::wdUnderlineDotDotDash, css::awt::FontUnderline::DASHDOTDOT }, + { word::WdUnderline::wdUnderlineWavy, css::awt::FontUnderline::WAVE }, + { word::WdUnderline::wdUnderlineDottedHeavy, css::awt::FontUnderline::BOLDDOTTED }, + { word::WdUnderline::wdUnderlineDashHeavy, css::awt::FontUnderline::BOLDDASH }, + { word::WdUnderline::wdUnderlineDotDashHeavy, css::awt::FontUnderline::BOLDDASHDOT }, + { word::WdUnderline::wdUnderlineDotDotDashHeavy, css::awt::FontUnderline::BOLDDASHDOTDOT }, + { word::WdUnderline::wdUnderlineWavyHeavy, css::awt::FontUnderline::BOLDWAVE }, + { word::WdUnderline::wdUnderlineDashLong, css::awt::FontUnderline::LONGDASH }, + { word::WdUnderline::wdUnderlineWavyDouble, css::awt::FontUnderline::DOUBLEWAVE }, + { word::WdUnderline::wdUnderlineDashLongHeavy, css::awt::FontUnderline::BOLDLONGDASH }, }; typedef std::unordered_map< sal_Int32, sal_Int32 > ConstToConst; diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index bb2859f7d259..127d84e6fdb7 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -27,7 +27,7 @@ #include <cppuhelper/bootstrap.hxx> #include "vbaapplication.hxx" using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; +using namespace css::uno; using namespace ::ooo::vba; SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "WordDocumentContext" ) diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index 3ebca1b28d50..bb7967061145 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -133,7 +133,7 @@ public: } }; -SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException) : SwVbaParagraphs_BASE( xParent, xContext, new ParagraphCollectionHelper( xDocument ) ), mxTextDocument( xDocument ) +SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException) : SwVbaParagraphs_BASE( xParent, xContext, new ParagraphCollectionHelper( xDocument ) ), mxTextDocument( xDocument ) { } diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx index fa8204d36ec0..d77ce2a19d49 100644 --- a/sw/source/ui/vba/vbavariables.cxx +++ b/sw/source/ui/vba/vbavariables.cxx @@ -38,7 +38,7 @@ uno::Reference< container::XIndexAccess > createVariablesAccess( const uno::Refe return xVariables; } -SwVbaVariables::SwVbaVariables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertyAccess >& rUserDefined ): SwVbaVariables_BASE( xParent, xContext, createVariablesAccess( xParent, xContext, rUserDefined ) ), mxUserDefined( rUserDefined ) +SwVbaVariables::SwVbaVariables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertyAccess >& rUserDefined ): SwVbaVariables_BASE( xParent, xContext, createVariablesAccess( xParent, xContext, rUserDefined ) ), mxUserDefined( rUserDefined ) { } // XEnumerationAccess |