changefileheader2: #i10000#: convert files with CR/LF characters to CR only

4 files changed, 88 insertions, 88 deletions

diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index c56330c1388c..f5059f979b63 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -742,14 +742,14 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame:
         uno::Reference< container::XChild > xChild( xChartModel, uno::UNO_QUERY );
         if( xChild.is() )
         {
-            aGenerator = lcl_getGeneratorFromModel( uno::Reference< frame::XModel >( xChild->getParent(), uno::UNO_QUERY) );

+            aGenerator = lcl_getGeneratorFromModel( uno::Reference< frame::XModel >( xChild->getParent(), uno::UNO_QUERY) );
             if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project") ) ) != -1 )
             {
-                //the chart application has not created files without a meta stream since OOo 2.3 (OOo 2.3 has written a metastream already) 

-                //only the report builder extension has created some files with OOo 3.1 that do not have a meta stream

-                if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/31") ) ) != -1 )

-                    bResult = false;//#i100102# probably generated with OOo 3.1 by the report designer

-                else

+                //the chart application has not created files without a meta stream since OOo 2.3 (OOo 2.3 has written a metastream already)
+                //only the report builder extension has created some files with OOo 3.1 that do not have a meta stream
+                if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/31") ) ) != -1 )
+                    bResult = false;//#i100102# probably generated with OOo 3.1 by the report designer
+                else
                     bResult= true; //in this case the OLE chart was created by an older version, as OLE objects are sometimes stream copied the version can differ from the parents version, so the parents version is not a reliable indicator
             }
             else if( isDocumentGeneratedWithOpenOfficeOlderThan2_0(xChartModel) )
@@ -759,18 +759,18 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame:
     return bResult;
 }
 
-bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel)

-{

-    bool bResult = false;

-    ::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) );

-    if(    ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org 1") ) ) == 0 )

-        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 6") ) ) == 0 )

-        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 7") ) ) == 0 )

-        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 6") ) ) == 0 )

-        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 7") ) ) == 0 )

-        )

-        bResult= true;

-    return bResult;

+bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel)
+{
+    bool bResult = false;
+    ::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) );
+    if(    ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org 1") ) ) == 0 )
+        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 6") ) ) == 0 )
+        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 7") ) ) == 0 )
+        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 6") ) ) == 0 )
+        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 7") ) ) == 0 )
+        )
+        bResult= true;
+    return bResult;
 }
 
 Reference< chart2::data::XDataProvider > getDataProviderFromParent( const Reference< chart2::XChartDocument >& xChartDoc )
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index d9675a380769..b541fd2c3057 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -196,12 +196,12 @@ OUString SvXMLNamespaceMap::GetAttrNameByKey( sal_uInt16 nKey ) const
     if (aIter != aNameMap.end())
     {
         sAttrName.append( sXMLNS  );
-        const ::rtl::OUString & prefix( (*aIter).second->sPrefix );

-        if (prefix.getLength()) // not default namespace

-        {

-            sAttrName.append( sal_Unicode(':') );

-            sAttrName.append( prefix );

-        }

+        const ::rtl::OUString & prefix( (*aIter).second->sPrefix );
+        if (prefix.getLength()) // not default namespace
+        {
+            sAttrName.append( sal_Unicode(':') );
+            sAttrName.append( prefix );
+        }
     }
     return sAttrName.makeStringAndClear();
 }
@@ -226,11 +226,11 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
             // don't bother caching this, it rarely happens
             OUStringBuffer sQName;
             sQName.append ( sXMLNS );
-            if (rLocalName.getLength()) // not default namespace

-            {

-                sQName.append ( sal_Unicode(':') );

-                sQName.append ( rLocalName );

-            }

+            if (rLocalName.getLength()) // not default namespace
+            {
+                sQName.append ( sal_Unicode(':') );
+                sQName.append ( rLocalName );
+            }
             return sQName.makeStringAndClear();;
         }
         case XML_NAMESPACE_XML:
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 06fe80fbf9b4..bc6f72abd2b0 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1260,51 +1260,51 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
                         break;
                     }
 
-                    case 33 : // AUTOLAYOUT_4CLIPART

-                    {

-                        Rectangle aTopLeft(pInfo->GetPresRectangle());

-                        aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));

-                        aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.488));

-                        Rectangle aBottomLeft(aTopLeft);

-                        aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);

-                        Rectangle aTopRight(aTopLeft);

-                        aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 1.05);

-                        Rectangle aBottomRight(aTopRight);

-                        aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);

-

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);

-                        break;

-                    }

-
-                    case 34 : // AUTOLAYOUT_6CLIPART

-                    {

-                        Rectangle aTopLeft(pInfo->GetPresRectangle());

-                        aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));

-                        aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.322));   

-                        Rectangle aTopCenter(aTopLeft);

-                        aTopCenter.Left() = long(aTopCenter.Left() + aTopCenter.GetWidth() * 1.05);

-                        Rectangle aTopRight(aTopLeft);

-                        aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 2 * 1.05);

-                    

-                        Rectangle aBottomLeft(aTopLeft);

-                        aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);

-                        Rectangle aBottomCenter(aTopCenter);

-                        aBottomCenter.Top() = long(aBottomCenter.Top() + aBottomCenter.GetHeight() * 1.095);

-                        Rectangle aBottomRight(aTopRight);

-                        aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);

-                                                

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopCenter);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomCenter);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);

-                        break;

+                    case 33 : // AUTOLAYOUT_4CLIPART
+                    {
+                        Rectangle aTopLeft(pInfo->GetPresRectangle());
+                        aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
+                        aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.488));
+                        Rectangle aBottomLeft(aTopLeft);
+                        aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);
+                        Rectangle aTopRight(aTopLeft);
+                        aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 1.05);
+                        Rectangle aBottomRight(aTopRight);
+                        aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);
+
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);
+                        break;
+                    }
+
+                    case 34 : // AUTOLAYOUT_6CLIPART
+                    {
+                        Rectangle aTopLeft(pInfo->GetPresRectangle());
+                        aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
+                        aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.322));
+                        Rectangle aTopCenter(aTopLeft);
+                        aTopCenter.Left() = long(aTopCenter.Left() + aTopCenter.GetWidth() * 1.05);
+                        Rectangle aTopRight(aTopLeft);
+                        aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 2 * 1.05);
+
+                        Rectangle aBottomLeft(aTopLeft);
+                        aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);
+                        Rectangle aBottomCenter(aTopCenter);
+                        aBottomCenter.Top() = long(aBottomCenter.Top() + aBottomCenter.GetHeight() * 1.095);
+                        Rectangle aBottomRight(aTopRight);
+                        aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);
+
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopCenter);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomCenter);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);
+                        break;
                     }
                     default:
                     {
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 1d783c4e73ba..01f0fa0faf5c 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -729,24 +729,24 @@ void SdXMLPresentationPageLayoutContext::EndElement()
                 }
                 case 5:
                 {
-                    SdXMLPresentationPlaceholderContext* pObj1 = maList.GetObject(1);

-

-                    if(pObj1->GetName().equals(

-                        OUString(RTL_CONSTASCII_USTRINGPARAM("object"))))

-                    {

-                        mnTypeId = 18; // AUTOLAYOUT_4OBJ

-                    }

-                    else

-                    {

-                        mnTypeId = 33; // AUTOLAYOUT_4CLIPART

-                    }

-                     break;

+                    SdXMLPresentationPlaceholderContext* pObj1 = maList.GetObject(1);
+
+                    if(pObj1->GetName().equals(
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("object"))))
+                    {
+                        mnTypeId = 18; // AUTOLAYOUT_4OBJ
+                    }
+                    else
+                    {
+                        mnTypeId = 33; // AUTOLAYOUT_4CLIPART
+                    }
+                     break;
 
                 }
                 case 7:
                 {
-                    mnTypeId = 33; // AUTOLAYOUT_6CLIPART

-                    break;

+                    mnTypeId = 33; // AUTOLAYOUT_6CLIPART
+                    break;
                 }
                 default:
                 {