summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@novell.com>2011-03-09 14:56:21 +0100
committerThorsten Behrens <tbehrens@novell.com>2011-03-09 14:56:21 +0100
commitff62ed4745a9b2367c68ef3eb863d29022f0fa7d (patch)
tree86a24f72042acbf232e5d1805150b590acc532a3 /xmloff
parent14fcbd54c96d9f46365f76f8df6b51d2e8074d74 (diff)
Revert idle whitespace changes
Reverting all hunks that solely change whitespace, prior to performing the m101 merge from OOo.
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx8
-rw-r--r--xmloff/source/draw/ximp3dscene.cxx4
-rw-r--r--xmloff/source/draw/ximpstyl.cxx6
-rw-r--r--xmloff/source/style/impastp1.cxx2
-rw-r--r--xmloff/source/style/impastpl.hxx2
-rw-r--r--xmloff/source/text/txtimp.cxx2
6 files changed, 12 insertions, 12 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index ba57db8717..6a6f1f5bf5 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1694,7 +1694,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls()
AddAttribute( XML_NAMESPACE_PRESENTATION, XML_NAME, sBuffer.makeStringAndClear());
AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SOURCE, rDecl.mbFixed ? XML_FIXED : XML_CURRENT_DATE );
-
+
if( !rDecl.mbFixed )
AddAttribute( XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, getDataStyleName( rDecl.mnFormat ) );
@@ -2727,7 +2727,7 @@ OUString SdXMLExport::getNavigationOrder( const Reference< XDrawPage >& xDrawPag
Reference< XIndexAccess > xNavOrder( xSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ) ), UNO_QUERY_THROW );
Reference< XIndexAccess > xZOrderAccess( xDrawPage, UNO_QUERY );
-
+
// only export navigation order if it is different from the z-order
if( (xNavOrder.get() != xZOrderAccess.get()) && (xNavOrder->getCount() == xDrawPage->getCount()) )
{
@@ -2781,7 +2781,7 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage )
// do not export in ODF 1.2 or older
if( getDefaultVersion() <= SvtSaveOptions::ODFVER_012 )
return;
-
+
Reference< XAnnotationAccess > xAnnotationAccess( xDrawPage, UNO_QUERY );
if( xAnnotationAccess.is() ) try
{
@@ -2949,7 +2949,7 @@ OUString SAL_CALL SdXMLExport::getImplementationName() throw( uno::RuntimeExcept
return XMLImpressMetaExportOasis_getImplementationName();
case EXPORT_OASIS|EXPORT_SETTINGS:
return XMLImpressSettingsExportOasis_getImplementationName();
-
+
default:
return XMLImpressExportOOO_getImplementationName();
}
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index b97e41a2e6..c2c993ddd2 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -293,7 +293,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
{
::basegfx::B3DVector aNewVec;
mrImport.GetMM100UnitConverter().convertB3DVector(aNewVec, rValue);
-
+
if(aNewVec != maVPN)
{
maVPN = aNewVec;
@@ -305,7 +305,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
{
::basegfx::B3DVector aNewVec;
mrImport.GetMM100UnitConverter().convertB3DVector(aNewVec, rValue);
-
+
if(aNewVec != maVUP)
{
maVUP = aNewVec;
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 5145072804..d51a9522e0 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -210,7 +210,7 @@ SvXMLImportContext *SdXMLDrawingPageStyleContext::CreateChildContext(
GetProperties(),
xImpPrMap );
}
-
+
if( !pContext )
pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
xAttrList );
@@ -467,7 +467,7 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
mpPageMasterStyle = (SdXMLPageMasterStyleContext*)pContext;
}
}
-
+
// call base class
if(!pContext)
pContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
@@ -1184,7 +1184,7 @@ UniReference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyM
xMapper = xPresImpPropMapper;
break;
}
-
+
case XML_STYLE_FAMILY_TABLE_COLUMN:
case XML_STYLE_FAMILY_TABLE_ROW:
case XML_STYLE_FAMILY_TABLE_CELL:
diff --git a/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastp1.cxx
index 8cfdcb3d99..786b0027be 100644
--- a/xmloff/source/style/impastp1.cxx
+++ b/xmloff/source/style/impastp1.cxx
@@ -51,7 +51,7 @@ XMLFamilyData_Impl::XMLFamilyData_Impl(
sal_Bool bAsFam )
: pCache( 0 ), mnFamily( nFamily ), maStrFamilyName( rStrName), mxMapper( rMapper ),
mnCount( 0 ), mnName( 0 ), maStrPrefix( rStrPrefix ), bAsFamily( bAsFam )
-
+
{
mpParentList = new SvXMLAutoStylePoolParentsP_Impl( 5, 5 );
mpNameList = new SvXMLAutoStylePoolNamesP_Impl( 5, 5 );
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index d11198c20a..3ed2748426 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -81,7 +81,7 @@ public:
pCache( 0 ),
mnFamily( nFamily ), mpParentList( NULL ),
mpNameList( NULL ), mnCount( 0 ), mnName( 0 )
-
+
{}
~XMLFamilyData_Impl();
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 801415db6e..b56acc0f4c 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1789,7 +1789,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
// #i107225# the combined characters need to be inserted first
// the selected text has to be removed afterwards
m_pImpl->m_xText->insertTextContent( xRange->getStart(), xTextContent, sal_True );
-
+
if( xRange->getString().getLength() )
{
try