Revert "Doxygen warnings corrected"

This reverts commit ff8036df5c5575503dc30d255dfbe99cc637c510.

multiple build failures with namespace collisions etc

Change-Id: Ie8ac08feff518af3584a26957f07a60d95932c76
Reviewed-on: https://gerrit.libreoffice.org/7855
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

12 files changed, 57 insertions, 58 deletions

diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx
index 5e8f5bdefc5b..dc760e47b359 100644
--- a/vcl/inc/regband.hxx
+++ b/vcl/inc/regband.hxx
@@ -79,10 +79,10 @@ public:
                                         The new ImplRegionBand object will
                                         be a copy of this band.
                                     @param bIgnorePoints
-                                        When true (the default) the
+                                        When <TRUE/> (the default) the
                                         band points pointed to by
                                         mpFirstBandPoint are not copied.
-                                        When false they are copied.
+                                        When <FALSE/> they are copied.
                                         You need the points when you are
                                         planning to call ProcessPoints()
                                         later on.
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 7c3ffdb005e8..28188260fb3c 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -375,9 +375,8 @@ public:
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry,
                                              const OutputDevice *pOutDev );
-    bool                    DrawPolyPolygon( const basegfx::B2DPolyPolygon &i_rPolyPolygon,
-                                             double i_fTransparency,
-                                             const OutputDevice *i_pOutDev);
+    bool                    DrawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency, const OutputDevice* );
+
     bool                    DrawPolyLine( const basegfx::B2DPolygon& i_rPolygon,
                                           double i_fTransparency,
                                           const basegfx::B2DVector& i_rLineWidth,
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index c86b5a271a68..aba541e874b9 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -18,7 +18,7 @@
  */
 
 /**
- * @file sft.hxx
+ * @file sft.h
  * @brief Sun Font Tools
  * @author Alexander Gelfenbain
  */
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 142e9defe0d0..0dc1227207c7 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -315,8 +315,8 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC)
 
 /**
  * Reads polygons from the stream.
- * The \<class T> parameter is for the type of the points (sal_uInt32 or sal_uInt16).
- * The \<class Drawer> parameter is a boost binding for the method that will draw the polygon.
+ * The <class T> parameter is for the type of the points (sal_uInt32 or sal_uInt16).
+ * The <class Drawer> parameter is a boost binding for the method that will draw the polygon.
  * skipFirst: if the first point read is the 0th point or the 1st point in the array.
  * */
 template <class T, class Drawer>
@@ -338,7 +338,7 @@ void EnhWMFReader::ReadAndDrawPolygon(Drawer drawer, const sal_Bool skipFirst)
 
 /**
  * Reads polygons from the stream.
- * The \<class T> parameter is for the type of the points
+ * The <class T> parameter is for the type of the points
  * nStartIndex: which is the starting index in the polygon of the first point read
  * nPoints: number of points
  * pWMF: the stream containings the polygons
@@ -366,7 +366,7 @@ Polygon EnhWMFReader::ReadPolygon(sal_uInt32 nStartIndex, sal_uInt32 nPoints)
 
 /**
  * Reads a polyline from the WMF file and draws it
- * The \<class T> parameter refers to the type of the points. (e.g. sal_uInt16 or sal_uInt32)
+ * The <class T> parameter refers to the type of the points. (e.g. sal_uInt16 or sal_uInt32)
  * */
 template <class T>
 void EnhWMFReader::ReadAndDrawPolyLine()
@@ -401,7 +401,7 @@ void EnhWMFReader::ReadAndDrawPolyLine()
 
 /**
  * Reads a poly polygon from the WMF file and draws it.
- * The \<class T> parameter refers to the type of the points. (e.g. sal_uInt16 or sal_uInt32)
+ * The <class T> parameter refers to the type of the points. (e.g. sal_uInt16 or sal_uInt32)
  * */
 template <class T>
 void EnhWMFReader::ReadAndDrawPolyPolygon()
diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx
index e95554224935..da9932c0600d 100644
--- a/vcl/source/fontsubset/ttcr.hxx
+++ b/vcl/source/fontsubset/ttcr.hxx
@@ -19,7 +19,7 @@
 
 /**
  *
- * @file ttcr.hxx
+ * @file ttcr.h
  * @brief TrueType font creator
  * @author Alexander Gelfenbain
  */
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 0699ac786836..1e8d76638344 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -2014,12 +2014,12 @@ void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly )
         mpAlphaVDev->DrawPolyPolygon( rPolyPoly );
 }
 
-void OutputDevice::DrawPolygon( const basegfx::B2DPolygon& rB2DPolygon)
+void OutputDevice::DrawPolygon( const ::basegfx::B2DPolygon& rB2DPolygon)
 {
     // AW: Do NOT paint empty polygons
     if(rB2DPolygon.count())
     {
-        basegfx::B2DPolyPolygon aPP( rB2DPolygon );
+        ::basegfx::B2DPolyPolygon aPP( rB2DPolygon );
         DrawPolyPolygon( aPP );
     }
 }
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 5c5dcf26eaa8..a994dd86e687 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -7387,7 +7387,7 @@ sal_Bool OutputDevice::GetTextBoundRect( Rectangle& rRect,
 sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector,
                                         const OUString& rStr, sal_Int32 nBase,
                                         sal_Int32 nIndex, sal_Int32 nLen,
-                                        sal_Bool bOptimize, sal_uLong nLayoutWidth, const sal_Int32* pDXArray ) const
+                                        sal_Bool bOptimize, sal_uLong nTWidth, const sal_Int32* pDXArray ) const
 {
     if(nLen == 0x0FFFF)
     {
@@ -7427,7 +7427,7 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector
     {
         sal_Int32 nStart = std::min( nBase, nIndex );
         sal_Int32 nOfsLen = std::max( nBase, nIndex ) - nStart;
-        pSalLayout = ImplLayout( rStr, nStart, nOfsLen, Point(0,0), nLayoutWidth, pDXArray );
+        pSalLayout = ImplLayout( rStr, nStart, nOfsLen, Point(0,0), nTWidth, pDXArray );
         if( pSalLayout )
         {
             nXOffset = pSalLayout->GetTextWidth();
@@ -7438,7 +7438,7 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector
         }
     }
 
-    pSalLayout = ImplLayout( rStr, nIndex, nLen, Point(0,0), nLayoutWidth, pDXArray );
+    pSalLayout = ImplLayout( rStr, nIndex, nLen, Point(0,0), nTWidth, pDXArray );
     if( pSalLayout )
     {
         bRet = pSalLayout->GetOutline( *mpGraphics, rVector );
@@ -7487,7 +7487,7 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector
     // is one-to-one. This is most probably valid for the old bitmap fonts.
     // fall back to bitmap method to get the bounding rectangle,
     // so we need a monochrome virtual device with matching font
-    pSalLayout = ImplLayout( rStr, nIndex, nLen, Point(0,0), nLayoutWidth, pDXArray );
+    pSalLayout = ImplLayout( rStr, nIndex, nLen, Point(0,0), nTWidth, pDXArray );
     if (pSalLayout == 0)
         return false;
     long nOrgWidth = pSalLayout->GetTextWidth();
@@ -7512,7 +7512,7 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector
     aVDev.SetTextColor( Color(COL_BLACK) );
     aVDev.SetTextFillColor();
 
-    pSalLayout = aVDev.ImplLayout( rStr, nIndex, nLen, Point(0,0), nLayoutWidth, pDXArray );
+    pSalLayout = aVDev.ImplLayout( rStr, nIndex, nLen, Point(0,0), nTWidth, pDXArray );
     if (pSalLayout == 0)
         return false;
     long nWidth = pSalLayout->GetTextWidth();
@@ -7532,7 +7532,7 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector
     {
         sal_Int32 nStart  = ((nBase < nIndex) ? nBase : nIndex);
         sal_Int32 nLength = ((nBase > nIndex) ? nBase : nIndex) - nStart;
-        pSalLayout = aVDev.ImplLayout( rStr, nStart, nLength, Point(0,0), nLayoutWidth, pDXArray );
+        pSalLayout = aVDev.ImplLayout( rStr, nStart, nLength, Point(0,0), nTWidth, pDXArray );
         if( pSalLayout )
         {
             nXOffset = pSalLayout->GetTextWidth();
@@ -7553,7 +7553,7 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector
         bool bSuccess = false;
 
         // draw character into virtual device
-        pSalLayout = aVDev.ImplLayout( rStr, nCharPos, 1, Point(0,0), nLayoutWidth, pDXArray );
+        pSalLayout = aVDev.ImplLayout( rStr, nCharPos, 1, Point(0,0), nTWidth, pDXArray );
         if (pSalLayout == 0)
             return false;
         long nCharWidth = pSalLayout->GetTextWidth();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 4c66cedd069f..fbfdbb5fd191 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -602,7 +602,7 @@ static void appendLiteralString( const sal_Char* pStr, sal_Int32 nLength, OStrin
  * in a PDF file seen through an Internet browser should be
  * specially crafted, in order to be used directly by the browser.
  * In this way the fragment part of a hyperlink to a PDF file (e.g. something
- * as 'test1/test2/a-file.pdf\#thefragment) will be (hopefully) interpreted by the
+ * as 'test1/test2/a-file.pdf#thefragment) will be (hopefully) interpreted by the
  * PDF reader (currently only Adobe Reader plug-in seems to be working that way) called
  * from inside the Internet browser as: 'open the file test1/test2/a-file.pdf
  * and go to named destination thefragment using default zoom'.
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 40f780c5a9fd..8357e529cab4 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -1002,9 +1002,9 @@ i12626
         of the current structure element
 
         @returns
-        true if no NonStructElement was found in ancestor path and tagged
+        <true/> if no NonStructElement was found in ancestor path and tagged
         PDF output is enabled
-        false else
+        <false/> else
      */
     bool checkEmitStructure();
 
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 5f30b43d9ac9..16b035cfa2de 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -66,7 +66,7 @@ struct ConnectedComponents
 
 typedef ::std::list< ConnectedComponents > ConnectedComponentsList;
 
-/** \#i10613# Extracted from Printer::GetPreparedMetaFile. Returns true
+/** #i10613# Extracted from Printer::GetPreparedMetaFile. Returns true
     if given action requires special handling (usually because of
     transparency)
 */
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 17989e803081..fa418b89caf7 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -286,7 +286,7 @@ void Printer::PrintJob( const boost::shared_ptr<PrinterController>& i_pControlle
                         )
 {
     sal_Bool bSynchronous = sal_False;
-    PropertyValue* pVal = i_pController->getValue( OUString( "Wait" ) );
+    beans::PropertyValue* pVal = i_pController->getValue( OUString( "Wait" ) );
     if( pVal )
         pVal->Value >>= bSynchronous;
 
@@ -345,12 +345,12 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
     // "Pages" attribute from API is now equivalent to "PageRange"
     // AND "PrintContent" = 1 except calc where it is "PrintRange" = 1
     // Argh ! That sure needs cleaning up
-    PropertyValue* pContentVal = i_pController->getValue( OUString( "PrintRange" ) );
+    beans::PropertyValue* pContentVal = i_pController->getValue( OUString( "PrintRange" ) );
     if( ! pContentVal )
         pContentVal = i_pController->getValue( OUString( "PrintContent" ) );
 
     // case 1: UNO API has set "Pages"
-    PropertyValue* pPagesVal = i_pController->getValue( OUString( "Pages" ) );
+    beans::PropertyValue* pPagesVal = i_pController->getValue( OUString( "Pages" ) );
     if( pPagesVal )
     {
         OUString aPagesVal;
@@ -376,7 +376,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
             if( nContent == 0 )
             {
                 // do not overwrite PageRange if it is already set
-                PropertyValue* pRangeVal = i_pController->getValue( OUString( "PageRange" ) );
+                beans::PropertyValue* pRangeVal = i_pController->getValue( OUString( "PageRange" ) );
                 OUString aRange;
                 if( pRangeVal )
                     pRangeVal->Value >>= aRange;
@@ -399,7 +399,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
         }
     }
 
-    PropertyValue* pReverseVal = i_pController->getValue( OUString( "PrintReverse" ) );
+    beans::PropertyValue* pReverseVal = i_pController->getValue( OUString( "PrintReverse" ) );
     if( pReverseVal )
     {
         sal_Bool bReverse = sal_False;
@@ -407,7 +407,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
         pController->setReversePrint( bReverse );
     }
 
-    PropertyValue* pPapersizeFromSetupVal = i_pController->getValue( OUString( "PapersizeFromSetup" ) );
+    beans::PropertyValue* pPapersizeFromSetupVal = i_pController->getValue( OUString( "PapersizeFromSetup" ) );
     if( pPapersizeFromSetupVal )
     {
         sal_Bool bPapersizeFromSetup = sal_False;
@@ -444,7 +444,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
         aMPS.bDrawBorder = i_pController->getBoolProperty( OUString( "NUpDrawBorder" ), aMPS.bDrawBorder );
         aMPS.nOrder = static_cast<PrinterController::NupOrderType>(i_pController->getIntProperty( OUString( "NUpSubPageOrder" ), aMPS.nOrder ));
         aMPS.aPaperSize = i_pController->getPrinter()->PixelToLogic( i_pController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) );
-        PropertyValue* pPgSizeVal = i_pController->getValue( OUString( "NUpPaperSize" ) );
+        beans::PropertyValue* pPgSizeVal = i_pController->getValue( OUString( "NUpPaperSize" ) );
         awt::Size aSizeVal;
         if( pPgSizeVal && (pPgSizeVal->Value >>= aSizeVal) )
         {
@@ -508,7 +508,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
     pController->pushPropertiesToPrinter();
 
     OUString aJobName;
-    PropertyValue* pJobNameVal = pController->getValue( OUString( "JobName" ) );
+    beans::PropertyValue* pJobNameVal = pController->getValue( OUString( "JobName" ) );
     if( pJobNameVal )
         pJobNameVal->Value >>= aJobName;
 
@@ -561,13 +561,13 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print
         return false;
 
     sal_Bool bSinglePrintJobs = sal_False;
-    PropertyValue* pSingleValue = i_pController->getValue( OUString( "PrintCollateAsSingleJobs" ) );
+    beans::PropertyValue* pSingleValue = i_pController->getValue( OUString( "PrintCollateAsSingleJobs" ) );
     if( pSingleValue )
     {
         pSingleValue->Value >>= bSinglePrintJobs;
     }
 
-    PropertyValue* pFileValue = i_pController->getValue( OUString( "LocalFileName" ) );
+    beans::PropertyValue* pFileValue = i_pController->getValue( OUString( "LocalFileName" ) );
     if( pFileValue )
     {
         OUString aFile;
@@ -936,13 +936,13 @@ int PrinterController::getPageCountProtected() const
     return nPages;
 }
 
-Sequence< PropertyValue > PrinterController::getPageParametersProtected( int i_nPage ) const
+Sequence< beans::PropertyValue > PrinterController::getPageParametersProtected( int i_nPage ) const
 {
     const MapMode aMapMode( MAP_100TH_MM );
 
     mpImplData->mpPrinter->Push();
     mpImplData->mpPrinter->SetMapMode( aMapMode );
-    Sequence< PropertyValue > aResult( getPageParameters( i_nPage ) );
+    Sequence< beans::PropertyValue > aResult( getPageParameters( i_nPage ) );
     mpImplData->mpPrinter->Pop();
     return aResult;
 }
@@ -1402,19 +1402,19 @@ Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< P
     return aResult;
 }
 
-const Sequence< PropertyValue >& PrinterController::getUIOptions() const
+const Sequence< beans::PropertyValue >& PrinterController::getUIOptions() const
 {
     return mpImplData->maUIOptions;
 }
 
-PropertyValue* PrinterController::getValue( const OUString& i_rProperty )
+beans::PropertyValue* PrinterController::getValue( const OUString& i_rProperty )
 {
     boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it =
         mpImplData->maPropertyToIndex.find( i_rProperty );
     return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL;
 }
 
-const PropertyValue* PrinterController::getValue( const OUString& i_rProperty ) const
+const beans::PropertyValue* PrinterController::getValue( const OUString& i_rProperty ) const
 {
     boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it =
         mpImplData->maPropertyToIndex.find( i_rProperty );
@@ -1423,14 +1423,14 @@ const PropertyValue* PrinterController::getValue( const OUString& i_rProperty )
 
 void PrinterController::setValue( const OUString& i_rName, const Any& i_rValue )
 {
-    PropertyValue aVal;
+    beans::PropertyValue aVal;
     aVal.Name = i_rName;
     aVal.Value = i_rValue;
 
     setValue( aVal );
 }
 
-void PrinterController::setValue( const PropertyValue& i_rValue )
+void PrinterController::setValue( const beans::PropertyValue& i_rValue )
 {
     boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it =
         mpImplData->maPropertyToIndex.find( i_rValue.Name );
@@ -1445,7 +1445,7 @@ void PrinterController::setValue( const PropertyValue& i_rValue )
     }
 }
 
-void PrinterController::setUIOptions( const Sequence< PropertyValue >& i_rOptions )
+void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_rOptions )
 {
     DBG_ASSERT( mpImplData->maUIOptions.getLength() == 0, "setUIOptions called twice !" );
 
@@ -1453,7 +1453,7 @@ void PrinterController::setUIOptions( const Sequence< PropertyValue >& i_rOption
 
     for( int i = 0; i < i_rOptions.getLength(); i++ )
     {
-        Sequence< PropertyValue > aOptProp;
+        Sequence< beans::PropertyValue > aOptProp;
         i_rOptions[i].Value >>= aOptProp;
         bool bIsEnabled = true;
         bool bHaveProperty = false;
@@ -1462,7 +1462,7 @@ void PrinterController::setUIOptions( const Sequence< PropertyValue >& i_rOption
         Sequence< sal_Bool > aChoicesDisabled;
         for( int n = 0; n < aOptProp.getLength(); n++ )
         {
-            const PropertyValue& rEntry( aOptProp[ n ] );
+            const beans::PropertyValue& rEntry( aOptProp[ n ] );
             if ( rEntry.Name == "Property" )
             {
                 PropertyValue aVal;
@@ -1532,7 +1532,7 @@ bool PrinterController::isUIOptionEnabled( const OUString& i_rProperty ) const
                 if( bEnabled )
                 {
                     // does the dependency have the correct value ?
-                    const PropertyValue* pVal = getValue( it->second.maDependsOnName );
+                    const com::sun::star::beans::PropertyValue* pVal = getValue( it->second.maDependsOnName );
                     OSL_ENSURE( pVal, "unknown property in dependency" );
                     if( pVal )
                     {
@@ -1600,7 +1600,7 @@ OUString PrinterController::makeEnabled( const OUString& i_rProperty )
         if( isUIOptionEnabled( it->second.maDependsOnName ) )
         {
            aDependency = it->second.maDependsOnName;
-           const PropertyValue* pVal = getValue( aDependency );
+           const com::sun::star::beans::PropertyValue* pVal = getValue( aDependency );
            OSL_ENSURE( pVal, "unknown property in dependency" );
            if( pVal )
            {
@@ -1639,12 +1639,12 @@ void PrinterController::createProgressDialog()
     if( ! mpImplData->mpProgress )
     {
         sal_Bool bShow = sal_True;
-        PropertyValue* pMonitor = getValue( OUString( "MonitorVisible" ) );
+        beans::PropertyValue* pMonitor = getValue( OUString( "MonitorVisible" ) );
         if( pMonitor )
             pMonitor->Value >>= bShow;
         else
         {
-            const PropertyValue* pVal = getValue( OUString( "IsApi" ) );
+            const com::sun::star::beans::PropertyValue* pVal = getValue( OUString( "IsApi" ) );
             if( pVal )
             {
                 sal_Bool bApi = sal_False;
@@ -1687,7 +1687,7 @@ void PrinterController::pushPropertiesToPrinter()
 {
     sal_Int32 nCopyCount = 1;
     // set copycount and collate
-    const PropertyValue* pVal = getValue( OUString( "CopyCount" ) );
+    const beans::PropertyValue* pVal = getValue( OUString( "CopyCount" ) );
     if( pVal )
         pVal->Value >>= nCopyCount;
     sal_Bool bCollate = sal_False;
@@ -1726,7 +1726,7 @@ bool PrinterController::isDirectPrint() const
 sal_Bool PrinterController::getBoolProperty( const OUString& i_rProperty, sal_Bool i_bFallback ) const
 {
     sal_Bool bRet = i_bFallback;
-    const PropertyValue* pVal = getValue( i_rProperty );
+    const com::sun::star::beans::PropertyValue* pVal = getValue( i_rProperty );
     if( pVal )
         pVal->Value >>= bRet;
     return bRet;
@@ -1735,7 +1735,7 @@ sal_Bool PrinterController::getBoolProperty( const OUString& i_rProperty, sal_Bo
 sal_Int32 PrinterController::getIntProperty( const OUString& i_rProperty, sal_Int32 i_nFallback ) const
 {
     sal_Int32 nRet = i_nFallback;
-    const PropertyValue* pVal = getValue( i_rProperty );
+    const com::sun::star::beans::PropertyValue* pVal = getValue( i_rProperty );
     if( pVal )
         pVal->Value >>= nRet;
     return nRet;
@@ -1810,7 +1810,7 @@ bool PrinterOptionsHelper::processProperties( const Sequence< PropertyValue >& i
     return bChanged;
 }
 
-void PrinterOptionsHelper::appendPrintUIOptions( uno::Sequence< PropertyValue >& io_rProps ) const
+void PrinterOptionsHelper::appendPrintUIOptions( uno::Sequence< beans::PropertyValue >& io_rProps ) const
 {
     if( m_aUIProperties.getLength() > 0 )
     {
@@ -1823,7 +1823,7 @@ void PrinterOptionsHelper::appendPrintUIOptions( uno::Sequence< PropertyValue >&
     }
 }
 
-Any PrinterOptionsHelper::setUIControlOpt(const Sequence< OUString >& i_rIDs,
+Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< OUString >& i_rIDs,
                                           const OUString& i_rTitle,
                                           const Sequence< OUString >& i_rHelpIds,
                                           const OUString& i_rType,
@@ -1962,7 +1962,7 @@ Any PrinterOptionsHelper::setBoolControlOpt(const OUString& i_rID,
     return setUIControlOpt(aIds, i_rTitle, aHelpId, "Bool", &aVal, i_rControlOptions);
 }
 
-Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const Sequence< OUString >& i_rIDs,
+Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< OUString >& i_rIDs,
                                               const OUString& i_rTitle,
                                               const Sequence< OUString >& i_rHelpId,
                                               const OUString& i_rProperty,
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index da23512cf691..a67b9102db38 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -466,7 +466,7 @@ void SalGraphics::DrawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints,
         drawPolyPolygon( nPoly, pPoints, pPtAry );
 }
 
-bool SalGraphics::DrawPolyPolygon( const basegfx::B2DPolyPolygon& i_rPolyPolygon, double i_fTransparency, const OutputDevice* i_pOutDev )
+bool SalGraphics::DrawPolyPolygon( const ::basegfx::B2DPolyPolygon& i_rPolyPolygon, double i_fTransparency, const OutputDevice* i_pOutDev )
 {
     bool bRet = false;
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (i_pOutDev && i_pOutDev->IsRTLEnabled()) )
@@ -537,9 +537,9 @@ sal_Bool SalGraphics::DrawPolyPolygonBezier( sal_uInt32 i_nPoly, const sal_uInt3
 }
 
 bool SalGraphics::DrawPolyLine(
-    const basegfx::B2DPolygon& i_rPolygon,
+    const ::basegfx::B2DPolygon& i_rPolygon,
     double i_fTransparency,
-    const basegfx::B2DVector& i_rLineWidth,
+    const ::basegfx::B2DVector& i_rLineWidth,
     basegfx::B2DLineJoin i_eLineJoin,
     com::sun::star::drawing::LineCap i_eLineCap,
     const OutputDevice* i_pOutDev )