diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-04-28 23:09:13 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-04-30 07:27:52 +0300 |
commit | d883c12556a71c5d3719454b1f95809a505f0ace (patch) | |
tree | 6f0c1cc518a3727db95b72d609ec9db793041b20 /vcl | |
parent | d1ca0f4ed0e30394ce6759a20d4896651dd43051 (diff) |
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
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/dndlcon.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/ilstbox.hxx | 10 | ||||
-rw-r--r-- | vcl/inc/svdata.hxx | 2 | ||||
-rw-r--r-- | vcl/osx/salframeview.mm | 2 | ||||
-rw-r--r-- | vcl/qa/cppunit/canvasbitmaptest.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/ctrl.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/edit.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/ilstbox.cxx | 14 | ||||
-rw-r--r-- | vcl/source/gdi/font.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/image.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/pngread.cxx | 2 | ||||
-rw-r--r-- | vcl/source/helper/canvasbitmap.cxx | 2 | ||||
-rw-r--r-- | vcl/source/helper/canvastools.cxx | 4 | ||||
-rw-r--r-- | vcl/source/outdev/font.cxx | 15 | ||||
-rw-r--r-- | vcl/source/outdev/nativecontrols.cxx | 4 | ||||
-rw-r--r-- | vcl/source/outdev/text.cxx | 10 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_cb.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_im.cxx | 2 |
21 files changed, 47 insertions, 48 deletions
diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx index c365c3c511d7..b2febeee3337 100644 --- a/vcl/inc/dndlcon.hxx +++ b/vcl/inc/dndlcon.hxx @@ -29,7 +29,7 @@ #include <vcl/unohelp2.hxx> -class DNDListenerContainer : public ::vcl::unohelper::MutexHelper, +class DNDListenerContainer : public vcl::unohelper::MutexHelper, public ::cppu::WeakComponentImplHelper4< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer, \ ::com::sun::star::datatransfer::dnd::XDropTargetDragContext, diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 7e2410a04aad..4d653054db98 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -175,7 +175,7 @@ public: sal_Int32 FindFirstSelectable( sal_Int32 nPos, bool bForward = true ); }; -class ImplListBoxWindow : public Control, public ::vcl::ISearchableStringList +class ImplListBoxWindow : public Control, public vcl::ISearchableStringList { private: ImplEntryList* mpEntryList; ///< EntryList @@ -237,7 +237,7 @@ private: Link maFocusHdl; Link maListItemSelectHdl; - ::vcl::QuickSelectionEngine maQuickSelectionEngine; + vcl::QuickSelectionEngine maQuickSelectionEngine; protected: virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; @@ -373,9 +373,9 @@ public: protected: // 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; }; class ImplListBox : public Control diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 82ae80ebbde6..1b2796ee65a9 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -336,7 +336,7 @@ struct ImplSVData rtl::Reference< vcl::DisplayConnection > mxDisplayConnection; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxAccessBridge; - ::vcl::SettingsConfigItem* mpSettingsConfigItem; + vcl::SettingsConfigItem* mpSettingsConfigItem; std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList; std::unordered_map< int, OUString >* mpPaperNames; diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 4a5166333e67..2867295bbc6f 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -1734,7 +1734,7 @@ private: { if ( !mpReferenceWrapper ) { // some frames never become visible .. - ::vcl::Window *pWindow = mpFrame -> GetWindow(); + vcl::Window *pWindow = mpFrame -> GetWindow(); if ( ! pWindow ) return nil; diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 54faf897b807..a69460ba5a96 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -43,7 +43,7 @@ #include "canvasbitmap.hxx" using namespace ::com::sun::star; -using namespace ::vcl::unotools; +using namespace vcl::unotools; namespace com { namespace sun { namespace star { namespace rendering { diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index ca3539306540..07cbab812cc9 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1409,7 +1409,7 @@ void Application::SetUnoWrapper( UnoWrapperBase* pWrapper ) if( !pSVData->mxDisplayConnection.is() ) { - pSVData->mxDisplayConnection.set( new ::vcl::DisplayConnection ); + pSVData->mxDisplayConnection.set( new vcl::DisplayConnection ); pSVData->mxDisplayConnection->start(); } diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 2aaa2f122a3a..79c6933614cf 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -108,7 +108,7 @@ void Control::FillLayoutData() const void Control::CreateLayoutData() const { DBG_ASSERT( !mpControlData->mpLayoutData, "Control::CreateLayoutData: should be called with non-existent layout data only!" ); - mpControlData->mpLayoutData = new ::vcl::ControlLayoutData(); + mpControlData->mpLayoutData = new vcl::ControlLayoutData(); } bool Control::HasLayoutData() const @@ -116,7 +116,7 @@ bool Control::HasLayoutData() const return mpControlData && mpControlData->mpLayoutData != NULL; } -::vcl::ControlLayoutData* Control::GetLayoutData() const +vcl::ControlLayoutData* Control::GetLayoutData() const { return mpControlData->mpLayoutData; } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index ece4f5680af4..6b89146dd231 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1289,7 +1289,7 @@ void Edit::ImplCopyToSelectionClipboard() void Edit::ImplCopy( uno::Reference< datatransfer::clipboard::XClipboard >& rxClipboard ) { - ::vcl::unohelper::TextDataObject::CopyStringTo( GetSelected(), rxClipboard ); + vcl::unohelper::TextDataObject::CopyStringTo( GetSelected(), rxClipboard ); } void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxClipboard ) @@ -2884,7 +2884,7 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra if ( IsTracking() ) EndTracking(); // Vor D&D Tracking ausschalten - ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( GetSelected() ); + vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( GetSelected() ); sal_Int8 nActions = datatransfer::dnd::DNDConstants::ACTION_COPY; if ( !IsReadOnly() ) nActions |= datatransfer::dnd::DNDConstants::ACTION_MOVE; diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index c2d53ce022fc..1f6830b72a3f 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -1644,7 +1644,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) namespace { - static ::vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_Int32 _nPos, OUString& _out_entryText ) + static vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_Int32 _nPos, OUString& _out_entryText ) { OSL_PRECOND( ( _nPos != LISTBOX_ENTRY_NOTFOUND ), "lcl_getEntry: invalid position!" ); sal_Int32 nEntryCount( _rList.GetEntryCount() ); @@ -1652,30 +1652,30 @@ namespace _nPos = 0; _out_entryText = _rList.GetEntryText( _nPos ); - // ::vcl::StringEntryIdentifier does not allow for 0 values, but our position is 0-based + // vcl::StringEntryIdentifier does not allow for 0 values, but our position is 0-based // => normalize - return reinterpret_cast< ::vcl::StringEntryIdentifier >( _nPos + 1 ); + return reinterpret_cast< vcl::StringEntryIdentifier >( _nPos + 1 ); } - static sal_Int32 lcl_getEntryPos( ::vcl::StringEntryIdentifier _entry ) + static sal_Int32 lcl_getEntryPos( vcl::StringEntryIdentifier _entry ) { // our pos is 0-based, but StringEntryIdentifier does not allow for a NULL return static_cast< sal_Int32 >( reinterpret_cast< sal_Int64 >( _entry ) ) - 1; } } -::vcl::StringEntryIdentifier ImplListBoxWindow::CurrentEntry( OUString& _out_entryText ) const +vcl::StringEntryIdentifier ImplListBoxWindow::CurrentEntry( OUString& _out_entryText ) const { return lcl_getEntry( *GetEntryList(), ( mnCurrentPos == LISTBOX_ENTRY_NOTFOUND ) ? 0 : mnCurrentPos, _out_entryText ); } -::vcl::StringEntryIdentifier ImplListBoxWindow::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const +vcl::StringEntryIdentifier ImplListBoxWindow::NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const { sal_Int32 nNextPos = lcl_getEntryPos( _currentEntry ) + 1; return lcl_getEntry( *GetEntryList(), nNextPos, _out_entryText ); } -void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry ) +void ImplListBoxWindow::SelectEntry( vcl::StringEntryIdentifier _entry ) { sal_Int32 nSelect = lcl_getEntryPos( _entry ); if ( mpEntryList->IsEntryPosSelected( nSelect ) ) diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index f1c5c9cc1435..04fc54cad985 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -736,13 +736,13 @@ SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font ) return rOStm; } -SvStream& ReadFont( SvStream& rIStm, ::vcl::Font& rFont ) +SvStream& ReadFont( SvStream& rIStm, vcl::Font& rFont ) { rFont.MakeUnique(); return ReadImpl_Font( rIStm, *rFont.mpImplFont ); } -SvStream& WriteFont( SvStream& rOStm, const ::vcl::Font& rFont ) +SvStream& WriteFont( SvStream& rOStm, const vcl::Font& rFont ) { return WriteImpl_Font( rOStm, *rFont.mpImplFont ); } diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 6e335118da62..c57c53bb4f9b 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -549,7 +549,7 @@ Image ImageList::GetImage( sal_uInt16 nId ) const if (!aRet) { BitmapEx rBitmap; - bool res = ::vcl::ImageRepository::loadDefaultImage(rBitmap); + bool res = vcl::ImageRepository::loadDefaultImage(rBitmap); if (res) aRet = Image(rBitmap); } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 9ed2d19e1644..4848bf5d99d6 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -9385,7 +9385,7 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const OUString& rOrigStr, if ( nTextHeight ) { - ::vcl::DefaultTextLayout aLayout( *m_pReferenceDevice ); + vcl::DefaultTextLayout aLayout( *m_pReferenceDevice ); OutputDevice::ImplGetTextLines( aMultiLineInfo, nWidth, aStr, nStyle, aLayout ); nLines = nHeight/nTextHeight; nFormatLines = aMultiLineInfo.Count(); diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index fe275146ee35..d9352a79202c 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -1640,7 +1640,7 @@ sal_uInt32 PNGReaderImpl::ImplReadsal_uInt32() } PNGReader::PNGReader(SvStream& rIStream) : - mpImpl(new ::vcl::PNGReaderImpl(rIStream)) + mpImpl(new vcl::PNGReaderImpl(rIStream)) { } diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index ab3d48a6d9c5..a1ebb5d39732 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -33,7 +33,7 @@ #include <algorithm> -using namespace ::vcl::unotools; +using namespace vcl::unotools; using namespace ::com::sun::star; namespace diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 901527b36a34..f8dbf63ad841 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -67,7 +67,7 @@ namespace vcl uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/, const ::BitmapEx& inputBitmap ) { - SAL_INFO( "vcl.helper", "::vcl::unotools::xBitmapFromBitmapEx()" ); + SAL_INFO( "vcl.helper", "vcl::unotools::xBitmapFromBitmapEx()" ); return new vcl::unotools::VclCanvasBitmap( inputBitmap ); } @@ -183,7 +183,7 @@ namespace vcl ::BitmapEx bitmapExFromXBitmap( const uno::Reference< rendering::XIntegerReadOnlyBitmap >& xInputBitmap ) { - SAL_INFO( "vcl.helper", "::vcl::unotools::bitmapExFromXBitmap()" ); + SAL_INFO( "vcl.helper", "vcl::unotools::bitmapExFromXBitmap()" ); if( !xInputBitmap.is() ) return ::BitmapEx(); diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 27810d43ade9..61dadc4e52dc 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -59,7 +59,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::rtl; using namespace ::utl; -using namespace ::vcl; vcl::FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const { @@ -231,7 +230,7 @@ FontMetric OutputDevice::GetFontMetric() const FontMetric OutputDevice::GetFontMetric( const vcl::Font& rFont ) const { // select font, query metrics, select original font again - Font aOldFont = GetFont(); + vcl::Font aOldFont = GetFont(); const_cast<OutputDevice*>(this)->SetFont( rFont ); FontMetric aMetric( GetFontMetric() ); const_cast<OutputDevice*>(this)->SetFont( aOldFont ); @@ -265,7 +264,7 @@ bool OutputDevice::GetFontCharMap( FontCharMapPtr& rFontCharMap ) const return true; } -bool OutputDevice::GetFontCapabilities( FontCapabilities& rFontCapabilities ) const +bool OutputDevice::GetFontCapabilities( vcl::FontCapabilities& rFontCapabilities ) const { // we need a graphics if( !mpGraphics && !AcquireGraphics() ) @@ -773,8 +772,8 @@ void ImplFontSubstitute( OUString& rFontName ) } //hidpi TODO: This routine has hard-coded font-sizes that break places such as DialControl -Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, - sal_uLong nFlags, const OutputDevice* pOutDev ) +vcl::Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, + sal_uLong nFlags, const OutputDevice* pOutDev ) { if (!pOutDev) // default is NULL pOutDev = Application::GetDefaultDevice(); @@ -793,7 +792,7 @@ Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, else aSearch = rDefaults.getUserInterfaceFont( aLanguageTag ); // use the UI font as a fallback - Font aFont; + vcl::Font aFont; aFont.SetPitch( PITCH_VARIABLE ); switch ( nType ) @@ -1656,12 +1655,12 @@ bool OutputDevice::ImplNewFont() const if( (nNewWidth != nOrigWidth) && (nNewWidth != 0) ) { Size aOrigSize = maFont.GetSize(); - const_cast<Font&>(maFont).SetSize( Size( nNewWidth, aSize.Height() ) ); + const_cast<vcl::Font&>(maFont).SetSize( Size( nNewWidth, aSize.Height() ) ); mbMap = false; mbNewFont = true; ImplNewFont(); // recurse once using stretched width mbMap = true; - const_cast<Font&>(maFont).SetSize( aOrigSize ); + const_cast<vcl::Font&>(maFont).SetSize( aOrigSize ); } } diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx index ce7d9b524952..5a963c2a2b00 100644 --- a/vcl/source/outdev/nativecontrols.cxx +++ b/vcl/source/outdev/nativecontrols.cxx @@ -48,8 +48,8 @@ static bool EnableNativeWidget( const OutputDevice& i_rDevice ) case OUTDEV_VIRDEV: { - const ::vcl::ExtOutDevData* pOutDevData( i_rDevice.GetExtOutDevData() ); - const ::vcl::PDFExtOutDevData* pPDFData( dynamic_cast< const ::vcl::PDFExtOutDevData* >( pOutDevData ) ); + const vcl::ExtOutDevData* pOutDevData( i_rDevice.GetExtOutDevData() ); + const vcl::PDFExtOutDevData* pPDFData( dynamic_cast< const vcl::PDFExtOutDevData* >( pOutDevData ) ); if ( pPDFData != NULL ) return false; return true; diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 1cc48a32223b..79588dd1fdd7 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -494,7 +494,7 @@ void OutputDevice::ImplDrawText( SalLayout& rSalLayout ) long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, - sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ) + sal_uInt16 nStyle, const vcl::ITextLayout& _rLayout ) { DBG_ASSERTWARNING( nWidth >= 0, "ImplGetTextLines: nWidth <= 0!" ); @@ -1537,7 +1537,7 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth, void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect, const OUString& rOrigStr, sal_uInt16 nStyle, MetricVector* pVector, OUString* pDisplayText, - ::vcl::ITextLayout& _rLayout ) + vcl::ITextLayout& _rLayout ) { Color aOldTextColor; @@ -1834,7 +1834,7 @@ void OutputDevice::AddTextRectActions( const Rectangle& rRect, void OutputDevice::DrawText( const Rectangle& rRect, const OUString& rOrigStr, sal_uInt16 nStyle, MetricVector* pVector, OUString* pDisplayText, - ::vcl::ITextLayout* _pTextLayout ) + vcl::ITextLayout* _pTextLayout ) { if (mpOutDevData->mpRecordLayout) { @@ -1878,7 +1878,7 @@ void OutputDevice::DrawText( const Rectangle& rRect, const OUString& rOrigStr, s Rectangle OutputDevice::GetTextRect( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle, TextRectInfo* pInfo, - const ::vcl::ITextLayout* _pTextLayout ) const + const vcl::ITextLayout* _pTextLayout ) const { Rectangle aRect = rRect; @@ -2012,7 +2012,7 @@ OUString OutputDevice::GetEllipsisString( const OUString& rOrigStr, long nMaxWid } OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, const OUString& rOrigStr, long nMaxWidth, - sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ) + sal_uInt16 nStyle, const vcl::ITextLayout& _rLayout ) { OUString aStr = rOrigStr; sal_Int32 nIndex = _rLayout.GetTextBreak( aStr, nMaxWidth, 0, aStr.getLength() ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 90e64bd1bf3b..ac348f2ec1ad 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3795,7 +3795,7 @@ Reference< css::rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr // Create canvas instance with window handle - static ::vcl::DeleteUnoReferenceOnDeinit<XMultiComponentFactory> xStaticCanvasFactory( + static vcl::DeleteUnoReferenceOnDeinit<XMultiComponentFactory> xStaticCanvasFactory( css::rendering::CanvasFactory::create( xContext ) ); Reference<XMultiComponentFactory> xCanvasFactory(xStaticCanvasFactory.get()); diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 496c5769b902..4f3b910ee6af 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -507,7 +507,7 @@ StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *call_data) if( nLength ) aText = OUString( pMBString, nLength, osl_getThreadTextEncoding() ); } - ::vcl::I18NStatus::get().setStatusText( aText ); + vcl::I18NStatus::get().setStatusText( aText ); } #if OSL_DEBUG_LEVEL > 1 else @@ -523,7 +523,7 @@ void SwitchIMCallback (XIC, XPointer, XPointer call_data) { XIMSwitchIMNotifyCallbackStruct* pCallData = reinterpret_cast<XIMSwitchIMNotifyCallbackStruct*>(call_data); - ::vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) ); + vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) ); } // vii. destroy callbacks: internally disable all IC/IM calls diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index dcf11cde4cc5..ce8dee888aae 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -257,7 +257,7 @@ SalI18N_InputMethod::SalI18N_InputMethod( ) SalI18N_InputMethod::~SalI18N_InputMethod() { - ::vcl::I18NStatus::free(); + vcl::I18NStatus::free(); if ( mpStyles != NULL ) XFree( mpStyles ); if ( maMethod != NULL ) |