offapi/com/sun/star/drawing/DrawingDocumentFactory.idl | 2 - offapi/com/sun/star/i18n/XExtendedTransliteration.idl | 2 - offapi/com/sun/star/i18n/XNativeNumberSupplier.idl | 2 - offapi/com/sun/star/linguistic2/LanguageGuessing.idl | 2 - tools/bootstrp/cppdep.cxx | 18 ++++----- tools/bootstrp/cppdep.hxx | 5 +- tools/bootstrp/mkunroll/mkunroll.cxx | 18 ++++----- tools/bootstrp/rscdep.cxx | 7 +-- udkapi/com/sun/star/util/logging/Logger.idl | 4 +- unusedcode.easy | 2 - vcl/inc/vcl/field.hxx | 2 - vcl/source/control/field.cxx | 31 ----------------- 12 files changed, 29 insertions(+), 66 deletions(-)
New commits: commit 5260bf5ea7271cca4767f596592091dcdfd895fe Author: Tomas Hlavaty <t...@logand.com> Date: Tue Dec 6 23:52:56 2011 +0100 minor idl fixes diff --git a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl index 41bbd29..71d3231 100644 --- a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl +++ b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl @@ -26,7 +26,7 @@ ************************************************************** **********/ #ifndef __com_sun_star_drawing_DrawingDocumentFactory_idl__ -#define __com::sun::star::drawing_DrawingDocumentFactory_idl__ +#define __com_sun_star_drawing_DrawingDocumentFactory_idl__ #include <com/sun/star/lang/XMultiServiceFactory.idl> diff --git a/offapi/com/sun/star/i18n/XExtendedTransliteration.idl b/offapi/com/sun/star/i18n/XExtendedTransliteration.idl index ca2348d..3afe7c8 100644 --- a/offapi/com/sun/star/i18n/XExtendedTransliteration.idl +++ b/offapi/com/sun/star/i18n/XExtendedTransliteration.idl @@ -29,7 +29,7 @@ #define __com_sun_star_i18n_XExtendedTransliteration_idl__ #include <com/sun/star/i18n/XTransliteration.idl> -#include <MultipleCharsOutputException.idl> +#include <com/sun/star/i18n/MultipleCharsOutputException.idl> //============================================================================= diff --git a/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl b/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl index a11ad7a..2e96883 100644 --- a/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl +++ b/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl @@ -29,7 +29,7 @@ #define __com_sun_star_i18n_XNativeNumberSupplier_idl__ #include <com/sun/star/lang/Locale.idl> -#include <NativeNumberXmlAttributes.idl> +#include <com/sun/star/i18n/NativeNumberXmlAttributes.idl> //============================================================================= diff --git a/offapi/com/sun/star/linguistic2/LanguageGuessing.idl b/offapi/com/sun/star/linguistic2/LanguageGuessing.idl index 1e99fbc..5ba3c04 100644 --- a/offapi/com/sun/star/linguistic2/LanguageGuessing.idl +++ b/offapi/com/sun/star/linguistic2/LanguageGuessing.idl @@ -28,7 +28,7 @@ #ifndef __com_sun_star_linguistic2_LanguageGuessing_idl__ #define __com_sun_star_linguistic2_LanguageGuessing_idl__ -#include <XLanguageGuessing.idl> +#include <com/sun/star/linguistic2/XLanguageGuessing.idl> module com { module sun { module star { module linguistic2 { diff --git a/udkapi/com/sun/star/util/logging/Logger.idl b/udkapi/com/sun/star/util/logging/Logger.idl index 5f02627..72e377a 100644 --- a/udkapi/com/sun/star/util/logging/Logger.idl +++ b/udkapi/com/sun/star/util/logging/Logger.idl @@ -29,8 +29,8 @@ #define __com_sun_star_webtop_Logger_idl__ #include <com/sun/star/uno/XInterface.idl> -#include <XLogger.idl> -#include <XLoggerRemote.idl> +#include <com/sun/star/util/logging/XLogger.idl> +#include <com/sun/star/util/logging/XLoggerRemote.idl> //============================================================================= commit 9e65b68ef9a3b745afb13700c68d0a5f2a2d8904 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Dec 6 23:37:33 2011 +0000 reduce CurrencyBox somewhat diff --git a/unusedcode.easy b/unusedcode.easy index d1afeb5..0d3e98a 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -74,8 +74,6 @@ Control::GetLineCount() const CurrencyBox::CurrencyBox(Window*, ResId const&) CurrencyBox::GetValue(unsigned short) const CurrencyBox::GetValuePos(long) const -CurrencyBox::InsertValue(long, unsigned short) -CurrencyBox::RemoveValue(long) CurrencyField::CurrencyField(Window*, ResId const&) CurrencyFormatter::SetCurrencySymbol(String const&) CustomToolBarImportHelper::showToolbar(rtl::OUString const&) diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx index 4af5e1a..391a6e6 100644 --- a/vcl/inc/vcl/field.hxx +++ b/vcl/inc/vcl/field.hxx @@ -819,8 +819,6 @@ public: virtual void ReformatAll(); - void InsertValue( sal_Int64 nValue, sal_uInt16 nPos = COMBOBOX_APPEND ); - void RemoveValue( sal_Int64 nValue ); sal_Int64 GetValue( sal_uInt16 nPos ) const; sal_uInt16 GetValuePos( sal_Int64 nValue ) const; diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index c4b6263..b943938 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -2383,23 +2383,6 @@ CurrencyBox::CurrencyBox( Window* pParent, WinBits nWinStyle ) : // ----------------------------------------------------------------------- -CurrencyBox::CurrencyBox( Window* pParent, const ResId& rResId ) : - ComboBox( WINDOW_CURRENCYBOX ) -{ - rResId.SetRT( RSC_CURRENCYBOX ); - WinBits nStyle = ImplInitRes( rResId ); - ComboBox::ImplInit( pParent, nStyle ); - CurrencyFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) ); - SetField( this ); - ComboBox::ImplLoadRes( rResId ); - Reformat(); - - if ( !(nStyle & WB_HIDE ) ) - Show(); -} - -// ----------------------------------------------------------------------- - CurrencyBox::~CurrencyBox() { } @@ -2478,20 +2461,6 @@ void CurrencyBox::ReformatAll() // ----------------------------------------------------------------------- -void CurrencyBox::InsertValue( sal_Int64 nValue, sal_uInt16 nPos ) -{ - ComboBox::InsertEntry( CreateFieldText( nValue ), nPos ); -} - -// ----------------------------------------------------------------------- - -void CurrencyBox::RemoveValue( sal_Int64 nValue ) -{ - ComboBox::RemoveEntry( CreateFieldText( nValue ) ); -} - -// ----------------------------------------------------------------------- - sal_Int64 CurrencyBox::GetValue( sal_uInt16 nPos ) const { double nValue = 0; commit a06492465223d42fb8905c4770c9f1ec4b80af36 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Dec 6 23:32:42 2011 +0000 ditch some ByteStrings diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx index ea9179d..c03a6a4 100644 --- a/tools/bootstrp/cppdep.cxx +++ b/tools/bootstrp/cppdep.cxx @@ -67,17 +67,17 @@ sal_Bool CppDep::AddSource( const char* pSource ) return sal_False; } -sal_Bool CppDep::Search( ByteString aFileName ) +sal_Bool CppDep::Search(const rtl::OString &rFileName) { #ifdef DEBUG_VERBOSE - fprintf( stderr, "SEARCH : %s\n", aFileName.GetBuffer()); + fprintf( stderr, "SEARCH : %s\n", rFileName.getStr()); #endif sal_Bool bRet = sal_False; SvFileStream aFile; rtl::OString aReadLine; - UniString suFileName(aFileName, osl_getThreadTextEncoding()); + UniString suFileName(rtl::OStringToOUString(rFileName, osl_getThreadTextEncoding())); aFile.Open( suFileName, STREAM_READ ); while ( aFile.ReadLine( aReadLine )) @@ -90,13 +90,13 @@ sal_Bool CppDep::Search( ByteString aFileName ) #ifdef DEBUG_VERBOSE fprintf( stderr, "found : %d %s\n", nPos, aReadLine.getStr() ); #endif - ByteString aResult = IsIncludeStatement( aReadLine ); + rtl::OString aResult = IsIncludeStatement( aReadLine ); #ifdef DEBUG_VERBOSE - fprintf( stderr, "Result : %s\n", aResult.GetBuffer() ); + fprintf( stderr, "Result : %s\n", aResult.getStr() ); #endif rtl::OString aNewFile; - if ( aResult !="") + if (!aResult.isEmpty()) if ( (aNewFile = Exists( aResult )).getLength() ) { sal_Bool bFound = sal_False; @@ -126,12 +126,12 @@ sal_Bool CppDep::Search( ByteString aFileName ) return bRet; } -rtl::OString CppDep::Exists( rtl::OString aFileName ) +rtl::OString CppDep::Exists(const rtl::OString &rFileName) { char pFullName[1023]; #ifdef DEBUG_VERBOSE - fprintf( stderr, "Searching %s \n", aFileName.getStr() ); + fprintf( stderr, "Searching %s \n", rFileName.getStr() ); #endif size_t nCount = m_aSearchPath.size(); @@ -142,7 +142,7 @@ rtl::OString CppDep::Exists( rtl::OString aFileName ) strcpy( pFullName, rPathName.getStr()); strcat( pFullName, DIR_SEP ); - strcat( pFullName, aFileName.getStr()); + strcat( pFullName, rFileName.getStr()); #ifdef DEBUG_VERBOSE fprintf( stderr, "looking for %s\t ", pFullName ); diff --git a/tools/bootstrp/cppdep.hxx b/tools/bootstrp/cppdep.hxx index b602427..3ed2942 100644 --- a/tools/bootstrp/cppdep.hxx +++ b/tools/bootstrp/cppdep.hxx @@ -39,8 +39,8 @@ protected: std::vector<rtl::OString> m_aFileList; std::vector<rtl::OString> m_aSources; - sal_Bool Search( ByteString aFileName ); - rtl::OString Exists( rtl::OString aFileName ); + sal_Bool Search(const rtl::OString& rFileName); + rtl::OString Exists(const rtl::OString& rFileName); rtl::OString IsIncludeStatement(rtl::OString aLine); public: diff --git a/tools/bootstrp/mkunroll/mkunroll.cxx b/tools/bootstrp/mkunroll/mkunroll.cxx index 6946457..d315af5 100644 --- a/tools/bootstrp/mkunroll/mkunroll.cxx +++ b/tools/bootstrp/mkunroll/mkunroll.cxx @@ -38,26 +38,26 @@ protected: FILE *pIn, *pOut; virtual void Filter(); public: - TextFilter( ByteString aInFile = "stdin", - ByteString aOutFile = "stdout" ); + TextFilter( rtl::OString aInFile = "stdin", + rtl::OString aOutFile = "stdout" ); virtual ~TextFilter(); virtual void Execute(); }; -TextFilter::TextFilter( ByteString aInFile, ByteString aOutFile ) +TextFilter::TextFilter( rtl::OString aInFile, rtl::OString aOutFile ) { if ( aInFile == "stdin" ) pIn = stdin; else - if (( pIn = fopen( aInFile.GetBuffer(), "r" )) == NULL ) - printf( "Can't read %s\n", aInFile.GetBuffer() ); + if (( pIn = fopen( aInFile.getStr(), "r" )) == NULL ) + printf( "Can't read %s\n", aInFile.getStr() ); if ( aOutFile == "stdout" ) pOut = stdout; else - if (( pOut = fopen( aOutFile.GetBuffer(), "w" )) == NULL ) - printf( "Can't write %s\n", aOutFile.GetBuffer() ); + if (( pOut = fopen( aOutFile.getStr(), "w" )) == NULL ) + printf( "Can't write %s\n", aOutFile.getStr() ); } TextFilter::~TextFilter() @@ -110,11 +110,11 @@ class MkFilter : public TextFilter protected: virtual void Filter(); public: - MkFilter( ByteString aInFile = "stdin", ByteString aOutFile = "stdout"); + MkFilter( rtl::OString aInFile = "stdin", rtl::OString aOutFile = "stdout"); ~MkFilter(); }; -MkFilter::MkFilter( ByteString aInFile, ByteString aOutFile ) : +MkFilter::MkFilter( rtl::OString aInFile, rtl::OString aOutFile ) : TextFilter( aInFile, aOutFile ) { pLst = new ByteStringList; diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx index eb6993e..4afde22 100644 --- a/tools/bootstrp/rscdep.cxx +++ b/tools/bootstrp/rscdep.cxx @@ -85,7 +85,7 @@ int main( int argc, char** argv ) char pSrsFileName[255]; String aSrsBaseName; sal_Bool bSource = sal_False; - ByteString aRespArg; + rtl::OStringBuffer aRespArg; // who needs anything but '/' ? sal_Char cDelim = '/'; @@ -155,8 +155,7 @@ int main( int argc, char** argv ) if (( aBuf2[0] != '-' ) && ( aBuf2[0] != '@' )) { pDep->AddSource( &aBuf2[0] ); - aRespArg += " "; - aRespArg += &aBuf2[0]; + aRespArg.append(' ').append(&aBuf2[0]); bSource = sal_True; } } @@ -239,7 +238,7 @@ int main( int argc, char** argv ) } } } - aString.append(aRespArg); + aString.append(aRespArg.makeStringAndClear()); pDep->Execute(); std::vector<rtl::OString>& rLst = pDep->GetDepList(); size_t nCount = rLst.size(); commit 66a8b58a6e14a4a862b44c57ed4645f37fc2bbe5 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Dec 6 23:22:18 2011 +0000 aSourceFile member unused diff --git a/tools/bootstrp/cppdep.hxx b/tools/bootstrp/cppdep.hxx index d71e38f..b602427 100644 --- a/tools/bootstrp/cppdep.hxx +++ b/tools/bootstrp/cppdep.hxx @@ -33,7 +33,6 @@ class CppDep { - ByteString aSourceFile; std::vector<rtl::OString> m_aSearchPath; protected:
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits