[Libreoffice-commits] .: Branch 'libreoffice-3-4' - basic/source
basic/source/classes/sb.cxx | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 738622d199a64327048d6a40953499b9dca5c008
Author: Michael Meeks michael.me...@novell.com
Date: Mon Jul 25 18:08:29 2011 +0100
fdo#39520 - turn DocBasicItems into an rtl::Static to improve shutdown on
mac
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index f9cbab6..9ef8de3 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -164,33 +164,33 @@ namespace {
typedef ::rtl::Reference DocBasicItem DocBasicItemRef;
typedef boost::unordered_map const StarBASIC *, DocBasicItemRef
DocBasicItemMap;
-//::rtl::OUStringHash, ::std::equal_to ::rtl::OUString
ModuleInitDependencyMap;
-static DocBasicItemMap GaDocBasicItems;
+class GaDocBasicItems : public rtl::StaticDocBasicItemMap,GaDocBasicItems {};
const DocBasicItem* lclFindDocBasicItem( const StarBASIC* pDocBasic )
{
-DocBasicItemMap::iterator it = GaDocBasicItems.find( pDocBasic );
-return (it != GaDocBasicItems.end()) ? it-second.get() : 0;
+DocBasicItemMap::iterator it = GaDocBasicItems::get().find( pDocBasic );
+DocBasicItemMap::iterator end = GaDocBasicItems::get().end();
+return (it != end) ? it-second.get() : 0;
}
void lclInsertDocBasicItem( StarBASIC rDocBasic )
{
-DocBasicItemRef rxDocBasicItem = GaDocBasicItems[ rDocBasic ];
+DocBasicItemRef rxDocBasicItem = GaDocBasicItems::get()[ rDocBasic ];
rxDocBasicItem.set( new DocBasicItem( rDocBasic ) );
rxDocBasicItem-startListening();
}
void lclRemoveDocBasicItem( StarBASIC rDocBasic )
{
-DocBasicItemMap::iterator it = GaDocBasicItems.find( rDocBasic );
-if( it != GaDocBasicItems.end() )
+DocBasicItemMap::iterator it = GaDocBasicItems::get().find( rDocBasic );
+if( it != GaDocBasicItems::get().end() )
{
it-second-stopListening();
-GaDocBasicItems.erase( it );
+GaDocBasicItems::get().erase( it );
}
-DocBasicItemMap::iterator it_end = GaDocBasicItems.end();
-for( it = GaDocBasicItems.begin(); it != it_end; ++it )
+DocBasicItemMap::iterator it_end = GaDocBasicItems::get().end();
+for( it = GaDocBasicItems::get().begin(); it != it_end; ++it )
it-second-clearDependingVarsOnDelete( rDocBasic );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/workben
sal/workben/measure_oustrings.cxx |2 +-
sal/workben/testproc.cxx | 12 +---
2 files changed, 2 insertions(+), 12 deletions(-)
New commits:
commit 2c46cde2edf25e8c9ae6f591b52a6b7c086fe166
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 10:40:42 2011 +
poke __cplusplus into workben comparison tool
diff --git a/sal/workben/measure_oustrings.cxx
b/sal/workben/measure_oustrings.cxx
index f9ce02b..eff82c8 100644
--- a/sal/workben/measure_oustrings.cxx
+++ b/sal/workben/measure_oustrings.cxx
@@ -45,7 +45,7 @@ int COUNT = 1;
int COUNT = 1000;
#endif
-#if defined __GXX_EXPERIMENTAL_CXX0X__
+#if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus = 201103L
# define HAVE_CXX_Ox 1
#endif
diff --git a/sal/workben/testproc.cxx b/sal/workben/testproc.cxx
index ed515ef..c015d08 100644
--- a/sal/workben/testproc.cxx
+++ b/sal/workben/testproc.cxx
@@ -43,7 +43,6 @@
int MAIN (void)
{
//oslProcess Process;
-oslProcessError ProcessError;
sal_uInt32 nArgCount;
sal_uInt32 index;
rtl_uString* ustrExeFile=0;
@@ -62,17 +61,8 @@ int MAIN (void)
fprintf(stderr,done ...\n\n);
}
-ProcessError = osl_getExecutableFile(ustrExeFile);
+osl_getExecutableFile(ustrExeFile);
-/*
-osl_executeProcess( e:\\test\\os2de202.exe,
-NULL,
-osl_Process_NORMAL,
-0L,
-NULL,
-NULL,
-NULL,
-Process );*/
return 0;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinfo.cxx |4 ++--
vcl/win/source/gdi/salprn.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e1de8237d5f8d5ac1db3c6eb4567eaffe2e7bd86
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 11:01:56 2011 +
these need to be getStr post OUString-ization
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 9ac68b0..2db9090 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -246,8 +246,8 @@ int WinSalSystem::ShowNativeMessageBox(const rtl::OUString
rTitle, const rtl::O
ImplHideSplash();
return MessageBoxW(
0,
-reinterpret_castLPCWSTR(rMessage.GetBuffer()),
-reinterpret_castLPCWSTR(rTitle.GetBuffer()),
+reinterpret_castLPCWSTR(rMessage.getStr()),
+reinterpret_castLPCWSTR(rTitle.getStr()),
nFlags);
}
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index b8f79d8..0da87bd 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -210,7 +210,7 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList*
pList )
void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
{
HANDLE hPrinter = 0;
-LPWSTR pPrnName =
reinterpret_castLPWSTR(const_castsal_Unicode*(pInfo-maPrinterName.GetBuffer()));
+LPWSTR pPrnName =
reinterpret_castLPWSTR(const_castsal_Unicode*(pInfo-maPrinterName.getStr()));
if( OpenPrinterW( pPrnName, hPrinter, NULL ) )
{
DWORD nBytes = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/ucbhelper/tempfile.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c6560c6f07f7f71842d7314157feaca2fa4a03c9
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 12:56:43 2011 +
Resolves fdo#41295 tmp name reuse in mass pdf export
diff --git a/unotools/source/ucbhelper/tempfile.cxx
b/unotools/source/ucbhelper/tempfile.cxx
index d157bab..6728c80 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -206,8 +206,8 @@ void CreateTempName_Impl( String rName, sal_Bool bKeep,
sal_Bool bDir = sal_Tru
aName += String::CreateFromAscii( lu );
rName.Erase();
-unsigned long nSeed = Time::GetSystemTicks() % nMax;
-for ( unsigned long u = nSeed; ++u != nSeed; )
+static unsigned long u = Time::GetSystemTicks() % nMax;
+for ( unsigned long nSeed = u; ++u != nSeed; )
{
u %= nMax;
String aTmp( aName );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ce60138d339a5eb2a174a5d27063249acf2cac42
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 13:11:46 2011 +
link error
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 58ec98f..71066ac 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2169,7 +2169,7 @@ static int WINAPI __AddFontResourceExW( LPCWSTR
lpszfileName, DWORD fl, PVOID pd
}
#endif
-bool ImplAddTempFont( SalData rSalData, const String rFontFileURL )
+bool ImplAddTempFont( SalData rSalData, const rtl::OUString rFontFileURL )
{
int nRet = 0;
::rtl::OUString aUSytemPath;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/inc tools/source
tools/inc/tools/fsys.hxx | 28 +--
tools/source/fsys/comdep.hxx |6
tools/source/fsys/dirent.cxx | 341 -
tools/source/fsys/filecopy.cxx | 10 -
tools/source/fsys/fstat.cxx| 17 --
tools/source/fsys/tdir.cxx | 13 -
tools/source/fsys/wntmsc.cxx |8
tools/source/fsys/wntmsc.hxx |2
8 files changed, 213 insertions(+), 212 deletions(-)
New commits:
commit 2a2fbbecc04b1364216a5180f722fb72ed00d42d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 15:12:34 2011 +
ByteString-rtl::OString
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index ee64c7f..f4d01cd 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -223,13 +223,13 @@ friend class FileCopier;
#ifdef FEAT_FSYS_DOUBLESPEED
FileStat* pStat; // optional
#endif
-ByteString aName;
+rtl::OStringaName;
DirEntry* pParent;
sal_uIntPtr nError;
DirEntryFlageFlag;
private:
-TOOLS_DLLPRIVATEDirEntry( const ByteString rInitName,
+TOOLS_DLLPRIVATEDirEntry( const rtl::OString rInitName,
DirEntryFlag aDirFlag,
FSysPathStyle eStyle );
@@ -237,13 +237,13 @@ private:
friend class FileStat;
friend const char* ImpCheckDirEntry( const void* p );
-TOOLS_DLLPRIVATE FSysError ImpParseName( const ByteString
rIntiName,
+TOOLS_DLLPRIVATE FSysError ImpParseName( const rtl::OString
rIntiName,
FSysPathStyle eParser );
#if defined(WNT)
-TOOLS_DLLPRIVATE FSysError ImpParseOs2Name( const ByteString
rPfad,
+TOOLS_DLLPRIVATE FSysError ImpParseOs2Name( const rtl::OString
rPfad,
FSysPathStyle eStyle );
#else
-TOOLS_DLLPRIVATE FSysError ImpParseUnixName( const ByteString
rPfad,
+TOOLS_DLLPRIVATE FSysError ImpParseUnixName( const rtl::OString
rPfad,
FSysPathStyle eStyle );
#endif
TOOLS_DLLPRIVATE const DirEntry*ImpGetTopPtr() const;
@@ -251,7 +251,7 @@ private:
protected:
voidImpTrim( FSysPathStyle eStyle );
-const ByteString ImpTheName() const;
+const rtl::OString ImpTheName() const;
DirEntryFlagImpTheFlag() const { return eFlag; };
DirEntry* ImpChangeParent( DirEntry* pNewParent, sal_Bool
bNormalize = sal_True );
DirEntry* ImpGetParent() { return pParent; }
@@ -266,7 +266,7 @@ protected:
public:
DirEntry( DirEntryFlag aDirFlag = FSYS_FLAG_CURRENT );
DirEntry( const DirEntry rEntry );
-DirEntry( const ByteString rInitName,
+DirEntry( const rtl::OString rInitName,
FSysPathStyle eParser = FSYS_STYLE_HOST );
DirEntry( const String rInitName,
FSysPathStyle eParser = FSYS_STYLE_HOST );
@@ -323,16 +323,16 @@ public:
sal_Booloperator !=( const DirEntry rAnotherDir ) const
{ return !(DirEntry::operator==( rAnotherDir )); }
-inline StringCompare NameCompareDirect( const DirEntry rWith ) const
-{
+inline sal_Int32 NameCompareDirect( const DirEntry rWith ) const
+{
#ifdef UNX
-return rWith.aName.CompareTo( aName );
+return rWith.aName.compareTo(aName);
#else
-rtl::OString
aThis(rtl::OString(aName).toAsciiLowerCase());
-rtl::OString
aWith(rtl::OString(rWith.aName).toAsciiLowerCase());
-return
static_castStringCompare(aWith.compareTo(aThis));
+rtl::OString aThis(rtl::OString(aName).toAsciiLowerCase());
+rtl::OString aWith(rtl::OString(rWith.aName).toAsciiLowerCase());
+return aWith.compareTo(aThis);
#endif
-}
+}
static String GetAccessDelimiter( FSysPathStyle eFormatter =
FSYS_STYLE_HOST );
static String GetSearchDelimiter( FSysPathStyle eFormatter =
FSYS_STYLE_HOST );
diff --git a/tools/source/fsys/comdep.hxx b/tools/source/fsys/comdep.hxx
index 94dfdff..1728116 100644
--- a/tools/source/fsys/comdep.hxx
+++ b/tools/source/fsys/comdep.hxx
@@ -64,7 +64,7 @@ struct DirReader_Impl
dirent* pDosEntry;
DirEntry* pParent;
String aPath;
-ByteString aBypass;
+rtl::OString aBypass;
sal_BoolbReady;
sal_BoolbInUse;
@@ -86,8 +86,8 @@ struct DirReader_Impl
#if defined(UNX)//for further eplanation see DirReader_Impl::Read() in
unx.cxx
pDosDir = NULL;
#else
-aBypass = ByteString(aPath,
[Libreoffice-commits] .: 6 commits - comphelper/inc comphelper/qa sdext/source sfx2/inc svtools/source sw/source tools/source unotools/inc unotools/source unusedcode.easy
comphelper/inc/comphelper/string.hxx | 27 +
comphelper/qa/string/test_string.cxx | 19 +
sdext/source/minimizer/configurationaccess.cxx | 26 ++---
sfx2/inc/sfx2/tabdlg.hxx |2 -
svtools/source/filter/ixbm/xbmread.cxx |8 ++--
svtools/source/filter/sgvtext.cxx |6 ++-
svtools/source/filter/wmf/wmfwr.cxx|4 +-
svtools/source/svhtml/parhtml.cxx | 28 +++---
sw/source/ui/app/docsh.cxx |2 -
sw/source/ui/app/docsh2.cxx|8 ++--
sw/source/ui/app/docst.cxx |2 -
sw/source/ui/dbui/mailmergechildwindow.cxx |5 +-
sw/source/ui/dochdl/swdtflvr.cxx | 18 +
sw/source/ui/envelp/labelexp.cxx |6 +--
sw/source/ui/envelp/mailmrge.cxx |4 +-
sw/source/ui/fldui/xfldui.cxx | 10 +++--
sw/source/ui/index/cntex.cxx |4 +-
sw/source/ui/lingu/olmenu.cxx |4 +-
sw/source/ui/misc/glossary.cxx |5 +-
sw/source/ui/misc/glshell.cxx |5 +-
sw/source/ui/shells/annotsh.cxx|4 +-
sw/source/ui/shells/drawsh.cxx |2 -
sw/source/ui/shells/drwtxtex.cxx |2 -
sw/source/ui/shells/drwtxtsh.cxx |2 -
sw/source/ui/shells/frmsh.cxx |2 -
sw/source/ui/shells/textsh.cxx |4 +-
sw/source/ui/shells/textsh1.cxx|2 -
sw/source/ui/table/chartins.cxx|2 -
sw/source/ui/uiview/swcli.cxx |4 +-
sw/source/ui/uiview/view2.cxx |4 +-
sw/source/ui/uiview/viewling.cxx |6 +--
sw/source/ui/uno/dlelstnr.cxx |2 -
sw/source/ui/uno/swdetect.cxx | 10 +++--
sw/source/ui/uno/unomailmerge.cxx | 18 -
sw/source/ui/utlui/swrenamexnameddlg.cxx |2 -
sw/source/ui/utlui/unotools.cxx|2 -
sw/source/ui/vba/vbadocumentproperties.cxx |2 -
sw/source/ui/vba/vbaheaderfooterhelper.cxx |4 +-
sw/source/ui/vba/vbarange.cxx |2 -
sw/source/ui/vba/vbarangehelper.cxx|8 ++--
sw/source/ui/vba/wordvbahelper.cxx |2 -
sw/source/ui/wrtsh/wrtsh1.cxx | 13 +++---
tools/source/fsys/dirent.cxx | 50 -
unotools/inc/unotools/atom.hxx |8
unotools/source/misc/atom.cxx | 30 ---
unusedcode.easy|3 -
46 files changed, 199 insertions(+), 184 deletions(-)
New commits:
commit 4a06a42de49215167221177d47cd2eb0e2d59232
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 22 12:29:25 2011 +
want to match here, not check for equality
diff --git a/comphelper/inc/comphelper/string.hxx
b/comphelper/inc/comphelper/string.hxx
index 31414e5..00a1664 100644
--- a/comphelper/inc/comphelper/string.hxx
+++ b/comphelper/inc/comphelper/string.hxx
@@ -272,6 +272,33 @@ COMPHELPER_DLLPUBLIC inline sal_Bool matchL(const
rtl::OString rStr, const char
}
/**
+ Match against a substring appearing in this string, ignoring the case of
+ ASCII letters.
+
+ The result is true if and only if the second string appears as a substring
+ of this string, at the given position.
+ Character values between 65 and 90 (ASCII A-Z) are interpreted as
+ values between 97 and 122 (ASCII a-z).
+ This function can't be used for language specific comparison.
+
+ @paramrStrThe string that pMatch will be compared to.
+ @parampMatch The substring rStr is to be compared against
+ @paramnMatchLen The length of pMatch
+ @paramfromIndex the index to start the comparion from.
+The index must be greater or equal than 0
+and less or equal as the string length.
+ @return sal_True if str match with the characters in the string
+at the given position;
+sal_False, otherwise.
+*/
+COMPHELPER_DLLPUBLIC inline sal_Bool matchIgnoreAsciiCaseL(const rtl::OString
rStr, const char *pMatch, sal_Int32 nMatchLen, sal_Int32 fromIndex = 0)
SAL_THROW(())
+{
+return rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
rStr.pData-buffer+fromIndex, rStr.pData-length-fromIndex,
+ pMatch,
nMatchLen,
+ nMatchLen ) ==
0;
+}
+
+/**
Returns the index within this string of the first occurrence of the
specified substring, starting at the specified index.
diff --git a/comphelper/qa/string/test_string.cxx
b/comphelper/qa/string/test_string.cxx
index 1106381..2ce6f2c 100644
---
[Libreoffice-commits] .: 2 commits - binfilter/bf_starmath binfilter/bf_sw
binfilter/bf_starmath/source/starmath_mathml.cxx |3 ++-
binfilter/bf_starmath/source/starmath_utility.cxx |3 ++-
binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx | 19 ++-
3 files changed, 14 insertions(+), 11 deletions(-)
New commits:
commit 8e457595bea4ebccafc71c8ce71bc19696d70c40
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 22 23:40:45 2011 +
use stripStart
diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx
b/binfilter/bf_starmath/source/starmath_mathml.cxx
index e81a8f2..dd64eb9 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -76,6 +76,7 @@ one go*/
#include com/sun/star/task/XStatusIndicatorFactory.hpp
#include com/sun/star/beans/PropertyAttribute.hpp
#include comphelper/genericpropertyset.hxx
+#include comphelper/string.hxx
#include bf_svtools/itemprop.hxx
@@ -630,7 +631,7 @@ void SmXMLImport::endDocument(void)
//Make up some editable text
aText = pDocShell-GetText();
pTree-CreateTextFromNode(aText);
-aText.EraseTrailingChars();
+aText = comphelper::string::stripEnd(aText, ' ');
if((aText.GetChar(0) == '{')
(aText.GetChar(aText.Len()-1) == '}'))
{
diff --git a/binfilter/bf_starmath/source/starmath_utility.cxx
b/binfilter/bf_starmath/source/starmath_utility.cxx
index 735b22a..68aa269 100644
--- a/binfilter/bf_starmath/source/starmath_utility.cxx
+++ b/binfilter/bf_starmath/source/starmath_utility.cxx
@@ -26,6 +26,7 @@
*
/
+#include comphelper/string.hxx
#include tools/tenccvt.hxx
#include osl/thread.h
@@ -217,7 +218,7 @@ int GetTextEncodingTabIndex( const String rTxt, xub_StrLen
nPos )
/*N*/ // in old 2.0 or 3.0 formulas the strings to be imported do have an
/*N*/ // additional '\0' character at the end that gets removed here.
/*N*/ if (aString.Len())
-/*N*/ aString.EraseTrailingChars( '\0' );
+/*N*/ aString = comphelper::string::stripEnd(aString, '\0');
/*N*/
/*N*/ aString.ConvertLineEnd();
/*N*/ return aString;
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index dcb93f6..99b2e9d 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -3366,7 +3366,7 @@ void Sw6Layout::AddXForm(sal_Char cLead, ByteString
rTmp, String rStr)
// Kurzform, wird oefter benoetigt
{
rTmp = comphelper::string::stripStart(rTmp, ' ');
-rTmp.EraseTrailingChars();
+rTmp = comphelper::string::stripEnd(rTmp, ' ');
rTmp.Insert((sal_Char)rTmp.Len(),0);
rTmp.Insert(cLead,0);
AddHForm(rTmp.GetBuffer(),rStr.Len(),rTmp.Len(),1);
@@ -3498,7 +3498,7 @@ size_t Sw6Layout::PutRest(String rStr,sal_Char *pCtrl)
rtl::OStringToOUString(aTmp, RTL_TEXTENCODING_IBM_850),
osl_getThreadTextEncoding());
aTmp = comphelper::string::stripStart(aTmp, ' ');
-aTmp.EraseTrailingChars();
+aTmp = comphelper::string::stripEnd(aTmp, ' ');
aTmp.Insert('}');// Mache versteckten Text
aTmp.Insert('{',0);
AddXForm('-',aTmp,rStr);
@@ -5320,7 +5320,7 @@ BOOL SwSw6Parser::ReadDocInfo(void)
if (ReadLn(rTmp))
{
rTmp = comphelper::string::stripStart(rTmp, ' ');
-rTmp.EraseTrailingChars();
+rTmp = comphelper::string::stripEnd(rTmp, ' ');
}
else
break;
@@ -5331,7 +5331,7 @@ BOOL SwSw6Parser::ReadDocInfo(void)
if (ReadLn(rTmp))
{
rTmp = comphelper::string::stripStart(rTmp, ' ');
-rTmp.EraseTrailingChars();
+rTmp = comphelper::string::stripEnd(rTmp, ' ');
}
else
break;
commit 1318e3ab271d62a2dc1ff2691b836c3b6da9a2de
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 22 17:18:15 2011 +
use stripStart
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index 73b6671..dcb93f6 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -57,6 +57,7 @@
#include bf_svx/cntritem.hxx
#include bf_svx/shdditem.hxx
#include bf_svx/colritem.hxx
+#include comphelper/string.hxx
#include fmtpdsc.hxx
@@ -3361,10 +3362,10 @@ BOOL Sw6Layout::TextBefehl(const sal_Char *pPatt,const
sal_Char *pOrig)
return !*pPatt (!cLen || *pOrig'A' || *pOrig'Z');
}
-void Sw6Layout::AddXForm(sal_Char cLead,ByteString rTmp,String rStr)
+void Sw6Layout::AddXForm(sal_Char cLead, ByteString
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - connectivity/source
connectivity/source/drivers/ado/Aservices.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit da6cd222d3c72b102cead739686fd5ca71a84861
Author: Lionel Elie Mamane lionel.mam...@gestman.lu
Date: Tue Nov 22 14:25:10 2011 +0100
fdo#36555: pImplementationName is not a compile-time constant
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/connectivity/source/drivers/ado/Aservices.cxx
b/connectivity/source/drivers/ado/Aservices.cxx
index 68600ba..69bd7c6 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -59,7 +59,7 @@ struct ProviderRequest
sal_Char const* pImplementationName
)
: xServiceManager(reinterpret_castXMultiServiceFactory*(pServiceManager))
-,
sImplementationName(OUString(RTL_CONSTASCII_USTRINGPARAM(pImplementationName)))
+, sImplementationName(OUString::createFromAscii(pImplementationName))
{
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/inc sw/source unusedcode.easy
sw/inc/swcrsr.hxx |4 ++--
sw/source/core/crsr/swcrsr.cxx|9 +
sw/source/core/fields/cellfml.cxx |4 ++--
unusedcode.easy |7 ---
4 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit b2e84f9a40fda7821d4e658f9102bcbc783a1ba3
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 23 15:32:43 2011 +
std::map::erase takes a nonconst iterator
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index f7bb248..9bb433a 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -283,8 +283,8 @@ public:
virtual sal_Bool GotoTable( const String rName );
void InsertBox( const SwTableBox rTblBox );
-void DeleteBox( SwSelBoxes::const_iterator it ) { aSelBoxes.erase( it );
bChg = sal_True; }
-void DeleteBox( SwSelBoxes::const_iterator itFirst,
SwSelBoxes::const_iterator itLast ) { aSelBoxes.erase( itFirst, itLast ); bChg
= sal_True; }
+void DeleteBox( SwSelBoxes::iterator it ) { aSelBoxes.erase( it ); bChg =
sal_True; }
+void DeleteBox( SwSelBoxes::iterator itFirst, SwSelBoxes::iterator itLast
) { aSelBoxes.erase( itFirst, itLast ); bChg = sal_True; }
void DeleteAllBoxes() { DeleteBox(aSelBoxes.begin(), aSelBoxes.end()); }
sal_uInt16 GetBoxesCount() const { return aSelBoxes.size(); }
const SwSelBoxes GetBoxes() const { return aSelBoxes; }
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 8b4fab8..650b01d 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2165,8 +2165,9 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
else
{
-SwSelBoxes::const_iterator it = aTmp.find(pSttNd-GetIndex());
-if( it != aTmp.end() ) {
+SwSelBoxes::iterator it = aTmp.find(pSttNd-GetIndex());
+if( it != aTmp.end() )
+{
SwNodeIndex aIdx( *pSttNd, 1 );
const SwNode* pNd = aIdx.GetNode();
if( !pNd-IsCntntNode() )
@@ -2272,7 +2273,7 @@ bool SwTableCursor::NewTableSelection()
void SwTableCursor::ActualizeSelection( const SwSelBoxes rNew )
{
-SwSelBoxes::const_iterator itOld = aSelBoxes.begin();
+SwSelBoxes::iterator itOld = aSelBoxes.begin();
SwSelBoxes::const_iterator itNew = rNew.begin();
while ( itOld != aSelBoxes.end() itNew != rNew.end() )
{
@@ -2285,7 +2286,7 @@ void SwTableCursor::ActualizeSelection( const SwSelBoxes
rNew )
}
else if( pPOld-GetSttIdx() pPNew-GetSttIdx() )
{
-SwSelBoxes::const_iterator it = itOld;
+SwSelBoxes::iterator it = itOld;
++itOld;
DeleteBox( it ); // this box has to go
}
diff --git a/sw/source/core/fields/cellfml.cxx
b/sw/source/core/fields/cellfml.cxx
index 5e7c1e4..17d3db2 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -349,7 +349,7 @@ void SwTableFormula::_MakeFormel( const SwTable rTbl,
String rNewStr,
rNewStr += '(';
bool bDelim = false;
-for( SwSelBoxes::const_iterator it = aBoxes.begin();
+for( SwSelBoxes::iterator it = aBoxes.begin();
it != aBoxes.end() !pCalcPara-rCalc.IsCalcError();
++it )
{
@@ -960,7 +960,7 @@ void SwTableFormula::GetBoxes( const SwTableBox rSttBox,
break;
// dann mal die Tabellenkoepfe raus:
-for( SwSelBoxes::const_iterator it = rBoxes.begin(); it !=
rBoxes.end(); ++it )
+for( SwSelBoxes::iterator it = rBoxes.begin(); it != rBoxes.end();
++it )
{
pLine = it-second-GetUpper();
while( pLine-GetUpper() )
commit 7434fa5bbd051dc4842bc76d33f27e07f10e0053
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 23 15:21:13 2011 +
update list post SwSelBoxes conversion
diff --git a/unusedcode.easy b/unusedcode.easy
index 6bb28a2..77d915b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -387,6 +387,7 @@ ScDPItemData::GetNumFormat() const
ScDPSaveData::Refresh(com::sun::star::uno::Referencecom::sun::star::sheet::XDimensionsSupplier
const)
ScDdeLink::ResetValue()
ScDocRowHeightUpdater::TabRanges::TabRanges()
+ScDocument::SetAllTabRangeNames(std::__debug::mapshort, ScRangeName const*,
std::lessshort, std::allocatorstd::pairshort const, ScRangeName const*
const)
ScDocument::ValidNewTabName(std::__debug::vectorrtl::OUString,
std::allocatorrtl::OUString const) const
ScFilterDetect::impl_createFactory(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const)
ScFormulaCell::IsRangeNameInUse(unsigned short) const
@@ -408,7 +409,9 @@ ScMultiTextWnd::GetLineCount()
ScMyCellInfo::ScMyCellInfo()
ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short,
rtl::OUString const*, ScXMLImport)
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/config/svt_useroptions.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 1761e9c96eb2d673d77712c840a51c2679d169f1
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 23 22:17:54 2011 +
remove EraseLeadingAndTrailingChars
diff --git a/binfilter/bf_svtools/source/config/svt_useroptions.cxx
b/binfilter/bf_svtools/source/config/svt_useroptions.cxx
index 00f870a..976fa42 100644
--- a/binfilter/bf_svtools/source/config/svt_useroptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_useroptions.cxx
@@ -27,7 +27,7 @@
/
#include bf_svtools/useroptions.hxx
-
+#include comphelper/string.hxx
#include tools/debug.hxx
#include com/sun/star/uno/Any.hxx
#include com/sun/star/uno/Sequence.hxx
@@ -179,8 +179,7 @@ void SvtUserOptions_Impl::InitUserPropertyNames()
void SvtUserOptions_Impl::InitFullName()
{
-m_aFullName = GetFirstName();
-m_aFullName.EraseLeadingAndTrailingChars();
+m_aFullName = comphelper::string::strip(GetFirstName(), ' ');
if ( m_aFullName.Len() )
m_aFullName += ' ';
m_aFullName += GetLastName();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - avmedia/source configure.in lingucomponent/source lotuswordpro/source sal/rtl sc/source sw/source tools/inc tools/Library_tl.mk tools/source unusedcode.easy
avmedia/source/quicktime/player.cxx | 31 -
configure.in |2
lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx | 31 -
lotuswordpro/source/filter/explode.cxx |2
lotuswordpro/source/filter/xfilter/xfutil.cxx|2
sal/rtl/source/debugprint.cxx| 67 ---
sal/rtl/source/makefile.mk | 33 -
sc/source/core/tool/compiler.cxx | 27
sw/source/core/frmedt/tblsel.cxx |2
tools/Library_tl.mk |3
tools/inc/tools/string.hxx |5
tools/source/string/debugprint.cxx | 48 ---
tools/source/string/strimp.cxx | 53
tools/source/string/tustring.cxx | 32 +
unusedcode.easy |2
15 files changed, 36 insertions(+), 304 deletions(-)
New commits:
commit 3af0c948254751eade9bff772b849720747c5494
Author: Daisuke Nishino niboshi...@gmail.com
Date: Thu Nov 24 23:08:04 2011 +0900
Fix logic inversion
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 8ab53d5..b70503b 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -2122,7 +2122,7 @@ sal_Bool _FndBoxCopyCol( const SwTableBox* rpBox, void*
pPara )
}
else
{
-if( 0 != pFndPara-rBoxes.count( rpBox ) )
+if( 0 == pFndPara-rBoxes.count( rpBox ) )
{
delete pFndBox;
return sal_True;
commit c8c53816593f30c54c7feef705ac6732eefc0833
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 15:06:57 2011 +
WaE: uninitialized value
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx
b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index 8471ff6..480482f 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -131,7 +131,7 @@ rtl::OUString DateTimeToOUString(XFDateTime dt)
rtl::OUString GetTableColName(sal_Int32 col)
{
-int remain;
+int remain = 0;
charch;
std::string strOut;
commit 2affd5e0195d828800b0a7a4dbad8c71d528b374
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 15:01:15 2011 +
WaE: uninitialized value
diff --git a/lotuswordpro/source/filter/explode.cxx
b/lotuswordpro/source/filter/explode.cxx
index 69c979d..241d43d 100644
--- a/lotuswordpro/source/filter/explode.cxx
+++ b/lotuswordpro/source/filter/explode.cxx
@@ -349,7 +349,7 @@ void Decompression::ToString(sal_uInt32 nBits, sal_Char
*pChar, sal_uInt32 nLen)
*/
sal_uInt32 Decompression::Decode(HuffmanTreeNode * pRoot)
{
-sal_uInt32 nRet;
+sal_uInt32 nRet(0);
sal_uInt32 nRead, nReadAlready;
if( 0 != ReadBits(1, nReadAlready))
commit 89f057a09d8684f697a822662907cfede7ef0a3f
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 09:51:32 2011 +
ditch dbg_dump
diff --git a/avmedia/source/quicktime/player.cxx
b/avmedia/source/quicktime/player.cxx
index f7efb51..e4550a0 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
@@ -32,37 +32,6 @@
#include framegrabber.hxx
#include window.hxx
-// dbg_dump for development
-#if OSL_DEBUG_LEVEL 1
-#include rtl/strbuf.hxx
-#include rtl/ustring.hxx
-
-const sal_Char *dbg_dump(const rtl::OString rStr)
-{
-static rtl::OStringBuffer aStr;
-
-aStr = rtl::OStringBuffer(rStr);
-aStr.append(static_castchar(0));
-return aStr.getStr();
-}
-
-const sal_Char *dbg_dump(const rtl::OUString rStr)
-{
-return dbg_dump(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8));
-}
-
-const sal_Char *dbg_dump(rtl_String *pStr)
-{
-return dbg_dump(rtl::OString(pStr));
-}
-
-const sal_Char *dbg_dump(rtl_uString *pStr)
-{
-return dbg_dump(rtl::OUString(pStr));
-}
-
-#endif
-
using namespace ::com::sun::star;
namespace avmedia { namespace quicktime {
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
index 336b373..3f7cc2d 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
@@ -61,37 +61,6 @@ using ::rtl::OUStringBuffer;
using ::rtl::OUStringToOString;
///
-// dbg_dump for development
-#if OSL_DEBUG_LEVEL 1
-#include rtl/strbuf.hxx
-#include rtl/ustring.hxx
-
-const sal_Char *dbg_dump(const rtl::OString rStr)
-{
-static rtl::OStringBuffer aStr;
-
-aStr = rtl::OStringBuffer(rStr);
-aStr.append(static_castchar(0));
-return aStr.getStr();
-}
[Libreoffice-commits] .: icc/source
icc/source/create_sRGB_profile/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ec9f3466d33536f68d86bde9f0389f46f8f147a2 Author: Caolán McNamara caol...@redhat.com Date: Thu Nov 24 16:05:48 2011 + might need to augment library path diff --git a/icc/source/create_sRGB_profile/makefile.mk b/icc/source/create_sRGB_profile/makefile.mk index 8aab067..2703492 100644 --- a/icc/source/create_sRGB_profile/makefile.mk +++ b/icc/source/create_sRGB_profile/makefile.mk @@ -83,7 +83,7 @@ ALLTAR: $(TARGET)$(EXECPOST) $(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST) .IF $(CROSS_COMPILING) != YES -cd $(BIN)$/ $(BIN)$/$(TARGET)$(EXECPOST) +cd $(BIN)$/ $(AUGMENT_LIBRARY_PATH) $(BIN)$/$(TARGET)$(EXECPOST) .ELSE cd $(BIN)$/ $(SRC_ROOT)$/icc$/$(INPATH_FOR_BUILD)$/bin$/$(TARGET) .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/misc/glosdoc.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit efdcb1692b48612fb7ad95f6385e7372fc06d891
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 16:53:29 2011 +
check glossary path for sanity
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 3db77a0..3701238 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -220,6 +220,8 @@ void SwGlossaries::PutGroupDoc(SwTextBlocks *pBlock) {
sal_Bool SwGlossaries::NewGroupDoc(String rGroupName, const String rTitle)
{
sal_uInt16 nNewPath = (sal_uInt16)rGroupName.GetToken(1,
GLOS_DELIM).ToInt32();
+if(nNewPath = m_pPathArr-Count())
+return sal_False;
String sNewFilePath(*(*m_pPathArr)[nNewPath]);
String sNewGroup = lcl_CheckFileName(sNewFilePath, rGroupName.GetToken(0,
GLOS_DELIM));
sNewGroup += GLOS_DELIM;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gdb
solenv/gdb/libreoffice/sw.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b0ba08657f23d273721592c30f10d37e43a49ec2 Author: Caolán McNamara caol...@redhat.com Date: Thu Nov 24 21:03:45 2011 + SwIndex::nIndex renamed to SwIndex::m_nIndex diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index 0b2ff7f..f41533a 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -36,7 +36,7 @@ class SwPositionPrinter(object): def to_string(self): node = self.value['nNode']['pNd'].dereference(); -offset = self.value['nContent']['nIndex'] +offset = self.value['nContent']['m_nIndex'] return %s (node %d, offset %d) % (self.typename, node['nOffset'], offset) class SwPaMPrinter(object): ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - basctl/source oox/Package_inc.mk tools/source unusedcode.easy
basctl/source/basicide/baside2.cxx |2 +-
basctl/source/basicide/baside2.hxx |2 +-
oox/Package_inc.mk |1 +
tools/source/inet/inetstrm.cxx | 22 +++---
unusedcode.easy|1 -
5 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit f4eb51fc238a427f148b0dde253570f4030bddf0
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 21:48:33 2011 +
fix build error, deliver oox/helper/attributelist.hxx
diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk
index ac2ad7d..5564eab 100644
--- a/oox/Package_inc.mk
+++ b/oox/Package_inc.mk
@@ -41,6 +41,7 @@ $(eval $(call
gb_Package_add_file,oox_inc,inc/oox/export/drawingml.hxx,oox/expor
$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/export/shapes.hxx,oox/export/shapes.hxx))
$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/export/utils.hxx,oox/export/utils.hxx))
$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/export/vmlexport.hxx,oox/export/vmlexport.hxx))
+$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/helper/attributelist.hxx,oox/helper/attributelist.hxx))
$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/helper/binarystreambase.hxx,oox/helper/binarystreambase.hxx))
$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/helper/containerhelper.hxx,oox/helper/containerhelper.hxx))
$(eval $(call
gb_Package_add_file,oox_inc,inc/oox/helper/graphichelper.hxx,oox/helper/graphichelper.hxx))
commit 33a03b669bf195a25efa273ad38402fb2e54aa78
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 21:41:31 2011 +
no need for BasicErrorHdl to be a LINK
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 8b57961..fb6ed3a 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -659,7 +659,7 @@ void ModulWindow::ManageBreakPoints()
}
-IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic )
+long ModulWindow::BasicErrorHdl( StarBASIC * pBasic )
{
DBG_CHKTHIS( ModulWindow, 0 );
GoOnTop();
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index ebf501e..119aa60 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -326,7 +326,7 @@ private:
String aCurPath;
::rtl::OUString m_aModule;
-DECL_LINK( BasicErrorHdl, StarBASIC * );
+longBasicErrorHdl( StarBASIC* pBasic );
longBasicBreakHdl( StarBASIC* pBasic );
voidCheckCompileBasic();
diff --git a/unusedcode.easy b/unusedcode.easy
index 3283270..98cc325 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -227,7 +227,6 @@ MetricBox::RemoveValue(long, FieldUnit)
MetricField::ConvertValue(long, unsigned short, FieldUnit, MapUnit)
MiscSettings::SetDisablePrinting(unsigned char)
MiscSettings::SetEnableATToolSupport(unsigned char)
-ModulWindow::LinkStubBasicErrorHdl(void*, void*)
MoreButton::RemoveWindow(Window*)
MultiLineEdit::GetHScrollBar() const
MultiLineEdit::GetLeftMargin() const
commit e2b73031e810bc5b29101a9d22ab0264ae676d99
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 24 21:35:32 2011 +
ByteString-rtl::OString
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index eadeec5..6b1011b 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -503,14 +503,14 @@ int INetMessageOStream::PutMsgLine (const sal_Char
*pData, sal_uIntPtr nSize)
// Check for header or body.
if (!IsHeaderParsed())
{
-ByteString aField (pData);
-sal_uInt16 nPos = aField.Search (':');
-if (nPos != STRING_NOTFOUND)
+rtl::OString aField(pData);
+sal_Int32 nPos = aField.indexOf(':');
+if (nPos != -1)
{
-ByteString aName (
-aField.Copy (0, nPos));
-ByteString aValue (
-aField.Copy (nPos + 1, aField.Len() - nPos + 1));
+rtl::OString aName(
+aField.copy(0, nPos));
+rtl::OString aValue(
+aField.copy(nPos + 1, aField.getLength() - nPos + 1));
aValue = comphelper::string::stripStart(aValue, ' ');
pTargetMsg-SetHeaderField (
@@ -1614,11 +1614,11 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char
*pData, sal_uIntPtr nSize)
// Determine boundary.
rtl::OString aType(rtl::OUStringToOString(
pMsg-GetContentType(), RTL_TEXTENCODING_ASCII_US));
-ByteString aLowerType(aType);
-aLowerType.ToLowerAscii();
+rtl::OString aLowerType(aType.toAsciiLowerCase());
-sal_uInt16 nPos = aLowerType.Search (boundary=);
-ByteString aBoundary(aType.copy(nPos + 9));
+sal_Int32 nPos =
[Libreoffice-commits] .: unusedcode.easy
unusedcode.easy | 20 +++- 1 file changed, 19 insertions(+), 1 deletion(-) New commits: commit 997da2415f7bf5bdaac9a69672e9fc46914c06e3 Author: Caolán McNamara caol...@redhat.com Date: Fri Nov 25 08:50:20 2011 + update list diff --git a/unusedcode.easy b/unusedcode.easy index 98cc325..af938e0 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -4,6 +4,7 @@ AtomDocument::AtomDocument(AtomPubSession*, std::basic_stringchar, std::char_tr AtomFolder::AtomFolder(AtomPubSession*, std::basic_stringchar, std::char_traitschar, std::allocatorchar ) AtomPubSession::getCollectionUrl(Collection::Type) AtomPubSession::~AtomPubSession() +BitmapWriteAccess::DrawPolygon(Polygon const) BufferNode::childAt(int) const ByteString::Assign(char const*, unsigned short) ByteString::Assign(char) @@ -535,7 +536,6 @@ SfxShell::RemoveItem(unsigned short) SfxSlotPool::NextInterface() SfxStyleSheet::SfxStyleSheet() SfxTabDialog::GetApplyHandler() const -SfxTabPage::SfxTabPage(Window*, long, SfxItemSet const) SfxThesSubMenuControl::RegisterControl(unsigned short, SfxModule*) SfxToDoStack_Implarr_::Contains(SfxToDo_Impl const) const SfxToDoStack_Implarr_::Insert(unsigned short, SfxToDo_Impl const, unsigned short) @@ -885,6 +885,7 @@ SvxUnoTextBase::InsertField(SvxFieldItem const) SvxUnoTextBase::SvxUnoTextBase(SvxEditSource const*, SvxItemPropertySet const*) SvxUnoTextContent::SvxUnoTextContent() SvxZoomStatusBarControl::GetDefItemWidth(StatusBar const) +SwAttrIter::Dump(SvStream) const SwBlinkList::Insert(SwBlinkList const*, unsigned short, unsigned short) SwBlinkList::Insert(SwBlinkPortion* const, unsigned short) SwBlinkList::Insert(SwBlinkPortion* const*, unsigned short) @@ -939,6 +940,7 @@ SwLRects::Insert(SwLRects const*, unsigned short, unsigned short, unsigned short SwLRects::Replace(SwLineRect const, unsigned short) SwLRects::Replace(SwLineRect const*, unsigned short, unsigned short) SwLRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwLineRect const, void*), void*) +SwLineLayout::DebugPortions(SvStream, String const, unsigned short) SwMailMergeChildWindow::GetChildWindowId() SwModify::GetClientCount() const SwOutlineNodes::Insert(SwNode* const, unsigned short) @@ -952,6 +954,8 @@ SwPosFlyFrms::Insert(SwPosFlyFrm* const*, unsigned short) SwPosFlyFrms::Insert(SwPosFlyFrms const*, unsigned short, unsigned short) SwPosFlyFrms::Remove(SwPosFlyFrm* const, unsigned short) SwPosFlyFrms::Remove(unsigned short, unsigned short) +SwProtocol::GetVar(unsigned short, long) +SwProtocol::SnapShot(SwFrm const*, unsigned long) SwRects::Replace(SwRect const, unsigned short) SwRects::Replace(SwRect const*, unsigned short, unsigned short) SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwRect const, void*), void*) @@ -983,6 +987,17 @@ SwTabFrm::GetLeaf(MakePageType, unsigned char) SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short) SwTableSortBoxes::Insert(SwTableBox* const, unsigned short) SwTableSortBoxes::Insert(SwTableBox* const*, unsigned short) +SwTxtFly::ShowContour(OutputDevice*) +SwTxtSizeInfo::IsOptCalm() const +SwTxtSizeInfo::IsOptLow() const +SwTxtSizeInfo::IsOptTest1() const +SwTxtSizeInfo::IsOptTest2() const +SwTxtSizeInfo::IsOptTest3() const +SwTxtSizeInfo::IsOptTest4() const +SwTxtSizeInfo::IsOptTest5() const +SwTxtSizeInfo::IsOptTest6() const +SwTxtSizeInfo::IsOptTest7() const +SwTxtSizeInfo::IsOptTest8() const SwVbaColumn::calculateAbsoluteColumnWidth(int, com::sun::star::uno::Sequencecom::sun::star::text::TableColumnSeparator const, double*) SwVbaColumn::calculateRelativeColumnWidth(double const*, double*, int) SwVbaStyle::getOOoStyleTypeFromMSWord(int) @@ -1039,6 +1054,7 @@ TaskStatusFieldItem::TaskStatusFieldItem() TempFile::IsValid() const TextObj::TextObj(TextObj) TextObj::Write(SvStream*) +ToolBox::GetToolbarLayoutMode() TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const, com::sun::star::uno::Referencecom::sun::star::uno::XInterface) UCBStorage::IsStorageFile(String const) UCBStream::UCBStream(com::sun::star::uno::Referencecom::sun::star::io::XOutputStream) @@ -2020,6 +2036,7 @@ oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const, un oox::dump::XmlStreamObject::XmlStreamObject(oox::dump::OutputObjectBase const, oox::dump::BinaryInputStreamRef const) oox::dump::biff::BiffObjectBase::dumpRowRange(oox::dump::String const, bool) oox::dump::biff::FormulaObject::dumpCellFormula(oox::dump::String const, unsigned short) +oox::formulaimport::XmlStream::AttributeList::hasAttribute(int) const oox::ole::VbaHelper::getBasicScriptUrl(rtl::OUString const, rtl::OUString const, rtl::OUString const) oox::ole::VbaProject::hasDialog(rtl::OUString const) const oox::ole::VbaProject::hasModule(rtl::OUString const) const @@ -2230,6 +2247,7 @@ svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const, unsigned short)
[Libreoffice-commits] .: tools/bootstrp tools/inc tools/source
tools/bootstrp/prj.cxx | 28 +-
tools/inc/bootstrp/prj.hxx |2
tools/source/fsys/wldcrd.cxx | 12 ++--
tools/source/inet/inetmime.cxx | 106 -
4 files changed, 63 insertions(+), 85 deletions(-)
New commits:
commit 6312367fb80f0cce15c576981b342ed57baf2b95
Author: Caolán McNamara caol...@redhat.com
Date: Fri Nov 25 09:20:04 2011 +
ByteString-rtl::OString
diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index a3caf23..ef362a0 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -28,21 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include precompiled_tools.hxx
-#include stdlib.h
-#include stdio.h
-#include osl/mutex.hxx
-
-#include tools/stream.hxx
-#include comphelper/string.hxx
#include bootstrp/prj.hxx
-
-#if defined(WNT)
-#define LIST_DELIMETER ';'
-#define PATH_DELIMETER '\\'
-#elif defined UNX
-#define LIST_DELIMETER ':'
-#define PATH_DELIMETER '/'
-#endif
+#include comphelper/string.hxx
SimpleConfig::SimpleConfig(const String rSimpleConfigFileName)
{
@@ -56,21 +43,14 @@ SimpleConfig::~SimpleConfig()
rtl::OString SimpleConfig::getNext()
{
-if (aStringBuffer == )
+if (aStringBuffer.isEmpty())
while ((aStringBuffer = GetNextLine()) == \t) ; //solange bis != \t
-if ( aStringBuffer == )
+if (aStringBuffer.isEmpty())
return rtl::OString();
rtl::OString aString = comphelper::string::getToken(aStringBuffer, 0,
'\t');
-#ifdef _MSC_VER
-#pragma warning (push)
-#pragma warning (disable:4244)
-#endif
-aStringBuffer.Erase(0, aString.getLength()+1);
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
+aStringBuffer = aStringBuffer.copy(aString.getLength()+1);
aStringBuffer = comphelper::string::stripStart(aStringBuffer, '\t');
diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index 62d9727..f416053 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -43,7 +43,7 @@
class SimpleConfig
{
SvFileStream aFileStream;
-ByteString aStringBuffer;
+rtl::OString aStringBuffer;
rtl::OString GetNextLine();
public:
diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx
index 9071924..c1acd61 100644
--- a/tools/source/fsys/wldcrd.cxx
+++ b/tools/source/fsys/wldcrd.cxx
@@ -112,24 +112,24 @@ sal_uInt16 WildCard::ImpMatch( const char *pWild, const
char *pStr ) const
sal_Bool WildCard::Matches( const String rString ) const
{
-ByteString aTmpWild = aWildString;
+rtl::OString aTmpWild = aWildString;
rtl::OString aString(rtl::OUStringToOString(rString,
osl_getThreadTextEncoding()));
-sal_uInt16 nSepPos;
+sal_Int32 nSepPos;
if ( cSepSymbol != '\0' )
{
-while ( (nSepPos = aTmpWild.Search( cSepSymbol )) != STRING_NOTFOUND )
+while ( (nSepPos = aTmpWild.indexOf(cSepSymbol)) != -1 )
{
// alle getrennten WildCard's pruefen
-if ( ImpMatch( aTmpWild.Copy( 0, nSepPos ).GetBuffer(),
aString.getStr() ) )
+if ( ImpMatch( aTmpWild.copy( 0, nSepPos ).getStr(),
aString.getStr() ) )
return sal_True;
-aTmpWild.Erase( 0, nSepPos + 1 ); // Trennsymbol entfernen
+aTmpWild = aTmpWild.copy(nSepPos + 1); // Trennsymbol entfernen
}
// und noch den hinter dem letzen Trennsymbol bzw. den einzigen
}
-if ( ImpMatch( aTmpWild.GetBuffer(), aString.getStr() ) )
+if ( ImpMatch( aTmpWild.getStr(), aString.getStr() ) )
return sal_True;
else
return sal_False;
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index e6b8db1..6034f3b 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -117,25 +117,25 @@ namespace unnamed_tools_inetmime {
struct Parameter
{
Parameter * m_pNext;
-ByteString m_aAttribute;
-ByteString m_aCharset;
-ByteString m_aLanguage;
-ByteString m_aValue;
+rtl::OString m_aAttribute;
+rtl::OString m_aCharset;
+rtl::OString m_aLanguage;
+rtl::OString m_aValue;
sal_uInt32 m_nSection;
bool m_bExtended;
-inline Parameter(Parameter * pTheNext, ByteString const rTheAttribute,
- ByteString const rTheCharset,
- ByteString const rTheLanguage,
- ByteString const rTheValue, sal_uInt32 nTheSection,
+inline Parameter(Parameter * pTheNext, const rtl::OString rTheAttribute,
+ const rtl::OString rTheCharset,
+ const rtl::OString rTheLanguage,
+ const rtl::OString rTheValue, sal_uInt32 nTheSection,
bool bTheExtended);
};
inline Parameter::Parameter(Parameter * pTheNext,
-ByteString const rTheAttribute,
-ByteString const rTheCharset,
-
[Libreoffice-commits] .: 2 commits - reportdesign/inc reportdesign/source tools/source
reportdesign/inc/RptObject.hxx |4 ++
reportdesign/source/core/sdr/RptObject.cxx | 58 ++---
tools/source/stream/strmunx.cxx|2 -
tools/source/stream/strmwnt.cxx|6 +--
4 files changed, 45 insertions(+), 25 deletions(-)
New commits:
commit 9eac8b2d2d5b77e1aa537a8e3756ffbbb10d7e0e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Nov 25 20:16:36 2011 +
Resolves: fdo#39950 fix dnd crash from default assignment operators
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 056a06c..4084a47 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -224,6 +224,8 @@ public:
virtual OOle2Obj* Clone() const;
virtual void initializeOle();
+OOle2Obj operator=(const OOle2Obj rObj);
+
void initializeChart( const ::com::sun::star::uno::Reference
::com::sun::star::frame::XModel _xModel);
};
@@ -275,6 +277,8 @@ public:
virtual sal_uInt32 GetObjInventor() const;
virtual OUnoObject* Clone() const;
+OUnoObject operator=(const OUnoObject rObj);
+
private:
voidimpl_setReportComponent_nothrow();
voidimpl_initializeModel_nothrow();
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index 09bf340..b50945a 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -941,18 +941,24 @@ uno::Reference uno::XInterface
OUnoObject::getUnoShape()
{
return OObjectBase::getUnoShapeOf( *this );
}
-//
-
+
+OUnoObject OUnoObject::operator=(const OUnoObject rObj)
+{
+if( this == rObj )
+return *this;
+SdrUnoObj::operator=(rObj);
+
+ReferenceXPropertySet
xSource(const_castOUnoObject(rObj).getUnoShape(), uno::UNO_QUERY);
+ReferenceXPropertySet xDest(getUnoShape(), uno::UNO_QUERY);
+if ( xSource.is() xDest.is() )
+comphelper::copyProperties(xSource.get(), xDest.get());
+
+return *this;
+}
+
OUnoObject* OUnoObject::Clone() const
{
-OUnoObject* pClone = CloneHelper OUnoObject ();
-if ( pClone )
-{
-ReferenceXPropertySet
xSource(const_castOUnoObject*(this)-getUnoShape(),uno::UNO_QUERY);
-ReferenceXPropertySet xDest(pClone-getUnoShape(),uno::UNO_QUERY);
-if ( xSource.is() xDest.is() )
-comphelper::copyProperties(xSource.get(),xDest.get());
-}
-return pClone;
+return CloneHelper OUnoObject ();
}
//
// OOle2Obj
@@ -1154,22 +1160,32 @@ uno::Reference chart2::data::XDatabaseDataProvider
lcl_getDataProvider(const
}
return xSource;
}
-//
-
-// Clone() soll eine komplette Kopie des Objektes erzeugen.
-OOle2Obj* OOle2Obj::Clone() const
+
+OOle2Obj OOle2Obj::operator=(const OOle2Obj rObj)
{
-OOle2Obj* pObj = CloneHelper OOle2Obj ();
-OReportModel* pRptModel = static_castOReportModel*(GetModel());
-svt::EmbeddedObjectRef::TryRunningState( pObj-GetObjRef() );
-
pObj-impl_createDataProvider_nothrow(pRptModel-getReportDefinition().get());
+if( this == rObj )
+return *this;
+SdrOle2Obj::operator=(rObj);
-uno::Reference chart2::data::XDatabaseDataProvider xSource(
lcl_getDataProvider(GetObjRef()) );
-uno::Reference chart2::data::XDatabaseDataProvider xDest(
lcl_getDataProvider(pObj-GetObjRef()) );
+OReportModel* pRptModel = static_castOReportModel*(rObj.GetModel());
+svt::EmbeddedObjectRef::TryRunningState( GetObjRef() );
+impl_createDataProvider_nothrow(pRptModel-getReportDefinition().get());
+
+uno::Reference chart2::data::XDatabaseDataProvider xSource(
lcl_getDataProvider(rObj.GetObjRef()) );
+uno::Reference chart2::data::XDatabaseDataProvider xDest(
lcl_getDataProvider(GetObjRef()) );
if ( xSource.is() xDest.is() )
comphelper::copyProperties(xSource.get(),xDest.get());
-pObj-initializeChart(pRptModel-getReportDefinition().get());
-return pObj;
+initializeChart(pRptModel-getReportDefinition().get());
+
+return *this;
+}
+
+//
-
+// Clone() soll eine komplette Kopie des Objektes erzeugen.
+OOle2Obj* OOle2Obj::Clone() const
+{
+return CloneHelper OOle2Obj ();
}
//
-
void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference
frame::XModel _xModel)
commit cbb2b42f113e29609161d8bdbeb667a2164a4d1a
Author: Caolán McNamara caol...@redhat.com
Date: Fri Nov 25 16:30:15 2011 +
ByteString-rtl::OString
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 2dfe2bb..ad245a7 100644
---
[Libreoffice-commits] .: automation/source basic/inc basic/source
automation/source/app/testbasi.cxx |2 +-
automation/source/app/testbasi.hxx |2 +-
basic/inc/basic/mybasic.hxx|2 +-
basic/source/app/mybasic.cxx |4 ++--
basic/source/app/textedit.cxx | 28 ++--
5 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 7e9eda006be9a1af14a8e8a6cb4a20cf2171de13
Author: mikew mi...@whiteley.org
Date: Fri Nov 25 10:22:17 2011 -0800
Fixed spelling: Spechial - Special
diff --git a/automation/source/app/testbasi.cxx
b/automation/source/app/testbasi.cxx
index 87ecf3e..c7a28d6 100644
--- a/automation/source/app/testbasi.cxx
+++ b/automation/source/app/testbasi.cxx
@@ -114,7 +114,7 @@ sal_Bool TTBasic::Compile( SbModule* p )
return MyBasic::Compile( p );
}
-const String TTBasic::GetSpechialErrorText()
+const String TTBasic::GetSpecialErrorText()
{
String nErrorText;
if ( pTestObject IS_ERROR() GetErrorCode() == GET_ERROR()-nError )
diff --git a/automation/source/app/testbasi.hxx
b/automation/source/app/testbasi.hxx
index c21f2d5..4f90d07 100644
--- a/automation/source/app/testbasi.hxx
+++ b/automation/source/app/testbasi.hxx
@@ -55,7 +55,7 @@ public:
void LoadIniFile();
SbTextType GetSymbolType( const String Symbol, sal_Bool bWasTTControl );
-virtual const String GetSpechialErrorText();
+virtual const String GetSpecialErrorText();
virtual void ReportRuntimeError( AppBasEd *pEditWin );
virtual void DebugFindNoErrors( sal_Bool bDebugFindNoErrors );
};
diff --git a/basic/inc/basic/mybasic.hxx b/basic/inc/basic/mybasic.hxx
index ad7df51..aae5fd7 100644
--- a/basic/inc/basic/mybasic.hxx
+++ b/basic/inc/basic/mybasic.hxx
@@ -89,7 +89,7 @@ public:
// Determines the extended symbol type for syntax highlighting
virtual SbTextType GetSymbolType( const String Symbol, sal_Bool
bWasTTControl );
-virtual const String GetSpechialErrorText();
+virtual const String GetSpecialErrorText();
virtual void ReportRuntimeError( AppBasEd *pEditWin );
virtual void DebugFindNoErrors( sal_Bool bDebugFindNoErrors );
diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx
index 61a2c81..b3f6409 100644
--- a/basic/source/app/mybasic.cxx
+++ b/basic/source/app/mybasic.cxx
@@ -222,7 +222,7 @@ sal_Bool MyBasic::ErrorHdl()
void MyBasic::ReportRuntimeError( AppBasEd *pEditWin )
{
String nErrorText;
-nErrorText = GetSpechialErrorText();
+nErrorText = GetSpecialErrorText();
if ( pEditWin ) // just in case the focus is not right
pEditWin-ToTop();
@@ -237,7 +237,7 @@ void MyBasic::DebugFindNoErrors( sal_Bool
bDebugFindNoErrors )
(void) bDebugFindNoErrors; /* avoid warning about unused parameter */
}
-const String MyBasic::GetSpechialErrorText()
+const String MyBasic::GetSpecialErrorText()
{
return GetErrorText();
}
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index 2cfed14..23205c5 100644
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -148,44 +148,44 @@ void TextEditImp::Notify( SfxBroadcaster rBC, const
SfxHint rHint )
}
}
-#define TEXTATTR_SPECHIAL 55
-class TextAttribSpechial : public TextAttrib
+#define TEXTATTR_SPECIAL 55
+class TextAttribSpecial : public TextAttrib
{
private:
FontWeight maFontWeight;
public:
-TextAttribSpechial( const FontWeight rFontWeight );
-TextAttribSpechial( const TextAttribSpechial rAttr );
-~TextAttribSpechial() {;}
+TextAttribSpecial( const FontWeight rFontWeight );
+TextAttribSpecial( const TextAttribSpecial rAttr );
+~TextAttribSpecial() {;}
virtual voidSetFont( Font rFont ) const;
virtual TextAttrib* Clone() const;
virtual int operator==( const TextAttrib rAttr ) const;
};
-TextAttribSpechial::TextAttribSpechial( const FontWeight rFontWeight )
-: TextAttrib( TEXTATTR_SPECHIAL ), maFontWeight( rFontWeight )
+TextAttribSpecial::TextAttribSpecial( const FontWeight rFontWeight )
+: TextAttrib( TEXTATTR_SPECIAL ), maFontWeight( rFontWeight )
{}
-TextAttribSpechial::TextAttribSpechial( const TextAttribSpechial rAttr )
+TextAttribSpecial::TextAttribSpecial( const TextAttribSpecial rAttr )
: TextAttrib( rAttr ), maFontWeight( rAttr.maFontWeight )
{}
-void TextAttribSpechial::SetFont( Font rFont ) const
+void TextAttribSpecial::SetFont( Font rFont ) const
{
rFont.SetWeight( maFontWeight );
}
-TextAttrib* TextAttribSpechial::Clone() const
+TextAttrib* TextAttribSpecial::Clone() const
{
-return new TextAttribSpechial( *this );
+return new TextAttribSpecial( *this );
}
-int TextAttribSpechial::operator==( const TextAttrib rAttr ) const
+int TextAttribSpecial::operator==( const TextAttrib rAttr ) const
{
return ( ( TextAttrib::operator==(rAttr ) )
-( maFontWeight == ((const
TextAttribSpechial)rAttr).maFontWeight ) );
+( maFontWeight
[Libreoffice-commits] .: 3 commits - sd/inc sd/source sfx2/inc sw/source
sd/inc/glob.hrc |1 -
sd/source/core/glob.src | 36 +++-
sd/source/ui/view/ViewShellBase.cxx |2 +-
sfx2/inc/sfx2/objface.hxx |4 ++--
sw/source/ui/inc/shells.hrc |4
sw/source/ui/shells/shells.src |8
6 files changed, 46 insertions(+), 9 deletions(-)
New commits:
commit ac07fe981912dfd435e571ae42d4c1980fd1cfe7
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 28 11:16:14 2011 +
add defined but missing SfxInterface strings
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
index 5d736a5..a3c5436 100644
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
@@ -346,10 +346,44 @@ String STR_MEDIAOBJECTBARSHELL
String STR_TABLEOBJECTBARSHELL
{
-Text [ de ] = Tabelle ;
Text [ en-US ] = Table ;
};
+String STR_SLIDESORTERVIEWSHELL
+{
+Text [ en-US ] = Slide Sorter ;
+};
+
+String STR_TOOL_PANEL_SHELL
+{
+Text [ en-US ] = Tool Panel ;
+};
+
+String STR_LEFT_IMPRESS_PANE_SHELL
+{
+Text [ en-US ] = Slides ;
+};
+
+String STR_LEFT_DRAW_PANE_SHELL
+{
+Text [ en-US ] = Pages ;
+};
+
+String STR_TASKPANEVIEWSHELL
+{
+Text [ en-US ] = Tasks ;
+};
+
+String STR_MASTERPAGESSELECTOR
+{
+Text [ en-US ] = Master Pages ;
+};
+
+String STR_TASKPANELAYOUTMENU
+{
+Text [ en-US ] = Layout ;
+};
+
String STR_POWERPOINT_IMPORT
{
Text [ en-US ] = PowerPoint Import;
diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc
index 569dba2..6c3e409 100644
--- a/sw/source/ui/inc/shells.hrc
+++ b/sw/source/ui/inc/shells.hrc
@@ -94,10 +94,6 @@
#define STR_REDLINE_EDIT(RC_SHELLS_BEGIN + 56)
#define STR_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 57)
-// #i68101# no longer needed
-// #define STR_NAME_SHAPE_LABEL(RC_SHELLS_BEGIN + 58)
-// #define STR_NAME_SHAPE_DIALOG (RC_SHELLS_BEGIN + 59)
-
#define RID_MODULE_TOOLBOX (RC_SHELLS_BEGIN + 60)
#define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61)
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index ad275b5..ee1f6ec 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -205,6 +205,14 @@ String STR_SHELLNAME_DRAW_TEXT
{
Text [ en-US ] = Draw text ;
};
+String STR_SHELLNAME_MEDIA
+{
+Text [ en-US ] = Media ;
+};
+String STR_SHELLNAME_NAVIGATION
+{
+Text [ en-US ] = Navigation ;
+};
//Strings fuer Gallery/Hintergrund
String STR_SWBG_PARAGRAPH
{
commit 55c5ea43a59e505297fb6fa20b77aaa28f7c67bc
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 28 10:49:36 2011 +
there is no STR_VIEWSHELLBASE string
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 89b2b67..4de2609 100755
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -125,7 +125,6 @@
#define STR_SAVE_DOCRID_GLOB_START+100
#define STR_PREVIEWVIEWSHELLRID_GLOB_START+101
#define RID_SD_ERRHDL RID_GLOB_START+102
-#define STR_VIEWSHELLBASE RID_GLOB_START+103
#define STR_3DOBJECTBARSHELLRID_GLOB_START+104
#define STR_FONTWORKOBJECTBARSHELL RID_GLOB_START+105
#define STR_SLIDESORTERVIEWSHELLRID_GLOB_START+106
diff --git a/sd/source/ui/view/ViewShellBase.cxx
b/sd/source/ui/view/ViewShellBase.cxx
index 3f7094d..94ed8ff 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -261,7 +261,7 @@ void ViewShellBase::InitFactory()
-SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(STR_VIEWSHELLBASE))
+SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(0))
{
}
commit 5d0051ac3733db9f04dd459db46212f70a9c07e9
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 28 10:11:54 2011 +
SfxInterfaces may legally have no translatable ui name
diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx
index 7e43c19..c4d38f2 100644
--- a/sfx2/inc/sfx2/objface.hxx
+++ b/sfx2/inc/sfx2/objface.hxx
@@ -80,9 +80,9 @@ public:
const SfxSlot* GetSlot( const String rCommand ) const;
const char* GetClassName() const { return pName; }
-int HasName() const { return 0 != aNameResId.GetId(); }
+boolHasName() const { return 0 != aNameResId.GetId(); }
rtl::OUString GetName() const
-{ return String(aNameResId); }
+{ return HasName() ? ResId::toString(aNameResId) :
rtl::OUString(); }
ResMgr* GetResMgr() const
{ return aNameResId.GetResMgr(); }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/unxgcc.mk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bc8a2861b473043956e01aeb60a0f419b8705255
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 28 12:09:29 2011 +
tidy up escaping so this works for me
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index c5c0324..fe2aa7e 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -403,7 +403,7 @@ define gb_Module_DEBUGRUNCOMMAND
OFFICESCRIPT=`mktemp` \
printf . $(OUTDIR)/installation/opt/program/ooenv\\n $${OFFICESCRIPT} \
printf gdb $(OUTDIR)/installation/opt/program/soffice.bin
$${OFFICESCRIPT} \
-printf -ex \set args --norestore --nologo
\\\--accept=pipe,name=$(USER);urp;\\\
-env:UserInstallation=file://$(OUTDIR)/installation/\ $${OFFICESCRIPT} \
+printf -ex \set args --norestore --nologo '--accept=pipe,name=$(USER);urp;'
-env:UserInstallation=file://$(OUTDIR)/installation/\ $${OFFICESCRIPT} \
printf -ex \r\\\n $${OFFICESCRIPT} \
$(SHELL) $${OFFICESCRIPT} \
rm $${OFFICESCRIPT}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/source
filter/source/xsltdialog/xmlfiltertabdialog.hxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit f26974181331713b166119d7149c5b280bf3a83e Author: Caolán McNamara caol...@redhat.com Date: Mon Nov 28 16:51:54 2011 + The vcl tabdlg, not the sfx2 one, is the one actually used diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index 7a4a539..ad8d889 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -29,7 +29,9 @@ #define _XMLFILTERTABDIALOG_HXX_ #include com/sun/star/lang/XMultiServiceFactory.hpp -#include sfx2/tabdlg.hxx +#include vcl/tabctrl.hxx +#include vcl/tabdlg.hxx +#include vcl/button.hxx class Window; class ResMgr; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unusedcode.easy
unusedcode.easy |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 22ad135d1beffa214bff0f628d6e1c3fd182b60c Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 30 15:40:16 2011 + update list diff --git a/unusedcode.easy b/unusedcode.easy index ca085ff..874a1e8 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,3 +1,4 @@ +(anonymous namespace)::UpdateInformationProvider::storeCommandInfo(int, com::sun::star::uno::Referencecom::sun::star::ucb::XCommandProcessor const) (anonymous namespace)::getState(std::__debug::vectorcppcanvas::internal::OutDevState, std::allocatorcppcanvas::internal::OutDevState const) (anonymous namespace)::writeInfo(com::sun::star::uno::Referencecom::sun::star::registry::XRegistryKey const, rtl::OUString const, rtl::OUString const) AtomDocument::AtomDocument(AtomPubSession*, std::basic_stringchar, std::char_traitschar, std::allocatorchar ) @@ -79,6 +80,7 @@ CurrencyBox::RemoveValue(long) CurrencyField::CurrencyField(Window*, ResId const) CurrencyFormatter::SetCurrencySymbol(String const) CustomToolBarImportHelper::showToolbar(rtl::OUString const) +Date::IsValidDate() const DateBox::DateBox(Window*, ResId const) DateBox::GetDate(unsigned short) const DateBox::GetDatePos(Date const) const @@ -1989,7 +1991,6 @@ oox::drawingml::CustomShapeProperties::getValue(std::__debug::vectoroox::drawin oox::drawingml::Diagram::getLayoutId() const oox::drawingml::DiagramLayout::layout(std::__debug::vectoroox::drawingml::dgm::Point, std::allocatoroox::drawingml::dgm::Point const, com::sun::star::awt::Point const) oox::drawingml::GetPoint2D(com::sun::star::uno::Referencecom::sun::star::xml::sax::XFastAttributeList const) -oox::drawingml::GetShapePresetType(int) oox::drawingml::GetTextMargin(rtl::OUString const) oox::drawingml::GetTextVerticalAdjust(int) oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties const) @@ -2025,7 +2026,9 @@ oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const, un oox::dump::XmlStreamObject::XmlStreamObject(oox::dump::OutputObjectBase const, oox::dump::BinaryInputStreamRef const) oox::dump::biff::BiffObjectBase::dumpRowRange(oox::dump::String const, bool) oox::dump::biff::FormulaObject::dumpCellFormula(oox::dump::String const, unsigned short) +oox::formulaimport::XmlStream::AttributeList::attribute(int, unsigned short) const oox::formulaimport::XmlStream::AttributeList::hasAttribute(int) const +oox::formulaimport::XmlStream::skipElement(int) oox::ole::VbaHelper::getBasicScriptUrl(rtl::OUString const, rtl::OUString const, rtl::OUString const) oox::ole::VbaProject::hasDialog(rtl::OUString const) const oox::ole::VbaProject::hasModule(rtl::OUString const) const ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/lngmerge.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 60795da6a87f751e69eaf5f731c86d45a040a97e
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 1 14:55:54 2011 +
fix broken .ulf translations
some loon ran a little amock (*cough*)
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index a641528..f07e13e 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -189,7 +189,7 @@ void LngParser::ReadLine( const ByteString sLine_in ,
ByteStringHashMap rText_
{
rtl::OString sLang = getToken(sLine_in, 0, '=');
sLang = comphelper::string::stripStart(sLang, ' ');
- sLang = comphelper::string::stripStart(sLang, ' ');
+ sLang = comphelper::string::stripEnd(sLang, ' ');
rtl::OString sText = getToken(getToken(sLine_in, 1, '\'), 0, '\');
if (!sLang.isEmpty())
rText_inout[ sLang ] = sText;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - canvas/source idl/source rsc/inc rsc/source svx/inc svx/source unotools/source unusedcode.easy xmlhelp/source
canvas/source/cairo/cairo_textlayout.cxx |4 ++-
idl/source/objects/slot.cxx | 22 +--
idl/source/prj/database.cxx |6 ++---
rsc/inc/rscdef.hxx| 18 +---
rsc/inc/rsctools.hxx |2 -
rsc/source/parser/erscerr.cxx |2 -
rsc/source/parser/rscdb.cxx |4 +--
rsc/source/prj/start.cxx | 12 +-
rsc/source/rsc/rsc.cxx| 22 +--
rsc/source/tools/rscdef.cxx |6 ++---
svx/inc/svx/svdetc.hxx|1
svx/source/svdraw/svdetc.cxx |6 -
unotools/source/misc/componentresmodule.cxx |9 +++-
unusedcode.easy | 20 ++---
xmlhelp/source/cxxhelp/provider/databases.cxx | 29 --
xmlhelp/source/cxxhelp/provider/databases.hxx |4 ---
16 files changed, 64 insertions(+), 103 deletions(-)
New commits:
commit b6e200a2befb522b7e6032384a0aca307f01e579
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 6 10:30:12 2011 +
fix annoying debugging-mode crash
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index 11b8201..d1e1459 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -588,7 +588,9 @@ namespace cairocanvas
nWidth,
(int) rOutpos.X(),
(int) rOutpos.Y(),
- cairo_glyphs[0].index, cairo_glyphs[1].index,
cairo_glyphs[2].index,
+ cairo_glyphs.size() 0 ? cairo_glyphs[0].index : -1,
+ cairo_glyphs.size() 1 ? cairo_glyphs[1].index : -1,
+ cairo_glyphs.size() 2 ? cairo_glyphs[2].index : -1,
maLogicalAdvancements.getLength() ? ADV : ,
rSysFontData.bAntialias ? AA : ,
rSysFontData.bFakeBold ? FB : ,
commit 7c89bc26ee2cba7d9afbb54cb01ed449acc0beae
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 2 12:29:10 2011 +
update list
diff --git a/unusedcode.easy b/unusedcode.easy
index aa93d3d..d1afeb5 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,3 @@
-(anonymous namespace)::UpdateInformationProvider::storeCommandInfo(int,
com::sun::star::uno::Referencecom::sun::star::ucb::XCommandProcessor const)
(anonymous
namespace)::getState(std::__debug::vectorcppcanvas::internal::OutDevState,
std::allocatorcppcanvas::internal::OutDevState const)
(anonymous
namespace)::writeInfo(com::sun::star::uno::Referencecom::sun::star::registry::XRegistryKey
const, rtl::OUString const, rtl::OUString const)
AtomDocument::AtomDocument(AtomPubSession*, std::basic_stringchar,
std::char_traitschar, std::allocatorchar )
commit 12ffc366c27c44941336398414251f9f9174212a
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 2 08:17:27 2011 +
callcatcher: update list
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index 42c1c3d..b547289 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -132,7 +132,6 @@ public:
sal_uInt16 GetObject(sal_uIntPtr nPos) const {
return sal_uInt16(sal_uIntPtr(aArr.GetObject(nPos))); }
sal_uIntPtr GetPos(sal_uInt16 nElem)const {
return aArr.GetPos((void*)(sal_uIntPtr)nElem); }
sal_uIntPtr GetCount() const { return
aArr.Count(); }
-void Sort();
};
class ContainerSorter {
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 0e1d3e2..f832244 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -295,12 +295,6 @@ int ImpUShortContainerSorter::Compare(const void* pElem1,
const void* pElem2) co
return n1n2 ? -1 : n1n2 ? 1 : 0;
}
-void UShortCont::Sort()
-{
-ImpUShortContainerSorter aSorter(aArr);
-aSorter.DoSort();
-}
-
void SdrLinkList::Clear()
diff --git a/unusedcode.easy b/unusedcode.easy
index 5213980..aa93d3d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -80,7 +80,6 @@ CurrencyBox::RemoveValue(long)
CurrencyField::CurrencyField(Window*, ResId const)
CurrencyFormatter::SetCurrencySymbol(String const)
CustomToolBarImportHelper::showToolbar(rtl::OUString const)
-Date::IsValidDate() const
DateBox::DateBox(Window*, ResId const)
DateBox::GetDate(unsigned short) const
DateBox::GetDatePos(Date const) const
@@ -332,6 +331,11 @@ SbxDecimal::getUShort(unsigned short)
SbxDecimal::setShort(short)
SbxDecimal::setString(rtl::OUString*)
SbxDecimal::setUShort(unsigned short)
+SbxItem::SetDocument(basctl::ScriptDocument const)
[Libreoffice-commits] .: slideshow/source
slideshow/source/engine/slideshowimpl.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d57887eaad534ca51fc4975918fab66b2f93633d
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 6 16:26:05 2011 +
Resolves: rhbz#759647 ::dispose clears mpPresTimer before releaseTimer
called
diff --git a/slideshow/source/engine/slideshowimpl.cxx
b/slideshow/source/engine/slideshowimpl.cxx
index 5be3b62..4277280 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -2025,10 +2025,14 @@ sal_Bool SlideShowImpl::update( double nNextTimeout )
//that have zero delay. While the timer is stopped these events
//are processed in the same run.
{
+//Get a shared-ptr that outlives the scope-guard which will
+//ensure that the pointed-to-item exists in the case of a
+//::dispose clearing mpPresTimer
+boost::shared_ptrcanvas::tools::ElapsedTime xTimer(mpPresTimer);
comphelper::ScopeGuard scopeGuard(
boost::bind( canvas::tools::ElapsedTime::releaseTimer,
- boost::cref(mpPresTimer) ) );
-mpPresTimer-holdTimer();
+ boost::cref(xTimer) ) );
+xTimer-holdTimer();
// process queues
maEventQueue.process();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/qa
binfilter/qa/cppunit/test_binfilter.cxx | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) New commits: commit b2048718a5a102e9e0bc12d8874f5407afd4cbcd Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 6 21:15:42 2011 + normalize Red Hat, Inc. spellings, and bump to latest template diff --git a/binfilter/qa/cppunit/test_binfilter.cxx b/binfilter/qa/cppunit/test_binfilter.cxx index abca460..d1da8c9 100644 --- a/binfilter/qa/cppunit/test_binfilter.cxx +++ b/binfilter/qa/cppunit/test_binfilter.cxx @@ -4,20 +4,21 @@ * * The contents of this file are subject to the Mozilla Public License Version * 1.1 (the License); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an AS IS basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * for the specific language governing rights and limitations under the * License. * - * The Initial Developer of the Original Code is - *Caolán McNamara caol...@redhat.com (Red Hat, Inc.) - * Portions created by the Initial Developer are Copyright (C) 2011 the - * Initial Developer. All Rights Reserved. + * Major Contributor(s): + * Copyright (C) 2011 Red Hat, Inc., Caolán McNamara caol...@redhat.com + * (initial developer) * - * Contributor(s): Caolán McNamara caol...@redhat.com + * All Rights Reserved. + * + * For minor contributions see the git repository. * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 3 or later (the GPLv3+), or ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - offapi/com tools/bootstrp udkapi/com unusedcode.easy vcl/inc vcl/source
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 +
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 voidReformatAll();
-voidInsertValue( sal_Int64 nValue, sal_uInt16 nPos =
COMBOBOX_APPEND );
-void
[Libreoffice-commits] .: 4 commits - accessibility/inc accessibility/source l10ntools/inc l10ntools/source sal/osl unusedcode.easy
accessibility/inc/accessibility/helper/acc_factory.hxx | 53 -
accessibility/source/helper/acc_factory.cxx| 39 +-
l10ntools/inc/export.hxx | 12 +-
l10ntools/inc/helpmerge.hxx|3
l10ntools/inc/lngmerge.hxx | 21 ++-
l10ntools/source/cfgmerge.cxx |9 +
l10ntools/source/export.cxx| 95 +
l10ntools/source/export2.cxx | 42 +--
l10ntools/source/helpmerge.cxx |9 -
l10ntools/source/lngex.cxx |5
l10ntools/source/lngmerge.cxx | 51 +++--
l10ntools/source/merge.cxx |2
l10ntools/source/xrmmerge.cxx |6 -
sal/osl/unx/system.c |4
unusedcode.easy|7 +
15 files changed, 180 insertions(+), 178 deletions(-)
New commits:
commit 42502c8484cd0aef4732cc33fdc4b9a5a333a1f8
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 7 11:36:01 2011 +
|| -
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index d1fc724..bf8607d 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -201,11 +201,11 @@ int macxp_resolveAlias(char *path, int buflen)
#endif /* NO_PTHREAD_RTL */
-#if defined(LINUX) defined (__GLIBC__) __GLIBC__ == 2 || __GLIBC_MINOR__
4
+#if defined(LINUX) defined (__GLIBC__) __GLIBC__ == 2 __GLIBC_MINOR__
4
/* The linux kernel 2.4 getpid implemention always return the pid of the
thread subprocess and not of the main process, the NPTL implementation
with a Linux kernel 2.6 kernel return the pid. So when possibly
- their is the wrong implementation of getpid, we save the pid at startup.
+ there is the wrong implementation of getpid, we save the pid at startup.
FIXME: when our Linux base-line is above:
+ Linux kernel version 2.6 or higher; - clone() for NTPL
+ glibc2 version 2.4 or higher; - No longer LinuxThreads, only NPTL
commit 6c335f5754ec1aee70cdba2d332e9cece17a7565
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 7 10:49:55 2011 +
convert some archaic l10ntools code
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index ae6c21e..a4d2f80 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -148,7 +148,7 @@ class ResData
{
public:
~ResData();
-sal_Bool SetId( const ByteString rId, sal_uInt16 nLevel );
+sal_Bool SetId(const rtl::OString rId, sal_uInt16 nLevel);
sal_uInt16 nWidth;
sal_uInt16 nChildIndex;
@@ -318,8 +318,8 @@ private:
public:
ParserQueue* pParseQueue; // public ?
-static ByteString sLanguages; // public ?
-static ByteString sForcedLanguages; // public ?
+static rtl::OString sLanguages; // public ?
+static rtl::OString sForcedLanguages; // public ?
static bool skipProject( ByteString sPrj ) ;
@@ -352,8 +352,10 @@ public:
static ByteString GetNativeFile( ByteString sSource );
static DirEntry GetTempFile();
-static void DumpExportList( ByteString sListName , ExportList aList );
-static ByteString DumpMap( ByteString sMapName , ByteStringHashMap aMap
);
+static void DumpExportList(const rtl::OString rListName,
+ExportList aList);
+static ByteString DumpMap(const rtl::OString rMapName,
+ByteStringHashMap aMap);
private:
static std::vectorByteString aLanguages;
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index a160b15..aeb61ae 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -64,7 +64,8 @@ public:
/// Method merges the String from the SDFfile into XMLfile. Both Strings must
/// point to existing files.
-bool Merge( const ByteString rSDFFile_in, const ByteString
rDestinationFile_in , ByteString sLanguage , MergeDataFile aMergeDataFile );
+bool Merge( const ByteString rSDFFile_in, const ByteString
rDestinationFile_in ,
+const rtl::OString sLanguage , MergeDataFile aMergeDataFile );
bool Merge( const ByteString rSDFFile, const ByteString rPathX , const
ByteString rPathY , bool bISO
, const std::vectorByteString aLanguages , MergeDataFile
aMergeDataFile , bool bCreateDir );
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index e658817..285f129 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -47,23 +47,28 @@ class LngParser
private:
sal_uInt16 nError;
LngLineList *pLines;
-ByteString sSource;
+rtl::OString sSource;
sal_Bool bDBIsUTF8;
sal_Bool bULF;
bool bQuiet;
std::vectorByteString aLanguages;
bool isNextGroup( ByteString sGroup_out , ByteString sLine_in);
-void ReadLine( const ByteString sLine_in ,
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/ww8par.cxx | 69 ++--
1 file changed, 59 insertions(+), 10 deletions(-)
New commits:
commit 3e6ae8428a2d9da28c392c58bf8b3b15738088ff
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 8 12:39:07 2011 +
Resolves: fdo#43337 optimize weak-char overriding
When writer would choose the same bias automatically that word
implies or this doc hard-codes, then elide the font-forcing.
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 4d47144..9923768 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2777,6 +2777,26 @@ namespace
}
return nPos;
}
+
+sal_Int32 lcl_getWriterScriptType(
+const uno::Referencei18n::XBreakIterator rBI,
+const rtl::OUString rString, sal_Int32 nPos)
+{
+sal_Int16 nScript = i18n::ScriptType::WEAK;
+
+if (rString.isEmpty())
+return nScript;
+
+while (nPos = 0)
+{
+nScript = rBI-getScriptType(rString, nPos);
+if (nScript != i18n::ScriptType::WEAK)
+break;
+--nPos;
+}
+
+return nScript;
+}
}
//In writer we categorize text into CJK, CTL and Western for everything else.
@@ -2817,6 +2837,14 @@ void
SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString rAddS
sal_Int16 nScript = lcl_getScriptType(xBI, rAddString, 0);
sal_Int32 nLen = rAddString.getLength();
+rtl::OUString sParagraphText;
+const SwCntntNode *pCntNd = pPaM-GetCntntNode();
+const SwTxtNode* pNd = pCntNd ? pCntNd-GetTxtNode() : NULL;
+if (pNd)
+sParagraphText = pNd-GetTxt();
+sal_Int32 nParaOffset = sParagraphText.getLength();
+sParagraphText = sParagraphText + rAddString;
+
sal_Int32 nPos = 0;
while (nPos nLen)
{
@@ -2853,20 +2881,41 @@ void
SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString rAddS
break;
}
-const SvxFontItem *pSourceFont = (const
SvxFontItem*)GetFmtAttr(nForceFromFontId);
+//Now we know that word would use the nForceFromFontId font for
this range
+//Try and determine what script writer would assign this range to
+
+sal_Int32 nWriterScript = lcl_getWriterScriptType(xBI,
sParagraphText,
+nPos + nParaOffset);
+
+bool bWriterWillUseSameFontAsWordAutomatically = false;
+
+if (
+ (nWriterScript == i18n::ScriptType::ASIAN nForceFromFontId
== RES_CHRATR_CJK_FONT) ||
+ (nWriterScript == i18n::ScriptType::COMPLEX
nForceFromFontId == RES_CHRATR_CTL_FONT) ||
+ (nWriterScript == i18n::ScriptType::LATIN nForceFromFontId
== RES_CHRATR_FONT)
+ )
+{
+bWriterWillUseSameFontAsWordAutomatically = true;
+}
-for (size_t i = 0; i SAL_N_ELEMENTS(aIds); ++i)
+//Writer won't use the same font as word, so force the issue
+if (!bWriterWillUseSameFontAsWordAutomatically)
{
-const SvxFontItem *pDestFont = (const
SvxFontItem*)GetFmtAttr(aIds[i]);
-aForced[i] = aIds[i] != nForceFromFontId *pSourceFont !=
*pDestFont;
-if (aForced[i])
+const SvxFontItem *pSourceFont = (const
SvxFontItem*)GetFmtAttr(nForceFromFontId);
+
+for (size_t i = 0; i SAL_N_ELEMENTS(aIds); ++i)
{
-pOverriddenItems[i] =
-(const
SvxFontItem*)pCtrlStck-GetStackAttr(*pPaM-GetPoint(), aIds[i]);
+const SvxFontItem *pDestFont = (const
SvxFontItem*)GetFmtAttr(aIds[i]);
+aForced[i] = aIds[i] != nForceFromFontId *pSourceFont
!= *pDestFont;
+if (aForced[i])
+{
+pOverriddenItems[i] =
+(const
SvxFontItem*)pCtrlStck-GetStackAttr(*pPaM-GetPoint(), aIds[i]);
-SvxFontItem aForceFont(*pSourceFont);
-aForceFont.SetWhich(aIds[i]);
-pCtrlStck-NewAttr(*pPaM-GetPoint(), aForceFont);
+SvxFontItem aForceFont(*pSourceFont);
+aForceFont.SetWhich(aIds[i]);
+pCtrlStck-NewAttr(*pPaM-GetPoint(), aForceFont);
+}
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/filter/ww8/ww8par.cxx | 69 ++--
1 file changed, 59 insertions(+), 10 deletions(-)
New commits:
commit 7614f8a7781c0d33e86d7a5f0988f4e1f30087aa
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 8 12:39:07 2011 +
Resolves: fdo#43337 optimize weak-char overriding
When writer would choose the same bias automatically that word
implies or this doc hard-codes, then elide the font-forcing.
(cherry picked from commit 3e6ae8428a2d9da28c392c58bf8b3b15738088ff)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 4d47144..9923768 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2777,6 +2777,26 @@ namespace
}
return nPos;
}
+
+sal_Int32 lcl_getWriterScriptType(
+const uno::Referencei18n::XBreakIterator rBI,
+const rtl::OUString rString, sal_Int32 nPos)
+{
+sal_Int16 nScript = i18n::ScriptType::WEAK;
+
+if (rString.isEmpty())
+return nScript;
+
+while (nPos = 0)
+{
+nScript = rBI-getScriptType(rString, nPos);
+if (nScript != i18n::ScriptType::WEAK)
+break;
+--nPos;
+}
+
+return nScript;
+}
}
//In writer we categorize text into CJK, CTL and Western for everything else.
@@ -2817,6 +2837,14 @@ void
SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString rAddS
sal_Int16 nScript = lcl_getScriptType(xBI, rAddString, 0);
sal_Int32 nLen = rAddString.getLength();
+rtl::OUString sParagraphText;
+const SwCntntNode *pCntNd = pPaM-GetCntntNode();
+const SwTxtNode* pNd = pCntNd ? pCntNd-GetTxtNode() : NULL;
+if (pNd)
+sParagraphText = pNd-GetTxt();
+sal_Int32 nParaOffset = sParagraphText.getLength();
+sParagraphText = sParagraphText + rAddString;
+
sal_Int32 nPos = 0;
while (nPos nLen)
{
@@ -2853,20 +2881,41 @@ void
SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString rAddS
break;
}
-const SvxFontItem *pSourceFont = (const
SvxFontItem*)GetFmtAttr(nForceFromFontId);
+//Now we know that word would use the nForceFromFontId font for
this range
+//Try and determine what script writer would assign this range to
+
+sal_Int32 nWriterScript = lcl_getWriterScriptType(xBI,
sParagraphText,
+nPos + nParaOffset);
+
+bool bWriterWillUseSameFontAsWordAutomatically = false;
+
+if (
+ (nWriterScript == i18n::ScriptType::ASIAN nForceFromFontId
== RES_CHRATR_CJK_FONT) ||
+ (nWriterScript == i18n::ScriptType::COMPLEX
nForceFromFontId == RES_CHRATR_CTL_FONT) ||
+ (nWriterScript == i18n::ScriptType::LATIN nForceFromFontId
== RES_CHRATR_FONT)
+ )
+{
+bWriterWillUseSameFontAsWordAutomatically = true;
+}
-for (size_t i = 0; i SAL_N_ELEMENTS(aIds); ++i)
+//Writer won't use the same font as word, so force the issue
+if (!bWriterWillUseSameFontAsWordAutomatically)
{
-const SvxFontItem *pDestFont = (const
SvxFontItem*)GetFmtAttr(aIds[i]);
-aForced[i] = aIds[i] != nForceFromFontId *pSourceFont !=
*pDestFont;
-if (aForced[i])
+const SvxFontItem *pSourceFont = (const
SvxFontItem*)GetFmtAttr(nForceFromFontId);
+
+for (size_t i = 0; i SAL_N_ELEMENTS(aIds); ++i)
{
-pOverriddenItems[i] =
-(const
SvxFontItem*)pCtrlStck-GetStackAttr(*pPaM-GetPoint(), aIds[i]);
+const SvxFontItem *pDestFont = (const
SvxFontItem*)GetFmtAttr(aIds[i]);
+aForced[i] = aIds[i] != nForceFromFontId *pSourceFont
!= *pDestFont;
+if (aForced[i])
+{
+pOverriddenItems[i] =
+(const
SvxFontItem*)pCtrlStck-GetStackAttr(*pPaM-GetPoint(), aIds[i]);
-SvxFontItem aForceFont(*pSourceFont);
-aForceFont.SetWhich(aIds[i]);
-pCtrlStck-NewAttr(*pPaM-GetPoint(), aForceFont);
+SvxFontItem aForceFont(*pSourceFont);
+aForceFont.SetWhich(aIds[i]);
+pCtrlStck-NewAttr(*pPaM-GetPoint(), aForceFont);
+}
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svtools/source
svtools/source/brwbox/brwbox2.cxx | 40 +-
1 file changed, 27 insertions(+), 13 deletions(-)
New commits:
commit 09400837349f3f42d47ff570abb3c2d5f50b3e50
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 12 09:17:17 2011 +
Resolves: fdo#42694 crash inserting table control
(cherry picked from commit 4521fc855b319bd8aa6583900d97c026bcc5f32f)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/svtools/source/brwbox/brwbox2.cxx
b/svtools/source/brwbox/brwbox2.cxx
index 30937db..92c29de 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -599,8 +599,10 @@ void BrowseBox::Resize()
nSBSize = (sal_uLong)(nSBSize * (double)GetZoom());
DoHideCursor( Resize );
-sal_uInt16 nOldVisibleRows =
-(sal_uInt16)(pDataWin-GetOutputSizePixel().Height() /
GetDataRowHeight() + 1);
+sal_uInt16 nOldVisibleRows = 0;
+//fdo#42694, post #i25# GetDataRowHeight() can be 0
+if (GetDataRowHeight())
+nOldVisibleRows = (sal_uInt16)(pDataWin-GetOutputSizePixel().Height()
/ GetDataRowHeight() + 1);
// did we need a horiz. scroll bar oder gibt es eine Control Area?
if ( !getDataWindow()-bNoHScroll
@@ -623,8 +625,10 @@ void BrowseBox::Resize()
Point( 0, GetTitleHeight() ),
Size( nDataWidth, nDataHeight ) );
-sal_uInt16 nVisibleRows =
-(sal_uInt16)(pDataWin-GetOutputSizePixel().Height() /
GetDataRowHeight() + 1);
+sal_uInt16 nVisibleRows = 0;
+
+if (GetDataRowHeight())
+nVisibleRows = (sal_uInt16)(pDataWin-GetOutputSizePixel().Height() /
GetDataRowHeight() + 1);
// TopRow ist unveraendert, aber die Anzahl sichtbarer Zeilen hat sich
// geaendert
@@ -911,8 +915,13 @@ void BrowseBox::ImplPaintData(OutputDevice _rOut, const
Rectangle _rRect, sal_
long nDataRowHeigt = GetDataRowHeight();
// compute relative rows to redraw
-sal_uLong nRelTopRow = _bForeignDevice ? 0 : ((sal_uLong)_rRect.Top() /
nDataRowHeigt);
-sal_uLong nRelBottomRow = (sal_uLong)(_bForeignDevice ?
aOverallAreaSize.Height() : _rRect.Bottom()) / nDataRowHeigt;
+sal_uLong nRelTopRow = 0;
+sal_uLong nRelBottomRow = aOverallAreaSize.Height();
+if (!_bForeignDevice nDataRowHeigt)
+{
+nRelTopRow = ((sal_uLong)_rRect.Top() / nDataRowHeigt);
+nRelBottomRow = (sal_uLong)(_rRect.Bottom()) / nDataRowHeigt;
+}
// cache frequently used values
Point aPos( aOverallAreaPos.X(), nRelTopRow * nDataRowHeigt +
aOverallAreaPos.Y() );
@@ -1182,11 +1191,16 @@ void BrowseBox::UpdateScrollbars()
if (IsZoom())
nCornerSize = (sal_uLong)(nCornerSize * (double)GetZoom());
-// needs VScroll?
-long nMaxRows = (pDataWin-GetSizePixel().Height()) / GetDataRowHeight();
-sal_Bool bNeedsVScroll =getDataWindow()-bAutoVScroll
-? nTopRow || ( nRowCount nMaxRows )
-: !getDataWindow()-bNoVScroll;
+sal_Bool bNeedsVScroll = sal_False;
+long nMaxRows = 0;
+if (GetDataRowHeight())
+{
+// needs VScroll?
+nMaxRows = (pDataWin-GetSizePixel().Height()) / GetDataRowHeight();
+bNeedsVScroll =getDataWindow()-bAutoVScroll
+? nTopRow || ( nRowCount nMaxRows )
+: !getDataWindow()-bNoVScroll;
+}
Size aDataWinSize = pDataWin-GetSizePixel();
if ( !bNeedsVScroll )
{
@@ -1269,8 +1283,8 @@ void BrowseBox::UpdateScrollbars()
pVScroll-SetPosSizePixel(
Point( aDataWinSize.Width(), GetTitleHeight() ),
Size( nCornerSize, aDataWinSize.Height()) );
-if ( nRowCount
- long( aDataWinSize.Height() / GetDataRowHeight() ) )
+long nLclDataRowHeight = GetDataRowHeight();
+if ( nLclDataRowHeight 0 nRowCount long( aDataWinSize.Height() /
nLclDataRowHeight ) )
ScrollRows( -nTopRow );
if ( bNeedsVScroll !pVScroll-IsVisible() )
pVScroll-Show();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 96e3f652ad0c02140fea42790e2d0a2baabb45d8
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 12 11:35:49 2011 +
stop saying 15 on stdout
(cherry picked from commit 6765b2b71544a1ca0957fbd5e04062c274a24f45)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index f9e5906..d064f83 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2103,7 +2103,6 @@ static Rectangle NWGetSpinButtonRect( int nScreen,
buttonRect.Left() = buttonRect.Right()+1;
buttonRect.Right() = aAreaRect.Right();
} else {
-printf(%ld\n, buttonRect.GetWidth());
buttonRect.Right() = buttonRect.Left()-1;
buttonRect.Left() = aAreaRect.Left();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/inc
tools/inc/tools/rtti.hxx |9 -
1 file changed, 9 deletions(-)
New commits:
commit 37785dde4be04375e83a477a0f5670c6490f4f93
Author: Rafael Dominguez venccsra...@gmail.com
Date: Sat Dec 10 14:42:29 2011 -0430
Remove unused macros.
diff --git a/tools/inc/tools/rtti.hxx b/tools/inc/tools/rtti.hxx
index 34f14c5..7f279f1 100644
--- a/tools/inc/tools/rtti.hxx
+++ b/tools/inc/tools/rtti.hxx
@@ -63,7 +63,6 @@ typedef void* (*TypeId)();
//-
-#define TYPEINIT_AUTOFACTORY(sType) TYPEINIT_FACTORY(sType, new sType)
#define TYPEINIT(sType) TYPEINIT_FACTORY(sType, 0)
#define SUPERTYPE(sSuper) \
@@ -107,8 +106,6 @@ typedef void* (*TypeId)();
SUPERTYPE(sSuper2); \
SUPERTYPE(sSuper3); \
TYPEINIT_END(sType)
-#define TYPEINIT3_AUTOFACTORY(sType, sSuper1, sSuper2, sSuper3) \
-TYPEINIT3_FACTORY(sType, sSuper1, sSuper2, sSuper3, new sType)
#define TYPEINIT3(sType, sSuper1, sSuper2, sSuper3) \
TYPEINIT3_FACTORY(sType, sSuper1, sSuper2, sSuper3, 0)
@@ -120,12 +117,6 @@ typedef void* (*TypeId)();
//-
// On-Demand-faehige persistent-TypeId Version
-#define TYPEINFO_ID(id) \
-static TypeId StaticType() { return (TypeId) ( id | 0xF00L ); } \
-static sal_Bool IsOf( TypeId aSameOrSuperType ); \
-virtual TypeId Type() const; \
-virtual sal_Bool IsA( TypeId aSameOrSuperType ) const
-
#define TYPEINIT_ID(sType) \
TypeId sType::Type() const { return StaticType(); } \
sal_Bool sType::IsOf( TypeId aSameOrSuperType ) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: pyuno/source
pyuno/source/loader/pythonloader.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fb37327df4153a31d7ba28e2bc3f742f4efc9f34 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 12 14:17:08 2011 + Let's not have debug spew all the time diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index c4fa69d..da3efa7 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -35,7 +35,7 @@ from com.sun.star.loader import XImplementationLoader from com.sun.star.lang import XServiceInfo MODULE_PROTOCOL = vnd.openoffice.pymodule: -DEBUG = 1 +DEBUG = 0 g_supportedServices = com.sun.star.loader.Python, # referenced by the native C++ loader ! g_implementationName = org.openoffice.comp.pyuno.Loader # referenced by the native C++ loader ! ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - pyuno/source
pyuno/source/loader/pythonloader.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4a7ba0cbaf5311342c48faeb0dc7269c47560fde Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 12 14:17:08 2011 + Let's not have debug spew all the time (cherry picked from commit fb37327df4153a31d7ba28e2bc3f742f4efc9f34) Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index c4fa69d..da3efa7 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -35,7 +35,7 @@ from com.sun.star.loader import XImplementationLoader from com.sun.star.lang import XServiceInfo MODULE_PROTOCOL = vnd.openoffice.pymodule: -DEBUG = 1 +DEBUG = 0 g_supportedServices = com.sun.star.loader.Python, # referenced by the native C++ loader ! g_implementationName = org.openoffice.comp.pyuno.Loader # referenced by the native C++ loader ! ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: pyuno/source
pyuno/source/loader/pythonloader.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9e8ac5c91e8bd42467b130b3cd53da44f7b736f6 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 12 15:21:19 2011 + more debug spew in non-debug product diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index da3efa7..eef1bd6 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -139,8 +139,8 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ): mod = self.getModuleFromUrl( locationUrl ) implHelper = mod.__dict__.get( g_ImplementationHelper , None ) -print (dump stuff) if DEBUG: +print (dump stuff) print (Fetched ImplHelper as + str(implHelper)) if implHelper == None: return mod.getComponentFactory( implementationName, self.ctx.ServiceManager, regKey ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/window/accel.cxx | 20
1 file changed, 12 insertions(+), 8 deletions(-)
New commits:
commit 26c0c9d404a65d5ab7a5a9c227132594e467cef4
Author: Marcel Metz mm...@adrian-broher.net
Date: Mon Dec 12 16:02:22 2011 +
Related: fdo#38832 Replace ImplAccesTable with std::map
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index f45b145..e755d48 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -27,18 +27,18 @@
/
-#include tools/table.hxx
#include tools/debug.hxx
#include tools/rc.h
#include vcl/svapp.hxx
#include accel.h
#include vcl/accel.hxx
+#include map
#include vector
// ===
-DECLARE_TABLE( ImplAccelTable, ImplAccelEntry* )
+typedef ::std::map sal_uLong, ImplAccelEntry* ImplAccelMap;
typedef ::std::vector ImplAccelEntry* ImplAccelList;
#define ACCELENTRY_NOTFOUND ((sal_uInt16)0x)
@@ -48,8 +48,8 @@ typedef ::std::vector ImplAccelEntry* ImplAccelList;
class ImplAccelData
{
public:
-ImplAccelTable maKeyTable; // for keycodes, generated with a code
-ImplAccelList maIdList; // Id-List
+ImplAccelMap maKeyMap; // for keycodes, generated with a code
+ImplAccelList maIdList; // Id-List
};
// ===
@@ -179,7 +179,11 @@ void Accelerator::ImplInit()
ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode rKeyCode ) const
{
-return mpData-maKeyTable.Get( rKeyCode.GetFullKeyCode() );
+ImplAccelMap::iterator it = mpData-maKeyMap.find(
rKeyCode.GetFullKeyCode() );
+if( it != mpData-maKeyMap.end() )
+return it-second;
+else
+return NULL;
}
// ---
@@ -200,7 +204,7 @@ void Accelerator::ImplCopyData( ImplAccelData rAccelData )
else
pEntry-mpAutoAccel = NULL;
-mpData-maKeyTable.Insert(
(sal_uLong)pEntry-maKeyCode.GetFullKeyCode(), pEntry );
+mpData-maKeyMap.insert( std::make_pair(
pEntry-maKeyCode.GetFullKeyCode(), pEntry ) );
mpData-maIdList.push_back( pEntry );
}
}
@@ -267,7 +271,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId,
const KeyCode rKeyCode,
OSL_FAIL( Accelerator::InsertItem(): KeyCode with KeyCode 0 not
allowed );
delete pEntry;
}
-else if ( !mpData-maKeyTable.Insert( nCode, pEntry ) )
+else if ( mpData-maKeyMap.insert( std::make_pair( nCode, pEntry )
).second )
{
OSL_TRACE( Accelerator::InsertItem(): KeyCode (Key: %lx) already
exists, nCode );
delete pEntry;
@@ -470,7 +474,7 @@ Accelerator Accelerator::operator=( const Accelerator
rAccel )
// delete and copy tables
ImplDeleteData();
-mpData-maKeyTable.Clear();
+mpData-maKeyMap.clear();
ImplCopyData( *((ImplAccelData*)(rAccel.mpData)) );
return *this;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/window/accel.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 20d6bd273c43a9b8573fa077f6d9d631bd2d53cc
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 12 16:18:37 2011 +
pair::second is false if element with same key already existed
The pair::second element in the pair is set to true if a new element was
inserted or false if an element with the same value existed
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index e755d48..50afd2b 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -271,7 +271,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId,
const KeyCode rKeyCode,
OSL_FAIL( Accelerator::InsertItem(): KeyCode with KeyCode 0 not
allowed );
delete pEntry;
}
-else if ( mpData-maKeyMap.insert( std::make_pair( nCode, pEntry )
).second )
+else if ( !mpData-maKeyMap.insert( std::make_pair( nCode, pEntry )
).second )
{
OSL_TRACE( Accelerator::InsertItem(): KeyCode (Key: %lx) already
exists, nCode );
delete pEntry;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source
cui/source/dialogs/pastedlg.cxx | 26 --
cui/source/inc/pastedlg.hxx |4 ++--
2 files changed, 14 insertions(+), 16 deletions(-)
New commits:
commit d6e21fd53cda06460f2c1611ef5d0744132d87bc
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 12 16:32:34 2011 +
now with an STL map we don't have to do our own mem allocation
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 656a813..99cb187 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -112,11 +112,6 @@ void SvPasteObjectDialog::SetDefault()
SvPasteObjectDialog::~SvPasteObjectDialog()
{
-::std::map SotFormatStringId, String* ::iterator it;
-for(it = aSupplementMap.begin(); it != aSupplementMap.end(); ++it)
-{
-delete it-second;
-}
}
/*
@@ -124,9 +119,7 @@ SvPasteObjectDialog::~SvPasteObjectDialog()
*/
void SvPasteObjectDialog::Insert( SotFormatStringId nFormat, const String
rFormatName )
{
-String * pStr = new String( rFormatName );
-if( !aSupplementMap.insert( ::std::make_pair( nFormat, pStr ) ).second )
-delete pStr;
+aSupplementMap.insert( ::std::make_pair( nFormat, rFormatName ) );
}
sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper
rHelper,
@@ -155,15 +148,15 @@ sal_uLong SvPasteObjectDialog::GetFormat( const
TransferableDataHelper rHelper,
::com::sun::star::datatransfer::DataFlavor aFlavor( *aIter );
SotFormatStringId nFormat = (*aIter++).mnSotId;
-String* pName = NULL;
-String aName;
-::std::map SotFormatStringId, String* ::iterator itName;
-itName = aSupplementMap.find( nFormat );
+::std::map SotFormatStringId, String ::iterator itName =
+aSupplementMap.find( nFormat );
// if there is an Embed Source or and Embedded Object on the
// Clipboard we read the Description and the Source of this object
// from an accompanied Object Descriptor format on the clipboard
// Remember: these formats mostly appear together on the clipboard
+String aName;
+const String* pName = NULL;
if ( itName == aSupplementMap.end() )
{
SvPasteObjectHelper::GetEmbeddedName(rHelper,aName,aSourceName,nFormat);
@@ -172,7 +165,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const
TransferableDataHelper rHelper,
}
else
{
-pName = itName-second;
+pName = (itName-second);
}
if( pName )
@@ -181,7 +174,8 @@ sal_uLong SvPasteObjectDialog::GetFormat( const
TransferableDataHelper rHelper,
if( SOT_FORMATSTR_ID_EMBED_SOURCE == nFormat )
{
-if( aDesc.maClassName != aEmptyNm )
{
+if( aDesc.maClassName != aEmptyNm )
+{
aSourceName = aDesc.maDisplayName;
if( aDesc.maClassName == aObjClassName )
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index ddf4ccb..21dee34 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -60,7 +60,7 @@ class SvPasteObjectDialog : public ModalDialog
OKButton aOKButton1;
CancelButton aCancelButton1;
HelpButton aHelpButton1;
-::std::map SotFormatStringId, String* aSupplementMap;
+::std::map SotFormatStringId, String aSupplementMap;
SvGlobalNameaObjClassName;
String aObjName;
sal_uInt16 nAspect;
commit 57054f84f66c4d2db8d117a4043e0fbcbd0ee528
Author: Marcel Metz mm...@adrian-broher.net
Date: Mon Dec 12 16:25:22 2011 +
Related: fdo#38832 Replace Table with std::map
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 47fdf2f..656a813 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -112,11 +112,10 @@ void SvPasteObjectDialog::SetDefault()
SvPasteObjectDialog::~SvPasteObjectDialog()
{
-void * pStr = aSupplementTable.First();
-while( pStr )
+::std::map SotFormatStringId, String* ::iterator it;
+for(it = aSupplementMap.begin(); it != aSupplementMap.end(); ++it)
{
-delete (String *)pStr;
-pStr = aSupplementTable.Next();
+delete it-second;
}
}
@@ -126,7 +125,7 @@ SvPasteObjectDialog::~SvPasteObjectDialog()
void SvPasteObjectDialog::Insert( SotFormatStringId nFormat, const String
rFormatName )
{
String * pStr = new String( rFormatName );
-if( !aSupplementTable.Insert( nFormat, pStr ) )
+if( !aSupplementMap.insert( ::std::make_pair( nFormat, pStr ) ).second )
delete pStr;
}
@@ -156,20 +155,25 @@ sal_uLong SvPasteObjectDialog::GetFormat( const
TransferableDataHelper rHelper,
[Libreoffice-commits] .: svl/source
svl/source/misc/inettype.cxx | 38 ++
1 file changed, 22 insertions(+), 16 deletions(-)
New commits:
commit 9fd35cc973e12a07d82e5ca14ec1f4307dbbada9
Author: Marcel Metz mm...@adrian-broher.net
Date: Mon Dec 12 16:50:32 2011 +
Related: fdo#38832 Replace Table with std::map
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 1cba9dc..b043f06 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -85,8 +85,9 @@ class Registration
{
typedef boost::ptr_mapUniString, TypeNameMapEntry TypeNameMap;
typedef boost::ptr_mapUniString, ExtensionMapEntry ExtensionMap;
+typedef std::mapINetContentType, TypeIDMapEntry* TypeIDMap;
-Table m_aTypeIDMap; // map TypeID to TypeName, Presentation
+TypeIDMapm_aTypeIDMap;// map ContentType to TypeID
TypeNameMap m_aTypeNameMap; // map TypeName to TypeID, Extension
ExtensionMap m_aExtensionMap; // map Extension to TypeID
sal_uInt32 m_nNextDynamicID;
@@ -127,8 +128,13 @@ namespace
// static
inline TypeIDMapEntry * Registration::getEntry(INetContentType eTypeID)
{
-return static_cast TypeIDMapEntry * (theRegistration::get().
-m_aTypeIDMap.Get(eTypeID));
+Registration rRegistration = theRegistration::get();
+
+TypeIDMap::iterator it = rRegistration.m_aTypeIDMap.find( eTypeID );
+if( it != rRegistration.m_aTypeIDMap.end() )
+return it-second;
+else
+return NULL;
}
//
@@ -526,10 +532,8 @@ MediaTypeEntry const aStaticPresentationMap[]
//
Registration::~Registration()
{
-{for (sal_uLong i = 0; i m_aTypeIDMap.Count(); ++i)
-delete static_cast TypeIDMapEntry * (m_aTypeIDMap.GetObject(i));
-}
-m_aTypeIDMap.Clear();
+for ( TypeIDMap::iterator it = m_aTypeIDMap.begin(); it !=
m_aTypeIDMap.end(); ++it )
+delete it-second;
}
//
@@ -571,7 +575,7 @@ INetContentType Registration::RegisterContentType(UniString
const rTypeName,
pTypeIDMapEntry-m_aPresentation = rPresentation;
if (pSystemFileType)
pTypeIDMapEntry-m_aSystemFileType = *pSystemFileType;
-rRegistration.m_aTypeIDMap.Insert(eTypeID, pTypeIDMapEntry);
+rRegistration.m_aTypeIDMap.insert( ::std::make_pair( eTypeID,
pTypeIDMapEntry ) );
std::auto_ptrTypeNameMapEntry pTypeNameMapEntry(new TypeNameMapEntry());
if (pExtension)
@@ -609,10 +613,11 @@ UniString Registration::GetContentType(INetContentType
eTypeID)
{
Registration rRegistration = theRegistration::get();
-TypeIDMapEntry * pEntry
-= static_cast TypeIDMapEntry * (rRegistration.
- m_aTypeIDMap.Get(eTypeID));
-return pEntry ? pEntry-m_aTypeName : UniString();
+TypeIDMap::iterator pEntry = rRegistration.m_aTypeIDMap.find( eTypeID );
+if( pEntry != rRegistration.m_aTypeIDMap.end() )
+return pEntry-second-m_aTypeName;
+else
+return UniString();
}
//
@@ -621,10 +626,11 @@ UniString Registration::GetPresentation(INetContentType
eTypeID)
{
Registration rRegistration = theRegistration::get();
-TypeIDMapEntry * pEntry
-= static_cast TypeIDMapEntry * (rRegistration.
- m_aTypeIDMap.Get(eTypeID));
-return pEntry ? pEntry-m_aPresentation : UniString();
+TypeIDMap::iterator pEntry = rRegistration.m_aTypeIDMap.find( eTypeID );
+if( pEntry != rRegistration.m_aTypeIDMap.end() )
+return pEntry-second-m_aPresentation;
+else
+return UniString();
}
//
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/rtl
sal/rtl/source/alloc_global.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit edf90c212d8bfe6360a1e35eb4d7fbbf82ed33b4
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 13 14:53:41 2011 +
warn about massive allocs
diff --git a/sal/rtl/source/alloc_global.cxx b/sal/rtl/source/alloc_global.cxx
index 6cf7509..59213a1 100644
--- a/sal/rtl/source/alloc_global.cxx
+++ b/sal/rtl/source/alloc_global.cxx
@@ -28,6 +28,7 @@
#include alloc_impl.hxx
#include rtl/alloc.h
+#include sal/log.hxx
#include sal/macros.h
#include cassert
@@ -295,6 +296,9 @@ void * SAL_CALL rtl_reallocateMemory_SYSTEM (void * p,
sal_Size n)
void* SAL_CALL rtl_allocateMemory (sal_Size n) SAL_THROW_EXTERN_C()
{
+SAL_WARN_IF(
+n = SAL_MAX_INT32, sal,
+suspicious massive alloc n);
#if !defined(FORCE_SYSALLOC)
while (1)
{
@@ -315,6 +319,9 @@ void* SAL_CALL rtl_allocateMemory (sal_Size n)
SAL_THROW_EXTERN_C()
void* SAL_CALL rtl_reallocateMemory (void * p, sal_Size n) SAL_THROW_EXTERN_C()
{
+SAL_WARN_IF(
+n = SAL_MAX_INT32, sal,
+suspicious massive alloc n);
#if !defined(FORCE_SYSALLOC)
while (1)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/inc tools/source
tools/inc/tools/string.hxx |6 +++---
tools/source/string/strcvt.cxx | 13 -
2 files changed, 3 insertions(+), 16 deletions(-)
New commits:
commit f356303302630f1d1d4a99189fc0c26f7f338911
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 14 13:39:14 2011 +
strip ByteClass down some more
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 527062d..8f3be40 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -163,6 +163,9 @@ private:
ByteString( const sal_Unicode* pUniStr, xub_StrLen
nLen,
rtl_TextEncoding eTextEncoding,
sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed
methods without compiler making somethiing to fit
+ByteString( const UniString rUniStr,
+rtl_TextEncoding eTextEncoding,
+sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed
methods without compiler making somethiing to fit
voidAssign(int); // not implemented; to detect misuses of
// Assign(sal_Char)
voidoperator =(int); // not implemented; to detect misuses
@@ -179,9 +182,6 @@ public:
ByteString( const rtl::OString rStr );
ByteString( const sal_Char* pCharStr );
ByteString( const sal_Char* pCharStr, xub_StrLen nLen
);
-ByteString( const UniString rUniStr,
-rtl_TextEncoding eTextEncoding,
-sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS );
~ByteString();
operator rtl::OString () const
diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx
index 75f1934..0f4a145 100644
--- a/tools/source/string/strcvt.cxx
+++ b/tools/source/string/strcvt.cxx
@@ -29,19 +29,6 @@
// ===
-ByteString::ByteString( const UniString rUniStr, rtl_TextEncoding
eTextEncoding, sal_uInt32 nCvtFlags )
-{
-DBG_CTOR( ByteString, DbgCheckByteString );
-DBG_CHKOBJ( rUniStr, UniString, DbgCheckUniString );
-
-mpData = NULL;
-rtl_uString2String( (rtl_String **)(mpData),
-rUniStr.mpData-maStr, rUniStr.mpData-mnLen,
-eTextEncoding, nCvtFlags );
-}
-
-// ===
-
ByteString::ByteString( const rtl::OString rStr )
: mpData(NULL)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - lingucomponent/source
lingucomponent/source/languageguessing/exports.dxp |1 + lingucomponent/source/languageguessing/makefile.mk | 10 +- 2 files changed, 6 insertions(+), 5 deletions(-) New commits: commit c8fc44a4468ad27655a778d51c8877d0f036e996 Author: Caolán McNamara caol...@redhat.com Date: Thu Dec 15 11:52:42 2011 + Resolves: fdo#43422 component_getFactory is missing this is already converted to gbuild in head, so presumably visibility woes are gone there now. diff --git a/lingucomponent/source/languageguessing/exports.dxp b/lingucomponent/source/languageguessing/exports.dxp new file mode 100644 index 000..7003307 --- /dev/null +++ b/lingucomponent/source/languageguessing/exports.dxp @@ -0,0 +1 @@ +component_getFactory diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk index 5fe1945..a99e1f4 100644 --- a/lingucomponent/source/languageguessing/makefile.mk +++ b/lingucomponent/source/languageguessing/makefile.mk @@ -1,4 +1,4 @@ -#* + # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -27,11 +27,9 @@ PRJ=..$/.. PRJNAME=lingucomponent - TARGET=guesslang - ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE +USE_DEFFILE=TRUE #- Settings - @@ -72,14 +70,16 @@ SHL1STDLIBS= \ $(UNOTOOLSLIB) # build DLL -SHL1USE_EXPORTS = name SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1IMPLIB= i$(TARGET) SHL1DEPN= $(SHL1LIBS) SHL1DEF=$(MISC)$/$(SHL1TARGET).def +SHL1VERSIONMAP=$(SOLARENV)/src/component.map + # build DEF file DEF1NAME=$(SHL1TARGET) +DEF1EXPORTFILE= exports.dxp # --- Targets -- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - filter/source
filter/source/msfilter/msdffimp.cxx | 31 +--
1 file changed, 25 insertions(+), 6 deletions(-)
New commits:
commit 5ec1a1dff4783437ba8f6b22db166aa10a1e9e69
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 16 11:31:35 2011 +
avoid looping on busted escher records
(cherry picked from commit 512401decb286ba0fc3031939b8f7de8649c502e)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 6853c13..afc272a 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3380,7 +3380,7 @@ sal_Bool SvxMSDffManager::SeekToShape( SvStream rSt,
void* /* pClientData */, s
rSt aEscherF002Hd;
sal_uLong nEscherF002End = aEscherF002Hd.GetRecEndFilePos();
DffRecordHeader aEscherObjListHd;
-while ( rSt.Tell() nEscherF002End )
+while (rSt.good() rSt.Tell() nEscherF002End)
{
rSt aEscherObjListHd;
if ( aEscherObjListHd.nRecVer != 0xf )
@@ -3417,6 +3417,8 @@ bool SvxMSDffManager::SeekToRec( SvStream rSt,
sal_uInt16 nRecId, sal_uLong nMa
do
{
rSt aHd;
+if (!rSt.good())
+break;
if ( aHd.nRecType == nRecId )
{
if ( nSkipCount )
@@ -3431,9 +3433,13 @@ bool SvxMSDffManager::SeekToRec( SvStream rSt,
sal_uInt16 nRecId, sal_uLong nMa
}
}
if ( !bRet )
-aHd.SeekToEndOfRecord( rSt );
+{
+bool bSeekSuccess = aHd.SeekToEndOfRecord( rSt );
+if (!bSeekSuccess)
+break;
+}
}
-while ( rSt.GetError() == 0 rSt.Tell() nMaxFilePos !bRet );
+while ( rSt.good() rSt.Tell() nMaxFilePos !bRet );
if ( !bRet )
rSt.Seek( nFPosMerk ); // FilePos restaurieren
return bRet;
@@ -6018,10 +6024,17 @@ void SvxMSDffManager::GetFidclData( sal_uInt32
nOffsDggL )
if ( mnIdClusters-- 2 )
{
-if ( aDggAtomHd.nRecLen == ( mnIdClusters * sizeof( FIDCL ) +
16 ) )
+const sal_Size nFIDCLsize = sizeof(sal_uInt32) * 2;
+if ( aDggAtomHd.nRecLen == ( mnIdClusters * nFIDCLsize + 16 ) )
{
+sal_Size nMaxEntriesPossible = rStCtrl.remainingSize() /
nFIDCLsize;
+SAL_WARN_IF(nMaxEntriesPossible mnIdClusters,
+escher, FIDCL list longer than remaining bytes, ppt
or parser is wrong);
+mnIdClusters = std::min(nMaxEntriesPossible,
static_castsal_Size(mnIdClusters));
+
mpFidcls = new FIDCL[ mnIdClusters ];
-for ( sal_uInt32 i = 0; i mnIdClusters; i++ )
+memset(mpFidcls, 0, mnIdClusters * sizeof(FIDCL));
+for (sal_uInt32 i = 0; i mnIdClusters; ++i)
{
rStCtrl mpFidcls[ i ].dgid
mpFidcls[ i ].cspidCur;
@@ -6814,6 +6827,8 @@ bool
SvxMSDffManager::ReadCommonRecordHeader(DffRecordHeader rRec,
rRec.nRecInstance, rRec.nRecType, rRec.nRecLen);
}
+sal_uInt32 nMaxLegalRecordLength = SAL_MAX_UINT32 -
DFF_COMMON_RECORD_HEADER_SIZE;
+
/* also static */
bool SvxMSDffManager::ReadCommonRecordHeader(SvStream rSt,
sal_uInt8 rVer, sal_uInt16 rInst, sal_uInt16 rFbt, sal_uInt32 rLength)
@@ -6822,7 +6837,11 @@ bool SvxMSDffManager::ReadCommonRecordHeader(SvStream
rSt,
rSt nTmp rFbt rLength;
rVer = sal::static_int_cast sal_uInt8 (nTmp 15);
rInst = nTmp 4;
-return rSt.good();
+if (!rSt.good())
+return false;
+if (rLength nMaxLegalRecordLength)
+return false;
+return true;
}
sal_Bool SvxMSDffManager::ProcessClientAnchor(SvStream rStData, sal_uInt32
nDatLen,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - accessibility/bridge svx/Library_svxcore.mk
accessibility/bridge/source/java/makefile.mk |2 +- svx/Library_svxcore.mk |3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 9bf638c8f0a744965aa3e9568bf6fe8caaf57f25 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 19 10:20:51 2011 + msvc 2008 express won't link without explicit salhelper post salhelper visibility markup and gbuildification express 2008 doesn't link without salhelper mentioned on link line diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 5ae06ab..f7b3be7 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -73,7 +73,8 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\ i18nisolang1 \ lng \ sal \ - sax \ +salhelper \ +sax \ sfx \ sot \ svl \ commit c61f986374a875acdbc29b3576271342742f8946 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 19 10:14:56 2011 + msvc 2008 express won't link without explicit salhelper post salhelper visibility markup and gbuildification express 2008 doesn't link without salhelper mentioned on link line diff --git a/accessibility/bridge/source/java/makefile.mk b/accessibility/bridge/source/java/makefile.mk index 5aeb21c..f010b95 100644 --- a/accessibility/bridge/source/java/makefile.mk +++ b/accessibility/bridge/source/java/makefile.mk @@ -45,7 +45,7 @@ SLOFILES= $(SLO)$/WindowsAccessBridgeAdapter.obj SHL1TARGET=java_uno_accessbridge SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS=$(VCLLIB) $(TOOLSLIB) $(JVMACCESSLIB) $(CPPULIB) $(SALLIB) +SHL1STDLIBS=$(VCLLIB) $(TOOLSLIB) $(JVMACCESSLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) SHL1OBJS=$(SLOFILES) SHL1VERSIONOBJ= ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sd
binfilter/bf_sd/util/makefile.mk |1 + 1 file changed, 1 insertion(+) New commits: commit ac67fcce783971e922fbf8fc0e924d5ba1cd9731 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 19 10:26:29 2011 + msvc 2008 express won't link without explicit salhelper post salhelper visibility markup and gbuildification express 2008 doesn't link without salhelper mentioned on link line diff --git a/binfilter/bf_sd/util/makefile.mk b/binfilter/bf_sd/util/makefile.mk index a01570c..864f769 100644 --- a/binfilter/bf_sd/util/makefile.mk +++ b/binfilter/bf_sd/util/makefile.mk @@ -78,6 +78,7 @@ SHL1STDLIBS+= \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ +$(SALHELPERLIB) \ $(SALLIB) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/source
svtools/source/filter/filter.cxx | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 71b63586c5fe33fdf836ecb417d11f9c2d4e4b72
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 19 14:48:43 2011 +
Resolves: fdo#43082 can't claim its not a DXF just because didn't see
SECTION
typedetection doesn't know about 999 COMMENT, it should really.
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index ef07514..f61990b 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -497,36 +497,36 @@ static sal_Bool ImpPeekGraphicFormat( SvStream rStream,
String rFormatExtensio
//--- DXF
if( !bTest || ( rFormatExtension.CompareToAscii( DXF, 3 ) ==
COMPARE_EQUAL ) )
{
-bSomethingTested=sal_True;
+//Binary DXF File Format
+if( strncmp( (const char*) sFirstBytes, AutoCAD Binary DXF, 18 ) ==
0 )
+{
+rFormatExtension = UniString::CreateFromAscii( DXF, 3 );
+return sal_True;
+}
+//ASCII DXF File Format
i=0;
while (i256 sFirstBytes[i]=32)
-i++;
+++i;
-if (i256)
+if (i256 sFirstBytes[i]=='0')
{
-if( sFirstBytes[i]=='0' )
-i++;
-else
-i=256;
-}
-while( i256 sFirstBytes[i]=32 )
-i++;
+++i;
-if (i+7256)
-{
-if (strncmp((char*)(sFirstBytes+i),SECTION,7)==0)
+//only now do we have sufficient data to make a judgement
+//based on a '0' + 'SECTION' == DXF argument
+bSomethingTested=sal_True;
+
+while( i256 sFirstBytes[i]=32 )
+++i;
+
+if (i+7256 (strncmp((const
char*)(sFirstBytes+i),SECTION,7)==0))
{
rFormatExtension = UniString::CreateFromAscii( DXF, 3 );
return sal_True;
}
}
-if( strncmp( (char*) sFirstBytes, AutoCAD Binary DXF, 18 ) == 0 )
-{
-rFormatExtension = UniString::CreateFromAscii( DXF, 3 );
-return sal_True;
-}
}
//--- PCT
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svtools/source
svtools/source/filter/filter.cxx | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 05d602e41958a5c60773884ade725f3a8e051064
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 19 14:48:43 2011 +
Resolves: fdo#43082 can't claim its not a DXF just because didn't see
SECTION
typedetection doesn't know about 999 COMMENT, it should really.
(cherry picked from commit 71b63586c5fe33fdf836ecb417d11f9c2d4e4b72)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index ef07514..f61990b 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -497,36 +497,36 @@ static sal_Bool ImpPeekGraphicFormat( SvStream rStream,
String rFormatExtensio
//--- DXF
if( !bTest || ( rFormatExtension.CompareToAscii( DXF, 3 ) ==
COMPARE_EQUAL ) )
{
-bSomethingTested=sal_True;
+//Binary DXF File Format
+if( strncmp( (const char*) sFirstBytes, AutoCAD Binary DXF, 18 ) ==
0 )
+{
+rFormatExtension = UniString::CreateFromAscii( DXF, 3 );
+return sal_True;
+}
+//ASCII DXF File Format
i=0;
while (i256 sFirstBytes[i]=32)
-i++;
+++i;
-if (i256)
+if (i256 sFirstBytes[i]=='0')
{
-if( sFirstBytes[i]=='0' )
-i++;
-else
-i=256;
-}
-while( i256 sFirstBytes[i]=32 )
-i++;
+++i;
-if (i+7256)
-{
-if (strncmp((char*)(sFirstBytes+i),SECTION,7)==0)
+//only now do we have sufficient data to make a judgement
+//based on a '0' + 'SECTION' == DXF argument
+bSomethingTested=sal_True;
+
+while( i256 sFirstBytes[i]=32 )
+++i;
+
+if (i+7256 (strncmp((const
char*)(sFirstBytes+i),SECTION,7)==0))
{
rFormatExtension = UniString::CreateFromAscii( DXF, 3 );
return sal_True;
}
}
-if( strncmp( (char*) sFirstBytes, AutoCAD Binary DXF, 18 ) == 0 )
-{
-rFormatExtension = UniString::CreateFromAscii( DXF, 3 );
-return sal_True;
-}
}
//--- PCT
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppu/source
cppu/source/uno/sequence.cxx | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit bc4c7b52a8cdeeb5db38cdf27950aff53bb8d07a
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 19 15:10:41 2011 +
get this to build under msvc 2008
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 0c63598..5affbef 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -766,7 +766,7 @@ extern C
{
//##
-CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_sequence_construct(
+sal_Bool SAL_CALL uno_type_sequence_construct(
uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pType,
void * pElements, sal_Int32 len,
uno_AcquireFunc acquire )
@@ -810,7 +810,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL
uno_type_sequence_construct(
}
//##
-CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_sequence_construct(
+sal_Bool SAL_CALL uno_sequence_construct(
uno_Sequence ** ppSequence, typelib_TypeDescription * pTypeDescr,
void * pElements, sal_Int32 len,
uno_AcquireFunc acquire )
@@ -849,7 +849,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_sequence_construct(
}
//##
-CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_sequence_realloc(
+sal_Bool SAL_CALL uno_type_sequence_realloc(
uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pType,
sal_Int32 nSize, uno_AcquireFunc acquire, uno_ReleaseFunc release )
SAL_THROW_EXTERN_C()
@@ -871,7 +871,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_sequence_realloc(
}
//##
-CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_sequence_realloc(
+sal_Bool SAL_CALL uno_sequence_realloc(
uno_Sequence ** ppSequence, typelib_TypeDescription * pTypeDescr,
sal_Int32 nSize, uno_AcquireFunc acquire, uno_ReleaseFunc release )
SAL_THROW_EXTERN_C()
@@ -890,7 +890,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_sequence_realloc(
}
//##
-CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_sequence_reference2One(
+sal_Bool SAL_CALL uno_type_sequence_reference2One(
uno_Sequence ** ppSequence,
typelib_TypeDescriptionReference * pType,
uno_AcquireFunc acquire, uno_ReleaseFunc release )
@@ -937,7 +937,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL
uno_type_sequence_reference2One(
}
//##
-CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_sequence_reference2One(
+sal_Bool SAL_CALL uno_sequence_reference2One(
uno_Sequence ** ppSequence,
typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_ReleaseFunc release )
@@ -981,7 +981,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_sequence_reference2One(
}
//##
-CPPU_DLLPUBLIC void SAL_CALL uno_sequence_assign(
+void SAL_CALL uno_sequence_assign(
uno_Sequence ** ppDest,
uno_Sequence * pSource,
typelib_TypeDescription * pTypeDescr,
@@ -997,7 +997,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_sequence_assign(
}
//##
-CPPU_DLLPUBLIC void SAL_CALL uno_type_sequence_assign(
+void SAL_CALL uno_type_sequence_assign(
uno_Sequence ** ppDest,
uno_Sequence * pSource,
typelib_TypeDescriptionReference * pType,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/classes/image.cxx |4
basic/source/inc/filefmt.hxx |4
2 files changed, 8 deletions(-)
New commits:
commit f6d704146ecf714e37fbed2b6b78de520634f208
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 19 20:27:09 2011 +
EXTENDED_BINARY_MODULES is always defined
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 2e24903..1208184 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -159,7 +159,6 @@ sal_Bool SbiImage::Load( SvStream r, sal_uInt32 nVersion )
aOUSource = aTmp;
break;
}
-#ifdef EXTENDED_BINARY_MODULES
case B_EXTSOURCE:
{
for( sal_uInt16 j = 0 ; j nCount ; j++ )
@@ -170,7 +169,6 @@ sal_Bool SbiImage::Load( SvStream r, sal_uInt32 nVersion )
}
break;
}
-#endif
case B_PCODE:
if( bBadVer ) break;
pCode = new char[ nLen ];
@@ -300,7 +298,6 @@ sal_Bool SbiImage::Save( SvStream r, sal_uInt32 nVer )
r.WriteByteString( aTmp, eCharSet );
SbiCloseRecord( r, nPos );
-#ifdef EXTENDED_BINARY_MODULES
if( nLen STRING_MAXLEN )
{
sal_Int32 nRemainingLen = nLen - nMaxUnitSize;
@@ -316,7 +313,6 @@ sal_Bool SbiImage::Save( SvStream r, sal_uInt32 nVer )
}
SbiCloseRecord( r, nPos );
}
-#endif
}
// Binary data?
if( pCode SbiGood( r ) )
diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx
index 2206106..672fcef 100644
--- a/basic/source/inc/filefmt.hxx
+++ b/basic/source/inc/filefmt.hxx
@@ -78,11 +78,7 @@ class SvStream;
#define B_LINERANGES0x524C // LR line ranges for publics
#define B_MODEND0x454D // ME module end
#define B_SBXOBJECTS0x5853 // SX SBX objects
-
-#define EXTENDED_BINARY_MODULES
-#ifdef EXTENDED_BINARY_MODULES
#define B_EXTSOURCE 0x5345 // ES extended source
-#endif
// A library record contains only module records
// sal_uInt16 identifier BL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/classes/image.cxx |4
basic/source/inc/filefmt.hxx |4
2 files changed, 8 deletions(-)
New commits:
commit 815b7b39f2b29db2d9e081b1ea098aaa6209c0e6
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 19 20:27:09 2011 +
EXTENDED_BINARY_MODULES is always defined
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 2e24903..1208184 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -159,7 +159,6 @@ sal_Bool SbiImage::Load( SvStream r, sal_uInt32 nVersion )
aOUSource = aTmp;
break;
}
-#ifdef EXTENDED_BINARY_MODULES
case B_EXTSOURCE:
{
for( sal_uInt16 j = 0 ; j nCount ; j++ )
@@ -170,7 +169,6 @@ sal_Bool SbiImage::Load( SvStream r, sal_uInt32 nVersion )
}
break;
}
-#endif
case B_PCODE:
if( bBadVer ) break;
pCode = new char[ nLen ];
@@ -300,7 +298,6 @@ sal_Bool SbiImage::Save( SvStream r, sal_uInt32 nVer )
r.WriteByteString( aTmp, eCharSet );
SbiCloseRecord( r, nPos );
-#ifdef EXTENDED_BINARY_MODULES
if( nLen STRING_MAXLEN )
{
sal_Int32 nRemainingLen = nLen - nMaxUnitSize;
@@ -316,7 +313,6 @@ sal_Bool SbiImage::Save( SvStream r, sal_uInt32 nVer )
}
SbiCloseRecord( r, nPos );
}
-#endif
}
// Binary data?
if( pCode SbiGood( r ) )
diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx
index 2206106..672fcef 100644
--- a/basic/source/inc/filefmt.hxx
+++ b/basic/source/inc/filefmt.hxx
@@ -78,11 +78,7 @@ class SvStream;
#define B_LINERANGES0x524C // LR line ranges for publics
#define B_MODEND0x454D // ME module end
#define B_SBXOBJECTS0x5853 // SX SBX objects
-
-#define EXTENDED_BINARY_MODULES
-#ifdef EXTENDED_BINARY_MODULES
#define B_EXTSOURCE 0x5345 // ES extended source
-#endif
// A library record contains only module records
// sal_uInt16 identifier BL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_basic
binfilter/bf_basic/source/classes/image.cxx |2 --
binfilter/bf_basic/source/inc/filefmt.hxx |4
2 files changed, 6 deletions(-)
New commits:
commit 46bb912ebfc8d399622f0d793a6fe85c7627b39a
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 19 20:27:01 2011 +
EXTENDED_BINARY_MODULES is always defined
diff --git a/binfilter/bf_basic/source/classes/image.cxx
b/binfilter/bf_basic/source/classes/image.cxx
index c41c51a..c713451 100644
--- a/binfilter/bf_basic/source/classes/image.cxx
+++ b/binfilter/bf_basic/source/classes/image.cxx
@@ -140,7 +140,6 @@ BOOL SbiImage::Load( SvStream r, UINT32 nVersion )
aOUSource = aTmp;
break;
}
-#ifdef EXTENDED_BINARY_MODULES
case B_EXTSOURCE:
{
for( UINT16 j = 0 ; j nCount ; j++ )
@@ -151,7 +150,6 @@ BOOL SbiImage::Load( SvStream r, UINT32 nVersion )
}
break;
}
-#endif
case B_PCODE:
if( bBadVer ) break;
pCode = new char[ nLen ];
diff --git a/binfilter/bf_basic/source/inc/filefmt.hxx
b/binfilter/bf_basic/source/inc/filefmt.hxx
index 73626a3..b99ba7c 100644
--- a/binfilter/bf_basic/source/inc/filefmt.hxx
+++ b/binfilter/bf_basic/source/inc/filefmt.hxx
@@ -80,11 +80,7 @@ namespace binfilter {
#define B_LINERANGES0x524C // LR line ranges for publics
#define B_MODEND0x454D // ME module end
#define B_SBXOBJECTS0x5853 // SX SBX objects
-
-#define EXTENDED_BINARY_MODULES
-#ifdef EXTENDED_BINARY_MODULES
#define B_EXTSOURCE 0x5345 // ES extended source
-#endif
// Ein Library Record enthaelt nur Module Records
// UINT16 Kennung BL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: idl/Executable_svidl.mk idl/inc idl/source
idl/Executable_svidl.mk|4
idl/inc/basobj.hxx |8
idl/inc/bastype.hxx| 14 --
idl/inc/database.hxx | 11 ---
idl/inc/globals.hxx|2 --
idl/inc/module.hxx |4
idl/inc/object.hxx |4
idl/inc/slot.hxx |4
idl/inc/types.hxx | 14 --
idl/source/objects/basobj.cxx | 11 ---
idl/source/objects/bastype.cxx |5 -
idl/source/objects/module.cxx | 13 -
idl/source/objects/object.cxx |3 ---
idl/source/objects/slot.cxx|4
idl/source/objects/types.cxx | 11 ---
idl/source/prj/database.cxx|3 ---
16 files changed, 115 deletions(-)
New commits:
commit 6ade792d3e8f3244dcbb445a540939158820e50a
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 19 21:10:10 2011 +
IDL_COMPILER is always defined
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index 407ee37..0fe2ee2 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -39,10 +39,6 @@ $(eval $(call gb_Executable_add_api,svidl,\
udkapi \
))
-$(eval $(call gb_Executable_add_defs,svidl,\
- -DIDL_COMPILER \
-))
-
$(eval $(call gb_Executable_add_linked_libs,svidl,\
tl \
sal \
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index ff1d7b4..d40aab3 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -79,7 +79,6 @@ public:
SV_DECL_META_FACTORY1( SvMetaObject, SvPersistBase, 14 )
SvMetaObject();
-#ifdef IDL_COMPILER
static void WriteTab( SvStream rOutStm, sal_uInt16 nTab );
static sal_Bool TestAndSeekSpaceOnly( SvStream , sal_uLong
nBegPos );
static void Back2Delemitter( SvStream );
@@ -93,7 +92,6 @@ public:
virtual voidWriteCxx( SvIdlDataBase rBase, SvStream rOutStm,
sal_uInt16 nTab );
virtual voidWriteHxx( SvIdlDataBase rBase, SvStream rOutStm,
sal_uInt16 nTab );
-#endif
};
SV_DECL_IMPL_REF(SvMetaObject)
SV_DECL_PERSIST_LIST(SvMetaObject,SvMetaObject *)
@@ -135,7 +133,6 @@ class SvMetaName : public SvMetaObject
SvString aDescription;
protected:
-#ifdef IDL_COMPILER
virtual sal_Bool ReadNameSvIdl( SvIdlDataBase , SvTokenStream rInStm );
void DoReadContextSvIdl( SvIdlDataBase , SvTokenStream rInStm,
char c = '\0' );
@@ -150,7 +147,6 @@ protected:
WriteType, WriteAttribute = 0);
virtual void WriteContext( SvIdlDataBase rBase, SvStream rOutStm,
sal_uInt16 nTab,
WriteType, WriteAttribute = 0);
-#endif
public:
SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
SvMetaName();
@@ -164,14 +160,12 @@ public:
virtual const SvString GetConfigName() const{ return aConfigName; }
virtual const SvString GetDescription() const{ return aDescription; }
-#ifdef IDL_COMPILER
virtual sal_BoolTest( SvIdlDataBase , SvTokenStream rInStm );
virtual sal_BoolReadSvIdl( SvIdlDataBase , SvTokenStream rInStm
);
virtual voidWriteSvIdl( SvIdlDataBase rBase, SvStream rOutStm,
sal_uInt16 nTab );
virtual voidWrite( SvIdlDataBase rBase, SvStream rOutStm,
sal_uInt16 nTab,
WriteType, WriteAttribute = 0);
voidWriteDescription( SvStream rOutStm );
-#endif
};
SV_DECL_IMPL_REF(SvMetaName)
SV_DECL_IMPL_PERSIST_LIST(SvMetaName,SvMetaName *)
@@ -242,7 +236,6 @@ public:
const SvGlobalName GetUUId() const;
const SvVersionGetVersion() const { return aVersion; }
-#ifdef IDL_COMPILER
voidSetModule( SvIdlDataBase rBase );
virtual sal_BoolReadSvIdl( SvIdlDataBase , SvTokenStream rInStm
);
virtual voidWriteSvIdl( SvIdlDataBase rBase, SvStream rOutStm,
sal_uInt16 nTab );
@@ -255,7 +248,6 @@ protected:
SvStream rOutStm, sal_uInt16
nTab );
virtual voidWriteAttributes( SvIdlDataBase rBase, SvStream
rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0);
-#endif
};
SV_DECL_IMPL_REF(SvMetaExtern)
SV_DECL_IMPL_PERSIST_LIST(SvMetaExtern,SvMetaExtern *)
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 3d20e62..7fdeafd 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -150,11 +150,9 @@ public:
friend SvStream operator (SvStream , const SvBOOL );
friend SvStream operator (SvStream , SvBOOL );
-#ifdef IDL_COMPILER
sal_BoolReadSvIdl( SvStringHashEntry * pName, SvTokenStream
rInStm );
sal_BoolWriteSvIdl( SvStringHashEntry * pName, SvStream rOutStm
);
ByteString GetSvIdlString( SvStringHashEntry * pName );
[Libreoffice-commits] .: 2 commits - l10ntools/source sc/source unusedcode.easy
l10ntools/source/helpex.cxx | 80 +---
sc/source/ui/docshell/docsh.cxx |4 --
sc/source/ui/inc/docsh.hxx |2 -
sc/source/ui/view/printfun.cxx | 21 --
unusedcode.easy |1
5 files changed, 35 insertions(+), 73 deletions(-)
New commits:
commit b0604113bc35c17f84f952ec882c24d61eef30e3
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 19 22:39:38 2011 +
ByteString-rtl::OString
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index b9c6874..1925285 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -48,17 +48,17 @@
#define STATE_OUTPUTY 0xff
// set of global variables
-ByteString sInputFile;
+rtl::OString sInputFile;
sal_Bool bEnableExport;
sal_Bool bMergeMode;
sal_Bool bErrorLog;
sal_Bool bUTF8;
-ByteString sPrj;
-ByteString sPrjRoot;
-ByteString sOutputFile;
-ByteString sOutputFileX;
-ByteString sOutputFileY;
-ByteString sSDFFile;
+rtl::OString sPrj;
+rtl::OString sPrjRoot;
+rtl::OString sOutputFile;
+rtl::OString sOutputFileX;
+rtl::OString sOutputFileY;
+rtl::OString sSDFFile;
/*/
sal_Bool ParseCommandLine( int argc, char* argv[])
@@ -77,41 +77,36 @@ sal_Bool ParseCommandLine( int argc, char* argv[])
sal_Bool bInput = sal_False;
// parse command line
-for( int i = 1; i argc; i++ ) {
-if ( ByteString( argv[ i ]).ToUpperAscii() == -I ) {
+for( int i = 1; i argc; i++ )
+{
+rtl::OString aArg(rtl::OString(argv[i]).toAsciiUpperCase());
+if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-I)))
nState = STATE_INPUT; // next tokens specifies source files
-}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -O ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-O)))
nState = STATE_OUTPUT; // next token specifies the dest file
-}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -X ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-X)))
nState = STATE_OUTPUTX; // next token specifies the dest file
-}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -Y ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-Y )))
nState = STATE_OUTPUTY; // next token specifies the dest file
-}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -P ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-P )))
nState = STATE_PRJ; // next token specifies the cur. project
-}
- else if ( ByteString( argv[ i ]).ToUpperAscii() == -LF ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-LF)))
nState = STATE_FORCE_LANGUAGES;
-}
-
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -R ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-R )))
nState = STATE_ROOT; // next token specifies path to project root
-}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -M ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-M )))
nState = STATE_SDFFILE; // next token specifies the merge database
-}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -E ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-E )))
+{
nState = STATE_ERRORLOG;
bErrorLog = sal_False;
}
-else if ( ByteString( argv[ i ]).ToUpperAscii() == -L ) {
+else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM(-L )))
nState = STATE_LANGUAGES;
-}
-else {
-switch ( nState ) {
+else
+{
+switch ( nState )
+{
case STATE_NON: {
return sal_False; // no valid command line
}
@@ -200,57 +195,53 @@ int _cdecl main( int argc, char *argv[] )
}
//sal_uInt32 startfull = Export::startMessure();
-bool hasInputList = sInputFile.GetBuffer()[0]=='@';
-//printf(x = %s , y = %s , o = %s\n, sOutputFileX.GetBuffer(),
sOutputFileY.GetBuffer() , sOutputFile.GetBuffer() );
+bool hasInputList = sInputFile[0]=='@';
bool hasNoError = true;
-if ( sOutputFile.Len() ){ //
Merge single file ?
-//printf(DBG: Inputfile = %s\n,sInputFile.GetBuffer());
+if ( sOutputFile.getLength() ){
// Merge single file ?
HelpParser aParser( sInputFile, bUTF8 , false );
if ( bMergeMode )
{
//sal_uInt64 startreadloc = Export::startMessure();
MergeDataFile aMergeDataFile(sSDFFile, sInputFile, sal_False);
-//Export::stopMessure( ByteString(read localize.sdf) ,
startreadloc );
hasNoError = aParser.Merge( sSDFFile, sOutputFile ,
[Libreoffice-commits] .: framework/source
framework/source/loadenv/loadenv.cxx | 36 +--
1 file changed, 22 insertions(+), 14 deletions(-)
New commits:
commit 80cc772841dc3b03f0a629215858d0a44f5419a1
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 20 10:00:36 2011 +
pretty up exception message for display in StarBasic dialogs
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index ef65152..090b6aa 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -193,24 +193,32 @@ css::uno::Reference css::lang::XComponent
LoadEnv::loadComponentFromURL(const
switch(ex.m_nID)
{
case LoadEnvException::ID_INVALID_MEDIADESCRIPTOR:
-throw css::lang::IllegalArgumentException(
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Optional list of arguments seem to
be corrupted.)),
-xLoader,
-4);
+throw css::lang::IllegalArgumentException(
+::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Optional list
of arguments seem to be corrupted.)),
+xLoader,
+4);
case LoadEnvException::ID_UNSUPPORTED_CONTENT:
-throw css::lang::IllegalArgumentException(
-(rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(Unsupported URL )) +
- sURL +
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(: \)) +
- rtl::OStringToOUString(
- ex.m_sMessage, RTL_TEXTENCODING_UTF8) +
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\))),
+{
+rtl::OUStringBuffer aMsg;
+aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM(Unsupported URL
)).
+append(sURL).append('');
+
+if (!ex.m_sMessage.isEmpty())
+{
+aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM(: \)).
+append(rtl::OStringToOUString(
+ ex.m_sMessage, RTL_TEXTENCODING_UTF8)).
+appendAscii(RTL_CONSTASCII_STRINGPARAM(\));
+}
+
+throw
css::lang::IllegalArgumentException(aMsg.makeStringAndClear(),
xLoader, 1);
+}
-default: xComponent.clear();
-break;
+default:
+xComponent.clear();
+break;
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source unotools/source unusedcode.easy
cui/source/inc/treeopt.hxx |2
cui/source/options/treeopt.cxx | 18 ++--
unotools/source/config/securityoptions.cxx |6 -
unusedcode.easy| 127 +++--
4 files changed, 42 insertions(+), 111 deletions(-)
New commits:
commit 217cde3790a05c786b7809d6326a15542aadd4ac
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 20 13:15:45 2011 +
callcatcher: update list
diff --git a/unotools/source/config/securityoptions.cxx
b/unotools/source/config/securityoptions.cxx
index 89b63cb..cb925a2 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -198,7 +198,6 @@ class SvtSecurityOptions_Impl : public ConfigItem
Sequence SvtSecurityOptions::Certificate GetTrustedAuthors (
) const ;
voidSetTrustedAuthors (
const Sequence SvtSecurityOptions::Certificate rAuthors
) ;
-sal_BoolIsTrustedAuthorsEnabled (
) ;
sal_BoolIsOptionSet ( SvtSecurityOptions::EOption
eOption ) const ;
sal_BoolSetOption ( SvtSecurityOptions::EOption
eOption, sal_Bool bValue ) ;
@@ -968,11 +967,6 @@ void SvtSecurityOptions_Impl::SetTrustedAuthors( const
Sequence SvtSecurityOpti
}
}
-sal_Bool SvtSecurityOptions_Impl::IsTrustedAuthorsEnabled()
-{
-return m_bROTrustedAuthors;
-}
-
sal_Bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption
eOption ) const
{
sal_Bool* pValue;
diff --git a/unusedcode.easy b/unusedcode.easy
index 5c73cc0..bf0dd0f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,6 @@
+(anonymous namespace)::Test::testCopyPaste()
(anonymous
namespace)::getState(std::__debug::vectorcppcanvas::internal::OutDevState,
std::allocatorcppcanvas::internal::OutDevState const)
+Animation::IsEmpty() const
AtomDocument::AtomDocument(AtomPubSession*, std::basic_stringchar,
std::char_traitschar, std::allocatorchar )
AtomFolder::AtomFolder(AtomPubSession*, std::basic_stringchar,
std::char_traitschar, std::allocatorchar )
AtomPubSession::getCollectionUrl(Collection::Type)
@@ -7,7 +9,6 @@ BitmapWriteAccess::DrawPolygon(Polygon const)
BufferNode::childAt(int) const
ByteString::Assign(char const*, unsigned short)
ByteString::Assign(char)
-ByteString::ByteString(String const, unsigned short, unsigned int)
CIccCLUT::Interp3dTetra(float*, float const*)
CIccCLUT::Iterate(IIccCLUTExec*)
CIccFormulaCurveSegment::SetFunction(unsigned short, unsigned char, float*)
@@ -66,13 +67,6 @@ CurrencyBox::GetValuePos(long) const
CurrencyField::CurrencyField(Window*, ResId const)
CurrencyFormatter::SetCurrencySymbol(String const)
CustomToolBarImportHelper::showToolbar(rtl::OUString const)
-DateBox::DateBox(Window*, ResId const)
-DateBox::GetDate(unsigned short) const
-DateBox::GetDatePos(Date const) const
-DateBox::InsertDate(Date const, unsigned short)
-DateBox::RemoveDate(Date const)
-DateFormatter::GetRealDate() const
-DateFormatter::IsDateModified() const
DateTime::MakeDateTimeFromSec(Date const, unsigned long)
DdeGetPutItem::DdeGetPutItem(DdeItem const)
DdeService::AddFormat(unsigned long)
@@ -306,6 +300,9 @@ ScCellObj::SetFormulaResultDouble(double)
ScCellObj::SetFormulaResultString(rtl::OUString const)
ScCellObj::SetFormulaWithGrammar(rtl::OUString const, rtl::OUString const,
formula::FormulaGrammar::Grammar)
ScChangeActionContent::SetNewValue(String const, ScDocument*)
+ScClipRangeNameData::ScClipRangeNameData()
+ScClipRangeNameData::insert(unsigned short, unsigned short)
+ScClipRangeNameData::~ScClipRangeNameData()
ScCompressedArrayint, unsigned char::GetEntryCount() const
ScCompressedArrayint, unsigned short::CopyFrom(ScCompressedArrayint,
unsigned short const, int, int, long)
ScCompressedArrayint, unsigned short::GetValue(int) const
@@ -376,13 +373,7 @@
ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const) const
ScStringCell::ScStringCell()
ScSubTotalDescriptorBase::GetData(ScSubTotalParam) const
ScSubTotalDescriptorBase::PutData(ScSubTotalParam const)
-ScTabPageSortFields::GetRanges()
-ScTabPageSortOptions::GetRanges()
ScTabViewShell::LinkStubHtmlOptionsHdl(void*, void*)
-ScTpCalcOptions::GetRanges()
-ScTpPrintOptions::GetRanges()
-ScTpSubTotalGroup::GetRanges()
-ScTpUserLists::GetRanges()
ScUserList::end()
ScUserList::end() const
ScValidationEntries_Impl::Insert(ScValidationData* const, unsigned short)
@@ -598,20 +589,16 @@ SvpSalInstance::CancelEvent(SalFrame const*, void*,
unsigned short)
SvtAcceleratorConfiguration::GetCommand(com::sun::star::awt::KeyEvent const)
[Libreoffice-commits] .: binfilter/bf_sc
binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 64926061f538f0a6e2cd1f6b824b9b864db744c1
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 20 15:20:26 2011 +
WaE: possibly uninitialized
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
index 6f6b2d0..c05989f 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
@@ -146,7 +146,7 @@ void ScXMLExportDatabaseRanges::WriteImportDescriptor(const
uno::Sequence beans
sal_Int32 nProperties = aImportDescriptor.getLength();
::rtl::OUString sDatabaseName;
::rtl::OUString sSourceObject;
-sheet::DataImportMode nSourceType;
+sheet::DataImportMode nSourceType = sheet::DataImportMode_NONE;
sal_Bool bNative = sal_False;
for (sal_Int16 i = 0; i nProperties; i++)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lingucomponent/Library_spell.mk
lingucomponent/Library_spell.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 2d9aac80a17b61f8339b80a4bc1555940255a8ff Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 10:20:10 2011 + msvc2008 hunspell linked to icuuc diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index a66b4ba..f7aa804 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_static_libs,spell,\ $(eval $(call gb_Library_use_externals,spell,\ hunspell \ + icuuc \ )) $(eval $(call gb_Library_add_exception_objects,spell,\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lingucomponent/Makefile
lingucomponent/Makefile |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6fd747bf0e1f8374d52e26e823d2186275d5e8fb Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 10:22:14 2011 + make this Makefile the same as all the others so that make inside an source ./Env.Host.sh environment works the same as make outside that env diff --git a/lingucomponent/Makefile b/lingucomponent/Makefile index 44c7d7c..7bbbe6c 100644 --- a/lingucomponent/Makefile +++ b/lingucomponent/Makefile @@ -2,7 +2,7 @@ #* # # 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 @@ -31,6 +31,7 @@ ifeq ($(strip $(SOLARENV)),) include $(dir $(realpath $(firstword $(MAKEFILE_LIST/../solenv/gbuild/source_and_rerun.mk else +gb_SourceEnvAndRecurse_STAGE=gbuild include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST/Module*.mk))) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/Library_tl.mk tools/source
tools/Library_tl.mk|2 +-
tools/source/stream/stream.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f5eb8a2fc2e56c0950db2fafeded593d569d43e9
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 21 14:32:08 2011 +
I hate you poxy msvc
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 2724575..8dc9215 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,tl,\
))
$(eval $(call gb_Library_add_defs,tl,\
--DTOOLS_DLLIMPLEMENTATION \
+-DTOOLS_DLLIMPLEMENTATION -DNOMINMAX\
))
$(eval $(call gb_Library_add_api,tl,\
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 2a5cd4a..3cfb900 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1287,7 +1287,7 @@ SvStream SvStream::operator(float r)
SvStream SvStream::operator(double r)
{
-double n;
+double n = 0;
READNUMBER_WITHOUT_SWAP(double, n)
if (good())
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: mythes/makefile.mk mythes/mythes-1.2.0-android.patch mythes/mythes-1.2.0-makefile-mk.diff mythes/mythes-1.2.0-vanilla-th-gen-idx.patch mythes/mythes-1.2.1-rhbz675806.patch ooo
mythes/makefile.mk |5 ++--- mythes/mythes-1.2.0-android.patch|4 ++-- mythes/mythes-1.2.0-makefile-mk.diff |4 ++-- mythes/mythes-1.2.0-vanilla-th-gen-idx.patch |6 +++--- mythes/mythes-1.2.1-rhbz675806.patch |4 ++-- ooo.lst.in |2 +- 6 files changed, 12 insertions(+), 13 deletions(-) New commits: commit da3e169a393d59b23c92187d0da80b92caf78308 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 14:37:07 2011 + bump mythes to 1.2.2 diff --git a/mythes/makefile.mk b/mythes/makefile.mk index c663077..f10d0a0 100644 --- a/mythes/makefile.mk +++ b/mythes/makefile.mk @@ -36,15 +36,14 @@ TARGET=mythes # --- Files -TARFILE_NAME=mythes-1.2.0 -TARFILE_MD5=067201ea8b126597670b5eff72e1f66c +TARFILE_NAME=mythes-1.2.2 +TARFILE_MD5=e1e255dc43dbcbb34cb19e8a0eba90ae ADDITIONAL_FILES += makefile.mk PATCH_FILES=\ mythes-1.2.0-vanilla-th-gen-idx.patch \ mythes-1.2.0-makefile-mk.diff \ -mythes-1.2.1-rhbz675806.patch \ mythes-1.2.0-android.patch .IF $(GUI)==UNX diff --git a/mythes/mythes-1.2.0-android.patch b/mythes/mythes-1.2.0-android.patch index 2b74414..efd9104 100644 --- a/mythes/mythes-1.2.0-android.patch +++ b/mythes/mythes-1.2.0-android.patch @@ -1,5 +1,5 @@ misc/mythes-1.2.0/config.sub 2010-02-27 16:52:52.0 +0100 -+++ misc/build/mythes-1.2.0/config.sub 2011-09-26 23:39:04.0 +0200 +--- misc/mythes-1.2.2/config.sub 2010-02-27 16:52:52.0 +0100 misc/build/mythes-1.2.2/config.sub 2011-09-26 23:39:04.0 +0200 @@ -123,7 +123,7 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` diff --git a/mythes/mythes-1.2.0-makefile-mk.diff b/mythes/mythes-1.2.0-makefile-mk.diff index 30cdf46..1020153 100644 --- a/mythes/mythes-1.2.0-makefile-mk.diff +++ b/mythes/mythes-1.2.0-makefile-mk.diff @@ -1,5 +1,5 @@ misc/mythes-1.2.0/makefile.mk 2010-05-14 23:36:09.0 +0200 -+++ misc/build/mythes-1.2.0/makefile.mk2010-05-14 23:35:14.0 +0200 +--- misc/mythes-1.2.2/makefile.mk 2010-05-14 23:36:09.0 +0200 misc/build/mythes-1.2.2/makefile.mk2010-05-14 23:35:14.0 +0200 @@ -1 +1,90 @@ -dummy +#* diff --git a/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch b/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch index 776fac4..c893fa9 100644 --- a/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch +++ b/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch @@ -1,5 +1,5 @@ misc/mythes-1.2.0.orig/th_gen_idx.pl -+++ misc/build/mythes-1.2.0/th_gen_idx.pl +--- misc/mythes-1.2.2.orig/th_gen_idx.pl misc/build/mythes-1.2.2/th_gen_idx.pl @@ -1,11 +1,32 @@ -#!/usr/bin/perl - @@ -28,7 +28,7 @@ +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). # --# typcially invoked as follows: +-# typically invoked as follows: -# cat th_en_US_new.dat | ./th_gen_idx.pl th_en_US_new.idx +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see diff --git a/mythes/mythes-1.2.1-rhbz675806.patch b/mythes/mythes-1.2.1-rhbz675806.patch index be50bee..7ad311a 100644 --- a/mythes/mythes-1.2.1-rhbz675806.patch +++ b/mythes/mythes-1.2.1-rhbz675806.patch @@ -1,5 +1,5 @@ misc/mythes-1.2.0/mythes.cxx 2011-02-08 10:42:57.262964286 + -+++ misc/build/mythes-1.2.0/mythes.cxx 2011-02-08 10:43:06.305076490 + +--- misc/mythes-1.2.2/mythes.cxx 2011-02-08 10:42:57.262964286 + misc/build/mythes-1.2.2/mythes.cxx 2011-02-08 10:43:06.305076490 + @@ -14,6 +14,7 @@ encoding = NULL; list = NULL; diff --git a/ooo.lst.in b/ooo.lst.in index bac48e7..b06780a 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -53,7 +53,7 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz 061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2 -067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz +e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sot/Library_sot.mk
sot/Library_sot.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 56c0d3b569ba62eafe94f79299e5afb83f2f891b Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 15:16:26 2011 + disable min as macro under msvc diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index cc5271d..1c008a1 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_api,sot,\ )) $(eval $(call gb_Library_add_defs,sot,\ --DSOT_DLLIMPLEMENTATION \ +-DSOT_DLLIMPLEMENTATION -DNOMINMAX\ )) $(eval $(call gb_Library_add_linked_libs,sot,\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: mythes/prj
mythes/prj/d.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2a76860a496a8a624e9e44d20c24252d59f88463 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 15:19:30 2011 + update delivering the correct version diff --git a/mythes/prj/d.lst b/mythes/prj/d.lst index 375161f..f2f46c2 100644 --- a/mythes/prj/d.lst +++ b/mythes/prj/d.lst @@ -1,7 +1,7 @@ ..\%__SRC%\slb\libmythes.lib %_DEST%\lib\libmythes.lib ..\%__SRC%\inc\mythes.hxx %_DEST%\inc\mythes.hxx -..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a +..\%__SRC%\misc\build\mythes-1.2.2\.libs\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a ..\%__SRC%\lib\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a -..\%__SRC%\misc\build\mythes-1.2.0\th_gen_idx.pl %_DEST%\bin\th_gen_idx.pl +..\%__SRC%\misc\build\mythes-1.2.2\th_gen_idx.pl %_DEST%\bin\th_gen_idx.pl ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/Library_vcl.mk vcl/win
vcl/Library_vcl.mk |2 +- vcl/win/source/gdi/salgdi3.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit c010c77dc3d240413d584d5837de4be1b164517e Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 15:26:59 2011 + explicitly write an 8 bit empty string diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f18c18f..95a307f 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_set_include,vcl,\ )) $(eval $(call gb_Library_add_defs,vcl,\ --DVCL_DLLIMPLEMENTATION \ +-DVCL_DLLIMPLEMENTATION -DNOMINMAX \ -DCUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,cui)\ \ -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ )) diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 32fd0f3..8d86069 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -210,7 +210,7 @@ ImplFontAttrCache::~ImplFontAttrCache() ++aIter; } // EOF Marker -write_lenPrefixed_uInt8s_FromOString(aCacheFile, rtl::OString(), RTL_TEXTENCODING_UTF8); +write_lenPrefixed_uInt8s_FromOStringsal_uInt16(aCacheFile, rtl::OString()); } } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/Library_sfx.mk
sfx2/Library_sfx.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 98d75b3506520bd5db7071a2d9379fb7c565b9d9 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 16:38:55 2011 + ditch min/max as macros under msvc diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index b8f5d37..893aa3f 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_set_include,sfx,\ )) $(eval $(call gb_Library_add_defs,sfx,\ --DSFX2_DLLIMPLEMENTATION \ +-DSFX2_DLLIMPLEMENTATION -DNOMINMAX \ )) ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_so3
binfilter/bf_so3/util/makefile.pmk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e22e6ff0b54c4b52326b4168ce40a15bc673d214 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 16:39:02 2011 + ditch min/max as macros under msvc diff --git a/binfilter/bf_so3/util/makefile.pmk b/binfilter/bf_so3/util/makefile.pmk index 40c5820..8167472 100644 --- a/binfilter/bf_so3/util/makefile.pmk +++ b/binfilter/bf_so3/util/makefile.pmk @@ -26,5 +26,5 @@ #* # Reduction of exported symbols: -CDEFS += -DSO3_DLLIMPLEMENTATION +CDEFS += -DSO3_DLLIMPLEMENTATION -DNOMINMAX VISIBILITY_HIDDEN=TRUE ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_sw binfilter/inc
binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx |4
binfilter/bf_sw/source/core/ole/sw_ndole.cxx |2 +-
binfilter/inc/bf_sd/sdfilter.hxx |2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit baf8f39900cd4763dd4bb325907010969ecc1670
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 21 16:55:21 2011 +
WaE: silence some msvc warnings
diff --git a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
index bcc481d..9bf7c6e 100644
--- a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
+++ b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
@@ -136,6 +136,10 @@ SdXMLFilter::SdXMLFilter( SfxMedium rMedium,
SdDrawDocShell rDocShell, sal_Boo
{
}
+SdXMLFilter::~SdXMLFilter()
+{
+}
+
//
-
sal_Bool SdXMLFilter::Import()
diff --git a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
index 7bd619c..d1e2683 100644
--- a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
+++ b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
@@ -68,7 +68,7 @@ public:
void Load();
-SvPtrarr::Count;
+using SvPtrarr::Count;
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence rtl::OUString
aPropertyNames );
diff --git a/binfilter/inc/bf_sd/sdfilter.hxx b/binfilter/inc/bf_sd/sdfilter.hxx
index 45af8d0..98bd862 100644
--- a/binfilter/inc/bf_sd/sdfilter.hxx
+++ b/binfilter/inc/bf_sd/sdfilter.hxx
@@ -66,7 +66,7 @@ protected:
public:
SdFilter( SfxMedium rMedium, SdDrawDocShell
rDocShell, sal_Bool bShowProgress );
-~SdFilter();
+virtual ~SdFilter();
virtual sal_BoolImport();
virtual sal_BoolExport();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 7 commits - connectivity/source editeng/source extensions/util hyphen/hyphen-2.7.1.patch hyphen/hyphen-android.patch hyphen/makefile.mk idl/inc idl/source linguistic/source sc
connectivity/source/drivers/dbase/DTable.cxx |4 -
editeng/source/editeng/editobj.cxx | 14 +++---
extensions/util/makefile.pmk |1
hyphen/hyphen-2.7.1.patch| 20 -
hyphen/hyphen-android.patch | 20 +
hyphen/makefile.mk |3 -
idl/inc/bastype.hxx | 20 ++---
idl/inc/types.hxx|2
idl/source/objects/bastype.cxx | 12 ++---
idl/source/objects/object.cxx| 10 ++--
idl/source/objects/slot.cxx | 54
idl/source/objects/types.cxx | 59 +--
idl/source/prj/database.cxx |6 +-
linguistic/source/dicimp.cxx | 13 ++---
sc/source/core/tool/interpr2.cxx |2
sfx2/source/appl/app.cxx |2
sfx2/source/appl/childwin.cxx|2
sfx2/source/appl/imagemgr.cxx|4 -
sfx2/source/appl/sfxhelp.cxx | 12 ++---
sfx2/source/appl/xpackcreator.cxx|6 +-
sfx2/source/control/dispatch.cxx |2
sfx2/source/control/unoctitm.cxx |2
sfx2/source/doc/iframe.cxx |5 +-
sfx2/source/doc/objcont.cxx |4 -
sfx2/source/doc/objxtor.cxx | 11 ++---
sfx2/source/doc/printhelper.cxx | 20 +++--
sfx2/source/view/sfxbasecontroller.cxx |6 +-
svl/inc/svl/ownlist.hxx |1
svl/source/misc/ownlist.cxx | 30 -
unusedcode.easy |9 +---
vcl/inc/vcl/svapp.hxx|1
vcl/source/app/svapp.cxx | 11 -
32 files changed, 176 insertions(+), 192 deletions(-)
New commits:
commit de2491a4c38a65cdc3c9d27629c1c9988bce096b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 22 09:05:53 2011 +
new route left to set pHandler
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index b4345c7..16381ea 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1801,12 +1801,8 @@ TYPEINIT0(ApplicationProperty)
//
-static PropertyHandler* pHandler=NULL;
-
-void Application::Property( ApplicationProperty rProp )
+void Application::Property( ApplicationProperty /*rProp*/ )
{
-if ( pHandler )
-pHandler-Property( rProp );
}
void Application::AppEvent( const ApplicationEvent /*rAppEvent*/ )
commit 9d97f5e8ab1670e5d496cf4bb3fe5494341c581e
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 22 09:05:10 2011 +
callcatcher: newly unused code
diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx
index ea1fc38..f0fd246 100644
--- a/svl/inc/svl/ownlist.hxx
+++ b/svl/inc/svl/ownlist.hxx
@@ -80,7 +80,6 @@ private:
public:
SvCommand Append( const String rCommand, const String rArg );
sal_BoolAppendCommands( const String rCmd, sal_uInt16 * pEaten );
-String GetCommands() const;
sal_Bool FillFromSequence( const com::sun::star::uno::Sequence
com::sun::star::beans::PropertyValue );
void FillSequence( com::sun::star::uno::Sequence
com::sun::star::beans::PropertyValue );
diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index 48e3750..51f0707 100644
--- a/svl/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.cxx
@@ -115,36 +115,6 @@ sal_Bool SvCommandList::AppendCommands
}
//=
-String SvCommandList::GetCommands() const
-/* [Beschreibung]
-
-Die Kommandos in der Liste werden als Text hintereinander, durch ein
-Leerzeichen getrennt geschrieben. Der Text muss nicht genauso
-aussehen wie der in SvCommandList::AppendCommands() ubergebene.
-
-[Ruckgabewert]
-
-String Die Kommandos werden zuruckgegeben.
-*/
-{
-String aRet;
-for( sal_uLong i = 0; i aCommandList.size(); i++ )
-{
-if( i != 0 )
-aRet += ' ';
-SvCommand aCmd = aCommandList[ i ];
-aRet += aCmd.GetCommand();
-if( aCmd.GetArgument().Len() )
-{
-aRet.AppendAscii( RTL_CONSTASCII_STRINGPARAM( =\ ) );
-aRet += aCmd.GetArgument();
-aRet.AppendAscii( RTL_CONSTASCII_STRINGPARAM( \ ) );
-}
-}
-return aRet;
-}
-
-//=
SvCommand SvCommandList::Append
(
const String rCommand,/* das Kommando */
diff --git a/unusedcode.easy b/unusedcode.easy
index b0a14b2..eadbb2f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,6 @@
-(anonymous namespace)::Test::testCopyPaste()
(anonymous
[Libreoffice-commits] .: 2 commits - canvas/inc canvas/Library_canvastools.mk canvas/Package_inc.mk canvas/source chart2/source comphelper/inc comphelper/source hyphen/hyphen-2.7.1-2.8.3.patch hyphen/
canvas/Library_canvastools.mk |1
canvas/Package_inc.mk |1
canvas/inc/canvas/prioritybooster.hxx | 69 --
canvas/source/tools/prioritybooster.cxx | 83 ---
chart2/source/controller/main/UndoGuard.cxx | 18
chart2/source/controller/main/UndoGuard.hxx | 13
comphelper/inc/comphelper/eventattachermgr.hxx |7
comphelper/source/eventattachermgr/eventattachermgr.cxx | 12
hyphen/hyphen-2.7.1-2.8.3.patch | 399
hyphen/hyphen-2.7.1-read-charset.patch | 20
hyphen/hyphen-2.7.1.patch | 72 --
hyphen/hyphen-android.patch |4
hyphen/hyphen-build.patch | 70 ++
hyphen/makefile.mk |8
hyphen/prj/d.lst|4
ooo.lst.in |2
sc/inc/clipparam.hxx| 13
sc/inc/document.hxx |1
sc/source/core/data/clipparam.cxx | 17
sd/source/ui/slideshow/slideshowimpl.cxx|1
unusedcode.easy |8
21 files changed, 78 insertions(+), 745 deletions(-)
New commits:
commit 27aa4dccf24fca018e19e563e51f7f9af62e
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 22 10:47:26 2011 +
bump hyphen to 2.8.3
diff --git a/hyphen/hyphen-2.7.1-2.8.3.patch b/hyphen/hyphen-2.7.1-2.8.3.patch
deleted file mode 100644
index 51ab23a..000
--- a/hyphen/hyphen-2.7.1-2.8.3.patch
+++ /dev/null
@@ -1,399 +0,0 @@
misc/build/hyphen-2.7.1/hyphen.c.old 2011-10-10 15:58:33.317260138
+0200
-+++ misc/build/hyphen-2.7.1/hyphen.c 2011-10-10 15:58:55.221260136 +0200
-@@ -226,115 +226,61 @@
- }
-
- #ifdef VERBOSE
--HashTab *global;
-+HashTab *global[1];
-
- static char *
--get_state_str (int state)
-+get_state_str (int state, int level)
- {
- int i;
- HashEntry *e;
-
- for (i = 0; i HASH_SIZE; i++)
--for (e = global-entries[i]; e; e = e-next)
-+for (e = global[level]-entries[i]; e; e = e-next)
- if (e-val == state)
- return e-key;
- return NULL;
- }
- #endif
-
--HyphenDict *
--hnj_hyphen_load (const char *fn)
--{
-- HyphenDict *dict[2];
-- HashTab *hashtab;
-- FILE *f;
-- char buf[MAX_CHARS];
-+void hnj_hyphen_load_line(char * buf, HyphenDict * dict, HashTab * hashtab) {
-+ int i, j;
- char word[MAX_CHARS];
- char pattern[MAX_CHARS];
- char * repl;
- signed char replindex;
- signed char replcut;
-- int state_num = 0, last_state;
-- int i, j, k;
-+ int state_num = 0;
-+ int last_state;
- char ch;
- int found;
-- HashEntry *e;
-- int nextlevel = 0;
--
-- f = fopen (fn, r);
-- if (f == NULL)
--return NULL;
--
--// loading one or two dictionaries (separated by NEXTLEVEL keyword)
--for (k = 0; k == 0 || (k == 1 nextlevel); k++) {
-- hashtab = hnj_hash_new ();
--#ifdef VERBOSE
-- global = hashtab;
--#endif
-- hnj_hash_insert (hashtab, , 0);
-- dict[k] = hnj_malloc (sizeof(HyphenDict));
-- dict[k]-num_states = 1;
-- dict[k]-states = hnj_malloc (sizeof(HyphenState));
-- dict[k]-states[0].match = NULL;
-- dict[k]-states[0].repl = NULL;
-- dict[k]-states[0].fallback_state = -1;
-- dict[k]-states[0].num_trans = 0;
-- dict[k]-states[0].trans = NULL;
-- dict[k]-nextlevel = NULL;
-- dict[k]-lhmin = 0;
-- dict[k]-rhmin = 0;
-- dict[k]-clhmin = 0;
-- dict[k]-crhmin = 0;
-- dict[k]-nohyphen = NULL;
-- dict[k]-nohyphenl = 0;
--
-- /* read in character set info */
-- if (k == 0) {
--for (i=0;iMAX_NAME;i++) dict[k]-cset[i]= 0;
--fgets(dict[k]-cset, sizeof(dict[k]-cset),f);
--for (i=0;iMAX_NAME;i++)
-- if ((dict[k]-cset[i] == '\r') || (dict[k]-cset[i] == '\n'))
--dict[k]-cset[i] = 0;
--dict[k]-utf8 = (strcmp(dict[k]-cset, UTF-8) == 0);
-- } else {
--strcpy(dict[k]-cset, dict[0]-cset);
--dict[k]-utf8 = dict[0]-utf8;
-- }
-
-- while (fgets (buf, sizeof(buf), f) != NULL)
--{
-- if (buf[0] != '%')
-- {
--if (strncmp(buf, NEXTLEVEL, 9) == 0) {
-- nextlevel = 1;
-- break;
--} else if (strncmp(buf, LEFTHYPHENMIN, 13) == 0) {
-- dict[k]-lhmin = atoi(buf + 13);
-- continue;
-+if (strncmp(buf, LEFTHYPHENMIN, 13) == 0) {
-+ dict-lhmin = atoi(buf + 13);
-+ return;
- } else if (strncmp(buf, RIGHTHYPHENMIN, 14) == 0) {
-- dict[k]-rhmin = atoi(buf + 14);
-- continue;
-+ dict-rhmin = atoi(buf + 14);
-+ return;
- } else if (strncmp(buf, COMPOUNDLEFTHYPHENMIN, 21) == 0) {
-- dict[k]-clhmin = atoi(buf + 21);
-- continue;
-+ dict-clhmin = atoi(buf + 21);
-+ return;
-
[Libreoffice-commits] .: embeddedobj/source
embeddedobj/source/commonembedding/persistence.cxx | 34 ++---
embeddedobj/source/commonembedding/xfactory.cxx| 22 ++---
embeddedobj/source/general/docholder.cxx |8 ++--
embeddedobj/source/general/dummyobject.cxx |4 +-
embeddedobj/source/general/xcreator.cxx| 24 +++---
embeddedobj/source/msole/oleembed.cxx | 20 ++--
embeddedobj/source/msole/olemisc.cxx |4 +-
embeddedobj/source/msole/olepersist.cxx| 24 +++---
embeddedobj/source/msole/ownview.cxx | 26
embeddedobj/source/msole/xolefactory.cxx | 10 +++---
10 files changed, 88 insertions(+), 88 deletions(-)
New commits:
commit 7c0c3362de894ddd4526f56e1849f116eb25cedd
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Wed Dec 21 19:54:11 2011 -0200
Fix for fdo43460 Part XV getLength() to isEmpty()
Part XV
Module
embeddeobj
diff --git a/embeddedobj/source/commonembedding/persistence.cxx
b/embeddedobj/source/commonembedding/persistence.cxx
index 8afe92d..654e221 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -246,7 +246,7 @@ static void SetDocToEmbedded( const uno::Reference
frame::XModel xDocument, c
aSeq[0].Value = sal_True;
xDocument-attachResource( ::rtl::OUString(), aSeq );
-if ( aModuleName.getLength() )
+if ( !aModuleName.isEmpty() )
{
try
{
@@ -465,7 +465,7 @@ uno::Reference util::XCloseable
OCommonEmbeddedObject::LoadLink_Impl()
::rtl::OUString OCommonEmbeddedObject::GetFilterName( sal_Int32 nVersion )
const
{
::rtl::OUString aFilterName = GetPresetFilterName();
-if ( !aFilterName.getLength() )
+if ( aFilterName.isEmpty() )
{
try {
::comphelper::MimeConfigurationHelper aHelper( m_xFactory );
@@ -486,8 +486,8 @@ void OCommonEmbeddedObject::FillDefaultLoadArgs_Impl( const
uno::Reference embe
o_rLoadArgs.put( ReadOnly, m_bReadOnly );
::rtl::OUString aFilterName = GetFilterName(
::comphelper::OStorageHelper::GetXStorageFormat( i_rxStorage ) );
-OSL_ENSURE( aFilterName.getLength(),
OCommonEmbeddedObject::FillDefaultLoadArgs_Impl: Wrong document service name!
);
-if ( !aFilterName.getLength() )
+OSL_ENSURE( !aFilterName.isEmpty(),
OCommonEmbeddedObject::FillDefaultLoadArgs_Impl: Wrong document service name!
);
+if ( aFilterName.isEmpty() )
throw io::IOException();// TODO: error message/code
o_rLoadArgs.put( FilterName, aFilterName );
@@ -543,7 +543,7 @@ uno::Reference util::XCloseable
OCommonEmbeddedObject::LoadDocumentFromStorag
{
}
-OSL_ENSURE( aTempFileURL.getLength(), Coudn't retrieve temporary file
URL!\n );
+OSL_ENSURE( !aTempFileURL.isEmpty(), Coudn't retrieve temporary file
URL!\n );
aLoadArgs.put( URL, aTempFileURL );
aLoadArgs.put( InputStream, xTempInpStream );
@@ -613,8 +613,8 @@ uno::Reference io::XInputStream
OCommonEmbeddedObject::StoreDocumentToTempStr
::rtl::OUString aFilterName = GetFilterName( nStorageFormat );
-OSL_ENSURE( aFilterName.getLength(), Wrong document service name! );
-if ( !aFilterName.getLength() )
+OSL_ENSURE( !aFilterName.isEmpty(), Wrong document service name! );
+if ( aFilterName.isEmpty() )
throw io::IOException(); // TODO:
uno::Sequence beans::PropertyValue aArgs( 4 );
@@ -692,7 +692,7 @@ void OCommonEmbeddedObject::SaveObject_Impl()
{}
}
-if ( !aBaseURL.getLength() )
+if ( aBaseURL.isEmpty() )
{
for ( nInd = 0; nInd m_aDocMediaDescriptor.getLength(); nInd++ )
if ( m_aDocMediaDescriptor[nInd].Name.equals(
@@ -703,7 +703,7 @@ void OCommonEmbeddedObject::SaveObject_Impl()
}
}
-if ( !aBaseURL.getLength() )
+if ( aBaseURL.isEmpty() )
aBaseURL = m_aDefaultParentBaseURL;
return aBaseURL;
@@ -724,7 +724,7 @@ void OCommonEmbeddedObject::SaveObject_Impl()
break;
}
-if ( !aBaseURL.getLength() )
+if ( aBaseURL.isEmpty() )
{
for ( nInd = 0; nInd lObjArgs.getLength(); nInd++ )
if ( lObjArgs[nInd].Name.equals( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( DefaultParentBaseURL ) ) ) )
@@ -775,8 +775,8 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const
uno::Reference embed:
{
::rtl::OUString aFilterName = GetFilterName( nStorageFormat );
-OSL_ENSURE( aFilterName.getLength(), Wrong document service name! );
-if ( !aFilterName.getLength() )
+OSL_ENSURE( !aFilterName.isEmpty(), Wrong document service name! );
+if ( aFilterName.isEmpty() )
throw io::IOException(); // TODO:
uno::Sequence beans::PropertyValue aArgs( 3 );
@@ -896,7
[Libreoffice-commits] .: 2 commits - codemaker/inc codemaker/source hyphen/hyphen-fdo43931.patch hyphen/makefile.mk unusedcode.easy
codemaker/inc/codemaker/commoncpp.hxx|2 --
codemaker/source/commoncpp/commoncpp.cxx | 25 -
hyphen/hyphen-fdo43931.patch | 11 +++
hyphen/makefile.mk |3 ++-
unusedcode.easy |1 -
5 files changed, 13 insertions(+), 29 deletions(-)
New commits:
commit 84897d4b3b2a0e4719b00fb06abb8c04e3c20c24
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 22 23:41:29 2011 +
Recover fix for fdo#43931
diff --git a/hyphen/hyphen-fdo43931.patch b/hyphen/hyphen-fdo43931.patch
new file mode 100644
index 000..5299066
--- /dev/null
+++ b/hyphen/hyphen-fdo43931.patch
@@ -0,0 +1,11 @@
+--- misc/hyphen-2.8.3/hyphen.c 2011-12-22 23:37:55.929693094 +
misc/build/hyphen-2.8.3/hyphen.c 2011-12-22 23:38:32.294088592 +
+@@ -437,7 +437,7 @@
+ /* default first level: hyphen and ASCII apostrophe */
+ if (!dict[0]-utf8) hnj_hyphen_load_line(NOHYPHEN '\n, dict[k],
hashtab);
+ else hnj_hyphen_load_line(NOHYPHEN ',\xe2\x80\x93,\xe2\x80\x99\n,
dict[k], hashtab);
+-strcpy(buf, 1-1/=,1,1\n); // buf rewritten by hnj_hyphen_load here
++strcpy(buf, 1-1\n); // buf rewritten by hnj_hyphen_load here
+ hnj_hyphen_load_line(buf, dict[k], hashtab); /* remove hyphen */
+ hnj_hyphen_load_line(1'1\n, dict[k], hashtab); /* ASCII apostrophe */
+ if (dict[0]-utf8) {
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index feb0ea7..f44953f 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -43,7 +43,8 @@ ADDITIONAL_FILES += makefile.mk
PATCH_FILES= \
hyphen-build.patch \
-hyphen-android.patch
+hyphen-android.patch \
+hyphen-fdo43931.patch
.IF $(GUI)==UNX
CONFIGURE_DIR=$(BUILD_DIR)
commit 279b71044d1a8b60452425b5b192d3dfb21a62fe
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 22 23:18:21 2011 +
callcatcher: remove unused typeToPrefix
diff --git a/codemaker/inc/codemaker/commoncpp.hxx
b/codemaker/inc/codemaker/commoncpp.hxx
index 5ccb5e3..812dd04 100644
--- a/codemaker/inc/codemaker/commoncpp.hxx
+++ b/codemaker/inc/codemaker/commoncpp.hxx
@@ -33,8 +33,6 @@
namespace codemaker { namespace cpp {
-rtl::OString typeToPrefix(TypeManager const manager, rtl::OString const
type);
-
rtl::OString scopedCppName(rtl::OString const type, bool bNoNameSpace=false,
bool shortname=false);
diff --git a/codemaker/source/commoncpp/commoncpp.cxx
b/codemaker/source/commoncpp/commoncpp.cxx
index a6926e6..ddd9dad 100644
--- a/codemaker/source/commoncpp/commoncpp.cxx
+++ b/codemaker/source/commoncpp/commoncpp.cxx
@@ -46,31 +46,6 @@
namespace codemaker { namespace cpp {
-rtl::OString typeToPrefix(TypeManager const manager, rtl::OString const
type)
-{
-RTTypeClass typeclass = manager.getTypeClass(type);
-if (typeclass == RT_TYPE_INVALID ||
-typeclass == RT_TYPE_PUBLISHED)
-return rtl::OString(_);
-
-static char const * const typeclassPrefix[RT_TYPE_UNION + 1] = {
-invalid,/* RT_TYPE_INVALID, is here only as placeholder */
-interface, /* RT_TYPE_INTERFACE */
-module, /* RT_TYPE_MODULE */
-struct, /* RT_TYPE_STRUCT */
-enum, /* RT_TYPE_ENUM */
-exception, /* RT_TYPE_EXCEPTION */
-typedef,/* RT_TYPE_TYPEDEF */
-service,/* RT_TYPE_SERVICE */
-singleton, /* RT_TYPE_SINGLETON */
-object, /* RT_TYPE_OBJECT */
-constants, /* RT_TYPE_CONSTANTS */
-union /* RT_TYPE_UNION */
-};
-
-return rtl::OString(typeclassPrefix[typeclass]);
-}
-
rtl::OString scopedCppName(rtl::OString const type, bool bNoNameSpace,
bool shortname)
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 40865c7..fa8ca4a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1608,7 +1608,6 @@ chart::EquidistantTickIter::getMaxIndex() const
chart::EquidistantTickIter::gotoIndex(int)
cmis::Content::exchangeIdentity(com::sun::star::uno::Referencecom::sun::star::ucb::XContentIdentifier
const)
cmis::Content::queryChildren(std::__debug::listrtl::Referencecmis::Content,
std::allocatorrtl::Referencecmis::Content )
-codemaker::cpp::typeToPrefix(TypeManager const, rtl::OString const)
comphelper::AccessibleEventNotifier::getEventListeners(unsigned int)
comphelper::AttributeList::AppendAttributeList(com::sun::star::uno::Referencecom::sun::star::xml::sax::XAttributeList
const)
comphelper::AttributeList::Clear()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild vcl/generic vcl/headless vcl/inc vcl/unx
solenv/gbuild/extensions/post_BuildplTargets.mk |4 +-
vcl/generic/print/common_gfx.cxx| 18 +-
vcl/generic/print/genprnpsp.cxx | 42
vcl/generic/print/printerjob.cxx|2 -
vcl/headless/svpprn.cxx |2 -
vcl/inc/vcl/ppdparser.hxx |3 +
vcl/unx/generic/printer/ppdparser.cxx |4 +-
7 files changed, 39 insertions(+), 36 deletions(-)
New commits:
commit f42e17d83b5c4f5343c8b113ef2d8dcbf96f8a20
Author: Christina Rossmanith chrrossman...@web.de
Date: Mon Jan 2 21:56:19 2012 +0100
Replace (Byte)String with rtl::O(U)String
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index 43c2cbb..26ac567 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -1188,26 +1188,26 @@ PrinterGfx::DrawEPS( const Rectangle rBoundingBox,
void* pPtr, sal_uInt32 nSize
// first search the BoundingBox of the EPS data
SvMemoryStream aStream( pPtr, nSize, STREAM_READ );
aStream.Seek( STREAM_SEEK_TO_BEGIN );
-ByteString aLine;
+rtl::OString aLine;
rtl::OString aDocTitle;
double fLeft = 0, fRight = 0, fTop = 0, fBottom = 0;
bool bEndComments = false;
while( ! aStream.IsEof()
( ( fLeft == 0 fRight == 0 fTop == 0 fBottom == 0 ) ||
-( aDocTitle.getLength() == 0 bEndComments == false ) )
+( aDocTitle.isEmpty() bEndComments == false ) )
)
{
aStream.ReadLine( aLine );
-if( aLine.Len() 1 aLine.GetChar( 0 ) == '%' )
+if( aLine.getLength() 1 aLine[0] == '%' )
{
-char cChar = aLine.GetChar(1);
+char cChar = aLine[1];
if( cChar == '%' )
{
-if( aLine.CompareIgnoreCaseToAscii( %%BoundingBox:, 14 ) ==
COMPARE_EQUAL )
+if( comphelper::string::matchIgnoreAsciiCaseL( aLine,
RTL_CONSTASCII_STRINGPARAM(%%BoundingBox:) ) )
{
aLine = WhitespaceToSpace(
comphelper::string::getToken(aLine, 1, ':') );
-if( aLine.Len() aLine.Search( atend ) ==
STRING_NOTFOUND )
+if( !aLine.isEmpty() aLine.indexOf( atend ) == -1 )
{
fLeft = StringToDouble( GetCommandLineToken( 0,
aLine ) );
fBottom = StringToDouble( GetCommandLineToken( 1,
aLine ) );
@@ -1215,9 +1215,9 @@ PrinterGfx::DrawEPS( const Rectangle rBoundingBox, void*
pPtr, sal_uInt32 nSize
fTop= StringToDouble( GetCommandLineToken( 3,
aLine ) );
}
}
-else if( aLine.CompareIgnoreCaseToAscii( %%Title:, 8 ) ==
COMPARE_EQUAL )
-aDocTitle = WhitespaceToSpace( aLine.Copy( 8 ) );
-else if( aLine.CompareIgnoreCaseToAscii( %%EndComments, 13 )
== COMPARE_EQUAL )
+else if( comphelper::string::matchIgnoreAsciiCaseL( aLine,
RTL_CONSTASCII_STRINGPARAM(%%Title:) ) )
+aDocTitle = WhitespaceToSpace( aLine.copy( 8 ) );
+else if( comphelper::string::matchIgnoreAsciiCaseL( aLine,
RTL_CONSTASCII_STRINGPARAM(%%EndComments) ) )
bEndComments = true;
}
else if( cChar == ' ' || cChar == '\t' || cChar == '\r' || cChar
== '\n' )
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 23a7bf5..747b0ec 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -47,6 +47,7 @@
#endif
#include rtl/ustring.hxx
+#include comphelper/string.hxx
#include osl/module.h
@@ -86,19 +87,19 @@ typedef int(*faxFunction)(String);
static faxFunction pFaxNrFunction = NULL;
}
-static String getPdfDir( const PrinterInfo rInfo )
+static rtl::OUString getPdfDir( const PrinterInfo rInfo )
{
-String aDir;
+rtl::OUString aDir;
sal_Int32 nIndex = 0;
while( nIndex != -1 )
{
-OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
+rtl::OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
if( ! aToken.compareToAscii( pdf=, 4 ) )
{
sal_Int32 nPos = 0;
aDir = aToken.getToken( 1, '=', nPos );
-if( ! aDir.Len() )
-aDir = String( ByteString( getenv( HOME ) ),
osl_getThreadTextEncoding() );
+if( aDir.isEmpty() getenv( HOME ) )
+aDir = rtl::OUString( getenv( HOME ), strlen( getenv( HOME
) ), osl_getThreadTextEncoding() );
break;
}
}
@@ -137,7 +138,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup,
JobData rData )
pJobSetup-meOrientation= (Orientation)(rData.m_eOrientation ==
orientation::Landscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT);
// copy
[Libreoffice-commits] .: 3 commits - basic/source cairo/cairo cairo/cairo.dlsym.lcdfilter.patch cppu/source dbaccess/source editeng/source idl/source sc/source sfx2/source svl/source svtools/source sv
basic/source/basmgr/basmgr.cxx | 15 ++-
basic/source/classes/image.cxx | 11 ++---
basic/source/classes/sbxmod.cxx |4 --
basic/source/runtime/methods1.cxx |3 -
cairo/cairo.dlsym.lcdfilter.patch | 56
cairo/cairo/makefile.mk |4 +-
cppu/source/typelib/typelib.cxx |2 -
dbaccess/source/ui/tabledesign/TableRow.cxx |9 ++--
editeng/source/editeng/editobj.cxx |6 +--
editeng/source/items/bulitem.cxx|7 +--
editeng/source/items/flditem.cxx|2 -
editeng/source/items/frmitems.cxx |5 +-
editeng/source/items/textitem.cxx |8 ++--
idl/source/objects/module.cxx |2 -
sc/source/core/data/patattr.cxx |2 -
sc/source/core/tool/autoform.cxx|4 +-
sc/source/core/tool/ddelink.cxx |6 +--
sc/source/core/tool/zforauto.cxx|2 -
sfx2/source/appl/appmisc.cxx|5 +-
svl/source/items/poolitem.cxx |5 +-
svl/source/numbers/zformat.cxx |2 -
svtools/source/misc/templatefoldercache.cxx |6 +--
svtools/source/misc/transfer.cxx|4 +-
svx/source/items/hlnkitem.cxx | 16
svx/source/items/pageitem.cxx |3 -
sw/source/core/doc/tblafmt.cxx |8 ++--
sw/source/ui/config/uinums.cxx | 14 +++
tools/inc/tools/stream.hxx |2 -
tools/source/stream/stream.cxx | 21 +-
vcl/source/gdi/font.cxx |4 +-
vcl/source/gdi/metaact.cxx |8 ++--
31 files changed, 143 insertions(+), 103 deletions(-)
New commits:
commit 79f5f4c97188e8584aceb6af98473c06f40f7500
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 6 09:37:16 2012 +
Resolves: fdo#44219 RHEL-4 buildbox doesn't have FT_Library_SetLcdFilter
diff --git a/cairo/cairo.dlsym.lcdfilter.patch
b/cairo/cairo.dlsym.lcdfilter.patch
new file mode 100644
index 000..46f7ac7
--- /dev/null
+++ b/cairo/cairo.dlsym.lcdfilter.patch
@@ -0,0 +1,56 @@
+--- misc/cairo-1.10.2/src/cairo-ft-font.c 2012-01-06 09:09:21.500373823
+
misc/build/cairo-1.10.2/src/cairo-ft-font.c2012-01-06
09:31:01.645238786 +
+@@ -59,6 +59,8 @@
+
+ #if HAVE_FT_LIBRARY_SETLCDFILTER
+ #include FT_LCD_FILTER_H
++#elif HAVE_DLFCN_H
++#include dlfcn.h
+ #endif
+
+ /* Fontconfig version older than 2.6 didn't have these options */
+@@ -1217,6 +1219,26 @@
+ return CAIRO_STATUS_SUCCESS;
+ }
+
++static void try_FT_Library_SetLcdFilter( FT_Library library,
++int lcd_filter )
++{
++#if HAVE_FT_LIBRARY_SETLCDFILTER
++FT_Library_SetLcdFilter (library, lcd_filter);
++#elif HAVE_DLFCN_H
++static void (*pFT_Library_SetLcdFilter) (FT_Library, int);
++static int dlsymed = 0;
++
++if (!dlsymed)
++{
++pFT_Library_SetLcdFilter = dlsym(RTLD_DEFAULT,
FT_Library_SetLcdFilter);
++dlsymed = 1;
++}
++
++if (pFT_Library_SetLcdFilter)
++ (*pFT_Library_SetLcdFilter) (library, lcd_filter);
++#endif
++}
++
+ /* Converts an outline FT_GlyphSlot into an image
+ *
+ * This could go through _render_glyph_bitmap as well, letting
+@@ -1350,15 +1372,11 @@
+ break;
+ }
+
+-#if HAVE_FT_LIBRARY_SETLCDFILTER
+- FT_Library_SetLcdFilter (library, lcd_filter);
+-#endif
++ try_FT_Library_SetLcdFilter(library, lcd_filter);
+
+ fterror = FT_Render_Glyph (face-glyph, render_mode);
+
+-#if HAVE_FT_LIBRARY_SETLCDFILTER
+- FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE);
+-#endif
++ try_FT_Library_SetLcdFilter(library, FT_LCD_FILTER_NONE);
+
+ if (fterror != 0)
+ return _cairo_error (CAIRO_STATUS_NO_MEMORY);
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 7f84e3d..1c06c74 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -47,7 +47,9 @@ CAIROVERSION=1.10.2
TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION)
TARFILE_MD5=f101a9e88b783337b20b2e26dfd26d5f
-PATCH_FILES=..$/$(TARFILE_NAME).patch
+PATCH_FILES=\
+..$/cairo-1.10.2.patch \
+..$/cairo.dlsym.lcdfilter.patch
.IF $(OS)$(COM) == WNTMSC
PATCH_FILES+= ..$/$(TARFILE_NAME).wntmsc.patch
commit 504e01e52e38583c6bcbd620973b314596633cdb
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 6 08:59:45 2012 +
typo in OSL_DEBUG_LEVEL 1 code
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index a0ed525..169d29d 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -737,7 +737,7 @@ extern C void SAL_CALL typelib_typedescription_newEmpty(
pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL 1
osl_incrementInterlockedCount(
-
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |8 1 file changed, 8 insertions(+) New commits: commit 6be6357cce999e5a1a692da1f682847be3723587 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 6 10:24:30 2012 + generic unix .mozilla dir is under home dir, not xdg-config-dir diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index 3625e56..4db639b 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -56,7 +56,15 @@ namespace ::osl::Security aSecurity; ::rtl::OUString aConfigPath; +#if defined(XP_WIN) || defined(MACOSX) aSecurity.getConfigDir( aConfigPath ); +#else +//This is to find the dir under which .mozilla/.thunderbird is created. +//mozilla doesn't honour XDG_CONFIG_HOME, so raw home dir required here +//not xdg-config dir +aSecurity.getHomeDir( aConfigPath ); +#endif + return aConfigPath + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/)); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/osl
sal/osl/unx/file.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit c11bcb5be5a282864ffc35d2b29d530f07a7e8fd
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 6 12:10:45 2012 +
valgrind: error on startup in osl_unmapMappedFile
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index bb31902..4bb30cf 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1045,13 +1045,16 @@ SAL_CALL osl_closeFile( oslFileHandle Handle )
{
FileHandle_Impl* pImpl = static_castFileHandle_Impl*(Handle);
+if (pImpl == 0)
+return osl_File_E_INVAL;
+
if (pImpl-m_kind == FileHandle_Impl::KIND_MEM)
{
delete pImpl;
return osl_File_E_None;
}
-if ((pImpl == 0) || (pImpl-m_fd 0))
+if (pImpl-m_fd 0)
return osl_File_E_INVAL;
(void) pthread_mutex_lock ((pImpl-m_mutex));
@@ -1239,6 +1242,9 @@ SAL_CALL osl_unmapMappedFile (oslFileHandle Handle, void*
pAddr, sal_uInt64 uLen
{
FileHandle_Impl * pImpl = static_castFileHandle_Impl*(Handle);
+if (pImpl == 0)
+return osl_File_E_INVAL;
+
if (pImpl-m_kind == FileHandle_Impl::KIND_FD)
return unmapFile (pAddr, uLength);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_sfx2/sfxsids.hrc |3 --- 1 file changed, 3 deletions(-) New commits: commit 6b7448e04adfd2ecf27f0a28f02ba050826b44c7 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 6 16:35:16 2012 + ditch commented out SID diff --git a/binfilter/inc/bf_sfx2/sfxsids.hrc b/binfilter/inc/bf_sfx2/sfxsids.hrc index 6961af7..52400dd 100644 --- a/binfilter/inc/bf_sfx2/sfxsids.hrc +++ b/binfilter/inc/bf_sfx2/sfxsids.hrc @@ -705,9 +705,6 @@ #define SID_COPY(SID_SFX_START + 711) #define SID_PASTE (SID_SFX_START + 712) -// steht unter diesem Wert in chaos/cntids.hrc!!! -//#define SID_DELETE(SID_SFX_START + 713) - #define SID_BACKSPACE (SID_SFX_START + 714) #define SID_SELECT (SID_SFX_START + 720) #define SID_EXPANDSELECTION (SID_SFX_START + 721) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff
binfilter/bf_sc/source/core/data/sc_document.cxx |5 --
binfilter/bf_sc/source/core/tool/sc_addincol.cxx |4 -
binfilter/bf_sc/source/core/tool/sc_compiler.cxx |4 -
binfilter/bf_sc/source/core/tool/sc_interpr1.cxx | 10 +---
binfilter/bf_sc/source/core/tool/sc_interpr4.cxx |2
binfilter/bf_sc/source/core/tool/sc_userlist.cxx |7 +--
binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx |2
binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx |2
binfilter/bf_svtools/source/numbers/svt_zforfind.cxx | 18
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx |2
binfilter/bf_svtools/source/numbers/svt_zformat.cxx |6 +-
binfilter/bf_svtools/source/numbers/svt_zforscan.cxx | 40 +--
binfilter/bf_svx/source/items/svx_svxfont.cxx|6 +-
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 18 +++-
binfilter/bf_sw/source/core/doc/sw_docdde.cxx|8 +--
binfilter/bf_sw/source/core/doc/sw_docfld.cxx|2
binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx |2
17 files changed, 65 insertions(+), 73 deletions(-)
New commits:
commit a4a9f044294ae2afad3ecee138c771a3654add98
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 6 23:09:49 2012 +
track changes to CharClass
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx
b/binfilter/bf_sc/source/core/data/sc_document.cxx
index dc9b4ea..1f00d00 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -132,15 +132,14 @@ namespace binfilter {
/*N*/ BOOL ScDocument::GetTable( const String rName, USHORT rTab ) const
/*N*/ {
-/*N*/ String aUpperName = rName;
-/*N*/ ScGlobal::pCharClass-toUpper(aUpperName);
+/*N*/ String aUpperName = ScGlobal::pCharClass-uppercase(rName);
/*N*/ String aCompName;
/*N*/
/*N*/ for (USHORT i=0; i=MAXTAB; i++)
/*N*/ if (pTab[i])
/*N*/ {
/*N*/ pTab[i]-GetName( aCompName );
-/*N*/ ScGlobal::pCharClass-toUpper(aCompName);
+/*N*/ aCompName = ScGlobal::pCharClass-uppercase(aCompName);
/*N*/ if (aUpperName == aCompName)
/*N*/ {
/*N*/ rTab = i;
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index 0fbac52..f409574 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -170,8 +170,8 @@ public:
/*N*/ else
/*N*/ pArgDescs = NULL;
/*N*/
-/*N*/ ScGlobal::pCharClass-toUpper(aUpperName);
-/*N*/ ScGlobal::pCharClass-toUpper(aUpperLocal);
+/*N*/ aUpperName = ScGlobal::pCharClass-uppercase(aUpperName);
+/*N*/ aUpperLocal = ScGlobal::pCharClass-uppercase(aUpperLocal);
/*N*/ }
/*N*/ ScUnoAddInFuncData::~ScUnoAddInFuncData()
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index e67a51f..3653762 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -1467,7 +1467,7 @@ namespace binfilter {
/*N*/ bMayBeFuncName = TRUE; // operators and other
opcodes
/*N*/
/*N*/ String aOrg( cSymbol ); // evtl. Dateinamen in IsReference
erhalten
-/*N*/ String aUpper( ScGlobal::pCharClass-upper( aOrg ) );
+/*N*/ String aUpper( ScGlobal::pCharClass-uppercase( aOrg ) );
/*N*/ // Spalte DM konnte nicht referiert werden, IsReference vor
IsValue
/*N*/ // #42016# italian ARCTAN.2 gab #REF! = IsOpCode vor
IsReference
/*N*/ if ( !(bMayBeFuncName IsOpCode( aUpper ))
@@ -1482,7 +1482,7 @@ namespace binfilter {
/*N*/ SetError( errNoName );
/*N*/ if ( bAutoCorrect )
/*N*/ { // provide single token information and continue
-/*?*/ ScGlobal::pCharClass-toLower( aUpper );
+/*?*/ aUpper = ScGlobal::pCharClass-lowercase( aUpper );
/*?*/ aToken.SetString( aUpper.GetBuffer() );
/*?*/ aToken.NewOpCode( ocBad );
/*?*/ pRawToken = aToken.Clone();
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
index 5b33047..9eb51bd 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -1657,8 +1657,7 @@ void ScInterpreter::ScTrim()
void ScInterpreter::ScUpper()
{
-String aString = GetString();
-ScGlobal::pCharClass-toUpper(aString);
+String aString = ScGlobal::pCharClass-uppercase(GetString());
PushString(aString);
}
@@ -1672,8 +1671,8 @@ void ScInterpreter::ScPropper()
// (would crash now that the empty string is const)
if ( nLen 0 )
{
-String aUpr(
[Libreoffice-commits] .: 2 commits - svl/source unotools/inc
svl/source/misc/restrictedpaths.cxx |4 +-
unotools/inc/unotools/localfilehelper.hxx | 50 ++
2 files changed, 26 insertions(+), 28 deletions(-)
New commits:
commit 58ef08f5e1336acbcfcb9f6f7a6449a0eae518a7
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 9 20:21:26 2012 +
toLower-lowercase
diff --git a/svl/source/misc/restrictedpaths.cxx
b/svl/source/misc/restrictedpaths.cxx
index d743247..ffdcdc6 100644
--- a/svl/source/misc/restrictedpaths.cxx
+++ b/svl/source/misc/restrictedpaths.cxx
@@ -105,7 +105,7 @@ namespace svt
#ifdef WNT
// on windows, assume that the relevant file systems are case
insensitive,
// thus normalize the URL
-m_sCheckURL = m_aSysLocale.GetCharClass().toLower( m_sCheckURL, 0,
m_sCheckURL.Len() );
+m_sCheckURL = m_aSysLocale.GetCharClass().lowercase( m_sCheckURL,
0, m_sCheckURL.Len() );
#endif
}
@@ -114,7 +114,7 @@ namespace svt
#ifdef WNT
// on windows, assume that the relevant file systems are case
insensitive,
// thus normalize the URL
-String sApprovedURL( m_aSysLocale.GetCharClass().toLower(
_rApprovedURL, 0, _rApprovedURL.Len() ) );
+String sApprovedURL( m_aSysLocale.GetCharClass().lowercase(
_rApprovedURL, 0, _rApprovedURL.Len() ) );
#else
String sApprovedURL( _rApprovedURL );
#endif
commit 4e83af0dc7d41c458f9d971342c62103fad51d0f
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 9 15:31:21 2012 +
make indent sane
diff --git a/unotools/inc/unotools/localfilehelper.hxx
b/unotools/inc/unotools/localfilehelper.hxx
index 634c7de..ebccc43 100644
--- a/unotools/inc/unotools/localfilehelper.hxx
+++ b/unotools/inc/unotools/localfilehelper.hxx
@@ -36,35 +36,33 @@
namespace utl
{
+class UNOTOOLS_DLLPUBLIC LocalFileHelper
+{
+public:
+/**
+Converts a physical file name into a UCB compatible URL ( if
possible ).
+If no UCP is available for the local file system, sal_False and an
empty URL is returned.
+Returning sal_True and an empty URL means that the URL doesn't point
to a local file.
+*/
+static sal_Bool ConvertPhysicalNameToURL( const String rName, String
rReturn );
+static sal_Bool ConvertSystemPathToURL( const String rName, const
String rBaseURL, String rReturn );
-class UNOTOOLS_DLLPUBLIC LocalFileHelper
-{
-public:
-/**
-Converts a physical file name into a UCB compatible
URL ( if possible ).
-If no UCP is available for the local file system,
sal_False and an empty URL is returned.
-Returning sal_True and an empty URL means that the URL
doesn't point to a local file.
-*/
-static sal_Bool ConvertPhysicalNameToURL( const String rName, String
rReturn );
-static sal_Bool ConvertSystemPathToURL( const String rName, const String
rBaseURL, String rReturn );
-
-/**
-Converts a UCB compatible URL into a physical file
name.
-If no UCP is available for the local file system,
sal_False and an empty file name is returned,
-otherwise sal_True and a valid URL, because a file name
can always be converted if a UCP for the local
-file system is present ( watch: this doesn't mean that
this file really exists! )
-*/
-static sal_Bool ConvertURLToPhysicalName( const String rName, String
rReturn );
-static bool ConvertURLToPhysicalName( const rtl::OUString rName,
rtl::OUString rReturn );
-static sal_Bool ConvertURLToSystemPath( const String rName, String
rReturn );
-
-static sal_Bool IsLocalFile( const String rName );
-static sal_Bool IsFileContent( const String rName );
+/**
+Converts a UCB compatible URL into a physical file name.
+If no UCP is available for the local file system, sal_False and an
empty file name is returned,
+otherwise sal_True and a valid URL, because a file name can always be
converted if a UCP for the local
+file system is present ( watch: this doesn't mean that this file
really exists! )
+*/
+static sal_Bool ConvertURLToPhysicalName( const String rName, String
rReturn );
+static bool ConvertURLToPhysicalName( const rtl::OUString rName,
rtl::OUString rReturn );
+static sal_Bool ConvertURLToSystemPath( const String rName, String
rReturn );
-static ::com::sun::star::uno::Sequence ::rtl::OUString
-GetFolderContents( const ::rtl::OUString rFolder,
sal_Bool bFolder );
-};
+static sal_Bool IsLocalFile( const String rName );
+static sal_Bool IsFileContent( const String rName );
+static ::com::sun::star::uno::Sequence ::rtl::OUString
+
[Libreoffice-commits] .: 2 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
binfilter/bf_basic/source/basmgr/basmgr.cxx |2
binfilter/bf_sc/source/core/data/sc_globalx.cxx |2
binfilter/bf_sc/source/ui/docshell/sc_impex.cxx |4
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx| 58 -
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx|8 -
binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx|2
binfilter/bf_svtools/source/config/svt_pathoptions.cxx | 12 -
binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx |4
binfilter/bf_svx/source/svdraw/svx_svdograf.cxx | 67 ---
binfilter/bf_svx/source/svxlink/svx_fileobj.cxx |2
binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx |2
binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx |2
binfilter/inc/bf_sfx2/docfile.hxx|4
binfilter/inc/bf_svtools/pathoptions.hxx |2
14 files changed, 55 insertions(+), 116 deletions(-)
New commits:
commit edf439f6016fa8ab7ba7267c49cde32e201d8b06
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 9 22:36:26 2012 +
force users of horrific ReadUniOrByteStringLine to provide the charset
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
index 66fa779..3d6d3b4 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
@@ -472,13 +472,13 @@ enum DoubledQuoteMode
/*N*/
/*N*/ while(--nSkipLines0)
/*N*/ {
-/*?*/ rStrm.ReadUniOrByteStringLine( aLine ); // content is ignored
+/*?*/ rStrm.ReadUniOrByteStringLine( aLine, rStrm.GetStreamCharSet() );
// content is ignored
/*?*/ if ( rStrm.IsEof() )
/*?*/ break;
/*N*/ }
/*N*/ for( ;; )
/*N*/ {
-/*N*/ rStrm.ReadUniOrByteStringLine( aLine );
+/*N*/ rStrm.ReadUniOrByteStringLine( aLine, rStrm.GetStreamCharSet() );
/*N*/ if ( rStrm.IsEof() )
/*N*/ break;
/*N*/
commit 24e7ea4126d944958966cd9421089bc4aa76c17e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 9 21:06:04 2012 +
adapt to simplified LocalFileHelper::ConvertURLToPhysicalName
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx
b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index c551b55..efda967 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -977,7 +977,7 @@ void BasicManager::LoadBasicManager( SotStorage rStorage,
const String rBaseUR
if ( pLibs-aBasicLibPath.Len() )
{
// Lib im Pfad suchen...
-String aSearchFile = pInfo-GetRelStorageName();
+rtl::OUString aSearchFile = pInfo-GetRelStorageName();
SvtPathOptions aPathCFG;
if( aPathCFG.SearchFile( aSearchFile,
SvtPathOptions::PATH_BASIC ) )
{
diff --git a/binfilter/bf_sc/source/core/data/sc_globalx.cxx
b/binfilter/bf_sc/source/core/data/sc_globalx.cxx
index c7c06ca..9f8642c 100644
--- a/binfilter/bf_sc/source/core/data/sc_globalx.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_globalx.cxx
@@ -70,7 +70,7 @@ namespace binfilter {
/*N*/ {
/*N*/ // use LocalFileHelper to convert the path to a URL that
always points
/*N*/ // to the file on the server
-/*N*/ String aUrl;
+/*N*/ rtl::OUString aUrl;
/*N*/ if ( ::utl::LocalFileHelper::ConvertPhysicalNameToURL(
aPath, aUrl ) )
/*N*/ aPath = aUrl;
/*N*/
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
index 2bf7615..10b509c 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
@@ -466,12 +466,12 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ String aURL;
-/*N*/ if ( aName.Len() )
+/*N*/ rtl::OUString aURL;
+/*N*/ if ( !aName.isEmpty() )
/*N*/ ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName,
aURL );
/*N*/ else if ( aLogicName.Len() )
/*N*/ aURL = GetURLObject().GetMainURL( INetURLObject::NO_DECODE
);
-/*N*/ if ( aURL.Len() )
+/*N*/ if ( !aURL.isEmpty() )
/*N*/ ::ucbhelper::Content::create( aURL, xEnv, pImp-aContent );
/*N*/ }
/*N*/ }
@@ -609,9 +609,9 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
/*N*/ }
//--
-/*N*/ const String SfxMedium::GetPhysicalName() const
+/*N*/ const rtl::OUString SfxMedium::GetPhysicalName() const
/*N*/ {
-/*N*/ if ( !aName.Len() aLogicName.Len() )
+/*N*/ if ( aName.isEmpty() aLogicName.Len() )
/*N*/ ((
[Libreoffice-commits] .: sw/source
sw/source/filter/html/swhtml.cxx |4
sw/source/ui/index/cnttab.cxx|4
2 files changed, 8 deletions(-)
New commits:
commit 322afee279afd6ce5a99212757d0747858959d80
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jan 10 11:38:42 2012 +
MAC_WITHOUT_EXT never defined thesedays
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 019c9dd..23cc0df 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -165,16 +165,13 @@ String HTMLReader::GetTemplateName() const
sTemplate += INET_PATH_TOKEN;
sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(html) );
String sTemplateWithoutExt( sTemplate );
-#ifndef MAC_WITHOUT_EXT
// first search for OpenDocument Writer/Web template
sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(.oth) );
-#endif
SvtPathOptions aPathOpt;
// OpenDocument Writer/Web template (extension .oth)
sal_Bool bSet = aPathOpt.SearchFile( sTemplate,
SvtPathOptions::PATH_TEMPLATE );
-#ifndef MAC_WITHOUT_EXT
if( !bSet )
{
// 6.0 (extension .stw)
@@ -184,7 +181,6 @@ String HTMLReader::GetTemplateName() const
sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(.stw) );
bSet = aPathOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
}
-#endif
if( !bSet )
{
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 59382cb..414bc5f 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -513,15 +513,12 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox
*, pBox )
sTemplate += INET_PATH_TOKEN;
sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(idxexample) );
String sTemplateWithoutExt( sTemplate );
-#ifndef MAC_WITHOUT_EXT
sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(.odt) );
-#endif
SvtPathOptions aOpt;
// 6.0 (extension .sxw)
sal_Bool bExist = aOpt.SearchFile( sTemplate,
SvtPathOptions::PATH_TEMPLATE );
-#ifndef MAC_WITHOUT_EXT
if( !bExist )
{
// 6.0 (extension .sxw)
@@ -536,7 +533,6 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *,
pBox )
sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(.sdw) );
bExist = aOpt.SearchFile( sTemplate,
SvtPathOptions::PATH_TEMPLATE );
}
-#endif
if(!bExist)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: store/source
store/source/lockbyte.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit e596df57b54bcb4f67dfa1242d47dda0f1e0f6aa
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jan 10 12:36:03 2012 +
valgrind: have MappedLockBytes take complete ownership of the file handle
have MappedLockBytes take complete ownership of the file handle and
unmap it and close it on release. Otherwise xFile will close it
and MappedLockBytes will unmap it in that order, which breaks
post android requirement to have a valid file handle in unmap
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index a91e470..e28bffe 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -509,6 +509,7 @@ struct FileMapping
static void unmapFile (oslFileHandle hFile, sal_uInt8 * pAddr, sal_uInt32
nSize)
{
(void) osl_unmapMappedFile (hFile, pAddr, nSize);
+(void) osl_closeFile (hFile);
}
/** @see ResourceHolderT::destructor_type
@@ -922,6 +923,7 @@ FileLockBytes_createInstance (
rxLockBytes = new MappedLockBytes (xMapping.get());
if (!rxLockBytes.is())
return store_E_OutOfMemory;
+(void) xFile.release();
(void) xMapping.release();
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - icu/makefile.mk libxml2/makefile.mk
icu/makefile.mk |2 +- libxml2/makefile.mk | 13 +++-- 2 files changed, 12 insertions(+), 3 deletions(-) New commits: commit 0ffc8c0d70860e1da3b71eb3ffbb30a0d463ddef Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 10 13:13:59 2012 + build debugging libxml2 with -g diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 1d125c1..78c4c3e 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -106,10 +106,19 @@ BUILD_ACTION=nmake BUILD_DIR=$(CONFIGURE_DIR) .ENDIF .ELSE + +.IF $(debug) != +xml2_CFLAGS+=-g +.ELSE +xml2_CFLAGS+=-O +.ENDIF + +xml2_CFLAGS+=$(ARCH_FLAGS) + .IF $(SYSBASE)!= xml2_CFLAGS+=-I$(SYSBASE)$/usr$/include .IF $(COMNAME)==sunpro5 -xml2_CFLAGS+=$(ARCH_FLAGS) $(C_RESTRICTIONFLAGS) +xml2_CFLAGS+=$(C_RESTRICTIONFLAGS) .ENDIF # $(COMNAME)==sunpro5 xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib .ENDIF # $(SYSBASE)!= @@ -121,7 +130,7 @@ CONFIGURE_FLAGS=--disable-shared .ELSE CONFIGURE_FLAGS=--disable-static .ENDIF -CONFIGURE_FLAGS+=--enable-ipv6=no --without-python --without-zlib --with-sax1=yes ADDCFLAGS=$(xml2_CFLAGS) $(EXTRA_CFLAGS) LDFLAGS=$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS) +CONFIGURE_FLAGS+=--enable-ipv6=no --without-python --without-zlib --with-sax1=yes CFLAGS=$(xml2_CFLAGS) $(EXTRA_CFLAGS) LDFLAGS=$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS) BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) commit 7c21df4eb3a977de368b40906b9808d078349f9e Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 10 13:13:19 2012 + typo in .IF diff --git a/icu/makefile.mk b/icu/makefile.mk index cb02475..02f94a4 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -82,7 +82,7 @@ CC:=gcc $(EXTRA_CFLAGS) .ENDIF # $(EXTRA_CFLAGS)!= .ENDIF # $(OS)==MACOSX -.IF $(debug) != +.IF $(debug) != icu_CFLAGS+=-g $(ARCH_FLAGS) icu_CXXFLAGS+=-g $(ARCH_FLAGS) .ELSE ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - vcl/generic
vcl/generic/print/genprnpsp.cxx | 47 ---
vcl/generic/print/genpspgraphics.cxx | 16 ++-
2 files changed, 31 insertions(+), 32 deletions(-)
New commits:
commit 5e3612b1d5923845bf955231278f45b4e3089951
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jan 10 13:32:36 2012 +
can drop intermediate strings now
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 83b3418..18980a4 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -357,10 +357,9 @@ static bool sendAFax( const OUString rFaxNumber, const
OUString rFileName, con
{
while( aFaxNumbers.begin() != aFaxNumbers.end() bSuccess )
{
-OUString aCmdLine( rCommand );
OUString aFaxNumber( aFaxNumbers.front() );
aFaxNumbers.pop_front();
-aCmdLine = comphelper::string::replace( aCmdLine, OUString(
RTL_CONSTASCII_USTRINGPARAM( (PHONE) ) ), aFaxNumber );
+OUString aCmdLine = comphelper::string::replace( rCommand,
OUString( RTL_CONSTASCII_USTRINGPARAM( (PHONE) ) ), aFaxNumber );
#if OSL_DEBUG_LEVEL 1
fprintf( stderr, sending fax to \%s\\n, OUStringToOString(
aFaxNumber, osl_getThreadTextEncoding() ).getStr() );
#endif
@@ -383,8 +382,7 @@ static bool sendAFax( const OUString rFaxNumber, const
OUString rFileName, con
static bool createPdf( const OUString rToFile, const OUString rFromFile,
const OUString rCommandLine )
{
#if defined( UNX )
-OUString aCommandLine( rCommandLine );
-aCommandLine = comphelper::string::replace( aCommandLine, OUString(
RTL_CONSTASCII_USTRINGPARAM( (OUTFILE) ) ), rToFile );
+OUString aCommandLine = comphelper::string::replace( rCommandLine,
OUString( RTL_CONSTASCII_USTRINGPARAM( (OUTFILE) ) ), rToFile );
return passFileToCommandLine( rFromFile, aCommandLine );
#else
commit 6dc465535784fa8964fbd7d1b12eaecadf027cdc
Author: Christina Rossmanith chrrossman...@web.de
Date: Tue Jan 10 10:42:55 2012 +0100
Replace (Byte)String with rtl::O(U)String
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 747b0ec..83b3418 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -83,7 +83,7 @@ extern C
{
typedef int(*setupFunction)(PrinterInfo);
static setupFunction pSetupFunction = NULL;
-typedef int(*faxFunction)(String);
+typedef int(*faxFunction)(OUString);
static faxFunction pFaxNrFunction = NULL;
}
@@ -170,7 +170,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup,
JobData rData )
pJobSetup-mnPaperBin = 0;
if( rData.m_pParser )
-pKey= rData.m_pParser-getKey( String(
RTL_CONSTASCII_USTRINGPARAM( InputSlot ) ) );
+pKey= rData.m_pParser-getKey( OUString(
RTL_CONSTASCII_USTRINGPARAM( InputSlot ) ) );
if( pKey )
pValue = rData.m_aContext.getValue( pKey );
if( pKey pValue )
@@ -190,7 +190,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup,
JobData rData )
pJobSetup-meDuplexMode = DUPLEX_UNKNOWN;
if( rData.m_pParser )
-pKey = rData.m_pParser-getKey( String( RTL_CONSTASCII_USTRINGPARAM(
Duplex ) ) );
+pKey = rData.m_pParser-getKey( OUString( RTL_CONSTASCII_USTRINGPARAM(
Duplex ) ) );
if( pKey )
pValue = rData.m_aContext.getValue( pKey );
if( pKey pValue )
@@ -231,7 +231,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup,
JobData rData )
// Needs a cleaner abstraction ...
#if defined( UNX )
-static bool passFileToCommandLine( const String rFilename, const String
rCommandLine, bool bRemoveFile = true )
+static bool passFileToCommandLine( const OUString rFilename, const OUString
rCommandLine, bool bRemoveFile = true )
{
bool bSuccess = false;
@@ -315,19 +315,19 @@ static bool passFileToCommandLine( const String
rFilename, const String rComma
}
#endif
-static bool sendAFax( const String rFaxNumber, const String rFileName, const
String rCommand )
+static bool sendAFax( const OUString rFaxNumber, const OUString rFileName,
const OUString rCommand )
{
#if defined( UNX )
std::list OUString aFaxNumbers;
-if( ! rFaxNumber.Len() )
+if( rFaxNumber.isEmpty() )
{
getPaLib();
if( pFaxNrFunction )
{
-String aNewNr;
+OUString aNewNr;
if( pFaxNrFunction( aNewNr ) )
-aFaxNumbers.push_back( OUString( aNewNr ) );
+aFaxNumbers.push_back( aNewNr );
}
}
else
@@ -357,11 +357,10 @@ static bool sendAFax( const String rFaxNumber, const
String rFileName, const S
{
while( aFaxNumbers.begin() != aFaxNumbers.end() bSuccess )
{
-String aCmdLine( rCommand );
-String aFaxNumber( aFaxNumbers.front() );
+OUString aCmdLine( rCommand
[Libreoffice-commits] .: extras/source
extras/source/truetype/symbol/README | 16 1 file changed, 16 insertions(+) New commits: commit 211e147ac64b2a22652d7390bcd9c8f7215a73b4 Author: Caolán McNamara caol...@redhat.com Date: Wed Jan 11 14:44:42 2012 + add README to document how to bump the font version diff --git a/extras/source/truetype/symbol/README b/extras/source/truetype/symbol/README new file mode 100644 index 000..889dd36 --- /dev/null +++ b/extras/source/truetype/symbol/README @@ -0,0 +1,16 @@ +Modify the OpenSymbol.sfd and generate opens___.ttf from it with fontforge. The +.sfd is the canonical source for the .ttf + +Every new version of the font should increase the font version. This is +important so that when two versions of the font are installed, e.g. one +bundled inside the office installation, and one already installed on the system +that the most recent font can be detected and favoured. + +Bumping the font version is easiest done manually by bumping the two places in +the .sfd where the version is mentioned, e.g. + +-Version: 102.2 ++Version: 102.3 + +-LangName: 1033 Regular OpenSymbol Version 102.2 ++LangName: 1033 Regular OpenSymbol Version 102.3 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: avmedia/source
avmedia/source/win/framegrabber.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit eea8a6e2181ee805854d29184aab3317264dde94
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jan 11 15:04:18 2012 +
fix windows build error
diff --git a/avmedia/source/win/framegrabber.cxx
b/avmedia/source/win/framegrabber.cxx
index 9743d12..fd7264c 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -84,11 +84,11 @@ IMediaDet* FrameGrabber::implCreateMediaDet( const
::rtl::OUString rURL ) const
if( SUCCEEDED( CoCreateInstance( CLSID_MediaDet, NULL,
CLSCTX_INPROC_SERVER, IID_IMediaDet, (void**) pDet ) ) )
{
-String aLocalStr;
+rtl::OUString aLocalStr;
-if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( rURL, aLocalStr
) aLocalStr.Len() )
+if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( rURL, aLocalStr
) !aLocalStr.isEmpty() )
{
-if( !SUCCEEDED( pDet-put_Filename( ::SysAllocString(
reinterpret_castLPCOLESTR(aLocalStr.GetBuffer()) ) ) ) )
+if( !SUCCEEDED( pDet-put_Filename( ::SysAllocString(
reinterpret_castLPCOLESTR(aLocalStr.getStr()) ) ) ) )
{
pDet-Release();
pDet = NULL;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/generic
vcl/generic/fontmanager/fontconfig.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 34d1c9f9b8618c3a58516c4fa4286f257c858430
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jan 11 20:47:54 2012 +
Resolves:fdo#44078 fix unfortunate name alias mixups with DejaVu fonts
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index daf4fee..90d59f1 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -124,7 +124,7 @@ public:
boost::unordered_map rtl::OString, rtl::OString, rtl::OStringHash
m_aFontNameToLocalized;
boost::unordered_map rtl::OString, rtl::OString, rtl::OStringHash
m_aLocalizedToCanonical;
private:
-void cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8 *bestfontname,
const std::vector lang_and_element lang_and_elements);
+void cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8
*bestfontname, const std::vector lang_and_element lang_and_elements);
};
FontCfgWrapper::FontCfgWrapper()
@@ -296,6 +296,7 @@ namespace
std::vectorlang_and_element::const_iterator aEnd = elements.end();
bool alreadyclosematch = false;
+bool found_fallback_englishname = false;
for( std::vectorlang_and_element::const_iterator aIter =
elements.begin(); aIter != aEnd; ++aIter )
{
const char *pLang = (const char*)aIter-first;
@@ -307,7 +308,8 @@ namespace
}
else if( alreadyclosematch )
{
-// override candidate only if there is a perfect match
+// current candidate matches lang of lang-TERRITORY
+// override candidate only if there is a full match
continue;
}
else if( rtl_str_compare( pLang, sLangMatch.getStr()) == 0)
@@ -316,10 +318,18 @@ namespace
candidate = aIter-second;
alreadyclosematch = true;
}
+else if( found_fallback_englishname )
+{
+// already found an english fallback, don't override candidate
+// unless there is a better language match
+continue;
+}
else if( rtl_str_compare( pLang, en) == 0)
{
-// fallback to the english element name
+// select a fallback candidate of the first english element
+// name
candidate = aIter-second;
+found_fallback_englishname = true;
}
}
return candidate;
@@ -327,7 +337,8 @@ namespace
}
//Set up maps to quickly map between a fonts best UI name and all the rest of
its names, and vice versa
-void FontCfgWrapper::cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8
*bestfontname, const std::vector lang_and_element lang_and_elements)
+void FontCfgWrapper::cacheLocalizedFontNames(const FcChar8 *origfontname,
const FcChar8 *bestfontname,
+const std::vector lang_and_element lang_and_elements)
{
std::vectorlang_and_element::const_iterator aEnd =
lang_and_elements.end();
for (std::vectorlang_and_element::const_iterator aIter =
lang_and_elements.begin(); aIter != aEnd; ++aIter)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/generic
vcl/generic/fontmanager/fontconfig.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 25b90909a7a22f6900abbe9df12570a24e528c9a
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jan 11 20:47:54 2012 +
Resolves:fdo#44078 fix unfortunate name alias mixups with DejaVu fonts
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index 4d02a76..a120fb7 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -124,7 +124,7 @@ public:
boost::unordered_map rtl::OString, rtl::OString, rtl::OStringHash
m_aFontNameToLocalized;
boost::unordered_map rtl::OString, rtl::OString, rtl::OStringHash
m_aLocalizedToCanonical;
private:
-void cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8 *bestfontname,
const std::vector lang_and_element lang_and_elements);
+void cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8
*bestfontname, const std::vector lang_and_element lang_and_elements);
};
FontCfgWrapper::FontCfgWrapper()
@@ -296,6 +296,7 @@ namespace
std::vectorlang_and_element::const_iterator aEnd = elements.end();
bool alreadyclosematch = false;
+bool found_fallback_englishname = false;
for( std::vectorlang_and_element::const_iterator aIter =
elements.begin(); aIter != aEnd; ++aIter )
{
const char *pLang = (const char*)aIter-first;
@@ -307,7 +308,8 @@ namespace
}
else if( alreadyclosematch )
{
-// override candidate only if there is a perfect match
+// current candidate matches lang of lang-TERRITORY
+// override candidate only if there is a full match
continue;
}
else if( rtl_str_compare( pLang, sLangMatch.getStr()) == 0)
@@ -316,10 +318,18 @@ namespace
candidate = aIter-second;
alreadyclosematch = true;
}
+else if( found_fallback_englishname )
+{
+// already found an english fallback, don't override candidate
+// unless there is a better language match
+continue;
+}
else if( rtl_str_compare( pLang, en) == 0)
{
-// fallback to the english element name
+// select a fallback candidate of the first english element
+// name
candidate = aIter-second;
+found_fallback_englishname = true;
}
}
return candidate;
@@ -327,7 +337,8 @@ namespace
}
//Set up maps to quickly map between a fonts best UI name and all the rest of
its names, and vice versa
-void FontCfgWrapper::cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8
*bestfontname, const std::vector lang_and_element lang_and_elements)
+void FontCfgWrapper::cacheLocalizedFontNames(const FcChar8 *origfontname,
const FcChar8 *bestfontname,
+const std::vector lang_and_element lang_and_elements)
{
std::vectorlang_and_element::const_iterator aEnd =
lang_and_elements.end();
for (std::vectorlang_and_element::const_iterator aIter =
lang_and_elements.begin(); aIter != aEnd; ++aIter)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - editeng/inc editeng/source hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk svtools/inc svtools/source test/prj unusedcode.easy vcl/generic vcl/inc vcl/source xml
editeng/inc/editeng/unofdesc.hxx |1
editeng/source/uno/unofdesc.cxx | 24 -
hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk |1
svtools/inc/svtools/collatorres.hxx |9
svtools/source/control/collatorres.cxx| 26 -
test/prj/build.lst|2
unusedcode.easy |4
vcl/generic/fontmanager/fontmanager.cxx | 358 --
vcl/generic/print/glyphset.cxx| 25 -
vcl/generic/print/glyphset.hxx|3
vcl/inc/unx/strhelper.hxx | 44 --
vcl/inc/vcl/fontmanager.hxx | 27 -
vcl/inc/vcl/strhelper.hxx | 70 ++--
vcl/source/helper/strhelper.cxx |7
xmlsecurity/source/framework/buffernode.cxx | 34 --
xmlsecurity/source/framework/buffernode.hxx |1
16 files changed, 59 insertions(+), 577 deletions(-)
New commits:
commit 7d42c86f660b65f86a864a6b674dc8cba107911c
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 12 10:28:08 2012 +
pesky dependencies
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index a6722cc..7beda1a 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -78,7 +78,6 @@ $(eval $(call
gb_CppunitTest_set_args,hwpfilter_test_hwpfilter,\
# we need to explicitly depend on library hwp because it is not implied
# by a link relation
$(call gb_CppunitTest_get_target,hwpfilter_test_hwpfilter) : \
-$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,hwp)
# vim: set noet sw=4 ts=4:
diff --git a/test/prj/build.lst b/test/prj/build.lst
index a06591b..b58dc5b 100644
--- a/test/prj/build.lst
+++ b/test/prj/build.lst
@@ -1,2 +1,2 @@
-te test : unotest vcl i18npool NULL
+te test : unotest vcl i18npool filters NULL
te test\source nmake - all source_cpp NULL
commit 87ceb5c987f8bf546bbc0c0fc3447c640780be91
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 12 09:30:09 2012 +
VCL_DLLPUBLIC is in the wrong place
and there's a unused duplicate header here too which can go
diff --git a/vcl/inc/unx/strhelper.hxx b/vcl/inc/unx/strhelper.hxx
deleted file mode 100644
index 78db605..000
--- a/vcl/inc/unx/strhelper.hxx
+++ /dev/null
@@ -1,44 +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 _SV_STRHELPER_HXX
-#define _SV_STRHELPER_HXX
-#include tools/string.hxx
-
-String GetCommandLineToken( int, const String );
-// gets one token of a unix command line style string
-// doublequote, singlequote and singleleftquote protect their respective
-// contents
-
-int GetCommandLineTokenCount( const String );
-// returns number of tokens (zero if empty or whitespace only)
-
-String WhitespaceToSpace( const String, BOOL bProtect = TRUE );
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/strhelper.hxx b/vcl/inc/vcl/strhelper.hxx
index 62e4fc0..fa8258d 100644
--- a/vcl/inc/vcl/strhelper.hxx
+++ b/vcl/inc/vcl/strhelper.hxx
@@ -35,47 +35,47 @@
#include cstring
-namespace psp {
+namespace psp
+{
+VCL_DLLPUBLIC String GetCommandLineToken( int, const String );
+VCL_DLLPUBLIC rtl::OString GetCommandLineToken(int, const rtl::OString);
+// gets one token of a unix command line style string
+// doublequote, singlequote and singleleftquote protect their respective
+// contents
-String VCL_DLLPUBLIC GetCommandLineToken( int, const String );
-rtl::OString VCL_DLLPUBLIC GetCommandLineToken(int, const rtl::OString);
-// gets one token of a unix
[Libreoffice-commits] .: test/prj
test/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 66be03c7490e160721884806fc959c29faa8063f Author: Caolán McNamara caol...@redhat.com Date: Thu Jan 12 12:43:18 2012 + wrong depend diff --git a/test/prj/build.lst b/test/prj/build.lst index b58dc5b..a06591b 100644 --- a/test/prj/build.lst +++ b/test/prj/build.lst @@ -1,2 +1,2 @@ -te test : unotest vcl i18npool filters NULL +te test : unotest vcl i18npool NULL te test\source nmake - all source_cpp NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: boost/boost.6397.warnings.patch boost/makefile.mk
boost/boost.6397.warnings.patch | 222
boost/makefile.mk |4
2 files changed, 226 insertions(+)
New commits:
commit 14359c82eb91b69212cbf0f743e819776a8f6d3a
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 12 20:40:36 2012 +
enable boost::multi_array
diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch
new file mode 100644
index 000..a307c31
--- /dev/null
+++ b/boost/boost.6397.warnings.patch
@@ -0,0 +1,222 @@
+--- misc/boost_1_44_0/boost/multi_array/collection_concept.hpp 2012-01-12
20:21:29.790009198 +
misc/build/boost_1_44_0/boost/multi_array/collection_concept.hpp
2012-01-12 20:28:55.457287835 +
+@@ -43,11 +43,11 @@
+ i = c.end();
+ c.swap(c);
+ }
+-void const_constraints(const Collection c) {
+- ci = c.begin();
+- ci = c.end();
+- n = c.size();
+- b = c.empty();
++void const_constraints(const Collection c_) {
++ ci = c_.begin();
++ ci = c_.end();
++ n = c_.size();
++ b = c_.empty();
+ }
+ Collection c;
+ bool b;
+--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp 2012-01-12
20:21:29.790009198 +
misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp
2012-01-12 20:29:56.482879277 +
+@@ -39,8 +39,8 @@
+
+ template typename Array, typename IdxGen, typename Call_Type
+ static void call(Array a, const IdxGen idgen, Call_Type c) {
+- typedef typename Array::index_range index_range;
+- typedef typename Array::index index;
++ typedef typename Array::index_range index_range_;
++ typedef typename Array::index index_;
+ idgen_helperN-1::call(a,idgen[c],c);
+ }
+ };
+@@ -50,8 +50,8 @@
+
+ template typename Array, typename IdxGen, typename Call_Type
+ static void call(Array a, const IdxGen idgen, Call_Type) {
+- typedef typename Array::index_range index_range;
+- typedef typename Array::index index;
++ typedef typename Array::index_range index_range_;
++ typedef typename Array::index index_;
+ a[ idgen ];
+ }
+ };
+@@ -153,27 +153,27 @@
+ const_constraints(a);
+ }
+
+-void const_constraints(const Array a) {
++void const_constraints(const Array a_) {
+
+ // value_type vt = a[ id ];
+
+ // Test slicing, keeping only the first dimension, losing the rest
+- idgen_helperNumDims-1::call(a,idgen[range],id);
++ idgen_helperNumDims-1::call(a_,idgen[range],id);
+
+ // Test slicing, keeping all dimensions.
+- idgen_helperNumDims-1::call(a,idgen[range],range);
++ idgen_helperNumDims-1::call(a_,idgen[range],range);
+
+- st = a.size();
+- st = a.num_dimensions();
+- st = a.num_elements();
+- stp = a.shape();
+- idp = a.strides();
+- idp = a.index_bases();
+- cit = a.begin();
+- cit = a.end();
+- crit = a.rbegin();
+- crit = a.rend();
+- eltp = a.origin();
++ st = a_.size();
++ st = a_.num_dimensions();
++ st = a_.num_elements();
++ stp = a_.shape();
++ idp = a_.strides();
++ idp = a_.index_bases();
++ cit = a_.begin();
++ cit = a_.end();
++ crit = a_.rbegin();
++ crit = a_.rend();
++ eltp = a_.origin();
+ }
+
+ typedef typename Array::value_type value_type;
+--- misc/boost_1_44_0/boost/multi_array/extent_range.hpp 2012-01-12
20:21:29.790009198 +
misc/build/boost_1_44_0/boost/multi_array/extent_range.hpp 2012-01-12
20:32:16.696241748 +
+@@ -26,11 +26,11 @@
+ typedef Extent index;
+ typedef SizeType size_type;
+
+- extent_range(index start, index finish) :
+-super_type(start,finish) { }
++ extent_range(index start_, index finish_) :
++super_type(start_,finish_) { }
+
+- extent_range(index finish) :
+-super_type(0,finish) { }
++ extent_range(index finish_) :
++super_type(0,finish_) { }
+
+ extent_range() : super_type(0,0) { }
+
+--- misc/boost_1_44_0/boost/multi_array/index_range.hpp2012-01-12
20:21:29.790009198 +
misc/build/boost_1_44_0/boost/multi_array/index_range.hpp 2012-01-12
20:31:29.405781105 +
+@@ -60,8 +60,8 @@
+ degenerate_ = true;
+ }
+
+-explicit index_range(index start, index finish, index stride=1)
+- : start_(start), finish_(finish), stride_(stride),
++explicit index_range(index i_start, index i_finish, index i_stride=1)
++ : start_(i_start), finish_(i_finish), stride_(i_stride),
+ degenerate_(false)
+ { }
+
+@@ -107,11 +107,11 @@
+
+ index stride() const { return stride_; }
+
+-void set_index_range(index start, index finish, index stride=1)
++void set_index_range(index i_start, index i_finish, index i_stride=1)
+ {
+- start_ = start;
+- finish_ = finish;
+- stride_ = stride;
++ start_ = i_start;
++ finish_ = i_finish;
++ stride_ = i_stride;
+ }
[Libreoffice-commits] .: 10 commits - basic/source canvas/source cui/source dbaccess/source desktop/source dtrans/source framework/inc framework/source reportdesign/source svtools/inc svtools/source s
basic/source/sbx/sbxdec.cxx |6
canvas/source/cairo/cairo_win32_cairo.cxx |1
cui/source/dialogs/insrc.cxx | 17 --
cui/source/inc/insrc.hxx |9 -
dbaccess/source/ui/app/AppController.cxx |6
dbaccess/source/ui/app/AppController.hxx |2
desktop/source/app/cmdlinehelp.cxx|2
desktop/source/app/lockfile.hxx | 15 -
desktop/source/app/lockfile2.cxx |8 -
desktop/source/deployment/registry/component/dp_component.cxx |8 -
desktop/source/deployment/registry/package/dp_package.cxx |4
dtrans/source/win32/ftransl/ftransl.cxx |2
framework/inc/helper/shareablemutex.hxx |1
framework/source/fwi/helper/shareablemutex.cxx|5
reportdesign/source/ui/inc/ReportController.hxx |2
reportdesign/source/ui/report/ReportController.cxx|6
svtools/inc/svtools/indexentryres.hxx |4
svtools/source/control/indexentryres.cxx | 25 +--
svx/Library_svx.mk|1
svx/inc/svxempty.hxx | 46 --
svx/source/engine3d/scene3d.cxx |4
svx/source/items/svxempty.cxx | 40 -
tools/inc/tools/stream.hxx|5
tools/source/stream/stream.cxx|3
unusedcode.easy | 12 -
vcl/generic/fontmanager/fontmanager.cxx | 76 --
vcl/inc/vcl/fontmanager.hxx |1
27 files changed, 59 insertions(+), 252 deletions(-)
New commits:
commit 6008c3f547a8cfa5f8c97f4084dfbab8fd263b6f
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 13 09:04:24 2012 +
WaE: unused i
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx
b/canvas/source/cairo/cairo_win32_cairo.cxx
index 93520cd..ee4aea8 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.cxx
@@ -291,7 +291,6 @@ namespace cairo
wchar_t unicode[2];
WORD glyph_index;
HDC hdc = NULL;
-int i = 0;
hdc = CreateCompatibleDC (NULL);
commit 26712ff5a60428f94d45b20b8f01900da52f5e4e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 13 09:03:06 2012 +
WaE: d shadows another d
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 14833cf..992bff0 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -696,10 +696,12 @@ start:
}
break;
case SbxBYREF | SbxCURRENCY:
+{
double d;
if( !pDec-getDouble( d ) )
SbxBase::SetError( SbxERR_OVERFLOW );
*p-pnInt64 = ImpDoubleToCurrency( d );
+}
break;
case SbxBYREF | SbxSALINT64:
{
@@ -708,8 +710,8 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW );
else
*p-pnInt64 = ImpDoubleToSalInt64( d );
-break;
}
+break;
case SbxBYREF | SbxSALUINT64:
{
double d;
@@ -717,8 +719,8 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW );
else
*p-puInt64 = ImpDoubleToSalUInt64( d );
-break;
}
+break;
case SbxBYREF | SbxSINGLE:
if( !pDec-getSingle( *p-pSingle ) )
{
commit d271080853675dbc0e16b0788410dc5caed21a01
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 13 09:00:05 2012 +
WaE: clipformat may be used uninitialized
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx
b/dtrans/source/win32/ftransl/ftransl.cxx
index aa67ce3..7bd6966 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -206,7 +206,7 @@ DataFlavor SAL_CALL
CDataFormatTranslator::getDataFlavorFromSystemDataType( cons
if ( aSysDataType.getValueType( ) == CPPUTYPE_SALINT32 )
{
-sal_Int32 clipformat;
+sal_Int32 clipformat = CF_INVALID;
aSysDataType = clipformat;
if ( CF_INVALID != clipformat )
findDataFlavorForStandardFormatId( clipformat, aFlavor );
commit 5678e845cc58933964729b908d649e10a11c220a
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 13 08:59:03 2012 +
callcatcher: update list, getXLFD is now unused
diff --git a/unusedcode.easy b/unusedcode.easy
index 3c824f0..b906bb9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -4,6 +4,7 @@
[Libreoffice-commits] .: desktop/Library_sofficeapp.mk desktop/source
desktop/Library_sofficeapp.mk |1
desktop/source/app/appsys.cxx | 68 --
desktop/source/app/appsys.hxx | 45 ---
3 files changed, 114 deletions(-)
New commits:
commit faf862a9d4c18a729c7d25a2a056e01b7447c72c
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 13 13:43:51 2012 +
appsys.* and FATToVFat_Impl appear to be unnecessary
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index cd57646..759f40f 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
desktop/source/app/app \
desktop/source/app/appfirststart \
desktop/source/app/appinit \
-desktop/source/app/appsys \
desktop/source/app/check_ext_deps \
desktop/source/app/cmdlineargs \
desktop/source/app/cmdlinehelp \
diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx
deleted file mode 100644
index 5cc4fed..000
--- a/desktop/source/app/appsys.cxx
+++ /dev/null
@@ -1,68 +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.
- *
- /
-
-
-#include appsys.hxx
-
-#ifdef WNT
-
-#include rtl/ustring.hxx
-#include tools/solar.h
-#include tools/urlobj.hxx
-
-#include windows.h
-
-
-#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
-
-namespace desktop
-{
-
-void FATToVFat_Impl( String aName )
-{
-INetURLObject aObj( aName );
-if ( aObj.GetProtocol() == INET_PROT_FILE )
-{
-WIN32_FIND_DATA aData;
-HANDLE h = FindFirstFile( U2S(aName).getStr(), aData );
-if ( h )
-{
-// Change FAT short filename into VFAT long filename
-aObj.removeSegment();
-aObj.insertName( String::CreateFromAscii( aData.cFileName ) );
-aName = aObj.PathToFileName();
-FindClose( h );
-}
-}
-}
-
-}
-
-#endif // WNT
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/appsys.hxx b/desktop/source/app/appsys.hxx
deleted file mode 100644
index d2f13ff..000
--- a/desktop/source/app/appsys.hxx
+++ /dev/null
@@ -1,45 +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 _DESKTOP_APPSYS_HXX_
-#define _DESKTOP_APPSYS_HXX_
-
-#include tools/string.hxx
-
-namespace desktop
-{
-
-#ifdef WNT
-void FATToVFat_Impl( String aName );
-#endif
-
-}
-
-#endif // _DESKTOP_APPSYS_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
[Libreoffice-commits] .: 2 commits - vcl/generic
vcl/generic/fontmanager/fontcache.cxx | 39 +-
1 file changed, 20 insertions(+), 19 deletions(-)
New commits:
commit 4e85b537d1229348bef16bb006d9e6b5303bd6c9
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 13 14:26:03 2012 +
tidy some string types
diff --git a/vcl/generic/fontmanager/fontcache.cxx
b/vcl/generic/fontmanager/fontcache.cxx
index 40877fc..616799a 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -267,7 +267,7 @@ void FontCache::read()
OString aLine;
aStream.ReadLine( aLine );
-if( !aLine.equals( rtl::OString(RTL_CONSTASCII_STRINGPARAM( CACHE_MAGIC ))
) )
+if (!aLine.equalsL(RTL_CONSTASCII_STRINGPARAM(CACHE_MAGIC)))
{
#if OSL_DEBUG_LEVEL 1
fprintf( stderr, FontCache::read: cache file %s fails magic test\n,
rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
@@ -277,7 +277,6 @@ void FontCache::read()
int nDir = 0;
FontDirMap* pDir = NULL;
-xub_StrLen nIndex;
bool bKeepOnlyUserOverridden = false;
do
{
@@ -286,12 +285,12 @@ void FontCache::read()
aLine.compareTo( RTL_CONSTASCII_STRINGPARAM(
EmptyFontCacheDirectory: ) ) == 0 )
{
bool bEmpty = (aLine.compareTo( RTL_CONSTASCII_STRINGPARAM
(Empty ) ) == 0);
-xub_StrLen nSearchIndex = bEmpty ? 24 : 19;
+sal_Int32 nSearchIndex = bEmpty ? 24 : 19;
OString aDir;
sal_Int64 nTimestamp = 0;
-xub_StrLen nTEnd = aLine.indexOf( ':', nSearchIndex );
-if( nTEnd != STRING_NOTFOUND )
+sal_Int32 nTEnd = aLine.indexOf( ':', nSearchIndex );
+if( nTEnd != -1 )
{
rtl::OString aTimeStamp = aLine.copy( nSearchIndex, nTEnd -
nSearchIndex );
nTimestamp = aTimeStamp.toInt64();
@@ -368,6 +367,8 @@ void FontCache::read()
default: break;
}
+sal_Int32 nIndex;
+
for( nIndex = 0; nIndex nLen pLine[nIndex] != ';';
nIndex++ )
;
@@ -376,7 +377,7 @@ void FontCache::read()
sal_True );
while( nIndex nLen )
{
-xub_StrLen nLastIndex = nIndex+1;
+sal_Int32 nLastIndex = nIndex+1;
for( nIndex = nLastIndex ; nIndex nLen pLine[nIndex]
!= ';'; nIndex++ )
;
if( nIndex - nLastIndex )
commit eed2ad8025fbfd8c8b9ed8d83068700585bf7b13
Author: Christina Rossmanith chrrossman...@web.de
Date: Thu Jan 12 10:52:31 2012 +0100
Replace (Byte)String with rtl::O(U)String
diff --git a/vcl/generic/fontmanager/fontcache.cxx
b/vcl/generic/fontmanager/fontcache.cxx
index 9c71963..40877fc 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -265,9 +265,9 @@ void FontCache::read()
}
-ByteString aLine;
+OString aLine;
aStream.ReadLine( aLine );
-if( !aLine.Equals( CACHE_MAGIC ) )
+if( !aLine.equals( rtl::OString(RTL_CONSTASCII_STRINGPARAM( CACHE_MAGIC ))
) )
{
#if OSL_DEBUG_LEVEL 1
fprintf( stderr, FontCache::read: cache file %s fails magic test\n,
rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
@@ -282,20 +282,20 @@ void FontCache::read()
do
{
aStream.ReadLine( aLine );
-if( aLine.CompareTo( FontCacheDirectory:, 19 ) == COMPARE_EQUAL ||
-aLine.CompareTo( EmptyFontCacheDirectory:, 24 ) == COMPARE_EQUAL
)
+if( aLine.compareTo( RTL_CONSTASCII_STRINGPARAM( FontCacheDirectory:
) ) == 0 ||
+aLine.compareTo( RTL_CONSTASCII_STRINGPARAM(
EmptyFontCacheDirectory: ) ) == 0 )
{
-bool bEmpty = (aLine.CompareTo( Empty, 5 ) == COMPARE_EQUAL);
+bool bEmpty = (aLine.compareTo( RTL_CONSTASCII_STRINGPARAM
(Empty ) ) == 0);
xub_StrLen nSearchIndex = bEmpty ? 24 : 19;
OString aDir;
sal_Int64 nTimestamp = 0;
-xub_StrLen nTEnd = aLine.Search( ':', nSearchIndex );
+xub_StrLen nTEnd = aLine.indexOf( ':', nSearchIndex );
if( nTEnd != STRING_NOTFOUND )
{
-rtl::OString aTimeStamp = aLine.Copy( nSearchIndex, nTEnd -
nSearchIndex );
+rtl::OString aTimeStamp = aLine.copy( nSearchIndex, nTEnd -
nSearchIndex );
nTimestamp = aTimeStamp.toInt64();
-aDir = aLine.Copy( nTEnd+1 );
+aDir = aLine.copy( nTEnd+1 );
}
else
{
@@ -327,12 +327,12 @@ void FontCache::read()
m_aCache[ nDir ].m_bUserOverrideOnly = bKeepOnlyUserOverridden;
}
}
-else if( pDir aLine.CompareTo( File:, 5 ) ==
[Libreoffice-commits] .: vcl/inc vcl/unx
vcl/inc/unx/saldisp.hxx |2 +-
vcl/unx/generic/app/saldisp.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b0f254fa1e1cb916fa21234603578de701f75e83
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 16 10:30:36 2012 +
WaE: getXScreen is an unsigned int now
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 984726d..ea7dfa7 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -375,7 +375,7 @@ public:
virtual ScreenData *initScreen( SalX11Screen nXScreen ) const;
const ScreenData getDataForScreen( SalX11Screen nXScreen ) const
{
-if( nXScreen.getXScreen() = static_castint(m_aScreens.size()) )
+if( nXScreen.getXScreen() = static_castunsigned
int(m_aScreens.size()) )
return m_aInvalidScreenData;
if( ! m_aScreens[nXScreen.getXScreen()].m_bInit )
initScreen( nXScreen );
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index c3d5f79..f361961 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -525,7 +525,7 @@ void SalX11Display::PostUserEvent()
SalDisplay::ScreenData *
SalDisplay::initScreen( SalX11Screen nXScreen ) const
{
-if( nXScreen.getXScreen() = static_castint(m_aScreens.size()) )
+if( nXScreen.getXScreen() = static_castunsigned int(m_aScreens.size()) )
nXScreen = m_nXDefaultScreen;
ScreenData* pSD = const_castScreenData
*(m_aScreens[nXScreen.getXScreen()]);
if( pSD-m_bInit )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unusedcode.easy vcl/inc vcl/source
unusedcode.easy |1 -
vcl/inc/vcl/field.hxx|1 -
vcl/source/control/field.cxx | 14 --
3 files changed, 16 deletions(-)
New commits:
commit d2d730f65774564f27f3f5a0d3a1ee94db21c47f
Author: Mariusz Dykierek mariuszdykie...@gmail.com
Date: Mon Jan 16 16:20:43 2012 +
Removed FormatterBase::SetFieldText
diff --git a/unusedcode.easy b/unusedcode.easy
index 26f593d..87e2618 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -94,7 +94,6 @@ FontSelectPattern::FontSelectPattern(ImplFontData const,
Size const, float, in
FontSizeBox::SetUserValue(long, FieldUnit)
FontStyleBox::FontStyleBox(Window*, long)
FormattedField::SetValidateText(String const, String const*)
-FormatterBase::SetFieldText(String const, unsigned char)
GraphCtrl::GraphCtrl(Window*, long)
GtkSalFrame::popIgnoreDamage()
GtkSalFrame::pushIgnoreDamage()
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index 5f5e8d6..311346e 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -62,7 +62,6 @@ protected:
SAL_DLLPRIVATE void ImplSetText( const XubString rText, Selection*
pNewSel = NULL );
SAL_DLLPRIVATE sal_Bool ImplGetEmptyFieldValue() const { return
mbEmptyFieldValue; }
-voidSetFieldText( const XubString rText, sal_Bool
bKeepSelection );
voidSetEmptyFieldValueData( sal_Bool bValue ) {
mbEmptyFieldValue = bValue; }
SAL_DLLPRIVATE LocaleDataWrapper ImplGetLocaleDataWrapper() const;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 1538287..51c4ee2 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -387,20 +387,6 @@ const AllSettings FormatterBase::GetFieldSettings() const
// ---
-void FormatterBase::SetFieldText( const XubString rText, sal_Bool
bKeepSelection )
-{
-if ( mpField )
-{
-Selection aNewSelection( 0x, 0x );
-if ( bKeepSelection )
-aNewSelection = mpField-GetSelection();
-
-ImplSetText( rText, aNewSelection );
-}
-}
-
-// ---
-
void FormatterBase::ImplSetText( const XubString rText, Selection*
pNewSelection )
{
if ( mpField )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/tool/interpr4.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ef0ee083e668be2b41e86196417893f84359aee8
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 16 17:00:05 2012 +
fix build error
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index b329ccb..cda83d3 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1456,7 +1456,7 @@ void ScInterpreter::PopExternalSingleRef(
return;
ScExternalRefManager* pRefMgr = pDok-GetExternalRefManager();
-const OUString* pFile = pRefMgr-getExternalFileName(rFileId);
+const rtl::OUString* pFile = pRefMgr-getExternalFileName(rFileId);
if (!pFile)
{
SetError(errNoName);
@@ -1548,7 +1548,7 @@ void ScInterpreter::GetExternalDoubleRef(
sal_uInt16 nFileId, const String rTabName, const ScComplexRefData rData,
ScExternalRefCache::TokenArrayRef rArray)
{
ScExternalRefManager* pRefMgr = pDok-GetExternalRefManager();
-const OUString* pFile = pRefMgr-getExternalFileName(nFileId);
+const rtl::OUString* pFile = pRefMgr-getExternalFileName(nFileId);
if (!pFile)
{
SetError(errNoName);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sax/inc sax/source unusedcode.easy vcl/generic
sax/inc/sax/fshelper.hxx |5 ---
sax/source/tools/fshelper.cxx | 48 --
unusedcode.easy |4 --
vcl/generic/fontmanager/fontsubst.cxx |2 -
4 files changed, 1 insertion(+), 58 deletions(-)
New commits:
commit d3253a0efdf0405790062f91b6dc164b1f2d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 16 20:58:00 2012 +
remove unimplemented methods from headers
diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx
index 89cf818..73d04eb 100644
--- a/sax/inc/sax/fshelper.hxx
+++ b/sax/inc/sax/fshelper.hxx
@@ -56,10 +56,6 @@ public:
~FastSerializerHelper();
-void startElement(const char* elementName, ...);
-void singleElement(const char* elementName, ...);
-void endElement(const char* elementName);
-
void startElementV(sal_Int32 elementTokenId, va_list args);
void singleElementV(sal_Int32 elementTokenId, va_list args);
@@ -75,7 +71,6 @@ public:
inline void endElementNS(sal_Int32 namespaceTokenId, sal_Int32
elementTokenId)
{ endElement( FSNS( namespaceTokenId, elementTokenId ) ); }
-void singleElement(const char* elementName, XFastAttributeListRef
xAttrList);
inline void singleElement(sal_Int32 elementTokenId, XFastAttributeListRef
xAttrList)
{ singleElementV(elementTokenId, xAttrList); }
void singleElementV(sal_Int32 elementTokenId, XFastAttributeListRef
xAttrList);
commit 0d7e73ac445d2e3fc8ed5ff2d6cf289d2b367a56
Author: Alexander Bergmann myadd...@gmx.de
Date: Mon Jan 16 12:26:11 2012 +0100
Removing unused code
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 89c2b1a..6cdd39d 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -29,49 +29,6 @@ FastSerializerHelper::~FastSerializerHelper()
delete mpSerializer;
}
-void FastSerializerHelper::startElement(const char* elementName, ...)
-{
-FastAttributeList* pAttrList = new FastAttributeList( mxTokenHandler );
-va_list args;
-va_start(args, elementName);
-while (true)
-{
-const char* pName = va_arg(args, const char*);
-if (!pName)
-break;
-const char* pValue = va_arg(args, const char*);
-if (pValue)
-pAttrList-addUnknown(pName, pValue);
-}
-va_end(args);
-const
com::sun::star::uno::Referencecom::sun::star::xml::sax::XFastAttributeList
xAttrList(pAttrList);
-mpSerializer-startUnknownElement(::rtl::OUString(),
::rtl::OUString::createFromAscii(elementName), xAttrList);
-}
-
-void FastSerializerHelper::singleElement(const char* elementName, ...)
-{
-FastAttributeList* pAttrList = new FastAttributeList( mxTokenHandler );
-va_list args;
-va_start(args, elementName);
-while (true)
-{
-const char* pName = va_arg(args, const char*);
-if (!pName)
-break;
-const char* pValue = va_arg(args, const char*);
-if (pValue)
-pAttrList-addUnknown(pName, pValue);
-}
-va_end(args);
-const
com::sun::star::uno::Referencecom::sun::star::xml::sax::XFastAttributeList
xAttrList(pAttrList);
-mpSerializer-singleUnknownElement(::rtl::OUString(),
::rtl::OUString::createFromAscii(elementName), xAttrList);
-}
-
-void FastSerializerHelper::endElement(const char* elementName)
-{
-mpSerializer-endUnknownElement(::rtl::OUString(),
::rtl::OUString::createFromAscii(elementName));
-}
-
void FastSerializerHelper::startElementV(sal_Int32 elementTokenId, va_list
args)
{
FastAttributeList* pAttrList = new FastAttributeList( mxTokenHandler );
@@ -119,11 +76,6 @@ void FastSerializerHelper::startElementV(sal_Int32
elementTokenId, XFastAttribut
}
-void FastSerializerHelper::singleElement(const char* elementName,
XFastAttributeListRef xAttrList)
-{
-mpSerializer-singleUnknownElement(::rtl::OUString(),
::rtl::OUString::createFromAscii(elementName), xAttrList);
-}
-
void FastSerializerHelper::singleElementV(sal_Int32 elementTokenId,
XFastAttributeListRef xAttrList)
{
mpSerializer-singleFastElement(elementTokenId, xAttrList);
diff --git a/unusedcode.easy b/unusedcode.easy
index 87e2618..b1dcbcd 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1776,10 +1776,6 @@ sax::Converter::clearUndefinedChars(rtl::OUString,
rtl::OUString const)
sax::Converter::convertAny(com::sun::star::uno::Any, rtl::OUString const,
rtl::OUString const)
sax::Converter::convertDouble(double, rtl::OUString const, short)
sax::Converter::convertNumber64(rtl::OUStringBuffer, long)
-sax_fastparser::FastSerializerHelper::endElement(char const*)
-sax_fastparser::FastSerializerHelper::singleElement(char const*, ...)
-sax_fastparser::FastSerializerHelper::singleElement(char const*,
com::sun::star::uno::Referencecom::sun::star::xml::sax::XFastAttributeList)
-sax_fastparser::FastSerializerHelper::startElement(char const*, ...)
[Libreoffice-commits] .: test/Package_unittest.mk
test/Package_unittest.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 9cf05319a87aff4590129259a0ae240b2d1fff1d Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 17 12:03:06 2012 + pspfontcache is gitignored diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk index 3b8637f..ce48f68 100644 --- a/test/Package_unittest.mk +++ b/test/Package_unittest.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/technical $(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/en-GB.dic,user/wordbook/en-GB.dic)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/gallery/empty_directory,user/gallery/empty_directory)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/dtd/empty_directory,user/dtd/empty_directory)) -$(eval $(call gb_Package_add_file,test_unittest,unittest/user/psprint/pspfontcache,user/psprint/pspfontcache)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/psprint/fontmetric/empty_directory,user/psprint/fontmetric/empty_directory)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/psprint/driver/empty_directory,user/psprint/driver/empty_directory)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/template.bau,user/autotext/en-US/template.bau)) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
