Remove some accidental merge by-products.

Change-Id: Ic04832bf95fd425f839bd4f6a1390959f3c82247

Remove some accidental merge by-products.
Change-Id: Ic04832bf95fd425f839bd4f6a1390959f3c82247
29534bfb · Thorsten Behrens · 42f9c7f8 · 42f9c7f8 · 42f9c7f8 · 42f9c7f8
Kaydet (Commit) 29534bfb authored Mar 14, 2013 tarafından Thorsten Behrens
Showing with 0 additions and 13 deletions

gdimtf.cxx.orig vcl/source/gdi/gdimtf.cxx.orig +0 -0

salgdi2.cxx.orig vcl/unx/generic/gdi/salgdi2.cxx.orig +0 -0

salgdi2.cxx.rej vcl/unx/generic/gdi/salgdi2.cxx.rej +0 -13

No files found.
--- a/vcl/source/gdi/gdimtf.cxx.orig
+++ b/vcl/source/gdi/gdimtf.cxx.orig
--- a/vcl/unx/generic/gdi/salgdi2.cxx.orig
+++ b/vcl/unx/generic/gdi/salgdi2.cxx.orig
--- a/vcl/unx/generic/gdi/salgdi2.cxx.rej
+++ b/vcl/unx/generic/gdi/salgdi2.cxx.rej
--- vcl/unx/generic/gdi/salgdi2.cxx
-+++ vcl/unx/generic/gdi/salgdi2.cxx
-@@ -658,8 +658,8 @@
-     const SalVisual& rSalVis = pSalDisp->GetVisual( m_nXScreen );
-     Display* pXDisplay = pSalDisp->GetDisplay();
- 
-    Picture aAlphaPic;
-    Pixmap aAlphaPM;
-+    Picture aAlphaPic = 0;
-+    Pixmap aAlphaPM = 0;
-     // create source Picture
-     int nDepth = m_pVDev ? m_pVDev->GetDepth() : rSalVis.GetDepth();
-     const X11SalBitmap& rSrcX11Bmp = static_cast<const X11SalBitmap&>( rSrcBitmap );