[Libreoffice-commits] core.git: vcl/generic vcl/headless vcl/inc vcl/opengl vcl/osx vcl/quartz vcl/source vcl/unx vcl/win vcl/workben
Noel Grandin
noel at peralex.com
Wed Nov 18 01:03:42 PST 2015
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(-)
New commits:
commit 5a4d508bd6711def27c7738f7ac68c2da478e48c
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 18 10:11:06 2015 +0200
com::sun::star->css in vcl/
Change-Id: Ifad76177673cf93746ba221838be80ff76fed228
Reviewed-on: https://gerrit.libreoffice.org/20032
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 9ed5c60..b663dff 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 029653f..c0e214d 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 4ae1afe..8c0363b 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 8edc059..801e80b 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 8d0d749..a5f11d4 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 77dc306..be5c7cf 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<sal_Int8> m_aComponentTags;
- com::sun::star::uno::Sequence<sal_Int32> m_aComponentBitCounts;
- com::sun::star::rendering::IntegerBitmapLayout m_aLayout;
+ css::uno::Sequence<sal_Int8> m_aComponentTags;
+ css::uno::Sequence<sal_Int32> 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<double> 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<double> 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 b1e36d3..da90d29 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 24d63fe..f7f335f 100644
--- a/vcl/inc/dndevdis.hxx
+++ b/vcl/inc/dndevdis.hxx
@@ -28,9 +28,9 @@
#include <vcl/window.hxx>
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<vcl::Window> 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 5d4cc96..be009ce 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 e286807..83f3cc6 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 a780f88..801ef4a 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<com::sun::star::i18n::XBreakIterator> mxBreak;
+ css::uno::Reference<css::i18n::XBreakIterator> 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 006ef49..4fd4dd2 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 b4bcd1e..2811764 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 c708fd0..24eced3 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -384,7 +384,7 @@ private:
bool mbEdgeBlending : 1;
Link<ImplListBox*,void> 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 7172ca6..dcf2f17 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 917cf01..667b2ec 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 c739f3e..b20755a0 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 0188cac..948ce1b 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<VclSimpleEvent&,void> 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 647333c..da7f092 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 a49230b..e33d247 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 e9b652a..8512231 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 fc8d3e8..b32d67b 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 93f8b8f..bb922b8 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 72e6c6a..da25c82 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 274190d..938f658 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 af65ce2..34476df 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 bf52514..49d2657 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 edf8875..98c3b8f 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 406f0ce..3324012 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 fb0c285..dc5c37a 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 60bf1f9..ca469a2 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 9bdada3..43aa463 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 c04d5ee..f68af82 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 422b5b2..04da6ed 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 083200c..e736faa 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 1fad904..b38d604 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 b7697d6..4ff01fa 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 eb79d39..5d792de 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<VirtualDevice> mpBuffer; ///< Buffer for the double-buffering
@@ -233,7 +233,7 @@ public:
std::vector<Link<VclWindowEvent&,void>> 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<FixedText> > 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 5969237..e771081 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 f954a01..1c22640 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 7cda1ee..56a5457 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 081f6e5..09bc77d 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<com::sun::star::datatransfer::DataFlavor>& flavors) const
+NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const css::uno::Sequence<css::datatransfer::DataFlavor>& 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<com::sun::star::datatransfer::DataFlavor> DataFlavorMapper::typesArrayToFlavorSequence(NSArray* types) const
+css::uno::Sequence<css::datatransfer::DataFlavor> DataFlavorMapper::typesArrayToFlavorSequence(NSArray* types) const
{
int nFormats = [types count];
Sequence<DataFlavor> flavors;
diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx
index 9632313..10cde7a 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<DataProvider> 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<com::sun::star::datatransfer::DataFlavor>& flavors) const;
+ NSArray* flavorSequenceToTypesArray(const css::uno::Sequence<css::datatransfer::DataFlavor>& 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<com::sun::star::datatransfer::DataFlavor> typesArrayToFlavorSequence(NSArray* types) const;
+ css::uno::Sequence<css::datatransfer::DataFlavor> 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 e0c80a0..3af6cd0 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
- <type>com::sun::star::datatransfer::dnd::DNDConstants</type>
+ <type>css::datatransfer::dnd::DNDConstants</type>
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
- <type>com::sun::star::datatransfer::dnd::DNDConstants</type>.
+ <type>css::datatransfer::dnd::DNDConstants</type>.
*/
sal_Int8 SystemToOfficeDragActions(unsigned int dragActions)
{
diff --git a/vcl/osx/DragActionConversion.hxx b/vcl/osx/DragActionConversion.hxx
index fbb5ea3..47e6ebe 100644
--- a/vcl/osx/DragActionConversion.hxx
+++ b/vcl/osx/DragActionConversion.hxx
@@ -27,14 +27,14 @@
#include <postmac.h>
/* Convert office drag actions as defined in
- <type>com::sun::star::datatransfer::dnd::DNDConstants</type>
+ <type>css::datatransfer::dnd::DNDConstants</type>
into system conform drag actions.
*/
unsigned int OfficeToSystemDragActions(sal_Int8 dragActions);
/* Convert system conform drag actions into office conform
drag actions as defined in
- <type>com::sun::star::datatransfer::dnd::DNDConstants</type>.
+ <type>css::datatransfer::dnd::DNDConstants</type>.
*/
sal_Int8 SystemToOfficeDragActions(unsigned int dragActions);
diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx
index 59fbc25..e96a3de 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 28b4a3c..da5a3a8 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<com::sun::star::datatransfer::dnd::XDragSourceContext>,
+ public cppu::WeakComponentImplHelper<css::datatransfer::dnd::XDragSourceContext>,
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 9b5a3dc..a54d390 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 77a9249..38ee4c4 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<sal_Int8> TextHtmlToHTMLFormat(com::sun::star::uno::Sequence<sal_Int8>& aTextHtml);
+css::uno::Sequence<sal_Int8> TextHtmlToHTMLFormat(css::uno::Sequence<sal_Int8>& aTextHtml);
/* Transform the MS Office HTML format into plain HTML.
*/
-com::sun::star::uno::Sequence<sal_Int8> HTMLFormatToTextHtml(const com::sun::star::uno::Sequence<sal_Int8>& aHTMLFormat);
+css::uno::Sequence<sal_Int8> HTMLFormatToTextHtml(const css::uno::Sequence<sal_Int8>& 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<sal_Int8>& aHtmlSequence);
+bool isHTMLFormat (const css::uno::Sequence<sal_Int8>& aHtmlSequence);
#endif // INCLUDED_VCL_OSX_HTMLFMTFLT_HXX
diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index bdf9345..b8c06fc 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -35,11 +35,11 @@
#include <memory>
#include <vector>
-class OSXTransferable : public ::cppu::WeakImplHelper<com::sun::star::datatransfer::XTransferable>,
+class OSXTransferable : public ::cppu::WeakImplHelper<css::datatransfer::XTransferable>,
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 dc04348..af8740b 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<sal_Int8>& rImgData,
- com::sun::star::uno::Sequence<sal_Int8>& rPngData,
+bool ImageToPNG( css::uno::Sequence<sal_Int8>& rImgData,
+ css::uno::Sequence<sal_Int8>& rPngData,
NSBitmapImageFileType eInFormat)
{
(void) eInFormat; // Really not needed? Weird.
@@ -50,8 +50,8 @@ bool ImageToPNG( com::sun::star::uno::Sequence<sal_Int8>& rImgData,
return (nPngSize > 0);
}
-bool PNGToImage( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
- com::sun::star::uno::Sequence<sal_Int8>& rImgData,
+bool PNGToImage( css::uno::Sequence<sal_Int8>& rPngData,
+ css::uno::Sequence<sal_Int8>& rImgData,
NSBitmapImageFileType eOutFormat
)
{
diff --git a/vcl/osx/PictToBmpFlt.hxx b/vcl/osx/PictToBmpFlt.hxx
index 59f1f2d..b90fa81 100644
--- a/vcl/osx/PictToBmpFlt.hxx
+++ b/vcl/osx/PictToBmpFlt.hxx
@@ -26,12 +26,12 @@
#include <Cocoa/Cocoa.h>
#include <postmac.h>
-bool ImageToPNG( com::sun::star::uno::Sequence<sal_Int8>& rImgData,
- com::sun::star::uno::Sequence<sal_Int8>& rPngData,
+bool ImageToPNG( css::uno::Sequence<sal_Int8>& rImgData,
+ css::uno::Sequence<sal_Int8>& rPngData,
NSBitmapImageFileType eInFormat);
-bool PNGToImage( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
- com::sun::star::uno::Sequence<sal_Int8>& rImgData,
+bool PNGToImage( css::uno::Sequence<sal_Int8>& rPngData,
+ css::uno::Sequence<sal_Int8>& rImgData,
NSBitmapImageFileType eOutFormat);
#endif // INCLUDED_VCL_OSX_PICTTOBMPFLT_HXX
diff --git a/vcl/osx/a11yfactory.mm b/vcl/osx/a11yfactory.mm
index 30437a8..79ddf64 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 ] ];
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list