[Libreoffice-commits] core.git: 3 commits - include/sal oox/source xmloff/source
Michael Stahl
mstahl at redhat.com
Mon Feb 9 09:14:43 PST 2015
include/sal/log-areas.dox | 5 ++++-
oox/source/export/chartexport.cxx | 6 +++---
xmloff/source/style/DashStyle.cxx | 2 +-
xmloff/source/style/GradientStyle.cxx | 3 +--
xmloff/source/style/HatchStyle.cxx | 3 +--
xmloff/source/style/ImageStyle.cxx | 3 +--
xmloff/source/style/TransGradientStyle.cxx | 3 +--
xmloff/source/text/txtflde.cxx | 6 +++---
xmloff/source/text/txtfldi.cxx | 2 +-
9 files changed, 16 insertions(+), 17 deletions(-)
New commits:
commit 3a6c04eef54129bdcb836785e7ffeff40fe0ef72
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Feb 9 18:08:39 2015 +0100
xmloff: replace legacy DBG_WARNINGs
Change-Id: I79f20f67e623b8d9607374e8be9a78fa10dc9af6
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index a4e26b2..d1aafde 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -188,7 +188,7 @@ void XMLDashStyleImport::importXML(
}
break;
default:
- DBG_WARNING( "Unknown token at import gradient style" );
+ SAL_INFO("xmloff.style", "Unknown token at import dash style");
}
}
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 6a3b749..0ef830b 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -189,8 +189,7 @@ bool XMLGradientStyleImport::importXML(
break;
default:
- DBG_WARNING( "Unknown token at import gradient style" )
- ;
+ SAL_INFO("xmloff.style", "Unknown token at import gradient style");
}
}
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index f3d3244..3dbbb45 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -146,8 +146,7 @@ bool XMLHatchStyleImport::importXML(
break;
default:
- DBG_WARNING( "Unknown token at import hatch style" )
- ;
+ SAL_INFO("xmloff.style", "Unknown token at import hatch style");
}
}
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 64958bd..ec0a53e 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -163,8 +163,7 @@ bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttributeList
// ignore
break;
default:
- DBG_WARNING( "Unknown token at import fill bitmap style" )
- ;
+ SAL_INFO("xmloff.style", "Unknown token at import fill bitmap style");
}
}
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 1442e5a..85c66ec 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -189,8 +189,7 @@ bool XMLTransGradientStyleImport::importXML(
break;
default:
- DBG_WARNING( "Unknown token at import transparency gradient style" )
- ;
+ SAL_INFO("xmloff.style", "Unknown token at import transparency gradient style");
}
}
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 837ebe6..aabd4be 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2887,7 +2887,7 @@ bool XMLTextFieldExport::ExplodeFieldMasterName(
// '.' found?
if (nSeparator <= nLength) {
nSeparator = sMasterName.getLength();
- DBG_WARNING("no field var name!");
+ SAL_WARN("xmloff.text", "no field var name!");
bReturn = false;
}
else
@@ -3278,7 +3278,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapSenderFieldName(
eName = XML_SENDER_STATE_OR_PROVINCE;
break;
default:
- DBG_WARNING("unknown sender type");
+ SAL_WARN("xmloff.text", "unknown sender type");
eName = XML_TOKEN_INVALID;
break;
}
@@ -3339,7 +3339,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapDocInfoFieldName(
eElement = XML_CREATOR;
break;
default:
- DBG_WARNING("unknown docinfo field type!");
+ SAL_WARN("xmloff.text", "unknown docinfo field type!");
eElement = XML_TOKEN_INVALID;
break;
}
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 90d1be3..bdba18f 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -959,7 +959,7 @@ void XMLPageNumberImportContext::PrepareField(
nPageAdjust++;
break;
default:
- DBG_WARNING("unknown page number type");
+ SAL_WARN("xmloff.text", "unknown page number type");
}
aAny <<= nPageAdjust;
xPropertySet->setPropertyValue(sPropertyOffset, aAny);
commit aa685127e756be55a3d4780b4f82c8462ca4e1de
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Feb 9 18:07:11 2015 +0100
oox: replace legacy DBG_WARNINGs
Change-Id: If2c47bbd0c12cc006b38972c5f71eb00d3b03460
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 7437152..5cd30b2 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -784,7 +784,7 @@ void ChartExport::exportExternalData( Reference< ::com::sun::star::chart::XChart
}
catch( beans::UnknownPropertyException & )
{
- DBG_WARNING( "Required property not found in ChartDocument" );
+ SAL_WARN("oox", "Required property not found in ChartDocument");
}
}
if(!externalDataPath.isEmpty())
@@ -844,7 +844,7 @@ void ChartExport::exportChart( Reference< ::com::sun::star::chart::XChartDocumen
}
catch( beans::UnknownPropertyException & )
{
- DBG_WARNING( "Required property not found in ChartDocument" );
+ SAL_WARN("oox", "Required property not found in ChartDocument");
}
} // if( xDocPropSet.is())
@@ -921,7 +921,7 @@ void ChartExport::exportLegend( Reference< ::com::sun::star::chart::XChartDocume
}
catch( beans::UnknownPropertyException & )
{
- DBG_WARNING( "Property Align not found in ChartLegend" );
+ SAL_WARN("oox", "Property Align not found in ChartLegend");
}
const char* strPos = NULL;
commit 8a0fc75030403e1fb09bd60898c771aff454bbd2
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Feb 9 17:56:29 2015 +0100
log-areas.dox: clean up oox mess
Change-Id: Ib1ec1ae009115dcc8f50ca3038bc9a35b7cb09a9
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 80433f1..2d38244 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -179,6 +179,10 @@ certain functionality.
@li @c filter.pict
@li @c filter.tiff
@li @c filter.xslt - xslt import/export
+
+ at section oox
+
+ at li @c oox
@li @c oox.cscode - see oox/source/drawingml/customshapes/README
@li @c oox.csdata - see oox/source/drawingml/customshapes/README
@li @c oox.drawingml - DrawingML
@@ -489,7 +493,6 @@ certain functionality.
@li @c helpcompiler
@li @c linguistic
@li @c mysqlc
- at li @c oox
@li @c postprocess.cppunit
@li @c registry
@li @c reportdesign
More information about the Libreoffice-commits
mailing list