#i10000#: fix CRLF. Sigh

7 files changed, 193 insertions, 193 deletions

diff --git a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.cxx b/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
index 8f191abf61ca..723b3e44f3e5 100644
--- a/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
+++ b/svtools/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
@@ -803,4 +803,4 @@ void HistoryOptTest::impl_checkHelpBookmarks()
     impl_checkGetList(s_sHelpBookmarks);
     impl_checkAppendItem(s_sHelpBookmarks);
 }
-*/

+*/
diff --git a/svtools/qa/complex/ConfigItems/helper/UserOptTest.cxx b/svtools/qa/complex/ConfigItems/helper/UserOptTest.cxx
index 3780eff3f741..14ee513ee0cb 100644
--- a/svtools/qa/complex/ConfigItems/helper/UserOptTest.cxx
+++ b/svtools/qa/complex/ConfigItems/helper/UserOptTest.cxx
@@ -31,12 +31,12 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA
  *
- ************************************************************************/

-

-#include "UserOptTest.hxx"

-

-namespace css = ::com::sun::star;

-

+ ************************************************************************/
+
+#include "UserOptTest.hxx"
+
+namespace css = ::com::sun::star;
+
 //=============================================================================
 static const ::rtl::OUString MESSAGE_SETCOMPANY_FAILED        = ::rtl::OUString::createFromAscii("set company failed")       ;
 static const ::rtl::OUString MESSAGE_SETFIRSTNAME_FAILED      = ::rtl::OUString::createFromAscii("set firstname failed")     ;
@@ -57,59 +57,59 @@ static const ::rtl::OUString MESSAGE_SETCUSTOMERNUMBER_FAILED = ::rtl::OUString:
 static const ::rtl::OUString MESSAGE_SETFATHERSNAME_FAILED    = ::rtl::OUString::createFromAscii("set fathersname failed")   ;
 static const ::rtl::OUString MESSAGE_SETAPARTMENT_FAILED      = ::rtl::OUString::createFromAscii("set apartment failed")     ;
 
-//=============================================================================

-

-

-UserOptTest::UserOptTest()

-   :m_aConfigItem()

-   ,m_xCfg()

-{

-}

-

-UserOptTest::~UserOptTest()

-{

-}

-

-void UserOptTest::impl_checkUserData()

-{

-    impl_checkSetCompany( ::rtl::OUString() );    

-    impl_checkSetFirstName( ::rtl::OUString() ); 

-    impl_checkSetLastName( ::rtl::OUString() );    

-    impl_checkSetID( ::rtl::OUString() );       

-    impl_checkSetStreet( ::rtl::OUString() );   

-    impl_checkSetCity( ::rtl::OUString() );   

-    impl_checkSetState( ::rtl::OUString() );     

-    impl_checkSetZip( ::rtl::OUString() );     

-    impl_checkSetCountry( ::rtl::OUString() );

-    impl_checkSetPosition( ::rtl::OUString() );

-    impl_checkSetTitle( ::rtl::OUString() );     

-    impl_checkSetTelephoneHome( ::rtl::OUString() );

-    impl_checkSetTelephoneWork( ::rtl::OUString() );

-    impl_checkSetFax( ::rtl::OUString() ); 

-    impl_checkSetEmail( ::rtl::OUString() );

-    //impl_checkSetCustomerNumber( ::rtl::OUString() );  

-    impl_checkSetFathersName( ::rtl::OUString() );

-    impl_checkSetApartment( ::rtl::OUString() );

-

-    impl_checkSetCompany( ::rtl::OUString::createFromAscii("RedFlag2000") );    

-    impl_checkSetFirstName( ::rtl::OUString::createFromAscii("Yan") ); 

-    impl_checkSetLastName( ::rtl::OUString::createFromAscii("Wu") );    

-    impl_checkSetID( ::rtl::OUString::createFromAscii("wuy") );       

-    impl_checkSetStreet( ::rtl::OUString::createFromAscii("SouthFifthRing") );   

-    impl_checkSetCity( ::rtl::OUString::createFromAscii("Beijing") );   

-    impl_checkSetState( ::rtl::OUString::createFromAscii("Beijing") );     

-    impl_checkSetZip( ::rtl::OUString::createFromAscii("100176") );     

-    impl_checkSetCountry( ::rtl::OUString::createFromAscii("China") );

-    impl_checkSetPosition( ::rtl::OUString::createFromAscii("Engineer") );

-    impl_checkSetTitle( ::rtl::OUString::createFromAscii("Software Engineer") );     

-    impl_checkSetTelephoneHome( ::rtl::OUString::createFromAscii("010-51570010") );

-    impl_checkSetTelephoneWork( ::rtl::OUString::createFromAscii("010-51570010") );

-    impl_checkSetFax( ::rtl::OUString::createFromAscii("010-51570010") ); 

-    impl_checkSetEmail( ::rtl::OUString::createFromAscii("wuy@redflag2000.cn") );

-    //impl_checkSetCustomerNumber( ::rtl::OUString::createFromAscii("87654321") );  

-    impl_checkSetFathersName( ::rtl::OUString::createFromAscii("father") );

-    impl_checkSetApartment( ::rtl::OUString::createFromAscii("apartment") );

-}

