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

[Stephan Bergmann]

 include/sfx2/XmlIdRegistry.hxx  |    2 +-
 sfx2/source/doc/Metadatable.cxx |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit aeba9c26898ae7b6da814cf012a7c348e64393d7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 11 16:29:34 2014 +0100

    No need for GetElementByMetadataReference to be SAL_CALL
    
    Change-Id: I34615c87238d4e96b6c1e81e57fb0822c876b929

diff --git a/include/sfx2/XmlIdRegistry.hxx b/include/sfx2/XmlIdRegistry.hxx
index 3b1dff4..68d6199 100644
--- a/include/sfx2/XmlIdRegistry.hxx
+++ b/include/sfx2/XmlIdRegistry.hxx
@@ -53,7 +53,7 @@ public:
     virtual ~IXmlIdRegistry() { }
 
     virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::rdf::XMetadatable > SAL_CALL
+            ::com::sun::star::rdf::XMetadatable >
         GetElementByMetadataReference(
             const ::com::sun::star::beans::StringPair & i_rXmlId) const = 0;
 
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 3f44618..f2ae8f4 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -150,9 +150,10 @@ public:
 
     /** get the ODF element with the given metadata reference. */
     virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::rdf::XMetadatable > SAL_CALL
+            ::com::sun::star::rdf::XMetadatable >
         GetElementByMetadataReference(
-            const ::com::sun::star::beans::StringPair & i_rReference) const;
+            const ::com::sun::star::beans::StringPair & i_rReference) const
+        SAL_OVERRIDE;
 
     /** register an ODF element at a newly generated, unique metadata reference.
 
@@ -364,7 +365,7 @@ XmlIdRegistry::~XmlIdRegistry()
 {
 }
 
-::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable > SAL_CALL
+::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable >
 XmlIdRegistry::GetElementByMetadataReference(
     const beans::StringPair & i_rReference) const
 {