dev/null |binary instsetoo_native/util/makefile.mk | 15 --------------- svx/source/svdraw/svdxcgv.cxx | 11 ++++++++++- 3 files changed, 10 insertions(+), 16 deletions(-)
New commits: commit 66d762b02a99bacba44964395081dcbc85670194 Author: Jürgen Schmidt <[email protected]> Date: Tue Jul 16 11:13:13 2013 +0000 remove obsolete installer image to avoid confusion diff --git a/instsetoo_native/res/nologoinstall.bmp b/instsetoo_native/res/nologoinstall.bmp deleted file mode 100755 index 2c08bfb..0000000 Binary files a/instsetoo_native/res/nologoinstall.bmp and /dev/null differ commit cac49d92eba807aae36ef068a3aff3dd8edc6a09 Author: Jürgen Schmidt <[email protected]> Date: Tue Jul 16 11:12:09 2013 +0000 merge fix from branch aoo400 to ensure correct installer image on windows diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index a4839dd..9f18a6c 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -143,20 +143,17 @@ sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i) MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates -#MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates .IF "$(BUILD_SPECIAL)"!="" MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE) MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE) -#MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE) MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE) .ELSE # "$(BUILD_SPECIAL)"!="" NOLOGOSPLASH:=$(BIN)$/intro.zip DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates -#MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH) @@ -267,27 +264,15 @@ $(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip hack_msitemplates .PHONY: -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR) -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR) -# -$(MKDIRHIER) $(MSIURETEMPLATEDIR) -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR) -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary -# -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary $(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR) $(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR) -# $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR) $(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR) $(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary $(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary -# $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary $(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary - $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp - $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp -# $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp - $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp - $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp - $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp -# $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp - $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp commit 4dc54d2ec37bc1595eb85548f5e3c6d2add2b10a Author: Armin Le Grand <[email protected]> Date: Tue Jul 16 10:55:54 2013 +0000 i122753 Force SwapIn for BitmapObjects which are part of a conversion to BitmapEx diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 3629e54..b67aca7 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -574,8 +574,17 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked) const for(sal_uInt32 a(0); a < nCount; a++) { + SdrObject* pCandidate = aSdrObjects[a]; + SdrGrafObj* pSdrGrafObj = dynamic_cast< SdrGrafObj* >(pCandidate); + + if(pSdrGrafObj) + { + // #122753# To ensure existance of graphic content, force swap in + pSdrGrafObj->ForceSwapIn(); + } + xPrimitives[a] = new drawinglayer::primitive2d::GroupPrimitive2D( - aSdrObjects[a]->GetViewContact().getViewIndependentPrimitive2DSequence()); + pCandidate->GetViewContact().getViewIndependentPrimitive2DSequence()); } // get logic range
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
