accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 8
accessibility/source/standard/vclxaccessiblelist.cxx | 2
basegfx/source/matrix/b3dhommatrixtools.cxx | 4
binaryurp/source/binaryany.hxx | 6
binaryurp/source/bridge.cxx | 2
binaryurp/source/bridge.hxx | 70 +--
binaryurp/source/bridgefactory.hxx | 26 -
binaryurp/source/currentcontext.hxx | 4
binaryurp/source/incomingrequest.hxx | 16
binaryurp/source/marshal.hxx | 8
binaryurp/source/outgoingrequest.hxx | 4
binaryurp/source/proxy.hxx | 8
binaryurp/source/reader.hxx | 2
binaryurp/source/readerstate.hxx | 2
binaryurp/source/unmarshal.hxx | 12
binaryurp/source/writer.cxx | 4
binaryurp/source/writer.hxx | 36 -
binaryurp/source/writerstate.hxx | 2
bridges/inc/cppinterfaceproxy.hxx | 4
bridges/inc/unointerfaceproxy.hxx | 8
bridges/source/cpp_uno/shared/bridge.cxx | 6
bridges/source/cpp_uno/shared/component.cxx | 8
bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx | 6
bridges/source/cpp_uno/shared/unointerfaceproxy.cxx | 4
bridges/source/jni_uno/jni_uno2java.cxx | 8
canvas/source/opengl/ogl_canvastools.hxx | 2
chart2/inc/ChartModel.hxx | 4
chart2/qa/extras/chart2import2.cxx | 4
chart2/source/controller/main/ChartController.cxx | 2
chart2/source/controller/main/ControllerCommandDispatch.cxx | 2
chart2/source/inc/ModifyListenerCallBack.hxx | 4
chart2/source/tools/ModifyListenerCallBack.cxx | 4
chart2/source/view/main/ChartView.cxx | 4
chart2/source/view/main/VDataSeries.cxx | 2
comphelper/qa/unit/variadictemplates.cxx | 12
comphelper/source/misc/types.cxx | 2
connectivity/source/drivers/firebird/Tables.hxx | 2
connectivity/source/drivers/mysqlc/mysqlc_types.cxx | 210 +++++------
cui/source/customize/SvxNotebookbarConfigPage.cxx | 8
cui/source/customize/cfg.cxx | 12
cui/source/inc/CommandCategoryListBox.hxx | 11
dbaccess/qa/unit/dbtest_base.cxx | 2
dbaccess/qa/unit/tdf119625.cxx | 2
dbaccess/source/ui/dlg/directsql.cxx | 2
desktop/inc/lib/init.hxx | 2
desktop/qa/desktop_lib/test_desktop_lib.cxx | 10
desktop/source/app/app.cxx | 2
desktop/source/deployment/manager/dp_commandenvironments.cxx | 10
desktop/source/deployment/manager/dp_extensionmanager.cxx | 16
desktop/source/deployment/manager/dp_informationprovider.cxx | 14
desktop/source/deployment/manager/dp_properties.cxx | 8
desktop/source/lib/init.cxx | 2
desktop/source/lib/lokinteractionhandler.hxx | 16
extensions/source/update/check/download.cxx | 8
extensions/source/update/check/updatecheck.cxx | 12
extensions/source/update/check/updatecheckconfig.cxx | 10
extensions/source/update/check/updatecheckjob.cxx | 10
extensions/source/update/check/updateprotocoltest.cxx | 4
extensions/source/update/feed/test/updatefeedtest.cxx | 8
extensions/source/update/feed/updatefeed.cxx | 18
filter/source/msfilter/msdffimp.cxx | 4
forms/source/component/Time.cxx | 2
forms/source/xforms/convert.cxx | 4
forms/source/xforms/datatypes.cxx | 6
framework/source/uielement/subtoolbarcontroller.cxx | 4
i18npool/source/localedata/LocaleNode.cxx | 2
include/basegfx/matrix/b3dhommatrixtools.hxx | 7
include/oox/ppt/presentationfragmenthandler.hxx | 2
include/sfx2/lokhelper.hxx | 2
include/svx/fmdmod.hxx | 4
include/test/sheet/xsheetcellrangecontainer.hxx | 2
include/test/sheet/xsheetconditionalentries.hxx | 3
include/test/unoapi_test.hxx | 5
include/unotools/weakref.hxx | 2
libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx | 26 -
libreofficekit/source/gtk/lokdocview.cxx | 26 -
linguistic/qa/restprotocol.cxx | 4
oox/qa/unit/wpc_drawing_canvas.cxx | 4
oox/source/docprop/ooxmldocpropimport.cxx | 6
oox/source/docprop/ooxmldocpropimport.hxx | 6
oox/source/drawingml/chart/axisconverter.cxx | 4
oox/source/drawingml/chart/chartspaceconverter.cxx | 2
oox/source/drawingml/chart/plotareaconverter.cxx | 4
oox/source/drawingml/chart/seriesconverter.cxx | 4
oox/source/drawingml/chart/titleconverter.cxx | 4
oox/source/drawingml/chart/typegroupconverter.cxx | 10
oox/source/drawingml/textparagraphpropertiescontext.cxx | 2
oox/source/ppt/presentationfragmenthandler.cxx | 2
sc/source/filter/excel/xehelper.cxx | 6
sc/source/filter/excel/xestyle.cxx | 2
sc/source/filter/excel/xiescher.cxx | 18
sc/source/filter/excel/xlstyle.cxx | 4
sc/source/ui/drawfunc/chartsh.cxx | 2
sc/source/ui/unoobj/cellvaluebinding.cxx | 2
scripting/source/provider/URIHelper.cxx | 8
sd/qa/unit/export-tests-ooxml2.cxx | 2
sd/qa/unit/import-tests.cxx | 2
sd/source/console/PresenterScreen.hxx | 2
sd/source/ui/controller/displaymodecontroller.cxx | 2
sd/source/ui/inc/CustomAnimationPane.hxx | 2
sd/source/ui/inc/DrawViewShell.hxx | 2
sfx2/source/notebookbar/NotebookbarTabControl.cxx | 2
sfx2/source/view/lokhelper.cxx | 2
sfx2/source/view/viewsh.cxx | 2
slideshow/source/engine/box2dtools.cxx | 59 +--
slideshow/source/engine/slide/slideimpl.cxx | 2
slideshow/source/engine/transitions/ellipsewipe.cxx | 2
slideshow/source/inc/box2dtools.hxx | 26 -
svtools/source/uno/wizard/wizardpagecontroller.cxx | 2
svx/source/sdr/properties/graphicproperties.cxx | 4
svx/source/sdr/properties/oleproperties.cxx | 4
svx/source/tbxctrls/tbxcolorupdate.cxx | 2
svx/source/unodraw/SvxXTextColumns.cxx | 6
sw/source/ui/vba/vbafind.hxx | 2
sw/source/ui/vba/vbalistformat.cxx | 2
sw/source/uibase/inc/navipi.hxx | 4
sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx | 2
sw/source/uibase/sidebar/CommentsPanel.cxx | 4
sw/source/uibase/sidebar/PageFooterPanel.cxx | 2
sw/source/uibase/sidebar/PageFormatPanel.cxx | 2
sw/source/uibase/sidebar/PageHeaderPanel.cxx | 4
sw/source/uibase/sidebar/PageStylesPanel.cxx | 4
sw/source/writerfilter/dmapper/GraphicImport.cxx | 4
sw/source/writerfilter/dmapper/GraphicImport.hxx | 2
test/source/text/textsettings.cxx | 2
toolkit/source/controls/table/tablecontrol_impl.cxx | 4
ucb/source/ucp/ext/ucpext_content.cxx | 4
ucb/source/ucp/webdav-curl/DAVResourceAccess.hxx | 4
ucb/source/ucp/webdav-curl/DAVSession.hxx | 2
ucb/source/ucp/webdav-curl/DAVSessionFactory.hxx | 8
unoxml/qa/unit/domtest.cxx | 4
unoxml/qa/unit/rdftest.cxx | 22 -
vcl/qt5/QtAccessibleWidget.cxx | 10
vcl/qt5/QtTransferable.cxx | 3
vcl/source/control/throbber.cxx | 2
vcl/source/outdev/outdev.cxx | 2
vcl/source/window/builder.cxx | 2
vcl/source/window/window2.cxx | 2
vcl/unx/gtk4/a11y.cxx | 42 +-
vcl/unx/gtk4/gtkaccessibleeventlistener.cxx | 4
vcl/unx/gtk4/gtkaccessibletext.cxx | 16
winaccessibility/inc/AccDescendantManagerEventListener.hxx | 2
winaccessibility/inc/AccObjectWinManager.hxx | 4
winaccessibility/source/UAccCOM/AccTextBase.cxx | 10
winaccessibility/source/service/AccEventListener.cxx | 3
writerperfect/qa/unit/DirectoryStreamTest.cxx | 4
writerperfect/qa/unit/WPXSvStreamTest.cxx | 6
writerperfect/qa/unit/WpftFilterFixture.cxx | 6
writerperfect/qa/unit/WpftFilterTestBase.cxx | 2
writerperfect/qa/unit/WpftLoader.cxx | 16
writerperfect/source/common/DirectoryStream.cxx | 8
writerperfect/source/common/WPXSvInputStream.cxx | 4
writerperfect/source/impress/KeynoteImportFilter.cxx | 6
xmloff/qa/unit/style.cxx | 2
xmloff/source/chart/SchXMLChartContext.cxx | 8
xmloff/source/chart/SchXMLChartContext.hxx | 2
xmloff/source/meta/MetaExportComponent.cxx | 2
xmlsecurity/source/component/documentdigitalsignatures.cxx | 6
158 files changed, 627 insertions(+), 650 deletions(-)
New commits:
commit 1180b3473aed3251b5869256abc9c7774bab9ced
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Nov 4 11:26:07 2024 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Nov 10 10:50:15 2024 +0100
com::sun::star -> css
Change-Id: I890ec73e30d3cc6b210903ecee29431f3cb5f635
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175979
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 9d10c78650e1..541b5ead7057 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -236,8 +236,8 @@ awt::Size SAL_CALL AccessibleBrowseBoxBase::getSize()
void SAL_CALL AccessibleBrowseBoxBase::focusGained( const
css::awt::FocusEvent& )
{
- com::sun::star::uno::Any aFocused;
- com::sun::star::uno::Any aEmpty;
+ css::uno::Any aFocused;
+ css::uno::Any aEmpty;
aFocused <<= FOCUSED;
commitEvent(AccessibleEventId::STATE_CHANGED,aFocused,aEmpty);
@@ -246,8 +246,8 @@ void SAL_CALL AccessibleBrowseBoxBase::focusGained( const
css::awt::FocusEvent&
void SAL_CALL AccessibleBrowseBoxBase::focusLost( const css::awt::FocusEvent& )
{
- com::sun::star::uno::Any aFocused;
- com::sun::star::uno::Any aEmpty;
+ css::uno::Any aFocused;
+ css::uno::Any aEmpty;
aFocused <<= FOCUSED;
commitEvent(AccessibleEventId::STATE_CHANGED,aEmpty,aFocused);
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx
b/accessibility/source/standard/vclxaccessiblelist.cxx
index 4895d929e1cf..335ffffe6624 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -440,7 +440,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const
VclWindowEvent& rVclWindowEve
if (m_pListBoxHelper && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN )
!= WB_DROPDOWN)
{
uno::Sequence<uno::Reference<css::accessibility::XAccessible>>
aSequence { pBox->GetAccessible() };
- rRelationSet.AddRelation(
com::sun::star::accessibility::AccessibleRelation(
com::sun::star::accessibility::AccessibleRelationType_MEMBER_OF, aSequence ) );
+ rRelationSet.AddRelation( css::accessibility::AccessibleRelation(
css::accessibility::AccessibleRelationType_MEMBER_OF, aSequence ) );
}
}
else
diff --git a/basegfx/source/matrix/b3dhommatrixtools.cxx
b/basegfx/source/matrix/b3dhommatrixtools.cxx
index 9125aca4e0a6..70ca2dea50b7 100644
--- a/basegfx/source/matrix/b3dhommatrixtools.cxx
+++ b/basegfx/source/matrix/b3dhommatrixtools.cxx
@@ -22,7 +22,7 @@
namespace basegfx::utils
{
-B3DHomMatrix UnoHomogenMatrixToB3DHomMatrix(const
com::sun::star::drawing::HomogenMatrix& rMatrixIn)
+B3DHomMatrix UnoHomogenMatrixToB3DHomMatrix(const css::drawing::HomogenMatrix&
rMatrixIn)
{
B3DHomMatrix aRetval;
@@ -47,7 +47,7 @@ B3DHomMatrix UnoHomogenMatrixToB3DHomMatrix(const
com::sun::star::drawing::Homog
}
void B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& rMatrixIn,
- com::sun::star::drawing::HomogenMatrix&
rMatrixOut)
+ css::drawing::HomogenMatrix& rMatrixOut)
{
rMatrixOut.Line1.Column1 = rMatrixIn.get(0, 0);
rMatrixOut.Line1.Column2 = rMatrixIn.get(0, 1);
diff --git a/binaryurp/source/binaryany.hxx b/binaryurp/source/binaryany.hxx
index c04fe8f8624a..1504f92d9259 100644
--- a/binaryurp/source/binaryany.hxx
+++ b/binaryurp/source/binaryany.hxx
@@ -31,7 +31,7 @@ class BinaryAny {
public:
BinaryAny() noexcept;
- BinaryAny(com::sun::star::uno::TypeDescription const & type, void * value)
+ BinaryAny(css::uno::TypeDescription const & type, void * value)
noexcept;
explicit BinaryAny(uno_Any const & raw) noexcept;
@@ -50,9 +50,9 @@ public:
uno_Any& get() noexcept { return data_; }
- com::sun::star::uno::TypeDescription getType() const noexcept;
+ css::uno::TypeDescription getType() const noexcept;
- void * getValue(com::sun::star::uno::TypeDescription const & type) const
+ void * getValue(css::uno::TypeDescription const & type) const
noexcept;
private:
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 0f9832682648..9d086946aa81 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -165,7 +165,7 @@ void PopOutgoingRequest::clear() {
}
struct Bridge::SubStub {
- com::sun::star::uno::UnoInterfaceReference object;
+ css::uno::UnoInterfaceReference object;
sal_uInt32 references;
};
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index 9da6640fa126..1d7c4aad60ab 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -66,16 +66,14 @@ namespace binaryurp {
class Bridge:
public cppu::WeakImplHelper<
- com::sun::star::bridge::XBridge, com::sun::star::lang::XComponent >
+ css::bridge::XBridge, com::sun::star::lang::XComponent >
{
public:
Bridge(
rtl::Reference< BridgeFactory > const & factory,
OUString name,
- com::sun::star::uno::Reference<
- com::sun::star::connection::XConnection > const & connection,
- com::sun::star::uno::Reference<
- com::sun::star::bridge::XInstanceProvider > provider);
+ css::uno::Reference< css::connection::XConnection > const & connection,
+ css::uno::Reference< css::bridge::XInstanceProvider > provider);
void start();
@@ -86,35 +84,35 @@ public:
// thread:
void terminate(bool final);
- const com::sun::star::uno::Reference<
com::sun::star::connection::XConnection >&
+ const css::uno::Reference< css::connection::XConnection >&
getConnection() const { return connection_;}
- const com::sun::star::uno::Reference<
com::sun::star::bridge::XInstanceProvider >&
+ const css::uno::Reference< css::bridge::XInstanceProvider >&
getProvider() const { return provider_;}
- com::sun::star::uno::Mapping & getCppToBinaryMapping() { return
cppToBinaryMapping_;}
+ css::uno::Mapping & getCppToBinaryMapping() { return cppToBinaryMapping_;}
- BinaryAny mapCppToBinaryAny(com::sun::star::uno::Any const & cppAny);
+ BinaryAny mapCppToBinaryAny(css::uno::Any const & cppAny);
uno_ThreadPool getThreadPool();
rtl::Reference< Writer > getWriter();
- com::sun::star::uno::UnoInterfaceReference registerIncomingInterface(
+ css::uno::UnoInterfaceReference registerIncomingInterface(
OUString const & oid,
- com::sun::star::uno::TypeDescription const & type);
+ css::uno::TypeDescription const & type);
OUString registerOutgoingInterface(
- com::sun::star::uno::UnoInterfaceReference const & object,
- com::sun::star::uno::TypeDescription const & type);
+ css::uno::UnoInterfaceReference const & object,
+ css::uno::TypeDescription const & type);
- com::sun::star::uno::UnoInterfaceReference findStub(
+ css::uno::UnoInterfaceReference findStub(
OUString const & oid,
- com::sun::star::uno::TypeDescription const & type);
+ css::uno::TypeDescription const & type);
void releaseStub(
OUString const & oid,
- com::sun::star::uno::TypeDescription const & type);
+ css::uno::TypeDescription const & type);
void resurrectProxy(Proxy & proxy);
@@ -132,7 +130,7 @@ public:
bool makeCall(
OUString const & oid,
- com::sun::star::uno::TypeDescription const & member, bool setter,
+ css::uno::TypeDescription const & member, bool setter,
std::vector< BinaryAny >&& inArguments, BinaryAny * returnValue,
std::vector< BinaryAny > * outArguments);
@@ -160,7 +158,7 @@ public:
bool isProtocolPropertiesRequest(
std::u16string_view oid,
- com::sun::star::uno::TypeDescription const & type) const;
+ css::uno::TypeDescription const & type) const;
void setCurrentContextMode();
@@ -172,7 +170,7 @@ private:
virtual ~Bridge() override;
- virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+ virtual css::uno::Reference< css::uno::XInterface >
SAL_CALL getInstance(OUString const & sInstanceName) override;
virtual OUString SAL_CALL getName() override;
@@ -182,11 +180,11 @@ private:
virtual void SAL_CALL dispose() override;
virtual void SAL_CALL addEventListener(
- com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
+ css::uno::Reference< css::lang::XEventListener >
const & xListener) override;
virtual void SAL_CALL removeEventListener(
- com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
+ css::uno::Reference< css::lang::XEventListener >
const & aListener) override;
// Only called from reader_ thread:
@@ -199,17 +197,17 @@ private:
void makeReleaseCall(
OUString const & oid,
- com::sun::star::uno::TypeDescription const & type);
+ css::uno::TypeDescription const & type);
void sendRequest(
rtl::ByteSequence const & tid, OUString const & oid,
- com::sun::star::uno::TypeDescription const & type,
- com::sun::star::uno::TypeDescription const & member,
+ css::uno::TypeDescription const & type,
+ css::uno::TypeDescription const & member,
std::vector< BinaryAny >&& inArguments);
void throwException(bool exception, BinaryAny const & value);
- com::sun::star::uno::Any mapBinaryToCppAny(BinaryAny const & binaryAny);
+ css::uno::Any mapBinaryToCppAny(BinaryAny const & binaryAny);
bool becameUnused() const;
@@ -220,13 +218,13 @@ private:
typedef
std::vector<
- com::sun::star::uno::Reference<
- com::sun::star::lang::XEventListener > >
+ css::uno::Reference<
+ css::lang::XEventListener > >
Listeners;
struct SubStub;
- typedef std::map< com::sun::star::uno::TypeDescription, SubStub > Stub;
+ typedef std::map< css::uno::TypeDescription, SubStub > Stub;
typedef std::map< OUString, Stub > Stubs;
@@ -238,18 +236,18 @@ private:
rtl::Reference< BridgeFactory > factory_;
OUString name_;
- com::sun::star::uno::Reference< com::sun::star::connection::XConnection >
+ css::uno::Reference< css::connection::XConnection >
connection_;
- com::sun::star::uno::Reference< com::sun::star::bridge::XInstanceProvider >
+ css::uno::Reference< css::bridge::XInstanceProvider >
provider_;
- com::sun::star::uno::Environment binaryUno_;
- com::sun::star::uno::Mapping cppToBinaryMapping_;
- com::sun::star::uno::Mapping binaryToCppMapping_;
+ css::uno::Environment binaryUno_;
+ css::uno::Mapping cppToBinaryMapping_;
+ css::uno::Mapping binaryToCppMapping_;
rtl::ByteSequence protPropTid_;
OUString protPropOid_;
- com::sun::star::uno::TypeDescription protPropType_;
- com::sun::star::uno::TypeDescription protPropRequest_;
- com::sun::star::uno::TypeDescription protPropCommit_;
+ css::uno::TypeDescription protPropType_;
+ css::uno::TypeDescription protPropRequest_;
+ css::uno::TypeDescription protPropCommit_;
OutgoingRequests outgoingRequests_;
osl::Condition passive_;
// to guarantee that passive_ is eventually set (to avoid deadlock, see
diff --git a/binaryurp/source/bridgefactory.hxx
b/binaryurp/source/bridgefactory.hxx
index 59023896010b..a733ebb040af 100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -46,15 +46,15 @@ namespace binaryurp {
typedef
cppu::WeakComponentImplHelper<
- com::sun::star::lang::XServiceInfo,
- com::sun::star::bridge::XBridgeFactory2 >
+ css::lang::XServiceInfo,
+ css::bridge::XBridgeFactory2 >
BridgeFactoryBase;
class BridgeFactory : private cppu::BaseMutex, public BridgeFactoryBase
{
public:
void removeBridge(
- com::sun::star::uno::Reference< com::sun::star::bridge::XBridge >
+ css::uno::Reference< css::bridge::XBridge >
const & bridge);
using BridgeFactoryBase::acquire;
@@ -72,38 +72,34 @@ private:
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
- virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge >
+ virtual css::uno::Reference< css::bridge::XBridge >
SAL_CALL createBridge(
OUString const & sName, OUString const & sProtocol,
- com::sun::star::uno::Reference<
- com::sun::star::connection::XConnection > const & aConnection,
- com::sun::star::uno::Reference<
- com::sun::star::bridge::XInstanceProvider > const &
+ css::uno::Reference< css::connection::XConnection > const &
aConnection,
+ css::uno::Reference< css::bridge::XInstanceProvider > const &
anInstanceProvider) override;
- virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge >
+ virtual css::uno::Reference< css::bridge::XBridge >
SAL_CALL getBridge(
OUString const & sName) override;
virtual
- com::sun::star::uno::Sequence<
- com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > >
+ css::uno::Sequence< css::uno::Reference< css::bridge::XBridge > >
SAL_CALL getExistingBridges() override;
void SAL_CALL disposing() override;
typedef
- std::vector<
- com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > >
+ std::vector< css::uno::Reference< css::bridge::XBridge > >
BridgeVector;
typedef
std::map<
OUString,
- com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > >
+ css::uno::Reference< css::bridge::XBridge > >
BridgeMap;
BridgeVector unnamed_;
diff --git a/binaryurp/source/currentcontext.hxx
b/binaryurp/source/currentcontext.hxx
index b5f55a8244c9..41e621f2670a 100644
--- a/binaryurp/source/currentcontext.hxx
+++ b/binaryurp/source/currentcontext.hxx
@@ -28,9 +28,9 @@ class UnoInterfaceReference;
namespace binaryurp::current_context
{
-com::sun::star::uno::UnoInterfaceReference get();
+css::uno::UnoInterfaceReference get();
-void set(com::sun::star::uno::UnoInterfaceReference const& value);
+void set(css::uno::UnoInterfaceReference const& value);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/incomingrequest.hxx
b/binaryurp/source/incomingrequest.hxx
index faff4f5a5c0c..9c61041a2706 100644
--- a/binaryurp/source/incomingrequest.hxx
+++ b/binaryurp/source/incomingrequest.hxx
@@ -45,12 +45,12 @@ public:
IncomingRequest(
rtl::Reference< Bridge > const & bridge, rtl::ByteSequence tid,
OUString oid,
- com::sun::star::uno::UnoInterfaceReference object,
- com::sun::star::uno::TypeDescription type,
+ css::uno::UnoInterfaceReference object,
+ css::uno::TypeDescription type,
sal_uInt16 functionId, bool synchronous,
- com::sun::star::uno::TypeDescription const & member, bool setter,
+ css::uno::TypeDescription const & member, bool setter,
std::vector< BinaryAny >&& inArguments, bool currentContextMode,
- com::sun::star::uno::UnoInterfaceReference currentContext);
+ css::uno::UnoInterfaceReference currentContext);
~IncomingRequest();
@@ -63,10 +63,10 @@ private:
rtl::Reference< Bridge > bridge_;
rtl::ByteSequence tid_;
OUString oid_; // initial object queryInterface; release
- com::sun::star::uno::UnoInterfaceReference object_;
- com::sun::star::uno::TypeDescription type_;
- com::sun::star::uno::TypeDescription member_;
- com::sun::star::uno::UnoInterfaceReference currentContext_;
+ css::uno::UnoInterfaceReference object_;
+ css::uno::TypeDescription type_;
+ css::uno::TypeDescription member_;
+ css::uno::UnoInterfaceReference currentContext_;
std::vector< BinaryAny > inArguments_;
sal_uInt16 functionId_;
bool synchronous_;
diff --git a/binaryurp/source/marshal.hxx b/binaryurp/source/marshal.hxx
index 93930e3566c1..3e456854a6db 100644
--- a/binaryurp/source/marshal.hxx
+++ b/binaryurp/source/marshal.hxx
@@ -53,12 +53,12 @@ public:
void writeValue(
std::vector< unsigned char > * buffer,
- com::sun::star::uno::TypeDescription const & type,
+ css::uno::TypeDescription const & type,
BinaryAny const & value);
void writeType(
std::vector< unsigned char > * buffer,
- com::sun::star::uno::TypeDescription const & value);
+ css::uno::TypeDescription const & value);
void writeOid(
std::vector< unsigned char > * buffer, OUString const & oid);
@@ -72,11 +72,11 @@ private:
void writeValue(
std::vector< unsigned char > * buffer,
- com::sun::star::uno::TypeDescription const & type, void const * value);
+ css::uno::TypeDescription const & type, void const * value);
void writeMemberValues(
std::vector< unsigned char > * buffer,
- com::sun::star::uno::TypeDescription const & type,
+ css::uno::TypeDescription const & type,
void const * aggregateValue);
rtl::Reference< Bridge > bridge_;
diff --git a/binaryurp/source/outgoingrequest.hxx
b/binaryurp/source/outgoingrequest.hxx
index efa673eac781..31daf919387f 100644
--- a/binaryurp/source/outgoingrequest.hxx
+++ b/binaryurp/source/outgoingrequest.hxx
@@ -30,12 +30,12 @@ struct OutgoingRequest {
enum Kind { KIND_NORMAL, KIND_REQUEST_CHANGE, KIND_COMMIT_CHANGE };
OutgoingRequest(
- Kind theKind, com::sun::star::uno::TypeDescription theMember,
+ Kind theKind, css::uno::TypeDescription theMember,
bool theSetter):
member(std::move(theMember)), kind(theKind), setter(theSetter)
{}
- com::sun::star::uno::TypeDescription member;
+ css::uno::TypeDescription member;
Kind kind;
diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx
index 4e1fa3656ecc..e6c6de5c3d79 100644
--- a/binaryurp/source/proxy.hxx
+++ b/binaryurp/source/proxy.hxx
@@ -40,11 +40,11 @@ class Proxy: public uno_Interface {
public:
Proxy(
rtl::Reference< Bridge > const & bridge, OUString oid,
- com::sun::star::uno::TypeDescription type);
+ css::uno::TypeDescription type);
const OUString& getOid() const { return oid_;}
- const com::sun::star::uno::TypeDescription& getType() const { return
type_;}
+ const css::uno::TypeDescription& getType() const { return type_;}
void do_acquire();
@@ -58,7 +58,7 @@ public:
static bool isProxy(
rtl::Reference< Bridge > const & bridge,
- com::sun::star::uno::UnoInterfaceReference const & object,
+ css::uno::UnoInterfaceReference const & object,
OUString * oid);
private:
@@ -76,7 +76,7 @@ private:
rtl::Reference< Bridge > bridge_;
OUString oid_;
- com::sun::star::uno::TypeDescription type_;
+ css::uno::TypeDescription type_;
std::atomic<std::size_t> references_;
};
diff --git a/binaryurp/source/reader.hxx b/binaryurp/source/reader.hxx
index 2f3ec0dd9e2e..3ab4d2340d47 100644
--- a/binaryurp/source/reader.hxx
+++ b/binaryurp/source/reader.hxx
@@ -55,7 +55,7 @@ private:
rtl::ByteSequence getTid(Unmarshal& unmarshal, bool newTid) const;
rtl::Reference<Bridge> bridge_;
- com::sun::star::uno::TypeDescription lastType_;
+ css::uno::TypeDescription lastType_;
OUString lastOid_;
rtl::ByteSequence lastTid_;
ReaderState state_;
diff --git a/binaryurp/source/readerstate.hxx b/binaryurp/source/readerstate.hxx
index a93a45dfcc1d..05dbaa24bb49 100644
--- a/binaryurp/source/readerstate.hxx
+++ b/binaryurp/source/readerstate.hxx
@@ -38,7 +38,7 @@ private:
public:
ReaderState() {}
- com::sun::star::uno::TypeDescription typeCache[cache::size];
+ css::uno::TypeDescription typeCache[cache::size];
OUString oidCache[cache::size];
rtl::ByteSequence tidCache[cache::size];
};
diff --git a/binaryurp/source/unmarshal.hxx b/binaryurp/source/unmarshal.hxx
index 1972c30d0e74..11f62ad334b7 100644
--- a/binaryurp/source/unmarshal.hxx
+++ b/binaryurp/source/unmarshal.hxx
@@ -41,7 +41,7 @@ class Unmarshal {
public:
Unmarshal(
rtl::Reference< Bridge > bridge, ReaderState & state,
- com::sun::star::uno::Sequence< sal_Int8 > const & buffer);
+ css::uno::Sequence< sal_Int8 > const & buffer);
~Unmarshal();
@@ -51,13 +51,13 @@ public:
sal_uInt32 read32();
- com::sun::star::uno::TypeDescription readType();
+ css::uno::TypeDescription readType();
OUString readOid();
rtl::ByteSequence readTid();
- BinaryAny readValue(com::sun::star::uno::TypeDescription const & type);
+ BinaryAny readValue(css::uno::TypeDescription const & type);
void done() const;
@@ -75,15 +75,15 @@ private:
OUString readString();
- BinaryAny readSequence(com::sun::star::uno::TypeDescription const & type);
+ BinaryAny readSequence(css::uno::TypeDescription const & type);
void readMemberValues(
- com::sun::star::uno::TypeDescription const & type,
+ css::uno::TypeDescription const & type,
std::vector< BinaryAny > * values);
rtl::Reference< Bridge > bridge_;
ReaderState & state_;
- com::sun::star::uno::Sequence< sal_Int8 > buffer_;
+ css::uno::Sequence< sal_Int8 > buffer_;
sal_uInt8 const * data_;
sal_uInt8 const * end_;
};
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index 4331a419c751..9b8bf07ea6b4 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -115,7 +115,7 @@ void Writer::queueRequest(
void Writer::queueReply(
rtl::ByteSequence const & tid,
- com::sun::star::uno::TypeDescription const & member, bool setter,
+ css::uno::TypeDescription const & member, bool setter,
bool exception, BinaryAny const & returnValue,
std::vector< BinaryAny >&& outArguments, bool setCurrentContextMode)
{
@@ -342,7 +342,7 @@ void Writer::sendRequest(
void Writer::sendReply(
rtl::ByteSequence const & tid,
- com::sun::star::uno::TypeDescription const & member, bool setter,
+ css::uno::TypeDescription const & member, bool setter,
bool exception, BinaryAny const & returnValue,
std::vector< BinaryAny > const & outArguments)
{
diff --git a/binaryurp/source/writer.hxx b/binaryurp/source/writer.hxx
index e2061502a015..2781014ed12a 100644
--- a/binaryurp/source/writer.hxx
+++ b/binaryurp/source/writer.hxx
@@ -50,27 +50,27 @@ public:
// thread is unblocked:
void sendDirectRequest(
rtl::ByteSequence const & tid, OUString const & oid,
- com::sun::star::uno::TypeDescription const & type,
- com::sun::star::uno::TypeDescription const & member,
+ css::uno::TypeDescription const & type,
+ css::uno::TypeDescription const & member,
std::vector< BinaryAny > const & inArguments);
// Only called from Bridge::reader_ thread, and only before Bridge::writer_
// thread is unblocked:
void sendDirectReply(
rtl::ByteSequence const & tid,
- com::sun::star::uno::TypeDescription const & member,
+ css::uno::TypeDescription const & member,
bool exception, BinaryAny const & returnValue,
std::vector< BinaryAny > const & outArguments);
void queueRequest(
rtl::ByteSequence const & tid, OUString const & oid,
- com::sun::star::uno::TypeDescription const & type,
- com::sun::star::uno::TypeDescription const & member,
+ css::uno::TypeDescription const & type,
+ css::uno::TypeDescription const & member,
std::vector< BinaryAny >&& inArguments);
void queueReply(
rtl::ByteSequence const & tid,
- com::sun::star::uno::TypeDescription const & member, bool setter,
+ css::uno::TypeDescription const & member, bool setter,
bool exception, BinaryAny const & returnValue,
std::vector< BinaryAny >&& outArguments,
bool setCurrentContextMode);
@@ -86,14 +86,14 @@ private:
void sendRequest(
rtl::ByteSequence const & tid, OUString const & oid,
- com::sun::star::uno::TypeDescription const & type,
- com::sun::star::uno::TypeDescription const & member,
+ css::uno::TypeDescription const & type,
+ css::uno::TypeDescription const & member,
std::vector< BinaryAny > const & inArguments, bool currentContextMode,
- com::sun::star::uno::UnoInterfaceReference const & currentContext);
+ css::uno::UnoInterfaceReference const & currentContext);
void sendReply(
rtl::ByteSequence const & tid,
- com::sun::star::uno::TypeDescription const & member, bool setter,
+ css::uno::TypeDescription const & member, bool setter,
bool exception, BinaryAny const & returnValue,
std::vector< BinaryAny > const & outArguments);
@@ -105,24 +105,24 @@ private:
// Request:
Item(
rtl::ByteSequence theTid, OUString theOid,
- com::sun::star::uno::TypeDescription theType,
- com::sun::star::uno::TypeDescription theMember,
+ css::uno::TypeDescription theType,
+ css::uno::TypeDescription theMember,
std::vector< BinaryAny >&& inArguments,
- com::sun::star::uno::UnoInterfaceReference theCurrentContext);
+ css::uno::UnoInterfaceReference theCurrentContext);
// Reply:
Item(
rtl::ByteSequence theTid,
- com::sun::star::uno::TypeDescription theMember,
+ css::uno::TypeDescription theMember,
bool theSetter, bool theException, BinaryAny theReturnValue,
std::vector< BinaryAny >&& outArguments,
bool theSetCurrentContextMode);
rtl::ByteSequence tid; // request + reply
OUString oid; // request
- com::sun::star::uno::TypeDescription type; // request
- com::sun::star::uno::TypeDescription member; // request + reply
- com::sun::star::uno::UnoInterfaceReference currentContext; // request
+ css::uno::TypeDescription type; // request
+ css::uno::TypeDescription member; // request + reply
+ css::uno::UnoInterfaceReference currentContext; // request
BinaryAny returnValue; // reply
std::vector< BinaryAny > arguments; // request: inArguments; reply:
outArguments
bool request;
@@ -134,7 +134,7 @@ private:
rtl::Reference< Bridge > bridge_;
WriterState state_;
Marshal marshal_;
- com::sun::star::uno::TypeDescription lastType_;
+ css::uno::TypeDescription lastType_;
OUString lastOid_;
rtl::ByteSequence lastTid_;
osl::Condition unblocked_;
diff --git a/binaryurp/source/writerstate.hxx b/binaryurp/source/writerstate.hxx
index 72477ad17c07..a9bbf5e8e2fc 100644
--- a/binaryurp/source/writerstate.hxx
+++ b/binaryurp/source/writerstate.hxx
@@ -37,7 +37,7 @@ public:
WriterState():
typeCache(cache::size), oidCache(cache::size), tidCache(cache::size) {}
- Cache< com::sun::star::uno::TypeDescription > typeCache;
+ Cache< css::uno::TypeDescription > typeCache;
Cache< OUString > oidCache;
diff --git a/bridges/inc/cppinterfaceproxy.hxx
b/bridges/inc/cppinterfaceproxy.hxx
index 5b5c85dc7dd5..a9489787783a 100644
--- a/bridges/inc/cppinterfaceproxy.hxx
+++ b/bridges/inc/cppinterfaceproxy.hxx
@@ -47,7 +47,7 @@ class CppInterfaceProxy {
public:
// Interface for Bridge:
- static com::sun::star::uno::XInterface * create(
+ static css::uno::XInterface * create(
Bridge * pBridge, uno_Interface * pUnoI,
typelib_InterfaceTypeDescription * pTypeDescr,
OUString const & rOId);
@@ -76,7 +76,7 @@ private:
~CppInterfaceProxy();
- static com::sun::star::uno::XInterface * castProxyToInterface(
+ static css::uno::XInterface * castProxyToInterface(
CppInterfaceProxy * pProxy);
std::atomic<std::size_t> nRef;
diff --git a/bridges/inc/unointerfaceproxy.hxx
b/bridges/inc/unointerfaceproxy.hxx
index d20a7c3549fa..a0a8f6d4b01d 100644
--- a/bridges/inc/unointerfaceproxy.hxx
+++ b/bridges/inc/unointerfaceproxy.hxx
@@ -60,21 +60,21 @@ public:
// Interface for Bridge:
static UnoInterfaceProxy * create(
- Bridge * pBridge, com::sun::star::uno::XInterface * pCppI,
+ Bridge * pBridge, css::uno::XInterface * pCppI,
typelib_InterfaceTypeDescription * pTypeDescr,
OUString const & rOId);
// Interface for individual CPP--UNO bridges:
Bridge * getBridge() { return pBridge; }
- com::sun::star::uno::XInterface * getCppI() { return pCppI; }
+ css::uno::XInterface * getCppI() { return pCppI; }
private:
UnoInterfaceProxy(UnoInterfaceProxy const &) = delete;
UnoInterfaceProxy& operator =(const UnoInterfaceProxy&) = delete;
UnoInterfaceProxy(
- Bridge * pBridge_, com::sun::star::uno::XInterface * pCppI_,
+ Bridge * pBridge_, css::uno::XInterface * pCppI_,
typelib_InterfaceTypeDescription * pTypeDescr_,
OUString aOId_);
@@ -84,7 +84,7 @@ private:
Bridge * pBridge;
// mapping information
- com::sun::star::uno::XInterface * pCppI; // wrapped interface
+ css::uno::XInterface * pCppI; // wrapped interface
typelib_InterfaceTypeDescription * pTypeDescr;
OUString oid;
diff --git a/bridges/source/cpp_uno/shared/bridge.cxx
b/bridges/source/cpp_uno/shared/bridge.cxx
index ddd34e4ed380..f43ee12ea184 100644
--- a/bridges/source/cpp_uno/shared/bridge.cxx
+++ b/bridges/source/cpp_uno/shared/bridge.cxx
@@ -79,7 +79,7 @@ void cpp2unoMapping(
uno_Interface * pSurrogate
= bridges::cpp_uno::shared::UnoInterfaceProxy::create(
pBridge,
- static_cast< ::com::sun::star::uno::XInterface * >( pCppI ),
+ static_cast< css::uno::XInterface * >( pCppI ),
pTypeDescr, pOId );
// proxy may be exchanged during registration
@@ -100,7 +100,7 @@ void uno2cppMapping(
assert(ppCppI && pTypeDescr);
if (*ppCppI)
{
- static_cast< ::com::sun::star::uno::XInterface * >( *ppCppI )->
+ static_cast< css::uno::XInterface * >( *ppCppI )->
release();
*ppCppI = nullptr;
}
@@ -122,7 +122,7 @@ void uno2cppMapping(
if (! *ppCppI) // no existing interface, register new proxy interface
{
// try to publish a new proxy (ref count initially 1)
- com::sun::star::uno::XInterface * pProxy
+ css::uno::XInterface * pProxy
= bridges::cpp_uno::shared::CppInterfaceProxy::create(
pBridge, static_cast< uno_Interface * >( pUnoI ),
pTypeDescr, pOId );
diff --git a/bridges/source/cpp_uno/shared/component.cxx
b/bridges/source/cpp_uno/shared/component.cxx
index 9e7f5ae7a75a..ada8ae6e643c 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -78,7 +78,7 @@ static void s_stub_computeObjectIdentifier(va_list * pParam)
{
::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > xHome(
- static_cast< ::com::sun::star::uno::XInterface * >(
+ static_cast< css::uno::XInterface * >(
pInterface ),
::com::sun::star::uno::UNO_QUERY );
assert(xHome.is() && "### query to XInterface failed!");
@@ -98,7 +98,7 @@ static void s_stub_computeObjectIdentifier(va_list * pParam)
::rtl_uString_acquire( *ppOId );
}
}
- catch (const ::com::sun::star::uno::RuntimeException & e)
+ catch (const css::uno::RuntimeException & e)
{
SAL_WARN("bridges",
"### RuntimeException occurred during queryInterface(): "
@@ -117,7 +117,7 @@ static void s_stub_acquireInterface(va_list * pParam)
/*uno_ExtEnvironment * pExtEnv = */va_arg(*pParam, uno_ExtEnvironment *);
void * pCppI = va_arg(*pParam, void *);
- static_cast< ::com::sun::star::uno::XInterface * >( pCppI )->acquire();
+ static_cast< css::uno::XInterface * >( pCppI )->acquire();
}
static void acquireInterface( uno_ExtEnvironment * pExtEnv, void * pCppI )
@@ -130,7 +130,7 @@ static void s_stub_releaseInterface(va_list * pParam)
/*uno_ExtEnvironment * pExtEnv = */va_arg(*pParam, uno_ExtEnvironment *);
void * pCppI = va_arg(*pParam, void *);
- static_cast< ::com::sun::star::uno::XInterface * >( pCppI )->release();
+ static_cast< css::uno::XInterface * >( pCppI )->release();
}
static void releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCppI )
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index 189b3c2a4ef9..324b328e8fc2 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -54,7 +54,7 @@ void freeCppInterfaceProxy(uno_ExtEnvironment * pEnv, void *
pInterface)
delete[] reinterpret_cast< char * >(pThis);
}
-com::sun::star::uno::XInterface * CppInterfaceProxy::create(
+css::uno::XInterface * CppInterfaceProxy::create(
bridges::cpp_uno::shared::Bridge * pBridge, uno_Interface * pUnoI,
typelib_InterfaceTypeDescription * pTypeDescr, OUString const & rOId)
{
@@ -122,10 +122,10 @@ CppInterfaceProxy::CppInterfaceProxy(
CppInterfaceProxy::~CppInterfaceProxy()
{}
-com::sun::star::uno::XInterface * CppInterfaceProxy::castProxyToInterface(
+css::uno::XInterface * CppInterfaceProxy::castProxyToInterface(
CppInterfaceProxy * pProxy)
{
- return reinterpret_cast< com::sun::star::uno::XInterface * >(
+ return reinterpret_cast< css::uno::XInterface * >(
&pProxy->vtables);
}
diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
index 3c03c1cffc0f..b93f78448c1e 100644
--- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
@@ -84,7 +84,7 @@ void releaseProxy(uno_Interface * pUnoI)
UnoInterfaceProxy * UnoInterfaceProxy::create(
bridges::cpp_uno::shared::Bridge * pBridge,
- com::sun::star::uno::XInterface * pCppI,
+ css::uno::XInterface * pCppI,
typelib_InterfaceTypeDescription * pTypeDescr,
OUString const & rOId)
{
@@ -93,7 +93,7 @@ UnoInterfaceProxy * UnoInterfaceProxy::create(
UnoInterfaceProxy::UnoInterfaceProxy(
bridges::cpp_uno::shared::Bridge * pBridge_,
- com::sun::star::uno::XInterface * pCppI_,
+ css::uno::XInterface * pCppI_,
typelib_InterfaceTypeDescription * pTypeDescr_, OUString aOId_)
: nRef( 1 )
, pBridge( pBridge_ )
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx
b/bridges/source/jni_uno/jni_uno2java.cxx
index 110ed8db14c2..5ca10fc30dd6 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -573,9 +573,9 @@ void UNO_proxy_dispatch(
reinterpret_cast<
typelib_InterfaceAttributeTypeDescription const * >(
member_td );
- com::sun::star::uno::TypeDescription attrib_holder;
+ css::uno::TypeDescription attrib_holder;
while ( attrib_td->pBaseRef != nullptr ) {
- attrib_holder = com::sun::star::uno::TypeDescription(
+ attrib_holder = css::uno::TypeDescription(
attrib_td->pBaseRef );
assert(
attrib_holder.get()->eTypeClass
@@ -616,9 +616,9 @@ void UNO_proxy_dispatch(
reinterpret_cast<
typelib_InterfaceMethodTypeDescription const * >(
member_td );
- com::sun::star::uno::TypeDescription method_holder;
+ css::uno::TypeDescription method_holder;
while ( method_td->pBaseRef != nullptr ) {
- method_holder = com::sun::star::uno::TypeDescription(
+ method_holder = css::uno::TypeDescription(
method_td->pBaseRef );
assert(
method_holder.get()->eTypeClass
diff --git a/canvas/source/opengl/ogl_canvastools.hxx
b/canvas/source/opengl/ogl_canvastools.hxx
index 8e7029fbe5f4..87136305c1b9 100644
--- a/canvas/source/opengl/ogl_canvastools.hxx
+++ b/canvas/source/opengl/ogl_canvastools.hxx
@@ -29,7 +29,7 @@ namespace oglcanvas
void setupState( const ::basegfx::B2DHomMatrix& rTransform,
GLenum eSrcBlend,
GLenum eDstBlend,
- const com::sun::star::rendering::ARGBColor&
rColor );
+ const css::rendering::ARGBColor& rColor );
void renderOSD( const std::vector<double>& rNumbers, double scale );
}
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index b2e9a6d87cb8..911fcc4e409f 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -181,7 +181,7 @@ private:
OUString impl_g_getLocation();
bool
- impl_isControllerConnected( const css::uno::Reference<
com::sun::star::frame::XController >& xController );
+ impl_isControllerConnected( const css::uno::Reference<
css::frame::XController >& xController );
/// @throws css::uno::RuntimeException
css::uno::Reference< css::frame::XController >
@@ -204,7 +204,7 @@ private:
const css::uno::Sequence< css::beans::PropertyValue >&
rMediaDescriptor,
const css::uno::Reference< css::embed::XStorage >& xStorage );
void impl_loadGraphics(
- const css::uno::Reference< ::com::sun::star::embed::XStorage >&
xStorage );
+ const css::uno::Reference< css::embed::XStorage >& xStorage );
css::uno::Reference< css::document::XFilter >
impl_createFilter( const css::uno::Sequence< css::beans::PropertyValue
> & rMediaDescriptor );
diff --git a/chart2/qa/extras/chart2import2.cxx
b/chart2/qa/extras/chart2import2.cxx
index 934414679a17..bb5f7ecb1947 100644
--- a/chart2/qa/extras/chart2import2.cxx
+++ b/chart2/qa/extras/chart2import2.cxx
@@ -37,9 +37,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf114179)
xDiagram.set(xChartDoc->getFirstDiagram());
CPPUNIT_ASSERT_MESSAGE("There is a Diagram.", xDiagram.is());
awt::Size aPage(0, 0);
- uno::Reference<com::sun::star::embed::XVisualObject>
xVisualObject(xChartDoc, uno::UNO_QUERY);
+ uno::Reference<css::embed::XVisualObject> xVisualObject(xChartDoc,
uno::UNO_QUERY);
CPPUNIT_ASSERT(xVisualObject.is());
- aPage =
xVisualObject->getVisualAreaSize(com::sun::star::embed::Aspects::MSOLE_CONTENT);
+ aPage =
xVisualObject->getVisualAreaSize(css::embed::Aspects::MSOLE_CONTENT);
Reference<beans::XPropertySet> xProp(xDiagram, uno::UNO_QUERY);
chart2::RelativeSize aRelativeSize;
xProp->getPropertyValue(u"RelativeSize"_ustr) >>= aRelativeSize;
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index e861b91c58c5..747b2319a1a8 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1361,7 +1361,7 @@ void ChartController::executeDispatch_SourceData()
if ( rModel.hasInternalDataProvider() )
{
// Check if we will able to create data provider later
- css::uno::Reference< com::sun::star::chart2::XDataProviderAccess >
xCreatorDoc(
+ css::uno::Reference< css::chart2::XDataProviderAccess > xCreatorDoc(
rModel.getParent(), uno::UNO_QUERY);
if (!xCreatorDoc.is())
return;
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index ee9d7d480de3..2aa350e48aa3 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -555,7 +555,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
OSL_ENSURE(xChartModel.is(), "Invalid XChartDocument");
if ( xChartModel.is() )
{
- css::uno::Reference< com::sun::star::chart2::XDataProviderAccess >
xCreatorDoc(xChartModel->getParent(), uno::UNO_QUERY);
+ css::uno::Reference< css::chart2::XDataProviderAccess >
xCreatorDoc(xChartModel->getParent(), uno::UNO_QUERY);
bCanCreateDataProvider = xCreatorDoc.is();
}
}
diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx
b/chart2/source/inc/ModifyListenerCallBack.hxx
index b1b704c86002..b9006bad5a13 100644
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ b/chart2/source/inc/ModifyListenerCallBack.hxx
@@ -40,9 +40,7 @@ public:
~ModifyListenerCallBack();
- void startListening(
- const
::com::sun::star::uno::Reference<::com::sun::star::util::XModifyBroadcaster>&
- xBroadcaster);
+ void startListening(const
css::uno::Reference<css::util::XModifyBroadcaster>& xBroadcaster);
SAL_DLLPRIVATE void stopListening();
private: //methods
diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx
b/chart2/source/tools/ModifyListenerCallBack.cxx
index 037ee7a7820d..758b25386f96 100644
--- a/chart2/source/tools/ModifyListenerCallBack.cxx
+++ b/chart2/source/tools/ModifyListenerCallBack.cxx
@@ -67,7 +67,7 @@ void SAL_CALL ModifyListenerCallBack_impl::disposing( const
lang::EventObject& /
m_xBroadcaster.clear();
}
-void ModifyListenerCallBack_impl::startListening( const
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster >&
xBroadcaster )
+void ModifyListenerCallBack_impl::startListening( const css::uno::Reference<
css::util::XModifyBroadcaster >& xBroadcaster )
{
if( m_xBroadcaster == xBroadcaster )
return;
@@ -97,7 +97,7 @@ ModifyListenerCallBack::~ModifyListenerCallBack()
stopListening();
}
-void ModifyListenerCallBack::startListening( const
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster >&
xBroadcaster )
+void ModifyListenerCallBack::startListening( const css::uno::Reference<
css::util::XModifyBroadcaster >& xBroadcaster )
{
pModifyListener_impl->startListening( xBroadcaster );
}
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 4b085cde1325..b2d27a4e67e1 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -446,7 +446,7 @@ void lcl_setDefaultWritingMode( const std::shared_ptr<
DrawModelWrapper >& pDraw
else
{
//Calc is parent document
- Reference< com::sun::star::beans::XPropertySetInfo
> xInfo = xParentProps->getPropertySetInfo();
+ Reference< css::beans::XPropertySetInfo > xInfo =
xParentProps->getPropertySetInfo();
if (xInfo->hasPropertyByName(u"PageStyle"_ustr))
{
xParentProps->getPropertyValue(
u"PageStyle"_ustr ) >>= aPageStyle;
@@ -457,7 +457,7 @@ void lcl_setDefaultWritingMode( const std::shared_ptr<
DrawModelWrapper >& pDraw
if( nWritingMode == -1 || nWritingMode ==
text::WritingMode2::PAGE )
{
uno::Reference< beans::XPropertySet > xPageStyle(
xPageStyles->getByName( aPageStyle ), uno::UNO_QUERY );
- Reference< com::sun::star::beans::XPropertySetInfo
> xInfo = xPageStyle->getPropertySetInfo();
+ Reference< css::beans::XPropertySetInfo > xInfo =
xPageStyle->getPropertySetInfo();
if (xInfo->hasPropertyByName(u"WritingMode"_ustr))
{
if( xPageStyle.is() )
diff --git a/chart2/source/view/main/VDataSeries.cxx
b/chart2/source/view/main/VDataSeries.cxx
index cdf5df751ddd..ebf2141d8bb9 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -836,7 +836,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index )
const
m_oSymbolProperties_InvisibleSymbolForSelection.emplace();
m_oSymbolProperties_InvisibleSymbolForSelection->Style =
SymbolStyle_STANDARD;
m_oSymbolProperties_InvisibleSymbolForSelection->StandardSymbol = 0;//square
- m_oSymbolProperties_InvisibleSymbolForSelection->Size =
com::sun::star::awt::Size(0, 0);//tdf#126033
+ m_oSymbolProperties_InvisibleSymbolForSelection->Size =
css::awt::Size(0, 0);//tdf#126033
m_oSymbolProperties_InvisibleSymbolForSelection->BorderColor =
0xff000000;//invisible
m_oSymbolProperties_InvisibleSymbolForSelection->FillColor
= 0xff000000;//invisible
}
diff --git a/comphelper/qa/unit/variadictemplates.cxx
b/comphelper/qa/unit/variadictemplates.cxx
index 2865fbac9f1e..c460bdba70fa 100644
--- a/comphelper/qa/unit/variadictemplates.cxx
+++ b/comphelper/qa/unit/variadictemplates.cxx
@@ -45,12 +45,12 @@ void extract(
const& xErrorContext )
{
if (nArg >= seq.getLength()) {
- throw ::com::sun::star::lang::IllegalArgumentException(
+ throw css::lang::IllegalArgumentException(
u"No such argument available!"_ustr,
xErrorContext, static_cast<sal_Int16>(nArg) );
}
if (! fromAny(seq[nArg], &v)) {
- throw ::com::sun::star::lang::IllegalArgumentException(
+ throw css::lang::IllegalArgumentException(
"Cannot extract ANY { "
+ seq[nArg].getValueTypeName()
+ " } to " + ::cppu::UnoType<T>::get().getTypeName(),
@@ -136,7 +136,7 @@ void VariadicTemplatesTest::testUnwrapArgs() {
CPPUNIT_ASSERT_MESSAGE( "seq1 and seq2 are equal",
bool(seq1 == seq2) );
}
- catch( ::com::sun::star::lang::IllegalArgumentException& err ) {
+ catch( css::lang::IllegalArgumentException& err ) {
std::stringstream ss;
ss << "IllegalArgumentException when unwrapping arguments at: " <<
err.ArgumentPosition;
@@ -149,7 +149,7 @@ void VariadicTemplatesTest::testUnwrapArgs() {
static_cast< sal_uInt32 >( 4 ) );
::comphelper::unwrapArgs( seq, tmp6, tmp7, tmp10, tmp11, tmp10, tmp6 );
}
- catch( ::com::sun::star::lang::IllegalArgumentException& err ) {
+ catch( css::lang::IllegalArgumentException& err ) {
CPPUNIT_ASSERT_EQUAL( static_cast< short >( 5 ), err.ArgumentPosition
);
}
@@ -164,14 +164,14 @@ void VariadicTemplatesTest::testUnwrapArgs() {
static_cast< sal_uInt32 >( 4 ) );
::comphelper::unwrapArgs( seq, test1, test2, test3, test4, test5 );
}
- catch( ::com::sun::star::lang::IllegalArgumentException& err1 ) {
+ catch( css::lang::IllegalArgumentException& err1 ) {
try {
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > seq(
static_cast< sal_uInt32 >( 4 ) );
unwrapArgsBaseline( seq, test1, test2, test3, test4, test5 );
CPPUNIT_FAIL( "unwrapArgs failed while the baseline did not throw"
);
}
- catch( ::com::sun::star::lang::IllegalArgumentException& err2 ) {
+ catch( css::lang::IllegalArgumentException& err2 ) {
CPPUNIT_ASSERT_EQUAL_MESSAGE( "err1.ArgumentPosition ==
err2.ArgumentPosition",
err1.ArgumentPosition,
err2.ArgumentPosition );
}
diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index 8e5d42073bff..e93d96dee867 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -105,7 +105,7 @@ FontDescriptor getDefaultFont()
FontDescriptor aReturn;
aReturn.Slant = FontSlant_DONTKNOW;
aReturn.Underline = FontUnderline::DONTKNOW;
- aReturn.Strikeout = com::sun::star::awt::FontStrikeout::DONTKNOW;
+ aReturn.Strikeout = css::awt::FontStrikeout::DONTKNOW;
return aReturn;
}
diff --git a/connectivity/source/drivers/firebird/Tables.hxx
b/connectivity/source/drivers/firebird/Tables.hxx
index ada1827097a5..9e59da0cf11d 100644
--- a/connectivity/source/drivers/firebird/Tables.hxx
+++ b/connectivity/source/drivers/firebird/Tables.hxx
@@ -28,7 +28,7 @@ namespace connectivity::firebird
css::uno::Reference< css::sdbc::XDatabaseMetaData >
m_xMetaData;
- static OUString createStandardColumnPart(const
css::uno::Reference< css::beans::XPropertySet >& xColProp,const
css::uno::Reference< com::sun::star::sdbc::XConnection>& _xConnection);
+ static OUString createStandardColumnPart(const
css::uno::Reference< css::beans::XPropertySet >& xColProp,const
css::uno::Reference< css::sdbc::XConnection>& _xConnection);
// OCollection
virtual void impl_refresh() override;
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_types.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_types.cxx
index ca473cebd84f..85d3df43dfe0 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_types.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_types.cxx
@@ -29,14 +29,14 @@ TypeInfoDef const mysqlc_types[] = {
// ------------- MySQL-Type: BIT. SDBC-Type: Bit -------------
{
"BIT", // Typename
- com::sun::star::sdbc::DataType::BIT, // sdbc-type
+ css::sdbc::DataType::BIT, // sdbc-type
1, // Precision
"", // Literal prefix
"", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
true, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -48,14 +48,14 @@ TypeInfoDef const mysqlc_types[] = {
// ------------ MySQL-Type: BOOL. SDBC-Type: Bit -------------
{
"BOOL", // Typename
- com::sun::star::sdbc::DataType::BIT, // sdbc-type
+ css::sdbc::DataType::BIT, // sdbc-type
1, // Precision
"", // Literal prefix
"", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
true, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -67,14 +67,14 @@ TypeInfoDef const mysqlc_types[] = {
// --------- MySQL-Type: TINYINT SDBC-Type: TINYINT ----------
{
"TINYINT", // Typename
- com::sun::star::sdbc::DataType::TINYINT, // sdbc-type
+ css::sdbc::DataType::TINYINT, // sdbc-type
3, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M)] [UNSIGNED] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
true, // unsignable
false, // fixed_prec_scale
true, // auto_increment
@@ -86,14 +86,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: BIGINT SDBC-Type: BIGINT ----------
{
"BIGINT", // Typename
- com::sun::star::sdbc::DataType::BIGINT, // sdbc-type
+ css::sdbc::DataType::BIGINT, // sdbc-type
19, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M)] [UNSIGNED] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
true, // unsignable
false, // fixed_prec_scale
true, // auto_increment
@@ -105,14 +105,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: LONG VARBINARY SDBC-Type: LONGVARBINARY
----------
{
"LONG VARBINARY", // Typename
- com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type
+ css::sdbc::DataType::LONGVARBINARY, // sdbc-type
16777215, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
true, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -124,14 +124,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: MEDIUMBLOB SDBC-Type: LONGVARBINARY ----------
{
"MEDIUMBLOB", // Typename
- com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type
+ css::sdbc::DataType::LONGVARBINARY, // sdbc-type
16777215, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
true, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -143,14 +143,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: LONGBLOB SDBC-Type: LONGVARBINARY ----------
{
"LONGBLOB", // Typename
- com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type
+ css::sdbc::DataType::LONGVARBINARY, // sdbc-type
-1, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
true, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -162,14 +162,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: BLOB SDBC-Type: LONGVARBINARY ----------
{
"BLOB", // Typename
- com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type
+ css::sdbc::DataType::LONGVARBINARY, // sdbc-type
0xFFFF, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
true, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -181,14 +181,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: TINYBLOB SDBC-Type: LONGVARBINARY ----------
{
"TINYBLOB", // Typename
- com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type
+ css::sdbc::DataType::LONGVARBINARY, // sdbc-type
0xFF, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
true, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -200,14 +200,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: VARBINARY SDBC-Type: VARBINARY ----------
{
"VARBINARY", // Typename
- com::sun::star::sdbc::DataType::VARBINARY, // sdbc-type
+ css::sdbc::DataType::VARBINARY, // sdbc-type
0xFF, // Precision
"'", // Literal prefix
"'", // Literal suffix
"(M)", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
true, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -219,14 +219,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: BINARY SDBC-Type: BINARY ----------
{
"BINARY", // Typename
- com::sun::star::sdbc::DataType::BINARY, // sdbc-type
+ css::sdbc::DataType::BINARY, // sdbc-type
0xFF, // Precision
"'", // Literal prefix
"'", // Literal suffix
"(M)", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
true, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -238,14 +238,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: LONG VARCHAR SDBC-Type: LONG VARCHAR ----------
{
"LONG VARCHAR", // Typename
- com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type
+ css::sdbc::DataType::LONGVARCHAR, // sdbc-type
0xFFFFFF, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -257,14 +257,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: MEDIUMTEXT SDBC-Type: LONG VARCHAR ----------
{
"MEDIUMTEXT", // Typename
- com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type
+ css::sdbc::DataType::LONGVARCHAR, // sdbc-type
0xFFFFFF, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -276,14 +276,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: LONGTEXT SDBC-Type: LONG VARCHAR ----------
{
"LONGTEXT", // Typename
- com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type
+ css::sdbc::DataType::LONGVARCHAR, // sdbc-type
0xFFFFFF, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -295,14 +295,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: TEXT SDBC-Type: LONG VARCHAR ----------
{
"TEXT", // Typename
- com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type
+ css::sdbc::DataType::LONGVARCHAR, // sdbc-type
0xFFFF, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -314,14 +314,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: TINYTEXT SDBC-Type: LONG VARCHAR ----------
{
"TINYTEXT", // Typename
- com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type
+ css::sdbc::DataType::LONGVARCHAR, // sdbc-type
0xFF, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -333,14 +333,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: CHAR SDBC-Type: CHAR ----------
{
"CHAR", // Typename
- com::sun::star::sdbc::DataType::CHAR, // sdbc-type
+ css::sdbc::DataType::CHAR, // sdbc-type
0xFF, // Precision
"'", // Literal prefix
"'", // Literal suffix
"(M)", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -352,14 +352,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: DECIMAL SDBC-Type: DECIMAL ----------
{
"DECIMAL", // Typename
- com::sun::star::sdbc::DataType::DECIMAL, // sdbc-type
+ css::sdbc::DataType::DECIMAL, // sdbc-type
17, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M[,D])] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
true, // auto_increment
@@ -371,14 +371,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: NUMERIC SDBC-Type: NUMERIC ----------
{
"NUMERIC", // Typename
- com::sun::star::sdbc::DataType::NUMERIC, // sdbc-type
+ css::sdbc::DataType::NUMERIC, // sdbc-type
17, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M[,D])] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
true, // auto_increment
@@ -390,14 +390,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: INTEGER SDBC-Type: INTEGER ----------
{
"INTEGER", // Typename
- com::sun::star::sdbc::DataType::INTEGER, // sdbc-type
+ css::sdbc::DataType::INTEGER, // sdbc-type
10, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M)] [UNSIGNED] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
true, // unsignable
false, // fixed_prec_scale
true, // auto_increment
@@ -409,14 +409,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: INT SDBC-Type: INTEGER ----------
{
"INT", // Typename
- com::sun::star::sdbc::DataType::INTEGER, // sdbc-type
+ css::sdbc::DataType::INTEGER, // sdbc-type
10, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M)] [UNSIGNED] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
true, // unsignable
false, // fixed_prec_scale
true, // auto_increment
@@ -428,14 +428,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: MEDIUMINT SDBC-Type: INTEGER ----------
{
"MEDIUMINT", // Typename
- com::sun::star::sdbc::DataType::INTEGER, // sdbc-type
+ css::sdbc::DataType::INTEGER, // sdbc-type
7, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M)] [UNSIGNED] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
true, // unsignable
false, // fixed_prec_scale
true, // auto_increment
@@ -447,14 +447,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: SMALLINT SDBC-Type: INTEGER ----------
{
"SMALLINT", // Typename
- com::sun::star::sdbc::DataType::SMALLINT, // sdbc-type
+ css::sdbc::DataType::SMALLINT, // sdbc-type
5, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M)] [UNSIGNED] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
true, // unsignable
false, // fixed_prec_scale
true, // auto_increment
@@ -466,14 +466,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: FLOAT SDBC-Type: REAL ----------
{
"FLOAT", // Typename
- com::sun::star::sdbc::DataType::REAL, // sdbc-type
+ css::sdbc::DataType::REAL, // sdbc-type
10, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M,D)] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
true, // auto_increment
@@ -485,14 +485,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: DOUBLE SDBC-Type: DOUBLE ----------
{
"DOUBLE", // Typename
- com::sun::star::sdbc::DataType::DOUBLE, // sdbc-type
+ css::sdbc::DataType::DOUBLE, // sdbc-type
17, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M,D)] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
true, // auto_increment
@@ -504,14 +504,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: DOUBLE PRECISION SDBC-Type: DOUBLE ----------
{
"DOUBLE PRECISION", // Typename
- com::sun::star::sdbc::DataType::DOUBLE, // sdbc-type
+ css::sdbc::DataType::DOUBLE, // sdbc-type
17, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M,D)] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
true, // auto_increment
@@ -523,14 +523,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: REAL SDBC-Type: DOUBLE ----------
{
"REAL", // Typename
- com::sun::star::sdbc::DataType::DOUBLE, // sdbc-type
+ css::sdbc::DataType::DOUBLE, // sdbc-type
17, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M,D)] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
true, // auto_increment
@@ -542,14 +542,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: VARCHAR SDBC-Type: VARCHAR ----------
{
"VARCHAR", // Typename
- com::sun::star::sdbc::DataType::VARCHAR, // sdbc-type
+ css::sdbc::DataType::VARCHAR, // sdbc-type
255, // Precision
"'", // Literal prefix
"'", // Literal suffix
"(M)", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -561,14 +561,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: ENUM SDBC-Type: VARCHAR ----------
{
"ENUM", // Typename
- com::sun::star::sdbc::DataType::VARCHAR, // sdbc-type
+ css::sdbc::DataType::VARCHAR, // sdbc-type
0xFFFF, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -580,14 +580,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: SET SDBC-Type: VARCHAR ----------
{
"SET", // Typename
- com::sun::star::sdbc::DataType::VARCHAR, // sdbc-type
+ css::sdbc::DataType::VARCHAR, // sdbc-type
64, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -599,14 +599,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: DATE SDBC-Type: DATE ----------
{
"DATE", // Typename
- com::sun::star::sdbc::DataType::DATE, // sdbc-type
+ css::sdbc::DataType::DATE, // sdbc-type
0, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -618,14 +618,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: TIME SDBC-Type: TIME ----------
{
"TIME", // Typename
- com::sun::star::sdbc::DataType::TIME, // sdbc-type
+ css::sdbc::DataType::TIME, // sdbc-type
0, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -637,14 +637,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: DATETIME SDBC-Type: TIMESTAMP ----------
{
"DATETIME", // Typename
- com::sun::star::sdbc::DataType::TIMESTAMP, // sdbc-type
+ css::sdbc::DataType::TIMESTAMP, // sdbc-type
0, // Precision
"'", // Literal prefix
"'", // Literal suffix
"", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -656,14 +656,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: TIMESTAMP SDBC-Type: TIMESTAMP ----------
{
"TIMESTAMP", // Typename
- com::sun::star::sdbc::DataType::TIMESTAMP, // sdbc-type
+ css::sdbc::DataType::TIMESTAMP, // sdbc-type
0, // Precision
"'", // Literal prefix
"'", // Literal suffix
"[(M)]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
false, // unsignable
false, // fixed_prec_scale
false, // auto_increment
@@ -677,14 +677,14 @@ TypeInfoDef const mysqlc_types[] = {
// ----------- MySQL-Type: YEAR SDBC-Type: INTEGER ----------
{
"YEAR", // Typename
- com::sun::star::sdbc::DataType::SMALLINT, // sdbc-type
+ css::sdbc::DataType::SMALLINT, // sdbc-type
10, // Precision
"", // Literal prefix
"", // Literal suffix
"[(M)] [UNSIGNED] [ZEROFILL]", // Create params
- com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable
+ css::sdbc::ColumnValue::NULLABLE, // nullable
false, // case sensitive
- com::sun::star::sdbc::ColumnSearch::FULL, // searchable
+ css::sdbc::ColumnSearch::FULL, // searchable
true, // unsignable
false, // fixed_prec_scale
true, // auto_increment
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index f04815570cf2..7bde0055bcfc 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -43,10 +43,10 @@
#include <o3tl/string_view.hxx>
#include <com/sun/star/frame/theUICommandDescription.hpp>
-namespace uno = com::sun::star::uno;
-namespace frame = com::sun::star::frame;
-namespace container = com::sun::star::container;
-namespace beans = com::sun::star::beans;
+namespace uno = css::uno;
+namespace frame = css::frame;
+namespace container = css::container;
+namespace beans = css::beans;
static bool isCategoryAvailable(std::u16string_view sClassId,
std::u16string_view sUIItemId,
std::u16string_view sActiveCategory, bool&
isCategory)
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index feae0442ef90..9b79a931163f 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -94,12 +94,12 @@
#include <comphelper/processfactory.hxx>
#include <config_features.h>
-namespace uno = com::sun::star::uno;
-namespace frame = com::sun::star::frame;
-namespace lang = com::sun::star::lang;
-namespace container = com::sun::star::container;
-namespace beans = com::sun::star::beans;
-namespace graphic = com::sun::star::graphic;
+namespace uno = css::uno;
+namespace frame = css::frame;
+namespace lang = css::lang;
+namespace container = css::container;
+namespace beans = css::beans;
+namespace graphic = css::graphic;
#if OSL_DEBUG_LEVEL > 1
diff --git a/cui/source/inc/CommandCategoryListBox.hxx
b/cui/source/inc/CommandCategoryListBox.hxx
index c4882ae1745d..e1de4de2e371 100644
--- a/cui/source/inc/CommandCategoryListBox.hxx
+++ b/cui/source/inc/CommandCategoryListBox.hxx
@@ -69,12 +69,11 @@ public:
void SetStylesInfo(SfxStylesInfo_Impl* pStyles);
// Adds children of the given macro group to the functions list
- void
- addChildren(const weld::TreeIter* parentEntry,
- const
css::uno::Reference<com::sun::star::script::browse::XBrowseNode>& parentNode,
- CuiConfigFunctionListBox* pFunctionListBox, const OUString&
filterTerm,
- SaveInData* pCurrentSaveInData,
- std::vector<std::unique_ptr<weld::TreeIter>>& rNodesToExpand);
+ void addChildren(const weld::TreeIter* parentEntry,
+ const
css::uno::Reference<css::script::browse::XBrowseNode>& parentNode,
+ CuiConfigFunctionListBox* pFunctionListBox, const
OUString& filterTerm,
+ SaveInData* pCurrentSaveInData,
+ std::vector<std::unique_ptr<weld::TreeIter>>&
rNodesToExpand);
void set_visible(bool bVisible) { m_xControl->set_visible(bVisible); }
};
diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx
index 8978f4a7ef17..cbb082c8db49 100644
--- a/dbaccess/qa/unit/dbtest_base.cxx
+++ b/dbaccess/qa/unit/dbtest_base.cxx
@@ -73,7 +73,7 @@ void DBTestBase::createDBDocument(const OUString& rDriverURL)
uno::Reference< XOfficeDatabaseDocument > xDocument(
m_xSFactory->createInstance(u"com.sun.star.sdb.OfficeDatabaseDocument"_ustr),
UNO_QUERY_THROW);
- uno::Reference< com::sun::star::frame::XStorable > xStorable(xDocument,
UNO_QUERY_THROW);
+ uno::Reference< css::frame::XStorable > xStorable(xDocument,
UNO_QUERY_THROW);
uno::Reference< XDataSource > xDataSource = xDocument->getDataSource();
uno::Reference< XPropertySet > xPropertySet(xDataSource, UNO_QUERY_THROW);
diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx
index cf8296cc3a34..24189e9a494d 100644
--- a/dbaccess/qa/unit/tdf119625.cxx
+++ b/dbaccess/qa/unit/tdf119625.cxx
@@ -101,7 +101,7 @@ void Tdf119625Test::testTime()
CPPUNIT_ASSERT(xRes->next());
CPPUNIT_ASSERT_EQUAL(xRow->getShort(1), e.id);
auto time_got = xRow->getTime(4);
- auto time_expected = com::sun::star::util::Time(0, e.s, e.m, e.h,
false);
+ auto time_expected = css::util::Time(0, e.s, e.m, e.h, false);
auto equal_times = time_got == time_expected;
CPPUNIT_ASSERT(equal_times);
}
diff --git a/dbaccess/source/ui/dlg/directsql.cxx
b/dbaccess/source/ui/dlg/directsql.cxx
index 1b2be95019be..bf80d7203562 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -239,7 +239,7 @@ namespace dbaui
if (m_xDirectSQL->get_active())
{
- Reference< com::sun::star::beans::XPropertySet >
xStatementProps(xStatement, UNO_QUERY_THROW);
+ Reference< css::beans::XPropertySet >
xStatementProps(xStatement, UNO_QUERY_THROW);
try
{
xStatementProps->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, Any(false));
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 25169b4e01a6..169d7e5b64d4 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -281,7 +281,7 @@ namespace desktop {
/// Helper function to convert JSON to a vector of PropertyValues.
/// Public to be unit-test-able.
- DESKTOP_DLLPUBLIC std::vector<com::sun::star::beans::PropertyValue>
jsonToPropertyValuesVector(const char* pJSON);
+ DESKTOP_DLLPUBLIC std::vector<css::beans::PropertyValue>
jsonToPropertyValuesVector(const char* pJSON);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index fa36de31ff73..31a72a0a5dfe 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -998,7 +998,7 @@ void DesktopLOKTest::testWriterComments()
{
LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback,
this);
- uno::Reference<awt::XReschedule> xToolkit =
com::sun::star::awt::Toolkit::create(comphelper::getProcessComponentContext());
+ uno::Reference<awt::XReschedule> xToolkit =
css::awt::Toolkit::create(comphelper::getProcessComponentContext());
// Insert a comment at the beginning of the document and wait till the main
// loop grabs the focus, so characters end up in the annotation window.
@@ -1024,7 +1024,7 @@ void DesktopLOKTest::testWriterComments()
pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'e', 0);
pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 's', 0);
pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 't', 0);
- pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0,
com::sun::star::awt::Key::ESCAPE);
+ pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0,
css::awt::Key::ESCAPE);
Scheduler::ProcessEventsToIdle();
// Test that the typed characters ended up in the right window.
@@ -2987,7 +2987,7 @@ void DesktopLOKTest::testTextSelectionHandles()
// deselect & check
m_aTextSelectionStart = ""_ostr;
m_aTextSelectionEnd = ""_ostr;
- pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0,
com::sun::star::awt::Key::ESCAPE);
+ pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0,
css::awt::Key::ESCAPE);
Scheduler::ProcessEventsToIdle();
pText = pDocument->pClass->getTextSelection(pDocument,
"text/plain;charset=utf-8", nullptr);
CPPUNIT_ASSERT_EQUAL(static_cast<char *>(nullptr), pText);
@@ -3140,7 +3140,7 @@ void DesktopLOKTest::testSpellcheckerMultiView()
pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'a', 0);
pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'a', 0);
pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'a', 0);
- pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0,
com::sun::star::awt::Key::ESCAPE);
+ pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0,
css::awt::Key::ESCAPE);
// Start spellchecking.
pDocument->pClass->postUnoCommand(pDocument, ".uno:SpellDialog", nullptr,
false);
@@ -3308,7 +3308,7 @@ void DesktopLOKTest::testJumpCursor()
pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'v', 0);
pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'i', 0);
pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'a', 0);
- pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0,
com::sun::star::awt::Key::ESCAPE);
+ pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0,
css::awt::Key::ESCAPE);
Scheduler::ProcessEventsToIdle();
// There is a cursor jump to (0, 0) due to
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c38fd40944ee..ec7d7f30a0c8 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1264,7 +1264,7 @@ private:
if (xJavaComponentLoader.is())
{
- const css::uno::Reference<
::com::sun::star::registry::XRegistryKey > xRegistryKey;
+ const css::uno::Reference< css::registry::XRegistryKey >
xRegistryKey;
try
{
xJavaComponentLoader->activate(u""_ustr, u""_ustr, u""_ustr,
xRegistryKey);
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx
b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index 4a0a88f42432..1252cf94e29a 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -28,12 +28,12 @@
#include "dp_commandenvironments.hxx"
#include <osl/diagnose.h>
-namespace deployment = com::sun::star::deployment;
-namespace task = com::sun::star::task;
-namespace ucb = com::sun::star::ucb;
-namespace uno = com::sun::star::uno;
+namespace deployment = css::deployment;
+namespace task = css::task;
+namespace ucb = css::ucb;
+namespace uno = css::uno;
-using ::com::sun::star::uno::Reference;
+using css::uno::Reference;
namespace dp_manager {
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 61fa44517be9..b6db9d10c483 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -55,14 +55,14 @@
#include <set>
#include <string_view>
-namespace lang = com::sun::star::lang;
-namespace task = com::sun::star::task;
-namespace ucb = com::sun::star::ucb;
-namespace uno = com::sun::star::uno;
-namespace beans = com::sun::star::beans;
-namespace util = com::sun::star::util;
-
-using ::com::sun::star::uno::Reference;
+namespace lang = css::lang;
+namespace task = css::task;
+namespace ucb = css::ucb;
+namespace uno = css::uno;
+namespace beans = css::beans;
+namespace util = css::util;
+
+using css::uno::Reference;
namespace {
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx
b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 14208c3b27a3..5ce8e60b52e0 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -45,13 +45,13 @@
#include <dp_version.hxx>
#include <dp_update.hxx>
-namespace beans = com::sun::star::beans ;
-namespace deployment = com::sun::star::deployment ;
-namespace lang = com::sun::star::lang ;
-namespace task = com::sun::star::task ;
-namespace css_ucb = com::sun::star::ucb ;
-namespace uno = com::sun::star::uno ;
-namespace xml = com::sun::star::xml ;
+namespace beans = css::beans ;
+namespace deployment = css::deployment ;
+namespace lang = css::lang ;
+namespace task = css::task ;
+namespace css_ucb = css::ucb ;
+namespace uno = css::uno ;
+namespace xml = css::xml ;
namespace dp_info {
diff --git a/desktop/source/deployment/manager/dp_properties.cxx
b/desktop/source/deployment/manager/dp_properties.cxx
index e356c9393bb5..ab170d52d75e 100644
--- a/desktop/source/deployment/manager/dp_properties.cxx
+++ b/desktop/source/deployment/manager/dp_properties.cxx
@@ -26,12 +26,12 @@
#include <dp_ucb.h>
#include "dp_properties.hxx"
-namespace lang = com::sun::star::lang;
-namespace ucb = com::sun::star::ucb;
-namespace uno = com::sun::star::uno;
+namespace lang = css::lang;
+namespace ucb = css::ucb;
+namespace uno = css::uno;
-using ::com::sun::star::uno::Reference;
+using css::uno::Reference;
constexpr OUString PROP_SUPPRESS_LICENSE = u"SUPPRESS_LICENSE"_ustr;
constexpr OUStringLiteral PROP_EXTENSION_UPDATE = u"EXTENSION_UPDATE";
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a0f73fd49f8a..f17f1484b63d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7778,7 +7778,7 @@ static void lo_status_indicator_callback(void *data,
comphelper::LibreOfficeKit:
/// Used by preloadData (LibreOfficeKit) for providing different shortcuts for
different languages.
static void preLoadShortCutAccelerators()
{
- std::unordered_map<OUString,
css::uno::Reference<com::sun::star::ui::XAcceleratorConfiguration>>&
acceleratorConfs = SfxLokHelper::getAcceleratorConfs();
+ std::unordered_map<OUString,
css::uno::Reference<css::ui::XAcceleratorConfiguration>>& acceleratorConfs =
SfxLokHelper::getAcceleratorConfs();
css::uno::Sequence<OUString>
installedLocales(officecfg::Setup::Office::InstalledLocales::get()->getElementNames());
OUString actualLang = officecfg::Setup::L10N::ooLocale::get();
diff --git a/desktop/source/lib/lokinteractionhandler.hxx
b/desktop/source/lib/lokinteractionhandler.hxx
index c3641db0762f..06aa62b9bcca 100644
--- a/desktop/source/lib/lokinteractionhandler.hxx
+++ b/desktop/source/lib/lokinteractionhandler.hxx
@@ -41,9 +41,9 @@ information easily via callbacks.
TODO: the callbacks are not implemented yet, we just approve any interaction
that we get.
*/
-class LOKInteractionHandler: public
cppu::WeakImplHelper<com::sun::star::lang::XServiceInfo,
-
com::sun::star::lang::XInitialization,
-
com::sun::star::task::XInteractionHandler2>
+class LOKInteractionHandler: public
cppu::WeakImplHelper<css::lang::XServiceInfo,
+
css::lang::XInitialization,
+
css::task::XInteractionHandler2>
{
private:
desktop::LibLibreOffice_Impl * m_pLOKit;
@@ -76,7 +76,7 @@ private:
bool handlePasswordRequest(const
css::uno::Sequence<css::uno::Reference<css::task::XInteractionContinuation>>
&rContinuations, const css::uno::Any& rRequest);
static bool handleMacroConfirmationRequest(const
css::uno::Reference<css::task::XInteractionRequest>& xRequest);
- static bool handleFilterOptionsRequest(const
::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>&
Request);
+ static bool handleFilterOptionsRequest(const
css::uno::Reference<css::task::XInteractionRequest>& Request);
static bool handlePackageReparationRequest(const
css::uno::Reference<css::task::XInteractionRequest>& xRequest);
static bool handleLoadReadOnlyRequest(const
css::uno::Reference<css::task::XInteractionRequest>& xRequest);
@@ -95,13 +95,13 @@ public:
virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName)
override;
- virtual com::sun::star::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
- virtual void SAL_CALL
initialize(com::sun::star::uno::Sequence<com::sun::star::uno::Any > const &
rArguments) override;
+ virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any > const
& rArguments) override;
- virtual void SAL_CALL
handle(com::sun::star::uno::Reference<com::sun::star::task::XInteractionRequest>
const & rRequest) override;
+ virtual void SAL_CALL
handle(css::uno::Reference<css::task::XInteractionRequest> const & rRequest)
override;
- virtual sal_Bool SAL_CALL handleInteractionRequest(const
::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>&
Request) override;
+ virtual sal_Bool SAL_CALL handleInteractionRequest(const
css::uno::Reference<css::task::XInteractionRequest>& Request) override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/update/check/download.cxx
b/extensions/source/update/check/download.cxx
index 7f876ec56d85..17056cc53820 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -35,10 +35,10 @@
#include "download.hxx"
-namespace beans = com::sun::star::beans ;
-namespace container = com::sun::star::container ;
-namespace lang = com::sun::star::lang ;
-namespace uno = com::sun::star::uno ;
+namespace beans = css::beans ;
+namespace container = css::container ;
+namespace lang = css::lang ;
+namespace uno = css::uno ;
namespace {
diff --git a/extensions/source/update/check/updatecheck.cxx
b/extensions/source/update/check/updatecheck.cxx
index 139eabbd2050..41c05ac635fc 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -53,12 +53,12 @@
#include "updateprotocol.hxx"
#include "updatecheckconfig.hxx"
-namespace beans = com::sun::star::beans ;
-namespace deployment = com::sun::star::deployment ;
-namespace lang = com::sun::star::lang ;
-namespace c3s = com::sun::star::system ;
-namespace task = com::sun::star::task ;
-namespace uno = com::sun::star::uno ;
+namespace beans = css::beans ;
+namespace deployment = css::deployment ;
+namespace lang = css::lang ;
+namespace c3s = css::system ;
+namespace task = css::task ;
+namespace uno = css::uno ;
constexpr OUStringLiteral PROPERTY_TITLE = u"BubbleHeading";
constexpr OUStringLiteral PROPERTY_TEXT = u"BubbleText";
diff --git a/extensions/source/update/check/updatecheckconfig.cxx
b/extensions/source/update/check/updatecheckconfig.cxx
index e62ff5fe93c9..718a33539523 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -36,11 +36,11 @@
#include <shlobj.h>
#endif
-namespace container = com::sun::star::container ;
-namespace beans = com::sun::star::beans ;
-namespace lang = com::sun::star::lang ;
-namespace util = com::sun::star::util ;
-namespace uno = com::sun::star::uno ;
+namespace container = css::container ;
+namespace beans = css::beans ;
+namespace lang = css::lang ;
+namespace util = css::util ;
+namespace uno = css::uno ;
#define LAST_CHECK "LastCheck"
#define UPDATE_VERSION "UpdateVersion"
diff --git a/extensions/source/update/check/updatecheckjob.cxx
b/extensions/source/update/check/updatecheckjob.cxx
index 7c34671ed876..b6e56196328e 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -36,11 +36,11 @@
#include <com/sun/star/frame/XTerminateListener.hpp>
#include <com/sun/star/task/XJob.hpp>
-namespace beans = com::sun::star::beans ;
-namespace frame = com::sun::star::frame ;
-namespace lang = com::sun::star::lang ;
-namespace task = com::sun::star::task ;
-namespace uno = com::sun::star::uno ;
+namespace beans = css::beans ;
+namespace frame = css::frame ;
+namespace lang = css::lang ;
+namespace task = css::task ;
+namespace uno = css::uno ;
namespace
{
diff --git a/extensions/source/update/check/updateprotocoltest.cxx
b/extensions/source/update/check/updateprotocoltest.cxx
index 070f930af160..b22b9c8be27a 100644
--- a/extensions/source/update/check/updateprotocoltest.cxx
+++ b/extensions/source/update/check/updateprotocoltest.cxx
@@ -28,8 +28,8 @@
#include <stdio.h>
#include "sal/log.hxx"
-namespace task = ::com::sun::star::task;
-namespace uno = ::com::sun::star::uno;
+namespace task = css::task;
+namespace uno = css::uno;
SAL_IMPLEMENT_MAIN()
diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx
b/extensions/source/update/feed/test/updatefeedtest.cxx
index 119aab24a3d1..4c3b8017414b 100644
--- a/extensions/source/update/feed/test/updatefeedtest.cxx
+++ b/extensions/source/update/feed/test/updatefeedtest.cxx
@@ -31,10 +31,10 @@
#include <sal/log.hxx>
#include <stdio.h>
-namespace deployment = ::com::sun::star::deployment;
-namespace lang = ::com::sun::star::lang;
-namespace uno = ::com::sun::star::uno;
-namespace xml = ::com::sun::star::xml;
+namespace deployment = css::deployment;
+namespace lang = css::lang;
+namespace uno = css::uno;
+namespace xml = css::xml;
SAL_IMPLEMENT_MAIN()
diff --git a/extensions/source/update/feed/updatefeed.cxx
b/extensions/source/update/feed/updatefeed.cxx
index 241a74d385f4..f1d77008f7e4 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -56,15 +56,15 @@
#include <utility>
#include <vcl/svapp.hxx>
-namespace beans = com::sun::star::beans ;
-namespace container = com::sun::star::container ;
-namespace deployment = com::sun::star::deployment ;
-namespace io = com::sun::star::io ;
-namespace lang = com::sun::star::lang ;
-namespace task = com::sun::star::task ;
-namespace ucb = com::sun::star::ucb ;
-namespace uno = com::sun::star::uno ;
-namespace xml = com::sun::star::xml ;
+namespace beans = css::beans ;
+namespace container = css::container ;
+namespace deployment = css::deployment ;
+namespace io = css::io ;
+namespace lang = css::lang ;
+namespace task = css::task ;
+namespace ucb = css::ucb ;
+namespace uno = css::uno ;
+namespace xml = css::xml ;
namespace
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index d39fc7c2ddda..9e93a6f84df6 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
-e
... etc. - the rest is truncated
