diff options
Diffstat (limited to 'svx/inc/svx/svdoole2.hxx')
| -rw-r--r-- | svx/inc/svx/svdoole2.hxx | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx index 6681e36c7c61..6fdc74d676e7 100644 --- a/svx/inc/svx/svdoole2.hxx +++ b/svx/inc/svx/svdoole2.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVDOOLE2_HXX #define _SVDOOLE2_HXX @@ -60,6 +51,9 @@ private: SVX_DLLPRIVATE void GetObjRef_Impl(); SVX_DLLPRIVATE void SetGraphic_Impl(const Graphic* pGrf); + // #i118485# helper added + SdrObject* createSdrGrafObjReplacement(bool bAddText, bool bUseHCGraphic) const; + protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); @@ -71,6 +65,8 @@ protected: // wg. Kompatibilitaet erstmal am SdrTextObj bool bFrame:1; bool bInDestruction:1; + // #i118524# + bool mbSuppressSetVisAreaSize:1; mutable bool m_bTypeAsked:1; mutable bool m_bChart:1; @@ -94,6 +90,8 @@ public: const svt::EmbeddedObjectRef& getEmbeddedObjectRef() const { return xObjRef; } sal_Int64 GetAspect() const { return xObjRef.GetViewAspect(); } + bool isInplaceActive() const; + bool isUiActive() const; void SetAspect( sal_Int64 nAspect ); // Ein OLE-Zeichenobjekt kann eine StarView-Grafik beinhalten. @@ -106,6 +104,9 @@ public: // no conversion is done if no target mode is provided Size GetOrigObjSize( MapMode* pTargetMapMode = NULL ) const; + // #i118524# Allow suppress SetVisAreaSize in changing methods when call + // comes from OLE client + void setSuppressSetVisAreaSize(bool bNew) { mbSuppressSetVisAreaSize = bNew; } // OLE object has got a separate PersistName member now; // !!! use ::SetPersistName( ... ) only, if you know what you do !!! @@ -184,6 +185,9 @@ public: static Bitmap GetEmtyOLEReplacementBitmap(); void SetWindow(const com::sun::star::uno::Reference < com::sun::star::awt::XWindow >& _xWindow); + + // #i118485# missing converter added + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; }; #endif //_SVDOOLE2_HXX |