[Libreoffice-commits] .: binfilter/bf_so3 binfilter/bf_xmloff
Christian Lohmaier
cloph at kemper.freedesktop.org
Tue Feb 1 19:19:17 PST 2011
binfilter/bf_so3/source/data/makefile.mk | 2 --
binfilter/bf_so3/source/dialog/makefile.mk | 3 ---
binfilter/bf_so3/source/inplace/makefile.mk | 2 --
binfilter/bf_so3/source/misc/makefile.mk | 3 ---
binfilter/bf_so3/source/ole/makefile.mk | 3 ---
binfilter/bf_so3/source/persist/makefile.mk | 1 -
binfilter/bf_so3/source/solink/makefile.mk | 2 --
binfilter/bf_so3/util/makefile.mk | 2 --
binfilter/bf_xmloff/source/draw/xmloff_propimp0.cxx | 6 +++---
binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx | 8 ++++----
binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx | 2 +-
binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx | 4 ++--
binfilter/bf_xmloff/source/style/xmloff_XMLPercentOrMeasurePropertyHandler.cxx | 2 +-
binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx | 4 ++--
14 files changed, 13 insertions(+), 31 deletions(-)
New commits:
commit 32f27160f9ab1c09fb5493e0b885affa93dd5c9e
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Wed Feb 2 04:21:51 2011 +0100
target.pmk was removed, but not reference to it/WaE initialize variables
diff --git a/binfilter/bf_so3/source/data/makefile.mk b/binfilter/bf_so3/source/data/makefile.mk
index ed1761b..5f7e051 100644
--- a/binfilter/bf_so3/source/data/makefile.mk
+++ b/binfilter/bf_so3/source/data/makefile.mk
@@ -44,5 +44,3 @@ SLOFILES= \
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
-
-.INCLUDE : $(SUBPRJ)$/util$/target.pmk
diff --git a/binfilter/bf_so3/source/dialog/makefile.mk b/binfilter/bf_so3/source/dialog/makefile.mk
index 216a24d..3244e9f 100644
--- a/binfilter/bf_so3/source/dialog/makefile.mk
+++ b/binfilter/bf_so3/source/dialog/makefile.mk
@@ -53,6 +53,3 @@ EXCEPTIONSFILES= \
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
-.INCLUDE : $(SUBPRJ)$/util$/target.pmk
-
diff --git a/binfilter/bf_so3/source/inplace/makefile.mk b/binfilter/bf_so3/source/inplace/makefile.mk
index 0d56060..ed8bac7 100644
--- a/binfilter/bf_so3/source/inplace/makefile.mk
+++ b/binfilter/bf_so3/source/inplace/makefile.mk
@@ -60,5 +60,3 @@ EXCEPTIONSFILES= \
.INCLUDE : target.mk
-
-.INCLUDE : $(SUBPRJ)$/util$/target.pmk
diff --git a/binfilter/bf_so3/source/misc/makefile.mk b/binfilter/bf_so3/source/misc/makefile.mk
index 167c54d..9b3909c 100644
--- a/binfilter/bf_so3/source/misc/makefile.mk
+++ b/binfilter/bf_so3/source/misc/makefile.mk
@@ -62,7 +62,4 @@ EXCEPTIONSFILES= \
# --- Tagets -------------------------------------------------------
-
.INCLUDE : target.mk
-
-.INCLUDE : $(SUBPRJ)$/util$/target.pmk
diff --git a/binfilter/bf_so3/source/ole/makefile.mk b/binfilter/bf_so3/source/ole/makefile.mk
index cc66625..aba536b 100644
--- a/binfilter/bf_so3/source/ole/makefile.mk
+++ b/binfilter/bf_so3/source/ole/makefile.mk
@@ -61,6 +61,3 @@ SLOFILES= \
.INCLUDE : target.mk
-
-.INCLUDE : $(SUBPRJ)$/util$/target.pmk
-
diff --git a/binfilter/bf_so3/source/persist/makefile.mk b/binfilter/bf_so3/source/persist/makefile.mk
index 9dae4cf..be2b963 100644
--- a/binfilter/bf_so3/source/persist/makefile.mk
+++ b/binfilter/bf_so3/source/persist/makefile.mk
@@ -62,4 +62,3 @@ SLOFILES=
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(SUBPRJ)$/util$/target.pmk
diff --git a/binfilter/bf_so3/source/solink/makefile.mk b/binfilter/bf_so3/source/solink/makefile.mk
index 59beaa8..71656cb 100644
--- a/binfilter/bf_so3/source/solink/makefile.mk
+++ b/binfilter/bf_so3/source/solink/makefile.mk
@@ -56,5 +56,3 @@ SLOFILES=\
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
-
-.INCLUDE : $(SUBPRJ)$/util$/target.pmk
diff --git a/binfilter/bf_so3/util/makefile.mk b/binfilter/bf_so3/util/makefile.mk
index 308025c..fdfa39d 100644
--- a/binfilter/bf_so3/util/makefile.mk
+++ b/binfilter/bf_so3/util/makefile.mk
@@ -128,8 +128,6 @@ DEF1DES =StarObjects
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : target.pmk
-
# --- SO2-Filter-Datei ---
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_propimp0.cxx b/binfilter/bf_xmloff/source/draw/xmloff_propimp0.cxx
index 8218591..d4721cb 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_propimp0.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_propimp0.cxx
@@ -80,7 +80,7 @@ sal_Bool XMLDurationPropertyHdl::exportXML(
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
- sal_Int32 nVal;
+ sal_Int32 nVal = 0;
if(rValue >>= nVal)
{
@@ -136,7 +136,7 @@ sal_Bool XMLOpacityPropertyHdl::exportXML(
const SvXMLUnitConverter& rUnitConverter ) const
{
sal_Bool bRet = sal_False;
- sal_uInt16 nVal;
+ sal_uInt16 nVal = 0;
if( rValue >>= nVal )
{
@@ -193,7 +193,7 @@ sal_Bool XMLTextAnimationStepPropertyHdl::exportXML(
const SvXMLUnitConverter& rUnitConverter ) const
{
sal_Bool bRet = sal_False;
- sal_Int16 nVal;
+ sal_Int16 nVal = 0;
if( rValue >>= nVal )
{
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
index 9ed468c..420cc6f 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
@@ -1102,7 +1102,7 @@ void XMLShapeExportPropertyMapper::ContextFilter(
// do not export visual area for internal ole objects
if( pOLEIsInternal )
{
- sal_Bool bInternal;
+ sal_Bool bInternal sal_False;
if( (pOLEIsInternal->maValue >>= bInternal) && bInternal )
{
if( pOLEVisAreaLeft ) pOLEVisAreaLeft->mnIndex = -1;
@@ -1129,7 +1129,7 @@ void XMLShapeExportPropertyMapper::ContextFilter(
if( pRepeatOffsetX && pRepeatOffsetY )
{
- sal_Int32 nOffset;
+ sal_Int32 nOffset = 0;
if( ( pRepeatOffsetX->maValue >>= nOffset ) && ( nOffset == 0 ) )
pRepeatOffsetX->mnIndex = -1;
else
@@ -1139,7 +1139,7 @@ void XMLShapeExportPropertyMapper::ContextFilter(
if(pFontWorkStyle)
{
// #FontWork#
- sal_Int32 nStyle;
+ sal_Int32 nStyle = 0;
if(pFontWorkStyle->maValue >>= nStyle)
{
@@ -1316,7 +1316,7 @@ void XMLPageExportPropertyMapper::ContextFilter(
if( pRepeatOffsetX && pRepeatOffsetY )
{
- sal_Int32 nOffset;
+ sal_Int32 nOffset = 0;
if( ( pRepeatOffsetX->maValue >>= nOffset ) && ( nOffset == 0 ) )
pRepeatOffsetX->mnIndex = -1;
else
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx
index a1e4497..d0d8c1a 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx
@@ -709,7 +709,7 @@ BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const uno::Reference<drawing::XDrawPage>
uno::Reference <beans::XPropertySet> xPropSet(xPage, uno::UNO_QUERY);
if(xPropSet.is())
{
- sal_uInt16 nType;
+ sal_uInt16 nType = 0;
uno::Any aAny;
aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Layout")));
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx
index 43a3cef..c81b6e0 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx
@@ -1167,7 +1167,7 @@ void XMLShapeExport::ImpExportConnectorShape(
rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_START_SHAPE, OUString::valueOf( nShapeId ));
aAny = xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartGluePointIndex")) );
- sal_Int32 nGluePointId;
+ sal_Int32 nGluePointId = 0;
if( aAny >>= nGluePointId )
{
if( nGluePointId != -1 )
@@ -1186,7 +1186,7 @@ void XMLShapeExport::ImpExportConnectorShape(
rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_SHAPE, OUString::valueOf( nShapeId ));
aAny = xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndGluePointIndex")) );
- sal_Int32 nGluePointId;
+ sal_Int32 nGluePointId = 0;
if( aAny >>= nGluePointId )
{
if( nGluePointId != -1 )
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLPercentOrMeasurePropertyHandler.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLPercentOrMeasurePropertyHandler.cxx
index 0144cea..11dbf95 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLPercentOrMeasurePropertyHandler.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLPercentOrMeasurePropertyHandler.cxx
@@ -80,7 +80,7 @@ sal_Bool XMLPercentOrMeasurePropertyHandler::exportXML(
{
OUStringBuffer aOut;
- sal_Int32 nValue;
+ sal_Int32 nValue = 0;
if( !(rValue >>= nValue ) )
return sal_False;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx
index 5d96733..ba405ef 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx
@@ -89,7 +89,7 @@ sal_Bool XMLParaAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any
if(!rValue.hasValue())
return sal_False; //added by BerryJia for fixing Bug102407 2002-11-5
OUStringBuffer aOut;
- sal_Int16 nVal;
+ sal_Int16 nVal = 0;
rValue >>= nVal;
@@ -124,7 +124,7 @@ sal_Bool XMLLastLineAdjustPropHdl::importXML( const OUString& rStrImpValue, uno:
sal_Bool XMLLastLineAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
{
OUStringBuffer aOut;
- sal_Int16 nVal;
+ sal_Int16 nVal = 0;
sal_Bool bRet = sal_False;
rValue >>= nVal;
More information about the Libreoffice-commits
mailing list