#103496#: move VCL free ConfigItems to unotools

4 files changed, 82 insertions, 82 deletions

diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx
index b778571a5c0f..0f5b42cbd37f 100644
--- a/starmath/source/config.cxx
+++ b/starmath/source/config.cxx
@@ -35,7 +35,7 @@
 #include <svtools/itemset.hxx>
 #include <svtools/hint.hxx>
 #include <svtools/smplhint.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svtools/eitem.hxx>
 #include <svtools/itempool.hxx>
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index ab467fc034e3..83411afab78c 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -59,9 +59,9 @@
 #include <svtools/fstathelper.hxx>
 #include <svtools/intitem.hxx>
 #include <svtools/itempool.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/ptitem.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/slstitm.hxx>
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 9ddabab9c325..75c9e8cfc8d9 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************

  *

  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

+ *

  * Copyright 2008 by Sun Microsystems, Inc.

  *

  * OpenOffice.org - a multi-platform office productivity suite

@@ -61,7 +61,7 @@
 #include <tools/debug.hxx>

 #include <tools/urlobj.hxx>

 #include <svtools/sfxecode.hxx>

-#include <svtools/saveopt.hxx>

+#include <unotools/saveopt.hxx>

 #include <svtools/stritem.hxx>

 #include <svtools/itemprop.hxx>

 #include <unotools/processfactory.hxx>

@@ -403,8 +403,8 @@ SmXMLExport::SmXMLExport(
 {

 }

 

-sal_Int64 SAL_CALL SmXMLExport::getSomething( 

-    const uno::Sequence< sal_Int8 >& rId ) 

+sal_Int64 SAL_CALL SmXMLExport::getSomething(

+    const uno::Sequence< sal_Int8 >& rId )

 throw(uno::RuntimeException)

 {

     if ( rId.getLength() == 16 &&

@@ -833,7 +833,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int nLevel)
     if (nSize >= 1 && pNode->GetSubNode(nSize-1)->GetNumSubNodes() == 0)

         --nSize;

 

-    // try to avoid creating a mtable element when the formula consists only 

+    // try to avoid creating a mtable element when the formula consists only

     // of a single output line

     if (nLevel || (nSize >1))

         pTable = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTABLE, sal_True, sal_True);

@@ -902,7 +902,7 @@ void SmXMLExport::ExportText(const SmNode *pNode, int /*nLevel*/)
 

 void SmXMLExport::ExportBlank(const SmNode * /*pNode*/, int /*nLevel*/)

 {

-    //!! exports an empty <mi> tag since for example "~_~" is allowed in 

+    //!! exports an empty <mi> tag since for example "~_~" is allowed in

     //!! Math (so it has no sense at all) but must not result in an empty

     //!! <msub> tag in MathML !!

 

@@ -910,7 +910,7 @@ void SmXMLExport::ExportBlank(const SmNode * /*pNode*/, int /*nLevel*/)
     //const SmBlankNode *pTemp = static_cast<const SmBlankNode *>(pNode);

 

     pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MI, sal_True, sal_False);

-    

+

     GetDocHandler()->characters( OUString() );

     delete pText;

 }

@@ -1203,10 +1203,10 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode, int nLevel)
 

 static bool lcl_HasEffectOnMathvariant( const SmTokenType eType )

 {

-    return  eType == TBOLD || eType == TNBOLD || 

+    return  eType == TBOLD || eType == TNBOLD ||

             eType == TITALIC || eType == TNBOLD ||

             eType == TSANS || eType == TSERIF || eType == TFIXED;

-}    

+}

 

 void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel)

 {

@@ -1480,7 +1480,7 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel)
                     // thus at least it will not vanish into nothing

                     ExportText(pNode, nLevel);

                 }

-                else    

