svdoole2.cxx (9e9dd2d5) svdoole2.cxx (17e8bc19)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 768 unchanged lines hidden (view full) ---

777 Init();
778
779 bFrame=bFrame_;
780
781 if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
782 SetResizeProtect(sal_True);
783
784 // #108759# For math objects, set closed state to transparent
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 768 unchanged lines hidden (view full) ---

777 Init();
778
779 bFrame=bFrame_;
780
781 if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
782 SetResizeProtect(sal_True);
783
784 // #108759# For math objects, set closed state to transparent
785 if( ImplIsMathObj( xObjRef.GetObject() ) )
786 SetClosedObj( false );
785 SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
787}
788
789// -----------------------------------------------------------------------------
790
791SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, FASTBOOL bFrame_)
792 : xObjRef( rNewObjRef )
793 , m_bTypeAsked(false)
794 , m_bChart(false)

--- 5 unchanged lines hidden (view full) ---

800
801 mpImpl->aPersistName = rNewObjName;
802 bFrame=bFrame_;
803
804 if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
805 SetResizeProtect(sal_True);
806
807 // #108759# For math objects, set closed state to transparent
786}
787
788// -----------------------------------------------------------------------------
789
790SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, FASTBOOL bFrame_)
791 : xObjRef( rNewObjRef )
792 , m_bTypeAsked(false)
793 , m_bChart(false)

--- 5 unchanged lines hidden (view full) ---

799
800 mpImpl->aPersistName = rNewObjName;
801 bFrame=bFrame_;
802
803 if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
804 SetResizeProtect(sal_True);
805
806 // #108759# For math objects, set closed state to transparent
808 if( ImplIsMathObj( xObjRef.GetObject() ) )
809 SetClosedObj( false );
807 SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
810}
811
812// -----------------------------------------------------------------------------
813
814SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_)
815 : SdrRectObj(rNewRect)
816 , xObjRef( rNewObjRef )
817 , m_bTypeAsked(false)

--- 6 unchanged lines hidden (view full) ---

824
825 mpImpl->aPersistName = rNewObjName;
826 bFrame=bFrame_;
827
828 if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
829 SetResizeProtect(sal_True);
830
831 // #108759# For math objects, set closed state to transparent
808}
809
810// -----------------------------------------------------------------------------
811
812SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_)
813 : SdrRectObj(rNewRect)
814 , xObjRef( rNewObjRef )
815 , m_bTypeAsked(false)

--- 6 unchanged lines hidden (view full) ---

822
823 mpImpl->aPersistName = rNewObjName;
824 bFrame=bFrame_;
825
826 if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
827 SetResizeProtect(sal_True);
828
829 // #108759# For math objects, set closed state to transparent
832 if( ImplIsMathObj( xObjRef.GetObject() ) )
833 SetClosedObj( false );
830 SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
834}
835
836// -----------------------------------------------------------------------------
837
838void SdrOle2Obj::Init()
839{
840 mpImpl = new SdrOle2ObjImpl;
841 pModifyListener = NULL;

--- 737 unchanged lines hidden (view full) ---

1579 if ( xObjRef.is() )
1580 {
1581 DELETEZ( pGraphic );
1582
1583 if ( (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
1584 SetResizeProtect(sal_True);
1585
1586 // #108759# For math objects, set closed state to transparent
831}
832
833// -----------------------------------------------------------------------------
834
835void SdrOle2Obj::Init()
836{
837 mpImpl = new SdrOle2ObjImpl;
838 pModifyListener = NULL;

--- 737 unchanged lines hidden (view full) ---

1576 if ( xObjRef.is() )
1577 {
1578 DELETEZ( pGraphic );
1579
1580 if ( (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
1581 SetResizeProtect(sal_True);
1582
1583 // #108759# For math objects, set closed state to transparent
1587 if( ImplIsMathObj( rNewObjRef ) )
1588 SetClosedObj( false );
1584 SetClosedObj(!ImplIsMathObj( rNewObjRef ));
1589
1590 Connect();
1591 }
1592
1593 SetChanged();
1594 BroadcastObjectChange();
1595}
1596

--- 515 unchanged lines hidden (view full) ---

2112 // If loading of OLE object failed, remember that to not invoke a endless
2113 // loop trying to load it again and again.
2114 if( xObjRef.is() )
2115 {
2116 mpImpl->mbLoadingOLEObjectFailed = sal_True;
2117 }
2118
2119 // #108759# For math objects, set closed state to transparent
1585
1586 Connect();
1587 }
1588
1589 SetChanged();
1590 BroadcastObjectChange();
1591}
1592

--- 515 unchanged lines hidden (view full) ---

2108 // If loading of OLE object failed, remember that to not invoke a endless
2109 // loop trying to load it again and again.
2110 if( xObjRef.is() )
2111 {
2112 mpImpl->mbLoadingOLEObjectFailed = sal_True;
2113 }
2114
2115 // #108759# For math objects, set closed state to transparent
2120 if( ImplIsMathObj( xObjRef.GetObject() ) )
2121 SetClosedObj( false );
2116 SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
2122 }
2123
2124 if ( xObjRef.is() )
2125 {
2126 if( !IsEmptyPresObj() )
2127 {
2128 // #75637# remember modified status of model
2129 const sal_Bool bWasChanged(pModel ? pModel->IsChanged() : sal_False);

--- 201 unchanged lines hidden --- 		2117 }
2118
2119 if ( xObjRef.is() )
2120 {
2121 if( !IsEmptyPresObj() )
2122 {
2123 // #75637# remember modified status of model
2124 const sal_Bool bWasChanged(pModel ? pModel->IsChanged() : sal_False);

--- 201 unchanged lines hidden ---