view2.cxx (52f1c2ee) | view2.cxx (8ef2f12b) |
---|---|
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 --- 195 unchanged lines hidden (view full) --- 204 return aStr; 205} 206 207 208int SwView::InsertGraphic( const String &rPath, const String &rFilter, 209 sal_Bool bLink, GraphicFilter *pFlt, 210 Graphic* pPreviewGrf, sal_Bool bRule ) 211{ | 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 --- 195 unchanged lines hidden (view full) --- 204 return aStr; 205} 206 207 208int SwView::InsertGraphic( const String &rPath, const String &rFilter, 209 sal_Bool bLink, GraphicFilter *pFlt, 210 Graphic* pPreviewGrf, sal_Bool bRule ) 211{ |
212 SwWait aWait( *GetDocShell(), sal_True ); | 212 SwWait aWait( *GetDocShell(), true ); |
213 214 Graphic aGrf; 215 int nRes = GRFILTER_OK; 216 if ( pPreviewGrf ) 217 aGrf = *pPreviewGrf; 218 else 219 { 220 if( !pFlt ) --- 1920 unchanged lines hidden (view full) --- 2141 { 2142 sal_uInt16 nUndoCheck = 0; 2143 SwDoc *pDoc = pDocSh->GetDoc(); 2144 if( pRead && pDocSh->GetDoc() ) 2145 nUndoCheck = lcl_PageDescWithHeader( *pDoc ); 2146 sal_uLong nErrno; 2147 { //Scope for SwWait-Object, to be able to execute slots 2148 //outside this scope. | 213 214 Graphic aGrf; 215 int nRes = GRFILTER_OK; 216 if ( pPreviewGrf ) 217 aGrf = *pPreviewGrf; 218 else 219 { 220 if( !pFlt ) --- 1920 unchanged lines hidden (view full) --- 2141 { 2142 sal_uInt16 nUndoCheck = 0; 2143 SwDoc *pDoc = pDocSh->GetDoc(); 2144 if( pRead && pDocSh->GetDoc() ) 2145 nUndoCheck = lcl_PageDescWithHeader( *pDoc ); 2146 sal_uLong nErrno; 2147 { //Scope for SwWait-Object, to be able to execute slots 2148 //outside this scope. |
2149 SwWait aWait( *GetDocShell(), sal_True ); | 2149 SwWait aWait( *GetDocShell(), true ); |
2150 pWrtShell->StartAllAction(); 2151 if ( pWrtShell->HasSelection() ) 2152 pWrtShell->DelRight(); // Selektionen loeschen 2153 if( pRead ) 2154 { 2155 nErrno = pRdr->Read( *pRead ); // und Dokument einfuegen 2156 delete pRdr; 2157 } --- 43 unchanged lines hidden (view full) --- 2201 String& rFilter, sal_Int16 nVersion, 2202 SwDocShell* pDestSh ); 2203 2204 String sFltNm; 2205 int nRet = lcl_FindDocShell( xDocSh, xLockRef, pMedium->GetName(), aEmptyStr, 2206 sFltNm, nVersion, pDocSh ); 2207 if( nRet ) 2208 { | 2150 pWrtShell->StartAllAction(); 2151 if ( pWrtShell->HasSelection() ) 2152 pWrtShell->DelRight(); // Selektionen loeschen 2153 if( pRead ) 2154 { 2155 nErrno = pRdr->Read( *pRead ); // und Dokument einfuegen 2156 delete pRdr; 2157 } --- 43 unchanged lines hidden (view full) --- 2201 String& rFilter, sal_Int16 nVersion, 2202 SwDocShell* pDestSh ); 2203 2204 String sFltNm; 2205 int nRet = lcl_FindDocShell( xDocSh, xLockRef, pMedium->GetName(), aEmptyStr, 2206 sFltNm, nVersion, pDocSh ); 2207 if( nRet ) 2208 { |
2209 SwWait aWait( *GetDocShell(), sal_True ); | 2209 SwWait aWait( *GetDocShell(), true ); |
2210 pWrtShell->StartAllAction(); 2211 2212 pWrtShell->EnterStdMode(); // Selektionen loeschen 2213 2214 if( bCompare ) 2215 nFound = pWrtShell->CompareDoc( *((SwDocShell*)&xDocSh)->GetDoc() ); 2216 else 2217 nFound = pWrtShell->MergeDoc( *((SwDocShell*)&xDocSh)->GetDoc() ); --- 288 unchanged lines hidden --- | 2210 pWrtShell->StartAllAction(); 2211 2212 pWrtShell->EnterStdMode(); // Selektionen loeschen 2213 2214 if( bCompare ) 2215 nFound = pWrtShell->CompareDoc( *((SwDocShell*)&xDocSh)->GetDoc() ); 2216 else 2217 nFound = pWrtShell->MergeDoc( *((SwDocShell*)&xDocSh)->GetDoc() ); --- 288 unchanged lines hidden --- |