+                else

                 {

                     //To fully handle generic MathML we need to implement the full

                     //operator dictionary, we will generate MathML with explicit

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 1f7336db6d3c..e4b01f33cc12 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************

  *

  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

+ *

  * Copyright 2008 by Sun Microsystems, Inc.

  *

  * OpenOffice.org - a multi-platform office productivity suite

@@ -57,7 +57,7 @@ one go*/
 #include <tools/debug.hxx>

 #include <tools/urlobj.hxx>

 #include <svtools/sfxecode.hxx>

-#include <svtools/saveopt.hxx>

+#include <unotools/saveopt.hxx>

 #include <svtools/stritem.hxx>

 #include <svtools/itemprop.hxx>

 #include <unotools/processfactory.hxx>

@@ -337,7 +337,7 @@ ULONG SmXMLImportWrapper::ReadThroughComponent(
         packages::zip::ZipIOException aBrokenPackage;

         if ( aSaxEx.WrappedException >>= aBrokenPackage )

             return ERRCODE_IO_BROKENPACKAGE;

-        

+

         if ( bEncrypted )

             nError = ERRCODE_SFX_WRONGPASSWORD;

     }

@@ -346,7 +346,7 @@ ULONG SmXMLImportWrapper::ReadThroughComponent(
         packages::zip::ZipIOException aBrokenPackage;

         if ( r.WrappedException >>= aBrokenPackage )

             return ERRCODE_IO_BROKENPACKAGE;

- 

+

         if ( bEncrypted )

             nError = ERRCODE_SFX_WRONGPASSWORD;

     }

@@ -553,8 +553,8 @@ rtl::OUString SAL_CALL SmXMLImport::getImplementationName()
 }

 

 

-sal_Int64 SAL_CALL SmXMLImport::getSomething( 

-    const uno::Sequence< sal_Int8 >&rId ) 

