embeddedobj/source/inc/commonembobj.hxx | 2 +- include/embeddedobj/embeddedupdate.hxx | 14 +++----------- svtools/source/misc/embedhlp.cxx | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-)
New commits: commit d35a23cbda438fcd74402aa5656b0b5b4fea63bf Author: Noel Grandin <[email protected]> AuthorDate: Fri Sep 12 12:06:49 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Sep 15 13:34:35 2025 +0200 EmbeddedUpdate should not use the css namespace that is for the UNO API stuff, using it just makes the code harder to read Change-Id: I01ac7672aa993842a889cdb8bcc05137efc80ee0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190938 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index 15afee320f99..fe6059ac7076 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -71,7 +71,7 @@ namespace comphelper { * document model successfully. */ class OCommonEmbeddedObject : public css::embed::XEmbeddedObject - , public css::embed::EmbeddedUpdate + , public ::embeddedobj::EmbeddedUpdate , public css::embed::XEmbedPersist2 , public css::embed::XLinkageSupport , public css::embed::XInplaceObject diff --git a/include/embeddedobj/embeddedupdate.hxx b/include/embeddedobj/embeddedupdate.hxx index 63e7bf4464c8..ebd14a60d403 100644 --- a/include/embeddedobj/embeddedupdate.hxx +++ b/include/embeddedobj/embeddedupdate.hxx @@ -11,13 +11,7 @@ #include <embeddedobj/embobjdllapi.h> -namespace com -{ -namespace sun -{ -namespace star -{ -namespace embed +namespace embeddedobj { /** This class is only used to tell the OCommonEmbeddedObject class that the following call is an Link- / Ole-refresh. @@ -44,9 +38,7 @@ private: EmbeddedUpdate(const EmbeddedUpdate&) = delete; EmbeddedUpdate& operator=(const EmbeddedUpdate&) = delete; }; -}; -}; -}; -}; + +} // namespace embeddedobj /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index f988a6abd1b6..ad43d8e727b5 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -910,7 +910,7 @@ void EmbeddedObjectRef::UpdateReplacement( bool bUpdateOle ) void EmbeddedObjectRef::UpdateOleObject( bool bUpdateOle ) { - embed::EmbeddedUpdate* pObj = dynamic_cast<embed::EmbeddedUpdate*> (GetObject().get()); + ::embeddedobj::EmbeddedUpdate* pObj = dynamic_cast<::embeddedobj::EmbeddedUpdate*> (GetObject().get()); if( pObj ) pObj->SetOleState( bUpdateOle ); }
