[Libreoffice-commits] .: 2 commits - sfx2/source

[Tor Lillqvist]

 sfx2/source/dialog/about.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1f9d435a78ed161c642410fddd627cf8161dabc7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Dec 15 15:30:00 2010 +0200

    In case of a missing "about" image, don't make the dialog zero width
    
    Fixes fdo#31518.

diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index 3bcf185..d386b49 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -166,6 +166,10 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
 
     // determine size and position of the dialog & elements
     Size aAppLogoSiz = aAppLogo.GetSizePixel();
+
+    if (aAppLogoSiz.Width() < 300)
+        aAppLogoSiz.Width() = 300;
+
     Size aOutSiz     = GetOutputSizePixel();
     aOutSiz.Width()  = aAppLogoSiz.Width();
 
commit 4c5bae35c6efc9e0e70f51574e4840e212a13bea
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Dec 15 15:28:33 2010 +0200

    Drop unused WELCOME_URL macro that referenced openoffice.org even

diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index e35e327..3bcf185 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -68,8 +68,6 @@ using namespace ::com::sun::star;
 #define SPACE_OFFSET	5
 #define SCROLL_TIMER	30
 
-#define WELCOME_URL     DEFINE_CONST_UNICODE( "http://www.openoffice.org/welcome/credits.html" )
-
 /** loads the application logo as used in the about dialog and impress slideshow pause screen */
 Image SfxApplication::GetApplicationLogo()
 {