+sal_Int64 SAL_CALL SmXMLImport::getSomething(

+    const uno::Sequence< sal_Int8 >&rId )

 throw(uno::RuntimeException)

 {

     if ( rId.getLength() == 16 &&

@@ -625,17 +625,17 @@ public:
     SmXMLImportContext( SmXMLImport &rImport, sal_uInt16 nPrfx,

         const OUString& rLName)

         : SvXMLImportContext(rImport, nPrfx, rLName) {}

-    

+

     const SmXMLImport& GetSmImport() const

     {

         return (const SmXMLImport&)GetImport();

     }

-    

+

     SmXMLImport& GetSmImport()

     {

         return (SmXMLImport&)GetImport();

     }

-    

+

     virtual void TCharacters(const OUString & /*rChars*/);

     virtual void Characters(const OUString &rChars);

     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/, const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/);

@@ -644,7 +644,7 @@ public:
 void SmXMLImportContext::TCharacters(const OUString & /*rChars*/)

 {

 }

-    

+

 void SmXMLImportContext::Characters(const OUString &rChars)

 {

     /*

@@ -678,10 +678,10 @@ struct SmXMLContext_Helper
     OUString sColor;

 

     SmXMLImportContext rContext;

-    

-    SmXMLContext_Helper(SmXMLImportContext &rImport) : 

+

+    SmXMLContext_Helper(SmXMLImportContext &rImport) :

         nIsBold(-1), nIsItalic(-1), nFontSize(0.0), rContext(rImport)  {}

-    

+

     void RetrieveAttrs(const uno::Reference< xml::sax::XAttributeList > &xAttrList );

     void ApplyAttrs();

 };

@@ -845,9 +845,9 @@ public:
     SmXMLDocContext_Impl( SmXMLImport &rImport, sal_uInt16 nPrfx,

         const OUString& rLName)

         : SmXMLImportContext(rImport,nPrfx,rLName) {}

-    

+

     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList);

-    

+

     void EndElement();

 };

 

@@ -864,13 +864,13 @@ public:
         const OUString& rLName)

         : SmXMLDocContext_Impl(rImport,nPrefix,rLName)

         { nElementCount = GetSmImport().GetNodeStack().Count(); }

-    

+

     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList);

-    

+

     SvXMLImportContext *StrictCreateChildContext(sal_uInt16 nPrefix,

         const OUString& rLocalName,

         const uno::Reference< xml::sax::XAttributeList > &xAttrList);

-    

+

     void EndElement();

 };

 

@@ -882,7 +882,7 @@ public:
     SmXMLFracContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -894,7 +894,7 @@ public:
     SmXMLSqrtContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -906,7 +906,7 @@ public:
     SmXMLRootContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -922,7 +922,7 @@ public:
     SmXMLStyleContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName),

         aStyleHelper(*this) {}

-    

+

     void EndElement();

     void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );

 };

@@ -1100,7 +1100,7 @@ public:
     SmXMLPaddedContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -1124,7 +1124,7 @@ public:
     SmXMLPhantomContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -1164,7 +1164,7 @@ public:
         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName),

         cBegin('('), cEnd(')') {}

-    

+

     void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList );

     void EndElement();

 };

@@ -1255,7 +1255,7 @@ public:
     SmXMLErrorContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -1293,9 +1293,9 @@ public:
         aToken.nLevel = 5;

         aToken.eType = TNUMBER;

     }

-    

+

     virtual void TCharacters(const OUString &rChars);

-    

+

     void EndElement();

 };

 

@@ -1319,9 +1319,9 @@ public:
     SmXMLAnnotationContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLImportContext(rImport,nPrefix,rLName), bIsStarMath(sal_False) {}

-    

+

     virtual void Characters(const OUString &rChars);

-    

+

     void StartElement(const uno::Reference<xml::sax::XAttributeList > & xAttrList );

 };

 

@@ -1374,9 +1374,9 @@ public:
         aToken.nLevel = 5;

         aToken.eType = TTEXT;

     }

-    

+

     virtual void TCharacters(const OUString &rChars);

-    

+

     void EndElement();

 };

 

@@ -1407,9 +1407,9 @@ public:
         aToken.nLevel = 5;

         aToken.eType = TTEXT;

     }

-    

+

     virtual void TCharacters(const OUString &rChars);

-    

+

     void EndElement();

 };

 

@@ -1454,9 +1454,9 @@ public:
         aToken.nLevel = 5;

         aToken.eType = TIDENT;

     }

-    

+

     void TCharacters(const OUString &rChars);

-    void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList ) 

+    void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList )

     {

         aStyleHelper.RetrieveAttrs(xAttrList);

     };

@@ -1519,7 +1519,7 @@ public:
         aToken.eType = TSPECIAL;

         aToken.nLevel = 5;

     }

-    

+

     void TCharacters(const OUString &rChars);

     void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );

     void EndElement();

@@ -1578,7 +1578,7 @@ public:
     SmXMLSpaceContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLImportContext(rImport,nPrefix,rLName) {}

-    

+

     void StartElement(const uno::Reference< xml::sax::XAttributeList >& xAttrList );

 };

 

@@ -1606,10 +1606,10 @@ public:
     SmXMLSubContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

-    void EndElement() 

-    { 

-        GenericEndElement(TRSUB,RSUB); 

+

+    void EndElement()

+    {

+        GenericEndElement(TRSUB,RSUB);

     }

 };

 

@@ -1647,7 +1647,7 @@ public:
     SmXMLSupContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLSubContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void EndElement()

     {

         GenericEndElement(TRSUP,RSUP);

@@ -1665,9 +1665,9 @@ public:
     SmXMLSubSupContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}

-    

-    void EndElement() 

-    { 

+

+    void EndElement()

+    {

         GenericEndElement(TRSUB,RSUB,RSUP);

     }

 };

@@ -1711,7 +1711,7 @@ public:
     SmXMLUnderContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLSubContext_Impl(rImport,nPrefix,rLName) {}

-    

+

     void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );

     void EndElement();

     void HandleAccent();

@@ -1782,7 +1782,7 @@ public:
     SmXMLOverContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLSubContext_Impl(rImport,nPrefix,rLName), nAttrCount(0) {}

-    

+

     void EndElement();

     void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );

     void HandleAccent();

@@ -1836,9 +1836,9 @@ public:
     SmXMLUnderOverContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLSubSupContext_Impl(rImport,nPrefix,rLName) {}

-    

-    void EndElement() 

-    { 

+

+    void EndElement()

+    {

         GenericEndElement(TCSUB,CSUB,CSUP);

     }

 };

@@ -1854,7 +1854,7 @@ public:
         const OUString& rLName) :

         SmXMLSubSupContext_Impl(rImport,nPrefix,rLName),

         bHasPrescripts(FALSE) {}

-    

+

     void EndElement();

     void MiddleElement();

     SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,

@@ -1870,7 +1870,7 @@ public:
     SmXMLNoneContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,

         const OUString& rLName)

         : SmXMLImportContext(rImport,nPrefix,rLName) {}

-    

+

     void EndElement();

 };

 

@@ -1906,7 +1906,7 @@ public:
         const OUString& rLName) :

         SmXMLRowContext_Impl(rImport,nPrefix,rLName)

         {}

-    

+

     SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,

         const OUString& rLocalName,

         const uno::Reference< xml::sax::XAttributeList > &xAttrList);

@@ -1922,7 +1922,7 @@ public:
         const OUString& rLName) :

         SmXMLTableRowContext_Impl(rImport,nPrefix,rLName)

         {}

-    

+

     void EndElement();

     SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,

         const OUString& rLocalName,

@@ -1950,9 +1950,9 @@ public:
         const OUString& rLName) :

         SmXMLRowContext_Impl(rImport,nPrefix,rLName)

         {}

-    

+

     /*Don't do anything with alignment for now*/

-    void EndElement() 

+    void EndElement()

     {

     }

 };

@@ -1966,7 +1966,7 @@ public:
         const OUString& rLName) :

         SmXMLRowContext_Impl(rImport,nPrefix,rLName)

         {}