+//=============================================================================
+
+
+UserOptTest::UserOptTest()
+   :m_aConfigItem()
+   ,m_xCfg()
+{
+}
+
+UserOptTest::~UserOptTest()
+{
+}
+
+void UserOptTest::impl_checkUserData()
+{
+    impl_checkSetCompany( ::rtl::OUString() );
+    impl_checkSetFirstName( ::rtl::OUString() );
+    impl_checkSetLastName( ::rtl::OUString() );
+    impl_checkSetID( ::rtl::OUString() );
+    impl_checkSetStreet( ::rtl::OUString() );
+    impl_checkSetCity( ::rtl::OUString() );
+    impl_checkSetState( ::rtl::OUString() );
+    impl_checkSetZip( ::rtl::OUString() );
+    impl_checkSetCountry( ::rtl::OUString() );
+    impl_checkSetPosition( ::rtl::OUString() );
+    impl_checkSetTitle( ::rtl::OUString() );
+    impl_checkSetTelephoneHome( ::rtl::OUString() );
+    impl_checkSetTelephoneWork( ::rtl::OUString() );
+    impl_checkSetFax( ::rtl::OUString() );
+    impl_checkSetEmail( ::rtl::OUString() );
+    //impl_checkSetCustomerNumber( ::rtl::OUString() );
+    impl_checkSetFathersName( ::rtl::OUString() );
+    impl_checkSetApartment( ::rtl::OUString() );
+
+    impl_checkSetCompany( ::rtl::OUString::createFromAscii("RedFlag2000") );
+    impl_checkSetFirstName( ::rtl::OUString::createFromAscii("Yan") );
+    impl_checkSetLastName( ::rtl::OUString::createFromAscii("Wu") );
+    impl_checkSetID( ::rtl::OUString::createFromAscii("wuy") );
+    impl_checkSetStreet( ::rtl::OUString::createFromAscii("SouthFifthRing") );
+    impl_checkSetCity( ::rtl::OUString::createFromAscii("Beijing") );
+    impl_checkSetState( ::rtl::OUString::createFromAscii("Beijing") );
+    impl_checkSetZip( ::rtl::OUString::createFromAscii("100176") );
+    impl_checkSetCountry( ::rtl::OUString::createFromAscii("China") );
+    impl_checkSetPosition( ::rtl::OUString::createFromAscii("Engineer") );
+    impl_checkSetTitle( ::rtl::OUString::createFromAscii("Software Engineer") );
+    impl_checkSetTelephoneHome( ::rtl::OUString::createFromAscii("010-51570010") );
+    impl_checkSetTelephoneWork( ::rtl::OUString::createFromAscii("010-51570010") );
+    impl_checkSetFax( ::rtl::OUString::createFromAscii("010-51570010") );
+    impl_checkSetEmail( ::rtl::OUString::createFromAscii("wuy@redflag2000.cn") );
+    //impl_checkSetCustomerNumber( ::rtl::OUString::createFromAscii("87654321") );
+    impl_checkSetFathersName( ::rtl::OUString::createFromAscii("father") );
+    impl_checkSetApartment( ::rtl::OUString::createFromAscii("apartment") );
+}
 
 void UserOptTest::impl_checkSetCompany( const ::rtl::OUString& sUserData )
 {
diff --git a/svtools/qa/complex/ConfigItems/helper/UserOptTest.hxx b/svtools/qa/complex/ConfigItems/helper/UserOptTest.hxx
index 203a4cbc7cbd..8234b0b7edf4 100644
--- a/svtools/qa/complex/ConfigItems/helper/UserOptTest.hxx
+++ b/svtools/qa/complex/ConfigItems/helper/UserOptTest.hxx
@@ -31,48 +31,48 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA
  *
- ************************************************************************/

-

-#ifndef  SVTOOLS_USEROPTTEST_HXX

-#define  SVTOOLS_USEROPTTEST_HXX

-

-#include <com/sun/star/container/XNameAccess.hpp>

-#include <svtools/useroptions.hxx>

-

-namespace css = ::com::sun::star;

-

-class UserOptTest

-{

-public:

-    UserOptTest();

-    ~UserOptTest();

-

-    void impl_checkUserData();

-

-private:

-    void impl_checkSetCompany( const ::rtl::OUString& sUserData );

-    void impl_checkSetFirstName( const ::rtl::OUString& sUserData );

-    void impl_checkSetLastName( const ::rtl::OUString& sUserData );

-    void impl_checkSetID( const ::rtl::OUString& sUserData );

-    void impl_checkSetStreet( const ::rtl::OUString& sUserData );

-    void impl_checkSetCity( const ::rtl::OUString& sUserData );

-    void impl_checkSetState( const ::rtl::OUString& sUserData );

-    void impl_checkSetZip( const ::rtl::OUString& sUserData );

-    void impl_checkSetCountry( const ::rtl::OUString& sUserData );

-    void impl_checkSetPosition( const ::rtl::OUString& sUserData );

-    void impl_checkSetTitle( const ::rtl::OUString& sUserData );

-    void impl_checkSetTelephoneHome( const ::rtl::OUString& sUserData );

-    void impl_checkSetTelephoneWork( const ::rtl::OUString& sUserData );

-    void impl_checkSetFax( const ::rtl::OUString& sUserData );

-    void impl_checkSetEmail( const ::rtl::OUString& sUserData );

-    void impl_checkSetCustomerNumber( const ::rtl::OUString& sUserData );

-    void impl_checkSetFathersName( const ::rtl::OUString& sUserData );

-    void impl_checkSetApartment( const ::rtl::OUString& sUserData );

-

-private:

-    SvtUserOptions m_aConfigItem;

-

-    css::uno::Reference< css::container::XNameAccess > m_xCfg;  

-};

-

-#endif // #ifndef  SVTOOLS_USEROPTTEST_HXX

+ ************************************************************************/
+
+#ifndef  SVTOOLS_USEROPTTEST_HXX
+#define  SVTOOLS_USEROPTTEST_HXX
+
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <svtools/useroptions.hxx>
+
+namespace css = ::com::sun::star;
+
+class UserOptTest
+{
+public:
+    UserOptTest();
+    ~UserOptTest();
+
+    void impl_checkUserData();
+
+private:
+    void impl_checkSetCompany( const ::rtl::OUString& sUserData );
+    void impl_checkSetFirstName( const ::rtl::OUString& sUserData );
+    void impl_checkSetLastName( const ::rtl::OUString& sUserData );
+    void impl_checkSetID( const ::rtl::OUString& sUserData );
+    void impl_checkSetStreet( const ::rtl::OUString& sUserData );
+    void impl_checkSetCity( const ::rtl::OUString& sUserData );
+    void impl_checkSetState( const ::rtl::OUString& sUserData );
+    void impl_checkSetZip( const ::rtl::OUString& sUserData );
+    void impl_checkSetCountry( const ::rtl::OUString& sUserData );
+    void impl_checkSetPosition( const ::rtl::OUString& sUserData );
+    void impl_checkSetTitle( const ::rtl::OUString& sUserData );
+    void impl_checkSetTelephoneHome( const ::rtl::OUString& sUserData );
+    void impl_checkSetTelephoneWork( const ::rtl::OUString& sUserData );
+    void impl_checkSetFax( const ::rtl::OUString& sUserData );
+    void impl_checkSetEmail( const ::rtl::OUString& sUserData );
+    void impl_checkSetCustomerNumber( const ::rtl::OUString& sUserData );
+    void impl_checkSetFathersName( const ::rtl::OUString& sUserData );
+    void impl_checkSetApartment( const ::rtl::OUString& sUserData );
+
+private:
+    SvtUserOptions m_aConfigItem;
+
+    css::uno::Reference< css::container::XNameAccess > m_xCfg;
+};
+
+#endif // #ifndef  SVTOOLS_USEROPTTEST_HXX
diff --git a/svtools/source/config/historyoptions.cxx b/svtools/source/config/historyoptions.cxx
index d658f25d1a73..758753df0e4e 100644
--- a/svtools/source/config/historyoptions.cxx
+++ b/svtools/source/config/historyoptions.cxx
@@ -160,8 +160,8 @@ public:
         const OUString&    sTitle   ,
         const OUString&    sPassword );
 
