binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 5 -- binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx | 22 ++++----- binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx | 5 -- binfilter/bf_sw/source/ui/app/sw_docsh2.cxx | 1 binfilter/inc/bf_sw/swunodef.hxx | 41 ----------------- binfilter/inc/bf_sw/toxwrap.hxx | 17 +++---- 6 files changed, 23 insertions(+), 68 deletions(-)
New commits: commit b42b9adeeda6e859943c7167dbc30f285e14d73e Author: Thomas Arnhold <tho...@arnhold.org> Date: Mon Feb 20 20:51:40 2012 +0100 remove now unused swunodef.hxx diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx index d586a99..4890880 100644 --- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx +++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx @@ -64,7 +64,6 @@ #include <usrfld.hxx> #include <dbmgr.hxx> #include <docfld.hxx> -#include <swunodef.hxx> #include <legacysmgr/legacy_binfilters_smgr.hxx> namespace binfilter { diff --git a/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx b/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx index 13abcd7..267195f 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx @@ -55,7 +55,6 @@ #include <bf_svtools/svstdarr.hxx> #include <swunohelper.hxx> -#include <swunodef.hxx> #include <osl/diagnose.h> #include <legacysmgr/legacy_binfilters_smgr.hxx> namespace binfilter { diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx index 4758125..9f8179a 100644 --- a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx +++ b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx @@ -58,7 +58,6 @@ #include <bf_so3/svstor.hxx> #include <comphelper/classids.hxx> -#include <swunodef.hxx> #include <osl/diagnose.h> diff --git a/binfilter/inc/bf_sw/swunodef.hxx b/binfilter/inc/bf_sw/swunodef.hxx deleted file mode 100644 index b3097f2..0000000 --- a/binfilter/inc/bf_sw/swunodef.hxx +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SWUNODEF_HXX -#define _SWUNODEF_HXX -namespace binfilter { - -#define STAR_REFERENCE(aType) ::com::sun::star::uno::Reference< ::com::sun::star::aType > - -} //namespace binfilter -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/inc/bf_sw/toxwrap.hxx b/binfilter/inc/bf_sw/toxwrap.hxx index 3f5a219..19899c1 100644 --- a/binfilter/inc/bf_sw/toxwrap.hxx +++ b/binfilter/inc/bf_sw/toxwrap.hxx @@ -33,7 +33,6 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <swunodef.hxx> namespace com { namespace sun { namespace star { namespace i18n { class XExtendedIndexEntrySupplier; commit 823b60e8435a1d9237c2bf9591e47f179060cce2 Author: Thomas Arnhold <tho...@arnhold.org> Date: Mon Feb 20 20:47:08 2012 +0100 expand and remove macro STAR_REFERENCE diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx index c55379b..d586a99 100644 --- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx +++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx @@ -265,7 +265,7 @@ static int /*N*/ eLang != SvxLocaleToLanguage( pCharClass->getLocale() ) ) /*N*/ { /*N*/ ::com::sun::star::lang::Locale aLocale( SvxCreateLocale( eLang )); -/*N*/ STAR_REFERENCE( lang::XMultiServiceFactory ) xMSF( +/*N*/ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF( /*N*/ ::legacy_binfilters::getLegacyProcessServiceFactory() ); /*N*/ pCharClass = new CharClass( xMSF, aLocale ); /*N*/ pLclData = new LocaleDataWrapper( xMSF, aLocale ); diff --git a/binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx b/binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx index 794d612..0f05030 100644 --- a/binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx +++ b/binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx @@ -49,7 +49,7 @@ namespace binfilter { ::legacy_binfilters::getLegacyProcessServiceFactory(); try { - STAR_REFERENCE( uno::XInterface ) xI = + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xI = rxMSF->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.IndexEntrySupplier" )) ); if( xI.is() ) { commit 387897a0a314cae3cf0aca9396a117d34619f3e4 Author: Thomas Arnhold <tho...@arnhold.org> Date: Mon Feb 20 17:35:54 2012 +0100 expand and remove macro CLIP_NMSPC diff --git a/binfilter/inc/bf_sw/swunodef.hxx b/binfilter/inc/bf_sw/swunodef.hxx index 0e6fa81..b3097f2 100644 --- a/binfilter/inc/bf_sw/swunodef.hxx +++ b/binfilter/inc/bf_sw/swunodef.hxx @@ -29,8 +29,6 @@ #define _SWUNODEF_HXX namespace binfilter { -#define CLIP_NMSPC ::com::sun::star::datatransfer::clipboard - #define STAR_REFERENCE(aType) ::com::sun::star::uno::Reference< ::com::sun::star::aType > } //namespace binfilter commit 54aec9b379c6112e7229120158d1069f8e092cd1 Author: Thomas Arnhold <tho...@arnhold.org> Date: Mon Feb 20 17:33:26 2012 +0100 expand and remove macro UNO_NMSPC diff --git a/binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx b/binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx index 6981504..794d612 100644 --- a/binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx +++ b/binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx @@ -53,12 +53,12 @@ namespace binfilter { rxMSF->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.IndexEntrySupplier" )) ); if( xI.is() ) { - UNO_NMSPC::Any x = xI->queryInterface( ::getCppuType( + ::com::sun::star::uno::Any x = xI->queryInterface( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedIndexEntrySupplier>*)0) ); x >>= xIES; } } - catch ( const UNO_NMSPC::Exception& e ) + catch ( const ::com::sun::star::uno::Exception& e ) { #ifdef DBG_UTIL rtl::OStringBuffer aMsg("IndexEntrySupplierWrapper: Exception caught\n"); @@ -80,7 +80,7 @@ namespace binfilter { try { sRet = xIES->getAlgorithmList( rLcl ); } - catch ( const UNO_NMSPC::Exception& e ) + catch ( const ::com::sun::star::uno::Exception& e ) { #ifdef DBG_UTIL rtl::OStringBuffer aMsg("getAlgorithmList: Exception caught\n"); @@ -99,7 +99,7 @@ namespace binfilter { try { bRet = xIES->loadAlgorithm( rLcl, sSortAlgorithm, nOptions ); } - catch (const UNO_NMSPC::Exception& e) + catch (const ::com::sun::star::uno::Exception& e) { #ifdef DBG_UTIL rtl::OStringBuffer aMsg("loadAlgorithm: Exception caught\n"); @@ -121,7 +121,7 @@ namespace binfilter { nRet = xIES->compareIndexEntry( rTxt1, rTxtReading1, rLocale1, rTxt2, rTxtReading2, rLocale2 ); } - catch (const UNO_NMSPC::Exception& e) + catch (const ::com::sun::star::uno::Exception& e) { #ifdef DBG_UTIL rtl::OStringBuffer aMsg( "compareIndexEntry: Exception caught\n" ); diff --git a/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx b/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx index c8c5667..13abcd7 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx @@ -61,14 +61,14 @@ namespace binfilter { namespace SWUnoHelper { -sal_Int32 GetEnumAsInt32( const UNO_NMSPC::Any& rVal ) +sal_Int32 GetEnumAsInt32( const ::com::sun::star::uno::Any& rVal ) { sal_Int32 eVal; try { eVal = comphelper::getEnumAsINT32( rVal ); } - catch( UNO_NMSPC::Exception & ) + catch( ::com::sun::star::uno::Exception & ) { eVal = 0; OSL_ENSURE( FALSE, "can't get EnumAsInt32" ); diff --git a/binfilter/inc/bf_sw/swunodef.hxx b/binfilter/inc/bf_sw/swunodef.hxx index 318a7e5..0e6fa81 100644 --- a/binfilter/inc/bf_sw/swunodef.hxx +++ b/binfilter/inc/bf_sw/swunodef.hxx @@ -29,10 +29,9 @@ #define _SWUNODEF_HXX namespace binfilter { -#define UNO_NMSPC ::com::sun::star::uno #define CLIP_NMSPC ::com::sun::star::datatransfer::clipboard -#define STAR_REFERENCE(aType) UNO_NMSPC::Reference< ::com::sun::star::aType > +#define STAR_REFERENCE(aType) ::com::sun::star::uno::Reference< ::com::sun::star::aType > } //namespace binfilter #endif commit 9602fa43c64482f0d64141b2e931046820c64972 Author: Thomas Arnhold <tho...@arnhold.org> Date: Mon Feb 20 17:29:39 2012 +0100 expand and remove macro STAR_NMSPC diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx index cc945d3..c55379b 100644 --- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx +++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx @@ -264,7 +264,7 @@ static int /*N*/ if( eLang != SvxLocaleToLanguage( pLclData->getLocale() ) || /*N*/ eLang != SvxLocaleToLanguage( pCharClass->getLocale() ) ) /*N*/ { -/*N*/ STAR_NMSPC::lang::Locale aLocale( SvxCreateLocale( eLang )); +/*N*/ ::com::sun::star::lang::Locale aLocale( SvxCreateLocale( eLang )); /*N*/ STAR_REFERENCE( lang::XMultiServiceFactory ) xMSF( /*N*/ ::legacy_binfilters::getLegacyProcessServiceFactory() ); /*N*/ pCharClass = new CharClass( xMSF, aLocale ); diff --git a/binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx b/binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx index ce5d1d8..6981504 100644 --- a/binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx +++ b/binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx @@ -72,8 +72,8 @@ namespace binfilter { { } - STAR_NMSPC::uno::Sequence< ::rtl::OUString > - IndexEntrySupplierWrapper::GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLcl ) const + ::com::sun::star::uno::Sequence< ::rtl::OUString > + IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const { ::com::sun::star::uno::Sequence< ::rtl::OUString > sRet; @@ -92,7 +92,7 @@ namespace binfilter { } sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm( - const STAR_NMSPC::lang::Locale& rLcl, + const ::com::sun::star::lang::Locale& rLcl, const String& sSortAlgorithm, long nOptions ) const { sal_Bool bRet = sal_False; @@ -112,9 +112,9 @@ namespace binfilter { sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry( const String& rTxt1, const String& rTxtReading1, - const STAR_NMSPC::lang::Locale& rLocale1, + const ::com::sun::star::lang::Locale& rLocale1, const String& rTxt2, const String& rTxtReading2, - const STAR_NMSPC::lang::Locale& rLocale2 ) const + const ::com::sun::star::lang::Locale& rLocale2 ) const { sal_Int16 nRet = 0; try { diff --git a/binfilter/inc/bf_sw/swunodef.hxx b/binfilter/inc/bf_sw/swunodef.hxx index 5d9d0d6..318a7e5 100644 --- a/binfilter/inc/bf_sw/swunodef.hxx +++ b/binfilter/inc/bf_sw/swunodef.hxx @@ -29,11 +29,10 @@ #define _SWUNODEF_HXX namespace binfilter { -#define STAR_NMSPC ::com::sun::star -#define UNO_NMSPC STAR_NMSPC::uno -#define CLIP_NMSPC STAR_NMSPC::datatransfer::clipboard +#define UNO_NMSPC ::com::sun::star::uno +#define CLIP_NMSPC ::com::sun::star::datatransfer::clipboard -#define STAR_REFERENCE(aType) UNO_NMSPC::Reference< STAR_NMSPC::aType > +#define STAR_REFERENCE(aType) UNO_NMSPC::Reference< ::com::sun::star::aType > } //namespace binfilter #endif diff --git a/binfilter/inc/bf_sw/toxwrap.hxx b/binfilter/inc/bf_sw/toxwrap.hxx index 2f85d55..3f5a219 100644 --- a/binfilter/inc/bf_sw/toxwrap.hxx +++ b/binfilter/inc/bf_sw/toxwrap.hxx @@ -48,25 +48,25 @@ namespace binfilter { class IndexEntrySupplierWrapper { - STAR_NMSPC::lang::Locale aLcl; - STAR_NMSPC::uno::Reference < ::com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES; + ::com::sun::star::lang::Locale aLcl; + ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES; public: IndexEntrySupplierWrapper(); ~IndexEntrySupplierWrapper(); - void SetLocale( const STAR_NMSPC::lang::Locale& rLocale ) { aLcl = rLocale; } + void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) { aLcl = rLocale; } - STAR_NMSPC::uno::Sequence< ::rtl::OUString > - GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLcl ) const; + ::com::sun::star::uno::Sequence< ::rtl::OUString > + GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const; - sal_Bool LoadAlgorithm( const STAR_NMSPC::lang::Locale& rLcl, + sal_Bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl, const String& sSortAlgorithm, long nOptions ) const; sal_Int16 CompareIndexEntry( const String& rTxt1, const String& rTxtReading1, - const STAR_NMSPC::lang::Locale& rLcl1, + const ::com::sun::star::lang::Locale& rLcl1, const String& rTxt2, const String& rTxtReading2, - const STAR_NMSPC::lang::Locale& rLcl2 ) const; + const ::com::sun::star::lang::Locale& rLcl2 ) const; }; } //namespace binfilter _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits