diff options
Diffstat (limited to 'shell/source/backends/kdebe/kdecommonlayer.cxx')
| -rw-r--r-- | shell/source/backends/kdebe/kdecommonlayer.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/shell/source/backends/kdebe/kdecommonlayer.cxx b/shell/source/backends/kdebe/kdecommonlayer.cxx index d770c87013..44592e8933 100644 --- a/shell/source/backends/kdebe/kdecommonlayer.cxx +++ b/shell/source/backends/kdebe/kdecommonlayer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" #include "kdecommonlayer.hxx" -#include <vcl/kde_headers.h> +#include "kde_headers.h" #include <com/sun/star/configuration/backend/PropertyInfo.hpp> #ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_ #include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp> @@ -48,7 +48,7 @@ KDECommonLayer::KDECommonLayer(const uno::Reference<uno::XComponentContext>& xCo rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.configuration.backend.LayerDescriber")); - typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber; + typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber; uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager(); if( xServiceManager.is() ) { @@ -63,8 +63,8 @@ KDECommonLayer::KDECommonLayer(const uno::Reference<uno::XComponentContext>& xCo //------------------------------------------------------------------------------ -void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler) - throw ( backend::MalformedDataException, lang::NullPointerException, +void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler) + throw ( backend::MalformedDataException, lang::NullPointerException, lang::WrappedTargetException, uno::RuntimeException) { if( ! m_xLayerContentDescriber.is() ) @@ -73,7 +73,7 @@ void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHand "Could not create com.sun.star.configuration.backend.LayerContentDescriber Service" ) ), static_cast < backend::XLayer * > (this) ); } - + uno::Sequence<backend::PropertyInfo> aPropInfoList(3); sal_Int32 nProperties = 0; @@ -91,7 +91,7 @@ void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHand aPropInfoList[nProperties].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/ExternalMailer/Program") ); - aPropInfoList[nProperties].Type = rtl::OUString( + aPropInfoList[nProperties].Type = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "string" ) ); aPropInfoList[nProperties].Protected = sal_False; aPropInfoList[nProperties++].Value = uno::makeAny( sClientProgram ); @@ -109,14 +109,14 @@ void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHand aPropInfoList[nProperties].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/Font/SourceViewFont/FontName") ); - aPropInfoList[nProperties].Type = rtl::OUString( + aPropInfoList[nProperties].Type = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "string" ) ); aPropInfoList[nProperties].Protected = sal_False; aPropInfoList[nProperties++].Value = uno::makeAny( sFontName ); aPropInfoList[nProperties].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/Font/SourceViewFont/FontHeight") ); - aPropInfoList[nProperties].Type = rtl::OUString( + aPropInfoList[nProperties].Type = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "short" ) ); aPropInfoList[nProperties].Protected = sal_False; aPropInfoList[nProperties++].Value = uno::makeAny( nFontHeight ); @@ -130,7 +130,7 @@ void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHand //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL KDECommonLayer::getTimestamp(void) +rtl::OUString SAL_CALL KDECommonLayer::getTimestamp(void) throw (uno::RuntimeException) { // Return the value as timestamp to avoid regenerating the binary cache |