drwbassh.cxx (cb0cd92e) | drwbassh.cxx (26ea3662) |
---|---|
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 --- 5 unchanged lines hidden (view full) --- 14 * software distributed under the License is distributed on an 15 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 16 * KIND, either express or implied. See the License for the 17 * specific language governing permissions and limitations 18 * under the License. 19 * 20 *************************************************************/ 21 | 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 --- 5 unchanged lines hidden (view full) --- 14 * software distributed under the License is distributed on an 15 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 16 * KIND, either express or implied. See the License for the 17 * specific language governing permissions and limitations 18 * under the License. 19 * 20 *************************************************************/ 21 |
22 23 | |
24// MARKER(update_precomp.py): autogen include statement, do not remove 25#include "precompiled_sw.hxx" 26 | 22// MARKER(update_precomp.py): autogen include statement, do not remove 23#include "precompiled_sw.hxx" 24 |
27 | |
28#include <tools/shl.hxx> 29#include <hintids.hxx> 30#include <helpid.h> 31#include <swtypes.hxx> 32#include <sfx2/objface.hxx> 33#include <sfx2/request.hxx> 34#include <sfx2/bindings.hxx> 35#include <svl/aeitem.hxx> --- 16 unchanged lines hidden (view full) --- 52#include <frmfmt.hxx> 53#include <wrap.hxx> 54#include <drawbase.hxx> 55#include <drwbassh.hxx> 56#include <swdtflvr.hxx> 57#include <svx/svdogrp.hxx> 58#include <svx/svdpage.hxx> 59#include <svx/svditer.hxx> | 25#include <tools/shl.hxx> 26#include <hintids.hxx> 27#include <helpid.h> 28#include <swtypes.hxx> 29#include <sfx2/objface.hxx> 30#include <sfx2/request.hxx> 31#include <sfx2/bindings.hxx> 32#include <svl/aeitem.hxx> --- 16 unchanged lines hidden (view full) --- 49#include <frmfmt.hxx> 50#include <wrap.hxx> 51#include <drawbase.hxx> 52#include <drwbassh.hxx> 53#include <swdtflvr.hxx> 54#include <svx/svdogrp.hxx> 55#include <svx/svdpage.hxx> 56#include <svx/svditer.hxx> |
60 | |
61#include <shells.hrc> 62#define SwDrawBaseShell 63#include <sfx2/msg.hxx> 64#include <swslots.hxx> 65#include <svx/svxdlg.hxx> 66#include <svx/dialogs.hrc> 67#include "swabstdlg.hxx" 68#include "dialog.hrc" 69#include <swundo.hxx> 70#include <com/sun/star/text/HoriOrientation.hpp> 71#include <com/sun/star/text/VertOrientation.hpp> 72#include <com/sun/star/text/RelOrientation.hpp> | 57#include <shells.hrc> 58#define SwDrawBaseShell 59#include <sfx2/msg.hxx> 60#include <swslots.hxx> 61#include <svx/svxdlg.hxx> 62#include <svx/dialogs.hrc> 63#include "swabstdlg.hxx" 64#include "dialog.hrc" 65#include <swundo.hxx> 66#include <com/sun/star/text/HoriOrientation.hpp> 67#include <com/sun/star/text/VertOrientation.hpp> 68#include <com/sun/star/text/RelOrientation.hpp> |
73 | |
74#include <IDocumentDrawModelAccess.hxx> | 69#include <IDocumentDrawModelAccess.hxx> |
70#include <drawdoc.hxx> |
|
75 76using namespace ::com::sun::star; 77 78SFX_IMPL_INTERFACE(SwDrawBaseShell, SwBaseShell, SW_RES(0)) 79{ 80} 81 82TYPEINIT1(SwDrawBaseShell,SwBaseShell) --- 563 unchanged lines hidden (view full) --- 646 String sNewName; 647 pNameDialog->GetName(sNewName); 648 long nRet = 0; 649 if(!sNewName.Len() || sCurrentName == sNewName) 650 nRet = 1; 651 else 652 { 653 nRet = 1; | 71 72using namespace ::com::sun::star; 73 74SFX_IMPL_INTERFACE(SwDrawBaseShell, SwBaseShell, SW_RES(0)) 75{ 76} 77 78TYPEINIT1(SwDrawBaseShell,SwBaseShell) --- 563 unchanged lines hidden (view full) --- 642 String sNewName; 643 pNameDialog->GetName(sNewName); 644 long nRet = 0; 645 if(!sNewName.Len() || sCurrentName == sNewName) 646 nRet = 1; 647 else 648 { 649 nRet = 1; |
654 SdrModel* pModel = rSh.getIDocumentDrawModelAccess()->GetDrawModel(); | 650 SwDrawModel* pModel = rSh.getIDocumentDrawModelAccess()->GetDrawModel(); |
655 // --> OD 2006-03-09 #i51726# - all drawing objects can be named now. 656 // consider also drawing objects inside group objects 657// SdrPage* pPage = pModel->GetPage(0); 658// sal_uInt32 nCount = pPage->GetObjCount(); 659// for( sal_uInt32 i=0; i< nCount; i++ ) 660// { 661// SdrObject* pTemp = pPage->GetObj(i); 662// if(pObj != pTemp && pTemp->ISA(SdrObjGroup) && pTemp->GetName() == sNewName) --- 344 unchanged lines hidden --- | 651 // --> OD 2006-03-09 #i51726# - all drawing objects can be named now. 652 // consider also drawing objects inside group objects 653// SdrPage* pPage = pModel->GetPage(0); 654// sal_uInt32 nCount = pPage->GetObjCount(); 655// for( sal_uInt32 i=0; i< nCount; i++ ) 656// { 657// SdrObject* pTemp = pPage->GetObj(i); 658// if(pObj != pTemp && pTemp->ISA(SdrObjGroup) && pTemp->GetName() == sNewName) --- 344 unchanged lines hidden --- |