-private: 

-    void impl_truncateList (EHistoryType eHistory, sal_uInt32 nSize);

+private:
+    void impl_truncateList (EHistoryType eHistory, sal_uInt32 nSize);
 
 private:
     css::uno::Reference< css::container::XNameAccess > m_xCfg;
@@ -248,12 +248,12 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory )
 //*****************************************************************************************************************
 void SvtHistoryOptions_Impl::SetSize( EHistoryType eHistory, sal_uInt32 nSize )
 {
-    css::uno::Reference< css::beans::XPropertySet > xListAccess(m_xCommonXCU, css::uno::UNO_QUERY);

-    if (! xListAccess.is ())

+    css::uno::Reference< css::beans::XPropertySet > xListAccess(m_xCommonXCU, css::uno::UNO_QUERY);
+    if (! xListAccess.is ())
         return;
 
     try
-    {

+    {
         switch( eHistory )
         {
         case ePICKLIST:
@@ -291,15 +291,15 @@ void SvtHistoryOptions_Impl::SetSize( EHistoryType eHistory, sal_uInt32 nSize )
         LogHelper::logIt(ex);
     }
 }
-

+
 //*****************************************************************************************************************
-void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt32 nSize )

+void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt32 nSize )
 {
     css::uno::Reference< css::container::XNameAccess >    xList;
     css::uno::Reference< css::container::XNameContainer > xItemList;
     css::uno::Reference< css::container::XNameContainer > xOrderList;
     css::uno::Reference< css::beans::XPropertySet >       xSet;
-

+
     try
     {
         switch( eHistory )
@@ -322,11 +322,11 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt
 
         // If too much items in current list ...
         // truncate the oldest items BEFORE you set the new one.
-        if ( ! xList.is())

-            return;

+        if ( ! xList.is())
+            return;
 
         xList->getByName(s_sOrderList) >>= xOrderList;
-        xList->getByName(s_sItemList)  >>= xItemList;

+        xList->getByName(s_sItemList)  >>= xItemList;
 
         const sal_uInt32 nLength = xOrderList->getElementNames().getLength();
         if (nSize < nLength)
@@ -348,7 +348,7 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt
     {
         LogHelper::logIt(ex);
     }
-}

+}
 
 //*****************************************************************************************************************
 //  public method
