1. mst
  2. ooo340

Commits

releng  committed fe9d705

CWS-TOOLING: integrate CWS c28v001_DEV300
2009-06-11 09:57:13 +0200 pl r272848 : #160046# make product and welcome text have transparent background to allow for more flexibility of the background bitmap
2009-06-11 09:54:27 +0200 pl r272847 : #160045# add edition search path for images.zip

  • Participants
  • Parent commits a55edf0
  • Branches default

Comments (0)

Files changed (2)

File framework/source/services/backingwindow.cxx

View file
  • Ignore whitespace
     // clean up resource stack
     FreeResource();
     
+    maWelcome.SetPaintTransparent( TRUE );
+    maProduct.SetPaintTransparent( TRUE );
+    EnableChildTransparentMode();
+    
     SetStyle( GetStyle() | WB_DIALOGCONTROL );
     
     // add some breathing space for the images
     }
 
     maWelcome.SetControlForeground( maWelcomeTextColor );
-    maWelcome.SetControlBackground( aTextBGColor );
+    maWelcome.SetBackground();
     maProduct.SetControlForeground( maWelcomeTextColor );
-    maProduct.SetControlBackground( aTextBGColor );
+    maProduct.SetBackground();
     maCreateText.SetControlForeground( maLabelTextColor );
     maCreateText.SetControlBackground( aTextBGColor );
     maWriterText.SetControlForeground( maLabelTextColor );

File vcl/source/gdi/impimagetree.cxx

View file
  • Ignore whitespace
     m_zips.clear();
     {
         rtl::OUString url(
+            RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/edition/images.zip"));
+        rtl::Bootstrap::expandMacros(url);
+        INetURLObject u(url);
+        OSL_ASSERT(!u.HasError());
+        m_zips.push_back(
+            std::make_pair(
+                u.GetMainURL(INetURLObject::NO_DECODE),
+                css::uno::Reference< css::container::XNameAccess >()));
+    }
+    {
+        rtl::OUString url(
             RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/config"));
         rtl::Bootstrap::expandMacros(url);
         INetURLObject u(url);