[Libreoffice-commits] core.git: include/sot include/svl include/svtools include/svx include/toolkit include/tools include/typelib
Noel Grandin
noel at peralex.com
Fri Oct 23 08:49:30 UTC 2015
include/sot/exchange.hxx | 18
include/sot/sotdata.hxx | 2
include/sot/stg.hxx | 6
include/sot/storage.hxx | 8
include/svl/PasswordHelper.hxx | 10
include/svl/asiancfg.hxx | 7
include/svl/cenumitm.hxx | 4
include/svl/cintitem.hxx | 16
include/svl/cntwall.hxx | 6
include/svl/ctypeitm.hxx | 4
include/svl/custritm.hxx | 4
include/svl/documentlockfile.hxx | 4
include/svl/eitem.hxx | 6
include/svl/globalnameitem.hxx | 4
include/svl/ilstitem.hxx | 12
include/svl/imageitm.hxx | 4
include/svl/instrm.hxx | 15
include/svl/int64item.hxx | 4
include/svl/intitem.hxx | 4
include/svl/itemprop.hxx | 87 -
include/svl/languageoptions.hxx | 4
include/svl/lckbitem.hxx | 4
include/svl/lockfilecommon.hxx | 6
include/svl/numuno.hxx | 28
include/svl/ondemand.hxx | 42
include/svl/outstrm.hxx | 7
include/svl/ownlist.hxx | 4
include/svl/pickerhistoryaccess.hxx | 4
include/svl/poolitem.hxx | 8
include/svl/ptitem.hxx | 4
include/svl/rectitem.hxx | 4
include/svl/sharecontrolfile.hxx | 12
include/svl/slstitm.hxx | 8
include/svl/srchitem.hxx | 36
include/svl/style.hxx | 8
include/svl/szitem.hxx | 4
include/svl/urihelper.hxx | 12
include/svl/visitem.hxx | 6
include/svl/zforlist.hxx | 12
include/svl/zformat.hxx | 4
include/svtools/DocumentInfoPreview.hxx | 5
include/svtools/ServerDetailsControls.hxx | 2
include/svtools/acceleratorexecute.hxx | 2
include/svtools/accessiblefactory.hxx | 56
include/svtools/accessibleruler.hxx | 102 -
include/svtools/addresstemplate.hxx | 26
include/svtools/apearcfg.hxx | 4
include/svtools/bindablecontrolhelper.hxx | 2
include/svtools/cliplistener.hxx | 10
include/svtools/contextmenuhelper.hxx | 26
include/svtools/ctrlbox.hxx | 4
include/svtools/dialogclosedlistener.hxx | 8
include/svtools/editbrowsebox.hxx | 12
include/svtools/embedhlp.hxx | 20
include/svtools/embedtransfer.hxx | 6
include/svtools/fileview.hxx | 11
include/svtools/foldertree.hxx | 2
include/svtools/fontsubstconfig.hxx | 2
include/svtools/framestatuslistener.hxx | 40
include/svtools/generictoolboxcontroller.hxx | 10
include/svtools/genericunodialog.hxx | 40
include/svtools/grfmgr.hxx | 2
include/svtools/headbar.hxx | 10
include/svtools/htmlcfg.hxx | 6
include/svtools/imageresourceaccess.hxx | 10
include/svtools/ivctrl.hxx | 3
include/svtools/javacontext.hxx | 26
include/svtools/javainteractionhandler.hxx | 13
include/svtools/openfiledroptargetlistener.hxx | 2
include/svtools/parhtml.hxx | 6
include/svtools/popupmenucontrollerbase.hxx | 72 -
include/svtools/popupwindowcontroller.hxx | 30
include/svtools/restartdialog.hxx | 3
include/svtools/ruler.hxx | 2
include/svtools/scriptedtext.hxx | 2
include/svtools/statusbarcontroller.hxx | 80 -
include/svtools/svmedit.hxx | 3
include/svtools/table/tablemodel.hxx | 10
include/svtools/table/tablerenderer.hxx | 4
include/svtools/toolboxcontroller.hxx | 92 -
include/svtools/toolpanel/decklayouter.hxx | 4
include/svtools/toolpanel/drawerlayouter.hxx | 4
include/svtools/toolpanel/paneltabbar.hxx | 2
include/svtools/toolpanel/tablayouter.hxx | 4
include/svtools/toolpanel/toolpanel.hxx | 4
include/svtools/toolpanel/toolpaneldeck.hxx | 2
include/svtools/transfer.hxx | 194 +-
include/svtools/treelistbox.hxx | 3
include/svtools/unoevent.hxx | 99 -
include/svtools/unoimap.hxx | 12
include/svtools/valueset.hxx | 2
include/svtools/xwindowitem.hxx | 2
include/svx/AccessibleControlShape.hxx | 56
include/svx/AccessibleGraphicShape.hxx | 30
include/svx/AccessibleOLEShape.hxx | 42
include/svx/AccessibleShape.hxx | 204 +--
include/svx/AccessibleShapeInfo.hxx | 24
include/svx/AccessibleShapeTreeInfo.hxx | 36
include/svx/AccessibleTextHelper.hxx | 12
include/svx/AffineMatrixItem.hxx | 8
include/svx/ChildrenManager.hxx | 28
include/svx/DescriptionGenerator.hxx | 8
include/svx/EnhancedCustomShape2d.hxx | 44
include/svx/EnhancedCustomShapeFunctionParser.hxx | 4
include/svx/IAccessibleParent.hxx | 18
include/svx/ParseContext.hxx | 2
include/svx/ShapeTypeHandler.hxx | 12
include/svx/SmartTagCtl.hxx | 8
include/svx/SmartTagItem.hxx | 40
include/svx/SmartTagMgr.hxx | 52
include/svx/UnoNamespaceMap.hxx | 2
include/svx/XPropertyTable.hxx | 12
include/svx/algitem.hxx | 8
include/svx/charthelper.hxx | 4
include/svx/chrtitem.hxx | 8
include/svx/clipfmtitem.hxx | 4
include/svx/dataaccessdescriptor.hxx | 16
include/svx/dbaexchange.hxx | 22
include/svx/dbaobjectex.hxx | 2
include/svx/dialogs.hrc | 2
include/svx/dlgctrl.hxx | 8
include/svx/drawitem.hxx | 24
include/svx/e3ditem.hxx | 4
include/svx/fmdpage.hxx | 22
include/svx/fmglob.hxx | 46
include/svx/fmgridcl.hxx | 28
include/svx/fmgridif.hxx | 386 ++---
include/svx/fmpage.hxx | 2
include/svx/fmsearch.hxx | 4
include/svx/fmshell.hxx | 8
include/svx/fmsrcimp.hxx | 70 -
include/svx/fmview.hxx | 14
include/svx/frmsel.hxx | 8
include/svx/galleryitem.hxx | 10
include/svx/galmisc.hxx | 4
include/svx/galtheme.hxx | 2
include/svx/graphctl.hxx | 2
include/svx/graphichelper.hxx | 2
include/svx/grfcrop.hxx | 4
include/svx/gridctrl.hxx | 42
include/svx/hlnkitem.hxx | 4
include/svx/itemwin.hxx | 8
include/svx/langbox.hxx | 2
include/svx/linectrl.hxx | 6
include/svx/numvset.hxx | 16
include/svx/pageitem.hxx | 4
include/svx/rotmodit.hxx | 4
include/svx/rubydialog.hxx | 2
include/svx/rulritem.hxx | 20
include/svx/sdasaitm.hxx | 4
include/svx/sdasitm.hxx | 22
include/svx/sdggaitm.hxx | 4
include/svx/sdr/table/tablecontroller.hxx | 4
include/svx/sdr/table/tabledesign.hxx | 2
include/svx/sdtaditm.hxx | 4
include/svx/sdtaitm.hxx | 8
include/svx/sdtakitm.hxx | 4
include/svx/sdtfchim.hxx | 4
include/svx/sdtfsitm.hxx | 4
include/svx/shapepropertynotifier.hxx | 8
include/svx/sidebar/ContextChangeEventMultiplexer.hxx | 2
include/svx/sidebar/PanelLayout.hxx | 2
include/svx/srchdlg.hxx | 2
include/svx/svdedxv.hxx | 2
include/svx/svdmodel.hxx | 18
include/svx/svdoashp.hxx | 18
include/svx/svdobj.hxx | 20
include/svx/svdograf.hxx | 2
include/svx/svdomedia.hxx | 4
include/svx/svdoole2.hxx | 18
include/svx/svdotable.hxx | 8
include/svx/svdouno.hxx | 16
include/svx/svdpagv.hxx | 2
include/svx/svdsob.hxx | 4
include/svx/svx3ditems.hxx | 28
include/svx/svxdlg.hxx | 16
include/svx/swframevalidation.hxx | 10
include/svx/sxekitm.hxx | 4
include/svx/sxenditm.hxx | 16
include/svx/sxmtpitm.hxx | 8
include/svx/sxmuitm.hxx | 4
include/svx/tbxcolor.hxx | 4
include/svx/unoapi.hxx | 8
include/svx/unofill.hxx | 12
include/svx/unomaster.hxx | 34
include/svx/unomod.hxx | 20
include/svx/unomodel.hxx | 60
include/svx/unopage.hxx | 56
include/svx/unopool.hxx | 32
include/svx/unoprov.hxx | 2
include/svx/unoshape.hxx | 444 +++---
include/svx/unoshprp.hxx | 148 +-
include/svx/viewlayoutitem.hxx | 4
include/svx/xbtmpit.hxx | 4
include/svx/xcolit.hxx | 4
include/svx/xfillit0.hxx | 4
include/svx/xflclit.hxx | 4
include/svx/xflftrit.hxx | 4
include/svx/xflgrit.hxx | 4
include/svx/xflhtit.hxx | 4
include/svx/xftadit.hxx | 4
include/svx/xftshit.hxx | 4
include/svx/xlineit0.hxx | 8
include/svx/xlinjoit.hxx | 8
include/svx/xlncapit.hxx | 8
include/svx/xlnclit.hxx | 4
include/svx/xlndsit.hxx | 4
include/svx/xlnedcit.hxx | 4
include/svx/xlnedit.hxx | 4
include/svx/xlnedwit.hxx | 4
include/svx/xlnstcit.hxx | 4
include/svx/xlnstit.hxx | 4
include/svx/xlnstwit.hxx | 4
include/svx/xlnwtit.hxx | 4
include/svx/xmleohlp.hxx | 32
include/svx/xmlgrhlp.hxx | 24
include/svx/xoutbmp.hxx | 2
include/svx/xtable.hxx | 22
include/svx/xtextit0.hxx | 4
include/svx/zoomslideritem.hxx | 8
include/toolkit/awt/animatedimagespeer.hxx | 30
include/toolkit/awt/vclxaccessiblecomponent.hxx | 68 -
include/toolkit/awt/vclxbitmap.hxx | 34
include/toolkit/awt/vclxcontainer.hxx | 34
include/toolkit/awt/vclxdevice.hxx | 58
include/toolkit/awt/vclxfont.hxx | 54
include/toolkit/awt/vclxgraphics.hxx | 98 -
include/toolkit/awt/vclxpointer.hxx | 16
include/toolkit/awt/vclxprinter.hxx | 140 +-
include/toolkit/awt/vclxregion.hxx | 54
include/toolkit/awt/vclxspinbutton.hxx | 34
include/toolkit/awt/vclxsystemdependentwindow.hxx | 16
include/toolkit/awt/vclxtabpagecontainer.hxx | 44
include/toolkit/awt/vclxtopwindow.hxx | 48
include/toolkit/awt/vclxwindow.hxx | 204 +--
include/toolkit/awt/vclxwindows.hxx | 1098 ++++++++--------
include/toolkit/controls/accessiblecontrolcontext.hxx | 40
include/toolkit/controls/animatedimages.hxx | 42
include/toolkit/controls/controlmodelcontainerbase.hxx | 186 +-
include/toolkit/controls/dialogcontrol.hxx | 230 +--
include/toolkit/controls/eventcontainer.hxx | 66
include/toolkit/controls/formattedcontrol.hxx | 42
include/toolkit/controls/geometrycontrolmodel.hxx | 74 -
include/toolkit/controls/geometrycontrolmodel_impl.hxx | 10
include/toolkit/controls/roadmapcontrol.hxx | 8
include/toolkit/controls/roadmapentry.hxx | 14
include/toolkit/controls/stdtabcontroller.hxx | 44
include/toolkit/controls/stdtabcontrollermodel.hxx | 62
include/toolkit/controls/tabpagecontainer.hxx | 84 -
include/toolkit/controls/tabpagemodel.hxx | 40
include/toolkit/controls/tkscrollbar.hxx | 78 -
include/toolkit/controls/unocontrol.hxx | 190 +-
include/toolkit/controls/unocontrolbase.hxx | 18
include/toolkit/controls/unocontrolcontainer.hxx | 90 -
include/toolkit/controls/unocontrolcontainermodel.hxx | 16
include/toolkit/controls/unocontrolmodel.hxx | 106 -
include/toolkit/controls/unocontrols.hxx | 1152 ++++++++---------
include/toolkit/helper/accessiblefactory.hxx | 24
include/toolkit/helper/convert.hxx | 18
include/toolkit/helper/emptyfontdescriptor.hxx | 8
include/toolkit/helper/formpdfexport.hxx | 2
include/toolkit/helper/listenermultiplexer.hxx | 158 +-
include/toolkit/helper/macros.hxx | 50
include/toolkit/helper/property.hxx | 20
include/toolkit/helper/vclunohelper.hxx | 60
include/tools/date.hxx | 6
include/tools/diagnose_ex.h | 14
include/tools/globname.hxx | 4
include/tools/time.hxx | 6
include/tools/urlobj.hxx | 4
include/typelib/typedescription.hxx | 4
271 files changed, 4625 insertions(+), 4663 deletions(-)
New commits:
commit c06e2fcc2c03c4b6353bd9a1e282c36de872d777
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 23 09:07:12 2015 +0200
com::sun::star->css in include/sot to include/typelib
Change-Id: I9cd92b53370a6b6018d2f7c648890f9c014a27de
diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx
index a42e836..4d9285b 100644
--- a/include/sot/exchange.hxx
+++ b/include/sot/exchange.hxx
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer {
} } } }
-struct DataFlavorEx : public ::com::sun::star::datatransfer::DataFlavor
+struct DataFlavorEx : public css::datatransfer::DataFlavor
{
SotClipboardFormatId mnSotId;
};
@@ -54,11 +54,11 @@ SOT_DLLPUBLIC bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVec
// actions
#define EXCHG_ACTION_MASK ((sal_uInt16)0x00FF)
-#define EXCHG_INOUT_ACTION_NONE ((sal_uInt16)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_NONE)
+#define EXCHG_INOUT_ACTION_NONE ((sal_uInt16)css::datatransfer::dnd::DNDConstants::ACTION_NONE)
#define EXCHG_IN_ACTION_DEFAULT EXCHG_INOUT_ACTION_NONE
-#define EXCHG_IN_ACTION_MOVE ((sal_uInt16)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_MOVE)
-#define EXCHG_IN_ACTION_COPY ((sal_uInt16)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY)
-#define EXCHG_IN_ACTION_LINK ((sal_uInt16)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_LINK)
+#define EXCHG_IN_ACTION_MOVE ((sal_uInt16)css::datatransfer::dnd::DNDConstants::ACTION_MOVE)
+#define EXCHG_IN_ACTION_COPY ((sal_uInt16)css::datatransfer::dnd::DNDConstants::ACTION_COPY)
+#define EXCHG_IN_ACTION_LINK ((sal_uInt16)css::datatransfer::dnd::DNDConstants::ACTION_LINK)
#define EXCHG_OUT_ACTION_INSERT_OBJ ((sal_uInt16)17)
#define EXCHG_OUT_ACTION_INSERT_BOOKMARK ((sal_uInt16)18)
#define EXCHG_OUT_ACTION_INSERT_FILE ((sal_uInt16)20)
@@ -122,13 +122,13 @@ class SvGlobalName;
class SOT_DLLPUBLIC SotExchange
{
public:
- static SotClipboardFormatId RegisterFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ static SotClipboardFormatId RegisterFormat( const css::datatransfer::DataFlavor& rFlavor );
static SotClipboardFormatId RegisterFormatName( const OUString& rName );
static SotClipboardFormatId RegisterFormatMimeType( const OUString& rMimeType );
- static SotClipboardFormatId GetFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ static SotClipboardFormatId GetFormat( const css::datatransfer::DataFlavor& rFlavor );
static OUString GetFormatName( SotClipboardFormatId nFormat );
- static bool GetFormatDataFlavor( SotClipboardFormatId nFormat, ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ static bool GetFormatDataFlavor( SotClipboardFormatId nFormat, css::datatransfer::DataFlavor& rFlavor );
static OUString GetFormatMimeType( SotClipboardFormatId nFormat );
static bool IsInternal( const SvGlobalName& );
static SotClipboardFormatId GetFormatIdFromMimeType( const OUString& rMimeType );
@@ -150,7 +150,7 @@ public:
// In:- optional - check only for this specific format
SotClipboardFormatId nOnlyTestFormat = SotClipboardFormatId::NONE,
// In:- optional - check the contents of Xtransferable
- const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >* pxTransferable = NULL );
+ const css::uno::Reference< css::datatransfer::XTransferable >* pxTransferable = NULL );
static sal_uInt16 IsChart( const SvGlobalName& rName );
static sal_uInt16 IsMath( const SvGlobalName& rName );
diff --git a/include/sot/sotdata.hxx b/include/sot/sotdata.hxx
index 88a7dde..58867b0 100644
--- a/include/sot/sotdata.hxx
+++ b/include/sot/sotdata.hxx
@@ -30,7 +30,7 @@ class SotFactory;
class SotObject;
typedef ::std::vector< SotFactory* > SotFactoryList;
-typedef ::std::vector< com::sun::star::datatransfer::DataFlavor* > tDataFlavorList;
+typedef ::std::vector< css::datatransfer::DataFlavor* > tDataFlavorList;
struct SotData_Impl
{
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index 8ef557b..6b6bebe 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -228,7 +228,7 @@ protected:
virtual ~UCBStorageStream();
public:
TYPEINFO_OVERRIDE();
- UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, const OString* pKey, bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress );
+ UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, const OString* pKey, bool bRepair, css::uno::Reference< css::ucb::XProgressHandler > xProgress );
UCBStorageStream( UCBStorageStream_Impl* );
virtual sal_uLong Read( void * pData, sal_uLong nSize ) override;
@@ -243,7 +243,7 @@ public:
virtual bool Validate( bool=false ) const override;
virtual bool ValidateMode( StreamMode ) const override;
virtual bool Equals( const BaseStorageStream& rStream ) const override;
- bool SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue );
+ bool SetProperty( const OUString& rName, const css::uno::Any& rValue );
SvStream* GetModifySvStream();
};
@@ -276,7 +276,7 @@ public:
bool bDirect,
bool bIsRoot,
bool bIsRepair,
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler >
+ css::uno::Reference< css::ucb::XProgressHandler >
xProgressHandler );
UCBStorage( UCBStorage_Impl* );
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 05d947a..316bc41 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -69,7 +69,7 @@ public:
sal_uInt32 GetSize() const;
bool CopyTo( SotStorageStream * pDestStm );
bool Commit();
- bool SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue );
+ bool SetProperty( const OUString& rName, const css::uno::Any& rValue );
virtual sal_uInt64 remainingSize() override;
};
@@ -177,10 +177,10 @@ public:
static bool IsOLEStorage( const OUString & rFileName );
static bool IsOLEStorage( SvStream* pStream );
- static SotStorage* OpenOLEStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage,
+ static SotStorage* OpenOLEStorage( const css::uno::Reference < css::embed::XStorage >& xStorage,
const OUString& rEleName, StreamMode = STREAM_STD_READWRITE );
- static SotClipboardFormatId GetFormatID( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
- static sal_Int32 GetVersion( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
+ static SotClipboardFormatId GetFormatID( const css::uno::Reference < css::embed::XStorage >& xStorage );
+ static sal_Int32 GetVersion( const css::uno::Reference < css::embed::XStorage >& xStorage );
};
#endif // _SVSTOR_HXX
diff --git a/include/svl/PasswordHelper.hxx b/include/svl/PasswordHelper.hxx
index 06cf311d..ca048ed 100644
--- a/include/svl/PasswordHelper.hxx
+++ b/include/svl/PasswordHelper.hxx
@@ -26,19 +26,19 @@
class SvPasswordHelper
{
- static void GetHashPasswordLittleEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
- static void GetHashPasswordBigEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
+ static void GetHashPasswordLittleEndian(css::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
+ static void GetHashPasswordBigEndian(css::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
public:
- SVL_DLLPUBLIC static void GetHashPassword(com::sun::star::uno::Sequence <sal_Int8>& rPassHash, const sal_Char* pPass, sal_uInt32 nLen);
+ SVL_DLLPUBLIC static void GetHashPassword(css::uno::Sequence <sal_Int8>& rPassHash, const sal_Char* pPass, sal_uInt32 nLen);
- SVL_DLLPUBLIC static void GetHashPassword(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
+ SVL_DLLPUBLIC static void GetHashPassword(css::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass);
/**
Use this method to compare a given string with another given Hash value.
This is necessary, because in older versions exists different hashes of the same string. They were endian dependent.
We need this to handle old files. This method will compare against big and little endian. See #101326#
*/
- SVL_DLLPUBLIC static bool CompareHashPassword(const com::sun::star::uno::Sequence<sal_Int8>& rOldPassHash, const OUString& sNewPass);
+ SVL_DLLPUBLIC static bool CompareHashPassword(const css::uno::Sequence<sal_Int8>& rOldPassHash, const OUString& sNewPass);
};
#endif
diff --git a/include/svl/asiancfg.hxx b/include/svl/asiancfg.hxx
index 127eb00..738d127 100644
--- a/include/svl/asiancfg.hxx
+++ b/include/svl/asiancfg.hxx
@@ -48,15 +48,14 @@ public:
void SetCharDistanceCompression(sal_Int16 value);
- com::sun::star::uno::Sequence< com::sun::star::lang::Locale >
- GetStartEndCharLocales() const;
+ css::uno::Sequence< css::lang::Locale > GetStartEndCharLocales() const;
bool GetStartEndChars(
- com::sun::star::lang::Locale const & locale, OUString & startChars,
+ css::lang::Locale const & locale, OUString & startChars,
OUString & endChars) const;
void SetStartEndChars(
- com::sun::star::lang::Locale const & locale,
+ css::lang::Locale const & locale,
OUString const * startChars, OUString const * endChars);
private:
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index 52360c7..a14f0c7 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -42,9 +42,9 @@ public:
const IntlWrapper * = 0)
const override;
- virtual bool QueryValue(com::sun::star::uno::Any & rVal, sal_uInt8 = 0) const override;
+ virtual bool QueryValue(css::uno::Any & rVal, sal_uInt8 = 0) const override;
- virtual bool PutValue(const com::sun::star::uno::Any & rVal, sal_uInt8 ) override;
+ virtual bool PutValue(const css::uno::Any & rVal, sal_uInt8 ) override;
virtual sal_uInt16 GetValueCount() const = 0;
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index 788c609..1ea75ae 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -48,10 +48,10 @@ public:
const IntlWrapper * = 0)
const override;
- virtual bool QueryValue(com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue(css::uno::Any& rVal,
sal_uInt8 nMemberId = 0) const override;
- virtual bool PutValue(const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue(const css::uno::Any& rVal,
sal_uInt8 nMemberId) override;
virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
@@ -98,10 +98,10 @@ public:
const IntlWrapper * = 0)
const override;
- virtual bool QueryValue(com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue(css::uno::Any& rVal,
sal_uInt8 nMemberId = 0) const override;
- virtual bool PutValue(const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue(const css::uno::Any& rVal,
sal_uInt8 nMemberId) override;
virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
@@ -148,10 +148,10 @@ public:
const IntlWrapper * = 0)
const override;
- virtual bool QueryValue(com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue(css::uno::Any& rVal,
sal_uInt8 nMemberId = 0) const override;
- virtual bool PutValue(const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue(const css::uno::Any& rVal,
sal_uInt8 nMemberId) override;
virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
@@ -198,10 +198,10 @@ public:
const IntlWrapper * = 0)
const override;
- virtual bool QueryValue(com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue(css::uno::Any& rVal,
sal_uInt8 nMemberId = 0) const override;
- virtual bool PutValue(const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue(const css::uno::Any& rVal,
sal_uInt8 nMemberId) override;
virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx
index a7401fd..991a803 100644
--- a/include/svl/cntwall.hxx
+++ b/include/svl/cntwall.hxx
@@ -49,16 +49,16 @@ public:
virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const override;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue ( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
void SetBitmapURL( const OUString& rURL ) { _aURL = rURL; }
void SetColor( Color nColor ) { _nColor = nColor; }
void SetStyle( sal_uInt16 nStyle ) { _nStyle = nStyle; }
- const OUString& GetBitmapURL() const { return _aURL; }
+ const OUString& GetBitmapURL() const { return _aURL; }
Color GetColor() const { return _nColor; }
sal_uInt16 GetStyle() const { return _nStyle; }
};
diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index 37d8bdc..bd72434 100644
--- a/include/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.hxx
@@ -55,9 +55,9 @@ public:
OUString & rText,
const IntlWrapper* pIntlWrapper = 0 ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue ( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
INetContentType GetEnumValue() const;
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index ee365ef..4c59264 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -52,10 +52,10 @@ public:
const IntlWrapper * = 0)
const override;
- virtual bool QueryValue(com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue(css::uno::Any& rVal,
sal_uInt8 nMemberId = 0) const override;
- virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId) override;
+ virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override;
virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override;
diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx
index 23403c8..b658dcc 100644
--- a/include/svl/documentlockfile.hxx
+++ b/include/svl/documentlockfile.hxx
@@ -37,9 +37,9 @@ class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon
// the workaround for automated testing!
static bool m_bAllowInteraction;
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > OpenStream();
+ css::uno::Reference< css::io::XInputStream > OpenStream();
- void WriteEntryToStream( const LockFileEntry& aEntry, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xStream );
+ void WriteEntryToStream( const LockFileEntry& aEntry, css::uno::Reference< css::io::XOutputStream > xStream );
public:
DocumentLockFile( const OUString& aOrigURL );
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index 7c0d8de..46c8534 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -94,11 +94,9 @@ public:
const IntlWrapper * = 0)
const override;
- virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 = 0)
- const override;
+ virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 = 0) const override;
- virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8)
- override;
+ virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8) override;
virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const
diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx
index 4144e05..3e552c2 100644
--- a/include/svl/globalnameitem.hxx
+++ b/include/svl/globalnameitem.hxx
@@ -38,9 +38,9 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
SvGlobalName GetValue() const { return m_aName; }
- virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue ( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
};
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index 9b9e937..64410a8 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -27,28 +27,28 @@
class SVL_DLLPUBLIC SfxIntegerListItem : public SfxPoolItem
{
- ::com::sun::star::uno::Sequence < sal_Int32 > m_aList;
+ css::uno::Sequence < sal_Int32 > m_aList;
public:
TYPEINFO_OVERRIDE();
SfxIntegerListItem();
SfxIntegerListItem( sal_uInt16 nWhich, const ::std::vector < sal_Int32 >& rList );
- SfxIntegerListItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Sequence < sal_Int32 >& rList );
+ SfxIntegerListItem( sal_uInt16 nWhich, const css::uno::Sequence < sal_Int32 >& rList );
SfxIntegerListItem( const SfxIntegerListItem& rItem );
virtual ~SfxIntegerListItem();
- ::com::sun::star::uno::Sequence < sal_Int32 > GetSequence()
+ css::uno::Sequence < sal_Int32 > GetSequence()
{ return m_aList; }
- ::com::sun::star::uno::Sequence < sal_Int32 > GetConstSequence() const
+ css::uno::Sequence < sal_Int32 > GetConstSequence() const
{ return (const_cast< SfxIntegerListItem * >(this))->GetSequence(); }
void GetList( ::std::vector < sal_Int32 >& rList ) const;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
- virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
};
#endif // INCLUDED_SVL_ILSTITEM_HXX
diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx
index 0ec2b77..a6bfd1d 100644
--- a/include/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
@@ -35,8 +35,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
void SetRotation( long nValue );
long GetRotation() const;
diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx
index 07188cd..1e64eda 100644
--- a/include/svl/instrm.hxx
+++ b/include/svl/instrm.hxx
@@ -34,12 +34,10 @@ class SvDataPipe_Impl;
class SVL_DLLPUBLIC SvInputStream: public SvStream
{
- com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
- m_xStream;
- com::sun::star::uno::Reference< com::sun::star::io::XSeekable >
- m_xSeekable;
- SvDataPipe_Impl * m_pPipe;
- sal_uInt64 m_nSeekedFrom;
+ css::uno::Reference< css::io::XInputStream > m_xStream;
+ css::uno::Reference< css::io::XSeekable > m_xSeekable;
+ SvDataPipe_Impl * m_pPipe;
+ sal_uInt64 m_nSeekedFrom;
SVL_DLLPRIVATE bool open();
@@ -54,10 +52,7 @@ class SVL_DLLPUBLIC SvInputStream: public SvStream
SVL_DLLPRIVATE virtual void SetSize(sal_uInt64) override;
public:
- SvInputStream(
- com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
- const &
- rTheStream);
+ SvInputStream( css::uno::Reference< css::io::XInputStream > const & rTheStream );
virtual ~SvInputStream();
};
diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx
index b5f36c0..feb0734 100644
--- a/include/svl/int64item.hxx
+++ b/include/svl/int64item.hxx
@@ -31,10 +31,10 @@ public:
OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const override;
virtual bool QueryValue(
- com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue(
- const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nItemVersion ) const override;
diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index 3b9d4bf..9ecbfce 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -65,10 +65,10 @@ public:
const IntlWrapper * = 0)
const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index 2c68dfa..56a82d9 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -32,8 +32,8 @@ struct SfxItemPropertyMapEntry
{
OUString aName; ///< name of property
sal_uInt16 nWID; ///< WhichId of SfxPoolItem
- com::sun::star::uno::Type aType; ///< UNO type of property
- /// flag bitmap, @see com::sun::star::beans::PropertyAttribute
+ css::uno::Type aType; ///< UNO type of property
+ /// flag bitmap, @see css::beans::PropertyAttribute
long nFlags;
/// "member ID" to tell QueryValue/PutValue which property it is
/// (when multiple properties map to the same nWID)
@@ -44,7 +44,7 @@ struct SfxItemPropertyMapEntry
struct SfxItemPropertySimpleEntry
{
sal_uInt16 nWID;
- com::sun::star::uno::Type aType;
+ css::uno::Type aType;
long nFlags;
sal_uInt8 nMemberId;
@@ -55,7 +55,7 @@ struct SfxItemPropertySimpleEntry
{
}
- SfxItemPropertySimpleEntry(sal_uInt16 _nWID, com::sun::star::uno::Type const & _rType,
+ SfxItemPropertySimpleEntry(sal_uInt16 _nWID, css::uno::Type const & _rType,
long _nFlags, sal_uInt8 _nMemberId)
: nWID( _nWID )
, aType( _rType )
@@ -94,12 +94,12 @@ public:
~SfxItemPropertyMap();
const SfxItemPropertySimpleEntry* getByName( const OUString &rName ) const;
- com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties() const;
- com::sun::star::beans::Property getPropertyByName( const OUString & rName ) const
- throw( ::com::sun::star::beans::UnknownPropertyException );
+ css::uno::Sequence< css::beans::Property > getProperties() const;
+ css::beans::Property getPropertyByName( const OUString & rName ) const
+ throw( css::beans::UnknownPropertyException );
bool hasPropertyByName( const OUString& rName ) const;
- void mergeProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rPropSeq );
+ void mergeProperties( const css::uno::Sequence< css::beans::Property >& rPropSeq );
PropertyEntryVector_t getPropertyEntries() const;
sal_uInt32 getSize() const;
@@ -107,8 +107,8 @@ public:
class SVL_DLLPUBLIC SfxItemPropertySet
{
- SfxItemPropertyMap m_aMap;
- mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo;
+ SfxItemPropertyMap m_aMap;
+ mutable css::uno::Reference<css::beans::XPropertySetInfo> m_xInfo;
public:
SfxItemPropertySet( const SfxItemPropertyMapEntry *pMap ) :
@@ -117,45 +117,44 @@ public:
void getPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
const SfxItemSet& rSet,
- com::sun::star::uno::Any& rAny) const
- throw(::com::sun::star::uno::RuntimeException);
+ css::uno::Any& rAny) const
+ throw(css::uno::RuntimeException);
void getPropertyValue( const OUString &rName,
const SfxItemSet& rSet,
- com::sun::star::uno::Any& rAny) const
- throw(::com::sun::star::uno::RuntimeException,
- ::com::sun::star::beans::UnknownPropertyException);
- com::sun::star::uno::Any
+ css::uno::Any& rAny) const
+ throw(css::uno::RuntimeException,
+ css::beans::UnknownPropertyException);
+ css::uno::Any
getPropertyValue( const OUString &rName,
const SfxItemSet& rSet ) const
- throw(::com::sun::star::uno::RuntimeException,
- ::com::sun::star::beans::UnknownPropertyException);
+ throw(css::uno::RuntimeException,
+ css::beans::UnknownPropertyException);
void setPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
- const com::sun::star::uno::Any& aVal,
+ const css::uno::Any& aVal,
SfxItemSet& rSet ) const
- throw(::com::sun::star::uno::RuntimeException,
- com::sun::star::lang::IllegalArgumentException);
+ throw(css::uno::RuntimeException,
+ css::lang::IllegalArgumentException);
void setPropertyValue( const OUString& rPropertyName,
- const com::sun::star::uno::Any& aVal,
+ const css::uno::Any& aVal,
SfxItemSet& rSet ) const
- throw(::com::sun::star::uno::RuntimeException,
- com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::beans::UnknownPropertyException);
+ throw(css::uno::RuntimeException,
+ css::lang::IllegalArgumentException,
+ css::beans::UnknownPropertyException);
- com::sun::star::beans::PropertyState
+ css::beans::PropertyState
getPropertyState(const OUString& rName, const SfxItemSet& rSet)const
- throw(com::sun::star::beans::UnknownPropertyException);
- com::sun::star::beans::PropertyState
+ throw(css::beans::UnknownPropertyException);
+ css::beans::PropertyState
getPropertyState(const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet) const
throw();
- com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo>
+ css::uno::Reference<css::beans::XPropertySetInfo>
getPropertySetInfo() const;
const SfxItemPropertyMap& getPropertyMap() const {return m_aMap;}
};
struct SfxItemPropertySetInfo_Impl;
-class SVL_DLLPUBLIC SfxItemPropertySetInfo : public
- cppu::WeakImplHelper1<com::sun::star::beans::XPropertySetInfo>
+class SVL_DLLPUBLIC SfxItemPropertySetInfo : public cppu::WeakImplHelper1<css::beans::XPropertySetInfo>
{
SfxItemPropertySetInfo_Impl* m_pImpl;
@@ -164,41 +163,41 @@ public:
SfxItemPropertySetInfo(const SfxItemPropertyMapEntry *pEntries );
virtual ~SfxItemPropertySetInfo();
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL
+ virtual css::uno::Sequence< css::beans::Property > SAL_CALL
getProperties( )
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::beans::Property SAL_CALL
+ virtual css::beans::Property SAL_CALL
getPropertyByName( const OUString& aName )
- throw(::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::beans::UnknownPropertyException,
+ css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL
hasPropertyByName( const OUString& Name )
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::uno::RuntimeException, std::exception) override;
};
-class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public cppu::WeakImplHelper1<com::sun::star::beans::XPropertySetInfo >
+class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public cppu::WeakImplHelper1<css::beans::XPropertySetInfo >
{
SfxItemPropertyMap aExtMap;
public:
SfxExtItemPropertySetInfo(
const SfxItemPropertyMapEntry *pMap,
- const com::sun::star::uno::Sequence<com::sun::star::beans::Property>& rPropSeq );
+ const css::uno::Sequence<css::beans::Property>& rPropSeq );
virtual ~SfxExtItemPropertySetInfo();
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL
+ virtual css::uno::Sequence< css::beans::Property > SAL_CALL
getProperties( )
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::beans::Property SAL_CALL
+ virtual css::beans::Property SAL_CALL
getPropertyByName( const OUString& aName )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL
hasPropertyByName( const OUString& Name )
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx
index 0064395..9215868 100644
--- a/include/svl/languageoptions.hxx
+++ b/include/svl/languageoptions.hxx
@@ -29,7 +29,7 @@
// class SvtLanguageOptions ----------------------------------------------------
// these defines can be ORed
-// note these values DO NOT match the values in com::sun::star::i18n::ScriptType
+// note these values DO NOT match the values in css::i18n::ScriptType
enum class SvtScriptType
{
NONE = 0x00,
@@ -124,7 +124,7 @@ public:
SvtSystemLanguageOptions();
virtual ~SvtSystemLanguageOptions();
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override;
LanguageType GetWin16SystemLanguage() const;
diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx
index f60d359..716e8fc 100644
--- a/include/svl/lckbitem.hxx
+++ b/include/svl/lckbitem.hxx
@@ -42,9 +42,9 @@ public:
SvLockBytes* GetValue() const { return _xVal; }
- virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue ( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
};
diff --git a/include/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx
index 767df06..ce6c435 100644
--- a/include/svl/lockfilecommon.hxx
+++ b/include/svl/lockfilecommon.hxx
@@ -55,9 +55,9 @@ public:
LockFileCommon( const OUString& aOrigURL, const OUString& aPrefix );
~LockFileCommon();
- static void ParseList( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, std::vector< LockFileEntry > &rOutput );
- static LockFileEntry ParseEntry( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos );
- static OUString ParseName( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos );
+ static void ParseList( const css::uno::Sequence< sal_Int8 >& aBuffer, std::vector< LockFileEntry > &rOutput );
+ static LockFileEntry ParseEntry( const css::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos );
+ static OUString ParseName( const css::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos );
static OUString EscapeCharacters( const OUString& aSource );
static OUString GetOOOUserName();
static OUString GetCurrentLocalTime();
diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx
index 059ead4..4dab2ef 100644
--- a/include/svl/numuno.hxx
+++ b/include/svl/numuno.hxx
@@ -37,10 +37,9 @@ namespace comphelper
// SvNumberFormatterServiceObj must be registered as service somewhere
-com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL
+css::uno::Reference<css::uno::XInterface> SAL_CALL
SvNumberFormatterServiceObj_NewInstance(
- const com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory>& rSMgr );
+ const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr );
@@ -48,8 +47,8 @@ com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL
// construct with SvNumberFormatter
class SVL_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2<
- com::sun::star::util::XNumberFormatsSupplier,
- com::sun::star::lang::XUnoTunnel>
+ css::util::XNumberFormatsSupplier,
+ css::lang::XUnoTunnel>
{
private:
SvNumFmtSuppl_Impl* pImpl;
@@ -63,21 +62,20 @@ public:
SvNumberFormatter* GetNumberFormatter() const;
// XNumberFormatsSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL
+ virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
getNumberFormatSettings()
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL
+ throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL
getNumberFormats()
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::uno::RuntimeException, std::exception) override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence<
- sal_Int8 >& aIdentifier )
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
+ throw(css::uno::RuntimeException, std::exception) override;
- static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
- static SvNumberFormatsSupplierObj* getImplementation( const com::sun::star::uno::Reference<
- com::sun::star::util::XNumberFormatsSupplier>& rObj );
+ static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
+ static SvNumberFormatsSupplierObj* getImplementation( const css::uno::Reference<
+ css::util::XNumberFormatsSupplier>& rObj );
::comphelper::SharedMutex& getSharedMutex() const;
};
diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx
index 9e9ddbb..8b9f367 100644
--- a/include/svl/ondemand.hxx
+++ b/include/svl/ondemand.hxx
@@ -54,7 +54,7 @@
class OnDemandLocaleDataWrapper
{
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
SvtSysLocale aSysLocale;
LanguageType eCurrentLanguage;
LanguageType eLastAnyLanguage;
@@ -75,7 +75,7 @@ public:
eCurrentLanguage = LANGUAGE_SYSTEM;
}
OnDemandLocaleDataWrapper(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const LanguageTag& rLanguageTag
)
: pEnglish(0)
@@ -95,7 +95,7 @@ public:
bool isInitialized() const { return bInitialized; }
void init(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const LanguageTag& rLanguageTag
)
{
@@ -148,8 +148,8 @@ public:
*/
class OnDemandCalendarWrapper
{
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
- ::com::sun::star::lang::Locale aLocale;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
+ css::lang::Locale aLocale;
mutable CalendarWrapper* pPtr;
mutable bool bValid;
bool bInitialized;
@@ -161,8 +161,8 @@ public:
, bInitialized(false)
{}
OnDemandCalendarWrapper(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
- ::com::sun::star::lang::Locale& rLocale
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ css::lang::Locale& rLocale
)
: bValid(false)
, bInitialized(false)
@@ -175,8 +175,8 @@ public:
}
void init(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
- const ::com::sun::star::lang::Locale& rLocale
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ const css::lang::Locale& rLocale
)
{
m_xContext = rxContext;
@@ -189,7 +189,7 @@ public:
bInitialized = true;
}
- void changeLocale( const ::com::sun::star::lang::Locale& rLocale )
+ void changeLocale( const css::lang::Locale& rLocale )
{
bValid = false;
aLocale = rLocale;
@@ -218,9 +218,9 @@ public:
*/
class OnDemandTransliterationWrapper
{
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
LanguageType eLanguage;
- ::com::sun::star::i18n::TransliterationModules nType;
+ css::i18n::TransliterationModules nType;
mutable ::utl::TransliterationWrapper* pPtr;
mutable bool bValid;
bool bInitialized;
@@ -228,15 +228,15 @@ class OnDemandTransliterationWrapper
public:
OnDemandTransliterationWrapper()
: eLanguage( LANGUAGE_SYSTEM )
- , nType(::com::sun::star::i18n::TransliterationModules_END_OF_MODULE)
+ , nType(css::i18n::TransliterationModules_END_OF_MODULE)
, pPtr(0)
, bValid(false)
, bInitialized(false)
{}
OnDemandTransliterationWrapper(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
LanguageType eLang,
- ::com::sun::star::i18n::TransliterationModules nTypeP
+ css::i18n::TransliterationModules nTypeP
)
: bValid(false)
, bInitialized(false)
@@ -251,9 +251,9 @@ public:
bool isInitialized() const { return bInitialized; }
void init(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
LanguageType eLang,
- ::com::sun::star::i18n::TransliterationModules nTypeP
+ css::i18n::TransliterationModules nTypeP
)
{
m_xContext = rxContext;
@@ -298,9 +298,9 @@ public:
*/
class OnDemandNativeNumberWrapper
{
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
mutable NativeNumberWrapper* pPtr;
- bool bInitialized;
+ bool bInitialized;
public:
OnDemandNativeNumberWrapper()
@@ -308,7 +308,7 @@ public:
, bInitialized(false)
{}
OnDemandNativeNumberWrapper(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext
)
: pPtr(0)
, bInitialized(false)
@@ -321,7 +321,7 @@ public:
}
void init(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext
)
{
m_xContext = rxContext;
diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx
index 0239a2f..487d133 100644
--- a/include/svl/outstrm.hxx
+++ b/include/svl/outstrm.hxx
@@ -31,8 +31,7 @@ namespace com { namespace sun { namespace star { namespace io {
class SVL_DLLPUBLIC SvOutputStream: public SvStream
{
- com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >
- m_xStream;
+ css::uno::Reference< css::io::XOutputStream > m_xStream;
SVL_DLLPRIVATE virtual sal_uLong GetData(void *, sal_uLong) override;
@@ -45,9 +44,7 @@ class SVL_DLLPUBLIC SvOutputStream: public SvStream
SVL_DLLPRIVATE virtual void SetSize(sal_uInt64) override;
public:
- SvOutputStream(com::sun::star::uno::Reference<
- com::sun::star::io::XOutputStream > const &
- rTheStream);
+ SvOutputStream(css::uno::Reference< css::io::XOutputStream > const & rTheStream);
virtual ~SvOutputStream();
};
diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx
index eb0298c..78d5c67 100644
--- a/include/svl/ownlist.hxx
+++ b/include/svl/ownlist.hxx
@@ -65,8 +65,8 @@ public:
SvCommand& Append( const OUString & rCommand, const OUString & rArg );
bool AppendCommands( const OUString & rCmd, sal_Int32 * pEaten );
- bool FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
- void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
+ bool FillFromSequence( const css::uno::Sequence < css::beans::PropertyValue >& );
+ void FillSequence( css::uno::Sequence < css::beans::PropertyValue >& );
size_t size() const { return aCommandList.size(); }
diff --git a/include/svl/pickerhistoryaccess.hxx b/include/svl/pickerhistoryaccess.hxx
index 4b848c8..4291dd0 100644
--- a/include/svl/pickerhistoryaccess.hxx
+++ b/include/svl/pickerhistoryaccess.hxx
@@ -31,10 +31,10 @@ namespace svt
SVL_DLLPUBLIC void addFolderPicker(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker );
+ const css::uno::Reference< css::uno::XInterface >& _rxPicker );
SVL_DLLPUBLIC void addFilePicker(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker );
+ const css::uno::Reference< css::uno::XInterface >& _rxPicker );
} // namespace svt
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 1ea63b9..f6a7df9 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -47,7 +47,7 @@ enum SfxItemKind {
#define CONVERT_TWIPS 0x80 // Uno conversion for measurement (for MemberId)
// warning, if there is no boolean inside the any this will always return the value false
-inline bool Any2Bool( const ::com::sun::star::uno::Any&rValue )
+inline bool Any2Bool( const css::uno::Any&rValue )
{
bool bValue = false;
if( rValue.hasValue() )
@@ -99,7 +99,7 @@ enum SfxItemPresentation
/**
* These values have to match the values in the
- * com::sun::star::frame::status::ItemState IDL
+ * css::frame::status::ItemState IDL
* to be found at offapi/com/sun/star/frame/status/ItemState.idl
*/
enum class SfxItemState {
@@ -181,8 +181,8 @@ public:
virtual bool ScaleMetrics( long lMult, long lDiv );
virtual bool HasMetrics() const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId );
virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nItemVersion ) const;
virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const;
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index 2737514..92dd2ab 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
@@ -54,9 +54,9 @@ public:
aVal = rNewVal;
}
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
};
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index f94215b..5031f07 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -49,9 +49,9 @@ public:
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
const Rectangle& GetValue() const { return aVal; }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
};
diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx
index 26ec507..d622d0e 100644
--- a/include/svl/sharecontrolfile.hxx
+++ b/include/svl/sharecontrolfile.hxx
@@ -36,13 +36,13 @@ namespace svt {
class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon
{
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream;
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream;
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > m_xOutputStream;
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable;
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate > m_xTruncate;
+ css::uno::Reference< css::io::XStream > m_xStream;
+ css::uno::Reference< css::io::XInputStream > m_xInputStream;
+ css::uno::Reference< css::io::XOutputStream > m_xOutputStream;
+ css::uno::Reference< css::io::XSeekable > m_xSeekable;
+ css::uno::Reference< css::io::XTruncate > m_xTruncate;
- std::vector< LockFileEntry > m_aUsersData;
+ std::vector< LockFileEntry > m_aUsersData;
void OpenStream();
void Close();
diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx
index 1e7e4a5..9f1fac7 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
@@ -50,8 +50,8 @@ public:
void SetString( const OUString& );
OUString GetString();
- void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList );
- void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const;
+ void SetStringList( const css::uno::Sequence< OUString >& rList );
+ void GetStringList( css::uno::Sequence< OUString >& rList ) const;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
@@ -63,9 +63,9 @@ public:
virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override;
virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override;
- virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue ( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
};
#endif
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 4813458..7a48eeb 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -63,7 +63,7 @@ class SVL_DLLPUBLIC SvxSearchItem :
public SfxPoolItem,
public utl::ConfigItem
{
- com::sun::star::util::SearchOptions m_aSearchOpt;
+ css::util::SearchOptions m_aSearchOpt;
SfxStyleFamily m_eFamily; // style family
@@ -98,8 +98,8 @@ public:
SvxSearchItem( const SvxSearchItem& rItem );
virtual ~SvxSearchItem();
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual bool operator == ( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
@@ -108,7 +108,7 @@ public:
OUString &rText, const IntlWrapper * = 0 ) const override;
// ConfigItem
- virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override;
SvxSearchCmd GetCommand() const { return m_nCommand; }
void SetCommand(SvxSearchCmd nNewCommand) { m_nCommand = nNewCommand; }
@@ -177,9 +177,9 @@ public:
inline sal_uInt16 GetLEVLonger() const;
inline void SetLEVLonger(sal_uInt16 nSet);
- inline const com::sun::star::util::SearchOptions &
- GetSearchOptions() const;
- inline void SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt );
+ inline const css::util::SearchOptions &
+ GetSearchOptions() const;
+ inline void SetSearchOptions( const css::util::SearchOptions &rOpt );
inline sal_Int32 GetTransliterationFlags() const;
void SetTransliterationFlags( sal_Int32 nFlags );
@@ -219,30 +219,27 @@ void SvxSearchItem::SetReplaceString(const OUString& rNewString)
bool SvxSearchItem::GetWordOnly() const
{
return 0 != (m_aSearchOpt.searchFlag &
- com::sun::star::util::SearchFlags::NORM_WORD_ONLY);
+ css::util::SearchFlags::NORM_WORD_ONLY);
}
bool SvxSearchItem::GetExact() const
{
- return 0 == (m_aSearchOpt.transliterateFlags &
- com::sun::star::i18n::TransliterationModules_IGNORE_CASE);
+ return 0 == (m_aSearchOpt.transliterateFlags & css::i18n::TransliterationModules_IGNORE_CASE);
}
bool SvxSearchItem::GetSelection() const
{
- return 0 != (m_aSearchOpt.searchFlag &
- com::sun::star::util::SearchFlags::REG_NOT_BEGINOFLINE);
+ return 0 != (m_aSearchOpt.searchFlag & css::util::SearchFlags::REG_NOT_BEGINOFLINE);
}
bool SvxSearchItem::GetRegExp() const
{
- return m_aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_REGEXP ;
+ return m_aSearchOpt.algorithmType == css::util::SearchAlgorithms_REGEXP ;
}
bool SvxSearchItem::IsLEVRelaxed() const
{
- return 0 != (m_aSearchOpt.searchFlag &
- com::sun::star::util::SearchFlags::LEV_RELAXED);
+ return 0 != (m_aSearchOpt.searchFlag & css::util::SearchFlags::LEV_RELAXED);
}
sal_uInt16 SvxSearchItem::GetLEVOther() const
@@ -277,15 +274,15 @@ void SvxSearchItem::SetLEVLonger( sal_uInt16 nVal )
bool SvxSearchItem::IsLevenshtein() const
{
- return m_aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_APPROXIMATE;
+ return m_aSearchOpt.algorithmType == css::util::SearchAlgorithms_APPROXIMATE;
}
-const com::sun::star::util::SearchOptions & SvxSearchItem::GetSearchOptions() const
+const css::util::SearchOptions & SvxSearchItem::GetSearchOptions() const
{
return m_aSearchOpt;
}
-void SvxSearchItem::SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt )
+void SvxSearchItem::SetSearchOptions( const css::util::SearchOptions &rOpt )
{
m_aSearchOpt = rOpt;
}
@@ -297,8 +294,7 @@ sal_Int32 SvxSearchItem::GetTransliterationFlags() const
bool SvxSearchItem::IsMatchFullHalfWidthForms() const
{
- return 0 != (m_aSearchOpt.transliterateFlags &
- com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH);
+ return 0 != (m_aSearchOpt.transliterateFlags & css::i18n::TransliterationModules_IGNORE_WIDTH);
}
#endif
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index da82d7b..cff7f49 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -340,20 +340,20 @@ public:
const OUString& GetOldName() const { return aName; }
};
-class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >
+class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, css::style::XStyle, css::lang::XUnoTunnel >
{
public:
SfxUnoStyleSheet( const OUString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, sal_uInt16 _nMaske );
- static SfxUnoStyleSheet* getUnoStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle );
+ static SfxUnoStyleSheet* getUnoStyleSheet( const css::uno::Reference< css::style::XStyle >& xStyle );
// XUnoTunnel
- virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
private:
SfxUnoStyleSheet(); // not implemented
- static const ::com::sun::star::uno::Sequence< ::sal_Int8 >& getIdentifier();
+ static const css::uno::Sequence< ::sal_Int8 >& getIdentifier();
};
#endif
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index ef2e1bc..3d9894b 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
@@ -44,9 +44,9 @@ public:
const IntlWrapper * = 0 ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx
index 6007b67..b784188 100644
--- a/include/svl/urihelper.hxx
+++ b/include/svl/urihelper.hxx
@@ -82,13 +82,13 @@ SVL_DLLPUBLIC Link<OUString *, bool> GetMaybeFileHdl();
@exception std::bad_alloc if an out-of-memory condition occurs
- @exception com::sun::star::uno::RuntimeException if any error occurs
+ @exception css::uno::RuntimeException if any error occurs
*/
-SVL_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference >
+SVL_DLLPUBLIC css::uno::Reference< css::uri::XUriReference >
normalizedMakeRelative(
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
- const & context,
- OUString const & baseUriReference, OUString const & uriReference);
+ css::uno::Reference< css::uno::XComponentContext > const & context,
+ OUString const & baseUriReference,
+ OUString const & uriReference);
/**
A variant of normalizedMakeRelative with a simplified interface.
@@ -107,7 +107,7 @@ normalizedMakeRelative(
@exception std::bad_alloc if an out-of-memory condition occurs
- @exception com::sun::star::uno::RuntimeException if any error occurs
+ @exception css::uno::RuntimeException if any error occurs
@deprecated
No code should rely on the default component context.
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index 3ef6b00..107c808 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -26,7 +26,7 @@
class SVL_DLLPUBLIC SfxVisibilityItem: public SfxPoolItem
{
- ::com::sun::star::frame::status::Visibility m_nValue;
+ css::frame::status::Visibility m_nValue;
public:
TYPEINFO_OVERRIDE();
@@ -53,10 +53,10 @@ public:
const IntlWrapper * = 0)
const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 8703a03..216d354 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -228,7 +228,7 @@ public:
NfCurrencyEntry( const LocaleDataWrapper& rLocaleData,
LanguageType eLang );
- NfCurrencyEntry( const ::com::sun::star::i18n::Currency & rCurr,
+ NfCurrencyEntry( const css::i18n::Currency & rCurr,
const LocaleDataWrapper& rLocaleData,
LanguageType eLang );
inline NfCurrencyEntry(const OUString& rSymbol, const OUString& rBankSymbol,
@@ -317,7 +317,7 @@ public:
/// Preferred ctor with service manager and language/country enum
SvNumberFormatter(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
LanguageType eLang
);
@@ -770,7 +770,7 @@ public:
static bool IsLocaleInstalled( LanguageType eLang );
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
LanguageTag maLanguageTag;
SvNumberFormatTable aFTable; // Table of format keys to format entries
typedef std::map<sal_uInt32, sal_uInt32> DefaultFormatKeysMap;
@@ -816,7 +816,7 @@ private:
NumberFormatCodeWrapper& rNumberFormatCode,
bool bAfterChangingSystemCL );
- SVL_DLLPRIVATE SvNumberformat* ImpInsertFormat( const ::com::sun::star::i18n::NumberFormatCode& rCode,
+ SVL_DLLPRIVATE SvNumberformat* ImpInsertFormat( const css::i18n::NumberFormatCode& rCode,
sal_uInt32 nPos,
bool bAfterChangingSystemCL = false,
sal_Int16 nOrgIndex = 0 );
@@ -856,7 +856,7 @@ private:
// Return the index in a sequence of format codes matching an enum of
// NfIndexTableOffset. If not found 0 is returned. If the sequence doesn't
// contain any format code elements a default element is created and inserted.
- SVL_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex( ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode >& rSeq,
+ SVL_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex( css::uno::Sequence< css::i18n::NumberFormatCode >& rSeq,
const NfIndexTableOffset nTabOff );
// Adjust a sequence of format codes to contain only one (THE) default
@@ -865,7 +865,7 @@ private:
// Return the default index in the sequence.
// Non-PRODUCT version may check locale data for matching defaults in one
// FormatElement group.
- SVL_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault( ::com::sun::star::i18n::NumberFormatCode * pFormatArr,
+ SVL_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault( css::i18n::NumberFormatCode * pFormatArr,
sal_Int32 nCount, bool bCheckCorrectness = true );
// Obtain the format entry for a given key index.
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 2858563..c204702 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -395,7 +395,7 @@ public:
// rAttr.Number not empty if NatNum attributes are to be stored
void GetNatNumXml(
- ::com::sun::star::i18n::NativeNumberXmlAttributes& rAttr,
+ css::i18n::NativeNumberXmlAttributes& rAttr,
sal_uInt16 nNumFor ) const;
/** Switches to the first non-"gregorian" calendar, but only if the current
@@ -477,7 +477,7 @@ private:
@param eCodeType
a NfKeywordIndex, must designate a month type code
- @returns one of com::sun::star::i18n::CalendarDisplayCode values
+ @returns one of css::i18n::CalendarDisplayCode values
according to eCodeType and the check executed (or passed).
*/
SVL_DLLPRIVATE sal_Int32 ImpUseMonthCase( int & io_nState, const ImpSvNumFor& rNumFor, NfKeywordIndex eCodeType ) const;
diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx
index d2aa02a..d7b02e7 100644
--- a/include/svtools/DocumentInfoPreview.hxx
+++ b/include/svtools/DocumentInfoPreview.hxx
@@ -50,8 +50,7 @@ public:
void clear();
void fill(
- com::sun::star::uno::Reference<
- com::sun::star::document::XDocumentProperties > const & xDocProps,
+ css::uno::Reference< css::document::XDocumentProperties > const & xDocProps,
OUString const & rURL);
private:
@@ -63,7 +62,7 @@ private:
void insertNonempty(long id, OUString const & value);
- void insertDateTime(long id, com::sun::star::util::DateTime const & value);
+ void insertDateTime(long id, css::util::DateTime const & value);
};
}
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index 3e71209..b86a23d 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -126,7 +126,7 @@ class CmisDetailsContainer : public DetailsContainer
private:
OUString m_sUsername;
OUString m_sPassword;
- com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xCmdEnv;
+ css::uno::Reference< css::ucb::XCommandEnvironment > m_xCmdEnv;
std::vector< OUString > m_aRepoIds;
OUString m_sRepoId;
OUString m_sBinding;
diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx
index a4ef5d5..8736506 100644
--- a/include/svtools/acceleratorexecute.hxx
+++ b/include/svtools/acceleratorexecute.hxx
@@ -171,7 +171,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit
* @param aKey The key event
* @return The command or an empty string if the key event could not be found.
*/
- OUString findCommand(const ::com::sun::star::awt::KeyEvent& aKey);
+ OUString findCommand(const css::awt::KeyEvent& aKey);
/** TODO document me */
static css::awt::KeyEvent st_VCLKey2AWTKey(const vcl::KeyCode& aKey);
diff --git a/include/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx
index 21ba910..6327c973 100644
--- a/include/svtools/accessiblefactory.hxx
+++ b/include/svtools/accessiblefactory.hxx
@@ -76,98 +76,98 @@ namespace svt
public:
virtual IAccessibleTabListBox*
createAccessibleTabListBox(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+ const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
SvHeaderTabListBox& rBox
) const = 0;
virtual IAccessibleBrowseBox*
createAccessibleBrowseBox(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+ const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox
) const = 0;
virtual table::IAccessibleTableControl*
createAccessibleTableControl(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+ const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
table::IAccessibleTable& _rTable
) const = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleIconChoiceCtrl(
SvtIconChoiceCtrl& _rIconCtrl,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent
+ const css::uno::Reference< css::accessibility::XAccessible >& _xParent
) const = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleTabBar(
TabBar& _rTabBar
) const = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleTextWindowContext(
VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView
) const = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleTreeListBox(
SvTreeListBox& _rListBox,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent
+ const css::uno::Reference< css::accessibility::XAccessible >& _xParent
) const = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxHeaderBar(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+ const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
IAccessibleTableProvider& _rOwningTable,
AccessibleBrowseBoxObjType _eObjType
) const = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxTableCell(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+ const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+ const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowId,
sal_uInt16 _nColId,
sal_Int32 _nOffset
) const = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxHeaderCell(
sal_Int32 _nColumnRowId,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+ const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
IAccessibleTableProvider& _rBrowseBox,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+ const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
AccessibleBrowseBoxObjType _eObjType
) const = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleCheckBoxCell(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+ const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+ const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos,
const TriState& _eState,
bool _bIsTriState
) const = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
createEditBrowseBoxTableCellAccess(
- const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxParent,
- const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxControlAccessible,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _rxFocusWindow,
+ const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
+ const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible,
+ const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow,
IAccessibleTableProvider& _rBrowseBox,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos
) const = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleToolPanelDeck(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+ const css::uno::Reference< css::accessibility::XAccessible >& i_rAccessibleParent,
::svt::ToolPanelDeck& i_rPanelDeck
) = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleToolPanelTabBar(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+ const css::uno::Reference< css::accessibility::XAccessible >& i_rAccessibleParent,
::svt::IToolPanelDeck& i_rPanelDeck,
::svt::PanelTabBar& i_rTabBar
) = 0;
diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx
index b8918b8..f73d385 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -53,11 +53,11 @@ namespace vcl { class Window; }
typedef ::cppu::WeakAggComponentImplHelper5<
- ::com::sun::star::accessibility::XAccessible,
- ::com::sun::star::accessibility::XAccessibleComponent,
- ::com::sun::star::accessibility::XAccessibleContext,
- ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
- ::com::sun::star::lang::XServiceInfo >
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleComponent,
+ css::accessibility::XAccessibleContext,
+ css::accessibility::XAccessibleEventBroadcaster,
+ css::lang::XServiceInfo >
SvtRulerAccessible_Base;
class SvtRulerAccessible : public ::comphelper::OBaseMutex, public SvtRulerAccessible_Base
@@ -65,112 +65,112 @@ class SvtRulerAccessible : public ::comphelper::OBaseMutex, public SvtRulerAcces
public:
//===== internal ========================================================
SvtRulerAccessible(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const ::rtl::OUString& rName );
+ const css::uno::Reference< css::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const ::rtl::OUString& rName );
protected:
virtual ~SvtRulerAccessible();
public:
bool SAL_CALL
- isVisible() throw( ::com::sun::star::uno::RuntimeException );
+ isVisible() throw( css::uno::RuntimeException );
//===== XAccessible =====================================================
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL
- getAccessibleContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
+ getAccessibleContext() throw( css::uno::RuntimeException, std::exception ) override;
//===== XAccessibleComponent ============================================
virtual sal_Bool SAL_CALL
- containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ containsPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
- getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+ getAccessibleAtPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL
- getBounds() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::awt::Rectangle SAL_CALL
+ getBounds() throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::awt::Point SAL_CALL
- getLocation() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::awt::Point SAL_CALL
+ getLocation() throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::awt::Point SAL_CALL
- getLocationOnScreen() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::awt::Point SAL_CALL
+ getLocationOnScreen() throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::awt::Size SAL_CALL
- getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::awt::Size SAL_CALL
+ getSize() throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
- grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ grabFocus() throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL
- getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ getForeground( ) throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL
- getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ getBackground( ) throw (css::uno::RuntimeException, std::exception) override;
//===== XAccessibleContext ==============================================
virtual sal_Int32 SAL_CALL
- getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ getAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+ virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
getAccessibleChild( sal_Int32 nIndex )
- throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) override;
+ throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
- getAccessibleParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
+ getAccessibleParent() throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL
- getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ getAccessibleIndexInParent() throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Int16 SAL_CALL
- getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ getAccessibleRole() throw( css::uno::RuntimeException, std::exception ) override;
virtual ::rtl::OUString SAL_CALL
- getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override;
virtual ::rtl::OUString SAL_CALL
- getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL
- getAccessibleRelationSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
+ getAccessibleRelationSet() throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL
- getAccessibleStateSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
+ getAccessibleStateSet() throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::lang::Locale SAL_CALL
+ virtual css::lang::Locale SAL_CALL
getLocale()
- throw( ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) override;
+ throw( css::uno::RuntimeException,
+ css::accessibility::IllegalAccessibleComponentStateException, std::exception ) override;
//===== XAccessibleEventBroadcaster =====================================
virtual void SAL_CALL
- addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
- removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
//===== XServiceInfo ====================================================
virtual ::rtl::OUString SAL_CALL
- getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
- supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
- getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< ::rtl::OUString> SAL_CALL
+ getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
//===== XTypeProvider ===================================================
- virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
- getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence<sal_Int8> SAL_CALL
+ getImplementationId() throw( css::uno::RuntimeException, std::exception ) override;
protected:
/// @Return the object's current bounding box relative to the desktop.
- Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException );
+ Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException );
/// @Return the object's current bounding box relative to the parent object.
- Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException );
+ Rectangle GetBoundingBox() throw( css::uno::RuntimeException );
virtual void SAL_CALL disposing() override;
@@ -182,7 +182,7 @@ protected:
inline bool IsNotAlive() const;
/// throws the exception DisposedException if it's not alive
- void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException );
+ void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException );
private:
/** Description of this object. This is not a constant because it can
@@ -195,7 +195,7 @@ private:
::rtl::OUString msName;
/// Reference to the parent object.
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ css::uno::Reference< css::accessibility::XAccessible >
mxParent;
/// pointer to internal representation
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index 9f5bb48..da67bf0 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -54,23 +54,23 @@ namespace svt
VclPtr<ScrollBar> m_pFieldScroller;
// string to display for "no selection"
- const OUString m_sNoFieldSelection;
+ const OUString m_sNoFieldSelection;
/// the DatabaseContext for selecting data sources
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext >
- m_xDatabaseContext;
+ css::uno::Reference< css::sdb::XDatabaseContext >
+ m_xDatabaseContext;
// the ORB for creating objects
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
- m_xORB;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
- m_xCurrentDatasourceTables;
+ css::uno::Reference< css::uno::XComponentContext >
+ m_xORB;
+ css::uno::Reference< css::container::XNameAccess >
+ m_xCurrentDatasourceTables;
AddressBookSourceDialogData*
- m_pImpl;
+ m_pImpl;
public:
AddressBookSourceDialog( vcl::Window* _pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB );
+ const css::uno::Reference< css::uno::XComponentContext >& _rxORB );
/** if you use this ctor, the dialog
<ul><li>will not store it's data in the configuration (nor initially retrieve it from there)</li>
@@ -92,11 +92,11 @@ namespace svt
obtained from <arg>_rxTransientDS</arg>
*/
AddressBookSourceDialog( vcl::Window* _pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxTransientDS,
+ const css::uno::Reference< css::uno::XComponentContext >& _rxORB,
+ const css::uno::Reference< css::sdbc::XDataSource >& _rxTransientDS,
const OUString& _rDataSourceName,
const OUString& _rTable,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping
+ const css::uno::Sequence< css::util::AliasProgrammaticPair >& _rMapping
);
virtual ~AddressBookSourceDialog();
@@ -104,7 +104,7 @@ namespace svt
// to be used if the object was constructed for editing a field mapping only
void getFieldMapping(
- ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping) const;
+ css::uno::Sequence< css::util::AliasProgrammaticPair >& _rMapping) const;
protected:
void implConstruct();
diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx
index a7d7c97..3b9dd1d 100644
--- a/include/svtools/apearcfg.hxx
+++ b/include/svtools/apearcfg.hxx
@@ -55,14 +55,14 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem
static bool bInitialized ;
- SVT_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
+ SVT_DLLPRIVATE const css::uno::Sequence<OUString>& GetPropertyNames();
virtual void ImplCommit() override;
public:
SvtTabAppearanceCfg( );
virtual ~SvtTabAppearanceCfg( );
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override;
sal_uInt16 GetDragMode () const { return nDragMode; }
diff --git a/include/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx
index 6ddaf5d..65ca905 100644
--- a/include/svtools/bindablecontrolhelper.hxx
+++ b/include/svtools/bindablecontrolhelper.hxx
@@ -36,7 +36,7 @@ namespace svt
*/
namespace BindableControlHelper
{
- SVT_DLLPUBLIC void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab = 0 );
+ SVT_DLLPUBLIC void ApplyListSourceAndBindableData( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab = 0 );
}
diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx
index 1033b39..f0f5fe1 100644
--- a/include/svtools/cliplistener.hxx
+++ b/include/svtools/cliplistener.hxx
@@ -30,7 +30,7 @@ namespace vcl { class Window; }
class TransferableDataHelper;
class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1<
- ::com::sun::star::datatransfer::clipboard::XClipboardListener >
+ css::datatransfer::clipboard::XClipboardListener >
{
Link<TransferableDataHelper*,void> aLink;
@@ -43,11 +43,11 @@ public:
void ClearCallbackLink();
// 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;
// XClipboardListener
- virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& event )
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL changedContents( const css::datatransfer::clipboard::ClipboardEvent& event )
+ throw(css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx
index 2e7d8c0..b636fdd 100644
--- a/include/svtools/contextmenuhelper.hxx
+++ b/include/svtools/contextmenuhelper.hxx
@@ -53,13 +53,13 @@ class SVT_DLLPUBLIC ContextMenuHelper
// create context menu helper
// ARGS: xFrame = frame defines the context of the context menu
// bAutoRefresh = specifies that the context will be constant or not
- ContextMenuHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, bool bAutoRefresh=true );
+ ContextMenuHelper( const css::uno::Reference< css::frame::XFrame >& xFrame, bool bAutoRefresh=true );
~ContextMenuHelper();
// methods to complete a popup menu (set images, labels, enable/disable states)
// ATTENTION: The item ID's must be unique for the whole popup (inclusive the sub menus!)
void completeAndExecute( const Point& aPos, PopupMenu& aPopupMenu );
- void completeAndExecute( const Point& aPos, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& xPopupMenu );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list