[Libreoffice-commits] core.git: accessibility/source canvas/source chart2/source cppcanvas/source cui/source drawinglayer/source extensions/source filter/source framework/source include/svtools include/svx include/toolkit include/vcl reportdesign/source sc/inc sc/source sd/inc sd/source sfx2/source slideshow/source starmath/inc starmath/source svtools/source sw/inc sw/source toolkit/source vcl/inc vcl/osx vcl/qa vcl/source vcl/unx
Tor Lillqvist
tml at collabora.com
Wed Apr 29 23:11:47 PDT 2015
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 2
accessibility/source/extended/accessiblelistboxentry.cxx | 4
accessibility/source/standard/vclxaccessiblelistitem.cxx | 2
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 2
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 8 -
accessibility/source/standard/vclxaccessibletabpage.cxx | 2
accessibility/source/standard/vclxaccessibletextcomponent.cxx | 2
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 2
canvas/source/cairo/cairo_canvashelper.cxx | 2
canvas/source/cairo/cairo_canvashelper_text.cxx | 4
canvas/source/cairo/cairo_devicehelper.cxx | 4
canvas/source/directx/dx_textlayout_drawhelper.cxx | 2
canvas/source/directx/dx_vcltools.cxx | 2
canvas/source/opengl/ogl_spritedevicehelper.cxx | 4
canvas/source/vcl/canvasbitmaphelper.cxx | 4
canvas/source/vcl/canvashelper.cxx | 22 +-
canvas/source/vcl/canvashelper_texturefill.cxx | 20 +-
canvas/source/vcl/devicehelper.cxx | 8 -
canvas/source/vcl/impltools.cxx | 4
canvas/source/vcl/spritecanvashelper.cxx | 12 -
canvas/source/vcl/spritehelper.cxx | 4
chart2/source/controller/accessibility/AccessibleBase.cxx | 2
cppcanvas/source/inc/implrenderer.hxx | 2
cppcanvas/source/mtfrenderer/bitmapaction.cxx | 4
cppcanvas/source/mtfrenderer/emfplus.cxx | 16 +-
cppcanvas/source/mtfrenderer/implrenderer.cxx | 78 +++++-----
cppcanvas/source/mtfrenderer/pointaction.cxx | 2
cppcanvas/source/mtfrenderer/textaction.cxx | 14 -
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 2
cppcanvas/source/wrapper/vclfactory.cxx | 2
cui/source/dialogs/hangulhanjadlg.cxx | 4
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 4
drawinglayer/source/tools/converters.cxx | 6
extensions/source/dbpilots/unoautopilot.inl | 2
extensions/source/plugin/inc/plugin/aqua/sysplug.hxx | 2
extensions/source/plugin/inc/plugin/win/sysplug.hxx | 2
filter/source/flash/swfdialog.cxx | 1
filter/source/pdf/pdfdialog.cxx | 1
filter/source/pdf/pdfexport.cxx | 69 ++++----
filter/source/pdf/pdfexport.hxx | 4
filter/source/svg/svgdialog.cxx | 1
filter/source/svg/svgfontexport.cxx | 2
filter/source/svg/svgwriter.cxx | 2
framework/source/services/autorecovery.cxx | 2
include/svtools/acceleratorexecute.hxx | 2
include/svtools/treelistbox.hxx | 10 -
include/svx/svdhdl.hxx | 5
include/toolkit/helper/formpdfexport.hxx | 2
include/vcl/ctrl.hxx | 4
include/vcl/font.hxx | 4
include/vcl/lazydelete.hxx | 2
include/vcl/outdev.hxx | 10 -
include/vcl/quickselectionengine.hxx | 2
reportdesign/source/ui/inc/ScrollHelper.hxx | 2
reportdesign/source/ui/inc/UITools.hxx | 4
sc/inc/docuno.hxx | 2
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 2
sd/inc/Outliner.hxx | 2
sd/inc/drawdoc.hxx | 2
sd/source/core/drawdoc2.cxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 4
sd/source/ui/animations/SlideTransitionPane.cxx | 4
sd/source/ui/annotations/annotationtag.hxx | 2
sd/source/ui/controller/slidelayoutcontroller.cxx | 2
sd/source/ui/dlg/assclass.cxx | 2
sd/source/ui/dlg/sddlgfact.cxx | 2
sd/source/ui/framework/factories/ChildWindowPane.cxx | 2
sd/source/ui/framework/factories/Pane.cxx | 2
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 2
sd/source/ui/func/fupage.cxx | 6
sd/source/ui/inc/AccessibleOutlineView.hxx | 5
sd/source/ui/inc/ClientView.hxx | 4
sd/source/ui/inc/DrawDocShell.hxx | 2
sd/source/ui/inc/DrawViewShell.hxx | 6
sd/source/ui/inc/OutlineView.hxx | 8 -
sd/source/ui/inc/OutlineViewShell.hxx | 2
sd/source/ui/inc/Ruler.hxx | 2
sd/source/ui/inc/SlideSorter.hxx | 8 -
sd/source/ui/inc/SlideSorterViewShell.hxx | 6
sd/source/ui/inc/View.hxx | 4
sd/source/ui/inc/ViewShell.hxx | 8 -
sd/source/ui/inc/Window.hxx | 4
sd/source/ui/inc/createcustomanimationpanel.hxx | 2
sd/source/ui/inc/createslidetransitionpanel.hxx | 2
sd/source/ui/inc/createtabledesignpanel.hxx | 2
sd/source/ui/inc/drawview.hxx | 6
sd/source/ui/inc/fuconbez.hxx | 2
sd/source/ui/inc/fuolbull.hxx | 1
sd/source/ui/inc/fuoltext.hxx | 3
sd/source/ui/inc/fuoutl.hxx | 1
sd/source/ui/inc/fuprlout.hxx | 1
sd/source/ui/inc/fuprobjs.hxx | 1
sd/source/ui/inc/slideshow.hxx | 6
sd/source/ui/inc/unomodel.hxx | 2
sd/source/ui/sidebar/CustomAnimationPanel.cxx | 6
sd/source/ui/sidebar/MasterPagesSelector.cxx | 2
sd/source/ui/sidebar/PanelBase.hxx | 2
sd/source/ui/sidebar/SlideTransitionPanel.cxx | 6
sd/source/ui/sidebar/TableDesignPanel.cxx | 6
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx | 4
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 8 -
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 16 +-
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 10 -
sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 14 -
sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx | 9 -
sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx | 2
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 6
sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx | 2
sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx | 2
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx | 2
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx | 2
sd/source/ui/slidesorter/shell/SlideSorter.cxx | 24 +--
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 8 -
sd/source/ui/table/TableDesignPane.cxx | 6
sd/source/ui/view/ViewShellBase.cxx | 2
sd/source/ui/view/ViewShellManager.cxx | 14 -
sd/source/ui/view/drviewse.cxx | 6
sd/source/ui/view/outlnvsh.cxx | 6
sfx2/source/control/thumbnailview.cxx | 2
slideshow/source/engine/shapes/gdimtftools.cxx | 4
slideshow/source/engine/shapes/viewmediashape.hxx | 2
starmath/inc/view.hxx | 4
starmath/source/accessibility.cxx | 2
svtools/source/contnr/imivctl.hxx | 2
svtools/source/contnr/imivctl1.cxx | 2
svtools/source/contnr/treelistbox.cxx | 6
svtools/source/graphic/provider.cxx | 2
svtools/source/misc/acceleratorexecute.cxx | 2
svtools/source/misc/transfer.cxx | 4
sw/inc/unotxdoc.hxx | 2
sw/source/uibase/inc/pview.hxx | 2
sw/source/uibase/inc/view.hxx | 2
toolkit/source/helper/formpdfexport.cxx | 44 ++---
vcl/inc/dndlcon.hxx | 2
vcl/inc/ilstbox.hxx | 10 -
vcl/inc/svdata.hxx | 2
vcl/osx/salframeview.mm | 2
vcl/qa/cppunit/canvasbitmaptest.cxx | 2
vcl/source/app/svapp.cxx | 2
vcl/source/control/ctrl.cxx | 4
vcl/source/control/edit.cxx | 4
vcl/source/control/ilstbox.cxx | 14 -
vcl/source/gdi/font.cxx | 4
vcl/source/gdi/image.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 2
vcl/source/gdi/pngread.cxx | 2
vcl/source/helper/canvasbitmap.cxx | 2
vcl/source/helper/canvastools.cxx | 4
vcl/source/outdev/font.cxx | 15 -
vcl/source/outdev/nativecontrols.cxx | 4
vcl/source/outdev/text.cxx | 10 -
vcl/source/window/window.cxx | 2
vcl/unx/generic/app/i18n_cb.cxx | 4
vcl/unx/generic/app/i18n_im.cxx | 2
154 files changed, 415 insertions(+), 440 deletions(-)
New commits:
commit d883c12556a71c5d3719454b1f95809a505f0ace
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 28 23:09:13 2015 +0300
Get rid of the initial :: for the vcl namespace
We used it all over the place without leading :: already anyway, even
in many files in include. So let's be consistent. In the majority of
cases, prefer the easier-on-the-eyes choice, not the "safe" one.
In those files in include where *all* existing uses of ::vcl:: indeed
used the :: prefix, there let's keep it for consistency.
Change-Id: If99cb41d3bf290d38c601d91125c3c8d935e61d0
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 811fca3..92dd30e 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -460,7 +460,7 @@ throw(RuntimeException, std::exception)
sal_Int32 nIndex = -1;
if ( m_pIconCtrl )
{
- ::vcl::ControlLayoutData aLayoutData;
+ vcl::ControlLayoutData aLayoutData;
Rectangle aItemRect = GetBoundingBox_Impl();
m_pIconCtrl->RecordLayoutData( &aLayoutData, aItemRect );
Point aPnt( VCLPoint( aPoint ) );
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 7f68e11..e145b98 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -665,7 +665,7 @@ namespace accessibility
SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( pEntry )
{
- ::vcl::ControlLayoutData aLayoutData;
+ vcl::ControlLayoutData aLayoutData;
Rectangle aItemRect = GetBoundingBox();
getListBox()->RecordLayoutData( &aLayoutData, aItemRect );
Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex );
@@ -687,7 +687,7 @@ namespace accessibility
SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( pEntry )
{
- ::vcl::ControlLayoutData aLayoutData;
+ vcl::ControlLayoutData aLayoutData;
Rectangle aItemRect = GetBoundingBox();
getListBox()->RecordLayoutData( &aLayoutData, aItemRect );
Point aPnt( VCLPoint( aPoint ) );
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index c9c1b16..d1ea1cf 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -575,7 +575,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I
if ( xClipboard.is() )
{
OUString sText( getTextRange( nStartIndex, nEndIndex ) );
- ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText );
+ vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
SolarMutexReleaser aReleaser;
xClipboard->setContents( pDataObj, NULL );
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 24f8ef5..9ee4986 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -403,7 +403,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd
{
OUString sText( getTextRange( nStartIndex, nEndIndex ) );
- ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText );
+ vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
SolarMutexReleaser aReleaser;
xClipboard->setContents( pDataObj, NULL );
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index 2ac6bf1..586a1d7 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -138,7 +138,7 @@ void VCLXAccessibleStatusBarItem::SetItemText( const OUString& sItemText )
OUString VCLXAccessibleStatusBarItem::GetItemText()
{
OUString sText;
- ::vcl::ControlLayoutData aLayoutData;
+ vcl::ControlLayoutData aLayoutData;
if ( m_pStatusBar )
{
Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
@@ -533,7 +533,7 @@ awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex
awt::Rectangle aBounds( 0, 0, 0, 0 );
if ( m_pStatusBar )
{
- ::vcl::ControlLayoutData aLayoutData;
+ vcl::ControlLayoutData aLayoutData;
Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect );
Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex );
@@ -553,7 +553,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint
sal_Int32 nIndex = -1;
if ( m_pStatusBar )
{
- ::vcl::ControlLayoutData aLayoutData;
+ vcl::ControlLayoutData aLayoutData;
Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect );
Point aPnt( VCLPoint( aPoint ) );
@@ -591,7 +591,7 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32
{
OUString sText( getTextRange( nStartIndex, nEndIndex ) );
- ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText );
+ vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
SolarMutexReleaser aReleaser;
xClipboard->setContents( pDataObj, NULL );
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 34aac11..f0bf4d3 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -664,7 +664,7 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI
{
OUString sText( getTextRange( nStartIndex, nEndIndex ) );
- ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText );
+ vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
SolarMutexReleaser aReleaser;
xClipboard->setContents( pDataObj, NULL );
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 7fbe48a..1050cdb 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -383,7 +383,7 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32
{
OUString sText( getTextRange( nStartIndex, nEndIndex ) );
- ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText );
+ vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
SolarMutexReleaser aReleaser;
xClipboard->setContents( pDataObj, NULL );
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 3209711..719df9c 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -522,7 +522,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa
{
OUString sText( getTextRange( nStartIndex, nEndIndex ) );
- ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText );
+ vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
SolarMutexReleaser aReleaser;
xClipboard->setContents( pDataObj, NULL );
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 7a918f4..64686fc 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -319,7 +319,7 @@ namespace cairocanvas
// TODO(F1): Add support for floating point bitmap formats
uno::Reference<rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap,
uno::UNO_QUERY_THROW);
- ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap(xIntBmp);
+ ::BitmapEx aBmpEx = vcl::unotools::bitmapExFromXBitmap(xIntBmp);
if( !!aBmpEx )
return aBmpEx;
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index 2a98ea7b..92782af 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -135,7 +135,7 @@ namespace cairocanvas
if( renderState.DeviceColor.getLength() > 2 )
{
- aColor = ::vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor );
+ aColor = vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor );
}
// extract alpha, and make color opaque
@@ -217,7 +217,7 @@ namespace cairocanvas
if( renderState.DeviceColor.getLength() > 2 )
{
- aColor = ::vcl::unotools::stdColorSpaceSequenceToColor(renderState.DeviceColor );
+ aColor = vcl::unotools::stdColorSpaceSequenceToColor(renderState.DeviceColor );
}
// setup font color
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index 684b61a..7fd8a46 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -113,7 +113,7 @@ namespace cairocanvas
const Size aPixelSize( mpRefDevice->LogicToPixel(Size(1,1)) );
mpRefDevice->SetMapMode( aOldMapMode );
- return ::vcl::unotools::size2DFromSize( aPixelSize );
+ return vcl::unotools::size2DFromSize( aPixelSize );
}
geometry::RealSize2D DeviceHelper::getPhysicalSize()
@@ -127,7 +127,7 @@ namespace cairocanvas
const Size aLogSize( mpRefDevice->PixelToLogic(mpRefDevice->GetOutputSizePixel()) );
mpRefDevice->SetMapMode( aOldMapMode );
- return ::vcl::unotools::size2DFromSize( aLogSize );
+ return vcl::unotools::size2DFromSize( aLogSize );
}
uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon(
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 15883c6..e9ae261 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -103,7 +103,7 @@ namespace dxcanvas
Color aColor( COL_WHITE );
if( rRenderState.DeviceColor.getLength() > 2 )
- aColor = ::vcl::unotools::doubleSequenceToColor(
+ aColor = vcl::unotools::doubleSequenceToColor(
rRenderState.DeviceColor,
mxGraphicDevice->getDeviceColorSpace());
aColor.SetTransparency(0);
diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx
index f65b5fc..7270080 100644
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.cxx
@@ -500,7 +500,7 @@ namespace dxcanvas
if( !xIntBmp.is() )
return false;
- ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap( xIntBmp );
+ ::BitmapEx aBmpEx = vcl::unotools::bitmapExFromXBitmap( xIntBmp );
if( !aBmpEx )
return false;
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index da0c735..37122d8 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -163,7 +163,7 @@ namespace oglcanvas
const Size aPixelSize( pChildWindow->LogicToPixel(Size(1,1)) );
pChildWindow->SetMapMode( aOldMapMode );
- return ::vcl::unotools::size2DFromSize( aPixelSize );
+ return vcl::unotools::size2DFromSize( aPixelSize );
}
geometry::RealSize2D SpriteDeviceHelper::getPhysicalSize()
@@ -178,7 +178,7 @@ namespace oglcanvas
const Size aLogSize( pChildWindow->PixelToLogic(pChildWindow->GetOutputSizePixel()) );
pChildWindow->SetMapMode( aOldMapMode );
- return ::vcl::unotools::size2DFromSize( aLogSize );
+ return vcl::unotools::size2DFromSize( aLogSize );
}
uno::Reference< rendering::XLinePolyPolygon2D > SpriteDeviceHelper::createCompatibleLinePolyPolygon(
diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx
index efbd61e..5c0a310 100644
--- a/canvas/source/vcl/canvasbitmaphelper.cxx
+++ b/canvas/source/vcl/canvasbitmaphelper.cxx
@@ -95,7 +95,7 @@ namespace vclcanvas
if( !mpBackBuffer )
return geometry::IntegerSize2D();
- return ::vcl::unotools::integerSize2DFromSize( mpBackBuffer->getBitmapSizePixel() );
+ return vcl::unotools::integerSize2DFromSize( mpBackBuffer->getBitmapSizePixel() );
}
void CanvasBitmapHelper::clear()
@@ -118,7 +118,7 @@ namespace vclcanvas
BitmapEx aRes( mpBackBuffer->getBitmapReference() );
- aRes.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize),
+ aRes.Scale( vcl::unotools::sizeFromRealSize2D(newSize),
beFast ? BMP_SCALE_DEFAULT : BMP_SCALE_BESTQUALITY );
return uno::Reference< rendering::XBitmap >(
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 5bf8b37..37a5176 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -723,7 +723,7 @@ namespace vclcanvas
{
// optimized case: identity matrix, or only
// translational components.
- mpOutDev->getOutDev().DrawBitmapEx( ::vcl::unotools::pointFromB2DPoint( aOutputPos ),
+ mpOutDev->getOutDev().DrawBitmapEx( vcl::unotools::pointFromB2DPoint( aOutputPos ),
aBmpEx );
if( mp2ndOutDev )
@@ -743,7 +743,7 @@ namespace vclcanvas
aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aBmpEx.GetMask() );
}
- mp2ndOutDev->getOutDev().DrawBitmapEx( ::vcl::unotools::pointFromB2DPoint( aOutputPos ),
+ mp2ndOutDev->getOutDev().DrawBitmapEx( vcl::unotools::pointFromB2DPoint( aOutputPos ),
aBmpEx );
}
@@ -838,7 +838,7 @@ namespace vclcanvas
}
// output GraphicObject
- const ::Point aPt( ::vcl::unotools::pointFromB2DPoint( aOutputPos ) );
+ const ::Point aPt( vcl::unotools::pointFromB2DPoint( aOutputPos ) );
const ::Size aSz( ::basegfx::fround( aScale.getX() * aBmpSize.Width() ),
::basegfx::fround( aScale.getY() * aBmpSize.Height() ) );
@@ -904,7 +904,7 @@ namespace vclcanvas
if( !mpOutDev.get() )
return geometry::IntegerSize2D(); // we're disposed
- return ::vcl::unotools::integerSize2DFromSize( mpOutDev->getOutDev().GetOutputSizePixel() );
+ return vcl::unotools::integerSize2DFromSize( mpOutDev->getOutDev().GetOutputSizePixel() );
}
uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D& newSize,
@@ -925,7 +925,7 @@ namespace vclcanvas
Bitmap aBitmap( rOutDev.GetBitmap(aEmptyPoint, aBmpSize) );
- aBitmap.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize),
+ aBitmap.Scale( vcl::unotools::sizeFromRealSize2D(newSize),
beFast ? BMP_SCALE_DEFAULT : BMP_SCALE_BESTQUALITY );
return uno::Reference< rendering::XBitmap >(
@@ -941,7 +941,7 @@ namespace vclcanvas
rLayout = getMemoryLayout();
// TODO(F2): Support alpha canvas here
- const Rectangle aRect( ::vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
+ const Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
OutputDevice& rOutDev( mpOutDev->getOutDev() );
@@ -1002,7 +1002,7 @@ namespace vclcanvas
rOutDev.EnableMapMode( false );
rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
- const Rectangle aRect( ::vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
+ const Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
const sal_uInt16 nBitCount( ::std::min( (sal_uInt16)24U,
(sal_uInt16)rOutDev.GetBitCount() ) );
const BitmapPalette* pPalette = NULL;
@@ -1144,7 +1144,7 @@ namespace vclcanvas
"Mismatching memory layout" );
// TODO(F2): Support alpha canvas here
- rOutDev.DrawPixel( ::vcl::unotools::pointFromIntegerPoint2D( pos ),
+ rOutDev.DrawPixel( vcl::unotools::pointFromIntegerPoint2D( pos ),
::canvas::tools::stdIntSequenceToColor( color ));
}
@@ -1175,7 +1175,7 @@ namespace vclcanvas
// TODO(F2): Support alpha canvas here
return ::canvas::tools::colorToStdIntSequence(
rOutDev.GetPixel(
- ::vcl::unotools::pointFromIntegerPoint2D( pos )));
+ vcl::unotools::pointFromIntegerPoint2D( pos )));
}
rendering::IntegerBitmapLayout CanvasHelper::getMemoryLayout()
@@ -1222,7 +1222,7 @@ namespace vclcanvas
if( renderState.DeviceColor.getLength() > 2 )
{
- aColor = ::vcl::unotools::stdColorSpaceSequenceToColor(
+ aColor = vcl::unotools::stdColorSpaceSequenceToColor(
renderState.DeviceColor );
}
@@ -1297,7 +1297,7 @@ namespace vclcanvas
if( renderState.DeviceColor.getLength() > 2 )
{
- aColor = ::vcl::unotools::stdColorSpaceSequenceToColor(
+ aColor = vcl::unotools::stdColorSpaceSequenceToColor(
renderState.DeviceColor );
}
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index b46746e..77b0853 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -133,8 +133,8 @@ namespace vclcanvas
// calc length of bound rect diagonal
const ::basegfx::B2DVector aBoundRectDiagonal(
- ::vcl::unotools::b2DPointFromPoint( rBounds.TopLeft() ) -
- ::vcl::unotools::b2DPointFromPoint( rBounds.BottomRight() ) );
+ vcl::unotools::b2DPointFromPoint( rBounds.TopLeft() ) -
+ vcl::unotools::b2DPointFromPoint( rBounds.BottomRight() ) );
const double nDiagonalLength( aBoundRectDiagonal.getLength() );
// create direction of gradient:
@@ -153,7 +153,7 @@ namespace vclcanvas
aLeftBottom,
aRightTop,
aRightBottom,
- ::vcl::unotools::b2DRectangleFromRectangle( rBounds ) );
+ vcl::unotools::b2DRectangleFromRectangle( rBounds ) );
// render gradient
@@ -643,11 +643,11 @@ namespace vclcanvas
aTextureTransform );
rOutDev.SetLineColor( COL_RED );
rOutDev.SetFillColor();
- rOutDev.DrawRect( ::vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) );
+ rOutDev.DrawRect( vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) );
rOutDev.SetLineColor( COL_BLUE );
::Polygon aPoly1(
- ::vcl::unotools::rectangleFromB2DRectangle( aRect ));
+ vcl::unotools::rectangleFromB2DRectangle( aRect ));
::basegfx::B2DPolygon aPoly2( aPoly1.getB2DPolygon() );
aPoly2.transform( aTextureTransform );
::Polygon aPoly3( aPoly2 );
@@ -767,7 +767,7 @@ namespace vclcanvas
aTotalTransform );
const ::Rectangle aIntegerTextureDeviceRect(
- ::vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) );
+ vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) );
if( bRectangularPolygon &&
aIntegerTextureDeviceRect == aPolygonDeviceRect )
@@ -911,7 +911,7 @@ namespace vclcanvas
// start point from it.
::basegfx::B2DRectangle aTextureSpacePolygonRect;
::canvas::tools::calcTransformedRectBounds( aTextureSpacePolygonRect,
- ::vcl::unotools::b2DRectangleFromRectangle(
+ vcl::unotools::b2DRectangleFromRectangle(
aPolygonDeviceRect ),
aInverseTextureTransform );
@@ -939,12 +939,12 @@ namespace vclcanvas
aSingleTextureRect,
aPureTotalTransform );
- const ::Point aPtRepeat( ::vcl::unotools::pointFromB2DPoint(
+ const ::Point aPtRepeat( vcl::unotools::pointFromB2DPoint(
aSingleDeviceTextureRect.getMinimum() ) );
const ::Size aSz( ::basegfx::fround( aScale.getX() * aBmpSize.Width ),
::basegfx::fround( aScale.getY() * aBmpSize.Height ) );
- const ::Size aIntegerNextTileX( ::vcl::unotools::sizeFromB2DSize(aNextTileX) );
- const ::Size aIntegerNextTileY( ::vcl::unotools::sizeFromB2DSize(aNextTileY) );
+ const ::Size aIntegerNextTileX( vcl::unotools::sizeFromB2DSize(aNextTileX) );
+ const ::Size aIntegerNextTileY( vcl::unotools::sizeFromB2DSize(aNextTileY) );
const ::Point aPt( textures[0].RepeatModeX == rendering::TexturingMode::NONE ?
::basegfx::fround( aOutputPos.getX() ) : aPtRepeat.X(),
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index dd600fc..63fdc8a 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -57,7 +57,7 @@ namespace vclcanvas
const Size aPixelSize( rOutDev.LogicToPixel(Size(1,1)) );
rOutDev.SetMapMode( aOldMapMode );
- return ::vcl::unotools::size2DFromSize( aPixelSize );
+ return vcl::unotools::size2DFromSize( aPixelSize );
}
geometry::RealSize2D DeviceHelper::getPhysicalSize()
@@ -72,7 +72,7 @@ namespace vclcanvas
const Size aLogSize( rOutDev.PixelToLogic(rOutDev.GetOutputSizePixel()) );
rOutDev.SetMapMode( aOldMapMode );
- return ::vcl::unotools::size2DFromSize( aLogSize );
+ return vcl::unotools::size2DFromSize( aLogSize );
}
uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon(
@@ -115,7 +115,7 @@ namespace vclcanvas
return uno::Reference< rendering::XBitmap >(); // we're disposed
return uno::Reference< rendering::XBitmap >(
- new CanvasBitmap( ::vcl::unotools::sizeFromIntegerSize2D(size),
+ new CanvasBitmap( vcl::unotools::sizeFromIntegerSize2D(size),
false,
*rDevice.get(),
mpOutDev ) );
@@ -136,7 +136,7 @@ namespace vclcanvas
return uno::Reference< rendering::XBitmap >(); // we're disposed
return uno::Reference< rendering::XBitmap >(
- new CanvasBitmap( ::vcl::unotools::sizeFromIntegerSize2D(size),
+ new CanvasBitmap( vcl::unotools::sizeFromIntegerSize2D(size),
true,
*rDevice.get(),
mpOutDev ) );
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 4167d1f..cc25ea0 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -87,7 +87,7 @@ namespace vclcanvas
uno::Reference< rendering::XIntegerReadOnlyBitmap > xIntBmp(
xBitmap, uno::UNO_QUERY_THROW );
- ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap( xIntBmp );
+ ::BitmapEx aBmpEx = vcl::unotools::bitmapExFromXBitmap( xIntBmp );
if( !!aBmpEx )
return aBmpEx;
@@ -181,7 +181,7 @@ namespace vclcanvas
rViewState,
rRenderState);
- return ::vcl::unotools::pointFromB2DPoint( aPoint );
+ return vcl::unotools::pointFromB2DPoint( aPoint );
}
::tools::PolyPolygon mapPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly,
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 51a234f..d003736 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -71,8 +71,8 @@ namespace vclcanvas
OutputDevice& rBackBuffer,
const ::basegfx::B2DRange& rArea )
{
- const ::Point& rPos( ::vcl::unotools::pointFromB2DPoint( rArea.getMinimum()) );
- const ::Size& rSize( ::vcl::unotools::sizeFromB2DSize( rArea.getRange()) );
+ const ::Point& rPos( vcl::unotools::pointFromB2DPoint( rArea.getMinimum()) );
+ const ::Size& rSize( vcl::unotools::sizeFromB2DSize( rArea.getRange()) );
rOutDev.DrawOutDev( rPos, rSize, rPos, rSize, rBackBuffer );
}
@@ -82,7 +82,7 @@ namespace vclcanvas
const ::basegfx::B2IRange& rArea )
{
const Rectangle& rRequestedArea(
- ::vcl::unotools::rectangleFromB2IRectangle( rArea ) );
+ vcl::unotools::rectangleFromB2IRectangle( rArea ) );
// clip output to actual update region (otherwise a)
// wouldn't save much render time, and b) will clutter
@@ -444,8 +444,8 @@ namespace vclcanvas
else
{
// scroll rOutDev content
- rOutDev.CopyArea( ::vcl::unotools::pointFromB2IPoint( aDestPos ),
- ::vcl::unotools::pointFromB2IPoint( aSourceRect.getMinimum() ),
+ rOutDev.CopyArea( vcl::unotools::pointFromB2IPoint( aDestPos ),
+ vcl::unotools::pointFromB2IPoint( aSourceRect.getMinimum() ),
// TODO(Q2): use numeric_cast to check range
::Size( static_cast<sal_Int32>(aSourceRect.getRange().getX()),
static_cast<sal_Int32>(aSourceRect.getRange().getY()) ) );
@@ -583,7 +583,7 @@ namespace vclcanvas
rSortedUpdateSprites.end(),
::boost::bind( &spriteRedrawStub2,
::boost::ref( *maVDev.get() ),
- ::vcl::unotools::b2DPointFromPoint(
+ vcl::unotools::b2DPointFromPoint(
aOutputPosition),
_1 ) );
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 675ea92..e79e012 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -114,8 +114,8 @@ namespace vclcanvas
// rounded to integer values. From now on, only those
// rounded values are used, to keep clip and content in
// sync.
- ::Size aOutputSize( ::vcl::unotools::sizeFromB2DSize( rOrigOutputSize ) );
- ::Point aOutPos( ::vcl::unotools::pointFromB2DPoint( rPos ) );
+ ::Size aOutputSize( vcl::unotools::sizeFromB2DSize( rOrigOutputSize ) );
+ ::Point aOutPos( vcl::unotools::pointFromB2DPoint( rPos ) );
// TODO(F3): Support for alpha-VDev
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index c03c0b1..c272666 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -407,7 +407,7 @@ void AccessibleBase::BroadcastAccEvent(
// send event to global message queue
if( bSendGlobally )
{
- ::vcl::unohelper::NotifyAccessibleStateEventGlobally( aEvent );
+ vcl::unohelper::NotifyAccessibleStateEventGlobally( aEvent );
}
}
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 7514bc4..e264d77 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -241,7 +241,7 @@ static float GetSwapFloat( SvStream& rSt )
static ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCanvasFont > createFont( double& o_rFontRotation,
- const ::vcl::Font& rFont,
+ const vcl::Font& rFont,
const ActionFactoryParameters& rParms );
bool createActions( GDIMetaFile& rMtf,
const ActionFactoryParameters& rParms,
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 14fea4e..fb0eb33 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -85,7 +85,7 @@ namespace cppcanvas
const CanvasSharedPtr& rCanvas,
const OutDevState& rState ) :
CachedPrimitiveBase( rCanvas, true ),
- mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(),
+ mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(),
rBmpEx ) ),
mpCanvas( rCanvas ),
maState()
@@ -113,7 +113,7 @@ namespace cppcanvas
const CanvasSharedPtr& rCanvas,
const OutDevState& rState ) :
CachedPrimitiveBase( rCanvas, true ),
- mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(),
+ mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(),
rBmpEx ) ),
mpCanvas( rCanvas ),
maState()
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 5afa0b2..de28124 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1259,7 +1259,7 @@ namespace cppcanvas
}
#define COLOR(x) \
- ::vcl::unotools::colorToDoubleSequence( ::Color (0xff - (x >> 24), \
+ vcl::unotools::colorToDoubleSequence( ::Color (0xff - (x >> 24), \
(x >> 16) & 0xff, \
(x >> 8) & 0xff, \
x & 0xff), \
@@ -1336,7 +1336,7 @@ namespace cppcanvas
{
fillColor = brush->secondColor;
}
- rState.fillColor = ::vcl::unotools::colorToDoubleSequence(fillColor, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
+ rState.fillColor = vcl::unotools::colorToDoubleSequence(fillColor, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
pPolyAction = ActionSharedPtr ( internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon, rParms.mrCanvas, rState ) );
}
else if (brush->type == 3 || brush->type == 4)
@@ -1399,10 +1399,10 @@ namespace cppcanvas
OUString aGradientService;
const uno::Sequence< double > aStartColor(
- ::vcl::unotools::colorToDoubleSequence( brush->solidColor,
+ vcl::unotools::colorToDoubleSequence( brush->solidColor,
rParms.mrCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() ) );
const uno::Sequence< double > aEndColor(
- ::vcl::unotools::colorToDoubleSequence( brush->secondColor,
+ vcl::unotools::colorToDoubleSequence( brush->secondColor,
rParms.mrCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() ) );
uno::Sequence< uno::Sequence < double > > aColors (2);
uno::Sequence< double > aStops (2);
@@ -1435,7 +1435,7 @@ namespace cppcanvas
for (int i = 0; i < brush->colorblendPoints; i++) {
aStops[i] = brush->colorblendPositions [i];
- aColors[(brush->type == 4) ? i : brush->colorblendPoints - 1 - i] = ::vcl::unotools::colorToDoubleSequence( brush->colorblendColors [i],
+ aColors[(brush->type == 4) ? i : brush->colorblendPoints - 1 - i] = vcl::unotools::colorToDoubleSequence( brush->colorblendColors [i],
rParms.mrCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
}
} else {
@@ -1591,7 +1591,7 @@ namespace cppcanvas
{
rState.isFillColorSet = false;
rState.isLineColorSet = true;
- rState.lineColor = ::vcl::unotools::colorToDoubleSequence (pen->GetColor (),
+ rState.lineColor = vcl::unotools::colorToDoubleSequence (pen->GetColor (),
rCanvas->getUNOCanvas ()->getDevice()->getDeviceColorSpace());
basegfx::B2DPolyPolygon aPolyPolygon(polygon);
@@ -2169,7 +2169,7 @@ namespace cppcanvas
TextActionFactory::createTextAction(
// position is just rough guess for now
// we should calculate it exactly from layoutRect or font
- ::vcl::unotools::pointFromB2DPoint ( point ),
+ vcl::unotools::pointFromB2DPoint ( point ),
::Size(),
::Color(),
::Size(),
@@ -2426,7 +2426,7 @@ namespace cppcanvas
ActionSharedPtr pTextAction(
TextActionFactory::createTextAction(
- ::vcl::unotools::pointFromB2DPoint ( point ),
+ vcl::unotools::pointFromB2DPoint ( point ),
::Size(),
::Color(),
::Size(),
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 9aeabba..c5febd0 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -103,7 +103,7 @@ namespace
aColor.SetTransparency(0);
//aColor.SetTransparency(128);
- rColorSequence = ::vcl::unotools::colorToDoubleSequence(
+ rColorSequence = vcl::unotools::colorToDoubleSequence(
aColor,
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
}
@@ -545,10 +545,10 @@ namespace cppcanvas
uno::Reference<rendering::XColorSpace> xColorSpace(
rParms.mrCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
const uno::Sequence< double > aStartColor(
- ::vcl::unotools::colorToDoubleSequence( aVCLStartColor,
+ vcl::unotools::colorToDoubleSequence( aVCLStartColor,
xColorSpace ));
const uno::Sequence< double > aEndColor(
- ::vcl::unotools::colorToDoubleSequence( aVCLEndColor,
+ vcl::unotools::colorToDoubleSequence( aVCLEndColor,
xColorSpace ));
uno::Sequence< uno::Sequence < double > > aColors(2);
@@ -851,7 +851,7 @@ namespace cppcanvas
else
aFontMatrix.m11 *= nScaleY / nScaleX;
}
- aFontRequest.CellSize = (rState.mapModeTransform * ::vcl::unotools::b2DSizeFromSize(rFontSizeLog)).getY();
+ aFontRequest.CellSize = (rState.mapModeTransform * vcl::unotools::b2DSizeFromSize(rFontSizeLog)).getY();
return rParms.mrCanvas->getUNOCanvas()->createFont( aFontRequest,
uno::Sequence< beans::PropertyValue >(),
@@ -898,7 +898,7 @@ namespace cppcanvas
aShadowOffset.setHeight( nShadowOffset );
// determine shadow color (from outdev3.cxx)
- ::Color aTextColor = ::vcl::unotools::doubleSequenceToColor(
+ ::Color aTextColor = vcl::unotools::doubleSequenceToColor(
rState.textColor, xColorSpace );
bool bIsDark = (aTextColor.GetColor() == COL_BLACK)
|| (aTextColor.GetLuminance() < 8);
@@ -922,7 +922,7 @@ namespace cppcanvas
aReliefOffset.setHeight( nReliefOffset );
// determine relief color (from outdev3.cxx)
- ::Color aTextColor = ::vcl::unotools::doubleSequenceToColor(
+ ::Color aTextColor = vcl::unotools::doubleSequenceToColor(
rState.textColor, xColorSpace );
aReliefColor = ::Color( COL_LIGHTGRAY );
@@ -934,7 +934,7 @@ namespace cppcanvas
{
aTextColor = ::Color( COL_WHITE );
rParms.mrStates.getState().textColor =
- ::vcl::unotools::colorToDoubleSequence(
+ vcl::unotools::colorToDoubleSequence(
aTextColor, xColorSpace );
}
@@ -1435,7 +1435,7 @@ namespace cppcanvas
aColor.SetTransparency(0);
rStates.getState().textColor =
- ::vcl::unotools::colorToDoubleSequence(
+ vcl::unotools::colorToDoubleSequence(
aColor,
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
}
@@ -1728,7 +1728,7 @@ namespace cppcanvas
aTexture.Alpha = 1.0 - aFill.getTransparency();
aTexture.Bitmap =
- ::vcl::unotools::xBitmapFromBitmapEx(
+ vcl::unotools::xBitmapFromBitmapEx(
rCanvas->getUNOCanvas()->getDevice(),
aBmpEx );
if( aFill.isTiling() )
@@ -1817,7 +1817,7 @@ namespace cppcanvas
{
ActionSharedPtr pPointAction(
internal::PointActionFactory::createPointAction(
- rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint(
+ rState.mapModeTransform * vcl::unotools::b2DPointFromPoint(
static_cast<MetaPointAction*>(pCurrAct)->GetPoint() ),
rCanvas,
rState ) );
@@ -1842,7 +1842,7 @@ namespace cppcanvas
{
ActionSharedPtr pPointAction(
internal::PointActionFactory::createPointAction(
- rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint(
+ rState.mapModeTransform * vcl::unotools::b2DPointFromPoint(
static_cast<MetaPixelAction*>(pCurrAct)->GetPoint() ),
rCanvas,
rState,
@@ -1871,9 +1871,9 @@ namespace cppcanvas
const LineInfo& rLineInfo( pLineAct->GetLineInfo() );
const ::basegfx::B2DPoint aStartPoint(
- rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( pLineAct->GetStartPoint() ));
+ rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( pLineAct->GetStartPoint() ));
const ::basegfx::B2DPoint aEndPoint(
- rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( pLineAct->GetEndPoint() ));
+ rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( pLineAct->GetEndPoint() ));
ActionSharedPtr pLineAction;
@@ -1944,9 +1944,9 @@ namespace cppcanvas
const OutDevState& rState( rStates.getState() );
const ::basegfx::B2DPoint aTopLeftPixel(
- rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ) );
+ rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ) );
const ::basegfx::B2DPoint aBottomRightPixel(
- rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
+ rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
// #121100# OutputDevice::DrawRect() fills
// rectangles Apple-like, i.e. with one
// additional pixel to the right and bottom.
@@ -1970,8 +1970,8 @@ namespace cppcanvas
::basegfx::B2DPolygon aPoly(
::basegfx::tools::createPolygonFromRect(
::basegfx::B2DRange(
- ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ),
- ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
+ vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ),
+ vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
::basegfx::B2DPoint(1,1) ),
( (double) static_cast<MetaRoundRectAction*>(pCurrAct)->GetHorzRound() ) / rRect.GetWidth(),
( (double) static_cast<MetaRoundRectAction*>(pCurrAct)->GetVertRound() ) / rRect.GetHeight() ) );
@@ -1991,8 +1991,8 @@ namespace cppcanvas
break;
const ::basegfx::B2DRange aRange(
- ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ),
- ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
+ vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ),
+ vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
::basegfx::B2DPoint(1,1) );
::basegfx::B2DPolygon aPoly(
@@ -2140,7 +2140,7 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmap(),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rCanvas,
rStates.getState() ) );
@@ -2164,9 +2164,9 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmap(),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
rCanvas,
rStates.getState() ) );
@@ -2197,9 +2197,9 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
rCanvas,
rStates.getState() ) );
@@ -2223,7 +2223,7 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmapEx(),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rCanvas,
rStates.getState() ) );
@@ -2247,9 +2247,9 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmapEx(),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
rCanvas,
rStates.getState() ) );
@@ -2280,9 +2280,9 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
rCanvas,
rStates.getState() ) );
@@ -2312,7 +2312,7 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rCanvas,
rStates.getState() ) );
@@ -2342,9 +2342,9 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
rCanvas,
rStates.getState() ) );
@@ -2380,9 +2380,9 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
rCanvas,
rStates.getState() ) );
@@ -2456,9 +2456,9 @@ namespace cppcanvas
std::move(pGradient),
rParms,
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
rCanvas,
rStates.getState() ) );
@@ -2532,8 +2532,8 @@ namespace cppcanvas
tools::createTextLinesPolyPolygon(
rState.mapModeTransform *
::basegfx::B2DPoint(
- ::vcl::unotools::b2DPointFromPoint(pAct->GetStartPoint()) +
- ::vcl::unotools::b2DSizeFromSize(aBaselineOffset)),
+ vcl::unotools::b2DPointFromPoint(pAct->GetStartPoint()) +
+ vcl::unotools::b2DSizeFromSize(aBaselineOffset)),
aSize.getX(),
tools::createTextLineInfo( rVDev,
rState )),
@@ -2985,7 +2985,7 @@ namespace cppcanvas
::cppcanvas::internal::OutDevState& rState = aStateStack.getState();
rState.xFont = createFont( rState.fontRotation,
- ::vcl::Font(), // default font
+ vcl::Font(), // default font
aParms );
}
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index 0467359..228dd73 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -91,7 +91,7 @@ namespace cppcanvas
maState()
{
tools::initRenderState(maState,rState);
- maState.DeviceColor = ::vcl::unotools::colorToDoubleSequence(
+ maState.DeviceColor = vcl::unotools::colorToDoubleSequence(
rAltColor,
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
}
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index fd46607..ec0b131 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -514,7 +514,7 @@ namespace cppcanvas
::canvas::tools::appendToRenderState(aShadowState, aTranslate);
aShadowState.DeviceColor =
- ::vcl::unotools::colorToDoubleSequence( rShadowColor,
+ vcl::unotools::colorToDoubleSequence( rShadowColor,
xColorSpace );
rRenderer( aShadowState );
@@ -532,7 +532,7 @@ namespace cppcanvas
::canvas::tools::appendToRenderState(aReliefState, aTranslate);
aReliefState.DeviceColor =
- ::vcl::unotools::colorToDoubleSequence( rReliefColor,
+ vcl::unotools::colorToDoubleSequence( rReliefColor,
xColorSpace );
rRenderer( aReliefState );
@@ -1633,7 +1633,7 @@ namespace cppcanvas
maState(),
mnOutlineWidth( calcOutlineWidth(rState,rVDev) ),
maFillColor(
- ::vcl::unotools::colorToDoubleSequence(
+ vcl::unotools::colorToDoubleSequence(
::Color( COL_WHITE ),
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )),
maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
@@ -1677,7 +1677,7 @@ namespace cppcanvas
maState(),
mnOutlineWidth( calcOutlineWidth(rState,rVDev) ),
maFillColor(
- ::vcl::unotools::colorToDoubleSequence(
+ vcl::unotools::colorToDoubleSequence(
::Color( COL_WHITE ),
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )),
maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
@@ -1772,7 +1772,7 @@ namespace cppcanvas
const rendering::ViewState& rViewState,
double nOutlineWidth ) :
maFillColor(
- ::vcl::unotools::colorToDoubleSequence(
+ vcl::unotools::colorToDoubleSequence(
::Color( COL_WHITE ),
rCanvas->getDevice()->getDeviceColorSpace() )),
mnOutlineWidth( nOutlineWidth ),
@@ -2106,9 +2106,9 @@ namespace cppcanvas
rStartPoint.Y() + aBaselineOffset.Height()) );
const ::basegfx::B2DSize aReliefOffset(
- rState.mapModeTransform * ::vcl::unotools::b2DSizeFromSize( rReliefOffset ) );
+ rState.mapModeTransform * vcl::unotools::b2DSizeFromSize( rReliefOffset ) );
const ::basegfx::B2DSize aShadowOffset(
- rState.mapModeTransform * ::vcl::unotools::b2DSizeFromSize( rShadowOffset ) );
+ rState.mapModeTransform * vcl::unotools::b2DSizeFromSize( rShadowOffset ) );
if( rState.isTextOutlineModeSet )
{
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index a943e36..412280b 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -386,7 +386,7 @@ namespace cppcanvas
#if OSL_DEBUG_LEVEL > 2
aLocalState.Clip.clear();
aLocalState.DeviceColor =
- ::vcl::unotools::colorToDoubleSequence(
+ vcl::unotools::colorToDoubleSequence(
::Color( 0x80FF0000 ),
mpCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx
index 669aabf..338daa4 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.cxx
@@ -81,7 +81,7 @@ namespace cppcanvas
return BitmapSharedPtr();
return BitmapSharedPtr( new internal::ImplBitmap( rCanvas,
- ::vcl::unotools::xBitmapFromBitmapEx(
+ vcl::unotools::xBitmapFromBitmapEx(
xCanvas->getDevice(),
rBmpEx) ) );
}
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index c607375..cf039ed 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -101,7 +101,7 @@ namespace svx
public:
void Paint( OutputDevice& _rDevice, const Rectangle& _rRect, sal_uInt16 _nTextStyle,
Rectangle* _pPrimaryLocation = NULL, Rectangle* _pSecondaryLocation = NULL,
- ::vcl::ControlLayoutData* _pLayoutData = NULL );
+ vcl::ControlLayoutData* _pLayoutData = NULL );
};
PseudoRubyText::PseudoRubyText()
@@ -118,7 +118,7 @@ namespace svx
void PseudoRubyText::Paint( OutputDevice& _rDevice, const Rectangle& _rRect, sal_uInt16 _nTextStyle,
- Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation, ::vcl::ControlLayoutData* _pLayoutData )
+ Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation, vcl::ControlLayoutData* _pLayoutData )
{
bool bLayoutOnly = NULL != _pLayoutData;
MetricVector* pTextMetrics = bLayoutOnly ? &_pLayoutData->m_aUnicodeBoundRects : NULL;
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 4c8df82..fb4402b 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -728,7 +728,7 @@ namespace drawinglayer
Adding support...
OOps, the necessary helper stuff is in svx/source/form/formpdxexport.cxx in namespace
svxform. Have to talk to FS if this has to be like that. Especially since
- ::vcl::PDFWriter::AnyWidget is filled out, which is already part of vcl.
+ vcl::PDFWriter::AnyWidget is filled out, which is already part of vcl.
Wrote an eMail to FS, he is on vacation currently. I see no reason why not to move
that stuff to somewhere else, maybe tools or svtools ?!? We will see...
Moved to toolkit, so i have to link against it. I tried VCL first, but it did
@@ -901,7 +901,7 @@ namespace drawinglayer
// PDF export. Emulate data handling from UnoControlPDFExportContact
// I have now moved describePDFControl to toolkit, thus i can implement the PDF
// form control support now as follows
- ::std::unique_ptr< ::vcl::PDFWriter::AnyWidget > pPDFControl(
+ ::std::unique_ptr< vcl::PDFWriter::AnyWidget > pPDFControl(
::toolkitform::describePDFControl( rXControl, *mpPDFExtOutDevData ) );
if(pPDFControl.get())
diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx
index 2dd3d9d..7f0af9e 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -103,7 +103,7 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew(OUString("c:\\test_content.png"), StreamMode::WRITE|StreamMode::TRUNC);
- ::vcl::PNGWriter aPNGWriter(aContent);
+ vcl::PNGWriter aPNGWriter(aContent);
aPNGWriter.Write(aNew);
}
#endif
@@ -133,7 +133,7 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew(OUString("c:\\test_alpha.png"), StreamMode::WRITE|StreamMode::TRUNC);
- ::vcl::PNGWriter aPNGWriter(aAlpha);
+ vcl::PNGWriter aPNGWriter(aAlpha);
aPNGWriter.Write(aNew);
}
#endif
@@ -144,7 +144,7 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew(OUString("c:\\test_combined.png"), StreamMode::WRITE|StreamMode::TRUNC);
- ::vcl::PNGWriter aPNGWriter(aRetval);
+ vcl::PNGWriter aPNGWriter(aRetval);
aPNGWriter.Write(aNew);
}
#endif
diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl
index 55e5861..c49a788 100644
--- a/extensions/source/dbpilots/unoautopilot.inl
+++ b/extensions/source/dbpilots/unoautopilot.inl
@@ -96,7 +96,7 @@ template <class TYPE, class SERVICEINFO>
template <class TYPE, class SERVICEINFO>
-VclPtr<Dialog> OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(::vcl::Window* _pParent)
+VclPtr<Dialog> OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(vcl::Window* _pParent)
{
return VclPtr<TYPE>::Create(_pParent, m_xObjectModel, m_aContext);
}
diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
index baeba80..9c1f5cc 100644
--- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
@@ -72,7 +72,7 @@ OUString CFURLtoOSLURL( CFURLRef i_xURL );
class MacPluginComm :
public PluginComm,
- public ::vcl::SolarThreadExecutor
+ public vcl::SolarThreadExecutor
{
enum CallType {
diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
index 948fe62..555d400 100644
--- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
@@ -59,7 +59,7 @@
class PluginComm_Impl :
public PluginComm,
- public ::vcl::SolarThreadExecutor
+ public vcl::SolarThreadExecutor
{
enum CallType {
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index dcfac41..a9faaa8 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-using namespace ::vcl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index 0204273..415ee43 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -25,7 +25,6 @@
#include <svl/solar.hrc>
#include <com/sun/star/view/XRenderable.hpp>
-using namespace ::vcl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 4b1b76f..7c065a4 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -76,7 +76,6 @@
#include "com/sun/star/graphic/XGraphicProvider.hpp"
#include <boost/scoped_ptr.hpp>
-using namespace ::vcl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -379,7 +378,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
INetURLObject aURL( rFile );
bool bRet = false;
- std::set< PDFWriter::ErrorCode > aErrors;
+ std::set< vcl::PDFWriter::ErrorCode > aErrors;
if( aURL.GetProtocol() != INetProtocol::File )
{
@@ -398,7 +397,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
VCLXDevice* pXDevice = new VCLXDevice;
OUString aPageRange;
Any aSelection;
- PDFWriter::PDFWriterContext aContext;
+ vcl::PDFWriter::PDFWriterContext aContext;
OUString aOpenPassword, aPermissionPassword;
Reference< beans::XMaterialHolder > xEnc;
Sequence< beans::NamedValue > aPreparedPermissionPassword;
@@ -566,10 +565,10 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
{
default:
case 0:
- aContext.Version = PDFWriter::PDF_1_4;
+ aContext.Version = vcl::PDFWriter::PDF_1_4;
break;
case 1:
- aContext.Version = PDFWriter::PDF_A_1;
+ aContext.Version = vcl::PDFWriter::PDF_A_1;
//force the tagged PDF as well
mbUseTaggedPDF = true;
//force disabling of form conversion
@@ -600,32 +599,32 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
{
default:
case 0:
- aContext.PDFDocumentMode = PDFWriter::ModeDefault;
+ aContext.PDFDocumentMode = vcl::PDFWriter::ModeDefault;
break;
case 1:
- aContext.PDFDocumentMode = PDFWriter::UseOutlines;
+ aContext.PDFDocumentMode = vcl::PDFWriter::UseOutlines;
break;
case 2:
- aContext.PDFDocumentMode = PDFWriter::UseThumbs;
+ aContext.PDFDocumentMode = vcl::PDFWriter::UseThumbs;
break;
}
switch( mnPDFDocumentAction )
{
default:
case 0:
- aContext.PDFDocumentAction = PDFWriter::ActionDefault;
+ aContext.PDFDocumentAction = vcl::PDFWriter::ActionDefault;
break;
case 1:
- aContext.PDFDocumentAction = PDFWriter::FitInWindow;
+ aContext.PDFDocumentAction = vcl::PDFWriter::FitInWindow;
break;
case 2:
- aContext.PDFDocumentAction = PDFWriter::FitWidth;
+ aContext.PDFDocumentAction = vcl::PDFWriter::FitWidth;
break;
case 3:
- aContext.PDFDocumentAction = PDFWriter::FitVisible;
+ aContext.PDFDocumentAction = vcl::PDFWriter::FitVisible;
break;
case 4:
- aContext.PDFDocumentAction = PDFWriter::ActionZoom;
+ aContext.PDFDocumentAction = vcl::PDFWriter::ActionZoom;
aContext.Zoom = mnZoom;
break;
}
@@ -634,23 +633,23 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
{
default:
case 0:
- aContext.PageLayout = PDFWriter::DefaultLayout;
+ aContext.PageLayout = vcl::PDFWriter::DefaultLayout;
break;
case 1:
- aContext.PageLayout = PDFWriter::SinglePage;
+ aContext.PageLayout = vcl::PDFWriter::SinglePage;
break;
case 2:
- aContext.PageLayout = PDFWriter::Continuous;
+ aContext.PageLayout = vcl::PDFWriter::Continuous;
break;
case 3:
- aContext.PageLayout = PDFWriter::ContinuousFacing;
+ aContext.PageLayout = vcl::PDFWriter::ContinuousFacing;
break;
}
aContext.FirstPageLeft = mbFirstPageLeft;
//check if PDF/A, which does not allow encryption
- if( aContext.Version != PDFWriter::PDF_A_1 )
+ if( aContext.Version != vcl::PDFWriter::PDF_A_1 )
{
//set values needed in encryption
//set encryption level, fixed, but here it can set by the UI if needed.
@@ -712,7 +711,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
aContext.Encryption.CanCopyOrExtract = mbCanCopyOrExtract;
aContext.Encryption.CanExtractForAccessibility = mbCanExtractForAccessibility;
if( mbEncrypt && ! xEnc.is() )
- xEnc = PDFWriter::InitEncryption( aPermissionPassword, aOpenPassword, aContext.Encryption.Security128bit );
+ xEnc = vcl::PDFWriter::InitEncryption( aPermissionPassword, aOpenPassword, aContext.Encryption.Security128bit );
if( mbEncrypt && !aPermissionPassword.isEmpty() && ! aPreparedPermissionPassword.getLength() )
aPreparedPermissionPassword = comphelper::OStorageHelper::CreatePackageEncryptionData( aPermissionPassword );
}
@@ -729,17 +728,17 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
switch( mnFormsFormat )
{
case 1:
- aContext.SubmitFormat = PDFWriter::PDF;
+ aContext.SubmitFormat = vcl::PDFWriter::PDF;
break;
case 2:
- aContext.SubmitFormat = PDFWriter::HTML;
+ aContext.SubmitFormat = vcl::PDFWriter::HTML;
break;
case 3:
- aContext.SubmitFormat = PDFWriter::XML;
+ aContext.SubmitFormat = vcl::PDFWriter::XML;
break;
default:
case 0:
- aContext.SubmitFormat = PDFWriter::FDF;
+ aContext.SubmitFormat = vcl::PDFWriter::FDF;
break;
}
aContext.AllowDuplicateFieldNames = mbAllowDuplicateFieldNames;
@@ -759,25 +758,25 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
default:
//default: URI, without fragment conversion (the bookmark in PDF may not work)
case 0:
- aContext.DefaultLinkAction = PDFWriter::URIAction;
+ aContext.DefaultLinkAction = vcl::PDFWriter::URIAction;
break;
//view PDF through the reader application
case 1:
aContext.ForcePDFAction = true;
- aContext.DefaultLinkAction = PDFWriter::LaunchAction;
+ aContext.DefaultLinkAction = vcl::PDFWriter::LaunchAction;
break;
//view PDF through an Internet browser
case 2:
- aContext.DefaultLinkAction = PDFWriter::URIActionDestination;
+ aContext.DefaultLinkAction = vcl::PDFWriter::URIActionDestination;
break;
}
aContext.ConvertOOoTargetToPDFTarget = mbConvertOOoTargetToPDFTarget;
// check for Link Launch action, not allowed on PDF/A-1
// this code chunk checks when the filter is called from scripting
- if( aContext.Version == PDFWriter::PDF_A_1 &&
- aContext.DefaultLinkAction == PDFWriter::LaunchAction )
+ if( aContext.Version == vcl::PDFWriter::PDF_A_1 &&
+ aContext.DefaultLinkAction == vcl::PDFWriter::LaunchAction )
{ //force the similar allowed URI action
- aContext.DefaultLinkAction = PDFWriter::URIActionDestination;
+ aContext.DefaultLinkAction = vcl::PDFWriter::URIActionDestination;
//and remove the remote goto action forced on PDF file
aContext.ForcePDFAction = false;
}
@@ -792,7 +791,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
aContext.SignTSA = msSignTSA;
// all context data set, time to create the printing device
- boost::scoped_ptr<PDFWriter> pPDFWriter(new PDFWriter( aContext, xEnc ));
+ boost::scoped_ptr<vcl::PDFWriter> pPDFWriter(new vcl::PDFWriter( aContext, xEnc ));
OutputDevice* pOut = pPDFWriter->GetReferenceDevice();
DBG_ASSERT( pOut, "PDFExport::Export: no reference device" );
@@ -980,14 +979,14 @@ uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL PDFEr
} // namespace
-void PDFExport::showErrors( const std::set< PDFWriter::ErrorCode >& rErrors )
+void PDFExport::showErrors( const std::set< vcl::PDFWriter::ErrorCode >& rErrors )
{
if( ! rErrors.empty() && mxIH.is() )
{
task::PDFExportException aExc;
aExc.ErrorCodes.realloc( sal_Int32(rErrors.size()) );
sal_Int32 i = 0;
- for( std::set< PDFWriter::ErrorCode >::const_iterator it = rErrors.begin();
+ for( std::set< vcl::PDFWriter::ErrorCode >::const_iterator it = rErrors.begin();
it != rErrors.end(); ++it, i++ )
{
aExc.ErrorCodes.getArray()[i] = (sal_Int32)*it;
@@ -999,7 +998,7 @@ void PDFExport::showErrors( const std::set< PDFWriter::ErrorCode >& rErrors )
-bool PDFExport::ImplExportPage( PDFWriter& rWriter, PDFExtOutDevData& rPDFExtOutDevData, const GDIMetaFile& rMtf )
+bool PDFExport::ImplExportPage( vcl::PDFWriter& rWriter, vcl::PDFExtOutDevData& rPDFExtOutDevData, const GDIMetaFile& rMtf )
{
const Size aSizePDF( OutputDevice::LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_POINT ) );
Point aOrigin;
@@ -1041,10 +1040,10 @@ bool PDFExport::ImplExportPage( PDFWriter& rWriter, PDFExtOutDevData& rPDFExtOut
-void PDFExport::ImplWriteWatermark( PDFWriter& rWriter, const Size& rPageSize )
+void PDFExport::ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size& rPageSize )
{
OUString aText( "Watermark" );
- Font aFont( OUString( "Helvetica" ), Size( 0, 3*rPageSize.Height()/4 ) );
+ vcl::Font aFont( OUString( "Helvetica" ), Size( 0, 3*rPageSize.Height()/4 ) );
aFont.SetItalic( ITALIC_NONE );
aFont.SetWidthType( WIDTH_NORMAL );
aFont.SetWeight( WEIGHT_NORMAL );
diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx
index 5123bdc..1015322 100644
--- a/filter/source/pdf/pdfexport.hxx
+++ b/filter/source/pdf/pdfexport.hxx
@@ -99,7 +99,7 @@ private:
sal_Int32 mnDefaultLinkAction;
bool mbConvertOOoTargetToPDFTarget;
bool mbExportBmkToDest;
- bool ImplExportPage( ::vcl::PDFWriter& rWriter, ::vcl::PDFExtOutDevData& rPDFExtOutDevData,
+ bool ImplExportPage( vcl::PDFWriter& rWriter, vcl::PDFExtOutDevData& rPDFExtOutDevData,
const GDIMetaFile& rMtf );
bool mbSignPDF;
@@ -110,7 +110,7 @@ private:
Reference< security::XCertificate > maSignCertificate;
OUString msSignTSA;
- void ImplWriteWatermark( ::vcl::PDFWriter& rWriter, const Size& rPageSize );
+ void ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size& rPageSize );
public:
PDFExport( const Reference< XComponent >& rxSrcDoc,
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index 764fc89..c4417f5 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -33,7 +33,6 @@
#define SVG_DIALOG_IMPLEMENTATION_NAME SVG_DIALOG_SERVICE_NAME
#define SVG_FILTER_DATA_NAME "FilterData"
-using namespace ::vcl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index 231639a..cc2a556 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -139,7 +139,7 @@ void SVGFontExport::implCollectGlyphs()
{
GlyphSet& rGlyphSet = implGetGlyphSet( pVDev->GetFont() );
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBI(
- ::vcl::unohelper::CreateBreakIterator() );
+ vcl::unohelper::CreateBreakIterator() );
if( xBI.is() )
{
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 5943732..cbcc299 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2496,7 +2496,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
}
else
{
- ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBI( ::vcl::unohelper::CreateBreakIterator() );
+ ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBI( vcl::unohelper::CreateBreakIterator() );
const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale();
sal_Int32 nCurPos = 0, nLastPos = 0, nX = aPos.X();
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 0a23fa6..9367901 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -387,7 +387,7 @@ private:
Timer m_aTimer;
/** @short make our dispatch asynchronous ... if required to do so! */
- ::vcl::EventPoster m_aAsyncDispatcher;
+ vcl::EventPoster m_aAsyncDispatcher;
/** @see DispatchParams
*/
diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx
index cb47ade..f42bc2a 100644
--- a/include/svtools/acceleratorexecute.hxx
+++ b/include/svtools/acceleratorexecute.hxx
@@ -106,7 +106,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit
/** @deprecated
replaced by internal class AsyncAccelExec ...
remove this resource here if we go forwards to next major */
- ::vcl::EventPoster m_aAsyncCallback;
+ vcl::EventPoster m_aAsyncCallback;
// interface
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 4fbda0b..6331887 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -238,8 +238,8 @@ class SVT_DLLPUBLIC SvTreeListBox
,public SvListView
,public DropTargetHelper
,public DragSourceHelper
- ,public ::vcl::IMnemonicEntryList
- ,public ::vcl::ISearchableStringList
+ ,public vcl::IMnemonicEntryList
+ ,public vcl::ISearchableStringList
{
friend class SvImpLBox;
friend class TreeControlPeer;
@@ -364,9 +364,9 @@ protected:
virtual void ExecuteSearchEntry( const void* _pEntry ) const SAL_OVERRIDE;
// ISearchableStringList
- virtual ::vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const SAL_OVERRIDE;
- virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const SAL_OVERRIDE;
- virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ) SAL_OVERRIDE;
+ virtual vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const SAL_OVERRIDE;
+ virtual vcl::StringEntryIdentifier NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const SAL_OVERRIDE;
+ virtual void SelectEntry( vcl::StringEntryIdentifier _entry ) SAL_OVERRIDE;
public:
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index e945f0b..6310077 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -34,18 +34,13 @@
#include <svx/svxdllapi.h>
#include <deque>
-class VirtualDevice;
class OutputDevice;
-namespace vcl { class Region; }
-namespace vcl { class Window; }
class SdrHdlList;
class SdrMarkView;
class SdrObject;
class SdrPageView;
class MouseEvent;
-
-
// Every object must be able to create its handles. They will be fetched on
// selection, registered at the View and made visible.
// Wird ein Handle von der Maus beruehrt (IsHit()), so wird von der View der
diff --git a/include/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx
index 10300d8..569372f 100644
--- a/include/toolkit/helper/formpdfexport.hxx
+++ b/include/toolkit/helper/formpdfexport.hxx
@@ -42,7 +42,7 @@ namespace toolkitform
*/
std::unique_ptr<vcl::PDFWriter::AnyWidget> TOOLKIT_DLLPUBLIC describePDFControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl,
- ::vcl::PDFExtOutDevData& i_pdfExportData
+ vcl::PDFExtOutDevData& i_pdfExportData
);
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 4d1f903..f3fd702 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -37,7 +37,7 @@ class StyleSettings;
class VCL_DLLPUBLIC Control : public vcl::Window
{
protected:
- ::vcl::ImplControlData* mpControlData;
+ vcl::ImplControlData* mpControlData;
private:
bool mbHasControlFocus;
@@ -61,7 +61,7 @@ protected:
/// determines whether we currently have layout data
bool HasLayoutData() const;
/// returns the current layout data
- ::vcl::ControlLayoutData*
+ vcl::ControlLayoutData*
GetLayoutData() const;
/** this calls both our event listeners, and a specified handler
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index da9ae54..9c91995 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -133,8 +133,8 @@ public:
{ return !(Font::operator==( rFont )); }
bool IsSameInstance( const Font& ) const;
- friend VCL_DLLPUBLIC SvStream& ::ReadFont( SvStream& rIStm, ::vcl::Font& );
- friend VCL_DLLPUBLIC SvStream& ::WriteFont( SvStream& rOStm, const ::vcl::Font& );
+ friend VCL_DLLPUBLIC SvStream& ::ReadFont( SvStream& rIStm, vcl::Font& );
+ friend VCL_DLLPUBLIC SvStream& ::WriteFont( SvStream& rOStm, const vcl::Font& );
static Font identifyFont( const void* pBuffer, sal_uInt32 nLen );
};
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index 08da855..ccefc62 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -269,7 +269,7 @@ namespace vcl
\<do something with xFactory>
*/
template <typename I>
- class DeleteUnoReferenceOnDeinit : public ::vcl::DeleteOnDeinitBase
+ class DeleteUnoReferenceOnDeinit : public vcl::DeleteOnDeinitBase
{
::com::sun::star::uno::Reference<I> m_xI;
virtual void doCleanup() SAL_OVERRIDE { set(NULL); }
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 16f44b8..4259258 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -940,11 +940,11 @@ public:
void DrawText( const Rectangle& rRect,
const OUString& rStr, sal_uInt16 nStyle = 0,
MetricVector* pVector = NULL, OUString* pDisplayText = NULL,
- ::vcl::ITextLayout* _pTextLayout = NULL );
+ vcl::ITextLayout* _pTextLayout = NULL );
static void ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect,
const OUString& rOrigStr, sal_uInt16 nStyle,
- MetricVector* pVector, OUString* pDisplayText, ::vcl::ITextLayout& _rLayout );
+ MetricVector* pVector, OUString* pDisplayText, vcl::ITextLayout& _rLayout );
void ImplDrawText( SalLayout& );
@@ -974,7 +974,7 @@ public:
Rectangle GetTextRect( const Rectangle& rRect,
const OUString& rStr, sal_uInt16 nStyle = TEXT_DRAW_WORDBREAK,
TextRectInfo* pInfo = NULL,
- const ::vcl::ITextLayout* _pTextLayout = NULL ) const;
+ const vcl::ITextLayout* _pTextLayout = NULL ) const;
/** Return the exact bounding rectangle of rStr.
@@ -1157,7 +1157,7 @@ private:
SAL_DLLPRIVATE static bool ImplIsUnderlineAbove( const vcl::Font& );
static
- SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout );
+ SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, sal_uInt16 nStyle, const vcl::ITextLayout& _rLayout );
///@}
@@ -1258,7 +1258,7 @@ private:
static
SAL_DLLPRIVATE OUString ImplGetEllipsisString( const OutputDevice& rTargetDevice, const OUString& rStr,
- long nMaxWidth, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout );
+ long nMaxWidth, sal_uInt16 nStyle, const vcl::ITextLayout& _rLayout );
SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 );
SAL_DLLPRIVATE void ImplDrawEmphasisMarks( SalLayout& );
diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx
index 3c33172..d68b4fa 100644
--- a/include/vcl/quickselectionengine.hxx
+++ b/include/vcl/quickselectionengine.hxx
@@ -36,7 +36,7 @@ namespace vcl
//= ISearchableStringList
- // TODO: consolidate this with ::vcl::IMnemonicEntryList
+ // TODO: consolidate this with vcl::IMnemonicEntryList
class SAL_NO_VTABLE VCL_DLLPUBLIC ISearchableStringList
{
public:
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index e45d9da..531e169 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -41,7 +41,7 @@ namespace rptui
/** This class defines the scrollable area of the report design. It includes
the h-ruler and the sections, and end marker. Not the start marker.
*/
- typedef ::vcl::Window OScrollWindowHelper_BASE;
+ typedef vcl::Window OScrollWindowHelper_BASE;
class OScrollWindowHelper : public ::cppu::BaseMutex
, public OScrollWindowHelper_BASE/*TabPage*/
, public ::comphelper::OPropertyChangeListener
diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx
index 3fa94d7..1838d99 100644
--- a/reportdesign/source/ui/inc/UITools.hxx
+++ b/reportdesign/source/ui/inc/UITools.hxx
@@ -126,7 +126,7 @@ namespace rptui
::comphelper::mem_fun(&TaskPaneList::AddWindow)
::comphelper::mem_fun(&TaskPaneList::RemoveWindow)
*/
- void notifySystemWindow(::vcl::Window* pWindow, ::vcl::Window* pToRegister, const ::comphelper::mem_fun1_t<TaskPaneList, ::vcl::Window*>& rMemFunc);
+ void notifySystemWindow(vcl::Window* pWindow, vcl::Window* pToRegister, const ::comphelper::mem_fun1_t<TaskPaneList, vcl::Window*>& rMemFunc);
const sal_Int16 ISOVER_IGNORE_CUSTOMSHAPES = 1;
@@ -176,7 +176,7 @@ namespace rptui
@param _aZoom the zoom scale
@param _rWindow where to set the map mode
*/
- void setZoomFactor(const Fraction& _aZoom, ::vcl::Window& _rWindow);
+ void setZoomFactor(const Fraction& _aZoom, vcl::Window& _rWindow);
}
#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_UITOOLS_HXX
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 0e58087..e11b960 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -70,7 +70,7 @@ class ScPrintUIOptions;
class ScSheetSaveData;
class SC_DLLPUBLIC ScModelObj : public SfxBaseModel,
- public ::vcl::ITiledRenderable,
+ public vcl::ITiledRenderable,
public com::sun::star::sheet::XSpreadsheetDocument,
public com::sun::star::document::XActionLockable,
public com::sun::star::sheet::XCalculatable,
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 9eb6355..6a8db74 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -528,7 +528,7 @@ void ScAccessibleContextBase::CommitFocusGained() const
CommitChange(aEvent);
- ::vcl::unohelper::NotifyAccessibleStateEventGlobally(aEvent);
+ vcl::unohelper::NotifyAccessibleStateEventGlobally(aEvent);
}
void ScAccessibleContextBase::CommitFocusLost() const
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index c1a2b82..2d5acaf 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -155,7 +155,7 @@ public:
/** Starts the text conversion (hangul/hanja or Chinese simplified/traditional)
for the current viewshell */
void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage,
- const ::vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive );
+ const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive );
/** This is called internally when text conversion is started.
The position of current view mode/page/object/caret position
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 394f62f..c9acf89 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -446,7 +446,7 @@ public:
static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false );
SAL_DLLPRIVATE SdIMapInfo* GetIMapInfo( SdrObject* pObject ) const;
- SAL_DLLPRIVATE IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const ::vcl::Window& rCmpWnd );
+ SAL_DLLPRIVATE IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const vcl::Window& rCmpWnd );
SAL_DLLPRIVATE CharClass* GetCharClass() const { return mpCharClass; }
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 354942c..149378b 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -965,7 +965,7 @@ SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const
IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
const Point& rWinPoint,
- const ::vcl::Window& /* rCmpWnd */ )
+ const vcl::Window& /* rCmpWnd */ )
{
SdIMapInfo* pIMapInfo = GetIMapInfo( pObj );
IMapObject* pIMapObj = NULL;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 431c75b..da9ba62 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2278,9 +2278,9 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot
}
}
-::vcl::Window * createCustomAnimationPanel( ::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame )
+vcl::Window * createCustomAnimationPanel( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame )
{
- ::vcl::Window* pWindow = 0;
+ vcl::Window* pWindow = 0;
DrawDocShell* pDocSh = rBase.GetDocShell();
if( pDocSh )
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 917a53e..274929e 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -1093,9 +1093,9 @@ IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback)
return 0;
}
-::vcl::Window * createSlideTransitionPanel( ::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame )
+vcl::Window * createSlideTransitionPanel( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame )
{
- ::vcl::Window* pWindow = 0;
+ vcl::Window* pWindow = 0;
DrawDocShell* pDocSh = rBase.GetDocShell();
if( pDocSh )
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index d53c544..036e682 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -82,7 +82,7 @@ private:
VclPtr<AnnotationWindow> mpAnnotationWindow;
Color maColor;
int mnIndex;
- const ::vcl::Font& mrFont;
+ const vcl::Font& mrFont;
Size maSize;
ImplSVEvent * mnClosePopupEvent;
VclPtr<vcl::Window> mpListenWindow;
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 801f7f2..8d62891 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -351,7 +351,7 @@ void SAL_CALL SlideLayoutController::initialize( const css::uno::Sequence< css::
}
}
-VclPtr< ::vcl::Window> SlideLayoutController::createPopupWindow( ::vcl::Window* pParent )
+VclPtr<vcl::Window> SlideLayoutController::createPopupWindow( vcl::Window* pParent )
{
return VclPtr<sd::LayoutToolbarMenu>::Create( *this, m_xFrame, pParent, mbInsertPage );
}
diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx
index 7049c5b..2c8a7dc 100644
--- a/sd/source/ui/dlg/assclass.cxx
+++ b/sd/source/ui/dlg/assclass.cxx
@@ -34,7 +34,7 @@ Assistent::Assistent(int nNoOfPages)
mpPageStatus[i] = true;
}
-bool Assistent::InsertControl(int nDestPage, ::vcl::Window* pUsedControl)
+bool Assistent::InsertControl(int nDestPage, vcl::Window* pUsedControl)
{
DBG_ASSERT( (nDestPage > 0) && (nDestPage <= mnPages), "Page not aviable!");
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index ad902b9..ead579c 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -279,7 +279,7 @@ bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const
return pDlg->IsInsertBefore();
}
-::vcl::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow()
+vcl::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow()
{
return (vcl::Window*)pDlg;
}
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index 9f70355..9692d6b 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -120,7 +120,7 @@ void SAL_CALL ChildWindowPane::disposing()
Pane::disposing();
}
-::vcl::Window* ChildWindowPane::GetWindow()
+vcl::Window* ChildWindowPane::GetWindow()
{
do
{
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
index 696724e..3d02f34 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -53,7 +53,7 @@ void Pane::disposing()
mpWindow = NULL;
}
-::vcl::Window* Pane::GetWindow()
+vcl::Window* Pane::GetWindow()
{
if (mxWindow.is())
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list