-    

+

     void EndElement();

 };

 

@@ -1980,7 +1980,7 @@ public:
     SmXMLOfficeContext_Impl( SmXMLImport &rImport, sal_uInt16 nPrfx,

         const OUString& rLName)

         : SvXMLImportContext(rImport,nPrfx,rLName) {}

-    

+

     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList);

 };

 

@@ -1990,10 +1990,10 @@ SvXMLImportContext *SmXMLOfficeContext_Impl::CreateChildContext(sal_uInt16 nPref
 {

     SvXMLImportContext *pContext = 0;

     if ( XML_NAMESPACE_OFFICE == nPrefix &&

-        rLocalName == GetXMLToken(XML_META) ) 

+        rLocalName == GetXMLToken(XML_META) )

     {

         DBG_WARNING("XML_TOK_DOC_META: should not have come here, maybe document is invalid?");

-    } 

+    }

     else if ( XML_NAMESPACE_OFFICE == nPrefix &&

         rLocalName == GetXMLToken(XML_SETTINGS) )

     {

@@ -2049,8 +2049,8 @@ SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext(
     {

         return SvXMLMetaDocumentContext::CreateChildContext(

                     i_nPrefix, i_rLocalName, i_xAttrList );

-    } 

-    else 

+    }

+    else

     {

         return SmXMLOfficeContext_Impl::CreateChildContext(

                     i_nPrefix, i_rLocalName, i_xAttrList );

@@ -2837,10 +2837,10 @@ SvXMLImportContext *SmXMLImport::CreateContext(sal_uInt16 nPrefix,
     const OUString &rLocalName,

     const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)

 {

-    if ( XML_NAMESPACE_OFFICE == nPrefix ) 

+    if ( XML_NAMESPACE_OFFICE == nPrefix )

     {

         if ( (IsXMLToken(rLocalName, XML_DOCUMENT) ||

-              IsXMLToken(rLocalName, XML_DOCUMENT_META))) 

+              IsXMLToken(rLocalName, XML_DOCUMENT_META)))

         {

             uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(

                 mxServiceFactory->createInstance(

@@ -2856,12 +2856,12 @@ SvXMLImportContext *SmXMLImport::CreateContext(sal_uInt16 nPrefix,
                 // flat OpenDocument file format -- this has not been tested...

                 : new SmXMLFlatDocContext_Impl( *this, nPrefix, rLocalName,

                             xDPS->getDocumentProperties(), xDocBuilder);

-        } 

-        else 

+        }

+        else

         {

             return new SmXMLOfficeContext_Impl( *this,nPrefix,rLocalName);

         }

-    } 

+    }

     else

         return new SmXMLDocContext_Impl(*this,nPrefix,rLocalName);

 }