[Libreoffice-commits] core.git: 3 commits - include/unotools unotools/source vcl/source xmlhelp/Library_tvhlp1.mk xmlhelp/Library_ucpchelp1.mk xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Wed Jun 5 08:29:41 PDT 2013
include/unotools/pathoptions.hxx | 6 +++---
unotools/source/config/pathoptions.cxx | 12 +++++-------
vcl/source/window/dialog.cxx | 8 ++------
xmlhelp/Library_tvhlp1.mk | 1 -
xmlhelp/Library_ucpchelp1.mk | 1 -
xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx | 5 -----
xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx | 11 ++---------
7 files changed, 12 insertions(+), 32 deletions(-)
New commits:
commit 496a2c2e46ca2afdb6a81a2b60b7b1bd89b21d1d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jun 5 17:26:55 2013 +0200
Drop unused XInitialization from implementation
...now that it has been dropped from the service declaration with
6a12e13870f15df93d2627f1538f7c64ca46e9e5 "fdo#46808, Convert
XMLSignatureTemplate service to new style"---appears to be nonsense that had
been in there "since the beginning."
Change-Id: I4e4d3649f1aa0dacebdc8bdcee0348cee294ab89
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index 15cb47c..4e095e0 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -104,11 +104,6 @@ void SAL_CALL XMLSignatureTemplateImpl::setStatus(
return m_nStatus;
}
-/* XInitialization */
-void SAL_CALL XMLSignatureTemplateImpl :: initialize( const Sequence< Any >& /*aArguments*/ ) throw( Exception, RuntimeException ) {
- // TBD
-} ;
-
/* XServiceInfo */
OUString SAL_CALL XMLSignatureTemplateImpl :: getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
index 87dba97..e471e97 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
@@ -23,22 +23,20 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
#include <vector>
-class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper3<
+class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper2<
::com::sun::star::xml::crypto::XXMLSignatureTemplate ,
- ::com::sun::star::lang::XInitialization ,
::com::sun::star::lang::XServiceInfo >
{
private :
@@ -83,11 +81,6 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper3<
SAL_CALL getStatus( )
throw (::com::sun::star::uno::RuntimeException);
- //Methods from XInitialization
- virtual void SAL_CALL initialize(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments
- ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
-
//Methods from XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
commit 3d4609d944b6bba3a135233054a0c396b29d7679
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jun 5 17:12:39 2013 +0200
Some String -> OUString
...to get rid of having to additionally link some libs against tl from
27c6434fccfec5fb4184c1efa2057595c8716fad "fdo#46808, Replace usage of
SpecialConfigManager" again.
Change-Id: Ica161a4f0da320858b6a3901a5a6907737c779f4
diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx
index ad1d16d..8b5f9da 100644
--- a/include/unotools/pathoptions.hxx
+++ b/include/unotools/pathoptions.hxx
@@ -117,9 +117,9 @@ public:
void SetUserConfigPath( const String& rPath );
void SetWorkPath( const String& rPath );
- String SubstituteVariable( const String& rVar ) const;
- String ExpandMacros( const String& rPath ) const;
- String UseVariable( const String& rVar ) const;
+ OUString SubstituteVariable( const OUString& rVar ) const;
+ OUString ExpandMacros( const OUString& rPath ) const;
+ OUString UseVariable( const OUString& rVar ) const;
sal_Bool SearchFile( String& rIniFile, Paths ePath = PATH_USERCONFIG );
const LanguageTag& GetLanguageTag() const;
sal_Bool IsReadonly() const;
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 8a56dab..1cd2c54 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -815,25 +815,23 @@ void SvtPathOptions::SetWorkPath( const String& rPath )
// -----------------------------------------------------------------------
-String SvtPathOptions::SubstituteVariable( const String& rVar ) const
+OUString SvtPathOptions::SubstituteVariable( const OUString& rVar ) const
{
- String aRet = pImp->SubstVar( rVar );
- return aRet;
+ return pImp->SubstVar( rVar );
}
// -----------------------------------------------------------------------
-String SvtPathOptions::ExpandMacros( const String& rPath ) const
+OUString SvtPathOptions::ExpandMacros( const OUString& rPath ) const
{
return pImp->ExpandMacros( rPath );
}
// -----------------------------------------------------------------------
-String SvtPathOptions::UseVariable( const String& rPath ) const
+OUString SvtPathOptions::UseVariable( const OUString& rPath ) const
{
- String aRet = pImp->UsePathVariables( rPath );
- return aRet;
+ return pImp->UsePathVariables( rPath );
}
// -----------------------------------------------------------------------
diff --git a/xmlhelp/Library_tvhlp1.mk b/xmlhelp/Library_tvhlp1.mk
index 9ef9f20..58487dd 100644
--- a/xmlhelp/Library_tvhlp1.mk
+++ b/xmlhelp/Library_tvhlp1.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,tvhlp1,\
cppu \
cppuhelper \
sal \
- tl \
utl \
i18nlangtag \
))
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index 0c4aab9..f559cb1 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_libraries,ucpchelp1,\
cppuhelper \
helplinker \
sal \
- tl \
ucbhelper \
utl \
i18nlangtag \
commit c570e6d5b2c41374daf30ed90cb6de527dfc801b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jun 5 16:35:41 2013 +0200
Some clean up
Change-Id: Ia954b2c7f9cabb4b8a1e5ccf59b06e25af6a1ce1
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 266a4a7..cd79e74 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -478,8 +478,6 @@ Dialog::Dialog( WindowType nType )
ImplInitDialogData();
}
-#define RELPATH_SHARE_LAYER OUString("soffice.cfg")
-
OUString VclBuilderContainer::getUIRootDir()
{
/*to-do, check if user config has an override before using shared one, etc*/
@@ -494,12 +492,10 @@ OUString VclBuilderContainer::getUIRootDir()
sShareLayer = sShareLayer.copy(0, nPos);
// Note: May be an user uses URLs without a final slash! Check it ...
- nPos = sShareLayer.lastIndexOf('/');
- if (nPos != sShareLayer.getLength()-1)
+ if (!sShareLayer.endsWith("/"))
sShareLayer += "/";
- sShareLayer += RELPATH_SHARE_LAYER; // folder
- sShareLayer += "/";
+ sShareLayer += "soffice.cfg/";
/*to-do, can we merge all this foo with existing soffice.cfg finding code, etc*/
return sShareLayer;
}
More information about the Libreoffice-commits
mailing list