On 21 Sep, [email protected] wrote: > This is an automated email from the ASF dual-hosted git repository. > > jimjag pushed a commit to branch trunk > in repository https://gitbox.apache.org/repos/asf/openoffice.git > > > The following commit(s) were added to refs/heads/trunk by this push: > new 7f4cef327c AOO5 logos > 7f4cef327c is described below > > commit 7f4cef327c6029f23638d23c1333551ed9c2eae8 > Author: Jim Jagielski <[email protected]> > AuthorDate: Mon Sep 21 15:50:34 2026 -0400 > > AOO5 logos > --- > main/default_images/introabout/about5.png | Bin 0 -> 13837 bytes > main/default_images/introabout/beta/about5.png | Bin 0 -> 16361 bytes > main/default_images/introabout/beta/intro5.png | Bin 0 -> 28002 bytes > main/default_images/introabout/dev/about5.png | Bin 0 -> 18386 bytes > main/default_images/introabout/dev/intro5.png | Bin 0 -> 31217 bytes > main/default_images/introabout/intro5.png | Bin 0 -> 26494 bytes > main/desktop/source/splash/splash.cxx | 2 +- > main/desktop/zipintro/makefile.mk | 20 ++++++++++---------- > 8 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/main/default_images/introabout/about5.png > b/main/default_images/introabout/about5.png > new file mode 100644 > index 0000000000..6d850c10c5 > Binary files /dev/null and b/main/default_images/introabout/about5.png differ > diff --git a/main/default_images/introabout/beta/about5.png > b/main/default_images/introabout/beta/about5.png > new file mode 100644 > index 0000000000..b287db7bb3 > Binary files /dev/null and b/main/default_images/introabout/beta/about5.png > differ > diff --git a/main/default_images/introabout/beta/intro5.png > b/main/default_images/introabout/beta/intro5.png > new file mode 100644 > index 0000000000..9de55c72af > Binary files /dev/null and b/main/default_images/introabout/beta/intro5.png > differ > diff --git a/main/default_images/introabout/dev/about5.png > b/main/default_images/introabout/dev/about5.png > new file mode 100644 > index 0000000000..c0cc9a6e42 > Binary files /dev/null and b/main/default_images/introabout/dev/about5.png > differ > diff --git a/main/default_images/introabout/dev/intro5.png > b/main/default_images/introabout/dev/intro5.png > new file mode 100644 > index 0000000000..e769b2157f > Binary files /dev/null and b/main/default_images/introabout/dev/intro5.png > differ > diff --git a/main/default_images/introabout/intro5.png > b/main/default_images/introabout/intro5.png > new file mode 100644 > index 0000000000..dfa4ddf695 > Binary files /dev/null and b/main/default_images/introabout/intro5.png differ > diff --git a/main/desktop/source/splash/splash.cxx > b/main/desktop/source/splash/splash.cxx > index b4b6cf9230..911d095513 100644 > --- a/main/desktop/source/splash/splash.cxx > +++ b/main/desktop/source/splash/splash.cxx > @@ -462,7 +462,7 @@ bool SplashScreen::findBitmap(rtl::OUString const & path) > { > if ( !haveBitmap ) > { > haveBitmap = loadBitmap( > - path, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("intro.png"))); > + path, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("intro5.png"))); > if ( !haveBitmap ) > haveBitmap = loadBitmap( > path, > rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("intro.bmp"))); > diff --git a/main/desktop/zipintro/makefile.mk > b/main/desktop/zipintro/makefile.mk > index b45c20ba5c..7949652335 100644 > --- a/main/desktop/zipintro/makefile.mk > +++ b/main/desktop/zipintro/makefile.mk > @@ -32,24 +32,24 @@ TARGET=zipintro > DEFAULT_FLAVOURS=dev dev_nologo nologo intro beta > > ZIP1LIST= \ > - $(null,$(INTRO_BITMAPS) > $(MISC)$/$(RSCDEFIMG)$/introabout$/dev$/intro.png $(INTRO_BITMAPS)) \ > - $(null,$(ABOUT_BITMAPS) > $(MISC)$/$(RSCDEFIMG)$/introabout$/dev$/about.png $(ABOUT_BITMAPS)) \ > + $(null,$(INTRO_BITMAPS) > $(MISC)$/$(RSCDEFIMG)$/introabout$/dev$/intro5.png $(INTRO_BITMAPS)) \ > + $(null,$(ABOUT_BITMAPS) > $(MISC)$/$(RSCDEFIMG)$/introabout$/dev$/about5.png $(ABOUT_BITMAPS)) \ > $(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png > ZIP2LIST= \ > - $(null,$(INTRO_BITMAPS) > $(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.png > $(INTRO_BITMAPS)) \ > - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png > $(ABOUT_BITMAPS)) \ > + $(null,$(INTRO_BITMAPS) > $(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro5.png > $(INTRO_BITMAPS)) \ > + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about5.png > $(ABOUT_BITMAPS)) \ > $(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png > ZIP3LIST= \ > - $(null,$(INTRO_BITMAPS) > $(MISC)$/ooo_custom_images$/nologo$/introabout$/intro.png $(INTRO_BITMAPS)) \ > - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png > $(ABOUT_BITMAPS)) \ > + $(null,$(INTRO_BITMAPS) > $(MISC)$/ooo_custom_images$/nologo$/introabout$/intro5.png $(INTRO_BITMAPS)) \ > + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about5.png > $(ABOUT_BITMAPS)) \ > $(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png > ZIP4LIST= \ > - $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.png > $(INTRO_BITMAPS)) \ > - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png > $(ABOUT_BITMAPS)) \ > + $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro5.png > $(INTRO_BITMAPS)) \ > + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about5.png > $(ABOUT_BITMAPS)) \ > $(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png > ZIP5LIST= \ > - $(null,$(INTRO_BITMAPS) > $(MISC)$/$(RSCDEFIMG)$/introabout$/beta$/intro.png $(INTRO_BITMAPS)) \ > - $(null,$(ABOUT_BITMAPS) > $(MISC)$/$(RSCDEFIMG)$/introabout$/beta$/about.png $(ABOUT_BITMAPS)) \ > + $(null,$(INTRO_BITMAPS) > $(MISC)$/$(RSCDEFIMG)$/introabout$/beta$/intro5.png $(INTRO_BITMAPS)) \ > + $(null,$(ABOUT_BITMAPS) > $(MISC)$/$(RSCDEFIMG)$/introabout$/beta$/about5.png $(ABOUT_BITMAPS)) \ > $(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png > > ZIP1TARGET=dev_intro >
Thank you! --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
