r14810 by fschmid - Removed a couple of obsolete AdjuctPictScale calls, at least the ones which are really unneeded.

[scribus-commit]

Revision: 14810
Author: fschmid
Date: 2010-02-24T21:41:30.108145Z
Commit message: Removed a couple of obsolete AdjuctPictScale calls, at least the ones which are really unneeded.

Changeset: 
M  /trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
M  /trunk/Scribus/scribus/scribus.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
M  /trunk/Scribus/scribus/scribusdoc.cpp
M  /trunk/Scribus/scribus/scribusview.cpp

Diffs:
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp	(revision 14809)
+++ scribus/scribusdoc.cpp	(revision 14810)
@@ -7263,7 +7263,6 @@
 			loadPict(currItem->Pfile, currItem, true);
 			currItem->setImageFlippedH(fho);
 			currItem->setImageFlippedV(fvo);
-			currItem->AdjustPictScale();
 		}
 	}
 	for (int a = 0; a < MasterItems.count(); ++a)
@@ -7276,7 +7275,6 @@
 			loadPict(currItem->Pfile, currItem, true);
 			currItem->setImageFlippedH(fho);
 			currItem->setImageFlippedV(fvo);
-			currItem->AdjustPictScale();
 		}
 	}
 	for (int a = 0; a <FrameItems.count(); ++a)
@@ -7289,7 +7287,6 @@
 			loadPict(currItem->Pfile, currItem, true);
 			currItem->setImageFlippedH(fho);
 			currItem->setImageFlippedV(fvo);
-			currItem->AdjustPictScale();
 		}
 	}
 	QStringList patterns = docPatterns.keys();
@@ -7306,7 +7303,6 @@
 				loadPict(currItem->Pfile, currItem, true);
 				currItem->setImageFlippedH(fho);
 				currItem->setImageFlippedV(fvo);
-				currItem->AdjustPictScale();
 			}
 		}
 		PageItem *ite = pa.items.at(0);
@@ -7335,7 +7331,6 @@
 						loadPict(currItem->Pfile, currItem, true);
 						currItem->setImageFlippedH(fho);
 						currItem->setImageFlippedV(fvo);
-						currItem->AdjustPictScale();
 						ScCore->fileWatcher->addFile(currItem->Pfile);
 					}
 				}
@@ -7359,7 +7354,6 @@
 						loadPict(currItem->Pfile, currItem, true);
 						currItem->setImageFlippedH(fho);
 						currItem->setImageFlippedV(fvo);
-						currItem->AdjustPictScale();
 						ScCore->fileWatcher->addFile(currItem->Pfile);
 					}
 				}
@@ -7383,7 +7377,6 @@
 						loadPict(currItem->Pfile, currItem, true);
 						currItem->setImageFlippedH(fho);
 						currItem->setImageFlippedV(fvo);
-						currItem->AdjustPictScale();
 						ScCore->fileWatcher->addFile(currItem->Pfile);
 					}
 				}
@@ -7411,7 +7404,6 @@
 							loadPict(currItem->Pfile, currItem, true);
 							currItem->setImageFlippedH(fho);
 							currItem->setImageFlippedV(fvo);
-							currItem->AdjustPictScale();
 							ScCore->fileWatcher->addFile(currItem->Pfile);
 						}
 					}
@@ -7644,7 +7636,6 @@
 						loadPict(currItem->Pfile, currItem, true);
 						currItem->setImageFlippedH(fho);
 						currItem->setImageFlippedV(fvo);
-						currItem->AdjustPictScale();
 						toUpdate=true;
 					}
 				}
Index: scribus/scribusview.cpp
===================================================================
--- scribus/scribusview.cpp	(revision 14809)
+++ scribus/scribusview.cpp	(revision 14810)
@@ -3046,7 +3046,6 @@
 								Doc->loadPict(currItem->Pfile, currItem, true);
 								currItem->setImageFlippedH(fho);
 								currItem->setImageFlippedV(fvo);
-								currItem->AdjustPictScale();
 							}
 						}
 					}
@@ -3074,7 +3073,6 @@
 									Doc->loadPict(currItem->Pfile, currItem, true);
 									currItem->setImageFlippedH(fho);
 									currItem->setImageFlippedV(fvo);
-									currItem->AdjustPictScale();
 								}
 							}
 						}
@@ -3109,7 +3107,6 @@
 					Doc->loadPict(currItem->Pfile, currItem, true);
 					currItem->setImageFlippedH(fho);
 					currItem->setImageFlippedV(fvo);
-					currItem->AdjustPictScale();
 				}
 			}
 
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 14809)
+++ scribus/scribus.cpp	(revision 14810)
@@ -4076,9 +4076,6 @@
 				qApp->changeOverrideCursor( QCursor(Qt::WaitCursor) );
 				qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 				doc->LoadPict(fileName, currItem->ItemNr, false, true);
-				//view->AdjustPictScale(currItem, false);
-				//false was ignored anyway
-				currItem->AdjustPictScale();
 				propertiesPalette->setScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
 				qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 				view->DrawNew();
@@ -4168,7 +4165,6 @@
 					currItem->Pfile = fileName;
 					img.save(fileName, "PNG");
 					doc->LoadPict(fileName, currItem->ItemNr, false, true);
-					currItem->AdjustPictScale();
 					propertiesPalette->setScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
 					qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 					view->DrawNew();
@@ -4225,7 +4221,6 @@
 							doc->loadPict(currItem->Pfile, currItem, true);
 							currItem->setImageFlippedH(fho);
 							currItem->setImageFlippedV(fvo);
-							currItem->AdjustPictScale();
 						}
 					}
 				}
@@ -4240,7 +4235,6 @@
 					doc->loadPict(currItem->Pfile, currItem, true);
 					currItem->setImageFlippedH(fho);
 					currItem->setImageFlippedV(fvo);
-					currItem->AdjustPictScale();
 				}
 				scrActions["itemToggleInlineImage"]->setChecked(currItem->isImageInline());
 			}
@@ -9527,7 +9521,6 @@
 				qApp->changeOverrideCursor( QCursor(Qt::WaitCursor) );
 				qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 				doc->loadPict(contentsBuffer.contentsFileName, imageItem);
-				imageItem->AdjustPictScale();
 				imageItem->setImageXYScale(contentsBuffer.LocalScX, contentsBuffer.LocalScY);
 				if (absolute==0)
 					imageItem->setImageXYOffset(contentsBuffer.LocalX, contentsBuffer.LocalY);
Index: scribus/plugins/fileloader/scribus150format/scribus150format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(revision 14809)
+++ scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(revision 14810)
@@ -1992,7 +1992,6 @@
 				newItem->pixm.imgInfo.isRequest = true;
 				doc->loadPict(newItem->Pfile, newItem, true);
 			}
-			newItem->AdjustPictScale();
 		}
 	}
 
Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14809)
+++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14810)
@@ -1907,7 +1907,6 @@
 				newItem->pixm.imgInfo.isRequest = true;
 				doc->loadPict(newItem->Pfile, newItem, true);
 			}
-			newItem->AdjustPictScale();
 		}
 	}