diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-11-04 11:26:07 +0500 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-11-10 10:50:15 +0100 |
commit | 1180b3473aed3251b5869256abc9c7774bab9ced (patch) | |
tree | 72e169fd28db8da7b247290e2e53d530feae9d2b /include | |
parent | 7713d916e06a8388f849a758f928cbcfded6c0ae (diff) |
com::sun::star -> css
Change-Id: I890ec73e30d3cc6b210903ecee29431f3cb5f635
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175979
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/basegfx/matrix/b3dhommatrixtools.hxx | 7 | ||||
-rw-r--r-- | include/oox/ppt/presentationfragmenthandler.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/lokhelper.hxx | 2 | ||||
-rw-r--r-- | include/svx/fmdmod.hxx | 4 | ||||
-rw-r--r-- | include/test/sheet/xsheetcellrangecontainer.hxx | 2 | ||||
-rw-r--r-- | include/test/sheet/xsheetconditionalentries.hxx | 3 | ||||
-rw-r--r-- | include/test/unoapi_test.hxx | 5 | ||||
-rw-r--r-- | include/unotools/weakref.hxx | 2 |
8 files changed, 12 insertions, 15 deletions
diff --git a/include/basegfx/matrix/b3dhommatrixtools.hxx b/include/basegfx/matrix/b3dhommatrixtools.hxx index 6b65d24603f2..ec83f2c3eb5b 100644 --- a/include/basegfx/matrix/b3dhommatrixtools.hxx +++ b/include/basegfx/matrix/b3dhommatrixtools.hxx @@ -33,11 +33,10 @@ namespace basegfx::utils B3DHomMatrix. drawing::HomogenMatrix4 is not used by OOo */ BASEGFX_DLLPUBLIC B3DHomMatrix -UnoHomogenMatrixToB3DHomMatrix(const com::sun::star::drawing::HomogenMatrix& rMatrixIn); +UnoHomogenMatrixToB3DHomMatrix(const css::drawing::HomogenMatrix& rMatrixIn); -BASEGFX_DLLPUBLIC void -B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& rMatrixIn, - com::sun::star::drawing::HomogenMatrix& rMatrixOut); +BASEGFX_DLLPUBLIC void B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& rMatrixIn, + css::drawing::HomogenMatrix& rMatrixOut); } // end of namespace basegfx::tools diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx index 29e7bcf12bfc..cd9084235221 100644 --- a/include/oox/ppt/presentationfragmenthandler.hxx +++ b/include/oox/ppt/presentationfragmenthandler.hxx @@ -53,7 +53,7 @@ private: const oox::ppt::SlidePersistPtr& rPersist ); void importSlide(sal_uInt32 nSlide, bool bFirstSlide, bool bImportNotes); void importMasterSlides(); - void importMasterSlide(const ::com::sun::star::uno::Reference<::com::sun::star::frame::XModel>& xModel, + void importMasterSlide(const css::uno::Reference<css::frame::XModel>& xModel, ::oox::ppt::PowerPointImport& rFilter, const OUString& rMasterFragmentPath); void saveThemeToGrabBag(const oox::drawingml::ThemePtr& pThemePtr, sal_Int32 nThemeIdx); diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx index a35670332097..ca2212139cc8 100644 --- a/include/sfx2/lokhelper.hxx +++ b/include/sfx2/lokhelper.hxx @@ -87,7 +87,7 @@ class SFX2_DLLPUBLIC SfxLokHelper { public: /// Gets the short cut accelerators. - static std::unordered_map<OUString, css::uno::Reference<com::sun::star::ui::XAcceleratorConfiguration>>& getAcceleratorConfs(); + static std::unordered_map<OUString, css::uno::Reference<css::ui::XAcceleratorConfiguration>>& getAcceleratorConfs(); /// Create a new view shell from the current view frame. /// This assumes a single document is ever loaded. static int createView(); diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx index 69ef27704040..df19a78a1197 100644 --- a/include/svx/fmdmod.hxx +++ b/include/svx/fmdmod.hxx @@ -29,9 +29,9 @@ public: virtual ~SvxFmMSFactory() {} - virtual ::com::sun::star::uno::Reference<::com::sun::star::uno::XInterface> + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance(const OUString& ServiceSpecifier) override; - virtual ::com::sun::star::uno::Sequence<OUString> SAL_CALL getAvailableServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getAvailableServiceNames() override; }; #endif // INCLUDED_SVX_FMDMOD_HXX diff --git a/include/test/sheet/xsheetcellrangecontainer.hxx b/include/test/sheet/xsheetcellrangecontainer.hxx index 734c2c4e2fc1..98b082b01a50 100644 --- a/include/test/sheet/xsheetcellrangecontainer.hxx +++ b/include/test/sheet/xsheetcellrangecontainer.hxx @@ -30,7 +30,7 @@ public: protected: ~XSheetCellRangeContainer() {} - static css::uno::Sequence<com::sun::star::table::CellRangeAddress> createCellRangeAddresses(); + static css::uno::Sequence<css::table::CellRangeAddress> createCellRangeAddresses(); }; } diff --git a/include/test/sheet/xsheetconditionalentries.hxx b/include/test/sheet/xsheetconditionalentries.hxx index 673e7ceb1784..81518afb5980 100644 --- a/include/test/sheet/xsheetconditionalentries.hxx +++ b/include/test/sheet/xsheetconditionalentries.hxx @@ -24,8 +24,7 @@ class OOO_DLLPUBLIC_TEST XSheetConditionalEntries { public: virtual css::uno::Reference<css::uno::XInterface> init() = 0; - virtual css::uno::Sequence<com::sun::star::beans::PropertyValue> - createCondition(const sal_Int32 nr) = 0; + virtual css::uno::Sequence<css::beans::PropertyValue> createCondition(const sal_Int32 nr) = 0; void testAddNew(); void testClear(); diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx index f09499bf2c5a..a7b12bc10263 100644 --- a/include/test/unoapi_test.hxx +++ b/include/test/unoapi_test.hxx @@ -75,9 +75,8 @@ protected: rtl::Reference<TestInteractionHandler> xInteractionHandler; private: - void - setTestInteractionHandler(const char* pPassword, - std::vector<com::sun::star::beans::PropertyValue>& rFilterOptions); + void setTestInteractionHandler(const char* pPassword, + std::vector<css::beans::PropertyValue>& rFilterOptions); bool mbSkipValidation; OUString m_aBaseString; diff --git a/include/unotools/weakref.hxx b/include/unotools/weakref.hxx index 34a7242bdfc1..45b965fd4fdd 100644 --- a/include/unotools/weakref.hxx +++ b/include/unotools/weakref.hxx @@ -46,7 +46,7 @@ namespace unotools avoid overly tight requirements on when interface_type needs to be complete.) */ template <class interface_type> -class SAL_WARN_UNUSED WeakReference : public com::sun::star::uno::WeakReferenceHelper +class SAL_WARN_UNUSED WeakReference : public css::uno::WeakReferenceHelper { public: /** Default ctor. Creates an empty weak reference. |