From 5a4d508bd6711def27c7738f7ac68c2da478e48c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 18 Nov 2015 10:11:06 +0200 Subject: com::sun::star->css in vcl/ Change-Id: Ifad76177673cf93746ba221838be80ff76fed228 Reviewed-on: https://gerrit.libreoffice.org/20032 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- vcl/generic/fontmanager/fontconfig.cxx | 2 +- vcl/generic/print/genpspgraphics.cxx | 2 +- vcl/headless/svpbmp.cxx | 2 +- vcl/headless/svpgdi.cxx | 2 +- vcl/inc/brdwin.hxx | 2 +- vcl/inc/canvasbitmap.hxx | 78 ++++++++--------- vcl/inc/displayconnectiondispatch.hxx | 2 +- vcl/inc/dndevdis.hxx | 48 +++++------ vcl/inc/dndlcon.hxx | 56 ++++++------ vcl/inc/fontmanager.hxx | 2 +- vcl/inc/generic/glyphcache.hxx | 2 +- vcl/inc/headless/svpbmp.hxx | 2 +- vcl/inc/headless/svpgdi.hxx | 2 +- vcl/inc/ilstbox.hxx | 4 +- vcl/inc/opengl/salbmp.hxx | 2 +- vcl/inc/openglgdiimpl.hxx | 2 +- vcl/inc/osx/a11yfactory.h | 12 +-- vcl/inc/osx/a11yfocustracker.hxx | 8 +- vcl/inc/osx/a11ylistener.hxx | 12 +-- vcl/inc/osx/a11ywrapper.h | 52 +++++------ vcl/inc/osx/keyboardfocuslistener.hxx | 2 +- vcl/inc/osx/saldata.hxx | 3 +- vcl/inc/osx/salframeview.h | 4 +- vcl/inc/printdlg.hxx | 2 +- vcl/inc/quartz/salbmp.h | 2 +- vcl/inc/quartz/salgdi.h | 2 +- vcl/inc/salbmp.hxx | 2 +- vcl/inc/salgdi.hxx | 4 +- vcl/inc/salgdiimpl.hxx | 2 +- vcl/inc/svdata.hxx | 2 +- vcl/inc/unx/gtk/gtkinst.hxx | 10 +-- vcl/inc/unx/kde/kdedata.hxx | 5 +- vcl/inc/unx/salbmp.h | 4 +- vcl/inc/unx/salgdi.h | 2 +- vcl/inc/unx/salinst.h | 10 +-- vcl/inc/win/salbmp.h | 2 +- vcl/inc/win/salgdi.h | 2 +- vcl/inc/window.h | 18 ++-- vcl/inc/xconnection.hxx | 16 ++-- vcl/opengl/gdiimpl.cxx | 2 +- vcl/opengl/salbmp.cxx | 2 +- vcl/osx/DataFlavorMapping.cxx | 4 +- vcl/osx/DataFlavorMapping.hxx | 14 +-- vcl/osx/DragActionConversion.cxx | 4 +- vcl/osx/DragActionConversion.hxx | 4 +- vcl/osx/DragSource.hxx | 38 ++++----- vcl/osx/DragSourceContext.hxx | 10 +-- vcl/osx/DropTarget.hxx | 62 +++++++------- vcl/osx/HtmlFmtFlt.hxx | 6 +- vcl/osx/OSXTransferable.hxx | 26 +++--- vcl/osx/PictToBmpFlt.cxx | 8 +- vcl/osx/PictToBmpFlt.hxx | 8 +- vcl/osx/a11yfactory.mm | 2 +- vcl/osx/a11yfocuslistener.hxx | 2 +- vcl/osx/a11yrolehelper.h | 2 +- vcl/osx/a11ytextattributeswrapper.mm | 12 +-- vcl/osx/a11yutil.h | 4 +- vcl/osx/a11ywrapper.mm | 8 +- vcl/osx/a11ywrappercombobox.h | 2 +- vcl/osx/clipboard.hxx | 50 +++++------ vcl/osx/documentfocuslistener.hxx | 52 +++++------ vcl/osx/salframeview.mm | 90 +++++++++---------- vcl/quartz/salgdicommon.cxx | 2 +- vcl/source/app/dndhelp.cxx | 64 +++++++------- vcl/source/app/i18nhelp.cxx | 2 +- vcl/source/app/settings.cxx | 2 +- vcl/source/app/svapp.cxx | 6 +- vcl/source/app/svmain.cxx | 16 ++-- vcl/source/app/unohelp.cxx | 10 +-- vcl/source/app/unohelp2.cxx | 4 +- vcl/source/components/dtranscomp.cxx | 36 ++++---- vcl/source/components/factory.cxx | 6 +- vcl/source/components/fontident.cxx | 46 +++++----- vcl/source/control/edit.cxx | 114 ++++++++++++------------- vcl/source/control/field2.cxx | 4 +- vcl/source/control/lstbox.cxx | 2 +- vcl/source/control/throbber.cxx | 4 +- vcl/source/edit/texteng.cxx | 6 +- vcl/source/edit/textview.cxx | 114 ++++++++++++------------- vcl/source/edit/vclmedit.cxx | 2 +- vcl/source/filter/FilterConfigCache.hxx | 2 +- vcl/source/filter/FilterConfigItem.cxx | 18 ++-- vcl/source/filter/graphicfilter.cxx | 6 +- vcl/source/filter/jpeg/JpegWriter.hxx | 4 +- vcl/source/filter/jpeg/jpeg.cxx | 2 +- vcl/source/filter/jpeg/jpeg.hxx | 2 +- vcl/source/filter/wmf/enhwmf.cxx | 6 +- vcl/source/filter/wmf/winmtf.hxx | 2 +- vcl/source/filter/wmf/winwmf.cxx | 6 +- vcl/source/filter/wmf/wmfwr.hxx | 2 +- vcl/source/gdi/bitmapex.cxx | 3 +- vcl/source/gdi/cvtsvm.cxx | 6 +- vcl/source/gdi/graph.cxx | 2 +- vcl/source/gdi/impgraph.cxx | 42 +++++---- vcl/source/gdi/lineinfo.cxx | 8 +- vcl/source/gdi/oldprintadaptor.cxx | 16 ++-- vcl/source/gdi/pdfextoutdevdata.cxx | 2 +- vcl/source/gdi/pdfwriter.cxx | 6 +- vcl/source/gdi/pdfwriter_impl.cxx | 28 +++--- vcl/source/gdi/pdfwriter_impl.hxx | 16 ++-- vcl/source/gdi/pdfwriter_impl2.cxx | 2 +- vcl/source/gdi/salgdilayout.cxx | 2 +- vcl/source/gdi/virdev.cxx | 4 +- vcl/source/helper/canvastools.cxx | 2 +- vcl/source/outdev/transparent.cxx | 2 +- vcl/source/window/accessibility.cxx | 8 +- vcl/source/window/brdwin.cxx | 4 +- vcl/source/window/dlgctrl.cxx | 2 +- vcl/source/window/dndevdis.cxx | 2 +- vcl/source/window/dockmgr.cxx | 6 +- vcl/source/window/layout.cxx | 6 +- vcl/source/window/menu.cxx | 4 +- vcl/source/window/menufloatingwindow.cxx | 2 +- vcl/source/window/mnemonic.cxx | 4 +- vcl/source/window/mouseevent.cxx | 16 ++-- vcl/source/window/msgbox.cxx | 2 +- vcl/source/window/settings.cxx | 2 +- vcl/source/window/syswin.cxx | 2 +- vcl/source/window/toolbox2.cxx | 4 +- vcl/source/window/winproc.cxx | 15 ++-- vcl/source/window/wrkwin.cxx | 12 ++- vcl/unx/generic/dtrans/X11_clipboard.cxx | 4 +- vcl/unx/generic/dtrans/X11_dndcontext.hxx | 18 ++-- vcl/unx/generic/dtrans/X11_droptarget.cxx | 2 +- vcl/unx/generic/dtrans/X11_selection.cxx | 28 +++--- vcl/unx/generic/dtrans/X11_transferable.hxx | 19 ++--- vcl/unx/generic/dtrans/config.cxx | 2 +- vcl/unx/generic/gdi/gdiimpl.cxx | 2 +- vcl/unx/generic/gdi/gdiimpl.hxx | 2 +- vcl/unx/generic/gdi/salbmp.cxx | 7 +- vcl/unx/generic/gdi/salgdi.cxx | 2 +- vcl/unx/generic/printer/ppdparser.cxx | 38 ++++----- vcl/unx/generic/window/salframe.cxx | 2 +- vcl/unx/gtk/a11y/atklistener.hxx | 20 ++--- vcl/unx/gtk/a11y/atkregistry.hxx | 4 +- vcl/unx/gtk/a11y/atktext.cxx | 16 ++-- vcl/unx/gtk/a11y/atktextattributes.cxx | 2 +- vcl/unx/gtk/a11y/atktextattributes.hxx | 4 +- vcl/unx/gtk/a11y/atkwrapper.cxx | 2 +- vcl/unx/gtk/a11y/atkwrapper.hxx | 4 +- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 3 +- vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 102 +++++++++++----------- vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 21 +++-- vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 8 +- vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 62 +++++++------- vcl/unx/gtk/fpicker/eventnotification.hxx | 2 +- vcl/unx/kde/UnxCommandThread.hxx | 16 ++-- vcl/unx/kde/UnxFilePicker.cxx | 2 +- vcl/unx/kde/UnxFilePicker.hxx | 80 ++++++++--------- vcl/unx/kde/UnxNotifyThread.hxx | 18 ++-- vcl/unx/kde/salnativewidgets-kde.cxx | 2 +- vcl/unx/kde4/KDE4FilePicker.cxx | 12 +-- vcl/unx/kde4/KDE4FilePicker.hxx | 128 ++++++++++++++-------------- vcl/unx/kde4/KDESalFrame.cxx | 2 +- vcl/unx/kde4/KDESalInstance.hxx | 6 +- vcl/unx/kde4/KDEXLib.cxx | 6 +- vcl/unx/kde4/KDEXLib.hxx | 10 +-- vcl/win/source/gdi/gdiimpl.cxx | 8 +- vcl/win/source/gdi/gdiimpl.hxx | 2 +- vcl/win/source/gdi/salbmp.cxx | 8 +- vcl/win/source/gdi/salgdi_gdiplus.cxx | 2 +- vcl/workben/svpclient.cxx | 2 +- 162 files changed, 1088 insertions(+), 1114 deletions(-) diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 9ed5c60f27c3..b663dffb7bd5 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -1231,7 +1231,7 @@ FontConfigFontOptions* PrintFontManager::getFontOptions( return pOptions; } -bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale ) +bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const css::lang::Locale& rLocale ) { FontCfgWrapper& rWrapper = FontCfgWrapper::get(); diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 029653f52eb5..c0e214d51e51 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -442,7 +442,7 @@ bool GenPspGraphics::drawPolyLine( double /*fTranspareny*/, const basegfx::B2DVector& /*rLineWidths*/, basegfx::B2DLineJoin /*eJoin*/, - com::sun::star::drawing::LineCap /*eLineCap*/) + css::drawing::LineCap /*eLineCap*/) { // TODO: a PS printer can draw B2DPolyLines almost directly return false; diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index 4ae1afed0c4f..8c0363bbfdc0 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -104,7 +104,7 @@ bool SvpSalBitmap::Create( const SalBitmap& /*rSalBmp*/, return false; } -bool SvpSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& /*xBitmapCanvas*/, Size& /*rSize*/, bool /*bMask*/ ) +bool SvpSalBitmap::Create( const css::uno::Reference< css::rendering::XBitmapCanvas >& /*xBitmapCanvas*/, Size& /*rSize*/, bool /*bMask*/ ) { return false; } diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 8edc059ee79f..801e80ba284a 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -607,7 +607,7 @@ bool SvpSalGraphics::drawPolyLine( double /*fTransparency*/, const ::basegfx::B2DVector& /*rLineWidths*/, basegfx::B2DLineJoin /*eJoin*/, - com::sun::star::drawing::LineCap /*eLineCap*/) + css::drawing::LineCap /*eLineCap*/) { // TODO: implement and advertise OutDevSupport_B2DDraw support return false; diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 8d0d74919bd0..a5f11d47ab9f 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -114,7 +114,7 @@ private: SystemParentData* pParentData ); void ImplInit( vcl::Window* pParent, WinBits nStyle, sal_uInt16 nTypeStyle, - const ::com::sun::star::uno::Any& ); + const css::uno::Any& ); ImplBorderWindow (const ImplBorderWindow &) = delete; ImplBorderWindow& operator= (const ImplBorderWindow &) = delete; diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index 77dc3069fafe..be5c7cf79d11 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -34,9 +34,9 @@ namespace vcl namespace unotools { class VCL_DLLPUBLIC VclCanvasBitmap : - public cppu::WeakImplHelper< com::sun::star::rendering::XIntegerReadOnlyBitmap, - com::sun::star::rendering::XBitmapPalette, - com::sun::star::rendering::XIntegerBitmapColorSpace > + public cppu::WeakImplHelper< css::rendering::XIntegerReadOnlyBitmap, + css::rendering::XBitmapPalette, + css::rendering::XIntegerBitmapColorSpace > { private: BitmapEx m_aBmpEx; @@ -44,9 +44,9 @@ namespace unotools ::Bitmap m_aAlpha; BitmapReadAccess* m_pBmpAcc; BitmapReadAccess* m_pAlphaAcc; - com::sun::star::uno::Sequence m_aComponentTags; - com::sun::star::uno::Sequence m_aComponentBitCounts; - com::sun::star::rendering::IntegerBitmapLayout m_aLayout; + css::uno::Sequence m_aComponentTags; + css::uno::Sequence m_aComponentBitCounts; + css::rendering::IntegerBitmapLayout m_aLayout; sal_Int32 m_nBitsPerInputPixel; sal_Int32 m_nBitsPerOutputPixel; sal_Int32 m_nRedIndex; @@ -63,45 +63,45 @@ namespace unotools public: // XBitmap - virtual com::sun::star::geometry::IntegerSize2D SAL_CALL getSize() throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasAlpha( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Reference< com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const com::sun::star::geometry::RealSize2D& newSize, sal_Bool beFast ) throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::geometry::IntegerSize2D SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasAlpha( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& newSize, sal_Bool beFast ) throw (css::uno::RuntimeException, std::exception) override; // XIntegerReadOnlyBitmap - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (css::uno::RuntimeException); + virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (css::uno::RuntimeException, std::exception) override; // XBitmapPalette - virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getIndex( ::com::sun::star::uno::Sequence< double >& entry, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setIndex( const ::com::sun::star::uno::Sequence< double >& color, sal_Bool transparency, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIndex( css::uno::Sequence< double >& entry, ::sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setIndex( const css::uno::Sequence< double >& color, sal_Bool transparency, ::sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (css::uno::RuntimeException, std::exception) override; // XIntegerBitmapColorSpace - virtual ::sal_Int8 SAL_CALL getType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertColorSpace( const ::com::sun::star::uno::Sequence< double >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertToRGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToPARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence SAL_CALL convertFromIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int8 SAL_CALL getType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getProperties( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL convertColorSpace( const css::uno::Sequence< double >& deviceColor, const css::uno::Reference< css::rendering::XColorSpace >& targetColorSpace ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertToRGB( const css::uno::Sequence< double >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertToARGB( const css::uno::Sequence< double >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertToPARGB( const css::uno::Sequence< double >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL convertFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL convertFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL convertFromPARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence SAL_CALL convertFromIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XColorSpace >& targetColorSpace ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; /** Create API wrapper for given BitmapEx diff --git a/vcl/inc/displayconnectiondispatch.hxx b/vcl/inc/displayconnectiondispatch.hxx index b1e36d3b228e..da90d29a8da0 100644 --- a/vcl/inc/displayconnectiondispatch.hxx +++ b/vcl/inc/displayconnectiondispatch.hxx @@ -28,7 +28,7 @@ namespace vcl { class DisplayConnectionDispatch: - public cppu::WeakImplHelper< com::sun::star::awt::XDisplayConnection > + public cppu::WeakImplHelper< css::awt::XDisplayConnection > { public: virtual bool dispatchEvent(void * pData, int nBytes) = 0; diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx index 24d63fe7e686..f7f335fb87be 100644 --- a/vcl/inc/dndevdis.hxx +++ b/vcl/inc/dndevdis.hxx @@ -28,9 +28,9 @@ #include class DNDEventDispatcher: public ::cppu::WeakImplHelper< - ::com::sun::star::datatransfer::dnd::XDropTargetListener, - ::com::sun::star::datatransfer::dnd::XDropTargetDragContext, - ::com::sun::star::datatransfer::dnd::XDragGestureListener > + css::datatransfer::dnd::XDropTargetListener, + css::datatransfer::dnd::XDropTargetDragContext, + css::datatransfer::dnd::XDragGestureListener > { VclPtr m_pTopWindow; @@ -39,31 +39,31 @@ class DNDEventDispatcher: public ::cppu::WeakImplHelper< DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void); ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_aDataFlavorList; + css::uno::Sequence< css::datatransfer::DataFlavor > m_aDataFlavorList; vcl::Window* findTopLevelWindow(Point location); /* * fire the events on the dnd listener container of the specified window */ - static sal_Int32 fireDragEnterEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, + static sal_Int32 fireDragEnterEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction, - const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aFlavorList ) throw(::com::sun::star::uno::RuntimeException); + const css::uno::Sequence< css::datatransfer::DataFlavor >& aFlavorList ) throw(css::uno::RuntimeException); - static sal_Int32 fireDragOverEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, - const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException); + static sal_Int32 fireDragOverEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext >& xContext, + const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(css::uno::RuntimeException); - static sal_Int32 fireDragExitEvent( vcl::Window *pWindow ) throw(::com::sun::star::uno::RuntimeException); + static sal_Int32 fireDragExitEvent( vcl::Window *pWindow ) throw(css::uno::RuntimeException); - static sal_Int32 fireDropActionChangedEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, - const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException); + static sal_Int32 fireDropActionChangedEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext >& xContext, + const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(css::uno::RuntimeException); - static sal_Int32 fireDropEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext, + static sal_Int32 fireDropEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDropTargetDropContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction, - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable ) throw(::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable ) throw(css::uno::RuntimeException); - static sal_Int32 fireDragGestureEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource, - const ::com::sun::star::uno::Any& event, const Point& rOrigin, const sal_Int8 nDragAction )throw(::com::sun::star::uno::RuntimeException); + static sal_Int32 fireDragGestureEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDragSource >& xSource, + const css::uno::Any& event, const Point& rOrigin, const sal_Int8 nDragAction )throw(css::uno::RuntimeException); public: @@ -74,30 +74,30 @@ public: * XDropTargetDragContext */ - virtual void SAL_CALL acceptDrag( sal_Int8 dropAction ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rejectDrag() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acceptDrag( sal_Int8 dropAction ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rejectDrag() throw(css::uno::RuntimeException, std::exception) override; /* * XDropTargetListener */ - virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override; /* * XDragGestureListener */ - virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) throw(css::uno::RuntimeException, std::exception) override; /* * XEventListener */ - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& eo ) throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx index 5d4cc963a26b..be009cef7fa4 100644 --- a/vcl/inc/dndlcon.hxx +++ b/vcl/inc/dndlcon.hxx @@ -31,16 +31,16 @@ class DNDListenerContainer : public vcl::unohelper::MutexHelper, public ::cppu::WeakComponentImplHelper< - ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer, \ - ::com::sun::star::datatransfer::dnd::XDropTargetDragContext, - ::com::sun::star::datatransfer::dnd::XDropTargetDropContext, - ::com::sun::star::datatransfer::dnd::XDropTarget > + css::datatransfer::dnd::XDragGestureRecognizer, + css::datatransfer::dnd::XDropTargetDragContext, + css::datatransfer::dnd::XDropTargetDropContext, + css::datatransfer::dnd::XDropTarget > { bool m_bActive; sal_Int8 m_nDefaultActions; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext > m_xDropTargetDragContext; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext > m_xDropTargetDropContext; + css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext > m_xDropTargetDragContext; + css::uno::Reference< css::datatransfer::dnd::XDropTargetDropContext > m_xDropTargetDropContext; public: @@ -48,63 +48,63 @@ public: virtual ~DNDListenerContainer(); sal_uInt32 fireDropEvent( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& context, + const css::uno::Reference< css::datatransfer::dnd::XDropTargetDropContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions, - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable ); + const css::uno::Reference< css::datatransfer::XTransferable >& transferable ); sal_uInt32 fireDragExitEvent(); sal_uInt32 fireDragOverEvent( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& context, + const css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions ); sal_uInt32 fireDragEnterEvent( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& context, + const css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions, - const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& dataFlavor ); + const css::uno::Sequence< css::datatransfer::DataFlavor >& dataFlavor ); sal_uInt32 fireDropActionChangedEvent( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& context, + const css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions ); sal_uInt32 fireDragGestureEvent( sal_Int8 dragAction, sal_Int32 dragOriginX, sal_Int32 dragOriginY, - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& dragSource, - const ::com::sun::star::uno::Any& triggerEvent ); + const css::uno::Reference< css::datatransfer::dnd::XDragSource >& dragSource, + const css::uno::Any& triggerEvent ); /* * XDragGestureRecognizer */ - virtual void SAL_CALL addDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL resetRecognizer( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addDragGestureListener( const css::uno::Reference< css::datatransfer::dnd::XDragGestureListener >& dgl ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeDragGestureListener( const css::uno::Reference< css::datatransfer::dnd::XDragGestureListener >& dgl ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL resetRecognizer( ) throw(css::uno::RuntimeException, std::exception) override; /* * XDropTargetDragContext */ - virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rejectDrag( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rejectDrag( ) throw (css::uno::RuntimeException, std::exception) override; /* * XDropTargetDropContext */ - virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rejectDrop( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropComplete( sal_Bool success ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rejectDrop( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropComplete( sal_Bool success ) throw (css::uno::RuntimeException, std::exception) override; /* * XDropTarget */ - virtual void SAL_CALL addDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isActive( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActive( sal_Bool active ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getDefaultActions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isActive( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActive( sal_Bool active ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL getDefaultActions( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx index e286807f6d52..83f3cc662a4a 100644 --- a/vcl/inc/fontmanager.hxx +++ b/vcl/inc/fontmanager.hxx @@ -497,7 +497,7 @@ public: true if a match was found false else */ - bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale ); + bool matchFont( FastPrintFontInfo& rInfo, const css::lang::Locale& rLocale ); static FontConfigFontOptions* getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*)); bool Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes ); diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index a780f88a0c14..801ef4a25b55 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -304,7 +304,7 @@ public: private: ServerFont& mrServerFont; - com::sun::star::uno::Reference mxBreak; + css::uno::Reference mxBreak; ServerFontLayout( const ServerFontLayout& ) = delete; ServerFontLayout& operator=( const ServerFontLayout& ) = delete; diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index 006ef49a2057..4fd4dd258d7f 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -48,7 +48,7 @@ public: SalGraphics* pGraphics ) override; virtual bool Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) override; - virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rBitmapCanvas, + virtual bool Create( const css::uno::Reference< css::rendering::XBitmapCanvas >& rBitmapCanvas, Size& rSize, bool bMask = false ) override; virtual void Destroy() override; diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index b4bcd1e21f3a..2811764117c9 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -152,7 +152,7 @@ public: double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, - com::sun::star::drawing::LineCap) override; + css::drawing::LineCap) override; virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override; virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override; virtual void drawPolyPolygon( sal_uInt32 nPoly, diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index c708fd04d616..24eced3169e4 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -384,7 +384,7 @@ private: bool mbEdgeBlending : 1; Link maScrollHdl; // because it is needed by ImplListBoxWindow itself - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer; + css::uno::Reference< css::uno::XInterface > mxDNDListenerContainer; protected: virtual void GetFocus() override; @@ -485,7 +485,7 @@ public: /// pb: #106948# explicit mirroring for calc inline void EnableMirroring() { maLBWindow->EnableMirroring(); } - inline void SetDropTraget(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; } + inline void SetDropTraget(const css::uno::Reference< css::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; } }; class ImplListBoxFloatingWindow : public FloatingWindow diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index 7172ca627b73..dcf2f177f82c 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -68,7 +68,7 @@ public: bool Create( const SalBitmap& rSalBmp ) override; bool Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) override; bool Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) override; - virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rBitmapCanvas, + virtual bool Create( const css::uno::Reference< css::rendering::XBitmapCanvas >& rBitmapCanvas, Size& rSize, bool bMask = false ) override; diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index 917cf01d82ed..667b2ec095f0 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -221,7 +221,7 @@ public: double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, - com::sun::star::drawing::LineCap) override; + css::drawing::LineCap) override; virtual bool drawPolyLineBezier( sal_uInt32 nPoints, diff --git a/vcl/inc/osx/a11yfactory.h b/vcl/inc/osx/a11yfactory.h index c739f3ef6b48..b20755a0313a 100644 --- a/vcl/inc/osx/a11yfactory.h +++ b/vcl/inc/osx/a11yfactory.h @@ -27,12 +27,12 @@ @interface AquaA11yFactory : NSObject { } -+(void)insertIntoWrapperRepository: (NSView *) viewElement forAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext; -+(AquaA11yWrapper *)wrapperForAccessible: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible >) rxAccessible; -+(AquaA11yWrapper *)wrapperForAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext; -+(AquaA11yWrapper *)wrapperForAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate; -+(AquaA11yWrapper *)wrapperForAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate asRadioGroup:(BOOL) asRadioGroup; -+(void)removeFromWrapperRepositoryFor: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext; ++(void)insertIntoWrapperRepository: (NSView *) viewElement forAccessibleContext: (css::uno::Reference < css::accessibility::XAccessibleContext >) rxAccessibleContext; ++(AquaA11yWrapper *)wrapperForAccessible: (css::uno::Reference < css::accessibility::XAccessible >) rxAccessible; ++(AquaA11yWrapper *)wrapperForAccessibleContext: (css::uno::Reference < css::accessibility::XAccessibleContext >) rxAccessibleContext; ++(AquaA11yWrapper *)wrapperForAccessibleContext: (css::uno::Reference < css::accessibility::XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate; ++(AquaA11yWrapper *)wrapperForAccessibleContext: (css::uno::Reference < css::accessibility::XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate asRadioGroup:(BOOL) asRadioGroup; ++(void)removeFromWrapperRepositoryFor: (css::uno::Reference < css::accessibility::XAccessibleContext >) rxAccessibleContext; +(void)registerView: (NSView *) theView; +(void)revokeView: (NSView *) theViewt; @end diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx index 0188cacc515f..948ce1b793c9 100644 --- a/vcl/inc/osx/a11yfocustracker.hxx +++ b/vcl/inc/osx/a11yfocustracker.hxx @@ -42,10 +42,10 @@ class AquaA11yFocusTracker : public rtl::Static< AquaA11yFocusTracker, AquaA11yF public: AquaA11yFocusTracker(); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getFocusedObject() { return m_xFocusedObject; }; + css::uno::Reference< css::accessibility::XAccessible > getFocusedObject() { return m_xFocusedObject; }; // sets the currently focus object and notifies the FocusEventListener (if any) - void setFocusedObject(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible); + void setFocusedObject(const css::uno::Reference< css::accessibility::XAccessible >& xAccessible); // may evolve to add/remove later void setFocusListener(const rtl::Reference< KeyboardFocusListener >& aFocusListener) { m_aFocusListener = aFocusListener; }; @@ -78,7 +78,7 @@ protected: private: // the accessible object that has the keyboard focus (if any) - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xFocusedObject; + css::uno::Reference< css::accessibility::XAccessible > m_xFocusedObject; // the listener for focus events rtl::Reference< KeyboardFocusListener > m_aFocusListener; @@ -90,7 +90,7 @@ private: Link m_aWindowEventLink; // the UNO XAccessibilityEventListener for Documents and other non VCL objects - const ::com::sun::star::uno::Reference< DocumentFocusListener > m_xDocumentFocusListener; + const css::uno::Reference< DocumentFocusListener > m_xDocumentFocusListener; }; #endif // INCLUDED_VCL_INC_OSX_A11YFOCUSTRACKER_HXX diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx index 647333cf561e..da7f0926c26e 100644 --- a/vcl/inc/osx/a11ylistener.hxx +++ b/vcl/inc/osx/a11ylistener.hxx @@ -31,7 +31,7 @@ // - AquaA11yEventListener - class AquaA11yEventListener : - public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessibleEventListener > + public ::cppu::WeakImplHelper< css::accessibility::XAccessibleEventListener > { public: @@ -39,17 +39,17 @@ public: virtual ~AquaA11yEventListener(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) + throw( css::uno::RuntimeException, std::exception ) override; private: const id m_wrapperObject; const sal_Int16 m_role; - ::com::sun::star::awt::Rectangle m_oldBounds; + css::awt::Rectangle m_oldBounds; }; #endif // INCLUDED_VCL_INC_OSX_A11YLISTENER_HXX diff --git a/vcl/inc/osx/a11ywrapper.h b/vcl/inc/osx/a11ywrapper.h index a49230b7cb0e..e33d247a1f39 100644 --- a/vcl/inc/osx/a11ywrapper.h +++ b/vcl/inc/osx/a11ywrapper.h @@ -37,18 +37,18 @@ // rAccessibleXYZ as a field in an Objective-C-Class would not call Con-/Destructor, so use a struct instead struct ReferenceWrapper { - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleAction > rAccessibleAction; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext > rAccessibleContext; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleComponent > rAccessibleComponent; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleExtendedComponent > rAccessibleExtendedComponent; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleSelection > rAccessibleSelection; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleTable > rAccessibleTable; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleText > rAccessibleText; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleEditableText > rAccessibleEditableText; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleValue > rAccessibleValue; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleTextAttributes > rAccessibleTextAttributes; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleMultiLineText > rAccessibleMultiLineText; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleTextMarkup > rAccessibleTextMarkup; + css::uno::Reference < css::accessibility::XAccessibleAction > rAccessibleAction; + css::uno::Reference < css::accessibility::XAccessibleContext > rAccessibleContext; + css::uno::Reference < css::accessibility::XAccessibleComponent > rAccessibleComponent; + css::uno::Reference < css::accessibility::XAccessibleExtendedComponent > rAccessibleExtendedComponent; + css::uno::Reference < css::accessibility::XAccessibleSelection > rAccessibleSelection; + css::uno::Reference < css::accessibility::XAccessibleTable > rAccessibleTable; + css::uno::Reference < css::accessibility::XAccessibleText > rAccessibleText; + css::uno::Reference < css::accessibility::XAccessibleEditableText > rAccessibleEditableText; + css::uno::Reference < css::accessibility::XAccessibleValue > rAccessibleValue; + css::uno::Reference < css::accessibility::XAccessibleTextAttributes > rAccessibleTextAttributes; + css::uno::Reference < css::accessibility::XAccessibleMultiLineText > rAccessibleMultiLineText; + css::uno::Reference < css::accessibility::XAccessibleTextMarkup > rAccessibleTextMarkup; }; @interface AquaA11yWrapper : NSView @@ -87,22 +87,22 @@ struct ReferenceWrapper -(void)setActsAsRadioGroup:(BOOL)actsAsRadioGroup; -(BOOL)actsAsRadioGroup; -(NSWindow*)windowForParent; --(id)initWithAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) anAccessibleContext; --(void) setDefaults: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext; +-(id)initWithAccessibleContext: (css::uno::Reference < css::accessibility::XAccessibleContext >) anAccessibleContext; +-(void) setDefaults: (css::uno::Reference < css::accessibility::XAccessibleContext >) rxAccessibleContext; -(void) dealloc; +(void)setPopupMenuOpen:(BOOL)popupMenuOpen; --(::com::sun::star::accessibility::XAccessibleAction *)accessibleAction; --(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext; --(::com::sun::star::accessibility::XAccessibleComponent *)accessibleComponent; --(::com::sun::star::accessibility::XAccessibleExtendedComponent *)accessibleExtendedComponent; --(::com::sun::star::accessibility::XAccessibleSelection *)accessibleSelection; --(::com::sun::star::accessibility::XAccessibleTable *)accessibleTable; --(::com::sun::star::accessibility::XAccessibleText *)accessibleText; --(::com::sun::star::accessibility::XAccessibleEditableText *)accessibleEditableText; --(::com::sun::star::accessibility::XAccessibleValue *)accessibleValue; --(::com::sun::star::accessibility::XAccessibleTextAttributes *)accessibleTextAttributes; --(::com::sun::star::accessibility::XAccessibleMultiLineText *)accessibleMultiLineText; --(::com::sun::star::accessibility::XAccessibleTextMarkup *)accessibleTextMarkup; +-(css::accessibility::XAccessibleAction *)accessibleAction; +-(css::accessibility::XAccessibleContext *)accessibleContext; +-(css::accessibility::XAccessibleComponent *)accessibleComponent; +-(css::accessibility::XAccessibleExtendedComponent *)accessibleExtendedComponent; +-(css::accessibility::XAccessibleSelection *)accessibleSelection; +-(css::accessibility::XAccessibleTable *)accessibleTable; +-(css::accessibility::XAccessibleText *)accessibleText; +-(css::accessibility::XAccessibleEditableText *)accessibleEditableText; +-(css::accessibility::XAccessibleValue *)accessibleValue; +-(css::accessibility::XAccessibleTextAttributes *)accessibleTextAttributes; +-(css::accessibility::XAccessibleMultiLineText *)accessibleMultiLineText; +-(css::accessibility::XAccessibleTextMarkup *)accessibleTextMarkup; @end #endif // INCLUDED_VCL_INC_OSX_A11YWRAPPER_H diff --git a/vcl/inc/osx/keyboardfocuslistener.hxx b/vcl/inc/osx/keyboardfocuslistener.hxx index e9b652a8ec14..8512231133b9 100644 --- a/vcl/inc/osx/keyboardfocuslistener.hxx +++ b/vcl/inc/osx/keyboardfocuslistener.hxx @@ -30,7 +30,7 @@ class KeyboardFocusListener : public salhelper::SimpleReferenceObject { public: - virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) = 0; + virtual void SAL_CALL focusedObjectChanged(const css::uno::Reference< css::accessibility::XAccessible >& xAccessible) = 0; }; #endif // INCLUDED_VCL_INC_OSX_KEYBOARDFOCUSLISTENER_HXX diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx index fc8d3e82779a..b32d67b737c7 100644 --- a/vcl/inc/osx/saldata.hxx +++ b/vcl/inc/osx/saldata.hxx @@ -98,8 +98,7 @@ public: long mnDPIX; // #i100617# read DPI only once per office life long mnDPIY; // #i100617# read DPI only once per office life - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > - mxClipboard; + css::uno::Reference< css::uno::XInterface > mxClipboard; SalData(); ~SalData(); diff --git a/vcl/inc/osx/salframeview.h b/vcl/inc/osx/salframeview.h index 93f8b8f42634..bb922b825a06 100644 --- a/vcl/inc/osx/salframeview.h +++ b/vcl/inc/osx/salframeview.h @@ -44,7 +44,7 @@ -(void)dockMenuItemTriggered: (id)sender; -(AquaSalFrame*)getSalFrame; -(BOOL)containsMouse; --(::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >)accessibleContext; +-(css::uno::Reference < css::accessibility::XAccessibleContext >)accessibleContext; /* NSDraggingDestination protocol methods */ @@ -172,7 +172,7 @@ -(void)noop: (id)aSender; /* set the correct pointer for our view */ -(void)resetCursorRects; --(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext; +-(css::accessibility::XAccessibleContext *)accessibleContext; -(id)parentAttribute; -(NSWindow*)windowForParent; /* diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 72e6c6a01315..da25c825baf6 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -234,7 +234,7 @@ namespace vcl void setupOptionalUI(); void readFromSettings(); void storeToSettings(); - com::sun::star::beans::PropertyValue* getValueForWindow( vcl::Window* ) const; + css::beans::PropertyValue* getValueForWindow( vcl::Window* ) const; virtual void Resize() override; virtual void Command( const CommandEvent& ) override; diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h index 274190d66e68..938f6583ebc1 100644 --- a/vcl/inc/quartz/salbmp.h +++ b/vcl/inc/quartz/salbmp.h @@ -61,7 +61,7 @@ public: bool Create( const SalBitmap& rSalBmp ) override; bool Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) override; bool Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) override; - virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rBitmapCanvas, + virtual bool Create( const css::uno::Reference< css::rendering::XBitmapCanvas >& rBitmapCanvas, Size& rSize, bool bMask = false ) override; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index af65ce28c64e..34476dfe1e4d 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -247,7 +247,7 @@ public: double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, - com::sun::star::drawing::LineCap eLineCap) override; + css::drawing::LineCap eLineCap) override; virtual bool drawGradient( const tools::PolyPolygon&, const Gradient& ) override { return false; }; // CopyArea --> No RasterOp, but ClipRegion diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx index bf525141d0d0..49d26573bceb 100644 --- a/vcl/inc/salbmp.hxx +++ b/vcl/inc/salbmp.hxx @@ -57,7 +57,7 @@ public: SalGraphics* pGraphics ) = 0; virtual bool Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) = 0; - virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rBitmapCanvas, + virtual bool Create( const css::uno::Reference< css::rendering::XBitmapCanvas >& rBitmapCanvas, Size& rSize, bool bMask = false ) = 0; virtual void Destroy() = 0; diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index edf8875f4ba8..98c3b8fa5c74 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -280,7 +280,7 @@ public: double i_fTransparency, const basegfx::B2DVector& i_rLineWidth, basegfx::B2DLineJoin i_eLineJoin, - com::sun::star::drawing::LineCap i_eLineCap, + css::drawing::LineCap i_eLineCap, const OutputDevice* i_pOutDev); bool DrawPolyLineBezier( @@ -481,7 +481,7 @@ protected: double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, - com::sun::star::drawing::LineCap) = 0; + css::drawing::LineCap) = 0; virtual bool drawPolyLineBezier( sal_uInt32 nPoints, diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx index 406f0ce15ba1..3324012dac29 100644 --- a/vcl/inc/salgdiimpl.hxx +++ b/vcl/inc/salgdiimpl.hxx @@ -105,7 +105,7 @@ public: double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, - com::sun::star::drawing::LineCap) = 0; + css::drawing::LineCap) = 0; virtual bool drawPolyLineBezier( sal_uInt32 nPoints, diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index fb0c28598683..dc5c37a22665 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -348,7 +348,7 @@ struct ImplSVData oslThreadIdentifier mnMainThreadId; rtl::Reference< vcl::DisplayConnection > mxDisplayConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxAccessBridge; + css::uno::Reference< css::lang::XComponent > mxAccessBridge; vcl::SettingsConfigItem* mpSettingsConfigItem; std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList; std::unordered_map< int, OUString >* mpPaperNames; diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 60bf1f9b3d33..ca469a2f83ba 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -87,12 +87,10 @@ public: virtual bool hasNativeFileSelection() const override { return true; } - virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 > - createFilePicker( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 > - createFolderPicker( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& ) override; + virtual css::uno::Reference< css::ui::dialogs::XFilePicker2 > + createFilePicker( const css::uno::Reference< css::uno::XComponentContext >& ) override; + virtual css::uno::Reference< css::ui::dialogs::XFolderPicker2 > + createFolderPicker( const css::uno::Reference< css::uno::XComponentContext >& ) override; #if GTK_CHECK_VERSION(3,0,0) virtual css::uno::Reference< css::uno::XInterface > CreateClipboard( const css::uno::Sequence< css::uno::Any >& i_rArguments ) override; diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx index 9bdada352466..43aa46389e7b 100644 --- a/vcl/inc/unx/kde/kdedata.hxx +++ b/vcl/inc/unx/kde/kdedata.hxx @@ -79,9 +79,8 @@ public: virtual bool hasNativeFileSelection() const override { return true; } - virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 > - createFilePicker( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& ) override; + virtual css::uno::Reference< css::ui::dialogs::XFilePicker2 > + createFilePicker( const css::uno::Reference< css::uno::XComponentContext >& ) override; }; class KDEXLib : public SalXLib diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index c04d5ee58e2b..f68af82cda42 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -130,9 +130,7 @@ public: ) override; virtual bool Create( - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmapCanvas - >& rBitmapCanvas, + const css::uno::Reference< css::rendering::XBitmapCanvas >& rBitmapCanvas, Size& rSize, bool bMask = false ) override; diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 422b5b2b19c1..04da6ed1c3c3 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -173,7 +173,7 @@ public: double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin, - com::sun::star::drawing::LineCap ) override; + css::drawing::LineCap ) override; virtual bool drawGradient( const tools::PolyPolygon&, const Gradient& ) override; diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index 083200c14e3b..e736faa4106e 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -39,7 +39,7 @@ class X11SalGraphics; class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalGenericInstance { private: - std::unordered_map< Atom, com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboard > > m_aInstances; + std::unordered_map< Atom, css::uno::Reference< css::datatransfer::clipboard::XClipboard > > m_aInstances; protected: SalXLib *mpXLib; @@ -78,10 +78,10 @@ public: void SetLib( SalXLib *pXLib ) { mpXLib = pXLib; } // dtrans implementation - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > - CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments ) override; - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource() override; - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget() override; + virtual css::uno::Reference< css::uno::XInterface > + CreateClipboard( const css::uno::Sequence< css::uno::Any >& i_rArguments ) override; + virtual css::uno::Reference< css::uno::XInterface > CreateDragSource() override; + virtual css::uno::Reference< css::uno::XInterface > CreateDropTarget() override; virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override; }; diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h index 1fad90491fdf..b38d604a35f6 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -84,7 +84,7 @@ public: virtual bool Create( const SalBitmap& rSalBmpImpl ) override; virtual bool Create( const SalBitmap& rSalBmpImpl, SalGraphics* pGraphics ) override; virtual bool Create( const SalBitmap& rSalBmpImpl, sal_uInt16 nNewBitCount ) override; - virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rBitmapCanvas, + virtual bool Create( const css::uno::Reference< css::rendering::XBitmapCanvas >& rBitmapCanvas, Size& rSize, bool bMask = false ) override; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index b7697d6843f4..4ff01fa6ed43 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -271,7 +271,7 @@ protected: double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin, - com::sun::star::drawing::LineCap) override; + css::drawing::LineCap) override; virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) override; virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) override; virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) override; diff --git a/vcl/inc/window.h b/vcl/inc/window.h index eb79d392edc8..5d792dea7890 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -173,11 +173,11 @@ struct ImplFrameData bool mbInSysObjToTopHdl; //< within a SysChildren's ToTop handler bool mbSysObjFocus; //< does a SysChild have focus - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > mxDragSource; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > mxDropTarget; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener > mxDropTargetListener; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxClipboard; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxSelection; + css::uno::Reference< css::datatransfer::dnd::XDragSource > mxDragSource; + css::uno::Reference< css::datatransfer::dnd::XDropTarget > mxDropTarget; + css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > mxDropTargetListener; + css::uno::Reference< css::datatransfer::clipboard::XClipboard > mxClipboard; + css::uno::Reference< css::datatransfer::clipboard::XClipboard > mxSelection; bool mbInternalDragGestureRecognizer; VclPtr mpBuffer; ///< Buffer for the double-buffering @@ -233,7 +233,7 @@ public: std::vector> maChildEventListeners; // The canvas interface for this VCL window. Is persistent after the first GetCanvas() call - ::com::sun::star::uno::WeakReference< ::com::sun::star::rendering::XCanvas > mxCanvas; + css::uno::WeakReference< css::rendering::XCanvas > mxCanvas; ImplDelData* mpFirstDel; void* mpUserData; @@ -261,8 +261,8 @@ public: OUString maHelpText; OUString maQuickHelpText; InputContext maInputContext; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > mxWindowPeer; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible; + css::uno::Reference< css::awt::XWindowPeer > mxWindowPeer; + css::uno::Reference< css::accessibility::XAccessible > mxAccessible; std::shared_ptr< VclSizeGroup > m_xSizeGroup; std::vector< VclPtr > m_aMnemonicLabels; ImplAccessibleInfos* mpAccessibleInfos; @@ -381,7 +381,7 @@ public: vcl::RenderSettings maRenderSettings; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer; + css::uno::Reference< css::uno::XInterface > mxDNDListenerContainer; }; /// Sets up the buffer to have settings matching the window, and restores the original state in the dtor. diff --git a/vcl/inc/xconnection.hxx b/vcl/inc/xconnection.hxx index 5969237d51d1..e771081d9772 100644 --- a/vcl/inc/xconnection.hxx +++ b/vcl/inc/xconnection.hxx @@ -34,11 +34,11 @@ namespace vcl { public DisplayConnectionDispatch { ::osl::Mutex m_aMutex; - ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler > > + ::std::list< css::uno::Reference< css::awt::XEventHandler > > m_aHandlers; - ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler > > + ::std::list< css::uno::Reference< css::awt::XEventHandler > > m_aErrorHandlers; - ::com::sun::star::uno::Any m_aAny; + css::uno::Any m_aAny; public: DisplayConnection(); virtual ~DisplayConnection(); @@ -49,11 +49,11 @@ namespace vcl { virtual bool dispatchEvent( void* pData, int nBytes ) override; // XDisplayConnection - virtual void SAL_CALL addEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw(std::exception) override; - virtual void SAL_CALL removeEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception) override; - virtual void SAL_CALL addErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception) override; - virtual void SAL_CALL removeErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getIdentifier() throw(std::exception) override; + virtual void SAL_CALL addEventHandler( const css::uno::Any& window, const css::uno::Reference< css::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw(std::exception) override; + virtual void SAL_CALL removeEventHandler( const css::uno::Any& window, const css::uno::Reference< css::awt::XEventHandler >& handler ) throw(std::exception) override; + virtual void SAL_CALL addErrorHandler( const css::uno::Reference< css::awt::XEventHandler >& handler ) throw(std::exception) override; + virtual void SAL_CALL removeErrorHandler( const css::uno::Reference< css::awt::XEventHandler >& handler ) throw(std::exception) override; + virtual css::uno::Any SAL_CALL getIdentifier() throw(std::exception) override; }; diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index f954a01700c5..1c22640fecbe 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -1412,7 +1412,7 @@ bool OpenGLSalGraphicsImpl::drawPolyLine( double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin eLineJoin, - com::sun::star::drawing::LineCap eLineCap) + css::drawing::LineCap eLineCap) { VCL_GL_INFO( "vcl.opengl", "::drawPolyLine trans " << fTransparency ); if( mnLineColor == SALCOLOR_NONE ) diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx index 7cda1eea7eb0..56a545737199 100644 --- a/vcl/opengl/salbmp.cxx +++ b/vcl/opengl/salbmp.cxx @@ -175,7 +175,7 @@ bool OpenGLSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount return false; } -bool OpenGLSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& /*xBitmapCanvas*/, Size& /*rSize*/, bool /*bMask*/ ) +bool OpenGLSalBitmap::Create( const css::uno::Reference< css::rendering::XBitmapCanvas >& /*xBitmapCanvas*/, Size& /*rSize*/, bool /*bMask*/ ) { // TODO Is this method needed? return false; diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx index 081f6e5f53dc..09bc77d6fe73 100644 --- a/vcl/osx/DataFlavorMapping.cxx +++ b/vcl/osx/DataFlavorMapping.cxx @@ -640,7 +640,7 @@ bool DataFlavorMapper::isValidMimeContentType(const OUString& contentType) const return result; } -NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno::Sequence& flavors) const +NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const css::uno::Sequence& flavors) const { sal_uInt32 nFlavors = flavors.getLength(); NSMutableArray* array = [[NSMutableArray alloc] initWithCapacity: 1]; @@ -676,7 +676,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno: return [array autorelease]; } -com::sun::star::uno::Sequence DataFlavorMapper::typesArrayToFlavorSequence(NSArray* types) const +css::uno::Sequence DataFlavorMapper::typesArrayToFlavorSequence(NSArray* types) const { int nFormats = [types count]; Sequence flavors; diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx index 9632313c8a0b..10cde7ab5330 100644 --- a/vcl/osx/DataFlavorMapping.hxx +++ b/vcl/osx/DataFlavorMapping.hxx @@ -48,7 +48,7 @@ public: /* Get the clipboard data in OOo format. */ - virtual com::sun::star::uno::Any getOOoData() = 0; + virtual css::uno::Any getOOoData() = 0; }; typedef std::unique_ptr DataProviderPtr_t; @@ -67,13 +67,13 @@ public: mapping from a system data flavor to a OpenOffice data flavor. */ - com::sun::star::datatransfer::DataFlavor systemToOpenOfficeFlavor( const NSString* systemDataFlavor) const; + css::datatransfer::DataFlavor systemToOpenOfficeFlavor( const NSString* systemDataFlavor) const; /* Map an OpenOffice data flavor to a system data flavor. If there is no suitable mapping available NULL will be returned. */ - const NSString* openOfficeToSystemFlavor(const com::sun::star::datatransfer::DataFlavor& oooDataFlavor, bool& rbInternal) const; + const NSString* openOfficeToSystemFlavor(const css::datatransfer::DataFlavor& oooDataFlavor, bool& rbInternal) const; /* Select the best available image data type If there is no suitable mapping available NULL will @@ -85,7 +85,7 @@ public: be put on to the system clipboard. */ DataProviderPtr_t getDataProvider( const NSString* systemFlavor, - const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > rTransferable) const; + const css::uno::Reference< css::datatransfer::XTransferable > rTransferable) const; /* Get a data provider which is able to provide 'systemData' in the OOo expected format. */ @@ -99,13 +99,13 @@ public: Only those DataFlavors for which a suitable mapping to a system type exist will be contained in the returned types array. */ - NSArray* flavorSequenceToTypesArray(const com::sun::star::uno::Sequence& flavors) const; + NSArray* flavorSequenceToTypesArray(const css::uno::Sequence& flavors) const; /* Translate a NSArray of system types into a sequence of DataFlavors. Only those types for which a suitable mapping to a DataFlavor exist will be contained in the new DataFlavor Sequence. */ - com::sun::star::uno::Sequence typesArrayToFlavorSequence(NSArray* types) const; + css::uno::Sequence typesArrayToFlavorSequence(NSArray* types) const; /* Returns an NSArray containing all pasteboard types supported by OOo */ @@ -117,7 +117,7 @@ private: bool isValidMimeContentType(const OUString& contentType) const; private: - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory; + css::uno::Reference< css::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory; typedef std::unordered_map< OUString, NSString*, OUStringHash > OfficeOnlyTypes; mutable OfficeOnlyTypes maOfficeOnlyTypes; }; diff --git a/vcl/osx/DragActionConversion.cxx b/vcl/osx/DragActionConversion.cxx index e0c80a09313e..3af6cd010a3f 100644 --- a/vcl/osx/DragActionConversion.cxx +++ b/vcl/osx/DragActionConversion.cxx @@ -23,7 +23,7 @@ using namespace com::sun::star::datatransfer::dnd; /* Convert office drag actions as defined in - com::sun::star::datatransfer::dnd::DNDConstants + css::datatransfer::dnd::DNDConstants into system conform drag actions. */ unsigned int OfficeToSystemDragActions(sal_Int8 dragActions) @@ -50,7 +50,7 @@ unsigned int OfficeToSystemDragActions(sal_Int8 dragActions) /* Convert system conform drag actions into office conform drag actions as defined in - com::sun::star::datatransfer::dnd::DNDConstants. + css::datatransfer::dnd::DNDConstants. */ sal_Int8 SystemToOfficeDragActions(unsigned int dragActions) { diff --git a/vcl/osx/DragActionConversion.hxx b/vcl/osx/DragActionConversion.hxx index fbb5ea362b44..47e6ebed5041 100644 --- a/vcl/osx/DragActionConversion.hxx +++ b/vcl/osx/DragActionConversion.hxx @@ -27,14 +27,14 @@ #include /* Convert office drag actions as defined in - com::sun::star::datatransfer::dnd::DNDConstants + css::datatransfer::dnd::DNDConstants into system conform drag actions. */ unsigned int OfficeToSystemDragActions(sal_Int8 dragActions); /* Convert system conform drag actions into office conform drag actions as defined in - com::sun::star::datatransfer::dnd::DNDConstants. + css::datatransfer::dnd::DNDConstants. */ sal_Int8 SystemToOfficeDragActions(unsigned int dragActions); diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx index 59fbc2575036..e96a3deb0ffc 100644 --- a/vcl/osx/DragSource.hxx +++ b/vcl/osx/DragSource.hxx @@ -70,9 +70,9 @@ class AquaSalFrame; @end class DragSource : public ::cppu::BaseMutex, - public ::cppu::WeakComponentImplHelper< com::sun::star::datatransfer::dnd::XDragSource, - com::sun::star::lang::XInitialization, - com::sun::star::lang::XServiceInfo >, + public ::cppu::WeakComponentImplHelper< css::datatransfer::dnd::XDragSource, + css::lang::XInitialization, + css::lang::XServiceInfo >, private ::boost::noncopyable { public: @@ -80,47 +80,47 @@ public: virtual ~DragSource(); // XInitialization - virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw(com::sun::star::uno::Exception, std::exception/*, com::sun::star::uno::RuntimeException*/) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw(css::uno::Exception, std::exception/*, css::uno::RuntimeException*/) override; // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported( ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDragImageSupported( ) throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getDefaultCursor(sal_Int8 dragAction) - throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startDrag( const com::sun::star::datatransfer::dnd::DragGestureEvent& trigger, + virtual void SAL_CALL startDrag( const css::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, - const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& transferable, - const com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDragSourceListener >& listener ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::datatransfer::XTransferable >& transferable, + const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener ) + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; void saveMouseEvent(NSEvent* theEvent); unsigned int getSupportedDragOperations(bool isLocal) const; public: // The context notifies the XDragSourceListeners - com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDragSourceContext > mXCurrentContext; + css::uno::Reference< css::datatransfer::dnd::XDragSourceContext > mXCurrentContext; id mView; AquaSalFrame* mpFrame; NSEvent* mLastMouseEventBeforeStartDrag; DragSourceHelper* mDragSourceHelper; - com::sun::star::awt::MouseEvent mMouseEvent; - com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > mXTransferable; - com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDragSourceListener > mXDragSrcListener; + css::awt::MouseEvent mMouseEvent; + css::uno::Reference< css::datatransfer::XTransferable > mXTransferable; + css::uno::Reference< css::datatransfer::dnd::XDragSourceListener > mXDragSrcListener; // The mouse button that set off the drag and drop operation short m_MouseButton; sal_Int8 mDragSourceActions; - static com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > g_XTransferable; + static css::uno::Reference< css::datatransfer::XTransferable > g_XTransferable; static NSView* g_DragSourceView; static bool g_DropSuccessSet; static bool g_DropSuccess; diff --git a/vcl/osx/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx index 28b4a3ccf89f..da5a3a8bac87 100644 --- a/vcl/osx/DragSourceContext.hxx +++ b/vcl/osx/DragSourceContext.hxx @@ -33,7 +33,7 @@ // An instance of SourceContext only lives as long as the drag and drop // operation lasts. class DragSourceContext: public cppu::BaseMutex, - public cppu::WeakComponentImplHelper, + public cppu::WeakComponentImplHelper, private ::boost::noncopyable { public: @@ -41,16 +41,16 @@ public: virtual ~DragSourceContext(); virtual sal_Int32 SAL_CALL getCurrentCursor( ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setCursor( sal_Int32 cursorId ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setImage( sal_Int32 imageId ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL transferablesFlavorsChanged( ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx index 9b5a3dcabbc1..a54d390167b4 100644 --- a/vcl/osx/DropTarget.hxx +++ b/vcl/osx/DropTarget.hxx @@ -73,11 +73,11 @@ class AquaSalFrame; @end class DropTarget: public cppu::BaseMutex, - public cppu::WeakComponentImplHelper< com::sun::star::lang::XInitialization, - com::sun::star::datatransfer::dnd::XDropTarget, - com::sun::star::datatransfer::dnd::XDropTargetDragContext, - com::sun::star::datatransfer::dnd::XDropTargetDropContext, - com::sun::star::lang::XServiceInfo >, + public cppu::WeakComponentImplHelper< css::lang::XInitialization, + css::datatransfer::dnd::XDropTarget, + css::datatransfer::dnd::XDropTargetDragContext, + css::datatransfer::dnd::XDropTargetDropContext, + css::lang::XServiceInfo >, private boost::noncopyable { public: @@ -90,35 +90,35 @@ public: virtual void SAL_CALL disposing() override; // XInitialization - virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw(com::sun::star::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw(css::uno::Exception, std::exception) override; // XDropTarget - virtual void SAL_CALL addDropTargetListener( const com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeDropTargetListener( const com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) + throw(css::uno::RuntimeException, std::exception) override; // Default is not active - virtual sal_Bool SAL_CALL isActive() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActive(sal_Bool isActive) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getDefaultActions() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultActions(sal_Int8 actions) throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isActive() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActive(sal_Bool isActive) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL getDefaultActions() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDefaultActions(sal_Int8 actions) throw(css::uno::RuntimeException, std::exception) override; // XDropTargetDragContext - virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rejectDrag() throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rejectDrag() throw(css::uno::RuntimeException, std::exception) override; // XDropTargetDragContext - virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rejectDrop() throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropComplete(sal_Bool success) throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rejectDrop() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropComplete(sal_Bool success) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; // NSDraggingDestination protocol functions NSDragOperation draggingEntered(id sender); @@ -136,16 +136,16 @@ public: sal_Int8 determineDropAction(sal_Int8 dropActions, id sender) const; private: - void fire_drop(const com::sun::star::datatransfer::dnd::DropTargetDropEvent& dte); - void fire_dragEnter(const com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee); - void fire_dragExit(const com::sun::star::datatransfer::dnd::DropTargetEvent& dte); - void fire_dragOver(const com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde); - void fire_dropActionChanged(const com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde); + void fire_drop(const css::datatransfer::dnd::DropTargetDropEvent& dte); + void fire_dragEnter(const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee); + void fire_dragExit(const css::datatransfer::dnd::DropTargetEvent& dte); + void fire_dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde); + void fire_dropActionChanged(const css::datatransfer::dnd::DropTargetDragEvent& dtde); private: - com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetDragContext > mXCurrentDragContext; - com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetDropContext > mXCurrentDropContext; - com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboard > mXCurrentDragClipboard; + css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext > mXCurrentDragContext; + css::uno::Reference< css::datatransfer::dnd::XDropTargetDropContext > mXCurrentDropContext; + css::uno::Reference< css::datatransfer::clipboard::XClipboard > mXCurrentDragClipboard; DataFlavorMapperPtr_t mDataFlavorMapper; id mView; AquaSalFrame* mpFrame; diff --git a/vcl/osx/HtmlFmtFlt.hxx b/vcl/osx/HtmlFmtFlt.hxx index 77a92493bad6..38ee4c4face8 100644 --- a/vcl/osx/HtmlFmtFlt.hxx +++ b/vcl/osx/HtmlFmtFlt.hxx @@ -24,17 +24,17 @@ /* Transform plain HTML into the format expected by MS Office. */ -com::sun::star::uno::Sequence TextHtmlToHTMLFormat(com::sun::star::uno::Sequence& aTextHtml); +css::uno::Sequence TextHtmlToHTMLFormat(css::uno::Sequence& aTextHtml); /* Transform the MS Office HTML format into plain HTML. */ -com::sun::star::uno::Sequence HTMLFormatToTextHtml(const com::sun::star::uno::Sequence& aHTMLFormat); +css::uno::Sequence HTMLFormatToTextHtml(const css::uno::Sequence& aHTMLFormat); /* Detects whether the given byte sequence contains the MS Office Html format. @returns True if the MS Office Html format will be detected False otherwise. */ -bool isHTMLFormat (const com::sun::star::uno::Sequence& aHtmlSequence); +bool isHTMLFormat (const css::uno::Sequence& aHtmlSequence); #endif // INCLUDED_VCL_OSX_HTMLFMTFLT_HXX diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx index bdf93457a0c8..b8c06fcf09f8 100644 --- a/vcl/osx/OSXTransferable.hxx +++ b/vcl/osx/OSXTransferable.hxx @@ -35,11 +35,11 @@ #include #include -class OSXTransferable : public ::cppu::WeakImplHelper, +class OSXTransferable : public ::cppu::WeakImplHelper, private ::boost::noncopyable { public: - explicit OSXTransferable(com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> rXMimeCntFactory, + explicit OSXTransferable(css::uno::Reference< css::datatransfer::XMimeContentTypeFactory> rXMimeCntFactory, DataFlavorMapperPtr_t pDataFlavorMapper, NSPasteboard* pasteboard); @@ -47,27 +47,27 @@ public: // XTransferable - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) + throw( css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) + throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) + throw( css::uno::RuntimeException, std::exception ) override; // Helper functions not part of the XTransferable interface void initClipboardItemList(); - //com::sun::star::uno::Any getClipboardItemData(ClipboardItemPtr_t clipboardItem); + //css::uno::Any getClipboardItemData(ClipboardItemPtr_t clipboardItem); - bool compareDataFlavors( const com::sun::star::datatransfer::DataFlavor& lhs, - const com::sun::star::datatransfer::DataFlavor& rhs ); + bool compareDataFlavors( const css::datatransfer::DataFlavor& lhs, + const css::datatransfer::DataFlavor& rhs ); private: - com::sun::star::uno::Sequence< com::sun::star::datatransfer::DataFlavor > mFlavorList; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory; + css::uno::Sequence< css::datatransfer::DataFlavor > mFlavorList; + css::uno::Reference< css::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory; DataFlavorMapperPtr_t mDataFlavorMapper; NSPasteboard* mPasteboard; }; diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx index dc04348754b4..af8740be8960 100644 --- a/vcl/osx/PictToBmpFlt.cxx +++ b/vcl/osx/PictToBmpFlt.cxx @@ -26,8 +26,8 @@ #include "PictToBmpFlt.hxx" -bool ImageToPNG( com::sun::star::uno::Sequence& rImgData, - com::sun::star::uno::Sequence& rPngData, +bool ImageToPNG( css::uno::Sequence& rImgData, + css::uno::Sequence& rPngData, NSBitmapImageFileType eInFormat) { (void) eInFormat; // Really not needed? Weird. @@ -50,8 +50,8 @@ bool ImageToPNG( com::sun::star::uno::Sequence& rImgData, return (nPngSize > 0); } -bool PNGToImage( com::sun::star::uno::Sequence& rPngData, - com::sun::star::uno::Sequence& rImgData, +bool PNGToImage( css::uno::Sequence& rPngData, + css::uno::Sequence& rImgData, NSBitmapImageFileType eOutFormat ) { diff --git a/vcl/osx/PictToBmpFlt.hxx b/vcl/osx/PictToBmpFlt.hxx index 59f1f2d3fa99..b90fa817516a 100644 --- a/vcl/osx/PictToBmpFlt.hxx +++ b/vcl/osx/PictToBmpFlt.hxx @@ -26,12 +26,12 @@ #include #include -bool ImageToPNG( com::sun::star::uno::Sequence& rImgData, - com::sun::star::uno::Sequence& rPngData, +bool ImageToPNG( css::uno::Sequence& rImgData, + css::uno::Sequence& rPngData, NSBitmapImageFileType eInFormat); -bool PNGToImage( com::sun::star::uno::Sequence& rPngData, - com::sun::star::uno::Sequence& rImgData, +bool PNGToImage( css::uno::Sequence& rPngData, + css::uno::Sequence& rImgData, NSBitmapImageFileType eOutFormat); #endif // INCLUDED_VCL_OSX_PICTTOBMPFLT_HXX diff --git a/vcl/osx/a11yfactory.mm b/vcl/osx/a11yfactory.mm index 30437a837936..79ddf64bf6cf 100644 --- a/vcl/osx/a11yfactory.mm +++ b/vcl/osx/a11yfactory.mm @@ -189,7 +189,7 @@ static bool enabled = false; [ dAllWrapper setObject: viewElement forKey: [ AquaA11yFactory keyForAccessibleContext: rxAccessibleContext ] ]; } -+(void)removeFromWrapperRepositoryFor: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext { ++(void)removeFromWrapperRepositoryFor: (css::uno::Reference < css::accessibility::XAccessibleContext >) rxAccessibleContext { // TODO: when RADIO_BUTTON search for associated RadioGroup-wrapper and delete that as well AquaA11yWrapper * theWrapper = [ AquaA11yFactory wrapperForAccessibleContext: rxAccessibleContext createIfNotExists: NO ]; if ( theWrapper != nil ) { diff --git a/vcl/osx/a11yfocuslistener.hxx b/vcl/osx/a11yfocuslistener.hxx index dbc9e4739daa..0b4a012a92bc 100644 --- a/vcl/osx/a11yfocuslistener.hxx +++ b/vcl/osx/a11yfocuslistener.hxx @@ -38,7 +38,7 @@ public: id getFocusedUIElement(); // KeyboardFocusListener - virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) override; + virtual void SAL_CALL focusedObjectChanged(const css::uno::Reference< css::accessibility::XAccessible >& xAccessible) override; }; #endif // INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX diff --git a/vcl/osx/a11yrolehelper.h b/vcl/osx/a11yrolehelper.h index afa8af4bf3a7..7a4df6dbe967 100644 --- a/vcl/osx/a11yrolehelper.h +++ b/vcl/osx/a11yrolehelper.h @@ -25,7 +25,7 @@ @interface AquaA11yRoleHelper : NSObject { } -+(id)getNativeRoleFrom: (::com::sun::star::accessibility::XAccessibleContext *) accessibleContext; ++(id)getNativeRoleFrom: (css::accessibility::XAccessibleContext *) accessibleContext; +(id)getNativeSubroleFrom: (sal_Int16) nRole; +(id)getRoleDescriptionFrom: (NSString *) role with: (NSString *) subRole; @end diff --git a/vcl/osx/a11ytextattributeswrapper.mm b/vcl/osx/a11ytextattributeswrapper.mm index 3ac368ea17c8..546c3122bc0b 100644 --- a/vcl/osx/a11ytextattributeswrapper.mm +++ b/vcl/osx/a11ytextattributeswrapper.mm @@ -273,10 +273,10 @@ using namespace ::com::sun::star::uno; property.Value >>= alignment; NSNumber *textAlignment = nil; switch(alignment) { - case ::com::sun::star::style::ParagraphAdjust_RIGHT : textAlignment = [NSNumber numberWithInteger:NSRightTextAlignment] ; break; - case ::com::sun::star::style::ParagraphAdjust_CENTER: textAlignment = [NSNumber numberWithInteger:NSCenterTextAlignment] ; break; - case ::com::sun::star::style::ParagraphAdjust_BLOCK : textAlignment = [NSNumber numberWithInteger:NSJustifiedTextAlignment]; break; - case ::com::sun::star::style::ParagraphAdjust_LEFT : + case css::style::ParagraphAdjust_RIGHT : textAlignment = [NSNumber numberWithInteger:NSRightTextAlignment] ; break; + case css::style::ParagraphAdjust_CENTER: textAlignment = [NSNumber numberWithInteger:NSCenterTextAlignment] ; break; + case css::style::ParagraphAdjust_BLOCK : textAlignment = [NSNumber numberWithInteger:NSJustifiedTextAlignment]; break; + case css::style::ParagraphAdjust_LEFT : default : textAlignment = [NSNumber numberWithInteger:NSLeftTextAlignment] ; break; } NSDictionary *paragraphStyle = [NSDictionary dictionaryWithObjectsAndKeys:textAlignment, @"AXTextAlignment", textAlignment, @"AXVisualTextAlignment", nil]; @@ -303,7 +303,7 @@ using namespace ::com::sun::star::uno; if (markupRange.length > 0) { markupRange.location -= range.location; switch(type) { - case ::com::sun::star::text::TextMarkupType::SPELLCHECK: { + case css::text::TextMarkupType::SPELLCHECK: { [string addAttribute:NSAccessibilityMisspelledTextAttribute value:[NSNumber numberWithBool:YES] range:markupRange]; [string addAttribute:@"AXMarkedMisspelled" value:[NSNumber numberWithBool:YES] range:markupRange]; break; @@ -314,7 +314,7 @@ using namespace ::com::sun::star::uno; } +(void)addMarkup:(XAccessibleTextMarkup*)markup toString:(NSMutableAttributedString*)string inRange:(NSRange)range { - [AquaA11yTextAttributesWrapper addMarkup:markup withType:(::com::sun::star::text::TextMarkupType::SPELLCHECK) toString:string inRange:range]; + [AquaA11yTextAttributesWrapper addMarkup:markup withType:(css::text::TextMarkupType::SPELLCHECK) toString:string inRange:range]; } +(NSMutableAttributedString *)createAttributedStringForElement:(AquaA11yWrapper *)wrapper inOrigRange:(id)origRange { diff --git a/vcl/osx/a11yutil.h b/vcl/osx/a11yutil.h index 5cc5dc4582f9..56778e76dd80 100644 --- a/vcl/osx/a11yutil.h +++ b/vcl/osx/a11yutil.h @@ -24,8 +24,8 @@ @interface AquaA11yUtil : NSObject { } -+(NSValue *)vclPointToNSPoint:(::com::sun::star::awt::Point)vclPoint; -+(::com::sun::star::awt::Point)nsPointToVclPoint:(NSValue *)nsPoint; ++(NSValue *)vclPointToNSPoint:(css::awt::Point)vclPoint; ++(css::awt::Point)nsPointToVclPoint:(NSValue *)nsPoint; @end #endif // INCLUDED_VCL_OSX_A11YUTIL_H diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm index cd6a28b3d041..a59a99d7b784 100644 --- a/vcl/osx/a11ywrapper.mm +++ b/vcl/osx/a11ywrapper.mm @@ -972,15 +972,15 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) { return hit; } -Reference < XAccessibleContext > hitTestRunner ( com::sun::star::awt::Point point, +Reference < XAccessibleContext > hitTestRunner ( css::awt::Point point, Reference < XAccessibleContext > rxAccessibleContext ) { Reference < XAccessibleContext > hitChild; Reference < XAccessibleContext > emptyReference; try { Reference < XAccessibleComponent > rxAccessibleComponent ( rxAccessibleContext, UNO_QUERY ); if ( rxAccessibleComponent.is() ) { - com::sun::star::awt::Point location = rxAccessibleComponent -> getLocationOnScreen(); - com::sun::star::awt::Point hitPoint ( point.X - location.X , point.Y - location.Y); + css::awt::Point location = rxAccessibleComponent -> getLocationOnScreen(); + css::awt::Point hitPoint ( point.X - location.X , point.Y - location.Y); Reference < XAccessible > rxAccessible = rxAccessibleComponent -> getAccessibleAtPoint ( hitPoint ); if ( rxAccessible.is() && rxAccessible -> getAccessibleContext().is() && rxAccessible -> getAccessibleContext() -> getAccessibleChildCount() == 0 ) { @@ -1031,7 +1031,7 @@ Reference < XAccessibleContext > hitTestRunner ( com::sun::star::awt::Point poin } Reference < XAccessibleContext > hitChild; NSRect screenRect = [ [ NSScreen mainScreen ] frame ]; - com::sun::star::awt::Point hitPoint ( static_cast(point.x) , static_cast(screenRect.size.height - point.y) ); + css::awt::Point hitPoint ( static_cast(point.x) , static_cast(screenRect.size.height - point.y) ); // check child windows first NSWindow * window = (NSWindow *) [ self accessibilityAttributeValue: NSAccessibilityWindowAttribute ]; NSArray * childWindows = [ window childWindows ]; diff --git a/vcl/osx/a11ywrappercombobox.h b/vcl/osx/a11ywrappercombobox.h index 13058844b746..4b7534805104 100644 --- a/vcl/osx/a11ywrappercombobox.h +++ b/vcl/osx/a11ywrappercombobox.h @@ -27,7 +27,7 @@ { AquaA11yWrapper * textArea; } --(id)initWithAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) anAccessibleContext; +-(id)initWithAccessibleContext: (css::uno::Reference < css::accessibility::XAccessibleContext >) anAccessibleContext; -(id)valueAttribute; -(id)numberOfCharactersAttribute; -(id)selectedTextAttribute; diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx index 5e0edecbe8a3..67e76515c52c 100644 --- a/vcl/osx/clipboard.hxx +++ b/vcl/osx/clipboard.hxx @@ -63,9 +63,9 @@ class AquaClipboard; @end class AquaClipboard : public ::cppu::BaseMutex, - public ::cppu::WeakComponentImplHelper< com::sun::star::datatransfer::clipboard::XSystemClipboard, - com::sun::star::datatransfer::clipboard::XFlushableClipboard, - com::sun::star::lang::XServiceInfo >, + public ::cppu::WeakComponentImplHelper< css::datatransfer::clipboard::XSystemClipboard, + css::datatransfer::clipboard::XFlushableClipboard, + css::lang::XServiceInfo >, private ::boost::noncopyable { public: @@ -87,43 +87,43 @@ public: // XClipboard - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents() + throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setContents( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable, - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setContents( const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable, + const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XClipboardEx virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XClipboardNotifier - virtual void SAL_CALL addClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) + throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XFlushableClipboard - virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL flushClipboard( ) throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; /* Get a reference to the used pastboard. */ @@ -131,8 +131,8 @@ public: /* Notify the current clipboard owner that he is no longer the clipboard owner. */ - void fireLostClipboardOwnershipEvent(::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner> oldOwner, - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > oldContent); + void fireLostClipboardOwnershipEvent(css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner> oldOwner, + css::uno::Reference< css::datatransfer::XTransferable > oldContent); void pasteboardChangedOwner(); @@ -148,10 +148,10 @@ private: void fireClipboardChangedEvent(); private: - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory > mrXMimeCntFactory; - ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener > > mClipboardListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > mXClipboardContent; - com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboardOwner > mXClipboardOwner; + css::uno::Reference< css::datatransfer::XMimeContentTypeFactory > mrXMimeCntFactory; + ::std::list< css::uno::Reference< css::datatransfer::clipboard::XClipboardListener > > mClipboardListeners; + css::uno::Reference< css::datatransfer::XTransferable > mXClipboardContent; + css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner > mXClipboardOwner; DataFlavorMapperPtr_t mpDataFlavorMapper; bool mIsSystemPasteboard; NSPasteboard* mPasteboard; diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx index f7a592387865..9f8949206863 100644 --- a/vcl/osx/documentfocuslistener.hxx +++ b/vcl/osx/documentfocuslistener.hxx @@ -31,7 +31,7 @@ // - DocumentFocusListener - class DocumentFocusListener : - public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessibleEventListener > + public ::cppu::WeakImplHelper< css::accessibility::XAccessibleEventListener > { public: @@ -39,48 +39,48 @@ public: explicit DocumentFocusListener(AquaA11yFocusTracker& rTracker); void attachRecursive( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible - ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::accessibility::XAccessible >& xAccessible + ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); void attachRecursive( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& xContext - ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::accessibility::XAccessible >& xAccessible, + const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext + ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); void attachRecursive( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& xContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet >& xStateSet - ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::accessibility::XAccessible >& xAccessible, + const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext, + const css::uno::Reference< css::accessibility::XAccessibleStateSet >& xStateSet + ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); void detachRecursive( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible - ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::accessibility::XAccessible >& xAccessible + ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); void detachRecursive( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& xContext - ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::accessibility::XAccessible >& xAccessible, + const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext + ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); void detachRecursive( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& xContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet >& xStateSet - ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::accessibility::XAccessible >& xAccessible, + const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext, + const css::uno::Reference< css::accessibility::XAccessibleStateSet >& xStateSet + ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getAccessible(const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + static css::uno::Reference< css::accessibility::XAccessible > getAccessible(const css::lang::EventObject& aEvent ) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) + throw( css::uno::RuntimeException, std::exception ) override; private: - std::set< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > m_aRefList; + std::set< css::uno::Reference< css::uno::XInterface > > m_aRefList; AquaA11yFocusTracker& m_aFocusTracker; }; diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index c67d55218281..d16316906f64 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -399,7 +399,7 @@ static AquaSalFrame* getMouseContainerFrame() mpFrame->ToTop( SAL_FRAME_TOTOP_RESTOREWHENMIN | SAL_FRAME_TOTOP_GRABFOCUS ); } --(::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >)accessibleContext +-(css::uno::Reference < css::accessibility::XAccessibleContext >)accessibleContext { return mpFrame -> GetWindow() -> GetAccessible() -> getAccessibleContext(); } @@ -1131,7 +1131,7 @@ private: -(void)moveBackwardAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_BACKWARD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_BACKWARD character: 0 modifiers: 0]; } -(void)moveRight: (id)aSender @@ -1149,189 +1149,189 @@ private: -(void)moveForwardAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_FORWARD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_FORWARD character: 0 modifiers: 0]; } -(void)moveWordLeft: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)moveWordBackward: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)moveWordBackwardAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)moveWordLeftAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)moveWordRight: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0]; } -(void)moveWordForward: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0]; } -(void)moveWordForwardAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0]; } -(void)moveWordRightAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0]; } -(void)moveToEndOfLine: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)moveToRightEndOfLine: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)moveToEndOfLineAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)moveToRightEndOfLineAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)moveToBeginningOfLine: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)moveToLeftEndOfLine: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)moveToBeginningOfLineAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)moveToLeftEndOfLineAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)moveToEndOfParagraph: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveToEndOfParagraphAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveParagraphForward: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveParagraphForwardAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveToBeginningOfParagraph: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveParagraphBackward: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveToBeginningOfParagraphAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveParagraphBackwardAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveToEndOfDocument: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)scrollToEndOfDocument: (id)aSender { (void)aSender; // this is not exactly what we should do, but it makes "End" and "Shift-End" behave consistent - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)moveToEndOfDocumentAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_END_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)moveToBeginningOfDocument: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)scrollToBeginningOfDocument: (id)aSender { (void)aSender; // this is not exactly what we should do, but it makes "Home" and "Shift-Home" behave consistent - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)moveToBeginningOfDocumentAndModifySelection: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)moveUp: (id)aSender @@ -1374,73 +1374,73 @@ private: -(void)deleteWordBackward: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_WORD_BACKWARD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::DELETE_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)deleteWordForward: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_WORD_FORWARD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::DELETE_WORD_FORWARD character: 0 modifiers: 0]; } -(void)deleteToBeginningOfLine: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::DELETE_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)deleteToEndOfLine: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_END_OF_LINE character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::DELETE_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)deleteToBeginningOfParagraph: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)deleteToEndOfParagraph: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::DELETE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)insertLineBreak: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::INSERT_LINEBREAK character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::INSERT_LINEBREAK character: 0 modifiers: 0]; } -(void)insertParagraphSeparator: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::INSERT_PARAGRAPH character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::INSERT_PARAGRAPH character: 0 modifiers: 0]; } -(void)selectWord: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_WORD character: 0 modifiers: 0]; } -(void)selectLine: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_LINE character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_LINE character: 0 modifiers: 0]; } -(void)selectParagraph: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_PARAGRAPH character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_PARAGRAPH character: 0 modifiers: 0]; } -(void)selectAll: (id)aSender { (void)aSender; - [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_ALL character: 0 modifiers: 0]; + [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_ALL character: 0 modifiers: 0]; } -(void)cancelOperation: (id)aSender diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 385c8761715f..1c74efa6802a 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -1014,7 +1014,7 @@ bool AquaSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon& rPolyLine, switch(eLineCap) { - default: // com::sun::star::drawing::LineCap_BUTT: + default: // css::drawing::LineCap_BUTT: { aCGLineCap = kCGLineCapButt; break; diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx index 7e2ef1c918f7..4ea7fe1b8584 100644 --- a/vcl/source/app/dndhelp.cxx +++ b/vcl/source/app/dndhelp.cxx @@ -25,38 +25,38 @@ using namespace ::com::sun::star; vcl::unohelper::DragAndDropClient::~DragAndDropClient() {} -void vcl::unohelper::DragAndDropClient::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& /*dge*/ ) - throw (::com::sun::star::uno::RuntimeException, +void vcl::unohelper::DragAndDropClient::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& /*dge*/ ) + throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropClient::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& /*dsde*/ ) - throw (::com::sun::star::uno::RuntimeException, +void vcl::unohelper::DragAndDropClient::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& /*dsde*/ ) + throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropClient::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& /*dtde*/ ) - throw (::com::sun::star::uno::RuntimeException, +void vcl::unohelper::DragAndDropClient::drop( const css::datatransfer::dnd::DropTargetDropEvent& /*dtde*/ ) + throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropClient::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& /*dtdee*/ ) - throw (::com::sun::star::uno::RuntimeException, +void vcl::unohelper::DragAndDropClient::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& /*dtdee*/ ) + throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropClient::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& /*dte*/ ) - throw (::com::sun::star::uno::RuntimeException, +void vcl::unohelper::DragAndDropClient::dragExit( const css::datatransfer::dnd::DropTargetEvent& /*dte*/ ) + throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropClient::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& /*dtde*/ ) - throw (::com::sun::star::uno::RuntimeException, +void vcl::unohelper::DragAndDropClient::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& /*dtde*/ ) + throw (css::uno::RuntimeException, std::exception) { } @@ -74,77 +74,77 @@ vcl::unohelper::DragAndDropWrapper::~DragAndDropWrapper() uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::lang::XEventListener* >( static_cast(this)) ), - (static_cast< ::com::sun::star::datatransfer::dnd::XDragGestureListener* >(this)), - (static_cast< ::com::sun::star::datatransfer::dnd::XDragSourceListener* >(this)), - (static_cast< ::com::sun::star::datatransfer::dnd::XDropTargetListener* >(this)) ); + (static_cast< css::lang::XEventListener* >( static_cast(this)) ), + (static_cast< css::datatransfer::dnd::XDragGestureListener* >(this)), + (static_cast< css::datatransfer::dnd::XDragSourceListener* >(this)), + (static_cast< css::datatransfer::dnd::XDropTargetListener* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } -// ::com::sun::star::lang::XEventListener -void vcl::unohelper::DragAndDropWrapper::disposing( const ::com::sun::star::lang::EventObject& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::lang::XEventListener +void vcl::unohelper::DragAndDropWrapper::disposing( const css::lang::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) { // Empty Source means it's the client, because the client is not a XInterface if ( !rEvent.Source.is() ) mpClient = nullptr; } -// ::com::sun::star::datatransfer::dnd::XDragGestureListener -void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::datatransfer::dnd::XDragGestureListener +void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw (css::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragGestureRecognized( rDGE ); } -// ::com::sun::star::datatransfer::dnd::XDragSourceListener -void vcl::unohelper::DragAndDropWrapper::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::datatransfer::dnd::XDragSourceListener +void vcl::unohelper::DragAndDropWrapper::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (css::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragDropEnd( rDSDE ); } -void vcl::unohelper::DragAndDropWrapper::dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& ) throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropWrapper::dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragExit( const css::datatransfer::dnd::DragSourceEvent& ) throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropWrapper::dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragOver( const css::datatransfer::dnd::DragSourceDragEvent& ) throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& ) throw (css::uno::RuntimeException, std::exception) { } -// ::com::sun::star::datatransfer::dnd::XDropTargetListener -void vcl::unohelper::DragAndDropWrapper::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::datatransfer::dnd::XDropTargetListener +void vcl::unohelper::DragAndDropWrapper::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->drop( rDTDE ); } -void vcl::unohelper::DragAndDropWrapper::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (css::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragEnter( rDTDEE ); } -void vcl::unohelper::DragAndDropWrapper::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragExit( dte ); } -void vcl::unohelper::DragAndDropWrapper::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragOver( rDTDE ); } -void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) throw (css::uno::RuntimeException, std::exception) { } diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 75176fb6bbb2..03d1bed10ad0 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; -vcl::I18nHelper::I18nHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ) +vcl::I18nHelper::I18nHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ) : maLanguageTag( rLanguageTag) { diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 3d7a76c41067..e910a92db274 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2889,7 +2889,7 @@ namespace if ( aNode.isValid() ) { bool bTmp = bool(); - ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("UIMirroring") ); + css::uno::Any aValue = aNode.getNodeValue( OUString("UIMirroring") ); if( aValue >>= bTmp ) { // found true or false; if it was nil, nothing is changed diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 09bbf2d5f25c..7f490b603c87 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1440,9 +1440,9 @@ SystemWindowFlags Application::GetSystemWindowMode() return ImplGetSVData()->maAppData.mnSysWinMode; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > Application::GetVCLToolkit() +css::uno::Reference< css::awt::XToolkit > Application::GetVCLToolkit() { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > xT; + css::uno::Reference< css::awt::XToolkit > xT; UnoWrapperBase* pWrapper = Application::GetUnoWrapper(); if ( pWrapper ) xT = pWrapper->GetVCLToolkit(); @@ -1494,7 +1494,7 @@ void Application::SetUnoWrapper( UnoWrapperBase* pWrapper ) pSVData->mpUnoWrapper = pWrapper; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayConnection > Application::GetDisplayConnection() +css::uno::Reference< css::awt::XDisplayConnection > Application::GetDisplayConnection() { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 06f08114ee7d..9cb3d2de7035 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -213,18 +213,18 @@ static Application * pOwnSvApp = nullptr; // Exception handler. pExceptionHandler != NULL => VCL already inited static oslSignalHandler pExceptionHandler = nullptr; -class DesktopEnvironmentContext: public cppu::WeakImplHelper< com::sun::star::uno::XCurrentContext > +class DesktopEnvironmentContext: public cppu::WeakImplHelper< css::uno::XCurrentContext > { public: - explicit DesktopEnvironmentContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx) + explicit DesktopEnvironmentContext( const css::uno::Reference< css::uno::XCurrentContext > & ctx) : m_xNextContext( ctx ) {} // XCurrentContext - virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name ) + throw (css::uno::RuntimeException, std::exception) override; private: - com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_xNextContext; + css::uno::Reference< css::uno::XCurrentContext > m_xNextContext; }; uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Name) throw (uno::RuntimeException, std::exception) @@ -267,8 +267,8 @@ bool InitVCL() return false; // Desktop Environment context (to be able to get value of "system.desktop-environment" as soon as possible) - com::sun::star::uno::setCurrentContext( - new DesktopEnvironmentContext( com::sun::star::uno::getCurrentContext() ) ); + css::uno::setCurrentContext( + new DesktopEnvironmentContext( css::uno::getCurrentContext() ) ); // Initialize application instance (should be done after initialization of VCL SAL part) if( pSVData->mpApp ) @@ -312,7 +312,7 @@ namespace a bundled extension is registered/deregistered during startup, forcing exit while the app is still in splash screen.) */ -class VCLUnoWrapperDeleter : public cppu::WeakImplHelper +class VCLUnoWrapperDeleter : public cppu::WeakImplHelper { virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception) override; }; diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index de5cf66dbee8..a515d6ed8a9f 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -44,20 +44,20 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte return i18n::CharacterClassification::create( comphelper::getProcessComponentContext() ); } -void vcl::unohelper::NotifyAccessibleStateEventGlobally( const ::com::sun::star::accessibility::AccessibleEventObject& rEventObject ) +void vcl::unohelper::NotifyAccessibleStateEventGlobally( const css::accessibility::AccessibleEventObject& rEventObject ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > xExtToolkit( Application::GetVCLToolkit(), uno::UNO_QUERY ); + css::uno::Reference< css::awt::XExtendedToolkit > xExtToolkit( Application::GetVCLToolkit(), uno::UNO_QUERY ); if ( xExtToolkit.is() ) { // Only for focus events - sal_Int16 nType = ::com::sun::star::accessibility::AccessibleStateType::INVALID; + sal_Int16 nType = css::accessibility::AccessibleStateType::INVALID; rEventObject.NewValue >>= nType; - if ( nType == ::com::sun::star::accessibility::AccessibleStateType::FOCUSED ) + if ( nType == css::accessibility::AccessibleStateType::FOCUSED ) xExtToolkit->fireFocusGained( rEventObject.Source ); else { rEventObject.OldValue >>= nType; - if ( nType == ::com::sun::star::accessibility::AccessibleStateType::FOCUSED ) + if ( nType == css::accessibility::AccessibleStateType::FOCUSED ) xExtToolkit->fireFocusLost( rEventObject.Source ); } diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index 73389919f4bf..0db903a57d3a 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -61,14 +61,14 @@ namespace vcl { namespace unohelper { } } - // ::com::sun::star::uno::XInterface + // css::uno::XInterface uno::Any TextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< datatransfer::XTransferable* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } - // ::com::sun::star::datatransfer::XTransferable + // css::datatransfer::XTransferable uno::Any TextDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor ) throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception) { uno::Any aAny; diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 4d5c3d4a7a7c..18a104db05b6 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -57,9 +57,9 @@ class GenericClipboard : > { osl::Mutex m_aMutex; - Reference< ::com::sun::star::datatransfer::XTransferable > m_aContents; - Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner; - std::list< Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener > > m_aListeners; + Reference< css::datatransfer::XTransferable > m_aContents; + Reference< css::datatransfer::clipboard::XClipboardOwner > m_aOwner; + std::list< Reference< css::datatransfer::clipboard::XClipboardListener > > m_aListeners; public: @@ -85,12 +85,12 @@ public: * XClipboard */ - virtual Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() + virtual Reference< css::datatransfer::XTransferable > SAL_CALL getContents() throw(RuntimeException, std::exception) override; virtual void SAL_CALL setContents( - const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, - const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) + const Reference< css::datatransfer::XTransferable >& xTrans, + const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw(RuntimeException, std::exception) override; virtual OUString SAL_CALL getName() @@ -107,11 +107,11 @@ public: * XClipboardNotifier */ virtual void SAL_CALL addClipboardListener( - const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) + const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) throw(RuntimeException, std::exception) override; virtual void SAL_CALL removeClipboardListener( - const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) + const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) throw(RuntimeException, std::exception) override; }; @@ -145,14 +145,14 @@ sal_Bool GenericClipboard::supportsService( const OUString& ServiceName ) throw( return cppu::supportsService(this, ServiceName); } -Reference< ::com::sun::star::datatransfer::XTransferable > GenericClipboard::getContents() throw( RuntimeException, std::exception ) +Reference< css::datatransfer::XTransferable > GenericClipboard::getContents() throw( RuntimeException, std::exception ) { return m_aContents; } void GenericClipboard::setContents( - const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, - const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) + const Reference< css::datatransfer::XTransferable >& xTrans, + const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw( RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -203,7 +203,7 @@ void GenericClipboard::removeClipboardListener( const Reference< datatransfer::c } class ClipboardFactory : public ::cppu::WeakComponentImplHelper< - com::sun::star::lang::XSingleServiceFactory + css::lang::XSingleServiceFactory > { osl::Mutex m_aMutex; @@ -220,7 +220,7 @@ public: ClipboardFactory::ClipboardFactory() : cppu::WeakComponentImplHelper< - com::sun::star::lang::XSingleServiceFactory + css::lang::XSingleServiceFactory >( m_aMutex ) { } @@ -286,7 +286,7 @@ public: ) throw(std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) override; + virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( css::uno::Exception, std::exception ) override; OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override @@ -395,8 +395,8 @@ public: virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception, std::exception ) override; // XDropTarget - virtual void SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; - virtual void SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; + virtual void SAL_CALL addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; + virtual void SAL_CALL removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; virtual sal_Bool SAL_CALL isActive() throw(std::exception) override; virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception) override; virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception) override; @@ -434,11 +434,11 @@ void GenericDropTarget::initialize( const Sequence< Any >& ) throw( Exception, s { } -void GenericDropTarget::addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) +void GenericDropTarget::addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) { } -void GenericDropTarget::removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) +void GenericDropTarget::removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) { } diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index 856bddc23d35..c6096b46bb0b 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -42,10 +42,10 @@ extern "C" { if( pXUnoSMgr ) { - Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( - static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pXUnoSMgr ) + Reference< css::lang::XMultiServiceFactory > xMgr( + static_cast< css::lang::XMultiServiceFactory* >( pXUnoSMgr ) ); - Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory; + Reference< css::lang::XSingleServiceFactory > xFactory; if( vcl_session_getImplementationName().equalsAscii( pImplementationName ) ) { xFactory = ::cppu::createOneInstanceFactory( diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index 11066c63ae9e..20aa9d1a705f 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -107,46 +107,46 @@ Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException, std::excep aFD.Type = 0; switch( m_aFont.GetFamily() ) { - case FAMILY_DECORATIVE: aFD.Family = com::sun::star::awt::FontFamily::DECORATIVE;break; - case FAMILY_MODERN: aFD.Family = com::sun::star::awt::FontFamily::MODERN;break; - case FAMILY_ROMAN: aFD.Family = com::sun::star::awt::FontFamily::ROMAN;break; - case FAMILY_SCRIPT: aFD.Family = com::sun::star::awt::FontFamily::SCRIPT;break; - case FAMILY_SWISS: aFD.Family = com::sun::star::awt::FontFamily::SWISS;break; - case FAMILY_SYSTEM: aFD.Family = com::sun::star::awt::FontFamily::SYSTEM;break; + case FAMILY_DECORATIVE: aFD.Family = css::awt::FontFamily::DECORATIVE;break; + case FAMILY_MODERN: aFD.Family = css::awt::FontFamily::MODERN;break; + case FAMILY_ROMAN: aFD.Family = css::awt::FontFamily::ROMAN;break; + case FAMILY_SCRIPT: aFD.Family = css::awt::FontFamily::SCRIPT;break; + case FAMILY_SWISS: aFD.Family = css::awt::FontFamily::SWISS;break; + case FAMILY_SYSTEM: aFD.Family = css::awt::FontFamily::SYSTEM;break; default: - aFD.Family = com::sun::star::awt::FontFamily::DONTKNOW; + aFD.Family = css::awt::FontFamily::DONTKNOW; break; } switch( m_aFont.GetPitch() ) { - case PITCH_VARIABLE: aFD.Pitch = com::sun::star::awt::FontPitch::VARIABLE;break; - case PITCH_FIXED: aFD.Pitch = com::sun::star::awt::FontPitch::FIXED;break; + case PITCH_VARIABLE: aFD.Pitch = css::awt::FontPitch::VARIABLE;break; + case PITCH_FIXED: aFD.Pitch = css::awt::FontPitch::FIXED;break; default: - aFD.Pitch = com::sun::star::awt::FontPitch::DONTKNOW; + aFD.Pitch = css::awt::FontPitch::DONTKNOW; break; } switch( m_aFont.GetWeight() ) { - case WEIGHT_THIN: aFD.Weight = com::sun::star::awt::FontWeight::THIN;break; - case WEIGHT_ULTRALIGHT: aFD.Weight = com::sun::star::awt::FontWeight::ULTRALIGHT;break; - case WEIGHT_LIGHT: aFD.Weight = com::sun::star::awt::FontWeight::LIGHT;break; - case WEIGHT_SEMILIGHT: aFD.Weight = com::sun::star::awt::FontWeight::SEMILIGHT;break; + case WEIGHT_THIN: aFD.Weight = css::awt::FontWeight::THIN;break; + case WEIGHT_ULTRALIGHT: aFD.Weight = css::awt::FontWeight::ULTRALIGHT;break; + case WEIGHT_LIGHT: aFD.Weight = css::awt::FontWeight::LIGHT;break; + case WEIGHT_SEMILIGHT: aFD.Weight = css::awt::FontWeight::SEMILIGHT;break; case WEIGHT_MEDIUM: - case WEIGHT_NORMAL: aFD.Weight = com::sun::star::awt::FontWeight::NORMAL;break; - case WEIGHT_SEMIBOLD: aFD.Weight = com::sun::star::awt::FontWeight::SEMIBOLD;break; - case WEIGHT_BOLD: aFD.Weight = com::sun::star::awt::FontWeight::BOLD;break; - case WEIGHT_ULTRABOLD: aFD.Weight = com::sun::star::awt::FontWeight::ULTRABOLD;break; - case WEIGHT_BLACK: aFD.Weight = com::sun::star::awt::FontWeight::BLACK;break; + case WEIGHT_NORMAL: aFD.Weight = css::awt::FontWeight::NORMAL;break; + case WEIGHT_SEMIBOLD: aFD.Weight = css::awt::FontWeight::SEMIBOLD;break; + case WEIGHT_BOLD: aFD.Weight = css::awt::FontWeight::BOLD;break; + case WEIGHT_ULTRABOLD: aFD.Weight = css::awt::FontWeight::ULTRABOLD;break; + case WEIGHT_BLACK: aFD.Weight = css::awt::FontWeight::BLACK;break; default: - aFD.Weight = com::sun::star::awt::FontWeight::DONTKNOW; + aFD.Weight = css::awt::FontWeight::DONTKNOW; break; } switch( m_aFont.GetItalic() ) { - case ITALIC_OBLIQUE: aFD.Slant = com::sun::star::awt::FontSlant_OBLIQUE;break; - case ITALIC_NORMAL: aFD.Slant = com::sun::star::awt::FontSlant_ITALIC;break; + case ITALIC_OBLIQUE: aFD.Slant = css::awt::FontSlant_OBLIQUE;break; + case ITALIC_NORMAL: aFD.Slant = css::awt::FontSlant_ITALIC;break; default: - aFD.Slant = com::sun::star::awt::FontSlant_DONTKNOW; + aFD.Slant = css::awt::FontSlant_DONTKNOW; break; } return makeAny( aFD ); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index e905fba3df8b..dbd8233b0040 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1315,7 +1315,7 @@ void Edit::ImplCopyToSelectionClipboard() { if ( GetSelection().Len() ) { - ::com::sun::star::uno::Reference aSelection(GetPrimarySelection()); + css::uno::Reference aSelection(GetPrimarySelection()); ImplCopy( aSelection ); } } @@ -1336,7 +1336,7 @@ void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC SolarMutexReleaser aReleaser; xDataObj = rxClipboard->getContents(); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } @@ -1353,7 +1353,7 @@ void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC ShowTruncationWarning( this ); ReplaceSelected( aText ); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } } @@ -1414,7 +1414,7 @@ void Edit::MouseButtonUp( const MouseEvent& rMEvt ) else if ( rMEvt.IsMiddle() && !mbReadOnly && ( GetSettings().GetMouseSettings().GetMiddleButtonAction() == MouseMiddleButtonAction::PasteSelection ) ) { - ::com::sun::star::uno::Reference aSelection(Window::GetPrimarySelection()); + css::uno::Reference aSelection(Window::GetPrimarySelection()); ImplPaste( aSelection ); ImplModified(); } @@ -1534,7 +1534,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) { switch ( nCode ) { - case com::sun::star::awt::Key::SELECT_ALL: + case css::awt::Key::SELECT_ALL: { ImplSetSelection( Selection( 0, maText.getLength() ) ); bDone = true; @@ -1545,22 +1545,22 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) case KEY_RIGHT: case KEY_HOME: case KEY_END: - case com::sun::star::awt::Key::MOVE_WORD_FORWARD: - case com::sun::star::awt::Key::SELECT_WORD_FORWARD: - case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: - case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: - case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: - case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: + case css::awt::Key::MOVE_WORD_FORWARD: + case css::awt::Key::SELECT_WORD_FORWARD: + case css::awt::Key::MOVE_WORD_BACKWARD: + case css::awt::Key::SELECT_WORD_BACKWARD: + case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: + case css::awt::Key::MOVE_TO_END_OF_LINE: + case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: + case css::awt::Key::SELECT_TO_END_OF_LINE: + case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: { if ( !rKEvt.GetKeyCode().IsMod2() ) { @@ -1577,31 +1577,31 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) switch( nCode ) { - case com::sun::star::awt::Key::MOVE_WORD_FORWARD: + case css::awt::Key::MOVE_WORD_FORWARD: bGoRight = bWord = true;break; - case com::sun::star::awt::Key::SELECT_WORD_FORWARD: + case css::awt::Key::SELECT_WORD_FORWARD: bGoRight = bSelect = bWord = true;break; - case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: + case css::awt::Key::MOVE_WORD_BACKWARD: bGoLeft = bWord = true;break; - case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: + case css::awt::Key::SELECT_WORD_BACKWARD: bGoLeft = bSelect = bWord = true;break; - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: + case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: bSelect = true; // fallthrough intended - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: + case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: bGoHome = true;break; - case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_END_OF_LINE: + case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: bSelect = true; // fallthrough intended - case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_END_OF_LINE: + case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: bGoEnd = true;break; default: break; @@ -1673,10 +1673,10 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) } break; - case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: - case com::sun::star::awt::Key::DELETE_WORD_FORWARD: - case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: + case css::awt::Key::DELETE_WORD_BACKWARD: + case css::awt::Key::DELETE_WORD_FORWARD: + case css::awt::Key::DELETE_TO_BEGIN_OF_LINE: + case css::awt::Key::DELETE_TO_END_OF_LINE: case KEY_BACKSPACE: case KEY_DELETE: { @@ -1688,19 +1688,19 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) nMode = EDIT_DELMODE_RESTOFCONTENT; switch( nCode ) { - case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: + case css::awt::Key::DELETE_WORD_BACKWARD: nDel = EDIT_DEL_LEFT; nMode = EDIT_DELMODE_RESTOFWORD; break; - case com::sun::star::awt::Key::DELETE_WORD_FORWARD: + case css::awt::Key::DELETE_WORD_FORWARD: nDel = EDIT_DEL_RIGHT; nMode = EDIT_DELMODE_RESTOFWORD; break; - case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: + case css::awt::Key::DELETE_TO_BEGIN_OF_LINE: nDel = EDIT_DEL_LEFT; nMode = EDIT_DELMODE_RESTOFCONTENT; break; - case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: + case css::awt::Key::DELETE_TO_END_OF_LINE: nDel = EDIT_DEL_RIGHT; nMode = EDIT_DELMODE_RESTOFCONTENT; break; @@ -2641,14 +2641,14 @@ void Edit::Copy() { if ( !(GetStyle() & WB_PASSWORD ) ) { - ::com::sun::star::uno::Reference aClipboard(GetClipboard()); + css::uno::Reference aClipboard(GetClipboard()); ImplCopy( aClipboard ); } } void Edit::Paste() { - ::com::sun::star::uno::Reference aClipboard(GetClipboard()); + css::uno::Reference aClipboard(GetClipboard()); ImplPaste( aClipboard ); } @@ -2876,8 +2876,8 @@ void Edit::DeletePopupMenu( PopupMenu* pMenu ) delete pMenu; } -// ::com::sun::star::datatransfer::dnd::XDragGestureListener -void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::datatransfer::dnd::XDragGestureListener +void Edit::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -2913,8 +2913,8 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra } } -// ::com::sun::star::datatransfer::dnd::XDragSourceListener -void Edit::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::datatransfer::dnd::XDragSourceListener +void Edit::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -2939,8 +2939,8 @@ void Edit::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDro mpDDInfo = nullptr; } -// ::com::sun::star::datatransfer::dnd::XDropTargetListener -void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::datatransfer::dnd::XDropTargetListener +void Edit::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -2987,14 +2987,14 @@ void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE.Context->dropComplete( bChanges ); } -void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void Edit::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { if ( !mpDDInfo ) { mpDDInfo = new DDInfo; } // search for string data type - const Sequence< com::sun::star::datatransfer::DataFlavor >& rFlavors( rDTDE.SupportedDataFlavors ); + const Sequence< css::datatransfer::DataFlavor >& rFlavors( rDTDE.SupportedDataFlavors ); sal_Int32 nEle = rFlavors.getLength(); mpDDInfo->bIsStringSupported = false; for( sal_Int32 i = 0; i < nEle; i++ ) @@ -3009,14 +3009,14 @@ void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragE } } -void Edit::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void Edit::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; ImplHideDDCursor(); } -void Edit::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void Edit::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 8fd5b2215899..b08bd78814d7 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -153,7 +153,7 @@ static bool ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask ) nType = ImplGetCharClass()->getStringType( aCharStr, 0, aCharStr.getLength(), Application::GetSettings().GetLanguageTag().getLocale() ); } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { SAL_WARN( "vcl.control", "ImplIsPatternChar: Exception caught!" ); DBG_UNHANDLED_EXCEPTION(); @@ -1428,7 +1428,7 @@ DateFormatter::~DateFormatter() mpCalendarWrapper = nullptr; } -void DateFormatter::SetLocale( const ::com::sun::star::lang::Locale& rLocale ) +void DateFormatter::SetLocale( const css::lang::Locale& rLocale ) { delete mpCalendarWrapper; mpCalendarWrapper = nullptr; diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 4574618834c0..e15d09e5add7 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -106,7 +106,7 @@ void ListBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) Control::ImplInit( pParent, nStyle, nullptr ); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener> xDrop = new DNDEventDispatcher(this); + css::uno::Reference< css::datatransfer::dnd::XDropTargetListener> xDrop = new DNDEventDispatcher(this); if( nStyle & WB_DROPDOWN ) { diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 7306868cd32f..dc711c9521c9 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -74,8 +74,8 @@ namespace ::std::vector< Image > aImages; ENSURE_OR_RETURN( i_imageSet != Throbber::IMAGES_NONE, "lcl_loadImageSet: illegal image set", aImages ); - const Reference< com::sun::star::uno::XComponentContext > aContext( ::comphelper::getProcessComponentContext() ); - const Reference< XGraphicProvider > xGraphicProvider( com::sun::star::graphic::GraphicProvider::create(aContext) ); + const Reference< css::uno::XComponentContext > aContext( ::comphelper::getProcessComponentContext() ); + const Reference< XGraphicProvider > xGraphicProvider( css::graphic::GraphicProvider::create(aContext) ); ::std::vector< OUString > aImageURLs( Throbber::getDefaultImageURLs( i_imageSet ) ); aImages.reserve( aImageURLs.size() ); diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 58e0bc9581ef..6763664329c1 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -1669,7 +1669,7 @@ void TextEngine::ImpBreakLine( sal_uInt32 nPara, TextLine* pLine, TETextPortion* aUserOptions.allowPunctuationOutsideMargin = false; aUserOptions.allowHyphenateEnglish = false; - static const com::sun::star::lang::Locale aDefLocale; + static const css::lang::Locale aDefLocale; i18n::LineBreakResults aLBR = xBI->getLineBreak( pNode->GetText(), nMaxBreakPos, aDefLocale, pLine->GetStart(), aHyphOptions, aUserOptions ); sal_Int32 nBreakPos = aLBR.breakIndex; if ( nBreakPos <= pLine->GetStart() ) @@ -2839,14 +2839,14 @@ uno::Reference< i18n::XBreakIterator > TextEngine::GetBreakIterator() return mxBreakIterator; } -void TextEngine::SetLocale( const ::com::sun::star::lang::Locale& rLocale ) +void TextEngine::SetLocale( const css::lang::Locale& rLocale ) { maLocale = rLocale; delete mpLocaleDataWrapper; mpLocaleDataWrapper = nullptr; } -::com::sun::star::lang::Locale TextEngine::GetLocale() +css::lang::Locale TextEngine::GetLocale() { if ( maLocale.Language.isEmpty() ) { diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index cde8c85d6925..78bd880dde77 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star; -class TETextDataObject : public ::com::sun::star::datatransfer::XTransferable, +class TETextDataObject : public css::datatransfer::XTransferable, public ::cppu::OWeakObject { @@ -75,15 +75,15 @@ public: OUString& GetText() { return maText; } SvMemoryStream& GetHTMLStream() { return maHTMLStream; } - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::datatransfer::XTransferable - ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::datatransfer::XTransferable + css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw(css::uno::RuntimeException, std::exception) override; }; TETextDataObject::TETextDataObject( const OUString& rText ) : maText( rText ) @@ -163,7 +163,7 @@ struct ImpTextView SelectionEngine* mpSelEngine; TextSelFunctionSet* mpSelFuncSet; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener > mxDnDListener; + css::uno::Reference< css::datatransfer::dnd::XDragSourceListener > mxDnDListener; sal_uInt16 mnTravelXPos; @@ -610,22 +610,22 @@ bool TextView::KeyInput( const KeyEvent& rKeyEvent ) case KEY_END: case KEY_PAGEUP: case KEY_PAGEDOWN: - case com::sun::star::awt::Key::MOVE_WORD_FORWARD: - case com::sun::star::awt::Key::SELECT_WORD_FORWARD: - case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: - case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: - case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: - case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: + case css::awt::Key::MOVE_WORD_FORWARD: + case css::awt::Key::SELECT_WORD_FORWARD: + case css::awt::Key::MOVE_WORD_BACKWARD: + case css::awt::Key::SELECT_WORD_BACKWARD: + case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: + case css::awt::Key::MOVE_TO_END_OF_LINE: + case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: + case css::awt::Key::SELECT_TO_END_OF_LINE: + case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: { if ( ( !rKeyEvent.GetKeyCode().IsMod2() || ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) ) && !( rKeyEvent.GetKeyCode().IsMod1() && ( nCode == KEY_PAGEUP || nCode == KEY_PAGEDOWN ) ) ) @@ -645,10 +645,10 @@ bool TextView::KeyInput( const KeyEvent& rKeyEvent ) break; case KEY_BACKSPACE: case KEY_DELETE: - case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: - case com::sun::star::awt::Key::DELETE_WORD_FORWARD: - case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: + case css::awt::Key::DELETE_WORD_BACKWARD: + case css::awt::Key::DELETE_WORD_FORWARD: + case css::awt::Key::DELETE_TO_BEGIN_OF_LINE: + case css::awt::Key::DELETE_TO_END_OF_LINE: { if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsMod2() ) { @@ -659,19 +659,19 @@ bool TextView::KeyInput( const KeyEvent& rKeyEvent ) switch( nCode ) { - case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: + case css::awt::Key::DELETE_WORD_BACKWARD: nDel = DEL_LEFT; nMode = DELMODE_RESTOFWORD; break; - case com::sun::star::awt::Key::DELETE_WORD_FORWARD: + case css::awt::Key::DELETE_WORD_FORWARD: nDel = DEL_RIGHT; nMode = DELMODE_RESTOFWORD; break; - case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: + case css::awt::Key::DELETE_TO_BEGIN_OF_LINE: nDel = DEL_LEFT; nMode = DELMODE_RESTOFCONTENT; break; - case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: + case css::awt::Key::DELETE_TO_END_OF_LINE: nDel = DEL_RIGHT; nMode = DELMODE_RESTOFCONTENT; break; @@ -1133,7 +1133,7 @@ void TextView::Copy( uno::Reference< datatransfer::clipboard::XClipboard >& rxCl if( xFlushableClipboard.is() ) xFlushableClipboard->flushClipboard(); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } } @@ -1156,7 +1156,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC SolarMutexReleaser aReleaser; xDataObj = rxClipboard->getContents(); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } @@ -1180,7 +1180,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC if( bWasTruncated ) Edit::ShowTruncationWarning( mpImpl->mpWindow ); } - catch( const ::com::sun::star::datatransfer::UnsupportedFlavorException& ) + catch( const css::datatransfer::UnsupportedFlavorException& ) { } } @@ -1263,44 +1263,44 @@ TextSelection TextView::ImpMoveCursor( const KeyEvent& rKeyEvent ) break; case KEY_RIGHT: aPaM = bCtrl ? CursorWordRight( aPaM ) : CursorRight( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (sal_uInt16)i18n::CharacterIteratorMode::SKIPCHARACTER : (sal_uInt16)i18n::CharacterIteratorMode::SKIPCELL ); break; - case com::sun::star::awt::Key::SELECT_WORD_FORWARD: + case css::awt::Key::SELECT_WORD_FORWARD: bSelect = true; // fallthrough intentional - case com::sun::star::awt::Key::MOVE_WORD_FORWARD: + case css::awt::Key::MOVE_WORD_FORWARD: aPaM = CursorWordRight( aPaM ); break; - case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: + case css::awt::Key::SELECT_WORD_BACKWARD: bSelect = true; // fallthrough intentional - case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: + case css::awt::Key::MOVE_WORD_BACKWARD: aPaM = CursorWordLeft( aPaM ); break; - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: + case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: bSelect = true; // fallthrough intentional - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: + case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: aPaM = CursorStartOfLine( aPaM ); break; - case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: + case css::awt::Key::SELECT_TO_END_OF_LINE: bSelect = true; // fallthrough intentional - case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: + case css::awt::Key::MOVE_TO_END_OF_LINE: aPaM = CursorEndOfLine( aPaM ); break; - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: bSelect = true; // falltthrough intentional - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: aPaM = CursorStartOfParagraph( aPaM ); break; - case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: bSelect = true; // falltthrough intentional - case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: aPaM = CursorEndOfParagraph( aPaM ); break; - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: bSelect = true; // falltthrough intentional - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: aPaM = CursorStartOfDoc(); break; - case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: bSelect = true; // falltthrough intentional - case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: aPaM = CursorEndOfDoc(); break; } @@ -1958,7 +1958,7 @@ bool TextView::ImplCheckTextLen( const OUString& rNewText ) return bOK; } -void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void TextView::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw (css::uno::RuntimeException, std::exception) { if ( mpImpl->mbClickedInSelection ) { @@ -2005,14 +2005,14 @@ void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd: } } -void TextView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void TextView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& ) throw (css::uno::RuntimeException, std::exception) { ImpHideDDCursor(); delete mpImpl->mpDDInfo; mpImpl->mpDDInfo = nullptr; } -void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void TextView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -2119,17 +2119,17 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv rDTDE.Context->dropComplete( bChanges ); } -void TextView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void TextView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& ) throw (css::uno::RuntimeException, std::exception) { } -void TextView::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void TextView::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; ImpHideDDCursor(); } -void TextView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void TextView::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index a2e075555368..67a67a0d00c6 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -767,7 +767,7 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent ) { bool bDone = false; sal_uInt16 nCode = rKEvent.GetKeyCode().GetCode(); - if ( nCode == com::sun::star::awt::Key::SELECT_ALL || + if ( nCode == css::awt::Key::SELECT_ALL || ( (nCode == KEY_A) && rKEvent.GetKeyCode().IsMod1() && !rKEvent.GetKeyCode().IsMod2() ) ) { diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx index e4c204b817e5..71661f2bbfc2 100644 --- a/vcl/source/filter/FilterConfigCache.hxx +++ b/vcl/source/filter/FilterConfigCache.hxx @@ -34,7 +34,7 @@ class FilterConfigCache { OUString sInternalFilterName; OUString sType; - ::com::sun::star::uno::Sequence< OUString > lExtensionList; + css::uno::Sequence< OUString > lExtensionList; OUString sUIName; OUString sDocumentService; OUString sFilterService; diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index 428cf72225d6..4a7302f3998b 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -72,7 +72,7 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, co "com.sun.star.configuration.ConfigurationAccess", aArguments ); } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { bAvailable = false; } @@ -139,7 +139,7 @@ void FilterConfigItem::ImpInitTree( const OUString& rSubTree ) if ( xUpdatableView.is() ) xPropSet.set( xUpdatableView, UNO_QUERY ); } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { OSL_FAIL( "FilterConfigItem::FilterConfigItem - Could not access configuration Key" ); } @@ -151,7 +151,7 @@ FilterConfigItem::FilterConfigItem( const OUString& rSubTree ) ImpInitTree( rSubTree ); } -FilterConfigItem::FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) +FilterConfigItem::FilterConfigItem( css::uno::Sequence< css::beans::PropertyValue >* pFilterData ) : bModified(false) { if ( pFilterData ) @@ -159,7 +159,7 @@ FilterConfigItem::FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun: } FilterConfigItem::FilterConfigItem( const OUString& rSubTree, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) + css::uno::Sequence< css::beans::PropertyValue >* pFilterData ) { ImpInitTree( rSubTree ); @@ -186,7 +186,7 @@ void FilterConfigItem::WriteModifiedConfig() xUpdateControl->commitChanges(); bModified = false; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { OSL_FAIL( "FilterConfigItem::FilterConfigItem - Could not update configuration data" ); } @@ -211,7 +211,7 @@ bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XProper if ( aXPropSetInfo.is() ) bRetValue = aXPropSetInfo->hasPropertyByName( rString ); } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { } @@ -224,7 +224,7 @@ bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XProper if ( !rAny.hasValue() ) bRetValue = false; } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { bRetValue = false; } @@ -361,7 +361,7 @@ void FilterConfigItem::WriteBool( const OUString& rKey, bool bNewValue ) xPropSet->setPropertyValue( rKey, aAny ); bModified = true; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { OSL_FAIL( "FilterConfigItem::WriteBool - could not set PropertyValue" ); } @@ -395,7 +395,7 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) xPropSet->setPropertyValue( rKey, aAny ); bModified = true; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { OSL_FAIL( "FilterConfigItem::WriteInt32 - could not set PropertyValue" ); } diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 653d5367a165..c86d070072a8 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1319,7 +1319,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath, SvStream& rIStream, sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat, GraphicFilterImportFlags nImportFlags, - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData, + css::uno::Sequence< css::beans::PropertyValue >* pFilterData, WMF_EXTERNALHEADER *pExtHeader ) { OUString aFilterName; @@ -2000,7 +2000,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString { if ( (*pFilterData)[ i ].Name == "AdditionalChunks" ) { - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aAdditionalChunkSequence; + css::uno::Sequence< css::beans::PropertyValue > aAdditionalChunkSequence; if ( (*pFilterData)[ i ].Value >>= aAdditionalChunkSequence ) { for ( j = 0; j < aAdditionalChunkSequence.getLength(); j++ ) @@ -2013,7 +2013,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString nChunkType <<= 8; nChunkType |= (sal_uInt8)aAdditionalChunkSequence[ j ].Name[ k ]; } - com::sun::star::uno::Sequence< sal_Int8 > aByteSeq; + css::uno::Sequence< sal_Int8 > aByteSeq; if ( aAdditionalChunkSequence[ j ].Value >>= aByteSeq ) { std::vector< vcl::PNGWriter::ChunkData >& rChunkData = aPNGWriter.GetChunks(); diff --git a/vcl/source/filter/jpeg/JpegWriter.hxx b/vcl/source/filter/jpeg/JpegWriter.hxx index a9f765a7c67e..edfa8acd391f 100644 --- a/vcl/source/filter/jpeg/JpegWriter.hxx +++ b/vcl/source/filter/jpeg/JpegWriter.hxx @@ -39,11 +39,11 @@ class JPEGWriter bool* mpExpWasGrey; - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator; public: JPEGWriter( SvStream& rStream, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData, + const css::uno::Sequence< css::beans::PropertyValue >* pFilterData, bool* pExportWasGrey = nullptr ); virtual ~JPEGWriter() {}; diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx index e403dce69cfe..b2e46720790d 100644 --- a/vcl/source/filter/jpeg/jpeg.cxx +++ b/vcl/source/filter/jpeg/jpeg.cxx @@ -67,7 +67,7 @@ VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void* } bool ExportJPEG(SvStream& rOutputStream, const Graphic& rGraphic, - const com::sun::star::uno::Sequence* pFilterData, + const css::uno::Sequence* pFilterData, bool* pExportWasGrey) { JPEGWriter aJPEGWriter( rOutputStream, pFilterData, pExportWasGrey ); diff --git a/vcl/source/filter/jpeg/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx index e53eab2be6b9..701a8eaa53dc 100644 --- a/vcl/source/filter/jpeg/jpeg.hxx +++ b/vcl/source/filter/jpeg/jpeg.hxx @@ -31,7 +31,7 @@ VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void* bool ExportJPEG(SvStream& rOutputStream, const Graphic& rGraphic, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData, + const css::uno::Sequence< css::beans::PropertyValue >* pFilterData, bool* pExportWasGrey = nullptr); #endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_HXX diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index a55709b0176d..bb029b55ef43 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -953,18 +953,18 @@ bool EnhWMFReader::ReadEnhWMF() case PS_ENDCAP_ROUND : if ( aSize.Width() ) { - aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_ROUND ); + aLineInfo.SetLineCap( css::drawing::LineCap_ROUND ); break; } case PS_ENDCAP_SQUARE : if ( aSize.Width() ) { - aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_SQUARE ); + aLineInfo.SetLineCap( css::drawing::LineCap_SQUARE ); break; } case PS_ENDCAP_FLAT : default : - aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_BUTT ); + aLineInfo.SetLineCap( css::drawing::LineCap_BUTT ); } switch( nStyle & 0xF000 ) { diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index ab7b1aefbddc..af179ba3d844 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -732,7 +732,7 @@ protected: FilterConfigItem* pFilterConfigItem; - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; // assures aSampledBrush is the actual brush of the GDIMetaFile diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 29d2f5529829..64508ef7dbfa 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -855,14 +855,14 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) switch( nStyle & 0xF00 ) { case PS_ENDCAP_ROUND : - aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_ROUND ); + aLineInfo.SetLineCap( css::drawing::LineCap_ROUND ); break; case PS_ENDCAP_SQUARE : - aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_SQUARE ); + aLineInfo.SetLineCap( css::drawing::LineCap_SQUARE ); break; case PS_ENDCAP_FLAT : default : - aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_BUTT ); + aLineInfo.SetLineCap( css::drawing::LineCap_BUTT ); } switch( nStyle & 0xF000 ) { diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index dd842400a174..32cf5cf6d1ae 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -55,7 +55,7 @@ private: sal_uLong nLastPercent; // with which number pCallback was called last time. - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; SvStream* pWMF; VclPtr pVirDev; diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 5f836a20351b..906d3eb114fb 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -783,8 +783,7 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, sal_Int32 nY) const // Shift alpha transparent pixels between cppcanvas/ implementations // and vcl in a generally grotesque and under-performing fashion -bool BitmapEx::Create( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmapCanvas > &xBitmapCanvas, +bool BitmapEx::Create( const css::uno::Reference< css::rendering::XBitmapCanvas > &xBitmapCanvas, const Size &rSize ) { uno::Reference< beans::XFastPropertySet > xFastPropertySet( xBitmapCanvas, uno::UNO_QUERY ); diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 7452856e3d0c..07ceea37ac5b 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -568,7 +568,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { sal_Int16 nLineCap(0); rIStm.ReadInt16( nLineCap ); - aLineInfo.SetLineCap((com::sun::star::drawing::LineCap)nLineCap); + aLineInfo.SetLineCap((css::drawing::LineCap)nLineCap); } break; @@ -1449,7 +1449,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const LineInfo& rInfo = pAct->GetLineInfo(); const bool bFatLine(!rInfo.IsDefault() && (LINE_NONE != rInfo.GetStyle())); const bool bLineJoin(bFatLine && basegfx::B2DLineJoin::Round != rInfo.GetLineJoin()); - const bool bLineCap(bFatLine && com::sun::star::drawing::LineCap_BUTT != rInfo.GetLineCap()); + const bool bLineCap(bFatLine && css::drawing::LineCap_BUTT != rInfo.GetLineCap()); const bool bLineDashDot(LINE_DASH == rInfo.GetStyle()); if( bFatLine ) @@ -1605,7 +1605,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const sal_uInt16 nPoints(aSimplePoly.GetSize()); const bool bFatLine(!rInfo.IsDefault() && (LINE_NONE != rInfo.GetStyle())); const bool bLineJoin(bFatLine && basegfx::B2DLineJoin::Round != rInfo.GetLineJoin()); - const bool bLineCap(bFatLine && com::sun::star::drawing::LineCap_BUTT != rInfo.GetLineCap()); + const bool bLineCap(bFatLine && css::drawing::LineCap_BUTT != rInfo.GetLineCap()); const bool bLineDashDot(LINE_DASH == rInfo.GetStyle()); if( bFatLine ) diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index 3a1707100188..344c2e6835ea 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -220,7 +220,7 @@ Graphic::Graphic( const GDIMetaFile& rMtf ) mpImpGraphic = new ImpGraphic( rMtf ); } -Graphic::Graphic( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ) +Graphic::Graphic( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ) { uno::Reference< lang::XUnoTunnel > xTunnel( rxGraphic, uno::UNO_QUERY ); const ::Graphic* pGraphic = ( xTunnel.is() ? diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 4a2b59d829b7..9e4c78aef6c4 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -357,22 +357,22 @@ void ImpGraphic::ImplClear() try { ::ucbhelper::Content aCnt( mpSwapFile->aSwapURL.GetMainURL( INetURLObject::NO_DECODE ), - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); aCnt.executeCommand( "delete", - ::com::sun::star::uno::makeAny( true ) ); + css::uno::makeAny( true ) ); } - catch( const ::com::sun::star::ucb::ContentCreationException& ) + catch( const css::ucb::ContentCreationException& ) { } - catch( const ::com::sun::star::uno::RuntimeException& ) + catch( const css::uno::RuntimeException& ) { } - catch( const ::com::sun::star::ucb::CommandAbortedException& ) + catch( const css::ucb::CommandAbortedException& ) { } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } @@ -1166,7 +1166,7 @@ bool ImpGraphic::ImplSwapOut() { xOStm.reset(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | StreamMode::SHARE_DENYWRITE )); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } if( xOStm ) @@ -1187,22 +1187,21 @@ bool ImpGraphic::ImplSwapOut() try { ::ucbhelper::Content aCnt( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( "delete", - ::com::sun::star::uno::makeAny( true ) ); + aCnt.executeCommand( "delete", css::uno::makeAny( true ) ); } - catch( const ::com::sun::star::ucb::ContentCreationException& ) + catch( const css::ucb::ContentCreationException& ) { } - catch( const ::com::sun::star::uno::RuntimeException& ) + catch( const css::uno::RuntimeException& ) { } - catch( const ::com::sun::star::ucb::CommandAbortedException& ) + catch( const css::ucb::CommandAbortedException& ) { } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } } @@ -1264,7 +1263,7 @@ bool ImpGraphic::ImplSwapIn() { xIStm.reset(::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE | StreamMode::SHARE_DENYWRITE )); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } @@ -1285,22 +1284,21 @@ bool ImpGraphic::ImplSwapIn() try { ::ucbhelper::Content aCnt( aSwapURL, - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( "delete", - ::com::sun::star::uno::makeAny( true ) ); + aCnt.executeCommand( "delete", css::uno::makeAny( true ) ); } - catch( const ::com::sun::star::ucb::ContentCreationException& ) + catch( const css::ucb::ContentCreationException& ) { } - catch( const ::com::sun::star::uno::RuntimeException& ) + catch( const css::uno::RuntimeException& ) { } - catch( const ::com::sun::star::ucb::CommandAbortedException& ) + catch( const css::ucb::CommandAbortedException& ) { } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 55ec0ecdc8a2..302ecc732d63 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -38,7 +38,7 @@ ImplLineInfo::ImplLineInfo() : mnDotLen ( 0 ), mnDistance ( 0 ), meLineJoin ( basegfx::B2DLineJoin::Round ), - meLineCap ( com::sun::star::drawing::LineCap_BUTT ) + meLineCap ( css::drawing::LineCap_BUTT ) { } @@ -172,7 +172,7 @@ void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin) } } -void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap) +void LineInfo::SetLineCap(css::drawing::LineCap eLineCap) { if(eLineCap != mpImplLineInfo->meLineCap) { @@ -185,7 +185,7 @@ bool LineInfo::IsDefault() const { return( !mpImplLineInfo->mnWidth && ( LINE_SOLID == mpImplLineInfo->meStyle ) - && ( com::sun::star::drawing::LineCap_BUTT == mpImplLineInfo->meLineCap)); + && ( css::drawing::LineCap_BUTT == mpImplLineInfo->meLineCap)); } SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) @@ -218,7 +218,7 @@ SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) if( aCompat.GetVersion() >= 4 ) { // version 4 - rIStm.ReadUInt16( nTmp16 ); rImplLineInfo.meLineCap = (com::sun::star::drawing::LineCap) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImplLineInfo.meLineCap = (css::drawing::LineCap) nTmp16; } return rIStm; diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx index 46485b9ebde1..ef4250555ffa 100644 --- a/vcl/source/gdi/oldprintadaptor.cxx +++ b/vcl/source/gdi/oldprintadaptor.cxx @@ -24,12 +24,18 @@ #include +using namespace vcl; +using namespace cppu; +using namespace com::sun::star; +using namespace com::sun::star::uno; +using namespace com::sun::star::beans; + namespace vcl { struct AdaptorPage { - GDIMetaFile maPage; - com::sun::star::awt::Size maPageSize; + GDIMetaFile maPage; + css::awt::Size maPageSize; }; struct ImplOldStyleAdaptorData @@ -38,12 +44,6 @@ namespace vcl }; } -using namespace vcl; -using namespace cppu; -using namespace com::sun::star; -using namespace com::sun::star::uno; -using namespace com::sun::star::beans; - OldStylePrintAdaptor::OldStylePrintAdaptor( const VclPtr< Printer >& i_xPrinter ) : PrinterController( i_xPrinter ) , mpData( new ImplOldStyleAdaptorData() ) diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 5a1fd37f7c07..8212f8534338 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -516,7 +516,7 @@ PDFExtOutDevData::~PDFExtOutDevData() delete mpGlobalSyncData; } -void PDFExtOutDevData::SetDocumentLocale( const com::sun::star::lang::Locale& rLoc ) +void PDFExtOutDevData::SetDocumentLocale( const css::lang::Locale& rLoc ) { maDocLocale = rLoc; } diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index c90f41c7434c..6a22e4ac3836 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -27,7 +27,7 @@ PDFWriter::AnyWidget::~AnyWidget() { } -PDFWriter::PDFWriter( const PDFWriter::PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& xEnc ) +PDFWriter::PDFWriter( const PDFWriter::PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >& xEnc ) : xImplementation( new PDFWriterImpl( rContext, xEnc, *this ) ) { @@ -52,7 +52,7 @@ bool PDFWriter::Emit() return xImplementation->emit(); } -void PDFWriter::SetDocumentLocale( const com::sun::star::lang::Locale& rLoc ) +void PDFWriter::SetDocumentLocale( const css::lang::Locale& rLoc ) { xImplementation->setDocumentLocale( rLoc ); } @@ -456,7 +456,7 @@ std::set< PDFWriter::ErrorCode > PDFWriter::GetErrors() return xImplementation->getErrors(); } -com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > +css::uno::Reference< css::beans::XMaterialHolder > PDFWriter::InitEncryption( const OUString& i_rOwnerPassword, const OUString& i_rUserPassword, bool b128Bit diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 9fd3a127ab47..2384ef37cece 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -132,17 +132,17 @@ class PDFTestOutputStream : public PDFOutputStream { public: virtual ~PDFTestOutputStream(); - virtual void write( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xStream ); + virtual void write( const css::uno::Reference< css::io::XOutputStream >& xStream ); }; PDFTestOutputStream::~PDFTestOutputStream() { } -void PDFTestOutputStream::write( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xStream ) +void PDFTestOutputStream::write( const css::uno::Reference< css::io::XOutputStream >& xStream ) { OString aStr( "lalala\ntest\ntest\ntest" ); - com::sun::star::uno::Sequence< sal_Int8 > aData( aStr.getLength() ); + css::uno::Sequence< sal_Int8 > aData( aStr.getLength() ); memcpy( aData.getArray(), aStr.getStr(), aStr.getLength() ); xStream->writeBytes( aData ); } @@ -170,7 +170,7 @@ void doTestCode() aContext.SignReason = "Some valid reason to sign"; aContext.SignContact = "signer@example.com"; - com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > xEnc; + css::uno::Reference< css::beans::XMaterialHolder > xEnc; PDFWriter aWriter( aContext, xEnc ); aWriter.NewPage( 595, 842 ); aWriter.BeginStructureElement( PDFWriter::Document ); @@ -1643,7 +1643,7 @@ bool PDFWriterImpl::PDFPage::appendLineInfo( const LineInfo& rInfo, OStringBuffe return false; } - if(com::sun::star::drawing::LineCap_BUTT != rInfo.GetLineCap()) + if(css::drawing::LineCap_BUTT != rInfo.GetLineCap()) { // LineCap used, ExtLineInfo required return false; @@ -1734,7 +1734,7 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal } PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, - const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& xEnc, + const css::uno::Reference< css::beans::XMaterialHolder >& xEnc, PDFWriter& i_rOuterFace) : m_pReferenceDevice( nullptr ), @@ -6790,7 +6790,7 @@ bool PDFWriterImpl::finalizeSignature() } // 3- create the PKCS#7 object using NSS - com::sun::star::uno::Sequence< sal_Int8 > derEncoded = m_aContext.SignCertificate->getEncoded(); + css::uno::Sequence< sal_Int8 > derEncoded = m_aContext.SignCertificate->getEncoded(); if (!derEncoded.hasElements()) return false; @@ -8239,7 +8239,7 @@ void PDFWriterImpl::sortWidgets() namespace vcl { class PDFStreamIf : - public cppu::WeakImplHelper< com::sun::star::io::XOutputStream > + public cppu::WeakImplHelper< css::io::XOutputStream > { PDFWriterImpl* m_pWriter; bool m_bWrite; @@ -8247,7 +8247,7 @@ class PDFStreamIf : explicit PDFStreamIf( PDFWriterImpl* pWriter ) : m_pWriter( pWriter ), m_bWrite( true ) {} virtual ~PDFStreamIf(); - virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) override; + virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) override; virtual void SAL_CALL flush() throw(std::exception) override; virtual void SAL_CALL closeOutput() throw(std::exception) override; }; @@ -8257,7 +8257,7 @@ PDFStreamIf::~PDFStreamIf() { } -void SAL_CALL PDFStreamIf::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) +void SAL_CALL PDFStreamIf::writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) { if( m_bWrite && aData.getLength() ) { @@ -8307,7 +8307,7 @@ bool PDFWriterImpl::emitAdditionalStreams() beginCompression(); checkAndEnableStreamEncryption( rStream.m_nStreamObject ); - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xStream( new PDFStreamIf( this ) ); + css::uno::Reference< css::io::XOutputStream > xStream( new PDFStreamIf( this ) ); assert(rStream.m_pStream); if (!rStream.m_pStream) return false; @@ -10585,17 +10585,17 @@ void PDFWriterImpl::convertLineInfoToExtLineInfo( const LineInfo& rIn, PDFWriter // add LineCap switch(rIn.GetLineCap()) { - default: /* com::sun::star::drawing::LineCap_BUTT */ + default: /* css::drawing::LineCap_BUTT */ { rOut.m_eCap = PDFWriter::capButt; break; } - case com::sun::star::drawing::LineCap_ROUND: + case css::drawing::LineCap_ROUND: { rOut.m_eCap = PDFWriter::capRound; break; } - case com::sun::star::drawing::LineCap_SQUARE: + case css::drawing::LineCap_SQUARE: { rOut.m_eCap = PDFWriter::capSquare; break; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 23d27c54c526..3d7bf48b334e 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -521,9 +521,9 @@ public: std::list< PDFStructureElementKid > m_aKids; PDFStructAttributes m_aAttributes; Rectangle m_aBBox; - OUString m_aActualText; - OUString m_aAltText; - com::sun::star::lang::Locale m_aLocale; + OUString m_aActualText; + OUString m_aAltText; + css::lang::Locale m_aLocale; // m_aContents contains the element's marked content sequence // as pairs of (page nr, MCID) @@ -609,7 +609,7 @@ private: std::vector m_aLinks; /* makes correctly encoded for export to PDF URLS */ - com::sun::star::uno::Reference< com::sun::star::util::XURLTransformer > m_xTrans; + css::uno::Reference< css::util::XURLTransformer > m_xTrans; /* maps arbitrary link ids for structure attributes to real link ids (for setLinkPropertyId) */ @@ -1007,7 +1007,7 @@ i12626 static sal_Int32 computeAccessPermissions( const vcl::PDFWriter::PDFEncryptionProperties& i_rProperties, sal_Int32& o_rKeyLength, sal_Int32& o_rRC4KeyLength ); void setupDocInfo(); - bool prepareEncryption( const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& ); + bool prepareEncryption( const css::uno::Reference< css::beans::XMaterialHolder >& ); // helper for playMetafile void implWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, @@ -1024,10 +1024,10 @@ i12626 void appendStrokingColor( const Color& rColor, OStringBuffer& rBuffer ); void appendNonStrokingColor( const Color& rColor, OStringBuffer& rBuffer ); public: - PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >&, PDFWriter& ); + PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >&, PDFWriter& ); ~PDFWriterImpl(); - static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > + static css::uno::Reference< css::beans::XMaterialHolder > initEncryption( const OUString& i_rOwnerPassword, const OUString& i_rUserPassword, bool b128Bit ); @@ -1053,7 +1053,7 @@ public: PDFWriter::PDFVersion getVersion() const { return m_aContext.Version; } - void setDocumentLocale( const com::sun::star::lang::Locale& rLoc ) + void setDocumentLocale( const css::lang::Locale& rLoc ) { m_aContext.DocumentLocale = rLoc; } /* graphics state */ diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 3477fa8ef56d..8e47b843b136 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -1069,7 +1069,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa is not sufficient, since an rtl MD5 digest cannot be created in an arbitrary state which would be needed in PDFWriterImpl::computeEncryptionKey. */ -class EncHashTransporter : public cppu::WeakImplHelper < com::sun::star::beans::XMaterialHolder > +class EncHashTransporter : public cppu::WeakImplHelper < css::beans::XMaterialHolder > { rtlDigest maUDigest; sal_IntPtr maID; diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 6c7490798905..6d04c1e29d5e 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -540,7 +540,7 @@ bool SalGraphics::DrawPolyLine( const basegfx::B2DPolygon& i_rPolygon, double i_fTransparency, const basegfx::B2DVector& i_rLineWidth, basegfx::B2DLineJoin i_eLineJoin, - com::sun::star::drawing::LineCap i_eLineCap, + css::drawing::LineCap i_eLineCap, const OutputDevice* i_pOutDev ) { bool bRet = false; diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index c6987c1d2cb1..41a604bb19ef 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -155,9 +155,9 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, if ( !mpVirDev ) { // do not abort but throw an exception, may be the current thread terminates anyway (plugin-scenario) - throw ::com::sun::star::uno::RuntimeException( + throw css::uno::RuntimeException( OUString( "Could not create system bitmap!" ), - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); + css::uno::Reference< css::uno::XInterface >() ); } mnBitCount = ( nBitCount ? nBitCount : pOutDev->GetBitCount() ); diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 55a25df62cda..19f8a754458a 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -417,7 +417,7 @@ namespace vcl namespace { - class StandardColorSpace : public cppu::WeakImplHelper< com::sun::star::rendering::XColorSpace > + class StandardColorSpace : public cppu::WeakImplHelper< css::rendering::XColorSpace > { private: uno::Sequence< sal_Int8 > m_aComponentTags; diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index cbe7cd1833b4..d53303d9bbab 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -256,7 +256,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, for( int nPolyIdx = 0; nPolyIdx < nPolyCount; ++nPolyIdx ) { const ::basegfx::B2DPolygon aOnePoly = aB2DPolyPolygon.getB2DPolygon( nPolyIdx ); - mpGraphics->DrawPolyLine( aOnePoly, fTransparency, aHairlineWidth, ::basegfx::B2DLineJoin::NONE, com::sun::star::drawing::LineCap_BUTT, this ); + mpGraphics->DrawPolyLine( aOnePoly, fTransparency, aHairlineWidth, ::basegfx::B2DLineJoin::NONE, css::drawing::LineCap_BUTT, this ); } } diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index e0a708f78ff9..87af1209a5e4 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -124,7 +124,7 @@ ImplAccessibleInfos::~ImplAccessibleInfos() namespace vcl { -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::GetAccessible( bool bCreate ) +css::uno::Reference< css::accessibility::XAccessible > Window::GetAccessible( bool bCreate ) { // do not optimize hierarchy for the top level border win (ie, when there is no parent) /* // do not optimize accessible hierarchy at all to better reflect real VCL hierarchy @@ -144,13 +144,13 @@ namespace vcl { return mpWindowImpl->mxAccessible; } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > Window::CreateAccessible() { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc( GetComponentInterface(), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::accessibility::XAccessible > xAcc( GetComponentInterface(), css::uno::UNO_QUERY ); return xAcc; } -void Window::SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > x ) +void Window::SetAccessible( css::uno::Reference< css::accessibility::XAccessible > x ) { mpWindowImpl->mxAccessible = x; } diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index f65e69ec26d7..eb839d2298c8 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1726,7 +1726,7 @@ void ImplStdBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, sal void ImplBorderWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, sal_uInt16 nTypeStyle, - const ::com::sun::star::uno::Any& ) + const css::uno::Any& ) { ImplInit( pParent, nStyle, nTypeStyle, nullptr ); } @@ -1821,7 +1821,7 @@ ImplBorderWindow::ImplBorderWindow( vcl::Window* pParent, WinBits nStyle , sal_uInt16 nTypeStyle ) : Window( WINDOW_BORDERWINDOW ) { - ImplInit( pParent, nStyle, nTypeStyle, ::com::sun::star::uno::Any() ); + ImplInit( pParent, nStyle, nTypeStyle, css::uno::Any() ); } ImplBorderWindow::~ImplBorderWindow() diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 11f3c3c96fbd..3895ae2f4b50 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -396,7 +396,7 @@ vcl::Window* ImplFindAccelWindow( vcl::Window* pParent, sal_uInt16& rIndex, sal_ if ( !xCharClass.is() ) xCharClass = vcl::unohelper::CreateCharacterClassification(); - const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); + const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); cCharCode = xCharClass->toUpper( OUString(cCharCode), 0, 1, rLocale )[0]; if ( i < nFormEnd ) diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx index a436bdefa002..050b74983766 100644 --- a/vcl/source/window/dndevdis.cxx +++ b/vcl/source/window/dndevdis.cxx @@ -444,7 +444,7 @@ sal_Int32 DNDEventDispatcher::fireDragGestureEvent( vcl::Window *pWindow, const Reference< XDragSource >& xSource, const Any& event, const Point& rOrigin, const sal_Int8 nDragAction ) - throw(::com::sun::star::uno::RuntimeException) + throw(css::uno::RuntimeException) { sal_Int32 n = 0; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index b3fc00522b08..20950c6f23e6 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -481,7 +481,7 @@ public: virtual ~ImplPopupFloatWin(); virtual void dispose() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; @@ -525,7 +525,7 @@ void ImplPopupFloatWin::dispose() FloatingWindow::dispose(); } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ImplPopupFloatWin::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > ImplPopupFloatWin::CreateAccessible() { // switch off direct accessibilty support for this window @@ -533,7 +533,7 @@ void ImplPopupFloatWin::dispose() // as this window is only used as a helper for subtoolbars that are not teared-off, the parent toolbar // has to provide accessibility support (as implemented in the toolkit) // so the contained toolbar should appear as child of the correponsing toolbar item of the parent toolbar - return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >(); + return css::uno::Reference< css::accessibility::XAccessible >(); } vcl::Window* ImplPopupFloatWin::GetPreferredKeyInputWindow() diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 62e9e4fd7682..e4efb2667270 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -28,7 +28,7 @@ VclContainer::VclContainer(vcl::Window *pParent, WinBits nStyle) sal_uInt16 VclContainer::getDefaultAccessibleRole() const { - return com::sun::star::accessibility::AccessibleRole::PANEL; + return css::accessibility::AccessibleRole::PANEL; } Size VclContainer::GetOptimalSize() const @@ -327,9 +327,9 @@ sal_uInt16 VclBox::getDefaultAccessibleRole() const #if defined(WNT) //fdo#74284 call Boxes Panels, keep then as "Filler" under //at least Linux seeing as that's what Gtk does for GtkBoxes - return com::sun::star::accessibility::AccessibleRole::PANEL; + return css::accessibility::AccessibleRole::PANEL; #else - return com::sun::star::accessibility::AccessibleRole::FILLER; + return css::accessibility::AccessibleRole::FILLER; #endif } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index f12a855d48b4..7c36353f5a4e 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -146,13 +146,13 @@ Menu::~Menu() MenuFloatingWindow* pFloat = static_cast(pWindow.get()); if( pFloat->pMenu == this ) pFloat->pMenu = nullptr; - pWindow->SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() ); + pWindow->SetAccessible( css::uno::Reference< css::accessibility::XAccessible >() ); } // dispose accessible components if ( mxAccessible.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> xComponent( mxAccessible, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent> xComponent( mxAccessible, css::uno::UNO_QUERY ); if ( xComponent.is() ) xComponent->dispose(); } diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 327af121ba1d..2128f08cce28 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -87,7 +87,7 @@ void MenuFloatingWindow::doShutdown() } // free the reference to the accessible component - SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() ); + SetAccessible( css::uno::Reference< css::accessibility::XAccessible >() ); aHighlightChangedTimer.Stop(); diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index 9ccb441f2800..530e5ff626fa 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -72,7 +72,7 @@ sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey ) void MnemonicGenerator::RegisterMnemonic( const OUString& rKey ) { - const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); + const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); uno::Reference < i18n::XCharacterClassification > xCharClass = GetCharClass(); // Don't crash even when we don't have access to i18n service @@ -116,7 +116,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) if ( _rKey.isEmpty() || ImplFindMnemonic( _rKey ) ) return _rKey; - const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); + const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); uno::Reference < i18n::XCharacterClassification > xCharClass = GetCharClass(); // Don't crash even when we don't have access to i18n service diff --git a/vcl/source/window/mouseevent.cxx b/vcl/source/window/mouseevent.cxx index d4a493c71449..581c1643fc72 100644 --- a/vcl/source/window/mouseevent.cxx +++ b/vcl/source/window/mouseevent.cxx @@ -24,7 +24,7 @@ #include /** inits this vcl KeyEvent with all settings from the given awt event **/ -MouseEvent::MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent ) +MouseEvent::MouseEvent( const css::awt::MouseEvent& rEvent ) : maPos( rEvent.X, rEvent.Y ) , mnMode( MouseEventModifiers::NONE ) , mnClicks( static_cast< sal_uInt16 >( rEvent.ClickCount ) ) @@ -32,23 +32,23 @@ MouseEvent::MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent ) { if( rEvent.Modifiers ) { - if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::SHIFT) != 0 ) + if( (rEvent.Modifiers & css::awt::KeyModifier::SHIFT) != 0 ) mnCode |= KEY_SHIFT; - if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD1) != 0 ) + if( (rEvent.Modifiers & css::awt::KeyModifier::MOD1) != 0 ) mnCode |= KEY_MOD1; - if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD2) != 0 ) + if( (rEvent.Modifiers & css::awt::KeyModifier::MOD2) != 0 ) mnCode |= KEY_MOD2; - if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD3) != 0 ) + if( (rEvent.Modifiers & css::awt::KeyModifier::MOD3) != 0 ) mnCode |= KEY_MOD3; } if( rEvent.Buttons ) { - if( (rEvent.Buttons & ::com::sun::star::awt::MouseButton::LEFT) != 0 ) + if( (rEvent.Buttons & css::awt::MouseButton::LEFT) != 0 ) mnCode |= MOUSE_LEFT; - if( (rEvent.Buttons & ::com::sun::star::awt::MouseButton::RIGHT) != 0 ) + if( (rEvent.Buttons & css::awt::MouseButton::RIGHT) != 0 ) mnCode |= MOUSE_RIGHT; - if( (rEvent.Buttons & ::com::sun::star::awt::MouseButton::MIDDLE) != 0 ) + if( (rEvent.Buttons & css::awt::MouseButton::MIDDLE) != 0 ) mnCode |= MOUSE_MIDDLE; } } diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index e892c1d3c7be..6f84fbcd4778 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -456,7 +456,7 @@ Image ErrorBox::GetStandardImage() { ImplInitMsgBoxImageList(); } - catch (const ::com::sun::star::uno::Exception &) + catch (const css::uno::Exception &) { // During early bootstrap we can have no initialized // ucb and hence no ability to get this image, so nop. diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx index 500dede9626f..e54a4382c747 100644 --- a/vcl/source/window/settings.cxx +++ b/vcl/source/window/settings.cxx @@ -247,7 +247,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) "org.openoffice.Office.Common/Accessibility" ); // note: case sensitive ! if ( aNode.isValid() ) { - ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("AutoDetectSystemHC") ); + css::uno::Any aValue = aNode.getNodeValue( OUString("AutoDetectSystemHC") ); bool bTmp = false; if( aValue >>= bTmp ) bAutoHCMode = bTmp; diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index d353f4607d7d..218bcf6fcd60 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -922,7 +922,7 @@ void SystemWindow::SetMenuBar(MenuBar* pMenuBar) if ( pOldWindow ) { CallEventListeners( VCLEVENT_WINDOW_MENUBARREMOVED, static_cast(pOldMenuBar) ); - pOldWindow->SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() ); + pOldWindow->SetAccessible( css::uno::Reference< css::accessibility::XAccessible >() ); } if ( pMenuBar ) { diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 1de2f21de8d6..d8eb3289882f 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1997,7 +1997,7 @@ bool ToolBox::AlwaysLocked() { // feature enabled ? bool bStatesEnabled = bool(); - ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("StatesEnabled") ); + css::uno::Any aValue = aNode.getNodeValue( OUString("StatesEnabled") ); if( aValue >>= bStatesEnabled ) { if( bStatesEnabled ) @@ -2008,7 +2008,7 @@ bool ToolBox::AlwaysLocked() "/org.openoffice.Office.UI.GlobalSettings/Toolbars/States" ); // note: case sensitive ! bool bLocked = bool(); - ::com::sun::star::uno::Any aValue2 = aNode2.getNodeValue( OUString("Locked") ); + css::uno::Any aValue2 = aNode2.getNodeValue( OUString("Locked") ); if( aValue2 >>= bLocked ) nAlwaysLocked = bLocked ? 1 : 0; } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 544ea6e95d3a..ef4cb769e18e 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -475,9 +475,9 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool if( pMouseDownWin->ImplGetFrameData()->mbInternalDragGestureRecognizer ) { // query DropTarget from child window - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > xDragGestureRecognizer = - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > ( pMouseDownWin->ImplGetWindowImpl()->mxDNDListenerContainer, - ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > xDragGestureRecognizer = + css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > ( pMouseDownWin->ImplGetWindowImpl()->mxDNDListenerContainer, + css::uno::UNO_QUERY ); if( xDragGestureRecognizer.is() ) { @@ -487,10 +487,9 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool pMouseDownWin->ImplGetFrameData()->mnFirstMouseY ) ); // create a uno mouse event out of the available data - ::com::sun::star::awt::MouseEvent aMouseEvent( - static_cast < ::com::sun::star::uno::XInterface * > ( nullptr ), + css::awt::MouseEvent aMouseEvent( static_cast < css::uno::XInterface * > ( nullptr ), #ifdef MACOSX - nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3), + nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3), #else nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2), #endif @@ -503,12 +502,12 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool SolarMutexReleaser aReleaser; // FIXME: where do I get Action from ? - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > xDragSource = pMouseDownWin->GetDragSource(); + css::uno::Reference< css::datatransfer::dnd::XDragSource > xDragSource = pMouseDownWin->GetDragSource(); if( xDragSource.is() ) { static_cast < DNDListenerContainer * > ( xDragGestureRecognizer.get() )->fireDragGestureEvent( 0, - relLoc.X(), relLoc.Y(), xDragSource, ::com::sun::star::uno::makeAny( aMouseEvent ) ); + relLoc.X(), relLoc.Y(), xDragSource, css::uno::makeAny( aMouseEvent ) ); } } } diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 78dc4bb06e0d..cd32d25a8e57 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -67,11 +67,11 @@ void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentDat SetActivateMode( ActivateModeFlags::GrabFocus ); } -void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ) +void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, const css::uno::Any& aSystemWorkWindowToken ) { if( aSystemWorkWindowToken.hasValue() ) { - ::com::sun::star::uno::Sequence< sal_Int8 > aSeq; + css::uno::Sequence< sal_Int8 > aSeq; aSystemWorkWindowToken >>= aSeq; SystemParentData* pData = reinterpret_cast(aSeq.getArray()); DBG_ASSERT( aSeq.getLength() == sizeof( SystemParentData ) && pData->nSize == sizeof( SystemParentData ), "WorkWindow::WorkWindow( vcl::Window*, const Any&, WinBits ) called with invalid Any" ); @@ -95,7 +95,7 @@ WorkWindow::WorkWindow( vcl::Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -WorkWindow::WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : +WorkWindow::WorkWindow( vcl::Window* pParent, const css::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : SystemWindow( WINDOW_WORKWINDOW ) { ImplInitWorkWindowData(); @@ -142,12 +142,10 @@ void WorkWindow::ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScr { // Dispose of the canvas implementation, which might rely on // screen-specific system data. - com::sun::star::uno::Reference< com::sun::star::rendering::XCanvas > xCanvas( mpWindowImpl->mxCanvas ); + css::uno::Reference< css::rendering::XCanvas > xCanvas( mpWindowImpl->mxCanvas ); if( xCanvas.is() ) { - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > - xCanvasComponent( xCanvas, - com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent > xCanvasComponent( xCanvas, css::uno::UNO_QUERY ); if( xCanvasComponent.is() ) xCanvasComponent->dispose(); } diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index 498374287ed7..6e9f5678a3ba 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -47,8 +47,8 @@ using namespace x11; X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) : ::cppu::WeakComponentImplHelper< - ::com::sun::star::datatransfer::clipboard::XSystemClipboard, - ::com::sun::star::lang::XServiceInfo + css::datatransfer::clipboard::XSystemClipboard, + css::lang::XServiceInfo >( rManager.getMutex() ), m_rSelectionManager( rManager ), diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx index 3cff41d45125..e9021f46cdaf 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx @@ -34,14 +34,12 @@ namespace x11 { class SelectionManager; class DropTargetDropContext : - public ::cppu::WeakImplHelper< - ::com::sun::star::datatransfer::dnd::XDropTargetDropContext - > + public ::cppu::WeakImplHelper { ::Window m_aDropWindow; Time m_nTimestamp; SelectionManager& m_rManager; - com::sun::star::uno::Reference< XInterface > m_xManagerRef; + css::uno::Reference< XInterface > m_xManagerRef; public: DropTargetDropContext( ::Window, Time, SelectionManager& ); virtual ~DropTargetDropContext(); @@ -53,14 +51,12 @@ namespace x11 { }; class DropTargetDragContext : - public ::cppu::WeakImplHelper< - ::com::sun::star::datatransfer::dnd::XDropTargetDragContext - > + public ::cppu::WeakImplHelper { ::Window m_aDropWindow; Time m_nTimestamp; SelectionManager& m_rManager; - com::sun::star::uno::Reference< XInterface > m_xManagerRef; + css::uno::Reference< XInterface > m_xManagerRef; public: DropTargetDragContext( ::Window, Time, SelectionManager& ); virtual ~DropTargetDragContext(); @@ -71,14 +67,12 @@ namespace x11 { }; class DragSourceContext : - public ::cppu::WeakImplHelper< - ::com::sun::star::datatransfer::dnd::XDragSourceContext - > + public ::cppu::WeakImplHelper { ::Window m_aDropWindow; Time m_nTimestamp; SelectionManager& m_rManager; - com::sun::star::uno::Reference< XInterface > m_xManagerRef; + css::uno::Reference< XInterface > m_xManagerRef; public: DragSourceContext( ::Window, Time, SelectionManager& ); virtual ~DragSourceContext(); diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx index 23e590a73f67..413101f321e0 100644 --- a/vcl/unx/generic/dtrans/X11_droptarget.cxx +++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx @@ -46,7 +46,7 @@ DropTarget::~DropTarget() m_pSelectionManager->deregisterDropTarget( m_aTargetWindow ); } -void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) +void DropTarget::initialize( const Sequence< Any >& arguments ) throw( css::uno::Exception, std::exception ) { if( arguments.getLength() > 1 ) { diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index c3b6d3ad72b7..946aaf0a3b73 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -315,14 +315,14 @@ Cursor SelectionManager::createCursor( const unsigned char* pPointerData, const return aCursor; } -void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::com::sun::star::uno::Exception, std::exception) +void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (css::uno::Exception, std::exception) { osl::MutexGuard aGuard(m_aMutex); if( ! m_xDisplayConnection.is() ) { /* - * first argument must be a ::com::sun::star::awt::XDisplayConnection + * first argument must be a css::awt::XDisplayConnection * from this we will get the XEvents of the vcl event loop by * registering us as XEventHandler on it. * @@ -2796,7 +2796,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) m_nDropTimeout = time( nullptr ); // HACK :-) aGuard.clear(); - static_cast< X11Clipboard* >( pAdaptor )->setContents( m_xDragSourceTransferable, css::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >() ); + static_cast< X11Clipboard* >( pAdaptor )->setContents( m_xDragSourceTransferable, css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >() ); aGuard.reset(); bCancel = false; } @@ -3305,7 +3305,7 @@ void SelectionManager::startDrag( m_bDropSuccess = false; m_bWaitingForPrimaryConversion = false; m_nDragButton = Button1; // default to left button - com::sun::star::awt::MouseEvent aEvent; + css::awt::MouseEvent aEvent; if( trigger.Event >>= aEvent ) { if( aEvent.Buttons & MouseButton::LEFT ) @@ -3801,15 +3801,15 @@ sal_Bool SelectionManager::handleEvent(const Any& event) return true; } -void SAL_CALL SelectionManager::disposing( const ::com::sun::star::lang::EventObject& rEvt ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SelectionManager::disposing( const css::lang::EventObject& rEvt ) + throw( css::uno::RuntimeException, std::exception ) { if (rEvt.Source == m_xDesktop || rEvt.Source == m_xDisplayConnection) shutdown(); } -void SAL_CALL SelectionManager::queryTermination( const ::com::sun::star::lang::EventObject& ) - throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SelectionManager::queryTermination( const css::lang::EventObject& ) + throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception ) { } @@ -3818,8 +3818,8 @@ void SAL_CALL SelectionManager::queryTermination( const ::com::sun::star::lang:: * the downing event can be too late if paste are requested during shutdown and ~SfxApplication * has been called before vcl is shutdown */ -void SAL_CALL SelectionManager::notifyTermination( const ::com::sun::star::lang::EventObject& rEvent ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SelectionManager::notifyTermination( const css::lang::EventObject& rEvent ) + throw( css::uno::RuntimeException, std::exception ) { disposing(rEvent); } @@ -3986,7 +3986,7 @@ SelectionManagerHolder::~SelectionManagerHolder() { } -void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) +void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( css::uno::Exception, std::exception ) { OUString aDisplayName; @@ -4021,10 +4021,10 @@ sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw( } void SelectionManagerHolder::startDrag( - const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger, + const css::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, - const css::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable, - const css::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener >& listener + const css::uno::Reference< css::datatransfer::XTransferable >& transferable, + const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener ) throw(std::exception) { if( m_xRealDragSource.is() ) diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx index 2c2ee5e4b8e2..66a454a5583b 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.hxx +++ b/vcl/unx/generic/dtrans/X11_transferable.hxx @@ -28,8 +28,7 @@ namespace x11 { - class X11Transferable : public ::cppu::WeakImplHelper < - ::com::sun::star::datatransfer::XTransferable > + class X11Transferable : public ::cppu::WeakImplHelper< css::datatransfer::XTransferable > { SelectionManager& m_rManager; Atom m_aSelection; @@ -41,17 +40,17 @@ namespace x11 { * XTransferable */ - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw(::com::sun::star::datatransfer::UnsupportedFlavorException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) + throw(css::datatransfer::UnsupportedFlavorException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) + throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) + throw(css::uno::RuntimeException, std::exception) override; }; } // namespace diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index 10db3f0dc24d..863522b80a17 100644 --- a/vcl/unx/generic/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx @@ -32,7 +32,7 @@ class DtransX11ConfigItem : public ::utl::ConfigItem { sal_Int32 m_nSelectionTimeout; - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override; virtual void ImplCommit() override; public: diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index 3e333bd27e3e..745f52f8f4e2 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -1576,7 +1576,7 @@ bool X11SalGraphicsImpl::drawPolyLine( double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin eLineJoin, - com::sun::star::drawing::LineCap eLineCap) + css::drawing::LineCap eLineCap) { const bool bIsHairline = (rLineWidth.getX() == rLineWidth.getY()) && (rLineWidth.getX() <= 1.2); diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx index 19e02009b567..5031faf9bbc6 100644 --- a/vcl/unx/generic/gdi/gdiimpl.hxx +++ b/vcl/unx/generic/gdi/gdiimpl.hxx @@ -160,7 +160,7 @@ public: double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, - com::sun::star::drawing::LineCap) override; + css::drawing::LineCap) override; virtual bool drawPolyLineBezier( sal_uInt32 nPoints, diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index ebe6a89a25b1..395da5ae5588 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -753,16 +753,15 @@ bool X11SalBitmap::Create( const SalBitmap&, sal_uInt16 ) } bool X11SalBitmap::Create( - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rBitmapCanvas, + const css::uno::Reference< css::rendering::XBitmapCanvas >& rBitmapCanvas, Size& rSize, bool bMask ) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > - xFastPropertySet( rBitmapCanvas, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XFastPropertySet > xFastPropertySet( rBitmapCanvas, css::uno::UNO_QUERY ); if( xFastPropertySet.get() ) { sal_Int32 depth; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > args; + css::uno::Sequence< css::uno::Any > args; if( xFastPropertySet->getFastPropertyValue(bMask ? 2 : 1) >>= args ) { long pixmapHandle; diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index a6fba00c0143..738d59bf769c 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -545,7 +545,7 @@ bool X11SalGraphics::drawPolyLine( double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin eLineJoin, - com::sun::star::drawing::LineCap eLineCap) + css::drawing::LineCap eLineCap) { return mxImpl->drawPolyLine( rPolygon, fTransparency, rLineWidth, eLineJoin, eLineCap ); diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 77bc1648ca37..8ae6e0139b54 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -49,8 +49,8 @@ namespace psp { struct LocaleEqual { - bool operator()(const com::sun::star::lang::Locale& i_rLeft, - const com::sun::star::lang::Locale& i_rRight) const + bool operator()(const css::lang::Locale& i_rLeft, + const css::lang::Locale& i_rRight) const { return i_rLeft.Language.equals( i_rRight.Language ) && i_rLeft.Country.equals( i_rRight.Country ) && @@ -60,7 +60,7 @@ namespace psp struct LocaleHash { - size_t operator()(const com::sun::star::lang::Locale& rLocale) const + size_t operator()(const css::lang::Locale& rLocale) const { return (size_t)rLocale.Language.hashCode() ^ (size_t)rLocale.Country.hashCode() @@ -82,20 +82,20 @@ namespace psp const OUString& i_rOption, const OUString& i_rValue, const OUString& i_rTranslation, - const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() + const css::lang::Locale& i_rLocale = css::lang::Locale() ); void insertOption( const OUString& i_rKey, const OUString& i_rOption, const OUString& i_rTranslation, - const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) + const css::lang::Locale& i_rLocale = css::lang::Locale() ) { insertValue( i_rKey, i_rOption, OUString(), i_rTranslation, i_rLocale ); } void insertKey( const OUString& i_rKey, const OUString& i_rTranslation, - const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) + const css::lang::Locale& i_rLocale = css::lang::Locale() ) { insertValue( i_rKey, OUString(), OUString(), i_rTranslation, i_rLocale ); } @@ -104,29 +104,29 @@ namespace psp const OUString& i_rKey, const OUString& i_rOption, const OUString& i_rValue, - const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() + const css::lang::Locale& i_rLocale = css::lang::Locale() ) const; OUString translateOption( const OUString& i_rKey, const OUString& i_rOption, - const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const + const css::lang::Locale& i_rLocale = css::lang::Locale() ) const { return translateValue( i_rKey, i_rOption, OUString(), i_rLocale ); } OUString translateKey( const OUString& i_rKey, - const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const + const css::lang::Locale& i_rLocale = css::lang::Locale() ) const { return translateValue( i_rKey, OUString(), OUString(), i_rLocale ); } }; - static com::sun::star::lang::Locale normalizeInputLocale( - const com::sun::star::lang::Locale& i_rLocale, + static css::lang::Locale normalizeInputLocale( + const css::lang::Locale& i_rLocale, bool bInsertDefault = false ) { - com::sun::star::lang::Locale aLoc( i_rLocale ); + css::lang::Locale aLoc( i_rLocale ); if( bInsertDefault && aLoc.Language.isEmpty() ) { // empty locale requested, fill in application UI locale @@ -160,7 +160,7 @@ namespace psp const OUString& i_rOption, const OUString& i_rValue, const OUString& i_rTranslation, - const com::sun::star::lang::Locale& i_rLocale + const css::lang::Locale& i_rLocale ) { OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 ); @@ -178,7 +178,7 @@ namespace psp if( !aKey.isEmpty() && !i_rTranslation.isEmpty() ) { OUString aK( aKey.makeStringAndClear() ); - com::sun::star::lang::Locale aLoc; + css::lang::Locale aLoc; /* FIXME-BCP47: using Variant, uppercase? */ aLoc.Language = i_rLocale.Language.toAsciiLowerCase(); aLoc.Country = i_rLocale.Country.toAsciiUpperCase(); @@ -191,7 +191,7 @@ namespace psp const OUString& i_rKey, const OUString& i_rOption, const OUString& i_rValue, - const com::sun::star::lang::Locale& i_rLocale + const css::lang::Locale& i_rLocale ) const { OUString aResult; @@ -216,7 +216,7 @@ namespace psp { const translation_map& rMap( it->second ); - com::sun::star::lang::Locale aLoc( normalizeInputLocale( i_rLocale, true ) ); + css::lang::Locale aLoc( normalizeInputLocale( i_rLocale, true ) ); /* FIXME-BCP47: use LanguageTag::getFallbackStrings()? */ for( int nTry = 0; nTry < 4; nTry++ ) { @@ -986,7 +986,7 @@ void PPDParser::parse( ::std::list< OString >& rLines ) /* FIXME-BCP47: really only ISO 639-1 two character language codes? * goodnight.. */ bool bIsGlobalizedLine = false; - com::sun::star::lang::Locale aTransLocale; + css::lang::Locale aTransLocale; if( ( aUniKey.getLength() > 3 && aUniKey[ 2 ] == '.' ) || ( aUniKey.getLength() > 5 && aUniKey[ 2 ] == '_' && aUniKey[ 5 ] == '.' ) ) { @@ -1474,7 +1474,7 @@ void PPDParser::getDefaultResolution( int& rXRes, int& rYRes ) const } OUString PPDParser::translateKey( const OUString& i_rKey, - const com::sun::star::lang::Locale& i_rLocale ) const + const css::lang::Locale& i_rLocale ) const { OUString aResult( m_pTranslator->translateKey( i_rKey, i_rLocale ) ); if( aResult.isEmpty() ) @@ -1484,7 +1484,7 @@ OUString PPDParser::translateKey( const OUString& i_rKey, OUString PPDParser::translateOption( const OUString& i_rKey, const OUString& i_rOption, - const com::sun::star::lang::Locale& i_rLocale ) const + const css::lang::Locale& i_rLocale ) const { OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption, i_rLocale ) ); if( aResult.isEmpty() ) diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 781721b511fa..c0e3e75e36ec 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -537,7 +537,7 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen (mpParent ? mpParent->mnIconID : 1), 32, Hints.icon_pixmap, Hints.icon_mask, netwm_icon ); } - catch( com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { // can happen - no ucb during early startup } diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx index 20c194073cdb..a26e825a3b09 100644 --- a/vcl/unx/gtk/a11y/atklistener.hxx +++ b/vcl/unx/gtk/a11y/atklistener.hxx @@ -27,18 +27,18 @@ #include "atkwrapper.hxx" -class AtkListener : public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessibleEventListener > +class AtkListener : public ::cppu::WeakImplHelper< css::accessibility::XAccessibleEventListener > { public: explicit AtkListener(AtkObjectWrapper * pWrapper); // XEventListener - virtual void disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void disposing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; // XAccessibleEventListener - virtual void notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) + throw( css::uno::RuntimeException, std::exception ) override; AtkObjectWrapper *mpWrapper; std::vector< css::uno::Reference< css::accessibility::XAccessible > > @@ -55,17 +55,17 @@ private: // Process CHILD_EVENT notifications with a new child added void handleChildAdded( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& rxParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxChild); + const css::uno::Reference< css::accessibility::XAccessibleContext >& rxParent, + const css::uno::Reference< css::accessibility::XAccessible>& rxChild); // Process CHILD_EVENT notifications with a child removed void handleChildRemoved( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& rxParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxChild); + const css::uno::Reference< css::accessibility::XAccessibleContext >& rxParent, + const css::uno::Reference< css::accessibility::XAccessible>& rxChild); // Process INVALIDATE_ALL_CHILDREN notification void handleInvalidateChildren( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& rxParent); + const css::uno::Reference< css::accessibility::XAccessibleContext >& rxParent); }; #endif // INCLUDED_VCL_UNX_GTK_A11Y_ATKLISTENER_HXX diff --git a/vcl/unx/gtk/a11y/atkregistry.hxx b/vcl/unx/gtk/a11y/atkregistry.hxx index b25e449df474..b692290847d8 100644 --- a/vcl/unx/gtk/a11y/atkregistry.hxx +++ b/vcl/unx/gtk/a11y/atkregistry.hxx @@ -23,9 +23,9 @@ #include #include -AtkObject * ooo_wrapper_registry_get(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible); +AtkObject * ooo_wrapper_registry_get(const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible); -void ooo_wrapper_registry_add(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible, AtkObject *obj); +void ooo_wrapper_registry_add(const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible, AtkObject *obj); void ooo_wrapper_registry_remove( css::uno::Reference const & pAccessible); diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx index 28f2306fadf6..c38c43231d6f 100644 --- a/vcl/unx/gtk/a11y/atktext.cxx +++ b/vcl/unx/gtk/a11y/atktext.cxx @@ -435,22 +435,22 @@ handle_text_markup_as_run_attribute( css::uno::Reference& rAttributeList ) + const css::uno::Sequence< css::beans::PropertyValue >& rAttributeList ) { for( sal_Int32 i = 0; i < rAttributeList.getLength(); i++ ) { diff --git a/vcl/unx/gtk/a11y/atktextattributes.hxx b/vcl/unx/gtk/a11y/atktextattributes.hxx index cc78e1a836ef..f86c82f4fe09 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.hxx +++ b/vcl/unx/gtk/a11y/atktextattributes.hxx @@ -28,7 +28,7 @@ AtkAttributeSet* attribute_set_new_from_property_values( - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAttributeList, + const css::uno::Sequence< css::beans::PropertyValue >& rAttributeList, bool run_attributes_only, AtkText *text); @@ -39,7 +39,7 @@ attribute_set_new_from_extended_attributes( bool attribute_set_map_to_property_values( AtkAttributeSet* attribute_set, - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rValueList ); + css::uno::Sequence< css::beans::PropertyValue >& rValueList ); AtkAttributeSet* attribute_set_prepend_misspelled( AtkAttributeSet* attribute_set ); // #i92232# diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index 2dad164d9706..2c3e78b8dd66 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -798,7 +798,7 @@ atk_object_wrapper_ref( const uno::Reference< accessibility::XAccessible > &rxAc } AtkObject * -atk_object_wrapper_new( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible, +atk_object_wrapper_new( const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible, AtkObject* parent ) { g_return_val_if_fail( rxAccessible.get() != nullptr, NULL ); diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx index 939071316692..4a023fa6e4b9 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.hxx +++ b/vcl/unx/gtk/a11y/atkwrapper.hxx @@ -77,11 +77,11 @@ struct _AtkObjectWrapperClass GType atk_object_wrapper_get_type() G_GNUC_CONST; AtkObject * atk_object_wrapper_ref( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible, + const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible, bool create = true ); AtkObject * atk_object_wrapper_new( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible, + const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible, AtkObject* parent = nullptr ); void atk_object_wrapper_add_child(AtkObjectWrapper* wrapper, AtkObject *child, gint index); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 79b9b58859a2..9798639e58f9 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -1984,8 +1984,7 @@ SalGtkFilePicker::~SalGtkFilePicker() using namespace ::com::sun::star; uno::Reference< ui::dialogs::XFilePicker2 > -GtkInstance::createFilePicker( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > &xMSF ) +GtkInstance::createFilePicker( const css::uno::Reference< css::uno::XComponentContext > &xMSF ) { return uno::Reference< ui::dialogs::XFilePicker2 >( new SalGtkFilePicker( xMSF ) ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index c825439f1b55..e602baaff29f 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -44,10 +44,10 @@ typedef ::std::list < ElementEntry_Impl > ElementList; // class declaration typedef cppu::WeakComponentImplHelper< - ::com::sun::star::ui::dialogs::XFilePickerControlAccess, - ::com::sun::star::ui::dialogs::XFilePreview, - ::com::sun::star::ui::dialogs::XFilePicker3, - ::com::sun::star::lang::XInitialization + css::ui::dialogs::XFilePickerControlAccess, + css::ui::dialogs::XFilePreview, + css::ui::dialogs::XFilePicker3, + css::lang::XInitialization > SalGtkFilePicker_Base; class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base @@ -55,111 +55,111 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base public: // constructor - SalGtkFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); + SalGtkFilePicker( const css::uno::Reference< css::uno::XComponentContext >& xServiceMgr ); // XFilePickerNotifier - virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; // XExecutableDialog functions virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL execute() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XFilePicker functions virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDefaultName( const OUString& aName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) - throw( com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getDisplayDirectory( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getFiles( ) + throw( css::uno::RuntimeException, std::exception ) override; // XFilePicker2 functions - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() + throw (css::uno::RuntimeException, std::exception) override; // XFilterManager functions virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getCurrentFilter( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& aValue ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) - throw(::com::sun::star::uno::RuntimeException, std::exception ) override; + throw(css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XFilePreview - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getTargetColorDepth( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAvailableWidth( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAvailableHeight( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& aImage ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL getShowState( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XCancellable virtual void SAL_CALL cancel( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // FilePicker Event functions @@ -172,12 +172,12 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base void ensureFilterList( const OUString& _rInitialCurrentFilter ); - void impl_fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); - void impl_directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); - void impl_controlStateChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); + void impl_fileSelectionChanged( css::ui::dialogs::FilePickerEvent aEvent ); + void impl_directoryChanged( css::ui::dialogs::FilePickerEvent aEvent ); + void impl_controlStateChanged( css::ui::dialogs::FilePickerEvent aEvent ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > + css::uno::Reference< css::ui::dialogs::XFilePickerListener > m_xListener; OUString msPlayLabel; FilterList *m_pFilterList; @@ -245,14 +245,14 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base void implChangeType( GtkTreeSelection *selection ); GtkFileFilter * implAddFilter( const OUString& rFilter, const OUString& rType ); void implAddFilterGroup( const OUString& rFilter, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair>& _rFilters ); + const css::uno::Sequence< css::beans::StringPair>& _rFilters ); void updateCurrentFilterFromName(const gchar* filtername); void unselect_type(); void InitialMapping(); void HandleSetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction, - const ::com::sun::star::uno::Any& rValue); - static ::com::sun::star::uno::Any HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction); + const css::uno::Any& rValue); + static css::uno::Any HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction); static void expander_changed_cb( GtkExpander *expander, SalGtkFilePicker *pobjFP ); static void preview_toggled_cb( GObject *cb, SalGtkFilePicker *pobjFP ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index d2e7ab749cb7..9e2955796c8e 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -28,41 +28,40 @@ #include "gtk/fpicker/SalGtkPicker.hxx" class SalGtkFolderPicker : - public SalGtkPicker, - public cppu::WeakImplHelper< - ::com::sun::star::ui::dialogs::XFolderPicker2 > + public SalGtkPicker, + public cppu::WeakImplHelper< css::ui::dialogs::XFolderPicker2 > { public: // constructor - SalGtkFolderPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); + SalGtkFolderPicker( const css::uno::Reference< css::uno::XComponentContext >& xServiceMgr ); // XExecutableDialog functions virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL execute( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XFolderPicker functions virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) - throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getDisplayDirectory( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getDirectory( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDescription( const OUString& rDescription ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCancellable virtual void SAL_CALL cancel( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: SalGtkFolderPicker( const SalGtkFolderPicker& ) = delete; diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index 701cd627c364..26b2740bb79f 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -154,13 +154,13 @@ void SAL_CALL RunDialog::windowOpened(const css::lang::EventObject& e) g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, reinterpret_cast(canceldialog), this, nullptr); } -void SAL_CALL RunDialog::queryTermination( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL RunDialog::queryTermination( const css::lang::EventObject& ) + throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) { } -void SAL_CALL RunDialog::notifyTermination( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL RunDialog::notifyTermination( const css::lang::EventObject& ) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index 17a32b5f46e0..be74e669e979 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -43,25 +43,25 @@ class SalGtkPicker { public: - SalGtkPicker( const ::com::sun::star::uno::Reference& xContext ); + SalGtkPicker( const css::uno::Reference& xContext ); virtual ~SalGtkPicker(); protected: osl::Mutex m_rbHelperMtx; GtkWidget *m_pDialog; protected: void SAL_CALL implsetTitle( const OUString& aTitle ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory ) - throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); + throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ); OUString SAL_CALL implgetDisplayDirectory( ) - throw( com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); OUString uritounicode(const gchar *pIn); OString unicodetouri(const OUString &rURL); // to instantiate own services - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; static OUString getResString( sal_Int32 aId ); }; @@ -73,44 +73,44 @@ class SalGtkPicker //https://bugzilla.redhat.com/show_bug.cgi?id=441108 class RunDialog : public cppu::WeakComponentImplHelper< - ::com::sun::star::awt::XTopWindowListener, - ::com::sun::star::frame::XTerminateListener > + css::awt::XTopWindowListener, + css::frame::XTerminateListener > { private: osl::Mutex maLock; GtkWidget *mpDialog; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit> mxToolkit; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop > mxDesktop; + css::uno::Reference< css::awt::XExtendedToolkit> mxToolkit; + css::uno::Reference< css::frame::XDesktop > mxDesktop; public: // XTopWindowListener using cppu::WeakComponentImplHelperBase::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL disposing( const css::lang::EventObject& ) + throw(css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowClosing( const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL windowClosed( const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL windowMinimized( const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL windowNormalized( const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL windowActivated( const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) override {} // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) + throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) + throw(css::uno::RuntimeException, std::exception) override; public: RunDialog(GtkWidget *pDialog, - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit, - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop > &rDesktop + css::uno::Reference< css::awt::XExtendedToolkit > &rToolkit, + css::uno::Reference< css::frame::XDesktop > &rDesktop ); virtual ~RunDialog(); gint run(); diff --git a/vcl/unx/gtk/fpicker/eventnotification.hxx b/vcl/unx/gtk/fpicker/eventnotification.hxx index 0697e2599ffe..88a472e0e8ce 100644 --- a/vcl/unx/gtk/fpicker/eventnotification.hxx +++ b/vcl/unx/gtk/fpicker/eventnotification.hxx @@ -35,7 +35,7 @@ class CEventNotification public: virtual ~CEventNotification() { }; - virtual void SAL_CALL notifyEventListener( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xListener ) = 0; + virtual void SAL_CALL notifyEventListener( css::uno::Reference< css::uno::XInterface > xListener ) = 0; }; #endif diff --git a/vcl/unx/kde/UnxCommandThread.hxx b/vcl/unx/kde/UnxCommandThread.hxx index a3fddefcbfa6..35d79cc825f9 100644 --- a/vcl/unx/kde/UnxCommandThread.hxx +++ b/vcl/unx/kde/UnxCommandThread.hxx @@ -81,19 +81,19 @@ protected: ::osl::Mutex m_aMutex; YieldingCondition m_aExecCondition; - bool m_aResult; + bool m_aResult; ::osl::Condition m_aGetCurrentFilterCondition; - OUString m_aGetCurrentFilter; + OUString m_aGetCurrentFilter; ::osl::Condition m_aGetDirectoryCondition; - OUString m_aGetDirectory; + OUString m_aGetDirectory; ::osl::Condition m_aGetFilesCondition; - ::std::list< OUString > m_aGetFiles; + ::std::list< OUString > m_aGetFiles; ::osl::Condition m_aGetValueCondition; - ::com::sun::star::uno::Any m_aGetValue; + css::uno::Any m_aGetValue; public: UnxFilePickerCommandThread( UnxFilePickerNotifyThread *pNotifyThread, int nReadFD ); @@ -109,11 +109,11 @@ public: OUString SAL_CALL getDirectory(); ::osl::Condition& SAL_CALL getFilesCondition() { return m_aGetFilesCondition; } - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles(); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles(); + css::uno::Sequence< OUString > SAL_CALL getSelectedFiles(); + css::uno::Sequence< OUString > SAL_CALL getFiles(); ::osl::Condition& SAL_CALL getValueCondition() { return m_aGetValueCondition; } - ::com::sun::star::uno::Any SAL_CALL getValue(); + css::uno::Any SAL_CALL getValue(); protected: virtual void SAL_CALL run() override; diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index 60b1b46ae1a7..047741bc5f6e 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -856,7 +856,7 @@ void UnxFilePicker::initFilePicker() return; } -void UnxFilePicker::checkFilePicker() throw( ::com::sun::star::uno::RuntimeException ) +void UnxFilePicker::checkFilePicker() throw( css::uno::RuntimeException ) { if ( m_nFilePickerPid > 0 ) { diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx index a50c1ebd909c..30e4d42a27be 100644 --- a/vcl/unx/kde/UnxFilePicker.hxx +++ b/vcl/unx/kde/UnxFilePicker.hxx @@ -45,11 +45,11 @@ protected: }; typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::ui::dialogs::XFilePicker3, - ::com::sun::star::ui::dialogs::XFilePickerControlAccess, -// TODO ::com::sun::star::ui::dialogs::XFilePreview, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::lang::XServiceInfo > UnxFilePicker_Base; + css::ui::dialogs::XFilePicker3, + css::ui::dialogs::XFilePickerControlAccess, +// TODO css::ui::dialogs::XFilePreview, + css::lang::XInitialization, + css::lang::XServiceInfo > UnxFilePicker_Base; class UnxFilePicker : public UnxFilePickerDummy, @@ -67,7 +67,7 @@ protected: ResMgr *m_pResMgr; public: - explicit UnxFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + explicit UnxFilePicker( const css::uno::Reference< css::uno::XComponentContext >& ); virtual ~UnxFilePicker(); // XComponent @@ -76,73 +76,73 @@ public: // XFilePickerNotifier - virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override; // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int16 SAL_CALL execute() throw( css::uno::RuntimeException, std::exception ) override; // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getDisplayDirectory() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getFiles() throw( css::uno::RuntimeException, std::exception ) override; // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getCurrentFilter() throw( css::uno::RuntimeException, std::exception ) override; // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (css::uno::RuntimeException, std::exception) override; /* TODO XFilePreview - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getTargetColorDepth( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAvailableWidth( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAvailableHeight( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any &rImage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException); + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getTargetColorDepth( ) throw (css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAvailableWidth( ) throw (css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAvailableHeight( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any &rImage ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL getShowState( ) throw (css::uno::RuntimeException); */ // XFilePicker2 - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() + throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any > &rArguments ) throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL cancel( ) throw( css::uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject &rEvent ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL disposing( const css::lang::EventObject &rEvent ) throw( css::uno::RuntimeException ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; private: UnxFilePicker( const UnxFilePicker& ) = delete; @@ -150,7 +150,7 @@ private: protected: void initFilePicker(); - void checkFilePicker() throw( ::com::sun::star::uno::RuntimeException ); + void checkFilePicker() throw( css::uno::RuntimeException ); // Async sendCommand void sendCommand( const OUString &rCommand ); diff --git a/vcl/unx/kde/UnxNotifyThread.hxx b/vcl/unx/kde/UnxNotifyThread.hxx index 439ee6bf3bb1..5847e22a282b 100644 --- a/vcl/unx/kde/UnxNotifyThread.hxx +++ b/vcl/unx/kde/UnxNotifyThread.hxx @@ -43,9 +43,9 @@ protected: ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener; + css::uno::Reference< css::ui::dialogs::XFilePickerListener > m_xListener; - bool m_bExit; + bool m_bExit; ::osl::Condition m_aExitCondition; NotifyType m_eNotifyType; @@ -55,18 +55,18 @@ protected: public: UnxFilePickerNotifyThread( UnxFilePicker *pUnxFilePicker ); - virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) + throw( css::uno::RuntimeException ); + virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) + throw( css::uno::RuntimeException ); void SAL_CALL exit(); void SAL_CALL fileSelectionChanged(); /* TODO - void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); - OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const; - void SAL_CALL controlStateChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); + void SAL_CALL directoryChanged( css::ui::dialogs::FilePickerEvent aEvent ); + OUString SAL_CALL helpRequested( css::ui::dialogs::FilePickerEvent aEvent ) const; + void SAL_CALL controlStateChanged( css::ui::dialogs::FilePickerEvent aEvent ); void SAL_CALL dialogSizeChanged( ); */ diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 9b738f7bdd31..0d1455f27c4b 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1765,7 +1765,7 @@ static Color readColor( KConfig *pConfig, const char *pKey ) Mostly grabbed from the Gtk+ vclplug (salnativewidgets-gtk.cxx). */ -static vcl::Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& rLocale ) +static vcl::Font toFont( const QFont &rQFont, const css::lang::Locale& rLocale ) { psp::FastPrintFontInfo aInfo; QFontInfo qFontInfo( rQFont ); diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 225f361032c8..d1c718dc59b6 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -158,12 +158,12 @@ KDE4FilePicker::KDE4FilePicker( const uno::Reference& ) this, SLOT( getCurrentFilterSlot() ), Qt::BlockingQueuedConnection ); // XFilterGroupManager functions - connect( this, SIGNAL( appendFilterGroupSignal( const OUString &, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > & ) ), - this, SLOT( appendFilterGroupSlot( const OUString &, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > & ) ), Qt::BlockingQueuedConnection ); + connect( this, SIGNAL( appendFilterGroupSignal( const OUString &, const css::uno::Sequence< css::beans::StringPair > & ) ), + this, SLOT( appendFilterGroupSlot( const OUString &, const css::uno::Sequence< css::beans::StringPair > & ) ), Qt::BlockingQueuedConnection ); // XFilePickerControlAccess functions - connect( this, SIGNAL( setValueSignal( sal_Int16, sal_Int16, const ::com::sun::star::uno::Any & ) ), - this, SLOT( setValueSlot( sal_Int16, sal_Int16, const ::com::sun::star::uno::Any & ) ), Qt::BlockingQueuedConnection ); + connect( this, SIGNAL( setValueSignal( sal_Int16, sal_Int16, const css::uno::Any & ) ), + this, SLOT( setValueSlot( sal_Int16, sal_Int16, const css::uno::Any & ) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( getValueSignal( sal_Int16, sal_Int16 ) ), this, SLOT( getValueSlot( sal_Int16, sal_Int16 ) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( enableControlSignal( sal_Int16, bool ) ), @@ -178,8 +178,8 @@ KDE4FilePicker::KDE4FilePicker( const uno::Reference& ) this, SLOT( getSelectedFilesSlot() ), Qt::BlockingQueuedConnection ); // XInitialization - connect( this, SIGNAL( initializeSignal( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & ) ), - this, SLOT( initializeSlot( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & ) ), Qt::BlockingQueuedConnection ); + connect( this, SIGNAL( initializeSignal( const css::uno::Sequence< css::uno::Any > & ) ), + this, SLOT( initializeSlot( const css::uno::Sequence< css::uno::Any > & ) ), Qt::BlockingQueuedConnection ); // Destructor proxy connect( this, SIGNAL( cleanupProxySignal() ), this, SLOT( cleanupProxy() ), Qt::BlockingQueuedConnection ); diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx index 17a18398cf41..65cb01a6e2d5 100644 --- a/vcl/unx/kde4/KDE4FilePicker.hxx +++ b/vcl/unx/kde4/KDE4FilePicker.hxx @@ -41,11 +41,11 @@ class QWidget; class QLayout; typedef ::cppu::WeakComponentImplHelper -< ::com::sun::star::ui::dialogs::XFilePicker3 -, ::com::sun::star::ui::dialogs::XFilePickerControlAccess -// TODO ::com::sun::star::ui::dialogs::XFilePreview -, ::com::sun::star::lang::XInitialization -, ::com::sun::star::lang::XServiceInfo +< css::ui::dialogs::XFilePicker3 +, css::ui::dialogs::XFilePickerControlAccess +// TODO css::ui::dialogs::XFilePreview +, css::lang::XInitialization +, css::lang::XServiceInfo > KDE4FilePicker_Base; class KDE4FilePicker @@ -55,7 +55,7 @@ class KDE4FilePicker Q_OBJECT protected: - ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener; + css::uno::Reference< css::ui::dialogs::XFilePickerListener > m_xListener; //the dialog to display KFileDialog* _dialog; @@ -79,101 +79,101 @@ protected: bool allowRemoteUrls; public: - explicit KDE4FilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + explicit KDE4FilePicker( const css::uno::Reference< css::uno::XComponentContext >& ); virtual ~KDE4FilePicker(); // XFilePickerNotifier - virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override; // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int16 SAL_CALL execute() throw( css::uno::RuntimeException, std::exception ) override; // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getDisplayDirectory() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getFiles() throw( css::uno::RuntimeException, std::exception ) override; // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getCurrentFilter() throw( css::uno::RuntimeException, std::exception ) override; // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (css::uno::RuntimeException, std::exception) override; /* TODO XFilePreview - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getTargetColorDepth( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAvailableWidth( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAvailableHeight( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any &rImage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException); + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getTargetColorDepth( ) throw (css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAvailableWidth( ) throw (css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAvailableHeight( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any &rImage ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL getShowState( ) throw (css::uno::RuntimeException); */ // XFilePicker2 functions - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() + throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any > &rArguments ) throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL cancel( ) throw( css::uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject &rEvent ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL disposing( const css::lang::EventObject &rEvent ) throw( css::uno::RuntimeException ); using cppu::WeakComponentImplHelperBase::disposing; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; private Q_SLOTS: // XExecutableDialog functions - void setTitleSlot( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException ) { return setTitle( rTitle ); } - sal_Int16 executeSlot() throw( ::com::sun::star::uno::RuntimeException ) { return execute(); } + void setTitleSlot( const OUString &rTitle ) throw( css::uno::RuntimeException ) { return setTitle( rTitle ); } + sal_Int16 executeSlot() throw( css::uno::RuntimeException ) { return execute(); } // XFilePicker functions - void setMultiSelectionModeSlot( bool bMode ) throw( ::com::sun::star::uno::RuntimeException ) { return setMultiSelectionMode( bMode ); } - void setDefaultNameSlot( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ) { return setDefaultName( rName ); } - void setDisplayDirectorySlot( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ) { return setDisplayDirectory( rDirectory ); } - OUString getDisplayDirectorySlot() throw( ::com::sun::star::uno::RuntimeException ) { return getDisplayDirectory(); } - ::com::sun::star::uno::Sequence< OUString > getFilesSlot() throw( ::com::sun::star::uno::RuntimeException ) { return getFiles(); } + void setMultiSelectionModeSlot( bool bMode ) throw( css::uno::RuntimeException ) { return setMultiSelectionMode( bMode ); } + void setDefaultNameSlot( const OUString &rName ) throw( css::uno::RuntimeException ) { return setDefaultName( rName ); } + void setDisplayDirectorySlot( const OUString &rDirectory ) throw( css::uno::RuntimeException ) { return setDisplayDirectory( rDirectory ); } + OUString getDisplayDirectorySlot() throw( css::uno::RuntimeException ) { return getDisplayDirectory(); } + css::uno::Sequence< OUString > getFilesSlot() throw( css::uno::RuntimeException ) { return getFiles(); } // XFilterManager functions - void appendFilterSlot( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { return appendFilter( rTitle, rFilter ); } - void setCurrentFilterSlot( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { return setCurrentFilter( rTitle ); } - OUString getCurrentFilterSlot() throw( ::com::sun::star::uno::RuntimeException ) { return getCurrentFilter(); } + void appendFilterSlot( const OUString &rTitle, const OUString &rFilter ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) { return appendFilter( rTitle, rFilter ); } + void setCurrentFilterSlot( const OUString &rTitle ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) { return setCurrentFilter( rTitle ); } + OUString getCurrentFilterSlot() throw( css::uno::RuntimeException ) { return getCurrentFilter(); } // XFilterGroupManager functions - void appendFilterGroupSlot( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { return appendFilterGroup( rGroupTitle, rFilters ); } + void appendFilterGroupSlot( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) { return appendFilterGroup( rGroupTitle, rFilters ); } // XFilePickerControlAccess functions - void setValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException) { return setValue( nControlId, nControlAction, rValue ); } - ::com::sun::star::uno::Any getValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException) { return getValue( nControlId, nControlAction ); } - void enableControlSlot( sal_Int16 nControlId, bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ) { return enableControl( nControlId, bEnable ); } - void setLabelSlot( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException) { return setLabel( nControlId, rLabel ); } - OUString getLabelSlot( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException) { return getLabel( nControlId ); } + void setValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) throw (css::uno::RuntimeException) { return setValue( nControlId, nControlAction, rValue ); } + css::uno::Any getValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (css::uno::RuntimeException) { return getValue( nControlId, nControlAction ); } + void enableControlSlot( sal_Int16 nControlId, bool bEnable ) throw( css::uno::RuntimeException ) { return enableControl( nControlId, bEnable ); } + void setLabelSlot( sal_Int16 nControlId, const OUString &rLabel ) throw (css::uno::RuntimeException) { return setLabel( nControlId, rLabel ); } + OUString getLabelSlot( sal_Int16 nControlId ) throw (css::uno::RuntimeException) { return getLabel( nControlId ); } // XFilePicker2 functions - ::com::sun::star::uno::Sequence< OUString > getSelectedFilesSlot() throw (::com::sun::star::uno::RuntimeException) { return getSelectedFiles(); } + css::uno::Sequence< OUString > getSelectedFilesSlot() throw (css::uno::RuntimeException) { return getSelectedFiles(); } // XInitialization - void initializeSlot( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { return initialize( rArguments ); } + void initializeSlot( const css::uno::Sequence< css::uno::Any > &rArguments ) throw( css::uno::Exception, css::uno::RuntimeException ) { return initialize( rArguments ); } Q_SIGNALS: // XExecutableDialog functions @@ -185,7 +185,7 @@ Q_SIGNALS: void setDefaultNameSignal( const OUString &rName ); void setDisplayDirectorySignal( const OUString &rDirectory ); OUString getDisplayDirectorySignal(); - ::com::sun::star::uno::Sequence< OUString > getFilesSignal(); + css::uno::Sequence< OUString > getFilesSignal(); // XFilterManager functions void appendFilterSignal( const OUString &rTitle, const OUString &rFilter ); @@ -193,20 +193,20 @@ Q_SIGNALS: OUString getCurrentFilterSignal(); // XFilterGroupManager functions - void appendFilterGroupSignal( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ); + void appendFilterGroupSignal( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ); // XFilePickerControlAccess functions - void setValueSignal( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ); - ::com::sun::star::uno::Any getValueSignal( sal_Int16 nControlId, sal_Int16 nControlAction ); + void setValueSignal( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ); + css::uno::Any getValueSignal( sal_Int16 nControlId, sal_Int16 nControlAction ); void enableControlSignal( sal_Int16 nControlId, bool bEnable ); void setLabelSignal( sal_Int16 nControlId, const OUString &rLabel ); OUString getLabelSignal( sal_Int16 nControlId ); // XFilePicker2 functions - ::com::sun::star::uno::Sequence< OUString > getSelectedFilesSignal() ; + css::uno::Sequence< OUString > getSelectedFilesSignal() ; // XInitialization - void initializeSignal( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ); + void initializeSignal( const css::uno::Sequence< css::uno::Any > &rArguments ); // Destructor proxy void cleanupProxySignal(); diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index b75409af1b44..25a401fd7580 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -82,7 +82,7 @@ static OUString readEntryUntranslated( KConfigGroup *pGroup, const char *pKey ) Mostly grabbed from the Gtk+ vclplug (salnativewidgets-gtk.cxx). */ -static vcl::Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& rLocale ) +static vcl::Font toFont( const QFont &rQFont, const css::lang::Locale& rLocale ) { psp::FastPrintFontInfo aInfo; QFontInfo qFontInfo( rQFont ); diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx index a481698ee732..8eabb3be8981 100644 --- a/vcl/unx/kde4/KDESalInstance.hxx +++ b/vcl/unx/kde4/KDESalInstance.hxx @@ -33,9 +33,9 @@ class KDESalInstance : public X11SalInstance virtual bool hasNativeFileSelection() const override { return true; } - virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 > - createFilePicker( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& ) override; + virtual css::uno::Reference< css::ui::dialogs::XFilePicker2 > + createFilePicker( const css::uno::Reference< + css::uno::XComponentContext >& ) override; int getFrameWidth(); }; diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 653ce40c9abe..b6aa2939fc92 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -74,10 +74,8 @@ KDEXLib::KDEXLib() : // Create the File picker in the main / GUI thread and block the calling thread until // the FilePicker is created. - connect( this, SIGNAL( createFilePickerSignal( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >&) ), - this, SLOT( createFilePicker( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >&) ), + connect( this, SIGNAL( createFilePickerSignal( const css::uno::Reference< css::uno::XComponentContext >&) ), + this, SLOT( createFilePicker( const css::uno::Reference< css::uno::XComponentContext >&) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( getFrameWidthSignal() ), diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx index 4593298c34c6..0e9c0dd455d4 100644 --- a/vcl/unx/kde4/KDEXLib.hxx +++ b/vcl/unx/kde4/KDEXLib.hxx @@ -72,9 +72,8 @@ class KDEXLib : public QObject, public SalXLib void startTimeoutTimerSignal(); void startUserEventTimerSignal(); void processYieldSignal( bool bWait, bool bHandleAllCurrentEvents ); - com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 > - createFilePickerSignal( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& ); + css::uno::Reference< css::ui::dialogs::XFilePicker2 > + createFilePickerSignal( const css::uno::Reference< css::uno::XComponentContext >& ); int getFrameWidthSignal(); public: @@ -94,9 +93,8 @@ class KDEXLib : public QObject, public SalXLib bool allowKdeDialogs() { return m_allowKdeDialogs; } public Q_SLOTS: - com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 > - createFilePicker( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& ); + css::uno::Reference< css::ui::dialogs::XFilePicker2 > + createFilePicker( const css::uno::Reference< css::uno::XComponentContext >& ); int getFrameWidth(); }; diff --git a/vcl/win/source/gdi/gdiimpl.cxx b/vcl/win/source/gdi/gdiimpl.cxx index c888c2ab0d64..89093bb4e288 100644 --- a/vcl/win/source/gdi/gdiimpl.cxx +++ b/vcl/win/source/gdi/gdiimpl.cxx @@ -2043,7 +2043,7 @@ bool WinSalGraphicsImpl::drawPolyLine( double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin eLineJoin, - com::sun::star::drawing::LineCap eLineCap) + css::drawing::LineCap eLineCap) { const sal_uInt32 nCount(rPolygon.count()); @@ -2091,18 +2091,18 @@ bool WinSalGraphicsImpl::drawPolyLine( switch(eLineCap) { - default: /*com::sun::star::drawing::LineCap_BUTT*/ + default: /*css::drawing::LineCap_BUTT*/ { // nothing to do break; } - case com::sun::star::drawing::LineCap_ROUND: + case css::drawing::LineCap_ROUND: { Gdiplus::DllExports::GdipSetPenStartCap(pTestPen, Gdiplus::LineCapRound); Gdiplus::DllExports::GdipSetPenEndCap(pTestPen, Gdiplus::LineCapRound); break; } - case com::sun::star::drawing::LineCap_SQUARE: + case css::drawing::LineCap_SQUARE: { Gdiplus::DllExports::GdipSetPenStartCap(pTestPen, Gdiplus::LineCapSquare); Gdiplus::DllExports::GdipSetPenEndCap(pTestPen, Gdiplus::LineCapSquare); diff --git a/vcl/win/source/gdi/gdiimpl.hxx b/vcl/win/source/gdi/gdiimpl.hxx index 0c02506b8308..c36052cc955f 100644 --- a/vcl/win/source/gdi/gdiimpl.hxx +++ b/vcl/win/source/gdi/gdiimpl.hxx @@ -111,7 +111,7 @@ public: double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, - com::sun::star::drawing::LineCap) override; + css::drawing::LineCap) override; virtual bool drawPolyLineBezier( sal_uInt32 nPoints, diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 3dc08c714701..3e10ab9fafe0 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -685,13 +685,13 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, sal_uInt16 nNewBitCount ) return bRet; } -bool WinSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rBitmapCanvas, Size& /*rSize*/, bool bMask ) +bool WinSalBitmap::Create( const css::uno::Reference< css::rendering::XBitmapCanvas >& rBitmapCanvas, Size& /*rSize*/, bool bMask ) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > - xFastPropertySet( rBitmapCanvas, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XFastPropertySet > + xFastPropertySet( rBitmapCanvas, css::uno::UNO_QUERY ); if( xFastPropertySet.get() ) { - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > args; + css::uno::Sequence< css::uno::Any > args; if( xFastPropertySet->getFastPropertyValue(bMask ? 2 : 1) >>= args ) { sal_Int64 aHBmp64; diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx index 9b6319e31ed8..b07186550132 100644 --- a/vcl/win/source/gdi/salgdi_gdiplus.cxx +++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx @@ -36,7 +36,7 @@ bool WinSalGraphics::drawPolyLine( double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin eLineJoin, - com::sun::star::drawing::LineCap eLineCap) + css::drawing::LineCap eLineCap) { return mpImpl->drawPolyLine(rPolygon, fTransparency, rLineWidths, eLineJoin, eLineCap); diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 4188221e7b48..1d25daf649a0 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -144,7 +144,7 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : m_aSvpBitmaps->Show(); m_aImage->SetPosSizePixel( Point( 170, 10 ), Size( 400, 400 ) ); - m_aImage->SetScaleMode( com::sun::star::awt::ImageScaleMode::NONE ); + m_aImage->SetScaleMode( css::awt::ImageScaleMode::NONE ); m_aImage->Show(); m_aQuitButton->SetPosSizePixel( Point( 10, 300 ), Size( 120,25 ) ); -- cgit