fuins2.cxx (77bc49c4) fuins2.cxx (6f0b96b4)
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

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

46#include <svtools/insdlg.hxx>
47#include <svtools/soerr.hxx>
48#include <svx/svxdlg.hxx>
49#include <sot/clsids.hxx>
50#include <svx/svdpagv.hxx>
51#include <svx/svdpage.hxx>
52#include <svx/svdundo.hxx>
53#include <sfx2/msgpool.hxx>
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

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

46#include <svtools/insdlg.hxx>
47#include <svtools/soerr.hxx>
48#include <svx/svxdlg.hxx>
49#include <sot/clsids.hxx>
50#include <svx/svdpagv.hxx>
51#include <svx/svdpage.hxx>
52#include <svx/svdundo.hxx>
53#include <sfx2/msgpool.hxx>
54#include <svx/charthelper.hxx>
54#include <scmod.hxx>
55
56// BM/IHA --
57#include <cppuhelper/component_context.hxx>
58#include <comphelper/processfactory.hxx>
59#include <comphelper/storagehelper.hxx>
60#include <com/sun/star/beans/XPropertySet.hpp>
61#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>

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

660 // get chart position (from window size and data range)
661 aStart = pViewSh->GetChartInsertPos( aSize, aPositionRange );
662 }
663
664 Rectangle aRect (aStart, aSize);
665 SdrOle2Obj* pObj = new SdrOle2Obj( svt::EmbeddedObjectRef( xObj, nAspect ), aName, aRect);
666 SdrPageView* pPV = pView->GetSdrPageView();
667
55#include <scmod.hxx>
56
57// BM/IHA --
58#include <cppuhelper/component_context.hxx>
59#include <comphelper/processfactory.hxx>
60#include <comphelper/storagehelper.hxx>
61#include <com/sun/star/beans/XPropertySet.hpp>
62#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>

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

661 // get chart position (from window size and data range)
662 aStart = pViewSh->GetChartInsertPos( aSize, aPositionRange );
663 }
664
665 Rectangle aRect (aStart, aSize);
666 SdrOle2Obj* pObj = new SdrOle2Obj( svt::EmbeddedObjectRef( xObj, nAspect ), aName, aRect);
667 SdrPageView* pPV = pView->GetSdrPageView();
668
669 // #121334#
670 ChartHelper::AdaptDefaultsForChart( xObj );
671
668// pView->InsertObjectAtView(pObj, *pPV);//this call leads to an immidiate redraw and asks the chart for a visual representation
669
670 // use the page instead of the view to insert, so no undo action is created yet
671 SdrPage* pInsPage = pPV->GetPage();
672 pInsPage->InsertObject( pObj );
673 pView->UnmarkAllObj();
674 pView->MarkObj( pObj, pPV );
675 bool bAddUndo = true; // add undo action later, unless the dialog is canceled

--- 156 unchanged lines hidden --- 		672// pView->InsertObjectAtView(pObj, *pPV);//this call leads to an immidiate redraw and asks the chart for a visual representation
673
674 // use the page instead of the view to insert, so no undo action is created yet
675 SdrPage* pInsPage = pPV->GetPage();
676 pInsPage->InsertObject( pObj );
677 pView->UnmarkAllObj();
678 pView->MarkObj( pObj, pPV );
679 bool bAddUndo = true; // add undo action later, unless the dialog is canceled

--- 156 unchanged lines hidden ---