diff options
Diffstat (limited to 'include/vcl')
30 files changed, 294 insertions, 299 deletions
diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx index 567377f3d98c..f12eec5b9016 100644 --- a/include/vcl/FilterConfigItem.hxx +++ b/include/vcl/FilterConfigItem.hxx @@ -34,32 +34,32 @@ class VCL_DLLPUBLIC FilterConfigItem { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xUpdatableView; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterData; + css::uno::Reference< css::uno::XInterface > xUpdatableView; + css::uno::Reference< css::beans::XPropertySet > xPropSet; + css::uno::Sequence< css::beans::PropertyValue > aFilterData; bool bModified; - static bool ImplGetPropertyValue( ::com::sun::star::uno::Any& rAny, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet, + static bool ImplGetPropertyValue( css::uno::Any& rAny, + const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, const OUString& rPropName, bool bTestPropertyAvailability ); void ImpInitTree( const OUString& rTree ); - static ::com::sun::star::beans::PropertyValue* GetPropertyValue( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rPropSeq, + static css::beans::PropertyValue* GetPropertyValue( + css::uno::Sequence< css::beans::PropertyValue >& rPropSeq, const OUString& rName ); static bool WritePropertyValue( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rPropSeq, - const ::com::sun::star::beans::PropertyValue& rPropValue ); + css::uno::Sequence< css::beans::PropertyValue >& rPropSeq, + const css::beans::PropertyValue& rPropValue ); public: FilterConfigItem( const OUString& rSubTree ); - FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ); - FilterConfigItem( const OUString& rSubTree, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ); + FilterConfigItem( css::uno::Sequence< css::beans::PropertyValue >* pFilterData ); + FilterConfigItem( const OUString& rSubTree, css::uno::Sequence< css::beans::PropertyValue >* pFilterData ); /// Writes config in destructor ~FilterConfigItem(); /// Writes config and sets unmodified state again. @@ -79,10 +79,10 @@ public: void WriteBool( const OUString& rKey, bool bValue ); void WriteInt32( const OUString& rKey, sal_Int32 nValue ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData() const { return aFilterData;} + css::uno::Sequence< css::beans::PropertyValue > GetFilterData() const { return aFilterData;} // GetStatusIndicator is returning the "StatusIndicator" property of the FilterData sequence - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const; + css::uno::Reference< css::task::XStatusIndicator > GetStatusIndicator() const; }; #endif // INCLUDED_VCL_FILTERCONFIGITEM_HXX diff --git a/include/vcl/canvastools.hxx b/include/vcl/canvastools.hxx index 96e8ee08301d..f3af8bf340e3 100644 --- a/include/vcl/canvastools.hxx +++ b/include/vcl/canvastools.hxx @@ -79,15 +79,13 @@ namespace vcl /** Create an XBitmap from VCL BitmapEx */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > - VCL_DLLPUBLIC xBitmapFromBitmapEx( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, - const ::BitmapEx& inputBitmap ); + css::uno::Reference< css::rendering::XBitmap > + VCL_DLLPUBLIC xBitmapFromBitmapEx( const css::uno::Reference< css::rendering::XGraphicDevice >& xGraphicDevice, + const ::BitmapEx& inputBitmap ); /** Create a BitmapEx from an XBitmap */ - ::BitmapEx VCL_DLLPUBLIC bitmapExFromXBitmap( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XIntegerReadOnlyBitmap >& xInputBitmap ); + ::BitmapEx VCL_DLLPUBLIC bitmapExFromXBitmap( const css::uno::Reference< css::rendering::XIntegerReadOnlyBitmap >& xInputBitmap ); // Color conversions (vcl/tools Color <-> canvas standard color space) @@ -97,7 +95,7 @@ namespace vcl Note that this method assumes a color space equivalent to the one returned from createStandardColorSpace() */ - ::com::sun::star::uno::Sequence< double > + css::uno::Sequence< double > VCL_DLLPUBLIC colorToStdColorSpaceSequence( const Color& rColor ); /** Convert color to device color sequence @@ -108,10 +106,9 @@ namespace vcl @param xColorSpace Color space to convert into */ - ::com::sun::star::uno::Sequence< double > - VCL_DLLPUBLIC colorToDoubleSequence( const Color& rColor, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XColorSpace >& xColorSpace ); + css::uno::Sequence< double > + VCL_DLLPUBLIC colorToDoubleSequence( const Color& rColor, + const css::uno::Reference< css::rendering::XColorSpace >& xColorSpace ); /** Convert from standard device color space to VCL/Tools color @@ -119,7 +116,7 @@ namespace vcl the one returned from createStandardColorSpace() */ Color VCL_DLLPUBLIC stdColorSpaceSequenceToColor( - const ::com::sun::star::uno::Sequence< double >& rColor ); + const css::uno::Sequence< double >& rColor ); /** Convert color to device color sequence @@ -129,9 +126,8 @@ namespace vcl @param xColorSpace Color space to convert from */ - Color VCL_DLLPUBLIC doubleSequenceToColor( const ::com::sun::star::uno::Sequence< double >& rColor, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XColorSpace >& xColorSpace ); + Color VCL_DLLPUBLIC doubleSequenceToColor( const css::uno::Sequence< double >& rColor, + const css::uno::Reference< css::rendering::XColorSpace >& xColorSpace ); /// Convert [0,1] double value to [0,255] int inline sal_Int8 toByteColor( double val ) @@ -147,23 +143,22 @@ namespace vcl } /// Create a standard color space suitable for VCL RGB color - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XColorSpace> VCL_DLLPUBLIC createStandardColorSpace(); + css::uno::Reference< css::rendering::XColorSpace> VCL_DLLPUBLIC createStandardColorSpace(); // Geometry conversions (vcl/tools <-> x) // geometry::Real - ::com::sun::star::geometry::RealSize2D VCL_DLLPUBLIC size2DFromSize( const Size& ); + css::geometry::RealSize2D VCL_DLLPUBLIC size2DFromSize( const Size& ); - Size VCL_DLLPUBLIC sizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& ); + Size VCL_DLLPUBLIC sizeFromRealSize2D( const css::geometry::RealSize2D& ); // geometry::Integer - ::com::sun::star::geometry::IntegerSize2D VCL_DLLPUBLIC integerSize2DFromSize( const Size& ); + css::geometry::IntegerSize2D VCL_DLLPUBLIC integerSize2DFromSize( const Size& ); - Size VCL_DLLPUBLIC sizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& ); - Point VCL_DLLPUBLIC pointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& ); - Rectangle VCL_DLLPUBLIC rectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& ); + Size VCL_DLLPUBLIC sizeFromIntegerSize2D( const css::geometry::IntegerSize2D& ); + Point VCL_DLLPUBLIC pointFromIntegerPoint2D( const css::geometry::IntegerPoint2D& ); + Rectangle VCL_DLLPUBLIC rectangleFromIntegerRectangle2D( const css::geometry::IntegerRectangle2D& ); // basegfx::B2D Size VCL_DLLPUBLIC sizeFromB2DSize( const ::basegfx::B2DVector& ); diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx index c91354ae72b9..265d287787f5 100644 --- a/include/vcl/configsettings.hxx +++ b/include/vcl/configsettings.hxx @@ -39,7 +39,7 @@ namespace vcl private: std::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings; - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override; void getValues(); SettingsConfigItem(); diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx index 4e5036652a41..2043102de169 100644 --- a/include/vcl/dndhelp.hxx +++ b/include/vcl/dndhelp.hxx @@ -55,35 +55,35 @@ class VCL_DLLPUBLIC DragAndDropClient public: virtual ~DragAndDropClient(); - // ::com::sun::star::datatransfer::dnd::XDragGestureListener - virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) - throw (::com::sun::star::uno::RuntimeException, + // css::datatransfer::dnd::XDragGestureListener + virtual void dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) + throw (css::uno::RuntimeException, std::exception); - // ::com::sun::star::datatransfer::dnd::XDragSourceListener - virtual void dragDropEnd(const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) - throw (::com::sun::star::uno::RuntimeException, + // css::datatransfer::dnd::XDragSourceListener + virtual void dragDropEnd(const css::datatransfer::dnd::DragSourceDropEvent& dsde ) + throw (css::uno::RuntimeException, std::exception); - // ::com::sun::star::datatransfer::dnd::XDropTargetListener - virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) - throw (::com::sun::star::uno::RuntimeException, + // css::datatransfer::dnd::XDropTargetListener + virtual void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) + throw (css::uno::RuntimeException, std::exception); - virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) - throw (::com::sun::star::uno::RuntimeException, + virtual void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) + throw (css::uno::RuntimeException, std::exception); - virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) - throw (::com::sun::star::uno::RuntimeException, + virtual void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) + throw (css::uno::RuntimeException, std::exception); - virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) - throw (::com::sun::star::uno::RuntimeException, + virtual void dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) + throw (css::uno::RuntimeException, std::exception); }; class VCL_DLLPUBLIC DragAndDropWrapper : - public ::com::sun::star::datatransfer::dnd::XDragGestureListener, - public ::com::sun::star::datatransfer::dnd::XDragSourceListener, - public ::com::sun::star::datatransfer::dnd::XDropTargetListener, + public css::datatransfer::dnd::XDragGestureListener, + public css::datatransfer::dnd::XDragSourceListener, + public css::datatransfer::dnd::XDropTargetListener, public ::cppu::OWeakObject { private: @@ -93,30 +93,30 @@ public: DragAndDropWrapper( DragAndDropClient* pClient ); virtual ~DragAndDropWrapper(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } - - // ::com::sun::star::lang::XEventListener - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::datatransfer::dnd::XDragGestureListener - void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::datatransfer::dnd::XDragSourceListener - void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::datatransfer::dnd::XDropTargetListener - void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } + void SAL_CALL release() throw() override { OWeakObject::release(); } + + // css::lang::XEventListener + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + + // css::datatransfer::dnd::XDragGestureListener + void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) throw (css::uno::RuntimeException, std::exception) override; + + // css::datatransfer::dnd::XDragSourceListener + void SAL_CALL dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dragExit( const css::datatransfer::dnd::DragSourceEvent& dse ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dragOver( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override; + + // css::datatransfer::dnd::XDropTargetListener + void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override; }; }} // namespace vcl::unohelper diff --git a/include/vcl/embeddedfontshelper.hxx b/include/vcl/embeddedfontshelper.hxx index b02431e81d14..cae59da32ab7 100644 --- a/include/vcl/embeddedfontshelper.hxx +++ b/include/vcl/embeddedfontshelper.hxx @@ -46,7 +46,7 @@ public: @param key key to xor the data with, from the start until the key's length (not repeated) @param eot whether the data is compressed in Embedded OpenType format */ - static bool addEmbeddedFont( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > stream, + static bool addEmbeddedFont( css::uno::Reference< css::io::XInputStream > stream, const OUString& fontName, const char* extra, std::vector< unsigned char > key = std::vector< unsigned char >(), bool eot = false); diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 13ded2d0064d..153ad9503717 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -132,7 +132,7 @@ public: const Point& GetPosPixel() const { return maPos; } MouseEventModifiers GetMode() const { return mnMode; } /** inits this vcl KeyEvent with all settings from the given awt event **/ - MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent ); + MouseEvent( const css::awt::MouseEvent& rEvent ); sal_uInt16 GetClicks() const { return mnClicks; } diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 58ec9040db6b..45a7bf6b7b2e 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -76,8 +76,8 @@ public: virtual void Reformat(); virtual void ReformatAll(); - virtual void SetLocale( const ::com::sun::star::lang::Locale& rLocale ); - const ::com::sun::star::lang::Locale& GetLocale() const; + virtual void SetLocale( const css::lang::Locale& rLocale ); + const css::lang::Locale& GetLocale() const; const LanguageTag& GetLanguageTag() const; const AllSettings& GetFieldSettings() const; @@ -333,7 +333,7 @@ public: virtual void Reformat() override; virtual void ReformatAll() override; - virtual void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) override; + virtual void SetLocale( const css::lang::Locale& rLocale ) override; void SetExtDateFormat( ExtDateFieldFormat eFormat ); diff --git a/include/vcl/fltcall.hxx b/include/vcl/fltcall.hxx index 48f7ac973534..e5d6ca66e412 100644 --- a/include/vcl/fltcall.hxx +++ b/include/vcl/fltcall.hxx @@ -39,7 +39,7 @@ struct FltCallDialogParameter OUString aFilterExt; // In and Out PropertySequence for all filter dialogs - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterData; + css::uno::Sequence< css::beans::PropertyValue > aFilterData; FltCallDialogParameter( vcl::Window* pW, ResMgr* pRsMgr, FieldUnit eFiUni ) : pWindow ( pW ), diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index c7d2ceba7b95..ebd59dc8c142 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -96,7 +96,7 @@ public: Graphic( const SvgDataPtr& rSvgDataPtr ); Graphic( const Animation& rAnimation ); Graphic( const GDIMetaFile& rMtf ); - Graphic( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ); + Graphic( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ); virtual ~Graphic(); Graphic& operator=( const Graphic& rGraphic ); @@ -126,7 +126,7 @@ public: Animation GetAnimation() const; const GDIMetaFile& GetGDIMetaFile() const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > GetXGraphic() const; + css::uno::Reference< css::graphic::XGraphic > GetXGraphic() const; Size GetPrefSize() const; void SetPrefSize( const Size& rPrefSize ); diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 05dfed3608e7..fe4e0e0edefe 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -310,7 +310,7 @@ public: SvStream& rStream, sal_uInt16 nFormat, sal_uInt16 * pDeterminedFormat, GraphicFilterImportFlags nImportFlags, - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData, + css::uno::Sequence< css::beans::PropertyValue >* pFilterData, WMF_EXTERNALHEADER *pExtHeader = NULL ); void Abort() { bAbort = true; } diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx index 8ca39f05f4d5..7e22bd9571b3 100644 --- a/include/vcl/i18nhelp.hxx +++ b/include/vcl/i18nhelp.hxx @@ -50,12 +50,12 @@ class VCL_DLLPUBLIC I18nHelper private: ::osl::Mutex maMutex; LanguageTag maLanguageTag; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; LocaleDataWrapper* mpLocaleDataWrapper; utl::TransliterationWrapper* mpTransliterationWrapper; - bool mbTransliterateIgnoreCase; + bool mbTransliterateIgnoreCase; SAL_DLLPRIVATE void ImplDestroyWrappers(); @@ -66,7 +66,7 @@ protected: public: - I18nHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ); + I18nHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ); ~I18nHelper(); sal_Int32 CompareString( const OUString& rStr1, const OUString& rStr2 ) const; diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx index bfb1be48c4e5..58cbf966b922 100644 --- a/include/vcl/keycodes.hxx +++ b/include/vcl/keycodes.hxx @@ -27,130 +27,130 @@ #include <o3tl/typed_flags_set.hxx> // Key-Gruppen -#define KEYGROUP_NUM ((sal_uInt16)::com::sun::star::awt::KeyGroup::NUM) -#define KEYGROUP_ALPHA ((sal_uInt16)::com::sun::star::awt::KeyGroup::ALPHA) -#define KEYGROUP_FKEYS ((sal_uInt16)::com::sun::star::awt::KeyGroup::FKEYS) -#define KEYGROUP_CURSOR ((sal_uInt16)::com::sun::star::awt::KeyGroup::CURSOR) -#define KEYGROUP_MISC ((sal_uInt16)::com::sun::star::awt::KeyGroup::MISC) -#define KEYGROUP_TYPE ((sal_uInt16)::com::sun::star::awt::KeyGroup::TYPE) +#define KEYGROUP_NUM ((sal_uInt16)css::awt::KeyGroup::NUM) +#define KEYGROUP_ALPHA ((sal_uInt16)css::awt::KeyGroup::ALPHA) +#define KEYGROUP_FKEYS ((sal_uInt16)css::awt::KeyGroup::FKEYS) +#define KEYGROUP_CURSOR ((sal_uInt16)css::awt::KeyGroup::CURSOR) +#define KEYGROUP_MISC ((sal_uInt16)css::awt::KeyGroup::MISC) +#define KEYGROUP_TYPE ((sal_uInt16)css::awt::KeyGroup::TYPE) // Key-Codes -#define KEY_0 ((sal_uInt16)::com::sun::star::awt::Key::NUM0) -#define KEY_1 ((sal_uInt16)::com::sun::star::awt::Key::NUM1) -#define KEY_2 ((sal_uInt16)::com::sun::star::awt::Key::NUM2) -#define KEY_3 ((sal_uInt16)::com::sun::star::awt::Key::NUM3) -#define KEY_4 ((sal_uInt16)::com::sun::star::awt::Key::NUM4) -#define KEY_5 ((sal_uInt16)::com::sun::star::awt::Key::NUM5) -#define KEY_6 ((sal_uInt16)::com::sun::star::awt::Key::NUM6) -#define KEY_7 ((sal_uInt16)::com::sun::star::awt::Key::NUM7) -#define KEY_8 ((sal_uInt16)::com::sun::star::awt::Key::NUM8) -#define KEY_9 ((sal_uInt16)::com::sun::star::awt::Key::NUM9) +#define KEY_0 ((sal_uInt16)css::awt::Key::NUM0) +#define KEY_1 ((sal_uInt16)css::awt::Key::NUM1) +#define KEY_2 ((sal_uInt16)css::awt::Key::NUM2) +#define KEY_3 ((sal_uInt16)css::awt::Key::NUM3) +#define KEY_4 ((sal_uInt16)css::awt::Key::NUM4) +#define KEY_5 ((sal_uInt16)css::awt::Key::NUM5) +#define KEY_6 ((sal_uInt16)css::awt::Key::NUM6) +#define KEY_7 ((sal_uInt16)css::awt::Key::NUM7) +#define KEY_8 ((sal_uInt16)css::awt::Key::NUM8) +#define KEY_9 ((sal_uInt16)css::awt::Key::NUM9) -#define KEY_A ((sal_uInt16)::com::sun::star::awt::Key::A) -#define KEY_B ((sal_uInt16)::com::sun::star::awt::Key::B) -#define KEY_C ((sal_uInt16)::com::sun::star::awt::Key::C) -#define KEY_D ((sal_uInt16)::com::sun::star::awt::Key::D) -#define KEY_E ((sal_uInt16)::com::sun::star::awt::Key::E) -#define KEY_F ((sal_uInt16)::com::sun::star::awt::Key::F) -#define KEY_G ((sal_uInt16)::com::sun::star::awt::Key::G) -#define KEY_H ((sal_uInt16)::com::sun::star::awt::Key::H) -#define KEY_I ((sal_uInt16)::com::sun::star::awt::Key::I) -#define KEY_J ((sal_uInt16)::com::sun::star::awt::Key::J) -#define KEY_K ((sal_uInt16)::com::sun::star::awt::Key::K) -#define KEY_L ((sal_uInt16)::com::sun::star::awt::Key::L) -#define KEY_M ((sal_uInt16)::com::sun::star::awt::Key::M) -#define KEY_N ((sal_uInt16)::com::sun::star::awt::Key::N) -#define KEY_O ((sal_uInt16)::com::sun::star::awt::Key::O) -#define KEY_P ((sal_uInt16)::com::sun::star::awt::Key::P) -#define KEY_Q ((sal_uInt16)::com::sun::star::awt::Key::Q) -#define KEY_R ((sal_uInt16)::com::sun::star::awt::Key::R) -#define KEY_S ((sal_uInt16)::com::sun::star::awt::Key::S) -#define KEY_T ((sal_uInt16)::com::sun::star::awt::Key::T) -#define KEY_U ((sal_uInt16)::com::sun::star::awt::Key::U) -#define KEY_V ((sal_uInt16)::com::sun::star::awt::Key::V) -#define KEY_W ((sal_uInt16)::com::sun::star::awt::Key::W) -#define KEY_X ((sal_uInt16)::com::sun::star::awt::Key::X) -#define KEY_Y ((sal_uInt16)::com::sun::star::awt::Key::Y) -#define KEY_Z ((sal_uInt16)::com::sun::star::awt::Key::Z) +#define KEY_A ((sal_uInt16)css::awt::Key::A) +#define KEY_B ((sal_uInt16)css::awt::Key::B) +#define KEY_C ((sal_uInt16)css::awt::Key::C) +#define KEY_D ((sal_uInt16)css::awt::Key::D) +#define KEY_E ((sal_uInt16)css::awt::Key::E) +#define KEY_F ((sal_uInt16)css::awt::Key::F) +#define KEY_G ((sal_uInt16)css::awt::Key::G) +#define KEY_H ((sal_uInt16)css::awt::Key::H) +#define KEY_I ((sal_uInt16)css::awt::Key::I) +#define KEY_J ((sal_uInt16)css::awt::Key::J) +#define KEY_K ((sal_uInt16)css::awt::Key::K) +#define KEY_L ((sal_uInt16)css::awt::Key::L) +#define KEY_M ((sal_uInt16)css::awt::Key::M) +#define KEY_N ((sal_uInt16)css::awt::Key::N) +#define KEY_O ((sal_uInt16)css::awt::Key::O) +#define KEY_P ((sal_uInt16)css::awt::Key::P) +#define KEY_Q ((sal_uInt16)css::awt::Key::Q) +#define KEY_R ((sal_uInt16)css::awt::Key::R) +#define KEY_S ((sal_uInt16)css::awt::Key::S) +#define KEY_T ((sal_uInt16)css::awt::Key::T) +#define KEY_U ((sal_uInt16)css::awt::Key::U) +#define KEY_V ((sal_uInt16)css::awt::Key::V) +#define KEY_W ((sal_uInt16)css::awt::Key::W) +#define KEY_X ((sal_uInt16)css::awt::Key::X) +#define KEY_Y ((sal_uInt16)css::awt::Key::Y) +#define KEY_Z ((sal_uInt16)css::awt::Key::Z) -#define KEY_F1 ((sal_uInt16)::com::sun::star::awt::Key::F1) -#define KEY_F2 ((sal_uInt16)::com::sun::star::awt::Key::F2) -#define KEY_F3 ((sal_uInt16)::com::sun::star::awt::Key::F3) -#define KEY_F4 ((sal_uInt16)::com::sun::star::awt::Key::F4) -#define KEY_F5 ((sal_uInt16)::com::sun::star::awt::Key::F5) -#define KEY_F6 ((sal_uInt16)::com::sun::star::awt::Key::F6) -#define KEY_F7 ((sal_uInt16)::com::sun::star::awt::Key::F7) -#define KEY_F8 ((sal_uInt16)::com::sun::star::awt::Key::F8) -#define KEY_F9 ((sal_uInt16)::com::sun::star::awt::Key::F9) -#define KEY_F10 ((sal_uInt16)::com::sun::star::awt::Key::F10) -#define KEY_F11 ((sal_uInt16)::com::sun::star::awt::Key::F11) -#define KEY_F12 ((sal_uInt16)::com::sun::star::awt::Key::F12) -#define KEY_F13 ((sal_uInt16)::com::sun::star::awt::Key::F13) -#define KEY_F14 ((sal_uInt16)::com::sun::star::awt::Key::F14) -#define KEY_F15 ((sal_uInt16)::com::sun::star::awt::Key::F15) -#define KEY_F16 ((sal_uInt16)::com::sun::star::awt::Key::F16) -#define KEY_F17 ((sal_uInt16)::com::sun::star::awt::Key::F17) -#define KEY_F18 ((sal_uInt16)::com::sun::star::awt::Key::F18) -#define KEY_F19 ((sal_uInt16)::com::sun::star::awt::Key::F19) -#define KEY_F20 ((sal_uInt16)::com::sun::star::awt::Key::F20) -#define KEY_F21 ((sal_uInt16)::com::sun::star::awt::Key::F21) -#define KEY_F22 ((sal_uInt16)::com::sun::star::awt::Key::F22) -#define KEY_F23 ((sal_uInt16)::com::sun::star::awt::Key::F23) -#define KEY_F24 ((sal_uInt16)::com::sun::star::awt::Key::F24) -#define KEY_F25 ((sal_uInt16)::com::sun::star::awt::Key::F25) -#define KEY_F26 ((sal_uInt16)::com::sun::star::awt::Key::F26) +#define KEY_F1 ((sal_uInt16)css::awt::Key::F1) +#define KEY_F2 ((sal_uInt16)css::awt::Key::F2) +#define KEY_F3 ((sal_uInt16)css::awt::Key::F3) +#define KEY_F4 ((sal_uInt16)css::awt::Key::F4) +#define KEY_F5 ((sal_uInt16)css::awt::Key::F5) +#define KEY_F6 ((sal_uInt16)css::awt::Key::F6) +#define KEY_F7 ((sal_uInt16)css::awt::Key::F7) +#define KEY_F8 ((sal_uInt16)css::awt::Key::F8) +#define KEY_F9 ((sal_uInt16)css::awt::Key::F9) +#define KEY_F10 ((sal_uInt16)css::awt::Key::F10) +#define KEY_F11 ((sal_uInt16)css::awt::Key::F11) +#define KEY_F12 ((sal_uInt16)css::awt::Key::F12) +#define KEY_F13 ((sal_uInt16)css::awt::Key::F13) +#define KEY_F14 ((sal_uInt16)css::awt::Key::F14) +#define KEY_F15 ((sal_uInt16)css::awt::Key::F15) +#define KEY_F16 ((sal_uInt16)css::awt::Key::F16) +#define KEY_F17 ((sal_uInt16)css::awt::Key::F17) +#define KEY_F18 ((sal_uInt16)css::awt::Key::F18) +#define KEY_F19 ((sal_uInt16)css::awt::Key::F19) +#define KEY_F20 ((sal_uInt16)css::awt::Key::F20) +#define KEY_F21 ((sal_uInt16)css::awt::Key::F21) +#define KEY_F22 ((sal_uInt16)css::awt::Key::F22) +#define KEY_F23 ((sal_uInt16)css::awt::Key::F23) +#define KEY_F24 ((sal_uInt16)css::awt::Key::F24) +#define KEY_F25 ((sal_uInt16)css::awt::Key::F25) +#define KEY_F26 ((sal_uInt16)css::awt::Key::F26) -#define KEY_DOWN ((sal_uInt16)::com::sun::star::awt::Key::DOWN) -#define KEY_UP ((sal_uInt16)::com::sun::star::awt::Key::UP) -#define KEY_LEFT ((sal_uInt16)::com::sun::star::awt::Key::LEFT) -#define KEY_RIGHT ((sal_uInt16)::com::sun::star::awt::Key::RIGHT) -#define KEY_HOME ((sal_uInt16)::com::sun::star::awt::Key::HOME) -#define KEY_END ((sal_uInt16)::com::sun::star::awt::Key::END) -#define KEY_PAGEUP ((sal_uInt16)::com::sun::star::awt::Key::PAGEUP) -#define KEY_PAGEDOWN ((sal_uInt16)::com::sun::star::awt::Key::PAGEDOWN) +#define KEY_DOWN ((sal_uInt16)css::awt::Key::DOWN) +#define KEY_UP ((sal_uInt16)css::awt::Key::UP) +#define KEY_LEFT ((sal_uInt16)css::awt::Key::LEFT) +#define KEY_RIGHT ((sal_uInt16)css::awt::Key::RIGHT) +#define KEY_HOME ((sal_uInt16)css::awt::Key::HOME) +#define KEY_END ((sal_uInt16)css::awt::Key::END) +#define KEY_PAGEUP ((sal_uInt16)css::awt::Key::PAGEUP) +#define KEY_PAGEDOWN ((sal_uInt16)css::awt::Key::PAGEDOWN) -#define KEY_RETURN ((sal_uInt16)::com::sun::star::awt::Key::RETURN) -#define KEY_ESCAPE ((sal_uInt16)::com::sun::star::awt::Key::ESCAPE) -#define KEY_TAB ((sal_uInt16)::com::sun::star::awt::Key::TAB) -#define KEY_BACKSPACE ((sal_uInt16)::com::sun::star::awt::Key::BACKSPACE) -#define KEY_SPACE ((sal_uInt16)::com::sun::star::awt::Key::SPACE) -#define KEY_INSERT ((sal_uInt16)::com::sun::star::awt::Key::INSERT) -#define KEY_DELETE ((sal_uInt16)::com::sun::star::awt::Key::DELETE) +#define KEY_RETURN ((sal_uInt16)css::awt::Key::RETURN) +#define KEY_ESCAPE ((sal_uInt16)css::awt::Key::ESCAPE) +#define KEY_TAB ((sal_uInt16)css::awt::Key::TAB) +#define KEY_BACKSPACE ((sal_uInt16)css::awt::Key::BACKSPACE) +#define KEY_SPACE ((sal_uInt16)css::awt::Key::SPACE) +#define KEY_INSERT ((sal_uInt16)css::awt::Key::INSERT) +#define KEY_DELETE ((sal_uInt16)css::awt::Key::DELETE) -#define KEY_ADD ((sal_uInt16)::com::sun::star::awt::Key::ADD) -#define KEY_SUBTRACT ((sal_uInt16)::com::sun::star::awt::Key::SUBTRACT) -#define KEY_MULTIPLY ((sal_uInt16)::com::sun::star::awt::Key::MULTIPLY) -#define KEY_DIVIDE ((sal_uInt16)::com::sun::star::awt::Key::DIVIDE) -#define KEY_POINT ((sal_uInt16)::com::sun::star::awt::Key::POINT) -#define KEY_COMMA ((sal_uInt16)::com::sun::star::awt::Key::COMMA) -#define KEY_LESS ((sal_uInt16)::com::sun::star::awt::Key::LESS) -#define KEY_GREATER ((sal_uInt16)::com::sun::star::awt::Key::GREATER) -#define KEY_EQUAL ((sal_uInt16)::com::sun::star::awt::Key::EQUAL) +#define KEY_ADD ((sal_uInt16)css::awt::Key::ADD) +#define KEY_SUBTRACT ((sal_uInt16)css::awt::Key::SUBTRACT) +#define KEY_MULTIPLY ((sal_uInt16)css::awt::Key::MULTIPLY) +#define KEY_DIVIDE ((sal_uInt16)css::awt::Key::DIVIDE) +#define KEY_POINT ((sal_uInt16)css::awt::Key::POINT) +#define KEY_COMMA ((sal_uInt16)css::awt::Key::COMMA) +#define KEY_LESS ((sal_uInt16)css::awt::Key::LESS) +#define KEY_GREATER ((sal_uInt16)css::awt::Key::GREATER) +#define KEY_EQUAL ((sal_uInt16)css::awt::Key::EQUAL) -#define KEY_OPEN ((sal_uInt16)::com::sun::star::awt::Key::OPEN) -#define KEY_CUT ((sal_uInt16)::com::sun::star::awt::Key::CUT) -#define KEY_COPY ((sal_uInt16)::com::sun::star::awt::Key::COPY) -#define KEY_PASTE ((sal_uInt16)::com::sun::star::awt::Key::PASTE) -#define KEY_UNDO ((sal_uInt16)::com::sun::star::awt::Key::UNDO) -#define KEY_REPEAT ((sal_uInt16)::com::sun::star::awt::Key::REPEAT) -#define KEY_FIND ((sal_uInt16)::com::sun::star::awt::Key::FIND) -#define KEY_PROPERTIES ((sal_uInt16)::com::sun::star::awt::Key::PROPERTIES) -#define KEY_FRONT ((sal_uInt16)::com::sun::star::awt::Key::FRONT) -#define KEY_CONTEXTMENU ((sal_uInt16)::com::sun::star::awt::Key::CONTEXTMENU) -#define KEY_MENU ((sal_uInt16)::com::sun::star::awt::Key::MENU) -#define KEY_HELP ((sal_uInt16)::com::sun::star::awt::Key::HELP) -#define KEY_HANGUL_HANJA ((sal_uInt16)::com::sun::star::awt::Key::HANGUL_HANJA) -#define KEY_DECIMAL ((sal_uInt16)::com::sun::star::awt::Key::DECIMAL) -#define KEY_TILDE ((sal_uInt16)::com::sun::star::awt::Key::TILDE) -#define KEY_QUOTELEFT ((sal_uInt16)::com::sun::star::awt::Key::QUOTELEFT) -#define KEY_BRACKETLEFT ((sal_uInt16)::com::sun::star::awt::Key::BRACKETLEFT) -#define KEY_BRACKETRIGHT ((sal_uInt16)::com::sun::star::awt::Key::BRACKETRIGHT) -#define KEY_SEMICOLON ((sal_uInt16)::com::sun::star::awt::Key::SEMICOLON) -#define KEY_QUOTERIGHT ((sal_uInt16)::com::sun::star::awt::Key::QUOTERIGHT) +#define KEY_OPEN ((sal_uInt16)css::awt::Key::OPEN) +#define KEY_CUT ((sal_uInt16)css::awt::Key::CUT) +#define KEY_COPY ((sal_uInt16)css::awt::Key::COPY) +#define KEY_PASTE ((sal_uInt16)css::awt::Key::PASTE) +#define KEY_UNDO ((sal_uInt16)css::awt::Key::UNDO) +#define KEY_REPEAT ((sal_uInt16)css::awt::Key::REPEAT) +#define KEY_FIND ((sal_uInt16)css::awt::Key::FIND) +#define KEY_PROPERTIES ((sal_uInt16)css::awt::Key::PROPERTIES) +#define KEY_FRONT ((sal_uInt16)css::awt::Key::FRONT) +#define KEY_CONTEXTMENU ((sal_uInt16)css::awt::Key::CONTEXTMENU) +#define KEY_MENU ((sal_uInt16)css::awt::Key::MENU) +#define KEY_HELP ((sal_uInt16)css::awt::Key::HELP) +#define KEY_HANGUL_HANJA ((sal_uInt16)css::awt::Key::HANGUL_HANJA) +#define KEY_DECIMAL ((sal_uInt16)css::awt::Key::DECIMAL) +#define KEY_TILDE ((sal_uInt16)css::awt::Key::TILDE) +#define KEY_QUOTELEFT ((sal_uInt16)css::awt::Key::QUOTELEFT) +#define KEY_BRACKETLEFT ((sal_uInt16)css::awt::Key::BRACKETLEFT) +#define KEY_BRACKETRIGHT ((sal_uInt16)css::awt::Key::BRACKETRIGHT) +#define KEY_SEMICOLON ((sal_uInt16)css::awt::Key::SEMICOLON) +#define KEY_QUOTERIGHT ((sal_uInt16)css::awt::Key::QUOTERIGHT) -#define KEY_CAPSLOCK ((sal_uInt16)::com::sun::star::awt::Key::CAPSLOCK) -#define KEY_NUMLOCK ((sal_uInt16)::com::sun::star::awt::Key::NUMLOCK) -#define KEY_SCROLLLOCK ((sal_uInt16)::com::sun::star::awt::Key::SCROLLLOCK) +#define KEY_CAPSLOCK ((sal_uInt16)css::awt::Key::CAPSLOCK) +#define KEY_NUMLOCK ((sal_uInt16)css::awt::Key::NUMLOCK) +#define KEY_SCROLLLOCK ((sal_uInt16)css::awt::Key::SCROLLLOCK) // extended Modifier-Keys (only used for modkey events) #define MODKEY_LSHIFT 0x0001 diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index b5dfe23ca569..bd1cc7515655 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -271,24 +271,24 @@ namespace vcl template <typename I> class DeleteUnoReferenceOnDeinit : public vcl::DeleteOnDeinitBase { - ::com::sun::star::uno::Reference<I> m_xI; + css::uno::Reference<I> m_xI; virtual void doCleanup() override { set(NULL); } public: - DeleteUnoReferenceOnDeinit(const ::com::sun::star::uno::Reference<I>& r_xI ) : m_xI( r_xI ) { + DeleteUnoReferenceOnDeinit(const css::uno::Reference<I>& r_xI ) : m_xI( r_xI ) { addDeinitContainer( this ); } virtual ~DeleteUnoReferenceOnDeinit() {} - ::com::sun::star::uno::Reference<I> get() { return m_xI; } + css::uno::Reference<I> get() { return m_xI; } - void set (const ::com::sun::star::uno::Reference<I>& r_xNew ) + void set (const css::uno::Reference<I>& r_xNew ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> xComponent (m_xI, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::lang::XComponent> xComponent (m_xI, css::uno::UNO_QUERY); m_xI = r_xNew; if (xComponent.is()) try { xComponent->dispose(); } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { } } diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index 9f7438b72a05..e73b747cbdce 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -45,7 +45,7 @@ struct ImplLineInfo long mnDistance; basegfx::B2DLineJoin meLineJoin; - com::sun::star::drawing::LineCap meLineCap; + css::drawing::LineCap meLineCap; ImplLineInfo(); ImplLineInfo( const ImplLineInfo& rImplLineInfo ); @@ -102,8 +102,8 @@ public: void SetLineJoin(basegfx::B2DLineJoin eLineJoin); basegfx::B2DLineJoin GetLineJoin() const { return mpImplLineInfo->meLineJoin; } - void SetLineCap(com::sun::star::drawing::LineCap eLineCap); - com::sun::star::drawing::LineCap GetLineCap() const { return mpImplLineInfo->meLineCap; } + void SetLineCap(css::drawing::LineCap eLineCap); + css::drawing::LineCap GetLineCap() const { return mpImplLineInfo->meLineCap; } bool IsDefault() const; diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx index 27fbbdd281c0..be86fa9e3603 100644 --- a/include/vcl/mnemonic.hxx +++ b/include/vcl/mnemonic.hxx @@ -60,7 +60,7 @@ class VCL_DLLPUBLIC MnemonicGenerator private: // 0 == Mnemonic; >0 == count of characters sal_uInt8 maMnemonics[MAX_MNEMONICS]; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > mxCharClass; + css::uno::Reference< css::i18n::XCharacterClassification > mxCharClass; protected: SAL_DLLPRIVATE sal_uInt16 ImplGetMnemonicIndex( sal_Unicode c ); @@ -71,7 +71,7 @@ public: void RegisterMnemonic( const OUString& rKey ); OUString CreateMnemonic( const OUString& rKey ); - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > GetCharClass(); + css::uno::Reference< css::i18n::XCharacterClassification > GetCharClass(); // returns a string where all '~'-characters and CJK mnemonics of the form (~A) are completely removed static OUString EraseAllMnemonicChars( const OUString& rStr ); diff --git a/include/vcl/oldprintadaptor.hxx b/include/vcl/oldprintadaptor.hxx index 927deb3a8ee7..8f04f195a45f 100644 --- a/include/vcl/oldprintadaptor.hxx +++ b/include/vcl/oldprintadaptor.hxx @@ -36,7 +36,7 @@ namespace vcl void EndPage(); virtual int getPageCount() const override; - virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParameters( int i_nPage ) const override; + virtual css::uno::Sequence< css::beans::PropertyValue > getPageParameters( int i_nPage ) const override; virtual void printPage( int i_nPage ) const override; }; } diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx index 528f5fc1c403..268e6198273a 100644 --- a/include/vcl/pdfextoutdevdata.hxx +++ b/include/vcl/pdfextoutdevdata.hxx @@ -73,7 +73,7 @@ struct GlobalSyncData; class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData { - const OutputDevice& mrOutDev; + const OutputDevice& mrOutDev; bool mbTaggedPDF; bool mbExportNotes; @@ -85,9 +85,9 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData bool mbExportBookmarks; bool mbExportHiddenSlides; bool mbExportNDests; //i56629 - sal_Int32 mnFormsFormat; - sal_Int32 mnPage; - com::sun::star::lang::Locale maDocLocale; + sal_Int32 mnFormsFormat; + sal_Int32 mnPage; + css::lang::Locale maDocLocale; PageSyncData* mpPageSyncData; GlobalSyncData* mpGlobalSyncData; @@ -143,8 +143,8 @@ public: bool GetIsReduceImageResolution() const { return mbReduceImageResolution;} void SetIsReduceImageResolution( const bool bReduceImageResolution ); - const com::sun::star::lang::Locale& GetDocumentLocale() const { return maDocLocale;} - void SetDocumentLocale( const com::sun::star::lang::Locale& rLoc ); + const css::lang::Locale& GetDocumentLocale() const { return maDocLocale;} + void SetDocumentLocale( const css::lang::Locale& rLoc ); std::vector< PDFExtOutDevBookmarkEntry >& GetBookmarks() { return maBookmarks;} diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 592c4239e7de..f6ed9a322b46 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -73,7 +73,7 @@ class VCL_DLLPUBLIC PDFOutputStream { public: virtual ~PDFOutputStream(); - virtual void write( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xStream ) = 0; + virtual void write( const css::uno::Reference< css::io::XOutputStream >& xStream ) = 0; }; class VCL_DLLPUBLIC PDFWriter @@ -624,16 +624,16 @@ The following structure describes the permissions used in PDF security PDFWriter::PDFDocInfo DocumentInfo; bool SignPDF; - OUString SignLocation; - OUString SignPassword; - OUString SignReason; - OUString SignContact; - com::sun::star::lang::Locale DocumentLocale; // defines the document default language + OUString SignLocation; + OUString SignPassword; + OUString SignReason; + OUString SignContact; + css::lang::Locale DocumentLocale; // defines the document default language sal_uInt32 DPIx, DPIy; // how to handle MapMode( MAP_PIXEL ) // 0 here specifies a default handling PDFWriter::ColorMode ColorMode; - com::sun::star::uno::Reference< com::sun::star::security::XCertificate> SignCertificate; - OUString SignTSA; + css::uno::Reference< css::security::XCertificate> SignCertificate; + OUString SignTSA; PDFWriterContext() : RelFsys( false ), //i56629, i49415?, i64585? @@ -668,7 +668,7 @@ The following structure describes the permissions used in PDF security {} }; - PDFWriter( const PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& ); + PDFWriter( const PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >& ); ~PDFWriter(); /** Returns an OutputDevice for formatting @@ -714,7 +714,7 @@ The following structure describes the permissions used in PDF security /* sets the document locale originally passed with the context to a new value * only affects the output if used before calling Emit. */ - void SetDocumentLocale( const com::sun::star::lang::Locale& rDocLocale ); + void SetDocumentLocale( const css::lang::Locale& rDocLocale ); /* finishes the file */ bool Emit(); @@ -726,7 +726,7 @@ The following structure describes the permissions used in PDF security */ std::set< ErrorCode > GetErrors(); - static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > + static css::uno::Reference< css::beans::XMaterialHolder > InitEncryption( const OUString& i_rOwnerPassword, const OUString& i_rUserPassword, bool b128Bit diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index 92edf09eed2e..43dec319ff80 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -232,10 +232,10 @@ public: // helper function OUString translateKey( const OUString& i_rKey, - const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; + const css::lang::Locale& i_rLocale = css::lang::Locale() ) const; OUString translateOption( const OUString& i_rKey, const OUString& i_rOption, - const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; + const css::lang::Locale& i_rLocale = css::lang::Locale() ) const; }; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 199d298a020b..6246335b2aff 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -513,9 +513,9 @@ public: virtual css::uno::Sequence< css::beans::PropertyValue > getPageParameters( int i_nPage ) const = 0; virtual void printPage(int i_nPage) const = 0; /// App must override this virtual void jobStarted(); // will be called after a possible dialog has been shown and the real printjob starts - virtual void jobFinished( com::sun::star::view::PrintableState ); + virtual void jobFinished( css::view::PrintableState ); - com::sun::star::view::PrintableState getJobState() const; + css::view::PrintableState getJobState() const; void abortJob(); @@ -544,7 +544,7 @@ public: VCL_PLUGIN_PUBLIC bool getPrinterModified() const; SAL_DLLPRIVATE void pushPropertiesToPrinter(); SAL_DLLPRIVATE void resetPaperToLastConfigured(); - VCL_PLUGIN_PUBLIC void setJobState( com::sun::star::view::PrintableState ); + VCL_PLUGIN_PUBLIC void setJobState( css::view::PrintableState ); SAL_DLLPRIVATE bool setupPrinter( vcl::Window* i_pDlgParent ); SAL_DLLPRIVATE int getPageCountProtected() const; diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 8d8e7f7de8b5..dd1752b673fc 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -104,8 +104,8 @@ private: TEIMEInfos* mpIMEInfos; - ::com::sun::star::lang::Locale maLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > mxBreakIterator; + css::lang::Locale maLocale; + css::uno::Reference< css::i18n::XBreakIterator > mxBreakIterator; css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC; Rectangle maInvalidRect; @@ -162,7 +162,7 @@ protected: // gets not exported. First and second parameter swapped to have a different signatur. SAL_DLLPRIVATE TextPaM ImpInsertText( sal_Unicode c, const TextSelection& rSel, bool bOverwrite = false, bool bIsUserInput = false ); // some other new functions needed that must not be exported to remain compatible - SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > GetInputSequenceChecker(); + SAL_DLLPRIVATE css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > GetInputSequenceChecker(); SAL_DLLPRIVATE bool IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const; // broadcast or adjust selections @@ -308,9 +308,9 @@ public: void Draw( OutputDevice* pDev, const Point& rPos ); - void SetLocale( const ::com::sun::star::lang::Locale& rLocale ); - ::com::sun::star::lang::Locale GetLocale(); - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > GetBreakIterator(); + void SetLocale( const css::lang::Locale& rLocale ); + css::lang::Locale GetLocale(); + css::uno::Reference< css::i18n::XBreakIterator > GetBreakIterator(); static bool DoesKeyChangeText( const KeyEvent& rKeyEvent ); static bool IsSimpleCharInput( const KeyEvent& rKeyEvent ); diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 65146d1dc410..4fa335cca908 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -84,12 +84,12 @@ protected: VirtualDevice* GetVirtualDevice(); // DragAndDropClient - virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) throw (css::uno::RuntimeException, std::exception) override; + virtual void dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override; + virtual void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override; + virtual void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (css::uno::RuntimeException, std::exception) override; + virtual void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) override; + virtual void dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override; using DragAndDropClient::dragEnter; using DragAndDropClient::dragExit; diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index 88a4c7823d08..2ea99d4462e1 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -84,14 +84,14 @@ private: try { m_result.reset( m_func() ); } - catch (::com::sun::star::uno::Exception &) { + catch (css::uno::Exception &) { // only UNO exceptions can be dispatched: m_exc = ::cppu::getCaughtException(); } return 0; } - ::com::sun::star::uno::Any m_exc; + css::uno::Any m_exc; FuncT const m_func; // using boost::optional here omits the need that ResultT is default // constructable: @@ -120,14 +120,14 @@ private: try { m_func(); } - catch (::com::sun::star::uno::Exception &) { + catch (css::uno::Exception &) { // only UNO exceptions can be dispatched: m_exc = ::cppu::getCaughtException(); } return 0; } - ::com::sun::star::uno::Any m_exc; + css::uno::Any m_exc; FuncT const m_func; }; diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx index c1496928c8f4..c7ef4419c7ea 100644 --- a/include/vcl/unohelp.hxx +++ b/include/vcl/unohelp.hxx @@ -50,9 +50,9 @@ namespace vcl { namespace unohelper { -VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > CreateBreakIterator(); -VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification> CreateCharacterClassification(); -VCL_DLLPUBLIC void NotifyAccessibleStateEventGlobally( const ::com::sun::star::accessibility::AccessibleEventObject& rEventObject ); +VCL_DLLPUBLIC css::uno::Reference < css::i18n::XBreakIterator > CreateBreakIterator(); +VCL_DLLPUBLIC css::uno::Reference < css::i18n::XCharacterClassification> CreateCharacterClassification(); +VCL_DLLPUBLIC void NotifyAccessibleStateEventGlobally( const css::accessibility::AccessibleEventObject& rEventObject ); }} // namespace vcl::unohelper #endif // INCLUDED_VCL_UNOHELP_HXX diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx index 0fd4d2574f55..abd5f62ec2bf 100644 --- a/include/vcl/unohelp2.hxx +++ b/include/vcl/unohelp2.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer { namesp namespace vcl { namespace unohelper { class VCL_DLLPUBLIC TextDataObject : - public ::com::sun::star::datatransfer::XTransferable, + public css::datatransfer::XTransferable, public ::cppu::OWeakObject { private: @@ -45,20 +45,20 @@ namespace vcl { namespace unohelper { OUString& GetString() { return maText; } - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } + void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::datatransfer::XTransferable - ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::datatransfer::XTransferable + css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw(css::uno::RuntimeException, std::exception) override; /// copies a given string to a given clipboard static void CopyStringTo( const OUString& rContent, - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard + const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& rxClipboard ); }; diff --git a/include/vcl/unowrap.hxx b/include/vcl/unowrap.hxx index 84035e90eadc..066c700d518f 100644 --- a/include/vcl/unowrap.hxx +++ b/include/vcl/unowrap.hxx @@ -60,20 +60,20 @@ public: virtual void Destroy() = 0; // Toolkit - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > GetVCLToolkit() = 0; + virtual css::uno::Reference< css::awt::XToolkit > GetVCLToolkit() = 0; // Graphics - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > CreateGraphics( OutputDevice* pOutDev ) = 0; + virtual css::uno::Reference< css::awt::XGraphics > CreateGraphics( OutputDevice* pOutDev ) = 0; virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) = 0; // Window - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow, bool bCreate ) = 0; - virtual void SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0; + virtual css::uno::Reference< css::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow, bool bCreate ) = 0; + virtual void SetWindowInterface( vcl::Window* pWindow, css::uno::Reference< css::awt::XWindowPeer > xIFace ) = 0; virtual void WindowDestroyed( vcl::Window* pWindow ) = 0; // Accessibility - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible( Menu* pMenu, bool bIsMenuBar ) = 0; protected: diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index e564100f9a48..1b65eb6764aa 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -241,12 +241,12 @@ public: class VCL_DLLPUBLIC VclAccessibleEvent: public VclSimpleEvent { public: - VclAccessibleEvent( sal_uLong n, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible ); + VclAccessibleEvent( sal_uLong n, const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible ); virtual ~VclAccessibleEvent(); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible() const { return mxAccessible;} + css::uno::Reference< css::accessibility::XAccessible > GetAccessible() const { return mxAccessible;} private: - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible; + css::uno::Reference< css::accessibility::XAccessible > mxAccessible; }; #endif // INCLUDED_VCL_VCLEVENT_HXX diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 0123c3b28e6c..7a7d0a273d2d 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -785,7 +785,7 @@ private: SAL_DLLPRIVATE void ImplPaintToDevice( ::OutputDevice* pTargetOutDev, const Point& rPos ); - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > + SAL_DLLPRIVATE css::uno::Reference< css::rendering::XCanvas > ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const; public: @@ -1256,26 +1256,26 @@ public: const Point& rDestOff, VirtualDevice& rSaveDevice ); const SystemEnvData* GetSystemData() const; - ::com::sun::star::uno::Any GetSystemDataAny() const; + css::uno::Any GetSystemDataAny() const; // API to set/query the component interfaces - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > + virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface( bool bCreate = true ); - void SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ); + void SetComponentInterface( css::uno::Reference< css::awt::XWindowPeer > xIFace ); /** @name Accessibility */ ///@{ public: - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible(); - void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ); + void SetAccessible( css::uno::Reference< css::accessibility::XAccessible > ); vcl::Window* GetAccessibleParentWindow() const; sal_uInt16 GetAccessibleChildWindowCount(); @@ -1361,10 +1361,10 @@ private: Size get_ungrouped_preferred_size() const; public: /// request XCanvas render interface for this window - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > + css::uno::Reference< css::rendering::XCanvas > GetCanvas() const; /// request XSpriteCanvas render interface for this window - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > + css::uno::Reference< css::rendering::XSpriteCanvas > GetSpriteCanvas() const; /* records all DrawText operations within the passed rectangle; @@ -1374,22 +1374,22 @@ public: // set and retrieve for Toolkit VCLXWindow* GetWindowPeer() const; - void SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer, VCLXWindow* pVCLXWindow ); + void SetWindowPeer( css::uno::Reference< css::awt::XWindowPeer > xPeer, VCLXWindow* pVCLXWindow ); // remember if it was generated by Toolkit bool IsCreatedWithToolkit() const; void SetCreatedWithToolkit( bool b ); // Drag and Drop interfaces - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > GetDropTarget(); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > GetDragSource(); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > GetDragGestureRecognizer(); + css::uno::Reference< css::datatransfer::dnd::XDropTarget > GetDropTarget(); + css::uno::Reference< css::datatransfer::dnd::XDragSource > GetDragSource(); + css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > GetDragGestureRecognizer(); // Clipboard/Selection interfaces - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetClipboard(); + css::uno::Reference< css::datatransfer::clipboard::XClipboard > GetClipboard(); /// Sets a custom clipboard for the window's frame, instead of creating it on-demand using css::datatransfer::clipboard::SystemClipboard. void SetClipboard(css::uno::Reference<css::datatransfer::clipboard::XClipboard> xClipboard); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetPrimarySelection(); + css::uno::Reference< css::datatransfer::clipboard::XClipboard > GetPrimarySelection(); /* * Widgets call this to inform their owner container that the widget wants diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index 0165d32c0d13..c3fed0ce47e8 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -59,7 +59,7 @@ private: mbFullScreenMode:1; SAL_DLLPRIVATE void ImplInitWorkWindowData(); - SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const css::uno::Any& aSystemWorkWindowToken ); private: WorkWindow( const WorkWindow& rWin ) = delete; @@ -72,7 +72,7 @@ protected: public: explicit WorkWindow( vcl::Window* pParent, WinBits nStyle = WB_STDWORK ); - explicit WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); + explicit WorkWindow( vcl::Window* pParent, const css::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); explicit WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version virtual ~WorkWindow(); virtual void dispose() override; diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx index d54a6496d7e9..f7fd91e06cd2 100644 --- a/include/vcl/xtextedt.hxx +++ b/include/vcl/xtextedt.hxx @@ -40,7 +40,7 @@ public: virtual ~ExtTextEngine(); TextSelection MatchGroup( const TextPaM& rCursor ) const; - bool Search( TextSelection& rSel, const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bForward = true ); + bool Search( TextSelection& rSel, const css::util::SearchOptions& rSearchOptions, bool bForward = true ); }; class VCL_DLLPUBLIC ExtTextView : public TextView @@ -49,13 +49,13 @@ protected: bool ImpIndentBlock( bool bRight ); public: - ExtTextView( ExtTextEngine* pEng, vcl::Window* pWindow ); - virtual ~ExtTextView(); + ExtTextView( ExtTextEngine* pEng, vcl::Window* pWindow ); + virtual ~ExtTextView(); bool MatchGroup(); - bool Search( const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bForward ); - sal_uInt16 Replace( const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bAll, bool bForward ); + bool Search( const css::util::SearchOptions& rSearchOptions, bool bForward ); + sal_uInt16 Replace( const css::util::SearchOptions& rSearchOptions, bool bAll, bool bForward ); bool IndentBlock(); bool UnindentBlock(); |