strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

com::sun::star -> css

Browse source 
Change-Id: I890ec73e30d3cc6b210903ecee29431f3cb5f635
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175979
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2024-11-04 11:26:07 +05:00
parent 7713d916e0
commit 1180b3473a
158 changed files with 626 additions and 649 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
accessibility/source/extended/AccessibleBrowseBoxBase.cxx
View file

@ -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);

2
accessibility/source/standard/vclxaccessiblelist.cxx
View file

@ -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

4
basegfx/source/matrix/b3dhommatrixtools.cxx
View file

@ -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);

6
binaryurp/source/binaryany.hxx
View file

@ -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:

2
binaryurp/source/bridge.cxx
View file

@ -165,7 +165,7 @@ void PopOutgoingRequest::clear() {
}
struct Bridge::SubStub {
com::sun::star::uno::UnoInterfaceReference object;
css::uno::UnoInterfaceReference object;
sal_uInt32 references;
};

70
binaryurp/source/bridge.hxx
View file

@ -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

26
binaryurp/source/bridgefactory.hxx
View file

@ -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_;

4
binaryurp/source/currentcontext.hxx
View file

@ -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: */

16
binaryurp/source/incomingrequest.hxx
View file

@ -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_;

8
binaryurp/source/marshal.hxx
View file

@ -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_;

4
binaryurp/source/outgoingrequest.hxx
View file

@ -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;

8
binaryurp/source/proxy.hxx
View file

@ -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_;
};

2
binaryurp/source/reader.hxx
View file

@ -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_;

2
binaryurp/source/readerstate.hxx
View file

@ -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];
};

12
binaryurp/source/unmarshal.hxx
View file

@ -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_;
};

4
binaryurp/source/writer.cxx
View file

@ -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)
{

36
binaryurp/source/writer.hxx
View file

@ -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_;

2
binaryurp/source/writerstate.hxx
View file

@ -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;

4
bridges/inc/cppinterfaceproxy.hxx
View file

@ -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;

8
bridges/inc/unointerfaceproxy.hxx
View file

@ -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;

6
bridges/source/cpp_uno/shared/bridge.cxx
View file

@ -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 );

8
bridges/source/cpp_uno/shared/component.cxx
View file

@ -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 )

6
bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
View file

@ -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);
}

4
bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
View file

@ -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_ )

8
bridges/source/jni_uno/jni_uno2java.cxx
View file

@ -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

2
canvas/source/opengl/ogl_canvastools.hxx
View file

@ -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 );
}

4
chart2/inc/ChartModel.hxx
View file

@ -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 );

4
chart2/qa/extras/chart2import2.cxx
View file

@ -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;

2
chart2/source/controller/main/ChartController.cxx
View file

@ -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;

2
chart2/source/controller/main/ControllerCommandDispatch.cxx
View file

@ -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();
}
}

4
chart2/source/inc/ModifyListenerCallBack.hxx
View file

@ -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

4
chart2/source/tools/ModifyListenerCallBack.cxx
View file

@ -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 );
}

4
chart2/source/view/main/ChartView.cxx
View file

@ -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() )

2
chart2/source/view/main/VDataSeries.cxx
View file

@ -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
}

12
comphelper/qa/unit/variadictemplates.cxx
View file

@ -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 );
}

2
comphelper/source/misc/types.cxx
View file

@ -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;
}

2
connectivity/source/drivers/firebird/Tables.hxx
View file

@ -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;

210
connectivity/source/drivers/mysqlc/mysqlc_types.cxx
View file

@ -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

8
cui/source/customize/SvxNotebookbarConfigPage.cxx
View file

@ -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)

12
cui/source/customize/cfg.cxx
View file

@ -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

11
cui/source/inc/CommandCategoryListBox.hxx
View file

@ -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); }
};

2
dbaccess/qa/unit/dbtest_base.cxx
View file

@ -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);

2
dbaccess/qa/unit/tdf119625.cxx
View file

@ -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);
}

2
dbaccess/source/ui/dlg/directsql.cxx
View file

@ -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));

2
desktop/inc/lib/init.hxx
View file

@ -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: */

10
desktop/qa/desktop_lib/test_desktop_lib.cxx
View file

@ -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

2
desktop/source/app/app.cxx
View file

@ -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);

10
desktop/source/deployment/manager/dp_commandenvironments.cxx
View file