@@ -416,8 +416,8 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory )
 //*****************************************************************************************************************
 Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryType eHistory )
 {
-    impl_truncateList (eHistory, GetSize (eHistory));

-

+    impl_truncateList (eHistory, GetSize (eHistory));
+
     Sequence< Sequence< PropertyValue > > seqReturn; // Set default return value.
     Sequence< PropertyValue >             seqProperties( 4 );
     Sequence< ::rtl::OUString >           lOrders;
@@ -433,12 +433,12 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
     seqProperties[s_nOffsetPassword  ].Name = HISTORY_PROPERTYNAME_PASSWORD;
 
     try
-    { 

+    {
         switch( eHistory )
         {
         case ePICKLIST:
             {
-                m_xCfg->getByName(s_sPickList) >>= xListAccess; 

+                m_xCfg->getByName(s_sPickList) >>= xListAccess;
                 break;
             }
 
@@ -457,7 +457,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
         default:
             break;
         }
-

+
         if (xListAccess.is())
         {
             xListAccess->getByName(s_sItemList)  >>= xItemList;
@@ -500,8 +500,8 @@ void SvtHistoryOptions_Impl::AppendItem(       EHistoryType eHistory ,
                                         const OUString& sTitle      ,
                                         const OUString& sPassword   )
 {
-    impl_truncateList (eHistory, GetSize (eHistory));

-

+    impl_truncateList (eHistory, GetSize (eHistory));
+
     css::uno::Reference< css::container::XNameAccess > xListAccess;
     sal_Int32             nMaxSize = 0;
 
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 657d82ddb44e..0f54366c47f6 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -168,17 +168,17 @@ public:
     void        SetReducedBitmapResolution( sal_Int16 nResolution ) ;
     void        SetReducedBitmapIncludesTransparency( sal_Bool bState ) ;
        void        SetConvertToGreyscales( sal_Bool bState ) ;
-

+
 //-------------------------------------------------------------------------------------------------------------
 //  private API
-//-------------------------------------------------------------------------------------------------------------

-
-private:

-    void impl_setValue (const ::rtl::OUString& sProp,

-                              ::sal_Bool       bNew );

-    void impl_setValue (const ::rtl::OUString& sProp,

-                              ::sal_Int16      nNew );

-

+//-------------------------------------------------------------------------------------------------------------
+
+private:
+    void impl_setValue (const ::rtl::OUString& sProp,
+                              ::sal_Bool       bNew );
+    void impl_setValue (const ::rtl::OUString& sProp,
+                              ::sal_Int16      nNew );
+
 //-------------------------------------------------------------------------------------------------------------
 //  private member
 //-------------------------------------------------------------------------------------------------------------
@@ -431,7 +431,7 @@ sal_Bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
     return  bRet;
 
 }
-

+
 void SvtPrintOptions_Impl::SetReduceTransparency(sal_Bool bState)
 {
     impl_setValue(PROPERTYNAME_REDUCETRANSPARENCY, bState);
@@ -488,21 +488,21 @@ SvtPrintOptions_Impl::~SvtPrintOptions_Impl()
     m_xCfg.clear();
 }
 
-void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,

-                                                ::sal_Bool       bNew )

-{

+void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
+                                                ::sal_Bool       bNew )
+{
     try
     {
-        if ( ! m_xNode.is())

-            return;

+        if ( ! m_xNode.is())
+            return;
 
         css::uno::Reference<css::beans::XPropertySet> xSet(m_xNode, css::uno::UNO_QUERY);
-        if ( ! xSet.is())

-            return;

+        if ( ! xSet.is())
+            return;
 
         ::sal_Bool bOld = ! bNew;
-        if ( ! (xSet->getPropertyValue(sProp) >>= bOld))

-            return;

+        if ( ! (xSet->getPropertyValue(sProp) >>= bOld))
+            return;
 
         if (bOld != bNew)
         {
@@ -514,23 +514,23 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
     {
         LogHelper::logIt(ex);
     }
-}

+}
 
-void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,

-                                                ::sal_Int16      nNew )

-{

+void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
+                                                ::sal_Int16      nNew )
+{
     try
     {
-        if ( ! m_xNode.is())

-            return;

+        if ( ! m_xNode.is())
+            return;
 
         css::uno::Reference<css::beans::XPropertySet> xSet(m_xNode, css::uno::UNO_QUERY);
-        if ( ! xSet.is())

-            return;

+        if ( ! xSet.is())
+            return;
 
         ::sal_Int16 nOld = nNew+1;
-        if ( ! (xSet->getPropertyValue(sProp) >>= nOld))

-            return;

+        if ( ! (xSet->getPropertyValue(sProp) >>= nOld))
+            return;
 
         if (nOld != nNew)
         {
@@ -542,8 +542,8 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
     {
         LogHelper::logIt(ex);
     }
-}

-

+}
+
 // -----------------------------------------------------------------------------
 
 
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index 74d72e32155c..990e3041d903 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -29,14 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"

-

+#include "precompiled_svtools.hxx"
+
 #include <svtools/svmedit.hxx>
-#include <svtools/xtextedt.hxx>

-#include <svtools/editsyntaxhighlighter.hxx>

-#include "../../inc/txtattr.hxx"

-

-

+#include <svtools/xtextedt.hxx>
+#include <svtools/editsyntaxhighlighter.hxx>
+#include "../../inc/txtattr.hxx"
+
+
 MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle,
     HighlighterLanguage aLanguage): MultiLineEdit(pParent,nWinStyle), mbDoBracketHilight(true)
 {
diff --git a/svtools/source/inc/configitems/useroptions_const.hxx b/svtools/source/inc/configitems/useroptions_const.hxx
index bd3c6535b00c..4dbd6da8bba3 100644
--- a/svtools/source/inc/configitems/useroptions_const.hxx
+++ b/svtools/source/inc/configitems/useroptions_const.hxx
@@ -31,34 +31,34 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA
  *
- ************************************************************************/

-

-#ifndef INCLUDE_CONFIGITEMS_USEROPTIONS_CONST_HXX

-#define INCLUDE_CONFIGITEMS_USEROPTIONS_CONST_HXX

-

-#include <rtl/ustring.hxx>

-

-namespace

-{

-    static const ::rtl::OUString s_sData                     = ::rtl::OUString::createFromAscii("org.openoffice.UserProfile/Data"); 

-    static const ::rtl::OUString s_so                        = ::rtl::OUString::createFromAscii("o"); // USER_OPT_COMPANY

-    static const ::rtl::OUString s_sgivenname                = ::rtl::OUString::createFromAscii("givenname"); // USER_OPT_FIRSTNAME

-    static const ::rtl::OUString s_ssn                       = ::rtl::OUString::createFromAscii("sn"); // USER_OPT_LASTNAME

-    static const ::rtl::OUString s_sinitials                 = ::rtl::OUString::createFromAscii("initials"); // USER_OPT_ID

-    static const ::rtl::OUString s_sstreet                   = ::rtl::OUString::createFromAscii("street"); // USER_OPT_STREET

-    static const ::rtl::OUString s_sl                        = ::rtl::OUString::createFromAscii("l"); // USER_OPT_CITY

-    static const ::rtl::OUString s_sst                       = ::rtl::OUString::createFromAscii("st"); // USER_OPT_STATE

-    static const ::rtl::OUString s_spostalcode               = ::rtl::OUString::createFromAscii("postalcode"); // USER_OPT_ZIP

-    static const ::rtl::OUString s_sc                        = ::rtl::OUString::createFromAscii("c"); // USER_OPT_COUNTRY

-    static const ::rtl::OUString s_stitle                    = ::rtl::OUString::createFromAscii("title"); // USER_OPT_TITLE

-    static const ::rtl::OUString s_sposition                 = ::rtl::OUString::createFromAscii("position"); // USER_OPT_POSITION

-    static const ::rtl::OUString s_shomephone                = ::rtl::OUString::createFromAscii("homephone"); // USER_OPT_TELEPHONEHOME

-    static const ::rtl::OUString s_stelephonenumber          = ::rtl::OUString::createFromAscii("telephonenumber"); // USER_OPT_TELEPHONEWORK

-    static const ::rtl::OUString s_sfacsimiletelephonenumber = ::rtl::OUString::createFromAscii("facsimiletelephonenumber"); // USER_OPT_FAX

-    static const ::rtl::OUString s_smail                     = ::rtl::OUString::createFromAscii("mail"); // USER_OPT_EMAIL

-    static const ::rtl::OUString s_scustomernumber           = ::rtl::OUString::createFromAscii("customernumber"); // USER_OPT_CUSTOMERNUMBER

-    static const ::rtl::OUString s_sfathersname              = ::rtl::OUString::createFromAscii("fathersname"); // USER_OPT_FATHERSNAME

-    static const ::rtl::OUString s_sapartment                = ::rtl::OUString::createFromAscii("apartment"); // USER_OPT_APARTMENT

-}

-

-#endif //  INCLUDE_CONFIGITEMS_USEROPTIONS_CONST_HXX

+ ************************************************************************/
+
+#ifndef INCLUDE_CONFIGITEMS_USEROPTIONS_CONST_HXX
+#define INCLUDE_CONFIGITEMS_USEROPTIONS_CONST_HXX
+
+#include <rtl/ustring.hxx>
+
+namespace
+{
+    static const ::rtl::OUString s_sData                     = ::rtl::OUString::createFromAscii("org.openoffice.UserProfile/Data");
+    static const ::rtl::OUString s_so                        = ::rtl::OUString::createFromAscii("o"); // USER_OPT_COMPANY
+    static const ::rtl::OUString s_sgivenname                = ::rtl::OUString::createFromAscii("givenname"); // USER_OPT_FIRSTNAME
+    static const ::rtl::OUString s_ssn                       = ::rtl::OUString::createFromAscii("sn"); // USER_OPT_LASTNAME
+    static const ::rtl::OUString s_sinitials                 = ::rtl::OUString::createFromAscii("initials"); // USER_OPT_ID
+    static const ::rtl::OUString s_sstreet                   = ::rtl::OUString::createFromAscii("street"); // USER_OPT_STREET
+    static const ::rtl::OUString s_sl                        = ::rtl::OUString::createFromAscii("l"); // USER_OPT_CITY
+    static const ::rtl::OUString s_sst                       = ::rtl::OUString::createFromAscii("st"); // USER_OPT_STATE
+    static const ::rtl::OUString s_spostalcode               = ::rtl::OUString::createFromAscii("postalcode"); // USER_OPT_ZIP
+    static const ::rtl::OUString s_sc                        = ::rtl::OUString::createFromAscii("c"); // USER_OPT_COUNTRY
+    static const ::rtl::OUString s_stitle                    = ::rtl::OUString::createFromAscii("title"); // USER_OPT_TITLE
+    static const ::rtl::OUString s_sposition                 = ::rtl::OUString::createFromAscii("position"); // USER_OPT_POSITION
+    static const ::rtl::OUString s_shomephone                = ::rtl::OUString::createFromAscii("homephone"); // USER_OPT_TELEPHONEHOME
+    static const ::rtl::OUString s_stelephonenumber          = ::rtl::OUString::createFromAscii("telephonenumber"); // USER_OPT_TELEPHONEWORK
+    static const ::rtl::OUString s_sfacsimiletelephonenumber = ::rtl::OUString::createFromAscii("facsimiletelephonenumber"); // USER_OPT_FAX
+    static const ::rtl::OUString s_smail                     = ::rtl::OUString::createFromAscii("mail"); // USER_OPT_EMAIL
+    static const ::rtl::OUString s_scustomernumber           = ::rtl::OUString::createFromAscii("customernumber"); // USER_OPT_CUSTOMERNUMBER
+    static const ::rtl::OUString s_sfathersname              = ::rtl::OUString::createFromAscii("fathersname"); // USER_OPT_FATHERSNAME
+    static const ::rtl::OUString s_sapartment                = ::rtl::OUString::createFromAscii("apartment"); // USER_OPT_APARTMENT
+}
+
+#endif //  INCLUDE_CONFIGITEMS_USEROPTIONS_CONST_HXX