[Libreoffice-commits] core.git: 4 commits - include/vcl vcl/source

Chris Sherlock chris.sherlock79 at gmail.com
Thu Jan 7 18:47:36 PST 2016


 include/vcl/opengl/OpenGLHelper.hxx |    6 +++---
 vcl/source/image/ImageList.cxx      |    8 +++-----
 vcl/source/window/builder.cxx       |   16 +++++++---------
 vcl/source/window/menu.cxx          |    3 +--
 4 files changed, 14 insertions(+), 19 deletions(-)

New commits:
commit b07952a02ab847a7545af5d30ed2fb758fc3c2f3
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Jan 8 13:46:40 2016 +1100

    vcl: cleanup namespaces is vcl/source/window/menu.cxx
    
    Change-Id: Ia27b7c7aea0882ce62471f484971452cbb9ff374

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index a06962d..0b866be 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -82,7 +82,6 @@ struct MenuLayoutData : public ControlLayoutData
 
 }
 
-using namespace ::com::sun::star;
 using namespace vcl;
 
 #define EXTRAITEMHEIGHT     4
@@ -526,7 +525,7 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos )
     delete mpLayoutData, mpLayoutData = nullptr;
 }
 
-void Menu::InsertItem(const OUString& rCommand, const uno::Reference<frame::XFrame>& rFrame,
+void Menu::InsertItem(const OUString& rCommand, const css::uno::Reference<css::frame::XFrame>& rFrame,
                       MenuItemBits nBits, const OString &rIdent, sal_uInt16 nPos)
 {
     OUString aLabel(CommandInfoProvider::Instance().GetPopupLabelForCommand(rCommand, rFrame));
commit 9619edae4e50fde3a2fc61906fbbd3c704f3c15d
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Jan 8 13:44:06 2016 +1100

    vcl: cleanup namespaces is vcl/source/window/builder.cxx
    
    Change-Id: Ie7abebb4fad50e55793b9c1e99c4108c335a928b

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 2ee7ab9..cc11c28 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -40,8 +40,6 @@
 #include <window.h>
 #include <xmlreader/xmlreader.hxx>
 
-using namespace com::sun::star;
-
 #ifdef DISABLE_DYNLOADING
 #include <dlfcn.h>
 #endif
@@ -126,12 +124,12 @@ void VclBuilder::loadTranslations(const LanguageTag &rLanguageTag, const OUStrin
         OUString sZippedFile(rUri.copy(nLastSlash + 1, nEndName - nLastSlash - 1) + "/" + sLang + ".ui");
         try
         {
-            uno::Reference<packages::zip::XZipFileAccess2> xNameAccess =
-                packages::zip::ZipFileAccess::createWithURL(
+            css::uno::Reference<css::packages::zip::XZipFileAccess2> xNameAccess =
+                css::packages::zip::ZipFileAccess::createWithURL(
                         comphelper::getProcessComponentContext(), aTransBuf.makeStringAndClear());
             if (!xNameAccess.is())
                 continue;
-            uno::Reference<io::XInputStream> xInputStream(xNameAccess->getByName(sZippedFile), uno::UNO_QUERY);
+            css::uno::Reference<css::io::XInputStream> xInputStream(xNameAccess->getByName(sZippedFile), css::uno::UNO_QUERY);
             if (!xInputStream.is())
                 continue;
             OStringBuffer sStr;
@@ -149,7 +147,7 @@ void VclBuilder::loadTranslations(const LanguageTag &rLanguageTag, const OUStrin
             handleTranslations(reader);
             break;
         }
-        catch (const uno::Exception &)
+        catch (const css::uno::Exception &)
         {
         }
     }
@@ -172,7 +170,7 @@ namespace
 }
 #endif
 
-VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUString& sUIFile, const OString& sID, const uno::Reference<frame::XFrame>& rFrame)
+VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUString& sUIFile, const OString& sID, const css::uno::Reference<css::frame::XFrame>& rFrame)
     : m_sID(sID)
     , m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8))
     , m_pStringReplace(ResMgr::GetReadStringHook())
@@ -204,7 +202,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr
 
         handleChild(pParent, reader);
     }
-    catch (const uno::Exception &rExcept)
+    catch (const css::uno::Exception &rExcept)
     {
         SAL_WARN("vcl.layout", "Unable to read .ui file: " << rExcept.Message);
         throw;
@@ -871,7 +869,7 @@ namespace
         return sTooltipText;
     }
 
-    void setupFromActionName(Button *pButton, VclBuilder::stringmap &rMap, const uno::Reference<frame::XFrame>& rFrame)
+    void setupFromActionName(Button *pButton, VclBuilder::stringmap &rMap, const css::uno::Reference<css::frame::XFrame>& rFrame)
     {
         if (!rFrame.is())
             return;
commit e37fb68cc6a6ea1400113529306192717f2620a6
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Jan 8 13:40:13 2016 +1100

    vcl: get rid of rtl alias in include/vcl/opengl/OpenGLHelper.hxx
    
    Change-Id: I70df154ba599bcccfd8c4a0a567b7b565d957768

diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index a7f139c..5e1e86e 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -41,10 +41,10 @@ struct VCL_DLLPUBLIC OpenGLHelper
 
 public:
 
-    static rtl::OString GetDigest(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const rtl::OString& preamble = "" );
+    static OString GetDigest(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const OString& preamble = "" );
 
-    static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const OUString& rGeometryShaderName, const rtl::OString& preamble, const rtl::OString& rDigest );
-    static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const rtl::OString& preamble, const rtl::OString& rDigest );
+    static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const OUString& rGeometryShaderName, const OString& preamble, const OString& rDigest );
+    static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const OString& preamble, const OString& rDigest );
     static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const OUString& rGeometryShaderName);
     static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName);
 
commit 8e9c2f0a4f9c569a54a59a1538021c3c39b8408a
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Jan 8 13:37:06 2016 +1100

    vcl: cleanup namespaces in vcl/source/image/ImageList.cxx
    
    Change-Id: Iec667d4a9a650f4bc2f3a30e46b75d27643f8d00

diff --git a/vcl/source/image/ImageList.cxx b/vcl/source/image/ImageList.cxx
index 80806ec..4c88c99 100644
--- a/vcl/source/image/ImageList.cxx
+++ b/vcl/source/image/ImageList.cxx
@@ -37,8 +37,6 @@
 #include <rtl/strbuf.hxx>
 #endif
 
-using namespace ::com::sun::star;
-
 ImageList::ImageList( sal_uInt16 nInit, sal_uInt16 nGrow ) :
     mpImplData( nullptr ),
     mnInitSize( nInit ),
@@ -92,7 +90,7 @@ ImageList::ImageList( const ResId& rResId ) :
     }
 }
 
-ImageList::ImageList( const ::std::vector< OUString >& rNameVector,
+ImageList::ImageList( const std::vector< OUString >& rNameVector,
                       const OUString& rPrefix) :
     mpImplData( nullptr ),
     mnInitSize( 1 ),
@@ -391,11 +389,11 @@ OUString ImageList::GetImageName( sal_uInt16 nPos ) const
     return OUString();
 }
 
-void ImageList::GetImageNames( ::std::vector< OUString >& rNames ) const
+void ImageList::GetImageNames( std::vector< OUString >& rNames ) const
 {
     SAL_INFO( "vcl.gdi", "vcl: ImageList::GetImageNames" );
 
-    rNames = ::std::vector< OUString >();
+    rNames = std::vector< OUString >();
 
     if( mpImplData )
     {


More information about the Libreoffice-commits mailing list