#i10000# Removed 'using namespace ::com::sun::star::util': typedef Color from com/sun/star/util/Color.hpp conflicts with class Color from tools/color.hxx

5 files changed, 32 insertions, 37 deletions

diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index fb60bb97ee03..fbe6537d4221 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FieldDescControl.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: kz $ $Date: 2004-05-19 13:53:55 $
+ *  last change: $Author: rt $ $Date: 2004-05-25 12:59:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -179,7 +179,6 @@ using namespace dbtools;
 //  using namespace comphelper;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbc;
 //  using namespace ::com::sun::star::sdb;
@@ -205,12 +204,12 @@ using namespace ::com::sun::star::sdbc;
 namespace
 {
     // -----------------------------------------------------------------------------
-    double checkDoubleForDateFormat(double _nValue,sal_Int32 _nFormatKey,const Reference<XNumberFormatter>& _xNumberFormatter)
+    double checkDoubleForDateFormat(double _nValue,sal_Int32 _nFormatKey,const Reference< ::com::sun::star::util::XNumberFormatter>& _xNumberFormatter)
     {
         double nValue = _nValue;
         sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(_xNumberFormatter,_nFormatKey);
-        if(     (nNumberFormat & NumberFormat::DATE)    == NumberFormat::DATE
-            || (nNumberFormat & NumberFormat::DATETIME) == NumberFormat::DATETIME )
+        if(     (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE)    == ::com::sun::star::util::NumberFormat::DATE
+            || (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME )
         {
             nValue = DBTypeConversion::toStandardDbDate(DBTypeConversion::getNULLDate(_xNumberFormatter->getNumberFormatsSupplier()),nValue);
         }
@@ -417,7 +416,7 @@ String OFieldDescControl::BoolStringUI(const String& rPersistentString) const
 //------------------------------------------------------------------------------
 void OFieldDescControl::Init()
 {
-    Reference< XNumberFormatter > xFormatter = GetFormatter();
+    Reference< ::com::sun::star::util::XNumberFormatter > xFormatter = GetFormatter();
     ::dbaui::setEvalDateFormatForFormatter(xFormatter);
 }
 
@@ -770,7 +769,7 @@ IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, pButton )
 
     sal_Int32 nOldFormatKey(pActFieldDescr->GetFormatKey());
     SvxCellHorJustify rOldJustify = pActFieldDescr->GetHorJustify();
-    Reference< XNumberFormatsSupplier >  xSupplier = GetFormatter()->getNumberFormatsSupplier();
+    Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xSupplier = GetFormatter()->getNumberFormatsSupplier();
 
     Reference< XUnoTunnel > xTunnel(xSupplier,UNO_QUERY);
     SvNumberFormatsSupplierObj* pSupplierImpl = (SvNumberFormatsSupplierObj*)xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId());
@@ -2073,7 +2072,7 @@ sal_Bool OFieldDescControl::isTextFormat(const OFieldDescription* _pFieldDescr,s
     {
         if (!_nFormatKey)
         {
-            Reference< XNumberFormatTypes> xNumberTypes(GetFormatter()->getNumberFormatsSupplier()->getNumberFormats(),UNO_QUERY);
+            Reference< ::com::sun::star::util::XNumberFormatTypes> xNumberTypes(GetFormatter()->getNumberFormatsSupplier()->getNumberFormats(),UNO_QUERY);
             OSL_ENSURE(xNumberTypes.is(),"XNumberFormatTypes is null!");
 
             _nFormatKey = ::dbtools::getDefaultNumberFormat( _pFieldDescr->GetType(),
@@ -2083,7 +2082,7 @@ sal_Bool OFieldDescControl::isTextFormat(const OFieldDescription* _pFieldDescr,s
                 GetLocale());
         }
         sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(GetFormatter(),_nFormatKey);
-        bTextFormat = (nNumberFormat == NumberFormat::TEXT);
+        bTextFormat = (nNumberFormat == ::com::sun::star::util::NumberFormat::TEXT);
     }
     catch(const Exception&)
     {
@@ -2127,7 +2126,7 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes
                 _pFieldDescr->GetControlDefault() >>= nValue;
 
 
-            Reference<XNumberFormatter> xNumberFormatter = GetFormatter();
+            Reference< ::com::sun::star::util::XNumberFormatter> xNumberFormatter = GetFormatter();
             Reference<XPropertySet> xFormSet = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats()->getByKey(nFormatKey);
             OSL_ENSURE(xFormSet.is(),"XPropertySet is null!");
             ::rtl::OUString sFormat;
@@ -2139,15 +2138,15 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes
                 ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale"))) >>= aLocale;
 
                 sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(xNumberFormatter,nFormatKey);
-                if(     (nNumberFormat & NumberFormat::DATE)    == NumberFormat::DATE
-                    || (nNumberFormat & NumberFormat::DATETIME) == NumberFormat::DATETIME )
+                if(     (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE)    == ::com::sun::star::util::NumberFormat::DATE
+                    || (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME )
                 {
                     nValue = DBTypeConversion::toNullDate(DBTypeConversion::getNULLDate(xNumberFormatter->getNumberFormatsSupplier()),nValue);
                 }
 
 
 
-                Reference<XNumberFormatPreviewer> xPreViewer(xNumberFormatter,UNO_QUERY);
+                Reference< ::com::sun::star::util::XNumberFormatPreviewer> xPreViewer(xNumberFormatter,UNO_QUERY);
                 OSL_ENSURE(xPreViewer.is(),"XNumberFormatPreviewer is null!");
                 sDefault = xPreViewer->convertNumberToPreviewString(sFormat,nValue,aLocale,sal_True);
             }
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 9c5c6f92ab43..bf1fc3a61464 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HtmlReader.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:51:07 $
+ *  last change: $Author: rt $ $Date: 2004-05-25 12:59:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -171,7 +171,6 @@ using namespace dbaui;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::awt;
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index c169f214be38..3310c82d1d98 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RtfReader.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:51:07 $
+ *  last change: $Author: rt $ $Date: 2004-05-25 13:02:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -150,7 +150,6 @@ using namespace dbaui;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::awt;
@@ -162,7 +161,7 @@ DBG_NAME(ORTFReader);
 // ==========================================================================
 ORTFReader::ORTFReader( SvStream& rIn,
                         const Reference< XConnection >& _rxConnection,
-                        const Reference< XNumberFormatter >& _rxNumberF,
+                        const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM,
                         const TColumnVector* pList,
                         const OTypeInfoMap* _pInfoMap)
@@ -175,7 +174,7 @@ ORTFReader::ORTFReader( SvStream& rIn,
 ORTFReader::ORTFReader(SvStream& rIn,
                        sal_Int32 nRows,
                        const TPositions &_rColumnPositions,
-                       const Reference< XNumberFormatter >& _rxNumberF,
+                       const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF,
                        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM,
                        const TColumnVector* pList,
                        const OTypeInfoMap* _pInfoMap)
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index fcb09e876f2e..ae55a0efecb4 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TokenWriter.cxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: rt $ $Date: 2004-03-02 12:45:47 $
+ *  last change: $Author: rt $ $Date: 2004-05-25 13:02:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -152,7 +152,6 @@ using namespace svx;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::lang;
@@ -177,7 +176,7 @@ const static char __FAR_DATA sFontSize[]        = "font-size: ";
 DBG_NAME(ODatabaseImportExport);
 //======================================================================
 ODatabaseImportExport::ODatabaseImportExport(const Reference< XMultiServiceFactory >& _rM,
-                                             const Reference< XNumberFormatter >& _rxNumberF,
+                                             const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF,
                                              const String& rExchange)
     :m_pReader(NULL)
     ,m_pRowMarker(NULL)
@@ -669,7 +668,7 @@ const char __FAR_DATA OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t
 
 //-------------------------------------------------------------------
 OHTMLImportExport::OHTMLImportExport(const Reference< XMultiServiceFactory >& _rM,
-                                     const Reference< XNumberFormatter >& _rxNumberF,
+                                     const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF,
                                      const String& rExchange)
         : ODatabaseImportExport(_rM,_rxNumberF,rExchange)
     ,m_nIndent(0)
@@ -950,7 +949,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
 
     double fVal = 0.0;
 
-    Reference< XNumberFormatsSupplier >  xSupplier = m_xFormatter->getNumberFormatsSupplier();
+    Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xSupplier = m_xFormatter->getNumberFormatsSupplier();
 
     Reference< XUnoTunnel > xTunnel(xSupplier,UNO_QUERY);
     SvNumberFormatsSupplierObj* pSupplierImpl = (SvNumberFormatsSupplierObj*)xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId());
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 845cf0b095c1..ef6166747fb2 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UITools.cxx,v $
  *
- *  $Revision: 1.46 $
+ *  $Revision: 1.47 $
  *
- *  last change: $Author: obo $ $Date: 2003-09-04 08:33:25 $
+ *  last change: $Author: rt $ $Date: 2004-05-25 13:03:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -258,7 +258,6 @@ using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::ui::dialogs;
 
 
@@ -807,7 +806,7 @@ SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment)
 // -----------------------------------------------------------------------------
 void setColumnUiProperties( const Reference< XPropertySet>& _rxColumn,const OFieldDescription* _pFieldDesc)
 {
-    if ( _pFieldDesc->GetFormatKey() != NumberFormat::UNDEFINED && _rxColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_FORMATKEY) )
+    if ( _pFieldDesc->GetFormatKey() != ::com::sun::star::util::NumberFormat::UNDEFINED && _rxColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_FORMATKEY) )
         _rxColumn->setPropertyValue(PROPERTY_FORMATKEY,makeAny(_pFieldDesc->GetFormatKey()));
     if ( _rxColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_ALIGN) )
         _rxColumn->setPropertyValue(PROPERTY_ALIGN,makeAny(dbaui::mapTextAllign(_pFieldDesc->GetHorJustify())));
@@ -1097,7 +1096,7 @@ sal_Bool appendToFilter(const Reference<XConnection>& _xConnection,
                     aFilter.realloc(aFilter.getLength()+1);
                     aFilter.getArray()[aFilter.getLength()-1] = _sName;
                     xProp->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(aFilter));
-                    Reference<XFlushable> xFlush(xProp,UNO_QUERY);
+                    Reference< ::com::sun::star::util::XFlushable> xFlush(xProp,UNO_QUERY);
                     if(xFlush.is())
                         xFlush->flush();
                 }
@@ -1323,9 +1322,9 @@ namespace
     }
 }
 // -----------------------------------------------------------------------------
-URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId)
+::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId)
 {
-    URL aURL;
+    ::com::sun::star::util::URL aURL;
     aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) );
     aURL.Complete += _sModuleName;
     aURL.Complete += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
@@ -1344,9 +1343,9 @@ URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHel
     return aURL;
 }
 // -----------------------------------------------------------------------------
-void setEvalDateFormatForFormatter(Reference< XNumberFormatter >& _rxFormatter)
+void setEvalDateFormatForFormatter(Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter)
 {
-    Reference< XNumberFormatsSupplier >  xSupplier = _rxFormatter->getNumberFormatsSupplier();
+    Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xSupplier = _rxFormatter->getNumberFormatsSupplier();
 
     Reference< XUnoTunnel > xTunnel(xSupplier,UNO_QUERY);
     SvNumberFormatsSupplierObj* pSupplierImpl = (SvNumberFormatsSupplierObj*)xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId());