beanshell/ExternalProject_beanshell.mk | 2 +-
cui/source/tabpages/tparea.cxx | 14 ++++++++++++++
cui/source/tabpages/tpbitmap.cxx | 8 ++++++++
cui/source/tabpages/tpcolor.cxx | 1 +
cui/source/tabpages/tpgradnt.cxx | 7 +++++++
cui/source/tabpages/tphatch.cxx | 7 +++++++
cui/source/tabpages/tpshadow.cxx | 4 ++++
hsqldb/ExternalProject_hsqldb.mk | 2 +-
languagetool/ExternalProject_languagetool.mk | 2 +-
9 files changed, 44 insertions(+), 3 deletions(-)
New commits:
commit 72832c448f18381e53cc13dab56df66db21835bd
Author: David Tardon <dtar...@redhat.com>
Date: Wed Feb 6 09:58:51 2013 +0100
add some missing member initializations
Change-Id: I36bab07a127f90f651f3db67831a37bbb78900ce
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index eb31902..9cf8c17 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -240,6 +240,8 @@ void
SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const
SfxItemSet& rInAttrs)
: SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_TRANSPARENCE ),
rInAttrs),
rOutAttrs ( rInAttrs ),
+ eRP ( RP_LT ),
+
nPageType(0),
nDlgType(0),
@@ -644,12 +646,24 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const
SfxItemSet& rInAttrs ) :
aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ),
rOutAttrs ( rInAttrs ),
+ eRP( RP_LT ),
pColorList( NULL ),
pGradientList( NULL ),
pHatchingList( NULL ),
pBitmapList( NULL ),
+ pnColorListState( 0 ),
+ pnBitmapListState( 0 ),
+ pnGradientListState( 0 ),
+ pnHatchingListState( 0 ),
+
+ nPageType( 0 ),
+ nDlgType( 0 ),
+ nPos( LISTBOX_ENTRY_NOTFOUND ),
+
+ pbAreaTP( 0 ),
+
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
aXFillAttr ( pXPool ),
rXFSet ( aXFillAttr.GetItemSet() )
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 713adee..e4ae145 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -79,6 +79,14 @@ SvxBitmapTabPage::SvxBitmapTabPage
aBitmapCtl ( this, aCtlPreview.GetSizePixel() ),
rOutAttrs ( rInAttrs ),
+ pnBitmapListState ( 0 ),
+ pnColorListState ( 0 ),
+ pPageType ( 0 ),
+ pDlgType ( 0 ),
+ pbAreaTP ( 0 ),
+
+ bBmpChanged ( false ),
+
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
aXFStyleItem ( XFILL_BITMAP ),
aXBitmapItem ( String(), XOBitmap() ),
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 97b397f..ac0c085 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -306,6 +306,7 @@ SvxColorTabPage::SvxColorTabPage(Window* pParent, const
SfxItemSet& rInAttrs)
, pShadow ( new SvxColorTabPageShadow() )
, rOutAttrs ( rInAttrs )
// All the horrific pointers we store and should not
+ , pnColorListState( 0 )
, pPageType( NULL )
, pDlgType( NULL )
, pPos( NULL )
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 8aa86a4..1967880 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -78,6 +78,13 @@ SvxGradientTabPage::SvxGradientTabPage
rOutAttrs ( rInAttrs ),
+ pnGradientListState ( 0 ),
+ pnColorListState ( 0 ),
+ pPageType ( 0 ),
+ pDlgType ( 0 ),
+ pPos ( 0 ),
+ pbAreaTP ( 0 ),
+
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
aXFStyleItem ( XFILL_GRADIENT ),
aXGradientItem ( String(), XGradient( COL_BLACK, COL_WHITE ) ),
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index ba211f3..5970907 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -74,6 +74,13 @@ SvxHatchTabPage::SvxHatchTabPage
rOutAttrs ( rInAttrs ),
+ pnHatchingListState ( 0 ),
+ pnColorListState ( 0 ),
+ pPageType ( 0 ),
+ pDlgType ( 0 ),
+ pPos ( 0 ),
+ pbAreaTP ( 0 ),
+
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
aXFStyleItem ( XFILL_HATCH ),
aXHatchItem ( String(), XHatch() ),
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index fa87c6c..66faa42 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -63,6 +63,10 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const
SfxItemSet& rInAttrs
aMtrTransparent ( this, CUI_RES( MTR_SHADOW_TRANSPARENT ) ),
aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ),
rOutAttrs ( rInAttrs ),
+ eRP ( RP_LT ),
+ nPageType ( 0 ),
+ nDlgType ( 0 ),
+ pbAreaTP ( 0 ),
bDisable ( sal_False ),
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
aXFillAttr ( pXPool ),
commit b9f7241f522b913eaf885ee029746edf175c7a1c
Author: David Tardon <dtar...@redhat.com>
Date: Wed Feb 6 07:04:23 2013 +0100
use current version as build.label
Change-Id: Id350532d88ba7c9a54d5440748f5ff456ae58722
diff --git a/beanshell/ExternalProject_beanshell.mk
b/beanshell/ExternalProject_beanshell.mk
index 983537c..94b1d3a 100644
--- a/beanshell/ExternalProject_beanshell.mk
+++ b/beanshell/ExternalProject_beanshell.mk
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,beanshell,build) :
$(ICECREAM_RUN) "$(ANT)" \
-q \
-f build.xml \
- -Dbuild.label="build-libreoffice" \
+
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)"
\
$(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \
,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/hsqldb/ExternalProject_hsqldb.mk b/hsqldb/ExternalProject_hsqldb.mk
index 6863145..0ed22a3 100644
--- a/hsqldb/ExternalProject_hsqldb.mk
+++ b/hsqldb/ExternalProject_hsqldb.mk
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,hsqldb,build) :
$(ICECREAM_RUN) "$(ANT)" \
-q \
-f build/build.xml \
- -Dbuild.label="build-libreoffice" \
+
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)"
\
$(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \
,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/languagetool/ExternalProject_languagetool.mk
b/languagetool/ExternalProject_languagetool.mk
index 363fde5..3040689 100644
--- a/languagetool/ExternalProject_languagetool.mk
+++ b/languagetool/ExternalProject_languagetool.mk
@@ -20,7 +20,7 @@ $(call
gb_ExternalProject_get_state_target,languagetool,build) : $(call gb_Jar_g
$(ICECREAM_RUN) "$(ANT)" \
-q \
-f build.xml \
- -Dbuild.label="build-libreoffice" \
+
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)"
\
$(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \
,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
