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 <noel.grandin@collabora.co.uk>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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: */
|
||||
|
||||
@@ -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 );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user