@ -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 {

14
desktop/source/deployment/manager/dp_extensionmanager.cxx
View file

@ -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;
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 ::com::sun::star::uno::Reference;
using css::uno::Reference;
namespace {

14
desktop/source/deployment/manager/dp_informationprovider.cxx
View file

@ -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 {

8
desktop/source/deployment/manager/dp_properties.cxx
View file

@ -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";

2
desktop/source/lib/init.cxx
View file

@ -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();

16
desktop/source/lib/lokinteractionhandler.hxx
View file

@ -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: */

8
extensions/source/update/check/download.cxx
View file

@ -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 {

12
extensions/source/update/check/updatecheck.cxx
View file

@ -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";

10
extensions/source/update/check/updatecheckconfig.cxx
View file

@ -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"

10
extensions/source/update/check/updatecheckjob.cxx
View file

@ -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
{

4
extensions/source/update/check/updateprotocoltest.cxx
View file

@ -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()

8
extensions/source/update/feed/test/updatefeedtest.cxx
View file

@ -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()

18
extensions/source/update/feed/updatefeed.cxx
View file

@ -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

4
filter/source/msfilter/msdffimp.cxx
View file

@ -4625,12 +4625,12 @@ rtl::Reference<SdrObject> SvxMSDffManager::ImportShape( const DffRecordHeader& r
if (seqAdjustmentValues[0].State == css::beans::PropertyState_DEFAULT_VALUE)
{
pseqAdjustmentValues[0].Value <<= -90.0;
pseqAdjustmentValues[0].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
pseqAdjustmentValues[0].State = css::beans::PropertyState_DIRECT_VALUE;
}
if (seqAdjustmentValues[1].State == css::beans::PropertyState_DEFAULT_VALUE)
{
pseqAdjustmentValues[1].Value <<= 0.0;
pseqAdjustmentValues[1].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
pseqAdjustmentValues[1].State = css::beans::PropertyState_DIRECT_VALUE;
}
seqAdjustmentValues[0].Value >>= fStartAngle;
seqAdjustmentValues[1].Value >>= fEndAngle;

2
forms/source/component/Time.cxx
View file

@ -245,7 +245,7 @@ bool OTimeModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
{
util::DateTime aDateTime = m_xColumn->getTimestamp();
if (aDateTime.Year == 0 && aDateTime.Month == 0 && aDateTime.Day == 0)
aDateTime = ::com::sun::star::util::DateTime(0,0,0,0,30,12,1899, false);
aDateTime = css::util::DateTime(0,0,0,0,30,12,1899, false);
aDateTime.NanoSeconds = aTime.NanoSeconds;
aDateTime.Seconds = aTime.Seconds;
aDateTime.Minutes = aTime.Minutes;

4
forms/source/xforms/convert.cxx
View file

@ -134,7 +134,7 @@ namespace
// all okay?
if ( !bWellformed )
throw com::sun::star::lang::IllegalArgumentException();
throw css::lang::IllegalArgumentException();
return aDate;
}
@ -204,7 +204,7 @@ namespace
// all okay?
if ( !bWellformed )
throw com::sun::star::lang::IllegalArgumentException();
throw css::lang::IllegalArgumentException();
return aTime;
}

6
forms/source/xforms/datatypes.cxx
View file

@ -859,7 +859,7 @@ namespace xforms
{
aTypeValue = Convert::get().toAny( value, getCppuType() );
}
catch (com::sun::star::lang::IllegalArgumentException)
catch (css::lang::IllegalArgumentException)
{
return false;
}
@ -916,7 +916,7 @@ namespace xforms
{
aTypedValue = Convert::get().toAny( value, getCppuType() );
}
catch (com::sun::star::lang::IllegalArgumentException)
catch (css::lang::IllegalArgumentException)
{
return false;
}
@ -996,7 +996,7 @@ namespace xforms
{
aTypedValue = Convert::get().toAny( value, getCppuType() );
}
catch (com::sun::star::uno::RuntimeException)
catch (css::uno::RuntimeException)
{
return false;
}

4
framework/source/uielement/subtoolbarcontroller.cxx
View file

@ -51,7 +51,7 @@ class SubToolBarController : public ToolBarBase
css::uno::Reference< css::ui::XUIElement > m_xUIElement;
void disposeUIElement();
public:
explicit SubToolBarController( const rtl::Reference< com::sun::star::uno::XComponentContext >& rxContext,
explicit SubToolBarController( const rtl::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Sequence< css::uno::Any >& rxArgs );
virtual ~SubToolBarController() override;
@ -100,7 +100,7 @@ public:
}
SubToolBarController::SubToolBarController(
const rtl::Reference< com::sun::star::uno::XComponentContext >& rxContext,
const rtl::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Sequence< css::uno::Any >& rxArgs
) : ToolBarBase(
rxContext,

2
i18npool/source/localedata/LocaleNode.cxx
View file

@ -41,7 +41,7 @@
typedef ::o3tl::sorted_vector< OUString > NameSet;
typedef ::o3tl::sorted_vector< sal_Int16 > ValueSet;
namespace cssi = ::com::sun::star::i18n;
namespace cssi = css::i18n;
LocaleNode::LocaleNode (OUString name, const Reference< XAttributeList > & attr)
: aName(std::move(name))

7
include/basegfx/matrix/b3dhommatrixtools.hxx
View file

@ -33,11 +33,10 @@ namespace basegfx::utils
B3DHomMatrix. drawing::HomogenMatrix4 is not used by OOo
*/
BASEGFX_DLLPUBLIC B3DHomMatrix
UnoHomogenMatrixToB3DHomMatrix(const com::sun::star::drawing::HomogenMatrix& rMatrixIn);
UnoHomogenMatrixToB3DHomMatrix(const css::drawing::HomogenMatrix& rMatrixIn);
BASEGFX_DLLPUBLIC void
B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& rMatrixIn,
com::sun::star::drawing::HomogenMatrix& rMatrixOut);
BASEGFX_DLLPUBLIC void B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& rMatrixIn,
css::drawing::HomogenMatrix& rMatrixOut);
} // end of namespace basegfx::tools

2
include/oox/ppt/presentationfragmenthandler.hxx
View file

@ -53,7 +53,7 @@ private:
const oox::ppt::SlidePersistPtr& rPersist );
void importSlide(sal_uInt32 nSlide, bool bFirstSlide, bool bImportNotes);
void importMasterSlides();
void importMasterSlide(const ::com::sun::star::uno::Reference<::com::sun::star::frame::XModel>& xModel,
void importMasterSlide(const css::uno::Reference<css::frame::XModel>& xModel,
::oox::ppt::PowerPointImport& rFilter,
const OUString& rMasterFragmentPath);
void saveThemeToGrabBag(const oox::drawingml::ThemePtr& pThemePtr, sal_Int32 nThemeIdx);

2
include/sfx2/lokhelper.hxx
View file

@ -87,7 +87,7 @@ class SFX2_DLLPUBLIC SfxLokHelper
{
public:
/// Gets the short cut accelerators.
static std::unordered_map<OUString, css::uno::Reference<com::sun::star::ui::XAcceleratorConfiguration>>& getAcceleratorConfs();
static std::unordered_map<OUString, css::uno::Reference<css::ui::XAcceleratorConfiguration>>& getAcceleratorConfs();
/// Create a new view shell from the current view frame.
/// This assumes a single document is ever loaded.
static int createView();

4
include/svx/fmdmod.hxx
View file

@ -29,9 +29,9 @@ public:
virtual ~SvxFmMSFactory() {}
virtual ::com::sun::star::uno::Reference<::com::sun::star::uno::XInterface>
virtual css::uno::Reference<css::uno::XInterface>
SAL_CALL createInstance(const OUString& ServiceSpecifier) override;
virtual ::com::sun::star::uno::Sequence<OUString> SAL_CALL getAvailableServiceNames() override;
virtual css::uno::Sequence<OUString> SAL_CALL getAvailableServiceNames() override;
};
#endif // INCLUDED_SVX_FMDMOD_HXX

2
include/test/sheet/xsheetcellrangecontainer.hxx
View file

@ -30,7 +30,7 @@ public:
protected:
~XSheetCellRangeContainer() {}
static css::uno::Sequence<com::sun::star::table::CellRangeAddress> createCellRangeAddresses();
static css::uno::Sequence<css::table::CellRangeAddress> createCellRangeAddresses();
};
}

3
include/test/sheet/xsheetconditionalentries.hxx
View file

@ -24,8 +24,7 @@ class OOO_DLLPUBLIC_TEST XSheetConditionalEntries
{
public:
virtual css::uno::Reference<css::uno::XInterface> init() = 0;
virtual css::uno::Sequence<com::sun::star::beans::PropertyValue>
createCondition(const sal_Int32 nr) = 0;
virtual css::uno::Sequence<css::beans::PropertyValue> createCondition(const sal_Int32 nr) = 0;
void testAddNew();
void testClear();

5
include/test/unoapi_test.hxx
View file

@ -75,9 +75,8 @@ protected:
rtl::Reference<TestInteractionHandler> xInteractionHandler;
private:
void
setTestInteractionHandler(const char* pPassword,
std::vector<com::sun::star::beans::PropertyValue>& rFilterOptions);
void setTestInteractionHandler(const char* pPassword,
std::vector<css::beans::PropertyValue>& rFilterOptions);
bool mbSkipValidation;
OUString m_aBaseString;

2
include/unotools/weakref.hxx
View file

@ -46,7 +46,7 @@ namespace unotools
avoid overly tight requirements on when interface_type needs to be complete.)
*/
template <class interface_type>
class SAL_WARN_UNUSED WeakReference : public com::sun::star::uno::WeakReferenceHelper
class SAL_WARN_UNUSED WeakReference : public css::uno::WeakReferenceHelper
{
public:
/** Default ctor. Creates an empty weak reference.

26
libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
View file

@ -252,41 +252,41 @@ gtv_lok_dialog_signal_key(GtkWidget* pDialogDrawingArea, GdkEventKey* pEvent)
switch (pEvent->keyval)
{
case GDK_KEY_BackSpace:
nKeyCode = com::sun::star::awt::Key::BACKSPACE;
nKeyCode = css::awt::Key::BACKSPACE;
break;
case GDK_KEY_Delete:
nKeyCode = com::sun::star::awt::Key::DELETE;
nKeyCode = css::awt::Key::DELETE;
break;
case GDK_KEY_Return:
case GDK_KEY_KP_Enter:
nKeyCode = com::sun::star::awt::Key::RETURN;
nKeyCode = css::awt::Key::RETURN;
break;
case GDK_KEY_Escape:
nKeyCode = com::sun::star::awt::Key::ESCAPE;
nKeyCode = css::awt::Key::ESCAPE;
break;
case GDK_KEY_Tab:
nKeyCode = com::sun::star::awt::Key::TAB;
nKeyCode = css::awt::Key::TAB;
break;
case GDK_KEY_Down:
nKeyCode = com::sun::star::awt::Key::DOWN;
nKeyCode = css::awt::Key::DOWN;
break;
case GDK_KEY_Up:
nKeyCode = com::sun::star::awt::Key::UP;
nKeyCode = css::awt::Key::UP;
break;
case GDK_KEY_Left:
nKeyCode = com::sun::star::awt::Key::LEFT;
nKeyCode = css::awt::Key::LEFT;
break;
case GDK_KEY_Right:
nKeyCode = com::sun::star::awt::Key::RIGHT;
nKeyCode = css::awt::Key::RIGHT;
break;
case GDK_KEY_Page_Down:
nKeyCode = com::sun::star::awt::Key::PAGEDOWN;
nKeyCode = css::awt::Key::PAGEDOWN;
break;
case GDK_KEY_Page_Up:
nKeyCode = com::sun::star::awt::Key::PAGEUP;
nKeyCode = css::awt::Key::PAGEUP;
break;
case GDK_KEY_Insert:
nKeyCode = com::sun::star::awt::Key::INSERT;
nKeyCode = css::awt::Key::INSERT;
break;
case GDK_KEY_Shift_L:
case GDK_KEY_Shift_R:
@ -307,7 +307,7 @@ gtv_lok_dialog_signal_key(GtkWidget* pDialogDrawingArea, GdkEventKey* pEvent)
break;
default:
if (pEvent->keyval >= GDK_KEY_F1 && pEvent->keyval <= GDK_KEY_F26)
nKeyCode = com::sun::star::awt::Key::F1 + (pEvent->keyval - GDK_KEY_F1);
nKeyCode = css::awt::Key::F1 + (pEvent->keyval - GDK_KEY_F1);
else
nCharCode = gdk_keyval_to_unicode(pEvent->keyval);
}

26
libreofficekit/source/gtk/lokdocview.cxx
View file

@ -661,41 +661,41 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)
switch (pEvent->keyval)
{
case GDK_KEY_BackSpace:
nKeyCode = com::sun::star::awt::Key::BACKSPACE;
nKeyCode = css::awt::Key::BACKSPACE;
break;
case GDK_KEY_Delete:
nKeyCode = com::sun::star::awt::Key::DELETE;
nKeyCode = css::awt::Key::DELETE;
break;
case GDK_KEY_Return:
case GDK_KEY_KP_Enter:
nKeyCode = com::sun::star::awt::Key::RETURN;
nKeyCode = css::awt::Key::RETURN;
break;
case GDK_KEY_Escape:
nKeyCode = com::sun::star::awt::Key::ESCAPE;
nKeyCode = css::awt::Key::ESCAPE;
break;
case GDK_KEY_Tab:
nKeyCode = com::sun::star::awt::Key::TAB;
nKeyCode = css::awt::Key::TAB;
break;
case GDK_KEY_Down:
nKeyCode = com::sun::star::awt::Key::DOWN;
nKeyCode = css::awt::Key::DOWN;
break;
case GDK_KEY_Up:
nKeyCode = com::sun::star::awt::Key::UP;
nKeyCode = css::awt::Key::UP;
break;
case GDK_KEY_Left:
nKeyCode = com::sun::star::awt::Key::LEFT;
nKeyCode = css::awt::Key::LEFT;
break;
case GDK_KEY_Right:
nKeyCode = com::sun::star::awt::Key::RIGHT;
nKeyCode = css::awt::Key::RIGHT;
break;
case GDK_KEY_Page_Down:
nKeyCode = com::sun::star::awt::Key::PAGEDOWN;
nKeyCode = css::awt::Key::PAGEDOWN;
break;
case GDK_KEY_Page_Up:
nKeyCode = com::sun::star::awt::Key::PAGEUP;
nKeyCode = css::awt::Key::PAGEUP;
break;
case GDK_KEY_Insert:
nKeyCode = com::sun::star::awt::Key::INSERT;
nKeyCode = css::awt::Key::INSERT;
break;
case GDK_KEY_Shift_L:
case GDK_KEY_Shift_R:
@ -716,7 +716,7 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)
break;
default:
if (pEvent->keyval >= GDK_KEY_F1 && pEvent->keyval <= GDK_KEY_F26)
nKeyCode = com::sun::star::awt::Key::F1 + (pEvent->keyval - GDK_KEY_F1);
nKeyCode = css::awt::Key::F1 + (pEvent->keyval - GDK_KEY_F1);
else
nCharCode = gdk_keyval_to_unicode(pEvent->keyval);
}

4
linguistic/qa/restprotocol.cxx
View file

@ -152,11 +152,11 @@ void TestRestProtocol::testProofreading()
CPPUNIT_ASSERT_EQUAL(u"duden"_ustr, *LanguageToolCfg::RestProtocol::get());
Reference<::com::sun::star::linguistic2::XProofreader> xProofreader(
Reference<css::linguistic2::XProofreader> xProofreader(
m_xSFactory->createInstance(u"com.sun.star.linguistic2.Proofreader"_ustr), UNO_QUERY);
CPPUNIT_ASSERT(xProofreader.is());
com::sun::star::linguistic2::ProofreadingResult aResult
css::linguistic2::ProofreadingResult aResult
= xProofreader->doProofreading(u"id"_ustr, u"ths is a tst"_ustr, aLocale, 0, 0, {});
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aResult.aErrors.getLength());

4
oox/qa/unit/wpc_drawing_canvas.cxx
View file

@ -149,7 +149,7 @@ CPPUNIT_TEST_FIXTURE(TestWPC, WPC_BentConnector)
CPPUNIT_ASSERT(xInfo->supportsService(u"com.sun.star.drawing.ConnectorShape"_ustr));
uno::Reference<beans::XPropertySet> xShapeProps(xGroup->getByIndex(2), uno::UNO_QUERY);
com::sun::star::drawing::ConnectorType eEdgeKind;
css::drawing::ConnectorType eEdgeKind;
xShapeProps->getPropertyValue(UNO_NAME_EDGEKIND) >>= eEdgeKind;
CPPUNIT_ASSERT_EQUAL(drawing::ConnectorType::ConnectorType_STANDARD, eEdgeKind);
@ -324,7 +324,7 @@ CPPUNIT_TEST_FIXTURE(TestWPC, WPC_CurvedConnector2)
CPPUNIT_ASSERT(xInfo->supportsService(u"com.sun.star.drawing.ConnectorShape"_ustr));
uno::Reference<beans::XPropertySet> xShapeProps(xGroup->getByIndex(3), uno::UNO_QUERY);
com::sun::star::drawing::ConnectorType eEdgeKind;
css::drawing::ConnectorType eEdgeKind;
xShapeProps->getPropertyValue(UNO_NAME_EDGEKIND) >>= eEdgeKind;
CPPUNIT_ASSERT_EQUAL(drawing::ConnectorType::ConnectorType_CURVE, eEdgeKind);

6
oox/source/docprop/ooxmldocpropimport.cxx
View file

@ -182,7 +182,7 @@ void SAL_CALL DocumentPropertiesImport::importProperties(
aParser.parseStream( rCustomStream, true );
}
Reference < com::sun::star::io::XInputStream > SAL_CALL DocumentPropertiesImport::getCorePropertiesStream(
Reference < css::io::XInputStream > SAL_CALL DocumentPropertiesImport::getCorePropertiesStream(
const Reference< XStorage >& rxSource)
{
Sequence< InputSource > aCoreStreams = lclGetCoreStreams(rxSource);
@ -192,7 +192,7 @@ Reference < com::sun::star::io::XInputStream > SAL_CALL DocumentPropertiesImport
return aCoreStreams[0].aInputStream;
}
Reference < com::sun::star::io::XInputStream > SAL_CALL DocumentPropertiesImport::getExtendedPropertiesStream(
Reference < css::io::XInputStream > SAL_CALL DocumentPropertiesImport::getExtendedPropertiesStream(
const Reference< XStorage >& rxSource)
{
Sequence< InputSource > aExtStreams = lclGetExtStreams(rxSource);
@ -202,7 +202,7 @@ Reference < com::sun::star::io::XInputStream > SAL_CALL DocumentPropertiesImport
return aExtStreams[0].aInputStream;
}
css::uno::Sequence< css::uno::Reference< com::sun::star::io::XInputStream > > SAL_CALL DocumentPropertiesImport::getCustomPropertiesStreams(
css::uno::Sequence< css::uno::Reference< css::io::XInputStream > > SAL_CALL DocumentPropertiesImport::getCustomPropertiesStreams(
const Reference< XStorage >& rxSource)
{
Sequence <InputSource> aExtStreams = lclGetCustomStreams(rxSource);

6
oox/source/docprop/ooxmldocpropimport.hxx
View file

@ -45,11 +45,11 @@ public:
virtual void SAL_CALL importProperties(
const css::uno::Reference< css::embed::XStorage >& rxSource,
const css::uno::Reference< css::document::XDocumentProperties >& rxDocumentProperties ) override;
virtual css::uno::Reference < com::sun::star::io::XInputStream > SAL_CALL getCorePropertiesStream(
virtual css::uno::Reference < css::io::XInputStream > SAL_CALL getCorePropertiesStream(
const css::uno::Reference< css::embed::XStorage >& rxSource) override;
virtual css::uno::Reference < com::sun::star::io::XInputStream > SAL_CALL getExtendedPropertiesStream(
virtual css::uno::Reference < css::io::XInputStream > SAL_CALL getExtendedPropertiesStream(
const css::uno::Reference< css::embed::XStorage >& rxSource) override;
virtual css::uno::Sequence< css::uno::Reference< com::sun::star::io::XInputStream > > SAL_CALL getCustomPropertiesStreams(
virtual css::uno::Sequence< css::uno::Reference< css::io::XInputStream > > SAL_CALL getCustomPropertiesStreams(
const css::uno::Reference< css::embed::XStorage >& rxSource) override;
private:

4
oox/source/drawingml/chart/axisconverter.cxx
View file

@ -149,8 +149,8 @@ void AxisConverter::convertFromModel(const Reference<XCoordinateSystem>& rxCoord
Reference< XAxis > xAxis;
try
{
namespace cssc = ::com::sun::star::chart;
namespace cssc2 = ::com::sun::star::chart2;
namespace cssc = css::chart;
namespace cssc2 = css::chart2;
const TypeGroupInfo& rTypeInfo = rTypeGroups.front()->getTypeInfo();
ObjectFormatter& rFormatter = getFormatter();

2
oox/source/drawingml/chart/chartspaceconverter.cxx
View file

@ -244,7 +244,7 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
/* Following all conversions needing the old Chart1 API that involves full
initialization of the chart view. */
namespace cssc = ::com::sun::star::chart;
namespace cssc = css::chart;
Reference< cssc::XChartDocument > xChart1Doc( getChartDocument(), UNO_QUERY );
if( xChart1Doc.is() )
{

4
oox/source/drawingml/chart/plotareaconverter.cxx
View file

@ -212,7 +212,7 @@ View3DConverter::~View3DConverter()
void View3DConverter::convertFromModel( const Reference< XDiagram >& rxDiagram, TypeGroupConverter const & rTypeGroup )
{
namespace cssd = ::com::sun::star::drawing;
namespace cssd = css::drawing;
PropertySet aPropSet( rxDiagram );
sal_Int32 nRotationY = 0;
@ -466,7 +466,7 @@ void PlotAreaConverter::convertPositionFromModel()
try
{
namespace cssc = ::com::sun::star::chart;
namespace cssc = css::chart;
Reference< cssc::XChartDocument > xChart1Doc( getChartDocument(), UNO_QUERY_THROW );
Reference< cssc::XDiagramPositioning > xPositioning( xChart1Doc->getDiagram(), UNO_QUERY_THROW );
// for pie charts, always set inner plot area size to exclude the data labels as Excel does

4
oox/source/drawingml/chart/seriesconverter.cxx
View file

@ -170,7 +170,7 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatt
if( !(bDataSeriesLabel || rDataLabel.monLabelPos.has_value()) )
return;
namespace csscd = ::com::sun::star::chart::DataLabelPlacement;
namespace csscd = css::chart::DataLabelPlacement;
sal_Int32 nPlacement = -1;
switch( rDataLabel.monLabelPos.value_or( XML_TOKEN_INVALID ) )
{
@ -534,7 +534,7 @@ void ErrorBarConverter::convertFromModel( const Reference< XDataSeries >& rxData
aBarProp.setProperty( PROP_ShowNegativeError, bShowNeg );
// type of displayed error
namespace cssc = ::com::sun::star::chart;
namespace cssc = css::chart;
switch( mrModel.mnValueType )
{
case XML_cust:

4
oox/source/drawingml/chart/titleconverter.cxx
View file

@ -203,8 +203,8 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram )
try
{
namespace cssc = ::com::sun::star::chart;
namespace cssc2 = ::com::sun::star::chart2;
namespace cssc = css::chart;
namespace cssc2 = css::chart2;
// create the legend
Reference< XLegend > xLegend( createInstance( u"com.sun.star.chart2.Legend"_ustr ), UNO_QUERY_THROW );

10
oox/source/drawingml/chart/typegroupconverter.cxx
View file

@ -69,7 +69,7 @@ const char SERVICE_CHART2_BUBBLE[] = "com.sun.star.chart2.BubbleChartType";
const char SERVICE_CHART2_SURFACE[] = "com.sun.star.chart2.ColumnChartType"; // Todo
const char SERVICE_CHART2_HISTO[] = "com.sun.star.chart2.HistogramChartType";
namespace csscd = ::com::sun::star::chart::DataLabelPlacement;
namespace csscd = css::chart::DataLabelPlacement;
const TypeGroupInfo spTypeInfos[] =
{
@ -491,7 +491,7 @@ void TypeGroupConverter::convertMarker( PropertySet& rPropSet, sal_Int32 nOoxSym
if( isSeriesFrameFormat() )
return;
namespace cssc = ::com::sun::star::chart2;
namespace cssc = css::chart2;
// symbol style
cssc::Symbol aSymbol;
@ -538,7 +538,7 @@ void TypeGroupConverter::convertLineSmooth( PropertySet& rPropSet, bool bOoxSmoo
{
if( !isSeriesFrameFormat() && (maTypeInfo.meTypeCategory != TYPECATEGORY_RADAR) )
{
namespace cssc = ::com::sun::star::chart2;
namespace cssc = css::chart2;
cssc::CurveStyle eCurveStyle = bOoxSmooth ? cssc::CurveStyle_CUBIC_SPLINES : cssc::CurveStyle_LINES;
rPropSet.setProperty( PROP_CurveStyle, eCurveStyle );
}
@ -549,7 +549,7 @@ void TypeGroupConverter::convertBarGeometry( PropertySet& rPropSet, sal_Int32 nO
if( !(mb3dChart && (maTypeInfo.meTypeCategory == TYPECATEGORY_BAR)) )
return;
namespace cssc = ::com::sun::star::chart2;
namespace cssc = css::chart2;
sal_Int32 nGeom3d = cssc::DataPointGeometry3D::CUBOID;
switch( nOoxShape )
@ -615,7 +615,7 @@ void TypeGroupConverter::insertDataSeries( const Reference< XChartType >& rxChar
PropertySet aSeriesProp( rxSeries );
// series stacking mode
namespace cssc = ::com::sun::star::chart2;
namespace cssc = css::chart2;
cssc::StackingDirection eStacking = cssc::StackingDirection_NO_STACKING;
// stacked overrides deep-3d
if( isStacked() || isPercent() )

2
oox/source/drawingml/textparagraphpropertiescontext.cxx
View file

@ -54,7 +54,7 @@ namespace {
double lclGetGraphicAspectRatio( const Reference< XGraphic >& rxGraphic )
{
double fRatio = 1.0;
Reference< com::sun::star::beans::XPropertySet > xGraphicPropertySet( rxGraphic, UNO_QUERY_THROW );
Reference< css::beans::XPropertySet > xGraphicPropertySet( rxGraphic, UNO_QUERY_THROW );
css::awt::Size aSizeHmm( 0, 0 );
xGraphicPropertySet->getPropertyValue( u"Size100thMM"_ustr ) >>= aSizeHmm;

2
oox/source/ppt/presentationfragmenthandler.cxx
View file

@ -191,7 +191,7 @@ void PresentationFragmentHandler::importCustomSlideShow(std::vector<CustomShow>&
for (size_t i = 0; i < rCustomShowList.size(); ++i)
{
Reference<com::sun::star::container::XIndexContainer> xShow(mxShowFactory->createInstance(),
Reference<css::container::XIndexContainer> xShow(mxShowFactory->createInstance(),
UNO_QUERY);
if (xShow.is())
{

6
sc/source/filter/excel/xehelper.cxx
View file

@ -367,7 +367,7 @@ XclExpStringRef lclCreateFormattedString(
// script type handling
Reference< XBreakIterator > xBreakIt = rRoot.GetDoc().GetBreakIterator();
namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
namespace ApiScriptType = css::i18n::ScriptType;
// #i63255# get script type for leading weak characters
sal_Int16 nLastScript = XclExpStringHelper::GetLeadingScriptType( rRoot, rText );
@ -443,7 +443,7 @@ XclExpStringRef lclCreateFormattedString(
// script type handling
Reference< XBreakIterator > xBreakIt = rRoot.GetDoc().GetBreakIterator();
namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
namespace ApiScriptType = css::i18n::ScriptType;
// #i63255# get script type for leading weak characters
sal_Int16 nLastScript = XclExpStringHelper::GetLeadingScriptType( rRoot, rEE.GetText() );
@ -659,7 +659,7 @@ XclExpStringRef XclExpStringHelper::CreateString(
sal_Int16 XclExpStringHelper::GetLeadingScriptType( const XclExpRoot& rRoot, const OUString& rString )
{
namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
namespace ApiScriptType = css::i18n::ScriptType;
Reference< XBreakIterator > xBreakIt = rRoot.GetDoc().GetBreakIterator();
sal_Int32 nStrPos = 0;
sal_Int32 nStrLen = rString.getLength();

2
sc/source/filter/excel/xestyle.cxx
View file

@ -836,7 +836,7 @@ sal_Int16 lclCheckFontItems( const SfxItemSet& rItemSet,
sal_Int16 XclExpFontHelper::GetFirstUsedScript( const XclExpRoot& rRoot, const SfxItemSet& rItemSet )
{
namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
namespace ApiScriptType = css::i18n::ScriptType;
/* #i17050# #i107170# We need to determine which font items are set in the
item set, and which script type we should prefer according to the

18
sc/source/filter/excel/xiescher.cxx
View file

@ -1539,7 +1539,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
SdrTextVertAdjust eVerAlign = SDRTEXTVERTADJUST_TOP;
// orientation (this is only a fake, drawing does not support real text orientation)
namespace csst = ::com::sun::star::text;
namespace csst = css::text;
csst::WritingMode eWriteMode = csst::WritingMode_LR_TB;
switch( maTextData.maData.mnOrient )
{
@ -2183,7 +2183,7 @@ void XclImpButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const
rPropSet.SetProperty( u"Align"_ustr, nHorAlign );
// vertical text alignment
namespace csss = ::com::sun::star::style;
namespace csss = css::style;
csss::VerticalAlignment eVerAlign = csss::VerticalAlignment_MIDDLE;
switch( maTextData.maData.GetVerAlign() )
{
@ -2201,7 +2201,7 @@ void XclImpButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const
rPropSet.SetBoolProperty( u"DefaultButton"_ustr, bDefButton );
// button type (flags cannot be combined in OOo)
namespace cssa = ::com::sun::star::awt;
namespace cssa = css::awt;
cssa::PushButtonType eButtonType = cssa::PushButtonType_STANDARD;
if( ::get_flag( maTextData.maData.mnButtonFlags, EXC_OBJ_BUTTON_CLOSE ) )
eButtonType = cssa::PushButtonType_OK;
@ -2286,7 +2286,7 @@ void XclImpCheckBoxObj::DoProcessControl( ScfPropertySet& rPropSet ) const
rPropSet.SetProperty( u"DefaultState"_ustr, nApiState );
// box style
namespace AwtVisualEffect = ::com::sun::star::awt::VisualEffect;
namespace AwtVisualEffect = css::awt::VisualEffect;
sal_Int16 nEffect = ::get_flagvalue( mnCheckBoxFlags, EXC_OBJ_CHECKBOX_FLAT, AwtVisualEffect::FLAT, AwtVisualEffect::LOOK3D );
rPropSet.SetProperty( u"VisualEffect"_ustr, nEffect );
@ -2294,7 +2294,7 @@ void XclImpCheckBoxObj::DoProcessControl( ScfPropertySet& rPropSet ) const
rPropSet.SetBoolProperty( u"MultiLine"_ustr, false );
// #i40279# always centered vertically
namespace csss = ::com::sun::star::style;
namespace csss = css::style;
rPropSet.SetProperty( u"VerticalAlign"_ustr, csss::VerticalAlignment_MIDDLE );
// background color
@ -2425,7 +2425,7 @@ void XclImpLabelObj::DoProcessControl( ScfPropertySet& rPropSet ) const
// text alignment (always top/left aligned)
rPropSet.SetProperty( u"Align"_ustr, sal_Int16( 0 ) );
namespace csss = ::com::sun::star::style;
namespace csss = css::style;
rPropSet.SetProperty( u"VerticalAlign"_ustr, csss::VerticalAlignment_TOP );
// always wrap text automatically
@ -2696,7 +2696,7 @@ void XclImpScrollBarObj::DoProcessControl( ScfPropertySet& rPropSet ) const
rPropSet.SetProperty< sal_Int32 >( u"BlockIncrement"_ustr, mnPageStep );
rPropSet.SetProperty( u"VisibleSize"_ustr, ::std::min< sal_Int32 >( mnPageStep, 1 ) );
namespace AwtScrollOrient = ::com::sun::star::awt::ScrollBarOrientation;
namespace AwtScrollOrient = css::awt::ScrollBarOrientation;
sal_Int32 nApiOrient = ::get_flagvalue( mnOrient, EXC_OBJ_SCROLLBAR_HOR, AwtScrollOrient::HORIZONTAL, AwtScrollOrient::VERTICAL );
rPropSet.SetProperty( u"Orientation"_ustr, nApiOrient );
}
@ -2733,7 +2733,7 @@ void XclImpTbxObjListBase::ReadLbsData( XclImpStream& rStrm )
void XclImpTbxObjListBase::SetBoxFormatting( ScfPropertySet& rPropSet ) const
{
// border style
namespace AwtVisualEffect = ::com::sun::star::awt::VisualEffect;
namespace AwtVisualEffect = css::awt::VisualEffect;
sal_Int16 nApiBorder = ::get_flagvalue( mnListFlags, EXC_OBJ_LISTBOX_FLAT, AwtVisualEffect::FLAT, AwtVisualEffect::LOOK3D );
rPropSet.SetProperty( u"Border"_ustr, nApiBorder );
@ -3547,7 +3547,7 @@ rtl::Reference<SdrObject> XclImpDffConverter::CreateSdrObject( const XclImpPictu
if( aGraphic.GetType() != GraphicType::NONE )
{
ErrCode nError = ERRCODE_NONE;
namespace cssea = ::com::sun::star::embed::Aspects;
namespace cssea = css::embed::Aspects;
sal_Int64 nAspects = rPicObj.IsSymbol() ? cssea::MSOLE_ICON : cssea::MSOLE_CONTENT;
xSdrObj =
CreateSdrOLEFromStorage(

4
sc/source/filter/excel/xlstyle.cxx
View file

@ -164,7 +164,7 @@ Color XclDefaultPalette::GetDefColor( sal_uInt16 nXclIndex ) const
// Font Data ==================================================================
namespace Awt = ::com::sun::star::awt;
namespace Awt = css::awt;
namespace AwtFontFamily = Awt::FontFamily;
namespace AwtFontLineStyle = Awt::FontUnderline;
namespace AwtFontStrikeout = Awt::FontStrikeout;
@ -747,7 +747,7 @@ void XclFontPropSetHelper::WriteFontProperties(
ScfPropSetHelper& XclFontPropSetHelper::GetChartHelper( sal_Int16 nScript )
{
namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
namespace ApiScriptType = css::i18n::ScriptType;
switch( nScript )
{
case ApiScriptType::LATIN: return maHlpChWstrn;

2
sc/source/ui/drawfunc/chartsh.cxx
View file

@ -38,7 +38,7 @@
using namespace css::uno;
using namespace sfx2::sidebar;
namespace drawing = com::sun::star::drawing;
namespace drawing = css::drawing;
namespace {

2
sc/source/ui/unoobj/cellvaluebinding.cxx
View file

@ -42,7 +42,7 @@ namespace calc
#define PROP_HANDLE_BOUND_CELL 1
namespace lang = ::com::sun::star::lang;
namespace lang = css::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::table;

8
scripting/source/provider/URIHelper.cxx
View file

@ -29,10 +29,10 @@
namespace func_provider
{
namespace uno = ::com::sun::star::uno;
namespace ucb = ::com::sun::star::ucb;
namespace lang = ::com::sun::star::lang;
namespace uri = ::com::sun::star::uri;
namespace uno = css::uno;
namespace ucb = css::ucb;
namespace lang = css::lang;
namespace uri = css::uri;
constexpr OUString SHARE = u"share"_ustr;

2
sd/qa/unit/export-tests-ooxml2.cxx
View file

@ -1011,7 +1011,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf105739)
CPPUNIT_ASSERT_EQUAL(int(drawing::FillStyle_GRADIENT), static_cast<int>(aFillStyle));
// Test gradient properties
com::sun::star::awt::Gradient2 aFillGradient;
css::awt::Gradient2 aFillGradient;
aXBackgroundPropSet->getPropertyValue(u"FillGradient"_ustr) >>= aFillGradient;
// MCGR: Use the completely imported gradient to check for correctness

2
sd/qa/unit/import-tests.cxx
View file

@ -367,7 +367,7 @@ CPPUNIT_TEST_FIXTURE(SdImportTest, testTdf153466)
uno::Reference<beans::XPropertySet> xBackground(
xPageSet->getPropertyValue(u"Background"_ustr).get<uno::Reference<beans::XPropertySet>>());
com::sun::star::drawing::RectanglePoint aRectanglePoint;
css::drawing::RectanglePoint aRectanglePoint;
xBackground->getPropertyValue(u"FillBitmapRectanglePoint"_ustr) >>= aRectanglePoint;
CPPUNIT_ASSERT_EQUAL(drawing::RectanglePoint::RectanglePoint_RIGHT_BOTTOM, aRectanglePoint);

2
sd/source/console/PresenterScreen.hxx
View file

@ -230,7 +230,7 @@ private:
*/
css::uno::Reference<css::drawing::framework::XResourceId> GetMainPaneId (
const css::uno::Reference<css::presentation::XPresentation2>& rxPresentation,
const css::uno::Reference<com::sun::star::uno::XComponentContext>& xContext) const;
const css::uno::Reference<css::uno::XComponentContext>& xContext) const;
};
}

2
sd/source/ui/controller/displaymodecontroller.cxx
View file

@ -254,7 +254,7 @@ Sequence< OUString > SAL_CALL DisplayModeController::getSupportedServiceNames(
}
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface*
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_sd_DisplayModeController_get_implementation( css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{

2
sd/source/ui/inc/CustomAnimationPane.hxx
View file

@ -99,7 +99,7 @@ private:
static bool setProperty1Value( sal_Int32 nType, const CustomAnimationEffectPtr& pEffect, const css::uno::Any& rValue );
sal_Int32 fillAnimationLB( bool bHasText );
PathKind getCreatePathKind() const;
void createPath( PathKind eKind, std::vector< ::com::sun::star::uno::Any >& rTargets, double fDuration );
void createPath( PathKind eKind, std::vector< css::uno::Any >& rTargets, double fDuration );
DECL_LINK( implControlListBoxHdl, weld::ComboBox&, void );
DECL_LINK( implClickHdl, weld::Button&, void );

Some files were not shown because too many files have changed in this diff Show more