[Libreoffice-commits] .: xmloff/source

2012-04-11 Thread Ivan Timofeev
 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

2012-03-26 Thread Thorsten Behrens
 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

2012-03-18 Thread Julien Nabet
 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

2012-03-18 Thread Julien Nabet
 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

2012-03-08 Thread Stephan Bergmann
 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

2012-02-10 Thread Jan Holesovsky
 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

2012-01-25 Thread Olivier Hallot
 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

2012-01-16 Thread Stephan Bergmann
 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

2012-01-16 Thread Stephan Bergmann
 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

2012-01-06 Thread Cédric Bosdonnat
 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

2011-12-05 Thread Fridrich Strba
 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

2011-11-24 Thread Eike Rathke
 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

2011-09-29 Thread Tor Lillqvist
 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