[Libreoffice-commits] .: svtools/source

[Matus Kukan]

 svtools/source/config/accessibilityoptions.cxx |    2 +-
 svtools/source/config/colorcfg.cxx             |    2 +-
 svtools/source/config/helpopt.cxx              |    2 +-
 svtools/source/config/itemholder2.cxx          |    3 +++
 svtools/source/config/itemholder2.hxx          |    2 ++
 svtools/source/config/menuoptions.cxx          |    2 +-
 svtools/source/config/miscopt.cxx              |    2 +-
 svtools/source/config/printoptions.cxx         |    4 ++--
 8 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 53d2353dcb183fec15f18534840457f3c4cbe03d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Aug 18 13:03:05 2011 +0200

    use namespace for ItemHolder2 in svtools

diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 94cfd76..97a58b6 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -502,7 +502,7 @@ SvtAccessibilityOptions::SvtAccessibilityOptions()
         if(!sm_pSingleImplConfig)
         {
             sm_pSingleImplConfig = new SvtAccessibilityOptions_Impl;
-            ItemHolder2::holdConfigItem(E_ACCESSIBILITYOPTIONS);
+            svtools::ItemHolder2::holdConfigItem(E_ACCESSIBILITYOPTIONS);
         }
         ++sm_nAccessibilityRefCount;
     }
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 65f948d..d6a2aff 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -398,7 +398,7 @@ ColorConfig::ColorConfig()
     if ( !m_pImpl )
     {
         m_pImpl = new ColorConfig_Impl;
-        ItemHolder2::holdConfigItem(E_COLORCFG);
+        svtools::ItemHolder2::holdConfigItem(E_COLORCFG);
     }
     ++nColorRefCount_Impl;
     m_pImpl->AddListener(this);
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 20cb0f5..7473b54 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -553,7 +553,7 @@ SvtHelpOptions::SvtHelpOptions()
         RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtHelpOptions_Impl::ctor()");
         pOptions = new SvtHelpOptions_Impl;
 
-        ItemHolder2::holdConfigItem(E_HELPOPTIONS);
+        svtools::ItemHolder2::holdConfigItem(E_HELPOPTIONS);
     }
     pImp = pOptions;
 }
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 7f57664..74766fa 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -57,6 +57,7 @@ namespace css = ::com::sun::star;
 //-----------------------------------------------
 // declarations
 
+namespace svtools {
 //-----------------------------------------------
 ItemHolder2::ItemHolder2()
     : ItemHolderMutexBase()
@@ -209,4 +210,6 @@ void ItemHolder2::impl_deleteItem(TItemInfo& rItem)
     }
 }
 
+} // namespace svtools
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx
index 884536d..1e0ade7 100644
--- a/svtools/source/config/itemholder2.hxx
+++ b/svtools/source/config/itemholder2.hxx
@@ -45,6 +45,7 @@
 #define css ::com::sun::star
 #endif
 
+namespace svtools {
 //-----------------------------------------------
 // definitions
 
@@ -82,6 +83,7 @@ class ItemHolder2 : private ItemHolderMutexBase
         void impl_deleteItem(TItemInfo& rItem);
 };
 
+} // namespace svtools
 //-----------------------------------------------
 // namespaces
 
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index a70be00..aabfb52 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -463,7 +463,7 @@ SvtMenuOptions::SvtMenuOptions()
         RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtMenuOptions_Impl::ctor()");
         m_pDataContainer = new SvtMenuOptions_Impl();
 
-        ItemHolder2::holdConfigItem(E_MENUOPTIONS);
+        svtools::ItemHolder2::holdConfigItem(E_MENUOPTIONS);
     }
 }
 
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 6d10da9..d10874d 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -803,7 +803,7 @@ SvtMiscOptions::SvtMiscOptions()
     {
        RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtMiscOptions_Impl::ctor()");
        m_pDataContainer = new SvtMiscOptions_Impl;
-       ItemHolder2::holdConfigItem(E_MISCOPTIONS);
+       svtools::ItemHolder2::holdConfigItem(E_MISCOPTIONS);
     }
 }
 
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 7f86d99..bd12e9f 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -791,7 +791,7 @@ SvtPrinterOptions::SvtPrinterOptions()
         OUString aRootPath( ROOTNODE_START );
         m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/Printer" ) ) );
         pPrinterOptionsDataContainer = m_pStaticDataContainer;
-        ItemHolder2::holdConfigItem(E_PRINTOPTIONS);
+        svtools::ItemHolder2::holdConfigItem(E_PRINTOPTIONS);
     }
 
     SetDataContainer( m_pStaticDataContainer );
@@ -832,7 +832,7 @@ SvtPrintFileOptions::SvtPrintFileOptions()
         m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/File" ) ) );
         pPrintFileOptionsDataContainer = m_pStaticDataContainer;
 
-        ItemHolder2::holdConfigItem(E_PRINTFILEOPTIONS);
+        svtools::ItemHolder2::holdConfigItem(E_PRINTFILEOPTIONS);
     }
 
     SetDataContainer( m_pStaticDataContainer );