[Libreoffice-commits] .: xmloff/source
xmloff/source/draw/shapeexport4.cxx| 24
xmloff/source/draw/ximpcustomshape.cxx | 28
2 files changed, 52 insertions(+)
New commits:
commit 143ecebc73e84dfcafdc2577f811152b4a415fde
Author: Radek Doulik r...@novell.com
Date: Fri Feb 1 12:25:23 2013 +0100
export darken/darkeless/lighten/lightenless commands
Change-Id: I4531ab82a52e3da41f12409185f7c0730381aa23
diff --git a/xmloff/source/draw/shapeexport4.cxx
b/xmloff/source/draw/shapeexport4.cxx
index 1bb5481..ce504fe 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -413,6 +413,30 @@ void ImpExportEnhancedPath( SvXMLExport rExport,
i += 2;
}
break;
+case
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKEN :
+if ( bExtended )
+aStrBuffer.append( (sal_Unicode)'H' );
+else
+bNeedExtended = true;
+break;
+case
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS :
+if ( bExtended )
+aStrBuffer.append( (sal_Unicode)'I' );
+else
+bNeedExtended = true;
+break;
+case
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN :
+if ( bExtended )
+aStrBuffer.append( (sal_Unicode)'J' );
+else
+bNeedExtended = true;
+break;
+case
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS :
+if ( bExtended )
+aStrBuffer.append( (sal_Unicode)'K' );
+else
+bNeedExtended = true;
+break;
default : // ups, seems to be something wrong
{
aSegment.Count = 1;
diff --git a/xmloff/source/draw/ximpcustomshape.cxx
b/xmloff/source/draw/ximpcustomshape.cxx
index a3406ed..1a280ef 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -702,6 +702,34 @@ void GetEnhancedPath( std::vector
com::sun::star::beans::PropertyValue rDest
nIndex++;
}
break;
+case 'H' :
+{
+nLatestSegmentCommand =
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKEN;
+nParametersNeeded = 0;
+nIndex++;
+}
+break;
+case 'I' :
+{
+nLatestSegmentCommand =
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS;
+nParametersNeeded = 0;
+nIndex++;
+}
+break;
+case 'J' :
+{
+nLatestSegmentCommand =
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN;
+nParametersNeeded = 0;
+nIndex++;
+}
+break;
+case 'K' :
+{
+nLatestSegmentCommand =
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS;
+nParametersNeeded = 0;
+nIndex++;
+}
+break;
case 'W' :
{
nLatestSegmentCommand =
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/xforms/XFormsBindContext.cxx | 18 ++---
xmloff/source/xforms/XFormsModelContext.cxx |2 -
xmloff/source/xforms/XFormsSubmissionContext.cxx | 30 +++
xmloff/source/xforms/xformsapi.cxx |4 +--
xmloff/source/xforms/xformsapi.hxx |3 --
xmloff/source/xforms/xformsexport.cxx| 28 ++---
6 files changed, 41 insertions(+), 44 deletions(-)
New commits:
commit c4770788cba4bc3658285d955f5753e437b88998
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jan 29 09:43:53 2013 +0100
xmloff: no longer necessary OUTSTRING() macro
Change-Id: I60f588efb35d5968c21b7b0e0fc29bcbbd2dd50d
diff --git a/xmloff/source/xforms/XFormsBindContext.cxx
b/xmloff/source/xforms/XFormsBindContext.cxx
index 3929317..eee251b 100644
--- a/xmloff/source/xforms/XFormsBindContext.cxx
+++ b/xmloff/source/xforms/XFormsBindContext.cxx
@@ -90,28 +90,28 @@ void XFormsBindContext::HandleAttribute( sal_uInt16 nToken,
switch( nToken )
{
case XML_NODESET:
-xforms_setValue( mxBinding, OUSTRING(BindingExpression), rValue );
+xforms_setValue( mxBinding, BindingExpression, rValue );
break;
case XML_ID:
-xforms_setValue( mxBinding, OUSTRING(BindingID), rValue );
+xforms_setValue( mxBinding, BindingID, rValue );
break;
case XML_READONLY:
-xforms_setValue( mxBinding, OUSTRING(ReadonlyExpression), rValue );
+xforms_setValue( mxBinding, ReadonlyExpression, rValue );
break;
case XML_RELEVANT:
-xforms_setValue( mxBinding, OUSTRING(RelevantExpression), rValue );
+xforms_setValue( mxBinding, RelevantExpression, rValue );
break;
case XML_REQUIRED:
-xforms_setValue( mxBinding, OUSTRING(RequiredExpression), rValue );
+xforms_setValue( mxBinding, RequiredExpression, rValue );
break;
case XML_CONSTRAINT:
-xforms_setValue( mxBinding, OUSTRING(ConstraintExpression), rValue );
+xforms_setValue( mxBinding, ConstraintExpression, rValue );
break;
case XML_CALCULATE:
-xforms_setValue( mxBinding, OUSTRING(CalculateExpression), rValue );
+xforms_setValue( mxBinding, CalculateExpression, rValue );
break;
case XML_TYPE:
-xforms_setValue( mxBinding, OUSTRING(Type),
+xforms_setValue( mxBinding, Type,
makeAny( xforms_getTypeName(
mxModel-getDataTypeRepository(),
GetImport().GetNamespaceMap(),
rValue ) ) );
@@ -127,7 +127,7 @@ void XFormsBindContext::StartElement(
{
// we need to register the namespaces
ReferenceXNameContainer xContainer(
-mxBinding-getPropertyValue( OUSTRING(BindingNamespaces) ),
+mxBinding-getPropertyValue( BindingNamespaces ),
UNO_QUERY );
DBG_ASSERT( xContainer.is(), binding should have a namespace container );
diff --git a/xmloff/source/xforms/XFormsModelContext.cxx
b/xmloff/source/xforms/XFormsModelContext.cxx
index 0a09c23..3a47de5 100644
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -91,7 +91,7 @@ void XFormsModelContext::HandleAttribute(
switch( nToken )
{
case XML_ID:
-mxModel-setPropertyValue( OUSTRING(ID), makeAny( rValue ) );
+mxModel-setPropertyValue( ID, makeAny( rValue ) );
break;
case XML_SCHEMA:
GetImport().SetError( XMLERROR_XFORMS_NO_SCHEMA_SUPPORT );
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx
b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index b783427..7ad50a6 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -106,50 +106,50 @@ void XFormsSubmissionContext::HandleAttribute( sal_uInt16
nToken,
switch( nToken )
{
case XML_ID:
-xforms_setValue( mxSubmission, OUSTRING(ID), rValue );
+xforms_setValue( mxSubmission, ID, rValue );
break;
case XML_BIND:
-xforms_setValue( mxSubmission, OUSTRING(Bind), rValue );
+xforms_setValue( mxSubmission, Bind, rValue );
break;
case XML_REF:
-xforms_setValue( mxSubmission, OUSTRING(Ref), rValue );
+xforms_setValue( mxSubmission, Ref, rValue );
break;
case XML_ACTION:
-xforms_setValue( mxSubmission, OUSTRING(Action), rValue );
+xforms_setValue( mxSubmission, Action, rValue );
break;
case XML_METHOD:
-xforms_setValue( mxSubmission, OUSTRING(Method), rValue );
+xforms_setValue( mxSubmission, Method, rValue );
break;
case XML_VERSION:
-xforms_setValue( mxSubmission, OUSTRING(Version), rValue );
+xforms_setValue( mxSubmission, Version, rValue );
break;
case XML_INDENT:
-xforms_setValue( mxSubmission,
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/SchXMLTools.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c1760a241b3f0362338d09460ac7dd2e1f2b25aa
Author: Tor Lillqvist t...@iki.fi
Date: Thu Jan 24 13:27:17 2013 +0200
WaE: 'bVal' may be used uninitialized in this function
Seen in the MacOSX-Intel_1-built_no-moz_on_10.6.8 tinderbox build log,
not in an own build.
Change-Id: I1b5c87d3c1876821981d8f8a7b089b81659e5c7b
diff --git a/xmloff/source/chart/SchXMLTools.cxx
b/xmloff/source/chart/SchXMLTools.cxx
index 2e469a4..5752fad 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -383,7 +383,7 @@ Reference chart2::data::XDataSequence CreateDataSequence(
{
try
{
-sal_Bool bVal;
+sal_Bool bVal = sal_False;
uno::Any any =
xPropSet-getPropertyValue(UseInternalDataProvider);
if (any = bVal)
bUseInternal = static_castbool(bVal);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/txtexppr.cxx |8
xmloff/source/text/txtimppr.cxx | 23 ++-
2 files changed, 30 insertions(+), 1 deletion(-)
New commits:
commit 23c099a0236062724430efb986251637095c8d4f
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 17 12:41:11 2013 +
Resolves: fdo#58730 workaround [UL|LR]Space 100% problem
If all paragraph margins are 100% on import, ignore that as being the
implicit
default. That avoids explicit 100% being set onto the awesome [UL|LR]Space
which takes a relative propsize of 100% as a flag that its value field is
absolute and so rejected by SwTxtFmtColl::Modify as a candidate for getting
its
true value initialized relative to its parent, so it ends up as an absolute 0
Always elide the property on export because writing individual
margin-foos provides better backward compatibility with older versions
anyway.
Trigged by 3c5facfce42a0dbe362d6b9fa5ac374fd76f51a1
Change-Id: I55f6ceeae287b7d8e99befa4bd3cc06738a21299
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index ceff1d0..56e36e7 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -455,6 +455,8 @@ void XMLTextExportPropertySetMapper::ContextFilter(
XMLPropertyState* pClip11State = NULL;
XMLPropertyState* pClipState = NULL;
+// filter fo:margin
+XMLPropertyState* pAllParaMarginRel = NULL;
XMLPropertyState* pAllParaMargin = NULL;
XMLPropertyState* pAllMargin = NULL;
@@ -572,6 +574,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
case CTF_NUMBERINGSTYLENAME:pListStyleName = propertie; break;
case CTF_TEXT_CLIP11: pClip11State = propertie; break;
case CTF_TEXT_CLIP: pClipState = propertie; break;
+case CTF_PARAMARGINALL_REL: pAllParaMarginRel = propertie; break;
case CTF_PARAMARGINALL: pAllParaMargin = propertie; break;
case CTF_MARGINALL: pAllMargin = propertie; break;
}
@@ -625,6 +628,11 @@ void XMLTextExportPropertySetMapper::ContextFilter(
lcl_checkMultiProperty(pParaBottomMarginState, pParaBottomMarginRelState);
lcl_checkMultiProperty(pParaFirstLineState, pParaFirstLineRelState);
+if (pAllParaMarginRel)
+{ // because older OOo/LO versions can't read fo:margin:
+pAllParaMarginRel-mnIndex = -1; // just export individual
attributes...
+pAllParaMarginRel-maValue.clear();
+}
if (pAllParaMargin)
{
pAllParaMargin-mnIndex = -1; // just export individual attributes...
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index be8ef01..ef9758a 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -257,6 +257,26 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck(
}
}
+//fdo#58730 The [UL|LR]Space class has a deficiency where 100% also serves as
+//a flag that the value is an absolute value so we can't truly handle an
+//up/lower space property which wants to specify its 200% upper but 100% lower
+//of its parent (try typing 100% vs 200% into the edit style dialog and revisit
+//your style). So on xml load that ends up meaning 200%, 0 lower. This is a
+//crock.
+//
+//On import clear 100% all-margins relative sizes.
+static bool
+isNotDefaultRelSize(const XMLPropertyState* pRelState, const
UniReferenceXMLPropertySetMapper rPrMap)
+{
+if (rPrMap-GetEntryContextId(pRelState-mnIndex) == CTF_PARAMARGINALL_REL)
+{
+sal_Int32 nTemp = 0;
+pRelState-maValue = nTemp;
+return nTemp != 100;
+}
+return true;
+}
+
void XMLTextImportPropertyMapper::finished(
::std::vector XMLPropertyState rProperties,
sal_Int32 /*nStartIndex*/, sal_Int32 /*nEndIndex*/ ) const
@@ -425,7 +445,8 @@ void XMLTextImportPropertyMapper::finished(
for (sal_uInt16 i = 0; i 4; i++)
{
-if (pAllParaMargin !pParaMargins[i])
+if (pAllParaMargin !pParaMargins[i]
+ isNotDefaultRelSize(pAllParaMargin, getPropertySetMapper()))
{
#if OSL_DEBUG_LEVEL 0
sal_Int16 nTmp = getPropertySetMapper()-GetEntryContextId(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/xmlnumfi.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 5693934456f917861af7cb02734578b049a46940
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Jan 3 02:18:25 2013 +0100
limit the number of imported digits, fdo#58539
This should fix the crash with gnome#627420.
Change-Id: Ibfff498282dc1c6fe9124ced645392107ef8829f
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 7b0799c..8b57734 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -916,6 +916,8 @@ static void lcl_EnquoteIfNecessary( rtl::OUStringBuffer
rContent, const SvXMLNu
// SvXMLNumFmtElementContext
//
+const sal_Int32 MAX_SECOND_DIGITS = 20; // fdo#58539 gnome#627420: limit
number of digits during import
+
SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport rImport,
sal_uInt16 nPrfx, const rtl::OUString
rLName,
SvXMLNumFormatContext rParentContext,
sal_uInt16 nNewType,
@@ -948,7 +950,7 @@ SvXMLNumFmtElementContext::SvXMLNumFmtElementContext(
SvXMLImport rImport,
{
case XML_TOK_ELEM_ATTR_DECIMAL_PLACES:
if (::sax::Converter::convertNumber( nAttrVal, sValue, 0 ))
-aNumInfo.nDecimals = nAttrVal;
+aNumInfo.nDecimals = std::minsal_Int32(nAttrVal,
MAX_SECOND_DIGITS);
break;
case XML_TOK_ELEM_ATTR_MIN_INTEGER_DIGITS:
if (::sax::Converter::convertNumber( nAttrVal, sValue, 0 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/SchXMLAxisContext.cxx |2 -
xmloff/source/chart/SchXMLChartContext.cxx |2 -
xmloff/source/chart/SchXMLExport.cxx |2 -
xmloff/source/chart/SchXMLPlotAreaContext.cxx |3 -
xmloff/source/chart/SchXMLSeries2Context.cxx |4 +-
xmloff/source/chart/SchXMLTools.cxx| 50 -
xmloff/source/draw/animationimport.cxx |2 -
xmloff/source/draw/eventimp.cxx|4 +-
xmloff/source/draw/shapeexport2.cxx|4 +-
xmloff/source/forms/elementimport.cxx |2 -
xmloff/source/forms/propertyexport.cxx |3 -
xmloff/source/style/xmlnumfi.cxx |4 +-
xmloff/source/text/txtflde.cxx |6 +--
xmloff/source/transform/EventOASISTContext.cxx |4 +-
xmloff/source/transform/TransformerBase.cxx|4 +-
15 files changed, 47 insertions(+), 49 deletions(-)
New commits:
commit 4fd5136cbd1baa86361e84e3e3b146ba29d7d316
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Dec 28 13:36:36 2012 +0100
xmloff: mostly kill CONSTASCII_STRINGPARAM usage
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx
b/xmloff/source/chart/SchXMLAxisContext.cxx
index 3ddf60b..b14618f 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -779,7 +779,7 @@ void SchXMLAxisContext::CorrectAxisPositions( const
Reference chart2::XChartDoc
if( xMainXAxisProp.is() xMainYAxisProp.is() )
{
chart2::ScaleData aMainXScale =
xMainXAxis-getScaleData();
-if( 0 == rChartTypeServiceName.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM( com.sun.star.chart2.ScatterChartType ) ) )
+if( 0 == rChartTypeServiceName.reverseCompareTo(
com.sun.star.chart2.ScatterChartType ) )
{
xMainYAxisProp-setPropertyValue(
OUString(CrossoverPosition)
, uno::makeAny(
::com::sun::star::chart::ChartAxisPosition_VALUE) );
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx
b/xmloff/source/chart/SchXMLChartContext.cxx
index 608c342..0632b6b 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -862,7 +862,7 @@ void SchXMLChartContext::EndElement()
bool bLinesOn = true;
if( (maSeriesDefaultsAndStyles.maLinesOnProperty = bLinesOn)
!bLinesOn )
{
-if( 0 == maChartTypeServiceName.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM( com.sun.star.chart2.ScatterChartType ) ) )
+if( 0 == maChartTypeServiceName.reverseCompareTo(
com.sun.star.chart2.ScatterChartType ) )
{
bSwitchOffLinesForScatter = true;
SchXMLSeries2Context::switchSeriesLinesOff(
maSeriesDefaultsAndStyles.maSeriesStyleList );
diff --git a/xmloff/source/chart/SchXMLExport.cxx
b/xmloff/source/chart/SchXMLExport.cxx
index a84f714..e15819b 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2088,7 +2088,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
// stock-chart elements
OUString sChartType ( xDiagram-getDiagramType());
-if( 0 == sChartType.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM(
com.sun.star.chart.StockDiagram )))
+if( 0 == sChartType.reverseCompareTo( com.sun.star.chart.StockDiagram ))
{
Reference chart::XStatisticDisplay xStockPropProvider( xDiagram,
uno::UNO_QUERY );
if( xStockPropProvider.is())
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 0697e8e..8d10bf1 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -598,8 +598,7 @@ void SchXMLPlotAreaContext::EndElement()
}
// #i32366# stock has volume
-if( ( 0 == mxDiagram-getDiagramType().reverseCompareToAsciiL(
- RTL_CONSTASCII_STRINGPARAM(
com.sun.star.chart.StockDiagram )))
+if( ( 0 ==
mxDiagram-getDiagramType().reverseCompareTo(com.sun.star.chart.StockDiagram
))
mbStockHasVolume )
{
try
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx
b/xmloff/source/chart/SchXMLSeries2Context.cxx
index e3188b9..2764efc 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -275,9 +275,9 @@ SchXMLSeries2Context::SchXMLSeries2Context(
mbSymbolSizeIsMissingInFile(false),
maChartSize( rChartSize )
{
-if( 0 == aGlobalChartTypeName.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM( com.sun.star.chart2.DonutChartType ) ) )
+if( 0 == aGlobalChartTypeName.reverseCompareTo(
com.sun.star.chart2.DonutChartType ) )
{
-
[Libreoffice-commits] .: xmloff/source
xmloff/source/draw/shapeexport2.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 9e41982ac165092ed024b8ab318eedc7fcf4c6a9
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Dec 26 19:57:34 2012 +0100
text:p is not allowed for chart objects, fdo#58571
Change-Id: I24c485d31ea3f0540164ff65074b392be1e557e6
diff --git a/xmloff/source/draw/shapeexport2.cxx
b/xmloff/source/draw/shapeexport2.cxx
index d4f1e23..2ebd96a 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -1662,8 +1662,12 @@ void XMLShapeExport::ImpExportOLE2Shape(
if( !sClassId.isEmpty() )
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CLASS_ID,
sClassId );
-// #i118485# Add text export, the draw OLE shape allows text
now
-ImpExportText( xShape );
+if(eShapeType != XmlShapeTypePresChartShape eShapeType !=
XmlShapeTypeDrawChartShape)
+{
+// #i118485# Add text export, the draw OLE shape allows
text now
+// fdo#58571 chart objects don't allow text:p
+ImpExportText( xShape );
+}
if(!bExportEmbedded)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/xmlstyle.cxx |6 ++---
xmloff/source/text/XMLLineNumberingImportContext.cxx | 22 +--
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit da8af42a2d783588359d33f79d15b94fa0d91bb4
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Sat Nov 24 16:34:13 2012 +0100
Removed RTL_CONSTASCII_USTRINGPARAM
Change-Id: Ifb14257ef20c14f8e1551a1470d0dbea1dc0759b
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 433b140..b69f3f6 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -418,7 +418,7 @@ SvXMLStyleContext
*SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr
{
const SvXMLTokenMap rTokenMap = GetStyleStylesElemTokenMap();
sal_uInt16 nToken = rTokenMap.Get( p_nPrefix, rLocalName );
-switch( nToken )
+switch( nToken )
{
case XML_TOK_STYLE_STYLE:
case XML_TOK_STYLE_DEFAULT_STYLE:
@@ -804,8 +804,8 @@ SvXMLStylesContext::SvXMLStylesContext( SvXMLImport
rImport, sal_uInt16 nPrfx,
const OUString rLName,
const uno::Reference
xml::sax::XAttributeList , sal_Bool bAuto ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
-msParaStyleServiceName( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.style.ParagraphStyle ) ),
-msTextStyleServiceName( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.style.CharacterStyle ) ),
+msParaStyleServiceName( com.sun.star.style.ParagraphStyle ),
+msTextStyleServiceName( com.sun.star.style.CharacterStyle ),
mpImpl( new SvXMLStylesContext_Impl( bAuto ) ),
mpStyleStylesElemTokenMap( 0 )
{
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx
b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 103e5d6..77dd3ba 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -51,17 +51,17 @@
XMLLineNumberingImportContext::XMLLineNumberingImportContext(
const OUString rLocalName,
const ReferenceXAttributeList xAttrList)
: SvXMLStyleContext(rImport, nPrfx, rLocalName, xAttrList,
XML_STYLE_FAMILY_TEXT_LINENUMBERINGCONFIG)
-, sCharStyleName(RTL_CONSTASCII_USTRINGPARAM(CharStyleName))
-, sCountEmptyLines(RTL_CONSTASCII_USTRINGPARAM(CountEmptyLines))
-, sCountLinesInFrames(RTL_CONSTASCII_USTRINGPARAM(CountLinesInFrames))
-, sDistance(RTL_CONSTASCII_USTRINGPARAM(Distance))
-, sInterval(RTL_CONSTASCII_USTRINGPARAM(Interval))
-, sSeparatorText(RTL_CONSTASCII_USTRINGPARAM(SeparatorText))
-, sNumberPosition(RTL_CONSTASCII_USTRINGPARAM(NumberPosition))
-, sNumberingType(RTL_CONSTASCII_USTRINGPARAM(NumberingType))
-, sIsOn(RTL_CONSTASCII_USTRINGPARAM(IsOn))
-, sRestartAtEachPage(RTL_CONSTASCII_USTRINGPARAM(RestartAtEachPage))
-, sSeparatorInterval(RTL_CONSTASCII_USTRINGPARAM(SeparatorInterval))
+, sCharStyleName(CharStyleName)
+, sCountEmptyLines(CountEmptyLines)
+, sCountLinesInFrames(CountLinesInFrames)
+, sDistance(Distance)
+, sInterval(Interval)
+, sSeparatorText(SeparatorText)
+, sNumberPosition(NumberPosition)
+, sNumberingType(NumberingType)
+, sIsOn(IsOn)
+, sRestartAtEachPage(RestartAtEachPage)
+, sSeparatorInterval(SeparatorInterval)
, sNumFormat(GetXMLToken(XML_1))
, sNumLetterSync(GetXMLToken(XML_FALSE))
, nOffset(-1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/core/DocumentSettingsContext.cxx| 42 +--
xmloff/source/core/DomExport.cxx |4
xmloff/source/core/SettingsExportHelper.cxx | 54 ++--
xmloff/source/core/XMLEmbeddedObjectImportContext.cxx |2
xmloff/source/core/xmlexp.cxx | 10
xmloff/source/core/xmlimp.cxx | 229 ++
xmloff/source/core/xmlmultiimagehelper.cxx| 16 -
7 files changed, 140 insertions(+), 217 deletions(-)
New commits:
commit 649c6b38911e9b77d21efba5fa1d6affa9fc4b0e
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Tue Dec 4 14:35:40 2012 +0100
RTL_CONSTASCII_USTRINGPARAM clean up
Change-Id: I4d57a449c2bd61be0cb7b7ed9016b3ee71825b57
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx
b/xmloff/source/core/DocumentSettingsContext.cxx
index 0af9f1b..6ec025c 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -106,7 +106,7 @@ uno::Referencecontainer::XNameContainer
XMLMyList::GetNameContainer()
if( mxServiceFactory.is() )
{
-rtl::OUString
sName(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.document.NamedPropertyValues));
+rtl::OUString sName(com.sun.star.document.NamedPropertyValues);
xNameContainer =
uno::Referencecontainer::XNameContainer(mxServiceFactory-createInstance(sName),
uno::UNO_QUERY);
if (xNameContainer.is())
{
@@ -128,7 +128,7 @@ uno::Referencecontainer::XIndexContainer
XMLMyList::GetIndexContainer()
if( mxServiceFactory.is() )
{
-rtl::OUString
sName(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.document.IndexedPropertyValues));
+rtl::OUString sName(com.sun.star.document.IndexedPropertyValues);
xIndexContainer =
uno::Referencecontainer::XIndexContainer(mxServiceFactory-createInstance(sName),
uno::UNO_QUERY);
if (xIndexContainer.is())
{
@@ -683,16 +683,14 @@ void XMLConfigItemContext::EndElement()
* manipulate the values accordingly. */
void XMLConfigItemContext::ManipulateConfigItem()
{
-if( mrItemName.equalsAsciiL(
-RTL_CONSTASCII_STRINGPARAM( PrinterIndependentLayout ) ) )
+if( mrItemName == PrinterIndependentLayout )
{
rtl::OUString sValue;
mrAny = sValue;
sal_Int16 nTmp = document::PrinterIndependentLayout::HIGH_RESOLUTION;
-if( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(enabled)) ||
-sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(low-resolution)) )
+if( sValue == enabled || sValue == low-resolution )
{
nTmp = document::PrinterIndependentLayout::LOW_RESOLUTION;
}
@@ -797,7 +795,7 @@ void XMLConfigItemMapIndexedContext::EndElement()
uno::Reference lang::XMultiServiceFactory xFac(
GetImport().GetModel(), uno::UNO_QUERY );
if( xFac.is() )
{
-uno::Reference beans::XPropertySet xProps(
xFac-createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.document.Settings ) ) ), uno::UNO_QUERY );
+uno::Reference beans::XPropertySet xProps(
xFac-createInstance( com.sun.star.document.Settings ), uno::UNO_QUERY );
if( xProps.is()
xProps-getPropertySetInfo()-hasPropertyByName( maConfigItemName ) )
{
xProps-getPropertyValue( maConfigItemName ) =
xForbChars;
@@ -818,11 +816,11 @@ void XMLConfigItemMapIndexedContext::EndElement()
beans::PropertyValue *pForChar = aProps.getArray();
i18n::ForbiddenCharacters aForbid;
lang::Locale aLocale;
-const rtl::OUString sLanguage (
RTL_CONSTASCII_USTRINGPARAM ( Language ) );
-const rtl::OUString sCountry (
RTL_CONSTASCII_USTRINGPARAM ( Country ) );
-const rtl::OUString sVariant (
RTL_CONSTASCII_USTRINGPARAM ( Variant ) );
-const rtl::OUString sBeginLine (
RTL_CONSTASCII_USTRINGPARAM ( BeginLine ) );
-const rtl::OUString sEndLine (
RTL_CONSTASCII_USTRINGPARAM ( EndLine ) );
+const rtl::OUString sLanguage ( Language );
+const rtl::OUString sCountry ( Country );
+const rtl::OUString sVariant ( Variant );
+const rtl::OUString sBeginLine ( BeginLine );
+const rtl::OUString sEndLine ( EndLine );
sal_Bool bHaveLanguage = sal_False, bHaveCountry =
sal_False, bHaveVariant = sal_False,
bHaveBegin = sal_False, bHaveEnd = sal_False;
@@ -886,16 +884,16 @@ void XMLConfigItemMapIndexedContext::EndElement()
formula::SymbolDescriptor *pDescriptor = aSymbolList.getArray();
-const rtl::OUString sName
Re: [Libreoffice-commits] .: xmloff/source
On Saturday 08 of December 2012, Libreoffice Gerrit user wrote:
xmloff/source/core/DocumentSettingsContext.cxx| 42 +--
xmloff/source/core/DomExport.cxx |4
xmloff/source/core/SettingsExportHelper.cxx | 54 ++--
xmloff/source/core/XMLEmbeddedObjectImportContext.cxx |2
xmloff/source/core/xmlexp.cxx | 10
xmloff/source/core/xmlimp.cxx | 229
++ xmloff/source/core/xmlmultiimagehelper.cxx|
16 -
7 files changed, 140 insertions(+), 217 deletions(-)
New commits:
commit 649c6b38911e9b77d21efba5fa1d6affa9fc4b0e
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Tue Dec 4 14:35:40 2012 +0100
RTL_CONSTASCII_USTRINGPARAM clean up
...
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx
b/xmloff/source/core/xmlmultiimagehelper.cxx index c2214f2..e060de1 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -33,37 +33,37 @@ namespace
sal_uInt32 nRetval(0);
// pixel formats first
-if(rString.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM(.bmp)))
+if(rString.endsWithAsciiL(.bmp, 4))
{
return 10;
}
-if(rString.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM(.gif)))
+if(rString.endsWithAsciiL(.gif, 4))
...
These should be rString.endsWith( .gif ) . Specifying the length manually
is error-prone and unnecessary.
--
Lubos Lunak
l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/XMLFontAutoStylePool.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5f82ec11789a201e38565f59ce7d598b3d17827f
Author: Tor Lillqvist t...@iki.fi
Date: Wed Nov 28 21:13:46 2012 +0200
OUString::trim() does not modify in-place
Change-Id: I9efc0ef7e8fa433352dcbc3d3173b95fdf838e20
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx
b/xmloff/source/style/XMLFontAutoStylePool.cxx
index ca1d8a5..a496e79 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -165,7 +165,7 @@ OUString XMLFontAutoStylePool::Add(
else if( nLen 0 )
{
sName = rFamilyName.copy( 0, nLen );
-sName.trim();
+sName = sName.trim();
}
if( sName.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/XMLTextFrameContext.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9ebc1ab13854f44af64b2d63717e631542d9374c
Author: Tor Lillqvist t...@iki.fi
Date: Wed Nov 28 21:26:01 2012 +0200
OUString::trim() does not modify in-place
Change-Id: I68227dcf77b9082708503d2c0d9bf829d78a442e
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx
b/xmloff/source/text/XMLTextFrameContext.cxx
index f82811c..6e8fc2e 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -1044,7 +1044,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl(
case XML_TOK_TEXT_FRAME_TRANSFORM:
{
OUString sValue( rValue );
-sValue.trim();
+sValue = sValue.trim();
const OUString aRotate(GetXMLToken(XML_ROTATE));
const sal_Int32 nRotateLen(aRotate.getLength());
sal_Int32 nLen = sValue.getLength();
@@ -1054,7 +1054,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl(
')' == sValue[nLen-1] )
{
sValue = sValue.copy( nRotateLen+1, nLen-(nRotateLen+2) );
-sValue.trim();
+sValue = sValue.trim();
sal_Int32 nVal;
if (::sax::Converter::convertNumber( nVal, sValue ))
nRotation = (sal_Int16)(nVal % 360 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/xmlnumfe.cxx | 15 ---
xmloff/source/style/xmlnumfi.cxx | 12 ++--
2 files changed, 14 insertions(+), 13 deletions(-)
New commits:
commit ec2e175384f89d183def1d53f33a6bb394278c87
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 18:55:33 2012 +0100
use LanguageTag
Change-Id: I568af42912ce1ec7701dc0043dfbd9d69243d533
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 295b2c9..a2f85a4 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -22,6 +22,7 @@
#include svl/zformat.hxx
#include svl/numuno.hxx
#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include tools/debug.hxx
#include rtl/math.hxx
#include unotools/calendarwrapper.hxx
@@ -243,7 +244,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
}
else
{
-lang::Locale aLocale( MsLangId::convertLanguageToLocale(
MsLangId::getSystemLanguage() ) );
+lang::Locale aLocale( LanguageTag( MsLangId::getSystemLanguage()
).getLocale() );
pCharClass = new CharClass(
comphelper::getComponentContext(rExport.getServiceFactory()), aLocale );
pLocaleData = new LocaleDataWrapper(
comphelper::getComponentContext(rExport.getServiceFactory()), aLocale );
@@ -278,7 +279,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
}
else
{
-lang::Locale aLocale( MsLangId::convertLanguageToLocale(
MsLangId::getSystemLanguage() ) );
+lang::Locale aLocale( LanguageTag( MsLangId::getSystemLanguage()
).getLocale() );
pCharClass = new CharClass(
comphelper::getComponentContext(rExport.getServiceFactory()), aLocale );
pLocaleData = new LocaleDataWrapper(
comphelper::getComponentContext(rExport.getServiceFactory()), aLocale );
@@ -342,7 +343,7 @@ void SvXMLNumFmtExport::AddLanguageAttr_Impl( sal_Int32
nLang )
if ( nLang != LANGUAGE_SYSTEM )
{
OUString aLangStr, aCountryStr;
-MsLangId::convertLanguageToIsoNames( (LanguageType)nLang, aLangStr,
aCountryStr );
+LanguageTag( (LanguageType)nLang ).getIsoLanguageCountry( aLangStr,
aCountryStr );
if (!aLangStr.isEmpty())
rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_LANGUAGE, aLangStr
);
@@ -798,7 +799,7 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl(
const OUString rString,
sal_Bool bRet = sal_False;
-LanguageType nLang = MsLangId::convertLocaleToLanguage( rLocale );
+LanguageType nLang = LanguageTag( rLocale ).getLanguageType( false);
pFormatter-ChangeIntl( nLang );
String sCurString, sDummy;
pFormatter-GetCompatibilityCurrency( sCurString, sDummy );
@@ -841,7 +842,7 @@ static OUString lcl_GetDefaultCalendar( SvNumberFormatter*
pFormatter, LanguageT
CalendarWrapper* pCalendar = pFormatter-GetCalendar();
if (pCalendar)
{
-lang::Locale aLocale( MsLangId::convertLanguageToLocale( nLang ) );
+lang::Locale aLocale( LanguageTag( nLang ).getLocale() );
uno::SequenceOUString aCals = pCalendar-getAllCalendars( aLocale );
sal_Int32 nCnt = aCals.getLength();
@@ -1311,7 +1312,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const
SvNumberformat rFormat, sal_uInt
// automatic currency symbol is implemented as
part of
// normal text - search for the symbol
bCurrencyWritten = WriteTextWithCurrency_Impl(
*pElemStr,
-MsLangId::convertLanguageToLocale( nLang ) );
+LanguageTag( nLang ).getLocale() );
bAnyContent = sal_True;
}
else
@@ -1486,7 +1487,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const
SvNumberformat rFormat, sal_uInt
if ( nElemType == NF_KEY_ )
{
// write additional text element for separator
-pLocaleData-setLocale(
MsLangId::convertLanguageToLocale( nLang ) );
+pLocaleData-setLocale( LanguageTag( nLang
).getLocale() );
AddToTextElement_Impl(
pLocaleData-getLongDateDayOfWeekSep() );
}
}
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index abfbc36..f5b8c21 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -26,7 +26,7 @@
#include svl/zformat.hxx
#include svl/numuno.hxx
#include rtl/math.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include tools/color.hxx
#include tools/debug.hxx
#include rtl/ustrbuf.hxx
@@ -602,9 +602,9 @@ const LocaleDataWrapper SvXMLNumImpData::GetLocaleData(
LanguageType nLang )
pLocaleData = new LocaleDataWrapper(
comphelper::getComponentContext(
[Libreoffice-commits] .: xmloff/source
xmloff/source/core/xmlimp.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 42782fddff98eeab5c8249918e9ba000f08c22e8
Author: Tor Lillqvist t...@iki.fi
Date: Thu Nov 15 18:28:24 2012 +0200
WaE: 'const' type qualifier on return type has no effect
Change-Id: I06cc8b77e49ec2a22534e1f45d93dfa0d0a0689f
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 922fe8a..d6e29df 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -203,7 +203,7 @@ namespace
~DocumentInfo()
{}
-const sal_uInt16 getGeneratorVersion() const
+sal_uInt16 getGeneratorVersion() const
{
return mnGeneratorVersion;
}
@@ -265,7 +265,7 @@ public:
DestroyFontToSubsFontConverter( hMathFontConv );
}
-const sal_uInt16 getGeneratorVersion( const SvXMLImport rImport )
+sal_uInt16 getGeneratorVersion( const SvXMLImport rImport )
{
if ( !mpDocumentInfo.get() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/XMLRedlineExport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d34e2f8bf150210355d6717be7b2ad95c869af25
Author: jailletc36 christophe.jail...@wanadoo.fr
Date: Fri Nov 9 14:28:58 2012 +0100
s/aIter++/++aIter/
Change-Id: Id80013cbab8f1633db59d2d4492c7363224871bd
Signed-off-by: jailletc36 christophe.jail...@wanadoo.fr
Reviewed-on: https://gerrit.libreoffice.org/1016
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/xmloff/source/text/XMLRedlineExport.cxx
b/xmloff/source/text/XMLRedlineExport.cxx
index 917fb95..11d6e2e 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -107,7 +107,7 @@ XMLRedlineExport::~XMLRedlineExport()
// delete changes lists
for( ChangesMapType::iterator aIter = aChangeMap.begin();
aIter != aChangeMap.end();
- aIter++ )
+ ++aIter )
{
delete aIter-second;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/XMLBackgroundImageContext.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit faff21dcaa3f04be5aedbb966f0a6794404dfcaa Author: jailletc36 christophe.jail...@wanadoo.fr Date: Thu Nov 8 21:15:26 2012 +0100 Same, cut and paste typo ? Change-Id: I34e1de922544e5e0f0ea0e03be5d238d600aa833 Signed-off-by: jailletc36 christophe.jail...@wanadoo.fr Reviewed-on: https://gerrit.libreoffice.org/1010 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 4d74120..a209d5b 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -154,7 +154,6 @@ static void lcl_xmlbic_MergeVertPos( GraphicLocation ePos, : (GraphicLocation_MIDDLE_MIDDLE==eVert ? GraphicLocation_LEFT_MIDDLE : GraphicLocation_LEFT_BOTTOM); -ePos = eVert; break; case GraphicLocation_MIDDLE_TOP: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/backhdl.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit e9fc811e2bc995220954b4c471b93a7f06a82359 Author: jailletc36 christophe.jail...@wanadoo.fr Date: Thu Nov 8 21:11:45 2012 +0100 Cut and paste typo ? Corrected according to surrounding code. I don't know if or when this code is called. Change-Id: I4ed63439e47a89cc982d792c619c4c58335daf93 Signed-off-by: jailletc36 christophe.jail...@wanadoo.fr Reviewed-on: https://gerrit.libreoffice.org/1009 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx index 9ce7150..9cfe176 100644 --- a/xmloff/source/style/backhdl.cxx +++ b/xmloff/source/style/backhdl.cxx @@ -236,7 +236,6 @@ void XMLBackGraphicPositionPropHdl::MergeXMLVertPos( style::GraphicLocation ePo (style::GraphicLocation_MIDDLE_MIDDLE==eVert ? style::GraphicLocation_LEFT_MIDDLE : style::GraphicLocation_LEFT_BOTTOM); -ePos = eVert; break; case style::GraphicLocation_MIDDLE_TOP: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/SchXMLAutoStylePoolP.cxx |1 -
xmloff/source/chart/SchXMLPlotAreaContext.cxx |2 --
xmloff/source/core/xmlexp.cxx |1 -
xmloff/source/draw/shapeexport2.cxx|2 --
xmloff/source/meta/MetaExportComponent.cxx |4 ++--
xmloff/source/style/MarkerStyle.cxx|3 ---
xmloff/source/style/xmlaustp.cxx |2 --
xmloff/source/style/xmlexppr.cxx |3 ---
xmloff/source/style/xmlnumi.cxx|1 -
xmloff/source/text/txtparae.cxx|9 -
xmloff/source/transform/EventOASISTContext.cxx |1 -
11 files changed, 2 insertions(+), 27 deletions(-)
New commits:
commit 7fe8d9328c619523897aa0e84b4bb9f5ab11b743
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Nov 3 18:35:52 2012 +0100
xmloff: drop unused OUStrings
Change-Id: I040e9a5c9e60a27aa82fd624cc01edfecf5cc8de
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
index 5f59c34..5660ec0 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
@@ -54,7 +54,6 @@ void SchXMLAutoStylePoolP::exportStyleAttributes(
const SvXMLNamespaceMap rNamespaceMap
) const
{
-const rtl::OUString sCDATA( GetXMLToken( XML_CDATA ));
SvXMLAutoStylePoolP::exportStyleAttributes( rAttrList, nFamily,
rProperties,
rPropExp, rUnitConverter,
rNamespaceMap );
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 51f8cd2..e22934f 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -673,7 +673,6 @@ SchXMLDataPointContext::~SchXMLDataPointContext()
void SchXMLDataPointContext::StartElement( const uno::Reference
xml::sax::XAttributeList xAttrList )
{
sal_Int16 nAttrCount = xAttrList.is()? xAttrList-getLength(): 0;
-::rtl::OUString aValue;
::rtl::OUString sAutoStyleName;
sal_Int32 nRepeat = 1;
@@ -1050,7 +1049,6 @@
SchXMLStatisticsObjectContext::~SchXMLStatisticsObjectContext()
void SchXMLStatisticsObjectContext::StartElement( const uno::Reference
xml::sax::XAttributeList xAttrList )
{
sal_Int16 nAttrCount = xAttrList.is()? xAttrList-getLength(): 0;
-::rtl::OUString aValue;
::rtl::OUString sAutoStyleName;
rtl::OUString aPosRange;
rtl::OUString aNegRange;
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index e3bdf9f..05a33bd 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2207,7 +2207,6 @@ OUString SvXMLExport::GetRelativeReference(const
OUString rValue)
{
}
}
-OUString sRet = sValue;
if( xUriRef.is() )//no conversion for empty values or for fragments
{
//conversion for matching schemes only
diff --git a/xmloff/source/draw/shapeexport2.cxx
b/xmloff/source/draw/shapeexport2.cxx
index 0614995..988137e 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -239,8 +239,6 @@ sal_Bool XMLShapeExport::ImpExportPresentationAttributes(
const uno::Reference
{
sal_Bool bIsEmpty = sal_False;
-OUStringBuffer sStringBuffer;
-
// write presentation class entry
mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_CLASS, rClass);
diff --git a/xmloff/source/meta/MetaExportComponent.cxx
b/xmloff/source/meta/MetaExportComponent.cxx
index 9fb1976..511eb6a 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -163,8 +163,8 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum
XMLTokenEnum )
AddAttribute( XML_NAMESPACE_OFFICE, XML_VERSION,
::rtl::OUString::createFromAscii(pVersion) );
-SvXMLElementExport aDocElem( *this, XML_NAMESPACE_OFFICE,
XML_DOCUMENT_META,
-sal_True, sal_True );
+SvXMLElementExport aDocElem( *this, XML_NAMESPACE_OFFICE,
XML_DOCUMENT_META,
+sal_True, sal_True );
// NB: office:meta is now written by _ExportMeta
_ExportMeta();
diff --git a/xmloff/source/style/MarkerStyle.cxx
b/xmloff/source/style/MarkerStyle.cxx
index 5c0c0ec..5b129b4 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -183,9 +183,6 @@ sal_Bool XMLMarkerStyleExport::exportXML(
if(rValue = aBezier)
{
-OUString aStrValue;
-OUStringBuffer aOut;
-
/
// Name
sal_Bool bEncoded = sal_False;
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index 46c37ed..25a1a48 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -195,8 +195,6 @@ void
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/SchXMLTableContext.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit dcaf8a871c3ce47e4b51b5c026e47d1ad03f5696
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Oct 12 23:29:59 2012 +0200
uninit variable
Change-Id: I94870693fc269ab7a40e9ded482d259921316c38
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index c9c5857..5e0a67a 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -79,7 +79,8 @@ struct lcl_ApplyCellToData : public ::std::unary_function
SchXMLCell, void
lcl_ApplyCellToData( Sequence double rOutData ) :
m_rData( rOutData ),
m_nIndex( 0 ),
-m_nSize( rOutData.getLength())
+m_nSize( rOutData.getLength()),
+m_fNaN( 0.0 )
{
::rtl::math::setNan( m_fNaN );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/XMLTextMasterPageExport.cxx | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit d92345561c998f7382cf9ef0fdcd29096f978435
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 2 14:41:59 2012 +0100
don't blow up on .odt export with !hasValue footers/headers
Change-Id: I2507c23b7b17b9172f720548d32cdfe299d4fa20
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx
b/xmloff/source/text/XMLTextMasterPageExport.cxx
index a449f92..ab7f854 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -127,20 +127,21 @@ void XMLTextMasterPageExport::exportMasterPageContent(
else
{
aAny = rPropSet-getPropertyValue( sHeaderOn );
-sal_Bool bHeader = *(sal_Bool *)aAny.getValue();
+sal_Bool bHeader = sal_False;
+aAny = bHeader;
sal_Bool bHeaderFirst = sal_False;
if( bHeader )
{
aAny = rPropSet-getPropertyValue( sFirstShareContent );
-bHeaderFirst = !*(sal_Bool *)aAny.getValue();
+aAny = bHeaderFirst;
}
sal_Bool bHeaderLeft = sal_False;
if( bHeader )
{
aAny = rPropSet-getPropertyValue( sHeaderShareContent );
-bHeaderLeft = !*(sal_Bool *)aAny.getValue();
+aAny = bHeaderLeft;
}
if( xHeaderText.is() )
@@ -174,20 +175,21 @@ void XMLTextMasterPageExport::exportMasterPageContent(
}
aAny = rPropSet-getPropertyValue( sFooterOn );
-sal_Bool bFooter = *(sal_Bool *)aAny.getValue();
+sal_Bool bFooter = sal_False;
+aAny = bFooter;
sal_Bool bFooterFirst = sal_False;
if( bFooter )
{
aAny = rPropSet-getPropertyValue( sFirstShareContent );
-bFooterFirst = !*(sal_Bool *)aAny.getValue();
+aAny = bFooterFirst;
}
sal_Bool bFooterLeft = sal_False;
if( bFooter )
{
aAny = rPropSet-getPropertyValue( sFooterShareContent );
-bFooterLeft = !*(sal_Bool *)aAny.getValue();
+aAny = bFooterLeft;
}
if( xFooterText.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/impastp4.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4e1629ff792adeff05e4a0e04f5263a242d167ff
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 3 08:32:03 2012 +0100
additional const_iterator in const method
Change-Id: I8cad958e1b6ba5eec000244a31e1ee98e0b5d123
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index 194c516..6131466 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -300,13 +300,13 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
{
// Get list of parents for current family (nFamily)
XMLFamilyData_Impl aTmp( nFamily );
-XMLFamilyDataList_Impl::iterator aFind = maFamilyList.find(aTmp);
+XMLFamilyDataList_Impl::const_iterator aFind = maFamilyList.find(aTmp);
DBG_ASSERT( aFind != maFamilyList.end(),
SvXMLAutoStylePool_Impl::exportXML: unknown family );
if (aFind == maFamilyList.end())
return;
-XMLFamilyData_Impl rFamily = *aFind;
+const XMLFamilyData_Impl rFamily = *aFind;
sal_uInt32 nCount = rFamily.mnCount;
if (!nCount)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/xmlstyle.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0fc413a327242adc1eb4c196179fdf660229edc9
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 1 15:04:02 2012 +0100
const SvXMLStyleIndexCmp_Impl up
Change-Id: I5bd75e73f2584364bbb749767529efc75aff3d15
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index f881dec..380dd48 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -246,7 +246,7 @@ public:
struct SvXMLStyleIndexCmp_Impl
{
-bool operator()(const SvXMLStyleIndex_Impl r1, const
SvXMLStyleIndex_Impl r2)
+bool operator()(const SvXMLStyleIndex_Impl r1, const
SvXMLStyleIndex_Impl r2) const
{
sal_Int32 nRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/PageMasterImportPropMapper.cxx | 51 +
1 file changed, 51 insertions(+)
New commits:
commit 7f9928bfa561ccb6ed4e2baacc7d6960bc1ce231
Author: Michael Stahl mst...@redhat.com
Date: Thu Jul 19 12:12:14 2012 +0200
fdo#38056: ODF import: fix page style attributes:
PageMasterImportPropMapper: in the case of a single fo:border
and style:border-line-width attribute, it is possible that the border
is imported wrongly, like this:
1. pAllBorderProperty is set from the imported value, with name TopBorder
2. individual pNewBorder[i] are created as copies from pAllBorderProperty,
one of which also with name TopBorder
3. pNewBorder[i] is updated with widths from pBorderWidths[i]
4. the individual pNewBorder[i] are added to the property vector
5. the property vector is sorted by property name
6. the properites are applied in order; if the pNewBorder[TOP]
happens to precede the pAllBorderProperty (which is indeterminate
as they both have name TopBorder), then the pAllBorderProperty
will overwrite the border widths computed in step 3.
Thus, nerf the various pAllFoo properties so they do not override
the individual Foo properties later on.
Change-Id: I87755f1184d59da2aa72ac053e6f77d7295d6958
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx
b/xmloff/source/style/PageMasterImportPropMapper.cxx
index ad45cdb..005c732 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -408,6 +408,57 @@ void
PageMasterImportPropertyMapper::finished(::std::vector XMLPropertyState
rProperties.push_back(*pFooterDynamic);
delete pFooterDynamic;
}
+
+// fdo#38056: nerf the various AllFoo properties so they do not override
+// the individual Foo properties later on
+if (pAllPaddingProperty)
+{
+pAllPaddingProperty-mnIndex = -1;
+}
+if (pAllBorderProperty)
+{
+pAllBorderProperty-mnIndex = -1;
+}
+if (pAllBorderWidthProperty)
+{
+pAllBorderWidthProperty-mnIndex = -1;
+}
+if (pAllHeaderPaddingProperty)
+{
+pAllHeaderPaddingProperty-mnIndex = -1;
+}
+if (pAllHeaderBorderProperty)
+{
+pAllHeaderBorderProperty-mnIndex = -1;
+}
+if (pAllHeaderBorderWidthProperty)
+{
+pAllHeaderBorderWidthProperty-mnIndex = -1;
+}
+if (pAllFooterPaddingProperty)
+{
+pAllFooterPaddingProperty-mnIndex = -1;
+}
+if (pAllFooterBorderProperty)
+{
+pAllFooterBorderProperty-mnIndex = -1;
+}
+if (pAllFooterBorderWidthProperty)
+{
+pAllFooterBorderWidthProperty-mnIndex = -1;
+}
+if (pAllMarginProperty)
+{
+pAllMarginProperty-mnIndex = -1;
+}
+if (pAllHeaderMarginProperty)
+{
+pAllHeaderMarginProperty-mnIndex = -1;
+}
+if (pAllFooterMarginProperty)
+{
+pAllFooterMarginProperty-mnIndex = -1;
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/fonthdl.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit fc508908f55cc1fe5a22adcba710cebb75fc979c
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jul 13 15:15:57 2012 +0200
fix a crash with empty string
If it's named nLast, then it's supposed to point to the last character,
which, with an empty string, logically means it should point before
the start of the string.
Change-Id: I248fbe80c1c4b1c2c8d39f0bcf772f9b85415e4a
diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index 3d58197..f4d1705 100644
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -85,12 +85,10 @@ sal_Bool XMLFontFamilyNamePropHdl::importXML( const
OUString rStrImpValue, uno:
{
sal_Int32 nFirst = nPos;
nPos = ::sax::Converter::indexOfComma( rStrImpValue, nPos );
-sal_Int32 nLast = (-1 == nPos ? rStrImpValue.getLength() : nPos);
-if( nLast 0 )
-nLast--;
+sal_Int32 nLast = (-1 == nPos ? rStrImpValue.getLength() - 1 : nPos -
1);
// skip trailing blanks
-while( sal_Unicode(' ') == rStrImpValue[nLast] nLast nFirst )
+while( nLast nFirst sal_Unicode(' ') == rStrImpValue[nLast] )
nLast--;
// skip leading blanks
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx |2
xmloff/source/draw/XMLGraphicsDefaultStyle.cxx |4 -
xmloff/source/script/XMLScriptContextFactory.cxx|6 -
xmloff/source/script/XMLScriptExportHandler.cxx |2
xmloff/source/script/XMLStarBasicContextFactory.cxx | 10 +-
xmloff/source/style/shdwdhdl.cxx|2
xmloff/source/text/XMLAutoMarkFileContext.cxx |3
xmloff/source/text/XMLAutoTextEventImport.cxx |3
xmloff/source/text/XMLIndexTemplateContext.cxx | 44 ++--
xmloff/source/text/XMLIndexTitleTemplateContext.cxx |8 --
xmloff/source/text/XMLTextMasterPageExport.cxx | 16 ++--
xmloff/source/text/XMLTextShapeStyleContext.cxx |2
12 files changed, 48 insertions(+), 54 deletions(-)
New commits:
commit a8fb1a123f6c46eed611dbaea699624ea0b7962b
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jul 10 11:01:00 2012 +0200
xmloff: kill RTL_CONSTASCII_USTRINGPARAM in rebased code
Change-Id: I3d5227c299d78d4492c47e29385c2c5ca25cfe49
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index fc330d2..4e9a715 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -44,7 +44,7 @@ const OUString
UnoInterfaceToUniqueIdentifierMapper::registerReference( const R
}
else
{
-OUString aId( RTL_CONSTASCII_USTRINGPARAM( id ) );
+OUString aId( id );
aId += OUString::valueOf( mnNextId++ );
return (*maEntries.insert( IdMap_t::value_type( aId, rInterface )
).first).first;
}
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index 8c157a5..c6216a4 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -88,7 +88,7 @@ void XMLGraphicsDefaultStyle::SetDefaults()
if( !xFact.is() )
return;
-Reference XPropertySet xDefaults( xFact-createInstance(
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.Defaults) ) ),
UNO_QUERY );
+Reference XPropertySet xDefaults( xFact-createInstance(
com.sun.star.drawing.Defaults ), UNO_QUERY );
if( !xDefaults.is() )
return;
// SJ: #i114750#
@@ -105,7 +105,7 @@ void XMLGraphicsDefaultStyle::SetDefaults()
) )
bWordWrapDefault = sal_False;
-const OUString sTextWordWrap( RTL_CONSTASCII_USTRINGPARAM( TextWordWrap
) );
+const OUString sTextWordWrap( TextWordWrap );
Reference XPropertySetInfo xInfo( xDefaults-getPropertySetInfo() );
if ( xInfo-hasPropertyByName( sTextWordWrap ) )
xDefaults-setPropertyValue( sTextWordWrap, Any( bWordWrapDefault ) );
diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx
b/xmloff/source/script/XMLScriptContextFactory.cxx
index 5f671ea..1990d67 100644
--- a/xmloff/source/script/XMLScriptContextFactory.cxx
+++ b/xmloff/source/script/XMLScriptContextFactory.cxx
@@ -35,9 +35,9 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
XMLScriptContextFactory::XMLScriptContextFactory() :
-sEventType(RTL_CONSTASCII_USTRINGPARAM(EventType)),
-sScript(RTL_CONSTASCII_USTRINGPARAM(Script)),
-sURL(RTL_CONSTASCII_USTRINGPARAM(Script))
+sEventType(EventType),
+sScript(Script),
+sURL(Script)
{
}
diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx
b/xmloff/source/script/XMLScriptExportHandler.cxx
index 9e0c096..51057b7 100644
--- a/xmloff/source/script/XMLScriptExportHandler.cxx
+++ b/xmloff/source/script/XMLScriptExportHandler.cxx
@@ -34,7 +34,7 @@ using ::com::sun::star::beans::PropertyValue;
XMLScriptExportHandler::XMLScriptExportHandler() :
-sURL(RTL_CONSTASCII_USTRINGPARAM(Script))
+sURL(Script)
{
}
diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx
b/xmloff/source/script/XMLStarBasicContextFactory.cxx
index 3b3faa3..b9825be 100644
--- a/xmloff/source/script/XMLStarBasicContextFactory.cxx
+++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -36,10 +36,10 @@ using ::com::sun::star::uno::Any;
XMLStarBasicContextFactory::XMLStarBasicContextFactory() :
-sEventType(RTL_CONSTASCII_USTRINGPARAM(EventType)),
-sLibrary(RTL_CONSTASCII_USTRINGPARAM(Library)),
-sMacroName(RTL_CONSTASCII_USTRINGPARAM(MacroName)),
-sStarBasic(RTL_CONSTASCII_USTRINGPARAM(StarBasic))
+sEventType(EventType),
+sLibrary(Library),
+sMacroName(MacroName),
+sStarBasic(StarBasic)
{
}
@@ -83,7 +83,7 @@ SvXMLImportContext* XMLStarBasicContextFactory::CreateContext(
sMacroNameVal.copy(0,rApp.getLength()).equalsIgnoreAsciiCase( rApp )
':' == sMacroNameVal[rApp.getLength()]
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/txtimp.cxx | 22 -- 1 file changed, 22 deletions(-) New commits: commit a99e3134aa253977b5112cc903d4097907bf3801 Author: Miklos Vajna vmik...@suse.cz Date: Thu Jul 5 11:49:19 2012 +0200 xmloff: unused includes in txtimp Change-Id: I0a4feed51067f6b222d60f569dd794f2439fc790 diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index d80ed05..e751058 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -30,40 +30,21 @@ #include vector #include boost/scoped_array.hpp -#include boost/tuple/tuple.hpp -#include tools/solar.h -#include tools/debug.hxx #include svl/svstdarr.hxx -#include com/sun/star/beans/XPropertySet.hpp -#include com/sun/star/beans/PropertyValue.hpp #include com/sun/star/container/XEnumerationAccess.hpp -#include com/sun/star/container/XNameContainer.hpp #include com/sun/star/style/XStyleFamiliesSupplier.hpp -#include com/sun/star/text/XTextCursor.hpp #include com/sun/star/text/XChapterNumberingSupplier.hpp #include com/sun/star/text/XTextFramesSupplier.hpp #include com/sun/star/text/XTextGraphicObjectsSupplier.hpp #include com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp -#include com/sun/star/text/TextContentAnchorType.hpp -#include com/sun/star/text/XTextFrame.hpp #include com/sun/star/text/XFormField.hpp -#include com/sun/star/drawing/XShapes.hpp -#include com/sun/star/util/DateTime.hpp -#include com/sun/star/lang/XMultiServiceFactory.hpp #include com/sun/star/ucb/XAnyCompareFactory.hpp -#include com/sun/star/container/XNamed.hpp -#include xmloff/xmltoken.hxx #include xmloff/xmlnmspe.hxx #include xmloff/txtstyli.hxx -#include xmloff/families.hxx -#include xmloff/xmlnumfi.hxx #include xmloff/xmlnumi.hxx -#include xmloff/xmlictxt.hxx -#include xmloff/xmlimppr.hxx #include txtparai.hxx -#include xmloff/txtimp.hxx #include xmloff/txtprmap.hxx #include xmloff/txtimppr.hxx #include xmloff/xmlimp.hxx @@ -72,13 +53,10 @@ #include XMLTextListItemContext.hxx #include XMLTextListBlockContext.hxx #include XMLTextFrameContext.hxx -#include XMLPropertyBackpatcher.hxx #include XMLTextFrameHyperlinkContext.hxx #include XMLSectionImportContext.hxx #include XMLIndexTOCContext.hxx #include xmloff/XMLFontStylesContext.hxx -#include xmloff/ProgressBarHelper.hxx -#include xmloff/nmspmap.hxx #include xmloff/XMLEventsImportContext.hxx #include XMLTrackedChangesImportContext.hxx #include XMLChangeImportContext.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/SchXMLChartContext.hxx|5 -
xmloff/source/chart/SchXMLParagraphContext.hxx|2 --
xmloff/source/chart/SchXMLTableContext.hxx|4
xmloff/source/draw/layerimp.hxx |2 --
xmloff/source/draw/sdxmlexp_impl.hxx |9 -
xmloff/source/draw/sdxmlimp_impl.hxx |4
xmloff/source/draw/ximpcustomshape.hxx|1 -
xmloff/source/forms/callbacks.hxx |4
xmloff/source/forms/elementimport.hxx |1 -
xmloff/source/forms/formattributes.hxx|1 -
xmloff/source/forms/layerimport.hxx |4 +---
xmloff/source/style/impastpl.hxx |1 -
xmloff/source/text/XMLRedlineExport.hxx |1 -
xmloff/source/text/XMLSectionImportContext.hxx|1 -
xmloff/source/text/XMLTextFrameHyperlinkContext.hxx |3 ---
xmloff/source/text/XMLTrackedChangesImportContext.hxx |4
xmloff/source/transform/CreateElemTContext.hxx|2 --
xmloff/source/transform/ProcAddAttrTContext.hxx |2 --
xmloff/source/transform/ProcAttrTContext.hxx |2 --
19 files changed, 1 insertion(+), 52 deletions(-)
New commits:
commit 6013882bdff6265548a1511799611243a9d0e083
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Jun 27 20:03:57 2012 +0900
removed unnecessary forward declarations of class
except moving SvXMLStyleContext into xmloff/source/forms/layerimport.hxx
Change-Id: I5e16b54f98ccdd54bc0bb373d3fe92ed1bef3c5e
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx
b/xmloff/source/chart/SchXMLChartContext.hxx
index 249cbdb..4e39113 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -40,18 +40,13 @@
#include list
#include map
-class SchXMLImport;
class SchXMLImportHelper;
namespace com { namespace sun { namespace star {
namespace chart {
class XChartDocument;
-class XDiagram;
struct ChartSeriesAddress;
}
-namespace util {
-class XStringMapping;
-}
namespace xml { namespace sax {
class XAttributeList;
}}
diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx
b/xmloff/source/chart/SchXMLParagraphContext.hxx
index 31b8337..ba246ee 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.hxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.hxx
@@ -23,8 +23,6 @@
#include rtl/ustring.hxx
#include rtl/ustrbuf.hxx
-class SchXMLImport;
-
namespace com { namespace sun { namespace star { namespace xml { namespace sax
{
class XAttributeList;
}
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx
b/xmloff/source/chart/SchXMLTableContext.hxx
index 005fda9..3285849 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -28,15 +28,11 @@
#include transporttypes.hxx
namespace com { namespace sun { namespace star {
-namespace frame {
-class XModel;
-}
namespace xml { namespace sax {
class XAttributeList;
}}
namespace chart {
class XChartDocument;
-struct ChartSeriesAddress;
//
diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx
index 47eb16a..09464a9 100644
--- a/xmloff/source/draw/layerimp.hxx
+++ b/xmloff/source/draw/layerimp.hxx
@@ -23,8 +23,6 @@
#include xmloff/xmlictxt.hxx
#include com/sun/star/container/XNameAccess.hpp
-class AnimImpImpl;
-
//
// presentations:animations
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx
b/xmloff/source/draw/sdxmlexp_impl.hxx
index 0558fae..bb95104 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -41,20 +41,11 @@
//
-class SvXMLUnitConverter;
-class SvXMLExportItemMapper;
-class SfxPoolItem;
-class SfxItemSet;
-class OUStrings_Impl;
class Rectangle;
-class ImpPresPageDrawStylePropMapper;
class ImpXMLEXPPageMasterInfo;
-class ImpXMLDrawPageInfoList;
class ImpXMLAutoLayoutInfo;
-class SvXMLAutoStylePoolP;
class XMLSdPropHdlFactory;
-class ImpXMLShapeStyleInfo;
class XMLShapeExportPropertyMapper;
class XMLPageExportPropertyMapper;
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx
b/xmloff/source/draw/sdxmlimp_impl.hxx
index d6bd917..f13524a 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -169,10 +169,6 @@ typedef std::map sal_Int32,
com::sun::star::uno::Reference com::sun::star::dra
class SvXMLUnitConverter;
class SvXMLTokenMap;
-class XMLSdPropHdlFactory;
-class XMLPropertySetMapper;
-class XMLPropStyleContext;
-class SdXMLStylesContext;
class
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/SchXMLChartContext.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 0f79440a86dc788a38ef4b3be63bffd2cd396ddc
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 12 11:51:55 2012 +0200
work around spurious signed overflow warnings
gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2)
com/sun/star/uno/Sequence.hxx:178:10: error: assuming signed overflow does
not
occur when assuming that (X - c) X is always false
[-Werror=strict-overflow]
Change-Id: Ibbc2f3533097ad379e1707f77039c675a0d00133
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx
b/xmloff/source/chart/SchXMLChartContext.cxx
index 801d412..cdadaf4 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -636,7 +636,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
if( !sColTrans.isEmpty() || !sRowTrans.isEmpty() )
{
aArgs.realloc( aArgs.getLength() + 1 );
-aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
+aArgs[ sal::static_int_castsal_uInt32(aArgs.getLength()) - 1 ] =
beans::PropertyValue(
::rtl::OUString( SequenceMapping ),
-1, uno::makeAny( !sColTrans.isEmpty()
? lcl_getNumberSequenceFromString( sColTrans, bHasCateories
!xNewDoc-hasInternalDataProvider() )
@@ -662,7 +662,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
if( !aChartOleObjectName.isEmpty() )
{
aArgs.realloc( aArgs.getLength() + 1 );
-aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
+aArgs[ sal::static_int_castsal_uInt32(aArgs.getLength()) - 1 ] =
beans::PropertyValue(
::rtl::OUString( ChartOleObjectName ),
-1, uno::makeAny( aChartOleObjectName ),
beans::PropertyState_DIRECT_VALUE );
@@ -674,11 +674,11 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
xDataProvider-createDataSource( aArgs ));
aArgs.realloc( aArgs.getLength() + 2 );
-aArgs[ aArgs.getLength() - 2 ] = beans::PropertyValue(
+aArgs[ sal::static_int_castsal_uInt32(aArgs.getLength()) - 2 ] =
beans::PropertyValue(
::rtl::OUString( HasCategories ),
-1, uno::makeAny( bHasCateories ),
beans::PropertyState_DIRECT_VALUE );
-aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
+aArgs[ sal::static_int_castsal_uInt32(aArgs.getLength()) - 1 ] =
beans::PropertyValue(
::rtl::OUString(UseCategoriesAsX),
-1, uno::makeAny( sal_False ),//categories in ODF files are not to be
used as x values (independent from what is offered in our ui)
beans::PropertyState_DIRECT_VALUE );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/PropertyMap.hxx |2 +-
xmloff/source/chart/SchXMLExport.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0e9598fa6c388024fa788358e26ef77b5fc3f074
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Jun 5 10:52:17 2012 +0200
Catch more remnant ODFVER_LATEST instances.
This extends commit d0af38eaa029c2f2c2617544c8b6798c463381b9,
converting more latest-ver to 1.2-extended cases.
diff --git a/xmloff/source/chart/PropertyMap.hxx
b/xmloff/source/chart/PropertyMap.hxx
index b295eed..5ef9021 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -94,7 +94,7 @@
#define MAP_FULL( ApiName, NameSpace, XMLTokenName, XMLType, ContextId,
EarliestODFVersionForExport ) { ApiName, sizeof(ApiName)-1,
XML_NAMESPACE_##NameSpace, xmloff::token::XMLTokenName,
XMLType|XML_TYPE_PROP_CHART, ContextId, EarliestODFVersionForExport }
#define MAP_ENTRY( a, ns, nm, t ){ a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFVER_010 }
#define MAP_ENTRY_ODF12( a, ns, nm, t ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFVER_012 }
-#define MAP_ENTRY_ODF_EXT( a, ns, nm, t ){ a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFVER_LATEST }
+#define MAP_ENTRY_ODF_EXT( a, ns, nm, t ){ a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFVER_012_EXT_COMPAT }
#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, c,
SvtSaveOptions::ODFVER_010 }
#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART |
MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_010 }
#define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART |
MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_012 }
diff --git a/xmloff/source/chart/SchXMLExport.cxx
b/xmloff/source/chart/SchXMLExport.cxx
index 9cb5bc5..83a3491 100755
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3119,7 +3119,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const
Referencebeans::XPropertySe
const SvtSaveOptions::ODFDefaultVersion nCurrentVersion(
SvtSaveOptions().GetODFDefaultVersion() );
/// Dont export X ErrorBars for older ODF versions.
-if ( !bYError nCurrentVersion != SvtSaveOptions::ODFVER_LATEST )
+if ( !bYError nCurrentVersion = SvtSaveOptions::ODFVER_012 )
return;
if (xSeriesProp.is())
@@ -3168,7 +3168,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const
Referencebeans::XPropertySe
for( ::std::vector Reference chart2::data::XDataSequence
::const_iterator aIt(
aErrorBarSequences.begin()); aIt !=
aErrorBarSequences.end(); ++aIt )
{
-if ( nCurrentVersion == SvtSaveOptions::ODFVER_LATEST )
+if ( nCurrentVersion SvtSaveOptions::ODFVER_012 )
{
rtl::OUString aRole, aRange;
Reference beans::XPropertySet xSeqProp( *aIt,
uno::UNO_QUERY_THROW );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/txtparae.cxx | 49
1 file changed, 20 insertions(+), 29 deletions(-)
New commits:
commit 4190e9351e69730f0097e6cdf4dad2fafa10577e
Author: Michael Stahl mst...@redhat.com
Date: Tue Jun 5 13:51:09 2012 +0200
fdo#30711: fix some problems in 7a1c5e54:
The elements are exported without checking for bAutoStyles, and the Any
conversion is overly verbose.
Change-Id: Iebb52c8cd2638424dd48d28ec5a12c10a41f6cbf
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e7b370b..04b008c 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2295,16 +2295,15 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
if (xParameters.is() xParameters-hasByName(Name))
{
const Any aValue = xParameters-getByName(Name);
-const Type aValueType = aValue.getValueType();
-if (aValueType == ::getCppuType((OUString*)0))
+OUString sValue;
+if (aValue = sValue)
{
-OUString sValue;
-aValue = sValue;
GetExport().AddAttribute(XML_NAMESPACE_TEXT,
XML_NAME, sValue);
}
}
-GetExport().StartElement(XML_NAMESPACE_TEXT,
XML_BOOKMARK_START, sal_False);
-GetExport().EndElement(XML_NAMESPACE_TEXT,
XML_BOOKMARK_START, sal_False);
+SvXMLElementExport aElem( GetExport(), !bAutoStyles,
+XML_NAMESPACE_TEXT, XML_BOOKMARK_START,
+sal_False, sal_False );
const OUString sFieldType = xFormField-getFieldType();
if (sFieldType == ODF_FORMTEXT)
{
@@ -2319,19 +2318,15 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
openFieldMark = NONE;
}
}
-else
-{
-GetExport().StartElement(XML_NAMESPACE_TEXT,
XML_BOOKMARK_START, sal_False);
-GetExport().EndElement(XML_NAMESPACE_TEXT,
XML_BOOKMARK_START, sal_False);
-}
}
}
else if (sType.equals(sTextFieldEnd))
{
if ( GetExport().getDefaultVersion()
SvtSaveOptions::ODFVER_012 )
{
-GetExport().StartElement(XML_NAMESPACE_FIELD,
XML_FIELDMARK_END, sal_False);
-GetExport().EndElement(XML_NAMESPACE_FIELD,
XML_FIELDMARK_END, sal_False);
+SvXMLElementExport aElem( GetExport(), !bAutoStyles,
+XML_NAMESPACE_FIELD, XML_FIELDMARK_END,
+sal_False, sal_False );
}
else
{
@@ -2342,17 +2337,16 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
if (xParameters.is() xParameters-hasByName(Name))
{
const Any aValue = xParameters-getByName(Name);
-const Type aValueType = aValue.getValueType();
-if (aValueType == ::getCppuType((OUString*)0))
+OUString sValue;
+if (aValue = sValue)
{
-OUString sValue;
-aValue = sValue;
GetExport().AddAttribute(XML_NAMESPACE_TEXT,
XML_NAME, sValue);
}
}
}
-GetExport().StartElement(XML_NAMESPACE_TEXT,
XML_BOOKMARK_END, sal_False);
-
GetExport().EndElement(XML_NAMESPACE_TEXT,XML_BOOKMARK_END, sal_False);
+SvXMLElementExport aElem( GetExport(), !bAutoStyles,
+XML_NAMESPACE_TEXT, XML_BOOKMARK_END,
+sal_False, sal_False );
}
}
else if (sType.equals(sTextFieldStartEnd))
@@ -2383,8 +2377,9 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
{
GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME,
xBookmark-getName());
}
-GetExport().StartElement(XML_NAMESPACE_TEXT, XML_BOOKMARK,
sal_False);
-GetExport().EndElement(XML_NAMESPACE_TEXT, XML_BOOKMARK,
sal_False);
+SvXMLElementExport aElem( GetExport(), !bAutoStyles,
+XML_NAMESPACE_TEXT, XML_BOOKMARK,
+
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/impastp4.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8e18130bba49082cc1416e1a2631bd5a4cb3cb8f
Author: Tor Lillqvist t...@iki.fi
Date: Tue May 22 14:19:19 2012 +0300
WaE: unused parameter 'rStrName'
Change-Id: Ia760fe7ae66f8caadb10947c3d743a9f64a55dc5
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index 3fda512..32cd3f8 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -106,7 +106,7 @@ void SvXMLAutoStylePoolP_Impl::AddFamily(
void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper(
sal_Int32 nFamily,
-const OUString rStrName,
+const OUString /* rStrName */,
const UniReference SvXMLExportPropertyMapper rMapper )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/forms/elementimport.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5e0b52c1893ffe04a68333026afa7a557c48d534
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 17 14:51:04 2012 +0100
some more ConstAsciiString behind OSL_ENSURE
Change-Id: Ic93ec84ce62234364d233a9188a65439e88a79fe
diff --git a/xmloff/source/forms/elementimport.cxx
b/xmloff/source/forms/elementimport.cxx
index 5885914..8d29aaa 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -993,8 +993,8 @@ namespace xmloff
{
// we have exactly 2 properties where this type class is allowed:
OSL_ENSURE(
-(0 ==
_rPropValue.Name.compareToAscii(PROPERTY_EFFECTIVE_VALUE))
-|| (0 ==
_rPropValue.Name.compareToAscii(PROPERTY_EFFECTIVE_DEFAULT)),
+(0 ==
_rPropValue.Name.equalsAsciiL(PROPERTY_EFFECTIVE_VALUE.ascii,
PROPERTY_EFFECTIVE_VALUE.length))
+|| (0 ==
_rPropValue.Name.equalsAsciiL(PROPERTY_EFFECTIVE_DEFAULT.ascii,
PROPERTY_EFFECTIVE_DEFAULT.length)),
OControlImport::implTranslateValueProperty: invalid property
type/name combination!);
// Both properties are allowed to have a double or a string value,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/draw/sdxmlimp.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit cc92cb54e246e48dc62ef149aeaa550e14ec3a9e
Author: Caolán McNamara caol...@redhat.com
Date: Wed May 16 15:16:53 2012 +0100
completely nutso merge bustage since 2004
useless unused fat global objects since
146f73bcfa48d18a1eb449aaa5ddd43d2dd2
Change-Id: I2a5f54d34b498a64b658f158f98269f16e2e71f8
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index d1f960c..2687a18 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -1029,10 +1029,6 @@ OUString SAL_CALL SdXMLImport::getImplementationName()
throw( uno::RuntimeExcept
}
}
-HeaderFooterDeclMap maHeaderDeclsMap;
-HeaderFooterDeclMap maFooterDeclsMap;
-DateTimeDeclMap maDateTimeDeclsMap;
-
void SdXMLImport::AddHeaderDecl( const ::rtl::OUString rName, const
::rtl::OUString rText )
{
if( !rName.isEmpty() !rText.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/SchXMLExport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9c323a4bbe0f7dec33523e87e1c1010dd832d4bf
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed Apr 11 22:18:22 2012 +0400
fix windows build
diff --git a/xmloff/source/chart/SchXMLExport.cxx
b/xmloff/source/chart/SchXMLExport.cxx
index 0d253d2..6632b47 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3137,7 +3137,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const
Referencebeans::XPropertySe
{
Any aAny;
-aAny = xSeriesProp-getPropertyValue( bYError ? ErrorBarY :
ErrorBarX );
+aAny = xSeriesProp-getPropertyValue( bYError ?
rtl::OUString(ErrorBarY) : rtl::OUString(ErrorBarX) );
aAny = xErrorBarProp;
if ( xErrorBarProp.is() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/draw/xexptran.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit a2ee8055e9c136923f0244fe289cac6377933c31
Author: Thorsten Behrens tbehr...@suse.com
Date: Fri Mar 23 17:46:43 2012 +0100
Fix fdo#47406 incorrect relative moves after closePath
I missed the fact that odf export still uses the old exporter in
xmloff/source/draw/xexptran.cxx, which was not fixed wrt. the update
of current position in basegfx/source/polygon/b2dsvgpolypolygon.cxx
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 15ef848..6032984 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -1606,6 +1606,7 @@ void SdXMLImExSvgDElement::AddPolygon(
// bezier poly, handle curves
bool bDidWriteStart(false);
+sal_Int32 nStartX(0), nStartY(0);
for(sal_Int32 a(0L); a nCnt; a++)
{
@@ -2080,6 +2081,8 @@ void SdXMLImExSvgDElement::AddPolygon(
// remember start written
bDidWriteStart = true;
+nStartX = nX;
+nStartY = nY;
}
// remember new last position
@@ -2100,6 +2103,13 @@ void SdXMLImExSvgDElement::AddPolygon(
aNewString += rtl::OUString(static_castsal_Unicode('z'));
else
aNewString += rtl::OUString(static_castsal_Unicode('Z'));
+
+// update current point - we're back at the start
+if( bDidWriteStart )
+{
+mnLastX = nStartX;
+mnLastY = nStartY;
+}
}
// append new string
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/MultiPropertySetHandler.hxx |8
xmloff/source/core/RDFaImportHelper.cxx |2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 9032c7f63e28e5a9de00b3b868452581f6f5f145
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Mar 18 17:55:24 2012 +0100
Some cppcheck cleaning
diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx
b/xmloff/source/chart/MultiPropertySetHandler.hxx
index ab0ce3a..953e943 100644
--- a/xmloff/source/chart/MultiPropertySetHandler.hxx
+++ b/xmloff/source/chart/MultiPropertySetHandler.hxx
@@ -209,7 +209,7 @@ MultiPropertySetHandler::MultiPropertySetHandler
(::com::sun::star::uno::Referen
MultiPropertySetHandler::~MultiPropertySetHandler (void)
{
::std::map ::rtl::OUString, PropertyWrapperBase*,
OUStringComparison::iterator I;
-for (I=aPropertyList.begin(); I!=aPropertyList.end(); I++)
+for (I=aPropertyList.begin(); I!=aPropertyList.end(); ++I)
delete I-second;
}
@@ -220,7 +220,7 @@ sal_BoolMultiPropertySetHandler::GetProperties (void)
::std::map ::rtl::OUString, PropertyWrapperBase*,
OUStringComparison::iterator I;
::com::sun::star::uno::Sequence ::rtl::OUString aNameList
(aPropertyList.size());
int i;
-for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); I++)
+for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I)
aNameList[i++] = I-second-msName;
if ( ! MultiGet(aNameList))
if ( ! SingleGet(aNameList))
@@ -243,7 +243,7 @@ sal_BoolMultiPropertySetHandler::MultiGet (const
::com::sun::star::uno::Se
int i;
::com::sun::star::uno::Sequence ::com::sun::star::uno::Any
aValueList =
xMultiSet-getPropertyValues (rNameList);
-for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); I++)
+for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I)
I-second-SetValue (aValueList[i++]);
}
catch (const ::com::sun::star::beans::UnknownPropertyException)
@@ -269,7 +269,7 @@ sal_BoolMultiPropertySetHandler::SingleGet (const
::com::sun::star::uno::Se
{
::std::map ::rtl::OUString, PropertyWrapperBase*,
OUStringComparison::iterator I;
int i;
-for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); I++)
+for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I)
I-second-SetValue (xSingleSet-getPropertyValue
(rNameList[i++]));
}
catch (const ::com::sun::star::beans::UnknownPropertyException)
diff --git a/xmloff/source/core/RDFaImportHelper.cxx
b/xmloff/source/core/RDFaImportHelper.cxx
index 6b980d4..be466c8 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -236,7 +236,7 @@ RDFaReader::ReadCURIEs(::rtl::OUString const i_rCURIEs)
const
}
}
while (!CURIEs.isEmpty());
-if (!vec.size())
+if (vec.empty())
{
OSL_TRACE( ReadCURIEs: invalid CURIEs );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/XMLRedlineExport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b1b4f699fc47d2c40034453754d01a1bbb0a7734
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Mar 18 17:58:35 2012 +0100
Prefer prefix ++/-- operators for non-primitive types
diff --git a/xmloff/source/text/XMLRedlineExport.cxx
b/xmloff/source/text/XMLRedlineExport.cxx
index 007aac1..917fb95 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -177,7 +177,7 @@ void XMLRedlineExport::ExportChangesList(
// iterate over changes list
for( ChangesListType::iterator aIter = pChangesList-begin();
aIter != pChangesList-end();
- aIter++ )
+ ++aIter )
{
ExportChangedRegion( *aIter );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/transporttypes.hxx | 15 +--
1 file changed, 1 insertion(+), 14 deletions(-)
New commits:
commit c361ef86504e79a1e1b56fa3a7eba2f893386e2c
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 8 20:39:35 2012 +0100
Compiler-generated code is just fine
...now that member is Sequence instead of pointer to Sequence.
diff --git a/xmloff/source/chart/transporttypes.hxx
b/xmloff/source/chart/transporttypes.hxx
index cb03cbc..7ecf086 100644
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -50,21 +50,8 @@ struct SchXMLCell
SchXMLCellType eType;
rtl::OUString aRangeId;
-SchXMLCell() : aComplexString(), fValue( 0.0 ), eType(
SCH_CELL_TYPE_UNKNOWN )
+SchXMLCell(): fValue( 0.0 ), eType( SCH_CELL_TYPE_UNKNOWN )
{}
-
-SchXMLCell( const SchXMLCell rOther )
-: aString( rOther.aString )
-, aComplexString( rOther.aComplexString )
-, fValue( rOther.fValue )
-, eType( rOther.eType )
-, aRangeId( rOther.aRangeId )
-{}
-
-~SchXMLCell()
-{
-
-}
};
struct SchXMLTable
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/txtparai.cxx | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 9951de4a10386a85dc1bfa465304cd0005414b8e
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Feb 10 17:54:03 2012 +0100
fdo#42771: Fix crash when loading an invalid .fodt.
createTextCursorByRange() likes to throw runtime exception, even though it
just means 'we were unable to create the cursor'.
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 721e03b..70848c4 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -2031,10 +2031,16 @@ XMLParaContext::~XMLParaContext()
xTxtImport-InsertControlCharacter( ControlCharacter::APPEND_PARAGRAPH );
// create a cursor that select the whole last paragraph
-Reference XTextCursor xAttrCursor(
-xTxtImport-GetText()-createTextCursorByRange( xStart ));
-if( !xAttrCursor.is() )
-return; // Robust (defect file)
+Reference XTextCursor xAttrCursor;
+try {
+xAttrCursor = xTxtImport-GetText()-createTextCursorByRange( xStart );
+if( !xAttrCursor.is() )
+return; // Robust (defect file)
+} catch (uno::Exception ) {
+// createTextCursorByRange() likes to throw runtime exception, even
+// though it just means 'we were unable to create the cursor'
+return;
+}
xAttrCursor-gotoRange( xEnd, sal_True );
// xml:id for RDF metadata
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/forms/controlpropertyhdl.cxx |6 +-
xmloff/source/forms/elementexport.cxx | 24 +-
xmloff/source/forms/elementimport.cxx | 48 ++---
xmloff/source/forms/eventexport.cxx|4 -
xmloff/source/forms/eventimport.cxx|2
xmloff/source/forms/formcellbinding.cxx|4 -
xmloff/source/forms/layerexport.cxx|4 -
xmloff/source/forms/layerimport.cxx| 10 ++--
xmloff/source/forms/property_meta_data.cxx | 10 ++--
xmloff/source/forms/propertyexport.cxx | 20
xmloff/source/forms/propertyimport.cxx | 10 ++--
xmloff/source/meta/xmlmetae.cxx| 14 +++---
xmloff/source/meta/xmlmetai.cxx|4 -
xmloff/source/meta/xmlversion.cxx |4 -
xmloff/source/script/XMLStarBasicExportHandler.cxx |2
xmloff/source/script/xmlbasici.cxx |2
xmloff/source/style/DashStyle.cxx |4 -
xmloff/source/style/FillStyleContext.cxx |4 -
xmloff/source/style/GradientStyle.cxx |4 -
xmloff/source/style/HatchStyle.cxx |4 -
xmloff/source/style/ImageStyle.cxx |8 +--
xmloff/source/style/MarkerStyle.cxx|4 -
xmloff/source/style/PageMasterImportContext.cxx|2
xmloff/source/style/PageMasterPropHdl.cxx | 12 ++---
xmloff/source/style/TransGradientStyle.cxx |4 -
xmloff/source/style/XMLBackgroundImageContext.cxx |6 +-
xmloff/source/style/XMLBackgroundImageExport.cxx |8 +--
xmloff/source/style/XMLFontAutoStylePool.cxx |4 -
xmloff/source/style/XMLPageExport.cxx |4 -
xmloff/source/style/bordrhdl.cxx |2
xmloff/source/style/cdouthdl.cxx |2
xmloff/source/style/chrhghdl.cxx |6 +-
xmloff/source/style/chrlohdl.cxx |4 -
xmloff/source/style/csmaphdl.cxx |2
34 files changed, 126 insertions(+), 126 deletions(-)
New commits:
commit 3dbb89e5a39e7811d2fc0c1fbad012c3d565396b
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Wed Jan 25 21:59:48 2012 -0200
Fix for fdo43460 Part XLVIII getLength() to isEmpty()
Part XLVIII
Modules
xmloff (part 2)
diff --git a/xmloff/source/forms/controlpropertyhdl.cxx
b/xmloff/source/forms/controlpropertyhdl.cxx
index 3c8b0fc..5442a55 100644
--- a/xmloff/source/forms/controlpropertyhdl.cxx
+++ b/xmloff/source/forms/controlpropertyhdl.cxx
@@ -245,7 +245,7 @@ namespace xmloff
sal_uInt16 nStyle = 1;
while ( aTokens.getNextToken(sToken)// have a new token
- (0 != sToken.getLength()) // really have a new token
+ (!sToken.isEmpty()) // really have a new token
)
{
// try interpreting the token as border style
@@ -304,7 +304,7 @@ namespace xmloff
if ( !bSuccess )
return sal_False;
-if ( _rStrExpValue.getLength() )
+if ( !_rStrExpValue.isEmpty() )
_rStrExpValue += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
) );
_rStrExpValue += aOut.makeStringAndClear();
@@ -343,7 +343,7 @@ namespace xmloff
}
_rStrExpValue = aResult.makeStringAndClear();
-return _rStrExpValue.getLength() != 0;
+return !_rStrExpValue.isEmpty();
}
//=
diff --git a/xmloff/source/forms/elementexport.cxx
b/xmloff/source/forms/elementexport.cxx
index fcc3efa..863d99a 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -316,7 +316,7 @@ namespace xmloff
// the control id
if (CCA_CONTROL_ID m_nIncludeCommon)
{
-OSL_ENSURE(m_sControlId.getLength(),
OControlExport::exportInnerAttributes: have no control id for the control!);
+OSL_ENSURE(!m_sControlId.isEmpty(),
OControlExport::exportInnerAttributes: have no control id for the control!);
m_rContext.getGlobalContext().AddAttributeIdLegacy(
XML_NAMESPACE_FORM, m_sControlId);
#if OSL_DEBUG_LEVEL 0
@@ -799,7 +799,7 @@ namespace xmloff
// the target frame
if (m_nIncludeCommon CCA_FOR)
{
-if (m_sReferringControls.getLength())
+if (!m_sReferringControls.isEmpty())
{ // there is at least one control referring to the one we're
handling currently
AddAttribute(
OAttributeMetaData::getCommonControlAttributeNamespace(CCA_FOR),
@@ -1095,7 +1095,7 @@ namespace xmloff
else
OSL_FAIL( OControlExport::exportSpecialAttributes: not
property which can be mapped to
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/txtparae.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 69d91300547f6ed45a9a499ffae71c2c0f91c441
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jan 16 21:42:09 2012 +0100
WaE signed/unsigned comparison.
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e32203a..96316d1 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -856,7 +856,7 @@ void XMLTextParagraphExport::exportListChange(
if ( nListLevelsToBeClosed 0
pListElements
- pListElements-size() = ( 2 * nListLevelsToBeClosed ) )
+ pListElements-size() = ( 2 * sal::static_int_cast sal_uInt16
(nListLevelsToBeClosed) ) )
{
do {
for(size_t j = 0; j 2; ++j)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/txtparae.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7ca7690f84cfab87ddd25fa1200b11625d1f7ece
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 17 08:47:22 2012 +0100
Better fix for WaE signed/unsigned comparison.
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 96316d1..6db50ff 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -856,7 +856,7 @@ void XMLTextParagraphExport::exportListChange(
if ( nListLevelsToBeClosed 0
pListElements
- pListElements-size() = ( 2 * sal::static_int_cast sal_uInt16
(nListLevelsToBeClosed) ) )
+ pListElements-size() = sal::static_int_cast sal_uInt32 ( 2 *
nListLevelsToBeClosed ) )
{
do {
for(size_t j = 0; j 2; ++j)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/PageMasterExportPropMapper.cxx | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 0100280a5c5b121fab2aa932092a7a887bbb507c
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Fri Jan 6 10:33:19 2012 +0100
fdo#43862: reintroduce fo:margin-* on top of fo:margin for backward compat
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx
b/xmloff/source/style/PageMasterExportPropMapper.cxx
index ba0f45b..eedb4a4 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -151,14 +151,8 @@ void XMLPropertyStateBuffer::ContextFilter( ::std::vector
XMLPropertyState )
pPMMarginLeft-maValue = nLeft;
pPMMarginRight-maValue = nRight;
-if ((nTop == nBottom) (nBottom == nLeft) (nLeft == nRight))
-{
-lcl_RemoveState( pPMMarginTop );
-lcl_RemoveState( pPMMarginBottom );
-lcl_RemoveState( pPMMarginLeft );
-lcl_RemoveState( pPMMarginRight );
-}
-else
+// Don't remove the Margin Left,Right,Top,Bottom for backward
compatibility
+if ((nTop != nBottom) || (nBottom != nLeft) || (nLeft != nRight))
lcl_RemoveState( pPMMarginAll );
}
else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/core/xmlexp.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit dc0f9dab100ce02a8c2a275f5f53187bb0df0976 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Dec 5 11:13:44 2011 +0100 The ODG should have office:drawing after office:body, not office:graphics diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 7ebd3fd..a074d03 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -1248,6 +1248,8 @@ void SvXMLExport::ImplExportContent() GetXMLToken( XML_TRUE ) ); eClass = XML_TEXT; } +if ( XML_GRAPHICS == eClass ) +eClass = XML_DRAWING; // office:body ... SetBodyAttributes(); SvXMLElementExport aElem( *this, meClass != XML_TOKEN_INVALID, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/forms/elementimport.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 49846da1652661e73acffd1ee8df0419aadf5cdb
Author: Eike Rathke er...@redhat.com
Date: Thu Nov 24 17:40:44 2011 +0100
fdo#43152 ooo#114415 fixed crash on unnamed form element
An unnamed form element without parent container lead to a crash when
trying to
obtain a unique name by iterating over (now not) existing container
elements.
diff --git a/xmloff/source/forms/elementimport.cxx
b/xmloff/source/forms/elementimport.cxx
index 3fde263..10c4b2f 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -495,8 +495,11 @@ namespace xmloff
{
// no optimization here. If this method gets called, the XML stream
did not contain a name for the
// element, which is a heavy error. So in this case we don't care for
performance
-Sequence ::rtl::OUString aNames =
m_xParentContainer-getElementNames();
static const ::rtl::OUString
sUnnamedName(RTL_CONSTASCII_USTRINGPARAM(unnamed));
+OSL_ENSURE(m_xParentContainer.is(),
OElementImport::implGetDefaultName: no parent container!);
+if (!m_xParentContainer.is())
+return sUnnamedName;
+Sequence ::rtl::OUString aNames =
m_xParentContainer-getElementNames();
::rtl::OUString sReturn;
const ::rtl::OUString* pNames = NULL;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/core/xmlexp.cxx |2 +-
xmloff/source/core/xmlimp.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 42fe8b9f11da41530a6d914397b6301a72db3800
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 29 10:48:57 2011 +0300
WaE: Mark SvXMLExport_Impl and SvXMLImport_Impl as SAL_DLLPRIVATE
Fixes warnings: 'SvXML*_Impl' declared with greater visibility than
the type of its field 'SvXMLExport_Impl::mpRDFaHelper'.
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 2777f61..54b02a4 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -260,7 +260,7 @@ void SAL_CALL SvXMLExportEventListener::disposing( const
lang::EventObject )
//==
-class SvXMLExport_Impl
+class SAL_DLLPRIVATE SvXMLExport_Impl
{
public:
SvXMLExport_Impl();
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 1f9f87a..9574bd7 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -169,7 +169,7 @@ void SAL_CALL SvXMLImportEventListener::disposing( const
lang::EventObject )
//==
-class SvXMLImport_Impl
+class SAL_DLLPRIVATE SvXMLImport_Impl
{
public:
FontToSubsFontConverter hBatsFontConv;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
