viewshe2.cxx (77bc49c4) viewshe2.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

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

78#include "DrawViewShell.hxx"
79#include "ViewShellBase.hxx"
80
81#include "Window.hxx"
82
83#include <sfx2/viewfrm.hxx>
84#include <svtools/soerr.hxx>
85#include <toolkit/helper/vclunohelper.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

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

78#include "DrawViewShell.hxx"
79#include "ViewShellBase.hxx"
80
81#include "Window.hxx"
82
83#include <sfx2/viewfrm.hxx>
84#include <svtools/soerr.hxx>
85#include <toolkit/helper/vclunohelper.hxx>
86#include <svx/charthelper.hxx>
86
87#ifdef _MSC_VER
88#pragma optimize ( "", off )
89#endif
90
91using namespace com::sun::star;
92
93const String aEmptyStr;

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

827{
828 ErrCode aErrCode = 0;
829
830 SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), RID_SO_ERRCTX);
831 sal_Bool bAbort = sal_False;
832 GetDocSh()->SetWaitCursor( sal_True );
833 SfxViewShell* pViewShell = GetViewShell();
834 OSL_ASSERT (pViewShell!=NULL);
87
88#ifdef _MSC_VER
89#pragma optimize ( "", off )
90#endif
91
92using namespace com::sun::star;
93
94const String aEmptyStr;

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

828{
829 ErrCode aErrCode = 0;
830
831 SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), RID_SO_ERRCTX);
832 sal_Bool bAbort = sal_False;
833 GetDocSh()->SetWaitCursor( sal_True );
834 SfxViewShell* pViewShell = GetViewShell();
835 OSL_ASSERT (pViewShell!=NULL);
836 bool bChangeDefaultsForChart = false;
835
836 uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef();
837 if ( !xObj.is() )
838 {
839 /**********************************************************
840 * Leeres OLE-Objekt mit OLE-Objekt versehen
841 **********************************************************/
842 String aName = pObj->GetProgName();
843 ::rtl::OUString aObjName;
844 SvGlobalName aClass;
845
846 if( aName.EqualsAscii( "StarChart" ) || aName.EqualsAscii("StarOrg") )
847 {
848 if( SvtModuleOptions().IsChart() )
849 {
850 aClass = SvGlobalName( SO3_SCH_CLASSID );
837
838 uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef();
839 if ( !xObj.is() )
840 {
841 /**********************************************************
842 * Leeres OLE-Objekt mit OLE-Objekt versehen
843 **********************************************************/
844 String aName = pObj->GetProgName();
845 ::rtl::OUString aObjName;
846 SvGlobalName aClass;
847
848 if( aName.EqualsAscii( "StarChart" ) || aName.EqualsAscii("StarOrg") )
849 {
850 if( SvtModuleOptions().IsChart() )
851 {
852 aClass = SvGlobalName( SO3_SCH_CLASSID );
853 bChangeDefaultsForChart = true;
851 }
852 }
853 else if( aName.EqualsAscii( "StarCalc" ))
854 {
855 if( SvtModuleOptions().IsCalc() )
856 aClass = SvGlobalName( SO3_SC_CLASSID );
857 }
858 else if( aName.EqualsAscii( "StarMath" ))

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

967 aScaleHeight.ReduceInaccurate(10);
968 pSdClient->SetSizeScale(aScaleWidth, aScaleHeight);
969
970 // sichtbarer Ausschnitt wird nur inplace veraendert!
971 aRect.SetSize(aObjAreaSize);
972 // the object area size must be set after scaling, since it triggers the resizing
973 pSdClient->SetObjArea(aRect);
974
854 }
855 }
856 else if( aName.EqualsAscii( "StarCalc" ))
857 {
858 if( SvtModuleOptions().IsCalc() )
859 aClass = SvGlobalName( SO3_SC_CLASSID );
860 }
861 else if( aName.EqualsAscii( "StarMath" ))

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

970 aScaleHeight.ReduceInaccurate(10);
971 pSdClient->SetSizeScale(aScaleWidth, aScaleHeight);
972
973 // sichtbarer Ausschnitt wird nur inplace veraendert!
974 aRect.SetSize(aObjAreaSize);
975 // the object area size must be set after scaling, since it triggers the resizing
976 pSdClient->SetObjArea(aRect);
977
978 if( bChangeDefaultsForChart && xObj.is())
979 {
980 ChartHelper::AdaptDefaultsForChart( xObj );
981 }
982
975 pSdClient->DoVerb(nVerb); // ErrCode wird ggf. vom Sfx ausgegeben
976 pViewShell->GetViewFrame()->GetBindings().Invalidate(
977 SID_NAVIGATOR_STATE, sal_True, sal_False);
978 }
979
980 GetDocSh()->SetWaitCursor( sal_False );
981
982 if (aErrCode != 0 && !bAbort)

--- 200 unchanged lines hidden --- 		983 pSdClient->DoVerb(nVerb); // ErrCode wird ggf. vom Sfx ausgegeben
984 pViewShell->GetViewFrame()->GetBindings().Invalidate(
985 SID_NAVIGATOR_STATE, sal_True, sal_False);
986 }
987
988 GetDocSh()->SetWaitCursor( sal_False );
989
990 if (aErrCode != 0 && !bAbort)

--- 200 unchanged lines hidden ---