[Libreoffice-commits] .: sc/qa
sc/qa/unit/filters-test.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit eda3e5dcb63e6bce71df2c1c941eacd7f0c79191 Author: François Tigeot ftig...@wolfpond.org Date: Fri Nov 25 09:41:25 2011 +0100 Disable password test on DragonFly diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 587b71e..7fb1d5e 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -200,7 +200,8 @@ public: CPPUNIT_TEST(testBugFixesXLS); CPPUNIT_TEST(testBugFixesXLSX); //disable testPassword on MacOSX due to problems with libsqlite3 -#if !defined(MACOSX) +//also crashes on DragonFly due to problems with nss/nspr headers +#if !defined(MACOSX) !defined(DRAGONFLY) CPPUNIT_TEST(testPassword); #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc
oox/inc/oox/mathml/importutils.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f87ea359f45a8d8edbf029a5268b40fab3d1fa6c Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Nov 24 20:54:37 2011 +0100 fix compile diff --git a/oox/inc/oox/mathml/importutils.hxx b/oox/inc/oox/mathml/importutils.hxx index d5d2540..ad6ad6b 100644 --- a/oox/inc/oox/mathml/importutils.hxx +++ b/oox/inc/oox/mathml/importutils.hxx @@ -29,8 +29,8 @@ #define _STARMATHIMPORTUTILS_HXX #include com/sun/star/xml/sax/XFastAttributeList.hpp +#include oox/token/tokens.hxx #include map -#include oox/helper/attributelist.hxx #include vector #include oox/dllapi.h ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[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] .: Branch 'libreoffice-3-4' - setup_native/source
setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
| 205 +-
setup_native/source/win32/customactions/shellextensions/makefile.mk
|3
2 files changed, 27 insertions(+), 181 deletions(-)
New commits:
commit 2408d229104c3e198ce79e72bb89ce360575aa36
Author: Andras Timar ati...@suse.com
Date: Thu Nov 24 23:10:30 2011 +0100
change logic of IsOfficeRunning custom action fdo#36677
instead of trying to rename a file or folder in
Program Files directory - which is write protected
anyway normally - installer checks the process list,
if there is a process called soffice.bin.
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git
a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
index 0cf8458..3432ddd 100644
---
a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++
b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -53,6 +53,10 @@
#include stdio.h
#include sal/macros.h
+// works with Windows XP as well as with Windows 7
+#define PSAPI_VERSION 1
+#include psapi.h
+
#include systools/win32/uwinapi.h
#include ../tools/seterror.hxx
@@ -93,201 +97,42 @@ static std::_tstring GetMsiProperty( MSIHANDLE handle,
const std::_tstring sPro
return result;
}
-static inline bool IsSetMsiProperty(MSIHANDLE handle, const std::_tstring
sProperty)
-{
-std::_tstring value = GetMsiProperty(handle, sProperty);
-return (value.length() 0);
-}
-
-static inline void UnsetMsiProperty(MSIHANDLE handle, const std::_tstring
sProperty)
+extern C UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
{
-MsiSetProperty(handle, sProperty.c_str(), NULL);
-}
+std::_tstring sOfficeInstallPath = GetMsiProperty(handle,
TEXT(INSTALLLOCATION));
+// Property empty - no office installed
+if ( sOfficeInstallPath.length() == 0 )
+return ERROR_SUCCESS;
-static inline void SetMsiProperty(MSIHANDLE handle, const std::_tstring
sProperty)
-{
-MsiSetProperty(handle, sProperty.c_str(), TEXT(1));
-}
+DWORD aProcesses[1024], cbNeeded, cProcesses; /* 1024 processses ought to
be enough for anybody */
-static BOOL MoveFileEx9x( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA,
DWORD dwFlags )
-{
-BOOL fSuccess = FALSE; // assume failure
+if ( !EnumProcesses( aProcesses, sizeof(aProcesses), cbNeeded ) )
+return ERROR_INSTALL_FAILURE;
-// Windows 9x has a special mechanism to move files after reboot
+cProcesses = cbNeeded / sizeof(DWORD);
-if ( dwFlags MOVEFILE_DELAY_UNTIL_REBOOT )
+// Check if there is soffice.bin among the processes
+for ( unsigned int i = 0; i cProcesses; i++ )
{
-CHAR szExistingFileNameA[MAX_PATH];
-CHAR szNewFileNameA[MAX_PATH] = NUL;
-
-// Path names in WININIT.INI must be in short path name form
-
-if (
-GetShortPathNameA( lpExistingFileNameA, szExistingFileNameA,
MAX_PATH )
-(!lpNewFileNameA || GetShortPathNameA( lpNewFileNameA,
szNewFileNameA, MAX_PATH ))
-)
+if( aProcesses[i] != 0 )
{
-CHAR szBuffer[32767];// The buffer size must not
exceed 32K
-DWORD dwBufLen = GetPrivateProfileSectionA( RENAME_SECTION,
szBuffer, SAL_N_ELEMENTS(szBuffer), WININIT_FILENAME );
-
-CHAR szRename[MAX_PATH]; // This is enough for at most
to times 67 chracters
-strcpy( szRename, szNewFileNameA );
-strcat( szRename, = );
-strcat( szRename, szExistingFileNameA );
-size_t lnRename = strlen(szRename);
-
-if ( dwBufLen + lnRename + 2 = SAL_N_ELEMENTS(szBuffer) )
+TCHAR szProcessName[MAX_PATH] = TEXT(unknown);
+HANDLE hProcess = OpenProcess( PROCESS_QUERY_INFORMATION |
PROCESS_VM_READ, FALSE, aProcesses[i] );
+if (NULL != hProcess )
{
-CopyMemory( szBuffer[dwBufLen], szRename, lnRename );
-szBuffer[dwBufLen + lnRename ] = 0;
-szBuffer[dwBufLen + lnRename + 1 ] = 0;
-
-fSuccess = WritePrivateProfileSectionA( RENAME_SECTION,
szBuffer, WININIT_FILENAME );
+HMODULE hMod;
+if ( EnumProcessModules( hProcess, hMod, sizeof(hMod),
cbNeeded) )
+GetModuleBaseName( hProcess, hMod, szProcessName,
sizeof(szProcessName)/sizeof(TCHAR) );
}
-else
-SetLastError( ERROR_BUFFER_OVERFLOW );
-}
-}
-else
-{
-
-fSuccess = MoveFileA( lpExistingFileNameA, lpNewFileNameA );
-
-if ( !fSuccess GetLastError() != ERROR_ACCESS_DENIED
-0 != (dwFlags (MOVEFILE_COPY_ALLOWED |
MOVEFILE_REPLACE_EXISTING)) )
-{
-
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source
scp2/source/ooo/common_brand.scp |6 ++ 1 file changed, 6 insertions(+) New commits: commit 5a5fd169cb471192cc9d1602b1bd88107af9280b Author: Andras Timar ati...@suse.com Date: Wed Nov 23 13:40:17 2011 +0100 create this dir so uninstall can remove it Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 2557f0d..19f560f 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -413,6 +413,12 @@ Directory gid_Brand_Dir_Share_Uno_Packages_Cache Styles = (CREATE); End +Directory gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages +ParentID = gid_Brand_Dir_Share_Uno_Packages_Cache; +DosName = uno_packages; +Styles = (CREATE); +End + Directory gid_Brand_Dir_Share_Registry ParentID = gid_Brand_Dir_Share; DosName = registry; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfcontrolwords.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 52e6bfeb324574f2330d191c208860ddc2d532e0
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Fri Nov 25 10:02:02 2011 +0100
RTF import: fixed the missing paragraph breaks from fdo#43206.
\\\n is used as an equivalent to \par even though I couldn't find it
in the specs.
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx
b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index 3b82e80..3dd2672 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -38,6 +38,7 @@ RTFSymbol aRTFControlWords[] = {
{*, CONTROL_SYMBOL, RTF_IGNORE},
{:, CONTROL_SYMBOL, RTF_SUBENTRY},
{\\, CONTROL_SYMBOL, RTF_BACKSLASH},
+{\n, CONTROL_SYMBOL, RTF_PAR},
{_, CONTROL_SYMBOL, RTF_NOBRKHYPH},
{{, CONTROL_SYMBOL, RTF_LBRACE},
{|, CONTROL_SYMBOL, RTF_FORMULA},
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/Package_inc.mk
oox/Package_inc.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 59210463cce786edafeb09edfdaf147b7278b289 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Nov 25 09:12:52 2011 +0100 no need to export oox/helper/attributelist.hxx any longer diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk index 5564eab..ac2ad7d 100644 --- a/oox/Package_inc.mk +++ b/oox/Package_inc.mk @@ -41,7 +41,6 @@ $(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)) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/inc
tools/inc/tools/debug.hxx | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) New commits: commit 360043b30ebe21a6a02b5cdfe0b4bd12ab22 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Nov 25 10:51:13 2011 +0100 demoted plentiful DBG_WARNING etc. to SAL_INFO diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx index ecbfa3b..4fde7b5 100644 --- a/tools/inc/tools/debug.hxx +++ b/tools/inc/tools/debug.hxx @@ -46,7 +46,7 @@ have been used for true assertions as well as for logged warnings, they map to SAL_WARN instead of standard assert. The warning and error macros (DBG_WARNING, DBG_WARNING1, ..., DBG_WARNING5, DBG_WARNINGFILE, -DBG_ERRORFILE) all map to SAL_WARN, too. +DBG_ERRORFILE) all map to SAL_INFO. */ // @@ -480,23 +480,23 @@ public: #endif #define DBG_WARNING( aWarning ) \ -SAL_DETAIL_WARN_IF_FORMAT(true, legacy.tools, aWarning) +SAL_DETAIL_INFO_IF_FORMAT(true, legacy.tools, aWarning) #define DBG_WARNING1( aWarning, x1 ) \ -SAL_DETAIL_WARN_IF_FORMAT(true, legacy.tools, aWarning, x1) +SAL_DETAIL_INFO_IF_FORMAT(true, legacy.tools, aWarning, x1) #define DBG_WARNING2( aWarning, x1, x2 ) \ -SAL_DETAIL_WARN_IF_FORMAT(true, legacy.tools, aWarning, x1, x2) +SAL_DETAIL_INFO_IF_FORMAT(true, legacy.tools, aWarning, x1, x2) #define DBG_WARNING3( aWarning, x1, x2, x3 ) \ -SAL_DETAIL_WARN_IF_FORMAT(true, legacy.tools, aWarning, x1, x2, x3) +SAL_DETAIL_INFO_IF_FORMAT(true, legacy.tools, aWarning, x1, x2, x3) #define DBG_WARNING4( aWarning, x1, x2, x3, x4 ) \ -SAL_DETAIL_WARN_IF_FORMAT(true, legacy.tools, aWarning, x1, x2, x3, x4) +SAL_DETAIL_INFO_IF_FORMAT(true, legacy.tools, aWarning, x1, x2, x3, x4) #define DBG_WARNING5( aWarning, x1, x2, x3, x4, x5 ) \ -SAL_DETAIL_WARN_IF_FORMAT( \ +SAL_DETAIL_INFO_IF_FORMAT( \ true, legacy.tools, aWarning, x1, x2, x3, x4, x5) -#define DBG_WARNINGFILE( aWarning ) SAL_DETAIL_WARN_IF_FORMAT( \ +#define DBG_WARNINGFILE( aWarning ) SAL_DETAIL_INFO_IF_FORMAT( \ true, legacy.tools, aWarning, __FILE__, __LINE__) #define DBG_ERRORFILE( aError ) \ -SAL_DETAIL_WARN_IF_FORMAT(true, legacy.tools, aError, __FILE__, __LINE__) +SAL_DETAIL_INFO_IF_FORMAT(true, legacy.tools, aError, __FILE__, __LINE__) #define DBG_TESTSOLARMUTEX()\ do \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[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] .: jvmfwk/distributions
jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |4 1 file changed, 4 insertions(+) New commits: commit f95052c29b076995a54b1d3f7c0becf35ebcd23f Author: Stephan Bergmann sberg...@redhat.com Date: Fri Nov 25 11:01:18 2011 +0100 duplicate add Oracle Java 1.7.0 recognition from javavendors_linux - wnt diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index a72216d..5c92b7a 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -9,6 +9,9 @@ vendor name=Sun Microsystems Inc. minVersion1.5.0/minVersion /vendor + vendor name=Oracle Corporation +minVersion1.7.0/minVersion + /vendor vendor name=IBM Corporation minVersion1.5.0/minVersion /vendor @@ -16,6 +19,7 @@ plugins library vendor=Sun Microsystems Inc.vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll/library + library vendor=Oracle Corporationvnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll/library library vendor=IBM Corporationvnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll/library /plugins /javaSelection ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/helper/graphichelper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 65be3e7908f21355fc8cc443192338d1cc8a8d61
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Fri Nov 25 11:16:29 2011 +0100
Docx crasher: there may be no External Header for pictures.
diff --git a/oox/source/helper/graphichelper.cxx
b/oox/source/helper/graphichelper.cxx
index fd3046e..6ddb986 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -257,7 +257,7 @@ Reference XGraphic GraphicHelper::importGraphic( const
Reference XInputStrea
aArgs[ 0 ].Name = CREATE_OUSTRING( InputStream );
aArgs[ 0 ].Value = rxInStrm;
-if ( pExtHeader-mapMode 0 )
+if ( pExtHeader pExtHeader-mapMode 0 )
{
aArgs.realloc( aArgs.getLength() + 1 );
Sequence PropertyValue aFilterData( 3 );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: automation/source basctl/source basic/inc basic/source UnoControls/source
UnoControls/source/base/basecontainercontrol.cxx |4 ++--
automation/source/simplecm/simplecm.cxx | 14 +++---
automation/source/testtool/cmdstrm.cxx |4 ++--
basctl/source/basicide/basidesh.cxx |3 +--
basctl/source/basicide/tbxctl.cxx|4 ++--
basctl/source/inc/svheader.hxx |2 +-
basic/inc/basic/testtool.hxx |2 +-
basic/source/app/textedit.cxx|4 ++--
basic/source/classes/sbunoobj.cxx|2 +-
basic/source/comp/symtbl.cxx |2 +-
basic/source/runtime/props.cxx |2 +-
11 files changed, 21 insertions(+), 22 deletions(-)
New commits:
commit 5c76e221fec40db02d2c6de5204e0d43dc5420fd
Author: mikew mi...@whiteley.org
Date: Thu Nov 24 23:56:22 2011 -0800
Some German to English comment translations.
diff --git a/UnoControls/source/base/basecontainercontrol.cxx
b/UnoControls/source/base/basecontainercontrol.cxx
index 469146b..af1d349 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -208,8 +208,8 @@ Reference XControlModel SAL_CALL
BaseContainerControl::getModel() throw( Runt
void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
{
-// Zuerst der Welt mitteilen, da� der Container wegfliegt. Dieses ist um
einiges
-// schneller wenn die Welt sowohl an den Controls als auch am Container
horcht
+// Tell everything that this container is now gone.
+// It's faster if you listen to both the control and the container.
// Ready for multithreading
MutexGuard aGuard( m_aMutex );
diff --git a/automation/source/simplecm/simplecm.cxx
b/automation/source/simplecm/simplecm.cxx
index b5087f2..ba9b799 100644
--- a/automation/source/simplecm/simplecm.cxx
+++ b/automation/source/simplecm/simplecm.cxx
@@ -376,7 +376,7 @@ ByteString CommunicationManager::GetMyName( CM_NameType )
void CommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
{
-pCL-StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden
+pCL-StartCallback(); // This should already have been called.
pCL-aStart = DateTime();
pCL-aLastAccess = pCL-aStart;
bIsCommunicationRunning = sal_True;
@@ -385,7 +385,7 @@ void CommunicationManager::CallConnectionOpened(
CommunicationLink* pCL )
xLastNewLink = pCL;
INFO_MSG( CByteString(C+:).Append( pCL-GetCommunicationPartner( CM_FQDN
) ),
-CByteString(Verbindung aufgebaut: ).Append(
pCL-GetCommunicationPartner( CM_FQDN ) ),
+CByteString(Connection established: ).Append(
pCL-GetCommunicationPartner( CM_FQDN ) ),
CM_OPEN, pCL );
ConnectionOpened( pCL );
pCL-FinishCallback();
@@ -393,11 +393,11 @@ void CommunicationManager::CallConnectionOpened(
CommunicationLink* pCL )
void CommunicationManager::CallConnectionClosed( CommunicationLink* pCL )
{
-pCL-StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden
+pCL-StartCallback(); // This should already have been called.
pCL-aLastAccess = DateTime();
INFO_MSG( CByteString(C-:).Append( pCL-GetCommunicationPartner( CM_FQDN
) ),
-CByteString(Verbindung abgebrochen: ).Append(
pCL-GetCommunicationPartner( CM_FQDN ) ),
+CByteString(Connection broken: ).Append(
pCL-GetCommunicationPartner( CM_FQDN ) ),
CM_CLOSE, pCL );
ConnectionClosed( pCL );
@@ -410,9 +410,9 @@ void CommunicationManager::CallConnectionClosed(
CommunicationLink* pCL )
void CommunicationManager::CallDataReceived( CommunicationLink* pCL )
{
-pCL-StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden
+pCL-StartCallback(); // Should have already been called
pCL-aLastAccess = DateTime();
-CommunicationLinkRef rHold(pCL);// H�lt den Zeiger bis zum Ende des
calls
+CommunicationLinkRef rHold(pCL);// Keep the pointer for a bit.
// should be impossible but happens for mysterious reasons
if ( !pCL-pServiceData )
@@ -494,7 +494,7 @@ void CommunicationManager::CallDataReceived(
CommunicationLink* pCL )
void CommunicationManager::CallInfoMsg( InfoString aMsg )
{
-// Hier wird es wohl kein Housekeeping geben
+// Probably no housekeeping here.
InfoMsg( aMsg );
}
diff --git a/automation/source/testtool/cmdstrm.cxx
b/automation/source/testtool/cmdstrm.cxx
index 023fc4c..6aba838 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -372,8 +372,8 @@ void CmdStream::GenCmdSlot( sal_uInt16 nNr, SbxArray* rPar )
break;
}
-/// #59513# nicht mehr ben�tigt ( siehe oben )
-// rPar-Get( 2*n-1 )-SetUserData(nUserData); // Und wieder
zur�cksetzen, so da� auch alles sauber ist.
+/// #59513# //don't need this anymore (see
[Libreoffice-commits] .: tail_build/Makefile
tail_build/Makefile |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 538b1071531e895a55e2d6799806c3036f9ada49 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Nov 25 13:02:36 2011 +0100 copy Makefile to everywhere was a bit too much of a shotgun approach diff --git a/tail_build/Makefile b/tail_build/Makefile index f9ac01e..625b0cb 100644 --- a/tail_build/Makefile +++ b/tail_build/Makefile @@ -30,10 +30,9 @@ ifeq ($(strip $(SOLARENV)),) include $(dir $(realpath $(firstword $(MAKEFILE_LIST/../solenv/gbuild/source_and_rerun.mk else -gb_PARTIALBUILD := T include $(SOLARENV)/gbuild/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST/Module*.mk))) +$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk)) endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/mathml/importutils.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 15da1a153e85da6e8b3d33bb2ed10328bdfb9286
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Nov 25 13:18:03 2011 +0100
Fix build on Windows.
diff --git a/oox/source/mathml/importutils.cxx
b/oox/source/mathml/importutils.cxx
index 8037e2b..c6bf80c 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -107,7 +107,7 @@ XmlStream::Tag::Tag( int t, const uno::Reference
xml::sax::XFastAttributeList
}
-XmlStream::XmlStream::Tag::operator bool() const
+XmlStream::Tag::operator bool() const
{
return token != XML_TOKEN_INVALID;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/shellextensions/makefile.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit b0c3f12261538e3b89079e3b87bb8f8f0d39e5a0 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Nov 25 13:49:20 2011 +0100 Fix linking of the new custom action diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk index e0950d9..b6961cf 100644 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk @@ -75,6 +75,9 @@ STDSHL += \ STDSHL+= \ $(KERNEL32LIB)\ -lmsvcrt +.ELSE +STDSHL+=\ +psapi.lib .ENDIF SHL1OBJS = $(SLOFILES) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/doc/docdraw.cxx | 80 -
sw/source/core/doc/docedt.cxx | 347 +++--
2 files changed, 204 insertions(+), 223 deletions(-)
New commits:
commit 5aff8df5308d3db93dfb539fb0710e51309207d2
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Fri Nov 25 00:45:15 2011 +0100
Translate German comments and translate some english comments spelling
errors
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index f3b02b4..afc66fe 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -53,12 +53,12 @@
#include doc.hxx
#include IDocumentUndoRedo.hxx
#include docsh.hxx
-#include rootfrm.hxx //Damit der RootDtor gerufen wird.
+#include rootfrm.hxx // So that the RootDtor is called.
#include poolfmt.hxx
-#include viewsh.hxx // fuer MakeDrawView
+#include viewsh.hxx // for MakeDrawView
#include drawdoc.hxx
#include UndoDraw.hxx
-#include swundo.hxx // fuer die UndoIds
+#include swundo.hxx // for the UndoIds
#include dcontact.hxx
#include dview.hxx
#include mvsave.hxx
@@ -219,7 +219,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView rDrawView )
SwDrawContact* pNewContact = 0;
if( bNoGroup )
{
-//Ankerattribut aufheben.
+// Revoke anchor attribute.
SwDrawContact *pMyContact = (SwDrawContact*)GetUserCall(pObj);
const SwFmtAnchor aAnch( pMyContact-GetFmt()-GetAnchor() );
@@ -234,7 +234,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView rDrawView )
static_castSwAnchoredDrawObject*(pMyContact-GetAnchoredObj(
pObj ));
bGroupMembersNotPositioned = pAnchoredDrawObj-NotYetPositioned();
}
-//ContactObjekte und Formate vernichten.
+// Destroy ContactObjects and formats.
for( sal_uInt16 i = 0; i rMrkList.GetMarkCount(); ++i )
{
pObj = rMrkList.GetMark( i )-GetMarkedSdrObj();
@@ -249,7 +249,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView rDrawView )
#endif
pFmt = (SwDrawFrmFmt*)pContact-GetFmt();
-//loescht sich selbst!
+// Deletes itself!
pContact-Changed(*pObj, SDRUSERCALL_DELETE,
pObj-GetLastBoundRect() );
pObj-SetUserCall( 0 );
@@ -458,13 +458,13 @@ sal_Bool SwDoc::DeleteSelection( SwDrawView rDrawView )
? 0
: new SwUndoDrawDelete(
(sal_uInt16)rMrkList.GetMarkCount() );
-//ContactObjekte vernichten, Formate sicherstellen.
+// Destroy ContactObjects, save formats.
for( i = 0; i rMrkList.GetMarkCount(); ++i )
{
const SdrMark rMark = *rMrkList.GetMark( i );
pObj = rMark.GetMarkedSdrObj();
SwDrawContact *pContact =
(SwDrawContact*)pObj-GetUserCall();
-if( pContact ) // natuerlich nicht bei gruppierten Objekten
+if( pContact ) // of course not for grouped objects
{
SwDrawFrmFmt *pFmt = (SwDrawFrmFmt*)pContact-GetFmt();
// before delete of selection is performed, marked
@@ -475,7 +475,7 @@ sal_Bool SwDoc::DeleteSelection( SwDrawView rDrawView )
{
OSL_FAIL( SwDrawVirtObj is still marked for
delete. application will crash! );
}
-//loescht sich selbst!
+// Deletes itself!
pContact-Changed(*pObj, SDRUSERCALL_DELETE,
pObj-GetLastBoundRect() );
pObj-SetUserCall( 0 );
@@ -518,14 +518,14 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const
SwFmtAnchor* pFlyAn,
{
if( pFmt-getIDocumentLayoutAccess()-GetCurrentViewShell() )
//swmod 071107//swmod 071225
{
-// Schauen, ob es ein SdrObject dafuer gibt
+// See if there is an SdrObject for it
SwFlyFrm* pFly = SwIteratorSwFlyFrm,SwFmt::FirstElement(
*pFrmFmt );
if( pFly )
nOrdNum = pFly-GetVirtDrawObj()-GetOrdNum();
}
else
{
-// Schauen, ob es ein SdrObject dafuer gibt
+// See if there is an SdrObject for it
SwFlyDrawContact* pContact =
SwIteratorSwFlyDrawContact,SwFmt::FirstElement( *pFrmFmt );
if( pContact )
nOrdNum = pContact-GetMaster()-GetOrdNum();
@@ -533,7 +533,7 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const
SwFmtAnchor* pFlyAn,
}
else if( RES_DRAWFRMFMT == pFmt-Which() )
{
-// Schauen, ob es ein SdrObject dafuer gibt
+// See if there is an SdrObject for it
SwDrawContact* pContact =
SwIteratorSwDrawContact,SwFmt::FirstElement( *pFrmFmt );
if( pContact )
[Libreoffice-commits] .: sal/inc sal/osl
sal/inc/osl/endian.h | 21 -
sal/osl/unx/system.h | 16
2 files changed, 37 deletions(-)
New commits:
commit 3a1441c0d3107c69fd80492fa7e182d4f8c02d3d
Author: François Tigeot ftig...@wolfpond.org
Date: Fri Nov 25 10:38:14 2011 +0100
PDP_ENDIAN and variants are unused.
Remove their use from the code.
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index 7069c3b..dace25b 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -61,8 +61,6 @@ extern C {
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif __BYTE_ORDER == __PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
#endif
@@ -76,8 +74,6 @@ extern C {
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif __BYTE_ORDER == __PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
#endif
@@ -85,13 +81,8 @@ extern C {
# include machine/endian.h
# if BYTE_ORDER == LITTLE_ENDIAN
# undef _BIG_ENDIAN
-# undef _PDP_ENDIAN
# elif BYTE_ORDER == BIG_ENDIAN
# undef _LITTLE_ENDIAN
-# undef _PDP_ENDIAN
-# elif BYTE_ORDER == PDP_ENDIAN
-# undef _LITTLE_ENDIAN
-# undef _BIG_ENDIAN
# endif
#endif
@@ -103,8 +94,6 @@ extern C {
# define _LITTLE_ENDIAN
# elif BYTE_ORDER == BIG_ENDIAN
# define _BIG_ENDIAN
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
#endif
#endif
@@ -119,8 +108,6 @@ extern C {
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
#endif
@@ -138,10 +125,6 @@ extern C {
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif BYTE_ORDER == PDP_ENDIAN
-# ifndef _PDP_ENDIAN
-# define _PDP_ENDIAN
-# endif
# endif
#endif
@@ -155,10 +138,6 @@ extern C {
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif BYTE_ORDER == PDP_ENDIAN
-# ifndef _PDP_ENDIAN
-# define _PDP_ENDIAN
-# endif
# endif
#endif
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index c8f4871..71b9b31 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -89,8 +89,6 @@
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif __BYTE_ORDER == __PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
# define IORESOURCE_TRANSFER_BSD
# define IOCHANNEL_TRANSFER_BSD_RENO
@@ -142,8 +140,6 @@
# define _LITTLE_ENDIAN_OO
# elif BYTE_ORDER == BIG_ENDIAN
# define _BIG_ENDIAN_OO
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN_OO
# endif
# define IORESOURCE_TRANSFER_BSD
# define IOCHANNEL_TRANSFER_BSD_RENO
@@ -179,8 +175,6 @@
# define _LITTLE_ENDIAN
# elif BYTE_ORDER == BIG_ENDIAN
# define _BIG_ENDIAN
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
#endif
# define NO_PTHREAD_RTL
@@ -248,8 +242,6 @@
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
# define SLEEP_TIMESPEC(timespec)nsleep(timespec, 0)
# define LIBPATH LIBPATH
@@ -301,10 +293,6 @@
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif BYTE_ORDER == PDP_ENDIAN
-# ifndef _PDP_ENDIAN
-# define _PDP_ENDIAN
-# endif
# endif
# define IOCHANNEL_TRANSFER_BSD_RENO
# define NO_PTHREAD_RTL
@@ -341,10 +329,6 @@ int macxp_resolveAlias(char *path, int buflen);
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif BYTE_ORDER == PDP_ENDIAN
-# ifndef _PDP_ENDIAN
-# define _PDP_ENDIAN
-# endif
# endif
# define IOCHANNEL_TRANSFER_BSD_RENO
# define NO_PTHREAD_RTL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: rsc/source
rsc/source/rscpp/cpp5.c |8
rsc/source/rscpp/cppdef.h | 11 ---
2 files changed, 19 deletions(-)
New commits:
commit a5cabdbc747bfd13216bf45f50ec36ad28cfed53
Author: François Tigeot ftig...@wolfpond.org
Date: Fri Nov 25 14:42:10 2011 +0100
BIG_ENDIAN was never set
Remove its conditional code
diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index 4eb3183..24b13b9 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -750,19 +750,11 @@ evalchar(int skip)
* We warn on multi-byte constants and try to hack
* (big|little)endian machines.
*/
-#if BIG_ENDIAN
-count = 0;
-#endif
while ((c = get()) != '\'' c != EOF_CHAR c != '\n') {
if (!skip)
ciwarn(multi-byte constant '%c' isn't portable, c);
-#if BIG_ENDIAN
-count += BITS_CHAR;
-value += (c count);
-#else
value = BITS_CHAR;
value += c;
-#endif
}
instring = FALSE;
return (value);
diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h
index 2490f1d..29b5d92 100644
--- a/rsc/source/rscpp/cppdef.h
+++ b/rsc/source/rscpp/cppdef.h
@@ -220,17 +220,6 @@
#endif
/*
- * BIG_ENDIAN is set TRUE on machines (such as the IBM 360 series)
- * where 'ab' stores 'a' in the high-bits and 'b' in the low-bits.
- * It is set FALSE on machines (such as the PDP-11 and Vax-11)
- * where 'ab' stores 'a' in the low-bits and 'b' in the high-bits.
- * (Or is it the other way around?) -- Warning: BIG_ENDIAN code is untested.
- */
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN FALSE
-#endif
-
-/*
* COMMENT_INVISIBLE may be defined to allow old-style comment
* processing, whereby the comment becomes a zero-length token
* delimiter. This permitted tokens to be concatenated in macro
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - Makefile.in solenv/gbuild unotest/source
Makefile.in |7 ++
solenv/gbuild/JunitTest.mk| 14 +++--
solenv/gbuild/Module.mk | 10 +++
solenv/gbuild/gbuild.mk |4 +
solenv/gbuild/platform/unxgcc.mk | 26 +-
unotest/source/java/org/openoffice/test/OfficeConnection.java |6 --
6 files changed, 53 insertions(+), 14 deletions(-)
New commits:
commit bb149de2b4d3458c0db1958edbbb75e79a8a53c4
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Nov 25 15:14:09 2011 +0100
some hints cleanup
diff --git a/Makefile.in b/Makefile.in
index 9f58d33..443305b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,13 +46,18 @@ dev-install: build
printf \
'\nDeveloper installation finished, you can now execute:\n\n' \
\
-if test `uname -s` = Darwin; then \
+if test `uname -s` = Linux; then \
+printf 'make debugrun\n'; \
+elif test `uname -s` = Darwin; then \
printf 'open %s/install/LibreOffice.app\n' @abs_builddir@; \
else \
printf 'cd %s/install/program\n. ./ooenv\n./soffice.bin\n' \
@abs_builddir@; \
fi
+debugrun : dev-install
+ @. ./Env.Host.sh $$GNUMAKE -f $$SRC_ROOT/GNUmakefile.mk debugrun
+
check : allcheck
@true
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 33d068c..ab0d67f 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -58,9 +58,15 @@ $(call gb_JunitTest_get_target,%) :
-e 'at java.lang.reflect.' \
-e 'at sun.reflect.' $@.log \
echo see full error log at $@.log \
-echo to rerun just this failed test without all others, run
either: \
-echo cd \$$MODULE make $@ \
-echo make -f $(SRCDIR)/GNUmakefile.mk $@ false)) \
+echo to rerun just this failed test without all others,
run: \
+echo echo make $@ echo \
+echo add \-f $(SRCDIR)/GNUmakefile.mk\ if you are not in
the module dir \
+echo Or to do interactive debugging, run two shells with
(Linux only): \
+echo \
+echo make debugrun \
+echo make gb_JunitTest_DEBUGRUN=T $@ \
+echo \
+false)) \
rm -rf $(call gb_JunitTest_get_userdir,$*))
$(CLEAN_CMD)
commit a65b46b71d0f95119b343f4e931a318703889b08
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Nov 25 14:38:18 2011 +0100
remove debugcommand -- debugrun is superceding it
diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java
b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index 8f99076..ae2cae0 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -105,12 +105,6 @@ public final class OfficeConnection {
assertNull(waitForProcess(process, 1000)); // 1 sec
}
}
-try {
-ProcessBuilder debugbp = new ProcessBuilder(
-Argument.get(debugcommand).split( ));
-debugbp.start();
-Thread.sleep(1000);
-} catch(Exception e) {}
}
/** Shut down the OOo instance.
commit b684a5bb0374719976accaa9cedca44fa3d821ad
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Nov 25 14:36:18 2011 +0100
create debugrun target, adjust JunitTests to them
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 3003c9d..33d068c 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -50,8 +50,6 @@ $(call gb_JunitTest_get_target,%) :
mkdir -p $(call gb_JunitTest_get_userdir,$*) \
($(gb_JunitTest_JAVACOMMAND) \
-cp $(CLASSPATH) \
-$(if $(strip $(gb_JunitTest_DEBUGCOMMAND)),\
-
'-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \
$(DEFS) \
org.junit.runner.JUnitCore \
$(CLASSES) 21 $@.log || \
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 82da041..582d960 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -112,6 +112,10 @@ check : unitcheck
$(call gb_Output_announce_title,all tests checked.)
$(call gb_Output_announce_bell)
+debugrun : build
+ $(call gb_Module_DEBUGRUNCOMMAND)
+
+
ifeq ($(strip $(gb_PARTIALBUILD)),)
check : subsequentcheck
@@ -149,6 +153,10 @@ endif
endef
+# Dont recurse in subdirs for help an debugrun
+
+ifeq ($(filter help debugrun,$(MAKECMDGOALS)),)
+
define
[Libreoffice-commits] .: Makefile.in
Makefile.in |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 19b5d81f92363f1448dcf41930d973b8b04db11b Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Nov 25 15:24:49 2011 +0100 move workaround for old build system to other workarounds diff --git a/Makefile.in b/Makefile.in index 443305b..82dca9a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -55,7 +55,7 @@ dev-install: build @abs_builddir@; \ fi -debugrun : dev-install +debugrun: @. ./Env.Host.sh $$GNUMAKE -f $$SRC_ROOT/GNUmakefile.mk debugrun check : allcheck @@ -173,3 +173,4 @@ findunusedcode: unitcheck: build subsequentcheck: dev-install allcheck : dev-install +debugrun : dev-install ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/window/toolbox.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 93a5933060f61a5fb585148e4125a8ab22305259
Author: Noel Power noel.po...@novell.com
Date: Fri Nov 25 14:25:46 2011 +
really limit special layout to single line non-floating toolbars
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 1016301..3531ea1 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2721,7 +2721,7 @@ void ToolBox::ImplFormat( sal_Bool bResize )
if ( mbHorz )
{
it-maCalcRect.Left() = nX;
-if ( meLayoutMode == TBX_LAYOUT_TOP mnLines )
+if ( meLayoutMode == TBX_LAYOUT_TOP mnLines == 1 )
it-maCalcRect.Top() = nY/2;
else
it-maCalcRect.Top() =
nY+(nLineSize-aCurrentItemSize.Height())/2;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - scp2/source solenv/inc
scp2/source/ooo/module_helppack.ulf | 180 scp2/source/ooo/module_langpack.ulf | 180 solenv/inc/langlist.mk | 24 ++-- 3 files changed, 12 insertions(+), 372 deletions(-) New commits: commit 6cf8f6e737fdb35fa56713117baa617c02ed4dab Author: Lior Kaplan kaplanl...@gmail.com Date: Fri Nov 25 17:13:53 2011 +0200 Clean help pack list based on the current files in the translation repository (translations/source/) diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf index 4737584..18ac86e 100644 --- a/scp2/source/ooo/module_helppack.ulf +++ b/scp2/source/ooo/module_helppack.ulf @@ -193,36 +193,18 @@ en-US = Punjabi [STR_DESC_MODULE_HELPPACK_PA_IN] en-US = Installs Punjabi help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_GU_IN] -en-US = Gujarati - -[STR_DESC_MODULE_HELPPACK_GU_IN] -en-US = Installs Gujarati help in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_HELPPACK_TA] en-US = Tamil [STR_DESC_MODULE_HELPPACK_TA] en-US = Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_TA_IN] -en-US = Tamil - -[STR_DESC_MODULE_HELPPACK_TA_IN] -en-US = Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_HELPPACK_HI] en-US = Hindi [STR_DESC_MODULE_HELPPACK_HI] en-US = Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_HI_IN] -en-US = Hindi - -[STR_DESC_MODULE_HELPPACK_HI_IN] -en-US = Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_HELPPACK_ST] en-US = Southern Sotho (Sutu) @@ -253,12 +235,6 @@ en-US = Afrikaans [STR_DESC_MODULE_HELPPACK_AF] en-US = Installs Afrikaans help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_SW] -en-US = Swahili - -[STR_DESC_MODULE_HELPPACK_SW] -en-US = Installs Swahili help in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_HELPPACK_SW_TZ] en-US = Swahili @@ -283,42 +259,18 @@ en-US = Bengali [STR_DESC_MODULE_HELPPACK_BN] en-US = Installs Bengali help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_BN_BD] -en-US = Bengali (Bangladesh) - -[STR_DESC_MODULE_HELPPACK_BN_BD] -en-US = Installs Bengali (Bangladesh) help in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_HELPPACK_BN_IN] -en-US = Bengali (India) - -[STR_DESC_MODULE_HELPPACK_BN_IN] -en-US = Installs Bengali (India) help in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_HELPPACK_OR] en-US = Oriya [STR_DESC_MODULE_HELPPACK_OR] en-US = Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_OR_IN] -en-US = Oriya - -[STR_DESC_MODULE_HELPPACK_OR_IN] -en-US = Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_HELPPACK_MR] en-US = Marathi [STR_DESC_MODULE_HELPPACK_MR] en-US = Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_MR_IN] -en-US = Marathi - -[STR_DESC_MODULE_HELPPACK_MR_IN] -en-US = Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_HELPPACK_NE] en-US = Nepali @@ -331,12 +283,6 @@ en-US = Arabic [STR_DESC_MODULE_HELPPACK_AR] en-US = Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_AR_SA] -en-US = Arabic - -[STR_DESC_MODULE_HELPPACK_AR_SA] -en-US = Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_HELPPACK_CA] en-US = Catalan @@ -385,12 +331,6 @@ en-US = Norwegian (Nynorsk) [STR_DESC_MODULE_HELPPACK_NN] en-US = Installs Norwegian (Nynorsk) help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_RM] -en-US = Rhaeto-Romance - -[STR_DESC_MODULE_HELPPACK_RM] -en-US = Installs Rhaeto-Romance help in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_HELPPACK_RO] en-US = Romanian @@ -403,12 +343,6 @@ en-US = Albanian [STR_DESC_MODULE_HELPPACK_SQ] en-US = Installs Albanian help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_UR] -en-US = Urdu - -[STR_DESC_MODULE_HELPPACK_UR] -en-US = Installs Urdu help in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_HELPPACK_ID] en-US = Indonesian @@ -445,12 +379,6 @@ en-US = Lithuanian [STR_DESC_MODULE_HELPPACK_LT] en-US = Installs Lithuanian help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_HY] -en-US = Armenian - -[STR_DESC_MODULE_HELPPACK_HY] -en-US = Installs Armenian help in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_HELPPACK_EU] en-US = Basque @@ -463,12 +391,6 @@ en-US = Macedonian [STR_DESC_MODULE_HELPPACK_MK] en-US = Installs Macedonian help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_MT] -en-US = Maltese - -[STR_DESC_MODULE_HELPPACK_MT] -en-US = Installs Maltese help in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_HELPPACK_CY] en-US = Welsh @@ -481,12 +403,6 @@ en-US = Galician [STR_DESC_MODULE_HELPPACK_GL] en-US = Installs Galician help in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_HELPPACK_SH_YU] -en-US = Serbian (Latin)
[Libreoffice-commits] .: sdext/source
sdext/source/pdfimport/test/export.map |2
sdext/source/pdfimport/test/makefile.mk | 28 +--
sdext/source/pdfimport/test/tests.cxx | 80
3 files changed, 25 insertions(+), 85 deletions(-)
New commits:
commit b0e1f784080a0f78689b8166f296069c7c2fb8ad
Author: Thorsten Behrens tbehr...@suse.com
Date: Fri Nov 25 16:43:02 2011 +0100
First cut at making pdfimport unit tests work again.
diff --git a/sdext/source/pdfimport/test/export.map
b/sdext/source/pdfimport/test/export.map
index 7321bbc..3308588 100755
--- a/sdext/source/pdfimport/test/export.map
+++ b/sdext/source/pdfimport/test/export.map
@@ -27,7 +27,7 @@
UDK_3_0_0 {
global:
-registerAllTestFunction;
+cppunitTestPlugIn;
local:
*;
diff --git a/sdext/source/pdfimport/test/makefile.mk
b/sdext/source/pdfimport/test/makefile.mk
index b6f60d5..fdc3966 100755
--- a/sdext/source/pdfimport/test/makefile.mk
+++ b/sdext/source/pdfimport/test/makefile.mk
@@ -70,6 +70,8 @@ SHL1STDLIBS=\
$(CPPUNITLIB) \
$(ZLIB3RDLIB) \
$(CPPULIB) \
+$(UNOTESTLIB) \
+$(TESTLIB) \
$(SALLIB)
@@ -135,27 +137,5 @@ APP2STDLIBS=\
# --- Targets --
- .INCLUDE : target.mk
- .INCLUDE : _cppunit.mk
-
-# --- Fake uno bootstrap copy testfile
-
- $(BIN)$/pdfi_unittest_test.pdf : testinput.pdf
- rm -f $@
- $(GNUCOPY) testinput.pdf $@
-
- $(BIN)$/pdfi_unittest_test.ini : makefile.mk
- rm -f $@
- @echo UNO_SERVICES= $@
- @echo UNO_TYPES=$(UNOUCRRDB:s/\/\\/) $@
-
-# --- Enable testshl2 execution in normal build
-
- $(MISC)$/pdfi_unittest_succeeded : $(SHL1TARGETN)
$(BIN)$/pdfi_unittest_test.pdf $(BIN)$/pdfi_unittest_test.ini
- rm -f $(BIN)$/pdfi_unittest_draw.xml
- rm -f $(BIN)$/pdfi_unittest_writer.xml
- @echo --
- @echo - start unit test on library $(SHL1TARGETN)
- @echo --
- testshl2 -forward $(BIN)$/ $(SHL1TARGETN)
- $(TOUCH) $@
+.INCLUDE : target.mk
+.INCLUDE : _cppunit.mk
diff --git a/sdext/source/pdfimport/test/tests.cxx
b/sdext/source/pdfimport/test/tests.cxx
index 145f938..cffb336 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -29,6 +29,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include precompiled_sdext.hxx
+#include sal/config.h
+#include sal/precppunit.hxx
+
#define BASEGFX_STATICLIBRARY
#ifdef SYSTEM_ZLIB
@@ -47,12 +50,17 @@
#include rtl/math.hxx
#include osl/file.hxx
#include osl/process.h
-#include testshl/simpleheader.hxx
#include cppuhelper/compbase1.hxx
#include cppuhelper/bootstrap.hxx
#include cppuhelper/basemutex.hxx
#include comphelper/sequence.hxx
+#include comphelper/processfactory.hxx
+#include cppunit/TestAssert.h
+#include cppunit/TestFixture.h
+#include cppunit/extensions/HelperMacros.h
+#include cppunit/plugin/TestPlugIn.h
+#include test/bootstrapfixture.hxx
#include com/sun/star/rendering/XCanvas.hpp
#include com/sun/star/rendering/XColorSpace.hpp
@@ -471,58 +479,17 @@ namespace
bool m_bDashedLineSeen;
};
-class PDFITest : public CppUnit::TestFixture
+class PDFITest : public test::BootstrapFixture
{
-uno::Referenceuno::XComponentContext mxCtx;
-rtl::OUString msBaseDir;
-bool mbUnoInitialized;
-
public:
-PDFITest() : mxCtx(),msBaseDir(),mbUnoInitialized(false)
-{}
-
-void setUp()
-{
-if( !mbUnoInitialized )
-{
-const char* pArgs( getForwardString() );
-CPPUNIT_ASSERT_MESSAGE(Test file parameter, pArgs);
-
-msBaseDir = rtl::OUString::createFromAscii(pArgs);
-
-// bootstrap UNO
-try
-{
-::rtl::OUString aIniUrl;
-CPPUNIT_ASSERT_MESSAGE(
-Converting ini file to URL,
-osl_getFileURLFromSystemPath(
-
(msBaseDir+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pdfi_unittest_test.ini))).pData,
-aIniUrl.pData ) == osl_File_E_None );
-
-mxCtx =
::cppu::defaultBootstrap_InitialComponentContext(aIniUrl);
-CPPUNIT_ASSERT_MESSAGE(Getting component context,
mxCtx.is());
-}
-catch( uno::Exception )
-{
-CPPUNIT_ASSERT_MESSAGE(Bootstrapping UNO, false);
-}
-
-mbUnoInitialized = true;
-}
-}
-void tearDown()
[Libreoffice-commits] .: 3 commits - Makefile.in solenv/gbuild
Makefile.in | 12 ++-- solenv/gbuild/platform/unxgcc.mk |2 +- 2 files changed, 7 insertions(+), 7 deletions(-) New commits: commit f8b7720ca56e16d718593da8fc394dd91362fbf1 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Nov 25 16:44:45 2011 +0100 dev-install seems to poison the env diff --git a/Makefile.in b/Makefile.in index 78608d7..86acb64 100644 --- a/Makefile.in +++ b/Makefile.in @@ -173,4 +173,4 @@ findunusedcode: unitcheck: build subsequentcheck: dev-install allcheck : dev-install -debugrun : dev-install +#debugrun : dev-install # disabled for now, this dep seems to poison the debugrun !? commit c036777b4930e5c4ab34f035b8de749a7f80e42a Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Nov 25 16:41:28 2011 +0100 gbuild need no env anymore diff --git a/Makefile.in b/Makefile.in index 82dca9a..78608d7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -56,16 +56,16 @@ dev-install: build fi debugrun: - @. ./Env.Host.sh $$GNUMAKE -f $$SRC_ROOT/GNUmakefile.mk debugrun + @ @GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST/GNUmakefile.mk debugrun check : allcheck @true %check: - @. ./Env.Host.sh $$GNUMAKE -f $$SRC_ROOT/GNUmakefile.mk -r \ - $(if @VERBOSE@,,-s) --jobs=$(if \ - $(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@) \ - $(patsubst allcheck,check,$@) + @ @GNUMAKE@ -f $(dir $(realpath $(firstword $)MAKEFILE_LIST/GNUmakefile.mk -r \ + $(if @VERBOSE@,,-s) --jobs=$(if \ + $(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@) \ + $(patsubst allcheck,check,$@) cross-build-toolset: @. ./Env.Build.sh \ commit faa11fecdbca8cdba62a6cc5610c311fcbe0e607 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Nov 25 16:40:02 2011 +0100 fix default junit soffice path diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index d34d4a1..9d07c9f 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -383,7 +383,7 @@ else ifneq ($(gb_JunitTest_DEBUGRUN),) gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER) else -gb_JunitTest_SOFFICEARG:=$(OUTDIR)/installation/opt/program/soffice +gb_JunitTest_SOFFICEARG:=path:$(OUTDIR)/installation/opt/program/soffice endif endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source solenv/gbuild solenv/inc
connectivity/source/inc/hsqldb/HStorageAccess.hxx |8
solenv/gbuild/platform/ANDROID_ARM_GCC.mk | 11 +++
solenv/inc/unxandr.mk | 10 +-
3 files changed, 24 insertions(+), 5 deletions(-)
New commits:
commit 1171165b587480d9dde9c378b2998f3c26b83220
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Nov 25 17:53:51 2011 +0200
Fix Android compilation: 'NULL' was not declared in this scope
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index 079d8c7..dc9151d 100644
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
@@ -36,10 +36,10 @@ namespace connectivity { namespace hsqldb
class DataLogFile;
} }
-jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name,
jstring key, ::connectivity::hsqldb::DataLogFile* logger = NULL );
-jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject
obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len,
::connectivity::hsqldb::DataLogFile* logger = NULL );
-void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this,
jstring name, jstring key, jbyteArray buffer, jint off, jint len,
::connectivity::hsqldb::DataLogFile* logger = NULL );
-void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name,
jstring key, jint v, ::connectivity::hsqldb::DataLogFile* logger = NULL );
+jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name,
jstring key, ::connectivity::hsqldb::DataLogFile* logger = 0 );
+jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject
obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len,
::connectivity::hsqldb::DataLogFile* logger = 0 );
+void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this,
jstring name, jstring key, jbyteArray buffer, jint off, jint len,
::connectivity::hsqldb::DataLogFile* logger = 0 );
+void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name,
jstring key, jint v, ::connectivity::hsqldb::DataLogFile* logger = 0 );
#endif // CONNECTIVITY_HSQLDB_STORAGEACCESS_HXX
commit ea19e7243b3a4bd49cbad0cf03a5e9f50b2e3148
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Nov 25 14:06:28 2011 +0200
No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker
diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index cbcd3e6..53e571c 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -78,4 +78,15 @@ gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
\
+# No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker so
+# don't bother generating such.
+
+define gb_Library_get_rpath
+endef
+
+define gb_Executable_get_rpath
+endef
+
+gb_LinkTarget_LDFLAGS := $(subst
-Wl$(COMMA)-rpath-link$(COMMA)$(SYSBASE)/lib:$(SYSBASE)/usr/lib,,$(gb_LinkTarget_LDFLAGS))
+
# vim: set noet sw=4:
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index 49b481a..9d172df 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -52,5 +52,13 @@ STDSHLCUIMT+=-llog -landroid -lgnustl_shared
# All shared libraries we build must start with lib because
# otherwise the Android package installer will not unpack them from
-# the .apk into the app's lib directory
+# the .apk into the app's lib directory.
ENFORCEDSHLPREFIX=lib
+
+# No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker so
+# don't bother generating such.
+
+LINKFLAGSRUNPATH_URELIB=
+LINKFLAGSRUNPATH_UREBIN=
+LINKFLAGSRUNPATH_OOO=
+LINKFLAGSRUNPATH_SDK=
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/module_ooo.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1221e6a9e44f080b8e5fc5d3fdf3a708b6e382ab Author: Petr Mladek pmla...@suse.cz Date: Fri Nov 25 17:55:04 2011 +0100 correctly install Latvian dictionary the typo caused that the Latvian dictionary was included into core01 package and broke langpacks diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 196c1c2..8afa37d 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -300,7 +300,7 @@ End Module gid_Module_Root_Extension_Dictionary_Lv MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LV ); -Files = (gid_File_Extension_Dictionary_Lt); +Files = (gid_File_Extension_Dictionary_Lv); InstallOrder = 2000; Sortkey = 635; Spellcheckerlanguage = lv; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/nlpflatten'
New branch 'feature/nlpflatten' available with the following commits: commit f2f3ac84d49bdaf8fe3c1c6036cb477ffd4f16f0 Author: Michael Meeks michael.me...@suse.com Date: Fri Nov 25 14:48:18 2011 + nlpsolver: migrate the build to use native gnumake build Remove dmake, build.pl and ant build cruft. Update extension description, cleanup file locations etc. commit e4b8dd5bd72f285d50088085628997a0d93a3de6 Author: Michael Meeks michael.me...@suse.com Date: Fri Nov 25 12:44:22 2011 + move translation files into the correct place commit 6e5b10b17fbcbb4db76bcb1db5177fb3ab0cf46e Author: Michael Meeks michael.me...@suse.com Date: Fri Nov 25 12:41:39 2011 + Flatten un-maintained ex. Sun/Oracle nlpsolver extension into the repo This should make it easier to hack, and also to separate out the tangled in third party EvolutionarySolver as/when we can. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - i18npool/source
i18npool/source/localedata/data/pt_PT.xml | 49 +- 1 file changed, 28 insertions(+), 21 deletions(-) New commits: commit 0e0b3dfc9a13794b2f0137676ccfe0fe608f2864 Author: Eike Rathke er...@redhat.com Date: Fri Nov 25 17:27:19 2011 +0100 added [pt-PT] legacyOnly currency to cope with change from Esc. to $ diff --git a/i18npool/source/localedata/data/pt_PT.xml b/i18npool/source/localedata/data/pt_PT.xml index 1fbacd9..2d0f18d 100644 --- a/i18npool/source/localedata/data/pt_PT.xml +++ b/i18npool/source/localedata/data/pt_PT.xml @@ -34,7 +34,7 @@ TimePMPM/TimePM MeasurementSystemMetric/MeasurementSystem /LC_CTYPE -LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$Esc.-816] +LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$$-816] FormatElement msgid=DateFormatskey1 default=true type=short usage=DATE formatindex=18 FormatCodeDD-MM-/FormatCode DefaultName/DefaultName @@ -337,6 +337,13 @@ /Calendar /LC_CALENDAR LC_CURRENCY +Currency default=false usedInCompatibleFormatCodes=false legacyOnly=true +CurrencyIDPTE/CurrencyID +CurrencySymbolEsc./CurrencySymbol +BankSymbolPTE/BankSymbol +CurrencyNameEscudo/CurrencyName +DecimalPlaces2/DecimalPlaces +/Currency Currency default=false usedInCompatibleFormatCodes=true CurrencyIDPTE/CurrencyID CurrencySymbol$/CurrencySymbol commit 06b6e220b5e9250c688daaea4a7eb2ae64f1863c Author: Sérgio Marques smarque...@gmail.com Date: Fri Nov 25 17:23:25 2011 +0100 updated Portuguese [pt-PT] locale data diff --git a/i18npool/source/localedata/data/pt_PT.xml b/i18npool/source/localedata/data/pt_PT.xml index df6ce1d..1fbacd9 100644 --- a/i18npool/source/localedata/data/pt_PT.xml +++ b/i18npool/source/localedata/data/pt_PT.xml @@ -156,7 +156,7 @@ DefaultName/DefaultName /FormatElement FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 -FormatCodeEstandar/FormatCode +FormatCodeGeral/FormatCode DefaultName/DefaultName /FormatElement FormatElement msgid=FixedFormatskey2 default=true type=short usage=FIXED_NUMBER formatindex=1 @@ -222,38 +222,38 @@ DaysOfWeek Day DayIDsun/DayID -DefaultAbbrvNameDom/DefaultAbbrvName -DefaultFullNameDomingo/DefaultFullName +DefaultAbbrvNamedom/DefaultAbbrvName +DefaultFullNamedomingo/DefaultFullName /Day Day DayIDmon/DayID -DefaultAbbrvNameSeg/DefaultAbbrvName -DefaultFullNameSegunda-feira/DefaultFullName +DefaultAbbrvNameseg/DefaultAbbrvName +DefaultFullNamesegunda-feira/DefaultFullName /Day Day DayIDtue/DayID -DefaultAbbrvNameTer/DefaultAbbrvName -DefaultFullNameTerça-feira/DefaultFullName +DefaultAbbrvNameter/DefaultAbbrvName +DefaultFullNameterça-feira/DefaultFullName /Day Day DayIDwed/DayID -DefaultAbbrvNameQua/DefaultAbbrvName -DefaultFullNameQuarta-feira/DefaultFullName +DefaultAbbrvNamequa/DefaultAbbrvName +DefaultFullNamequarta-feira/DefaultFullName /Day Day DayIDthu/DayID -DefaultAbbrvNameQui/DefaultAbbrvName -DefaultFullNameQuinta-feira/DefaultFullName +DefaultAbbrvNamequi/DefaultAbbrvName +DefaultFullNamequinta-feira/DefaultFullName /Day Day DayIDfri/DayID -DefaultAbbrvNameSex/DefaultAbbrvName -DefaultFullNameSexta-feira/DefaultFullName +DefaultAbbrvNamesex/DefaultAbbrvName +DefaultFullNamesexta-feira/DefaultFullName /Day Day DayIDsat/DayID -DefaultAbbrvNameSáb/DefaultAbbrvName -DefaultFullNameSábado/DefaultFullName +DefaultAbbrvNamesáb/DefaultAbbrvName +DefaultFullNamesábado/DefaultFullName /Day /DaysOfWeek MonthsOfYear @@ -321,13 +321,13 @@ Eras Era EraIDbc/EraID -DefaultAbbrvNamea.c./DefaultAbbrvName -DefaultFullNamea.c./DefaultFullName +DefaultAbbrvNameaC/DefaultAbbrvName +DefaultFullNameaC/DefaultFullName /Era Era EraIDad/EraID -DefaultAbbrvNamed.c./DefaultAbbrvName -DefaultFullNamed.c./DefaultFullName +DefaultAbbrvNamedC/DefaultAbbrvName +DefaultFullNamedC/DefaultFullName /Era /Eras StartDayOfWeek @@ -339,7 +339,7 @@ LC_CURRENCY Currency default=false usedInCompatibleFormatCodes=true CurrencyIDPTE/CurrencyID -CurrencySymbolEsc./CurrencySymbol +CurrencySymbol$/CurrencySymbol BankSymbolPTE/BankSymbol CurrencyNameEscudo/CurrencyName DecimalPlaces2/DecimalPlaces ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/JunitTest.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 58932ca2426320df5c7d7ec97cf2ad65f6539b22 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Nov 25 19:07:19 2011 +0100 fix stderr piping diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index ab0d67f..b6ce903 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -52,7 +52,7 @@ $(call gb_JunitTest_get_target,%) : -cp $(CLASSPATH) \ $(DEFS) \ org.junit.runner.JUnitCore \ -$(CLASSES) 21 $@.log || \ +$(CLASSES) $@.log 21 || \ (grep -v -e 'at org.junit.' \ -e 'at com.sun.star.lib.uno.' \ -e 'at java.lang.reflect.' \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/LocaleNode.cxx | 44 +++---
i18npool/source/localedata/LocaleNode.hxx |3 ++
i18npool/source/localedata/data/ga_IE.xml |4 +-
i18npool/source/localedata/data/my_MM.xml |7
i18npool/source/localedata/data/wa_BE.xml |2 -
5 files changed, 53 insertions(+), 7 deletions(-)
New commits:
commit 4e34d8fd5b64a18dd17faf4ed4d603648bab8311
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 25 19:37:35 2011 +0100
added check if locale data's usedInCompatibleFormatCodes currency is really
used there
and fixed the cases discovered by the check ...
diff --git a/i18npool/source/localedata/LocaleNode.cxx
b/i18npool/source/localedata/LocaleNode.cxx
index 8d7d1a3..88c26b5 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -337,6 +337,12 @@ void LocaleNode::incErrorStr( const char* pStr, const
::rtl::OUString rVal ) co
fprintf( stderr, prepareErrorFormat( pStr, : %s), OSTR( rVal));
}
+void LocaleNode::incErrorStrStr( const char* pStr, const ::rtl::OUString
rVal1, const ::rtl::OUString rVal2 ) const
+{
+++nError;
+fprintf( stderr, prepareErrorFormat( pStr, : %s %s), OSTR( rVal1), OSTR(
rVal2));
+}
+
void LCInfoNode::generateCode (const OFileWriter of) const
{
@@ -590,13 +596,17 @@ void LCCTYPENode::generateCode (const OFileWriter of)
const
}
+static OUString sTheCompatibleCurrency;
+
sal_Int16 LCFormatNode::mnSection = 0;
sal_Int16 LCFormatNode::mnFormats = 0;
void LCFormatNode::generateCode (const OFileWriter of) const
{
OUString str;
-if (mnSection = 2)
+if (mnSection == 0)
+sTheCompatibleCurrency = OUString();
+else if (mnSection = 2)
incError(more than 2 LC_FORMAT sections);
OUString strFrom( getAttr().getValueByName(replaceFrom));
of.writeParameter(replaceFrom, strFrom, mnSection);
@@ -607,6 +617,13 @@ void LCFormatNode::generateCode (const OFileWriter of)
const
if (str.endsWithIgnoreAsciiCaseAsciiL( -], 6))
incErrorStr(replaceTo=\%s\ needs to be adapted to the real
LangID value., str);
of.writeParameter(replaceTo, str, mnSection);
+// Remember the currency symbol if present.
+if (str.indexOfAsciiL( [$, 2) == 0)
+{
+sal_Int32 nHyphen = str.indexOf( '-');
+if (nHyphen = 3)
+sTheCompatibleCurrency = str.copy( 2, nHyphen - 2);
+}
::rtl::OUString useLocale = getAttr().getValueByName(ref);
if (useLocale.getLength() 0) {
switch (mnSection)
@@ -710,14 +727,27 @@ void LCFormatNode::generateCode (const OFileWriter of)
const
}
}
break;
-// Currency formats should be something like [C]###0;-[C]###0
-// and not parenthesized [C]###0;([C]###0) if not en_US.
+case cssi::NumberFormatIndex::CURRENCY_1000DEC2 :
+// Remember the currency symbol if present.
+{
+sal_Int32 nStart;
+if (sTheCompatibleCurrency.isEmpty()
+((nStart = n-getValue().indexOfAsciiL( [$,
2)) = 0))
+{
+OUString aCode( n-getValue());
+sal_Int32 nHyphen = aCode.indexOf( '-', nStart);
+if (nHyphen = nStart + 3)
+sTheCompatibleCurrency = aCode.copy( nStart +
2, nHyphen - nStart - 2);
+}
+}
+// fallthru
case cssi::NumberFormatIndex::CURRENCY_1000INT :
case cssi::NumberFormatIndex::CURRENCY_1000INT_RED :
-case cssi::NumberFormatIndex::CURRENCY_1000DEC2 :
case cssi::NumberFormatIndex::CURRENCY_1000DEC2_RED :
case cssi::NumberFormatIndex::CURRENCY_1000DEC2_CCC :
case cssi::NumberFormatIndex::CURRENCY_1000DEC2_DASHED :
+// Currency formats should be something like
[C]###0;-[C]###0
+// and not parenthesized [C]###0;([C]###0) if not en_US.
if (strcmp( of.getLocale(), en_US) != 0)
{
OUString aCode( n-getValue());
@@ -1549,6 +1579,12 @@ void LCCurrencyNode :: generateCode (const OFileWriter
of) const
incError( CurrencyID is not ISO 4217);
str = currencyNode - findNode (CurrencySymbol) - getValue();
of.writeParameter(currencySymbol, str, nbOfCurrencies);
+// Check if this currency really is the one used in number format
+// codes. In case of ref=... mechanisms it may be that TheCurrency
+// couldn't had been determined from the current locale (i.e. is
+// empty), silently assume the referred locale has things right.
+if (bCompatible
[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] .: 4 commits - jvmfwk/plugins jvmfwk/prj postprocess/prj sal/inc shell/source tail_build/prj
jvmfwk/plugins/sunmajor/pluginlib/makefile.mk |2 +- jvmfwk/prj/d.lst |1 + postprocess/prj/build.lst |2 +- sal/inc/sal/main.h|7 --- shell/source/backends/desktopbe/makefile.mk |2 +- shell/source/backends/localebe/makefile.mk|2 +- shell/source/cmdmail/makefile.mk |5 + shell/source/unix/exec/makefile.mk|5 + shell/source/unix/misc/makefile.mk|5 + shell/source/unix/sysshell/makefile.mk|5 + tail_build/prj/build.lst |2 +- 11 files changed, 26 insertions(+), 12 deletions(-) New commits: commit 591191038e9d3847b258ab467182497e736d2cfb Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Nov 25 23:58:22 2011 +0200 Use ENFORCEDSHLPREFIX for Android diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk index 27dc8da..78f1457 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk +++ b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk @@ -60,7 +60,7 @@ LIB1OBJFILES= $(SLOFILES) LIB1TARGET=$(SLB)$/$(UNOCOMPONENT1).lib -SHL1TARGET=$(UNOCOMPONENT1) +SHL1TARGET=$(ENFORCEDSHLPREFIX)$(UNOCOMPONENT1) SHL1STDLIBS= \ diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst index 09bc295..e8753d1 100644 --- a/jvmfwk/prj/d.lst +++ b/jvmfwk/prj/d.lst @@ -6,6 +6,7 @@ mkdir: %_DEST%\inc\jvmfwk ..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin\* ..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin\* ..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib\* +..\%__SRC%\lib\libsunjavaplugin*.so %_DEST%\lib\* ..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib\* ..\%__SRC%\class\JREProperties.class %_DEST%\bin\JREProperties.class ..\%__SRC%\class\JREProperties.class %_DEST%\lib\JREProperties.class commit ce5f65f335096a8e2200a47cee19c36ca1507e41 Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Nov 25 23:55:29 2011 +0200 Build fpicker for DESKTOP only diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index eb6513d..b8eb41e 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL +po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL po postprocess usr1- all po_mkout NULL po postprocess\checkxmlnmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 2235197..72e90b4 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL +tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon
[Libreoffice-commits] .: scp2/source setup_native/source
scp2/source/ooo/common_brand.scp| 20 + scp2/source/ooo/file_ooo.scp| 36 + scp2/source/ooo/module_ooo.scp | 48 +++- scp2/source/ooo/module_ooo.ulf | 24 ++ setup_native/source/packinfo/packinfo_office.txt| 64 setup_native/source/packinfo/spellchecker_selection.txt |4 + 6 files changed, 194 insertions(+), 2 deletions(-) New commits: commit 2e366cbdedd542e2324684f4b8b2517dbfcd7f59 Author: Andras Timar ati...@suse.com Date: Fri Nov 25 23:24:18 2011 +0100 add Belarusian, Greek, Scottish Gaelic, and Telugu dictionaries diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 791eb6d..203f148 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -202,6 +202,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Ar DosName = dict-ar; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Be +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-be; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Bg ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-bg; @@ -242,6 +247,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_En DosName = dict-en; End +Directory gid_Brand_Dir_Share_Extensions_Dict_El +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-el; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Es ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-es; @@ -257,6 +267,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Fr DosName = dict-fr; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Gd +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-gd; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Gl ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-gl; @@ -377,6 +392,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Sw DosName = dict-sw; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Te +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-te; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Th ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-th; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index b53c69d..adce11d 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1304,6 +1304,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Be + Dir = gid_Brand_Dir_Share_Extensions_Dict_Be; + Name = dict-be.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Bg Dir = gid_Brand_Dir_Share_Extensions_Dict_Bg; Name = dict-bg.oxt; @@ -1376,6 +1385,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_El + Dir = gid_Brand_Dir_Share_Extensions_Dict_El; + Name = dict-el.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Es Dir = gid_Brand_Dir_Share_Extensions_Dict_Es; Name = dict-es.oxt; @@ -1403,6 +1421,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Gd + Dir = gid_Brand_Dir_Share_Extensions_Dict_Gd; + Name = dict-gd.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Gl Dir = gid_Brand_Dir_Share_Extensions_Dict_Gl; Name = dict-gl.oxt; @@ -1619,6 +1646,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Te + Dir = gid_Brand_Dir_Share_Extensions_Dict_Te; + Name = dict-te.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Th Dir = gid_Brand_Dir_Share_Extensions_Dict_Th; Name = dict-th.oxt; diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 8afa37d..473a026 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -78,11 +78,22 @@ Module gid_Module_Root_Extension_Dictionary_Ar Styles = (); End +Module gid_Module_Root_Extension_Dictionary_Be +MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BE ); +Files = (gid_File_Extension_Dictionary_Be); +InstallOrder = 2000; +Sortkey = 512; +Spellcheckerlanguage = be; +PackageInfo = packinfo_office.txt; +ParentID = gid_Module_Dictionaries; +Styles = (); +End + Module gid_Module_Root_Extension_Dictionary_Bg MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BG ); Files = (gid_File_Extension_Dictionary_Bg); InstallOrder =
[Libreoffice-commits] .: 5 commits - cpputools/source jvmaccess/source jvmaccess/util README.cross solenv/gbuild
README.cross |4 ++--
cpputools/source/registercomponent/makefile.mk |5 +
cpputools/source/regsingleton/makefile.mk |5 +
cpputools/source/unoexe/makefile.mk|4
jvmaccess/source/makefile.mk |5 +
jvmaccess/util/makefile.mk |5 +
solenv/gbuild/Package.mk |2 +-
7 files changed, 27 insertions(+), 3 deletions(-)
New commits:
commit 0b4a9bd2b49da8441d873a52ae5ec2c86937c839
Author: Tor Lillqvist t...@iki.fi
Date: Sat Nov 26 00:32:31 2011 +0200
Compile as Objective-C++ for iOS thanks to current sal/main.h idea
diff --git a/cpputools/source/unoexe/makefile.mk
b/cpputools/source/unoexe/makefile.mk
index 5869f18..e4317b0 100755
--- a/cpputools/source/unoexe/makefile.mk
+++ b/cpputools/source/unoexe/makefile.mk
@@ -72,6 +72,10 @@ APP1TARGET=$(TARGET)
APP1OBJS=$(DEPOBJFILES)
APP1RPATH=UREBIN
+.IF $(OS) == IOS
+CFLAGSCXX += $(OBJCXXFLAGS)
+.ENDIF
+
# Include all relevant (see ure/source/README) dynamic libraries, so that C++
# UNO components running in the uno executable have a defined environment
# (stlport, unxlngi6 libstdc++.so.6, and wntmsci10 uwinapi.dll are already
commit 649f45fdcd0bb01e087bfd1ab1056b9b02c7b7af
Author: Tor Lillqvist t...@iki.fi
Date: Sat Nov 26 00:30:40 2011 +0200
No sense building these for iOS
diff --git a/cpputools/source/registercomponent/makefile.mk
b/cpputools/source/registercomponent/makefile.mk
index 6808e0b..536d864 100644
--- a/cpputools/source/registercomponent/makefile.mk
+++ b/cpputools/source/registercomponent/makefile.mk
@@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -
.INCLUDE : settings.mk
+.IF $(OS) == IOS
+ALL:
+@echo Nothing done for $(OS)
+.ENDIF
+
UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
diff --git a/cpputools/source/regsingleton/makefile.mk
b/cpputools/source/regsingleton/makefile.mk
index e90b0c8..9d8812c 100644
--- a/cpputools/source/regsingleton/makefile.mk
+++ b/cpputools/source/regsingleton/makefile.mk
@@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF $(OS) == IOS
+ALL:
+@echo Nothing done for $(OS)
+.ENDIF
+
UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
commit 177fd47a8c77848c00632398ec233464cb8575e2
Author: Tor Lillqvist t...@iki.fi
Date: Sat Nov 26 00:28:49 2011 +0200
Don't bother building anything here for iOS
diff --git a/jvmaccess/source/makefile.mk b/jvmaccess/source/makefile.mk
index 44e0313..8c19c93 100644
--- a/jvmaccess/source/makefile.mk
+++ b/jvmaccess/source/makefile.mk
@@ -33,6 +33,11 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
+.IF $(OS) == IOS
+ALL:
+@echo Nothing done for $(OS)
+.ENDIF
+
SLOFILES = \
$(SLO)$/classpath.obj \
$(SLO)$/unovirtualmachine.obj \
diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk
index 1d6106f..9553973 100644
--- a/jvmaccess/util/makefile.mk
+++ b/jvmaccess/util/makefile.mk
@@ -37,6 +37,11 @@ UNIXVERSIONNAMES = UDK
.INCLUDE: settings.mk
+.IF $(OS) == IOS
+ALL:
+@echo Nothing done for $(OS)
+.ENDIF
+
.IF $(UNIXVERSIONNAMES) ==
SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID)
.ELSE # UNIXVERSIONNAMES
commit a5cdc4cbc70f479f0c06ec6f36d6a9139484bb34
Author: Tor Lillqvist t...@iki.fi
Date: Fri Nov 25 18:04:19 2011 +0200
xargs on MacOSX seems a bit broken, work around that
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 7420757..0179dd1 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -45,7 +45,7 @@ endef
$(call gb_Package_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PKG,2)
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
-cat $${RESPONSEFILE} | xargs rm -f \
+cat $${RESPONSEFILE} | xargs $(if $(filter
MACOSX,$(OS_FOR_BUILD)),-n 1000) rm -f \
rm -f $${RESPONSEFILE}
$(call gb_Package_get_preparation_target,%) :
commit fad4076a20242c94f9887984e431118a8e6aec89
Author: Tor Lillqvist t...@iki.fi
Date: Fri Nov 25 15:18:19 2011 +0200
Use the 5.0 SDK for the iOS simulator example
diff --git a/README.cross b/README.cross
index 6918ec6..204b86d 100644
--- a/README.cross
+++ b/README.cross
@@ -291,8 +291,8 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
-mmacosx-version-min=10.4
--without-myspell-dicts
And here for the iOS simulator:
-CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++
-arch i386 -isysroot
/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
-CC=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc
-arch i386 -isysroot
/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
+CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/unxgcc.mk |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 3d37661a095c8d0a2a4376a859fa73c99a45ca56
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Sat Nov 26 01:54:14 2011 +0100
dont attach, start own instance as otherwise it might be blocked
via/proc/sys/kernel/yama/ptrace_scope
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 9d07c9f..c5c0324 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -401,11 +401,10 @@ endef
define gb_Module_DEBUGRUNCOMMAND
OFFICESCRIPT=`mktemp` \
-echo . $(OUTDIR)/installation/opt/program/ooenv $${OFFICESCRIPT} \
-echo $(OUTDIR)/installation/opt/program/soffice.bin --norestore --nologo
\--accept=pipe,name=$(USER);urp;\
-env:UserInstallation=file://$(OUTDIR)/installation/ $${OFFICESCRIPT} \
-echo OFFICEPID=\$$! $${OFFICESCRIPT} \
-echo echo \office started as \$${OFFICEPID}\ $${OFFICESCRIPT} \
-echo gdb -ex \at \$${OFFICEPID}\ -ex \c\ $${OFFICESCRIPT} \
+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 \r\\\n $${OFFICESCRIPT} \
$(SHELL) $${OFFICESCRIPT} \
rm $${OFFICESCRIPT}
endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/inc/tmplctrl.hxx |1 - sw/source/ui/uno/swdetect.hxx |1 - sw/source/ui/uno/unodoc.cxx|1 - sw/source/ui/vba/vbasystem.cxx |3 +-- 4 files changed, 1 insertion(+), 5 deletions(-) New commits: commit 7d20dff1031b3c5325c09c541183131bdc15db57 Author: August Sodora aug...@gmail.com Date: Thu Nov 24 02:40:12 2011 -0500 Remove unnecessary tools/string includes diff --git a/sw/source/ui/inc/tmplctrl.hxx b/sw/source/ui/inc/tmplctrl.hxx index f0579d0..cc48a14 100644 --- a/sw/source/ui/inc/tmplctrl.hxx +++ b/sw/source/ui/inc/tmplctrl.hxx @@ -30,7 +30,6 @@ // include --- #include sfx2/stbitem.hxx -#include tools/string.hxx // class BookmarkToolBoxControl --- class SwTemplateControl : public SfxStatusBarControl diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx index 124a443..1c72939 100644 --- a/sw/source/ui/uno/swdetect.hxx +++ b/sw/source/ui/uno/swdetect.hxx @@ -39,7 +39,6 @@ #include com/sun/star/lang/XSingleServiceFactory.hpp #include cppuhelper/factory.hxx #include tools/link.hxx -#include tools/string.hxx class SfxMedium; diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx index e85dfea..1b2d1fa 100644 --- a/sw/source/ui/uno/unodoc.cxx +++ b/sw/source/ui/uno/unodoc.cxx @@ -30,7 +30,6 @@ #include precompiled_sw.hxx // System - Includes - -#include tools/string.hxx #include sfx2/docfac.hxx #include sfx2/sfxmodelfactory.hxx #include swdll.hxx diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index 4b5b5a6..d8be0e2 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -26,11 +26,10 @@ * / #include vbasystem.hxx -#include vbahelper/vbahelper.hxx + #include ooo/vba/word/WdCursorType.hpp #include tools/diagnose_ex.h #include tools/config.hxx -#include tools/string.hxx #include osl/file.hxx #include tools/urlobj.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/comp/symtbl.cxx |2 +-
basic/source/inc/symtbl.hxx |4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 0e8fd29c3139284fda47d6ea25b5661955ef
Author: August Sodora aug...@gmail.com
Date: Sat Nov 26 00:06:05 2011 -0500
Change boost::ptr_vector to std::vector
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index c81a1f3..1aaeca4 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -75,7 +75,7 @@ short SbiStringPool::Add( const rtl::OUString rVal, sal_Bool
bNoCase )
return i+1;
}
-aData.push_back(new rtl::OUString(rVal));
+aData.push_back(rVal);
return (short) ++n;
}
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 33da527..efdc704 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -29,8 +29,6 @@
#ifndef _SYMTBL_HXX
#define _SYMTBL_HXX
-#include boost/ptr_container/ptr_vector.hpp
-
class SbiConstDef;
class SbiParser;
class SbiProcDef;
@@ -44,7 +42,7 @@ enum SbiSymScope { SbLOCAL, SbPARAM, SbPUBLIC, SbGLOBAL,
SbRTL };
class SbiStringPool {
const rtl::OUString aEmpty;
-boost::ptr_vectorrtl::OUString aData;
+std::vectorrtl::OUString aData;
SbiParser* pParser;
public:
SbiStringPool( SbiParser* );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/inc/symtbl.hxx | 54 ++--
1 file changed, 27 insertions(+), 27 deletions(-)
New commits:
commit 2de121e58879d511376dd725aa41e2f842f30c43
Author: August Sodora aug...@gmail.com
Date: Sat Nov 26 00:16:58 2011 -0500
sal_Bool-bool
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index efdc704..310a238 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -111,16 +111,16 @@ protected:
sal_uInt16 nProcId;
sal_uInt16 nPos;
sal_uInt32 nChain;
-sal_Bool bNew : 1;// sal_True: Dim As New...
-sal_Bool bChained : 1;// sal_True: symbol is defined in code
-sal_Bool bByVal : 1;// sal_True: ByVal-parameter
-sal_Bool bOpt : 1;// sal_True: optional parameter
-sal_Bool bStatic : 1;// sal_True: STATIC variable
-sal_Bool bAs : 1;// sal_True: data type defined per AS
XXX
-sal_Bool bGlobal : 1;// sal_True: global variable
-sal_Bool bParamArray : 1; // sal_True: ParamArray parameter
-sal_Bool bWithEvents : 1; // sal_True: Declared WithEvents
-sal_Bool bWithBrackets : 1; // sal_True: Followed by ()
+bool bNew : 1;// true: Dim As New...
+bool bChained : 1;// true: symbol is defined in code
+bool bByVal : 1;// true: ByVal-parameter
+bool bOpt : 1;// true: optional parameter
+bool bStatic : 1;// true: STATIC variable
+bool bAs : 1;// true: data type defined per AS XXX
+bool bGlobal : 1;// true: global variable
+bool bParamArray : 1; // true: ParamArray parameter
+bool bWithEvents : 1; // true: Declared WithEvents
+bool bWithBrackets : 1; // true: Followed by ()
sal_uInt16 nDefaultId; // Symbol number of default value
short nFixedStringLength; // String length in: Dim foo As
String*Length
public:
@@ -143,28 +143,28 @@ public:
short GetLen() const { return nLen; }
void SetDims( short n ) { nDims = n; }
short GetDims() const { return nDims; }
-sal_Bool IsDefined() const{ return bChained; }
-void SetOptional(){ bOpt = sal_True; }
-void SetParamArray() { bParamArray = sal_True; }
-void SetWithEvents() { bWithEvents = sal_True; }
-void SetWithBrackets(){ bWithBrackets = sal_True; }
-void SetByVal( sal_Bool bByVal_ = sal_True )
+bool IsDefined() const{ return bChained; }
+void SetOptional(){ bOpt = true; }
+void SetParamArray() { bParamArray = true; }
+void SetWithEvents() { bWithEvents = true; }
+void SetWithBrackets(){ bWithBrackets = true; }
+void SetByVal( bool bByVal_ = true )
{ bByVal = bByVal_; }
-void SetStatic( sal_Bool bAsStatic = sal_True ) { bStatic =
bAsStatic; }
+void SetStatic( bool bAsStatic = true ) { bStatic = bAsStatic;
}
void SetNew() { bNew = sal_True; }
void SetDefinedAs() { bAs = sal_True; }
-void SetGlobal(sal_Bool b){ bGlobal = b; }
+void SetGlobal(bool b){ bGlobal = b; }
void SetDefaultId( sal_uInt16 n ) { nDefaultId = n; }
sal_uInt16 GetDefaultId( void ) { return nDefaultId; }
-sal_Bool IsOptional() const{ return bOpt; }
-sal_Bool IsParamArray() const{ return bParamArray; }
-sal_Bool IsWithEvents() const{ return bWithEvents; }
-sal_Bool IsWithBrackets() const{ return bWithBrackets; }
-sal_Bool IsByVal() const { return bByVal;}
-sal_Bool IsStatic() const { return bStatic; }
-sal_Bool IsNew() const{ return bNew; }
-sal_Bool IsDefinedAs() const { return bAs;}
-sal_Bool IsGlobal() const { return bGlobal; }
+bool IsOptional() const{ return bOpt; }
+bool IsParamArray() const{ return bParamArray; }
+bool IsWithEvents() const{ return bWithEvents; }
+bool IsWithBrackets() const{ return bWithBrackets; }
+bool IsByVal() const { return bByVal;}
+bool IsStatic() const { return bStatic; }
+bool IsNew() const{ return bNew; }
+bool IsDefinedAs() const { return bAs;}
+bool IsGlobal() const { return bGlobal; }
short GetFixedStringLength( void ) const { return nFixedStringLength;
}
void SetFixedStringLength( short n ) { nFixedStringLength = n; }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
Re: [Libreoffice] minutes of tech. steering call ...
On Thu, 2011-11-24 at 23:38 +0100, Bjoern Michaelsen wrote: However, we are not so much interested in interactively working with soffice in the subsequenttest. Rather than return to the 60s I'd still like to have an interactive debugger :-) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED][REVIEW] libreoffice-3-4 fix of two Windows installer bugs
Read, liked, pushed F. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of tech. steering call ...
Hi Bjoern, On Fri, 2011-11-25 at 05:56 +0100, Bjoern Michaelsen wrote: One allnigher later, its to late for opinions. Implemented with: This looks like a real improvement, that will make subsequentcheck much more useful, and me (at least) more likely to care about running it :-) Still might need some tuning (core file location for example, superfluous gdb output), but it basically works: ulimit -c unlimited make subsequentcheck I was wondering whether we could not hook the existing crash-reporter SEGV code, and dump the 'backtrace' output in a file-name pulled from an environment variable (that we could easily set in the makefile rule). But of course working from the core file we can get more information post-mortem debugging / inspection in theory. It seems like soffice.bin crashed during the test excution! Found a core dump at /mnt/striped/bjoern/.jenkins/jobs/libreoffice-master/workspace/workdir/unxlngx6.pro/JunitTest/sw_complex/user, moving it to /mnt/striped/bjoern/.jenkins/jobs/libreoffice-master/workspace/workdir/unxlngx6.pro/JunitTest/sw_complex/user/core.SfR2 [...] Lovely :-) and a hint at the full log: see full error log at /mnt/striped/bjoern/.jenkins/jobs/libreoffice-master/workspace/workdir/unxlngx6.pro/JunitTest/sw_complex/done.log make[1]: Leaving directory `/mnt/striped/bjoern/.jenkins/jobs/libreoffice-master/workspace/sw' So - (for me) the only missing piece now is the ability to quickly (ie. 12 minutes) get back to running precisely the failing test; Is it easy / possible to print a message at the end (after all this goodness) saying: run:\ncd sw; make foo_baa_sw_subsequent_check_baz_biff_boff ? :-) Thanks again for this - a really big improvement :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of tech. steering call ...
On 24/11/11 21:23, Caolán McNamara wrote: On Thu, 2011-11-24 at 16:26 +, Michael Meeks wrote: + subsequentcheck + number of ways to improve it (Caolan) the way i've always debugged it is something like: DISPLAY=:42 ./soffice --accept=pipe,name=$USER;urp; --norestore --nologo -env:UserInstallation=file:///tmp/xyz then attach gdb to soffice.bin then run subsequenttests e.g. make subsequentcheck OOO_TEST_SOFFICE=connect:pipe,name=$USER can run this in a loop as well... + Bjoern has a nice write-up of how to debug it here: i.e. sommat like a) just move that out of dev-tools into bin or solenv/bin b) tweak it to honour $COLORTERM/$TERM -e c) add a handle SIGPIPE nostop noprint pass d) get the definitely correct pid in there --- e) get the tooling to catch the disconnected error and say that LibreOffice crashed, rather than the current somewhat obscure error f) spit out a line liner to rerun the first failing test in isolation with soffice server under gdb this would of course be very useful when running the tests non-interactively such as on tinderboxes. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Bug with images in .doc with Writer
I'm sorry, I didn't know https://bugs.freedesktop.org I'm glad this bug has been fixed, and I'll wait until 12th December to download LibreOffice 3.4.5 RC1. Thank you very much! -- View this message in context: http://nabble.documentfoundation.org/Bug-with-images-in-doc-with-Writer-tp3533449p3535759.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED][PATCH] SwSelBoxes: svarray - std::map
On 24/11/11 21:35, Caolán McNamara wrote: On Thu, 2011-11-24 at 15:58 +, Caolán McNamara wrote: On Thu, 2011-11-24 at 23:19 +0900, Daisuke Nishino wrote: I'm not sure if this is related to the problem, but I found an obvious mistake. I hope this patch fixes it. I'm sorry for inconvenience. aha, excellent. That clear's the most obvious one anyway. Will see if it fixes everything, or if the remaining glitch I see is preexisting. Indeed, all looks good now. make subsequentcheck just fails now I believe because we have some conversions to assert from DBG_ASSERT or OSL_ENSURE in SwIndex::operator so -o sw.SwXTextEmbeddedObject -o sw.SwXTextEmbeddedObjects fail, which is unrelated to the table stuff. sadly i cannot reproduce this here... (am on revision 48d9feabd967f28bff8e73475f700f2ab009c4bc) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Getting some press about Citrus.
On Thu, 2011-11-24 at 21:00 -0200, Olivier Hallot wrote: It looks like, in a first glimpse, that the new UI pushes for direct formatting and not style formatting. Sure; which is IMHO not ideal, but certainly easy to use :-) It very much depends what people want really. If they want a hyper-simple UI to do simple stuff, that's fine, if code shows up that is maintainable works, we'll include it of course. Having said that: no-one is going to kill all our enterprise-users in one shot by mandating that thing for everyone :-) Personally, I'd prefer to see something that exposes more of our power features (like styles), while making that really compelling usable, so we could use the same (better) UI for all users [ but of course I'm not a UI designer; perhaps that just can't work ]. Naturally on smaller / portable device form factors, we'll need a smaller UI (as/when we have a UI there), perhaps this would be useful there; just some random thoughts :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Getting some press about Citrus.
On Fri, Nov 25, 2011 at 10:48:26AM +, Michael Meeks wrote: Having said that: no-one is going to kill all our enterprise-users in one shot by mandating that thing for everyone :-) Personally, I'd prefer to see something that exposes more of our power features (like styles), Microsoft Word had a mode where the style name for each paragraph was shown on the left of the document beeing edited. I always found that handy. -- Francois Tigeot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove unused PDP_ENDIAN defines
The attached patch removes the use of *PDP_ENDIAN* defines; besides the
two .h files in the patch, nothing uses them.
Please test it on your platform of choice, I'll commit it when I'll be sure
it doesn't break anything.
--
Francois Tigeot
From 804a0660bb66f8453f71768e4407671b2b3b1b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Tigeot?= ftig...@wolfpond.org
Date: Fri, 25 Nov 2011 10:38:14 +0100
Subject: [PATCH] PDP_ENDIAN and variants are unused.
Remove their use from the code.
---
sal/inc/osl/endian.h | 21 -
sal/osl/unx/system.h | 16
2 files changed, 0 insertions(+), 37 deletions(-)
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index 7069c3b..dace25b 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -61,8 +61,6 @@ extern C {
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif __BYTE_ORDER == __PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
#endif
@@ -76,8 +74,6 @@ extern C {
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif __BYTE_ORDER == __PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
#endif
@@ -85,13 +81,8 @@ extern C {
# include machine/endian.h
# if BYTE_ORDER == LITTLE_ENDIAN
# undef _BIG_ENDIAN
-# undef _PDP_ENDIAN
# elif BYTE_ORDER == BIG_ENDIAN
# undef _LITTLE_ENDIAN
-# undef _PDP_ENDIAN
-# elif BYTE_ORDER == PDP_ENDIAN
-# undef _LITTLE_ENDIAN
-# undef _BIG_ENDIAN
# endif
#endif
@@ -103,8 +94,6 @@ extern C {
# define _LITTLE_ENDIAN
# elif BYTE_ORDER == BIG_ENDIAN
# define _BIG_ENDIAN
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
#endif
#endif
@@ -119,8 +108,6 @@ extern C {
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
#endif
@@ -138,10 +125,6 @@ extern C {
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif BYTE_ORDER == PDP_ENDIAN
-# ifndef _PDP_ENDIAN
-# define _PDP_ENDIAN
-# endif
# endif
#endif
@@ -155,10 +138,6 @@ extern C {
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif BYTE_ORDER == PDP_ENDIAN
-# ifndef _PDP_ENDIAN
-# define _PDP_ENDIAN
-# endif
# endif
#endif
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index c8f4871..71b9b31 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -89,8 +89,6 @@
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif __BYTE_ORDER == __PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
# define IORESOURCE_TRANSFER_BSD
# define IOCHANNEL_TRANSFER_BSD_RENO
@@ -142,8 +140,6 @@
# define _LITTLE_ENDIAN_OO
# elif BYTE_ORDER == BIG_ENDIAN
# define _BIG_ENDIAN_OO
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN_OO
# endif
# define IORESOURCE_TRANSFER_BSD
# define IOCHANNEL_TRANSFER_BSD_RENO
@@ -179,8 +175,6 @@
# define _LITTLE_ENDIAN
# elif BYTE_ORDER == BIG_ENDIAN
# define _BIG_ENDIAN
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
#endif
# define NO_PTHREAD_RTL
@@ -248,8 +242,6 @@
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN
# endif
# define SLEEP_TIMESPEC(timespec)nsleep(timespec, 0)
# define LIBPATH LIBPATH
@@ -301,10 +293,6 @@
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif BYTE_ORDER == PDP_ENDIAN
-# ifndef _PDP_ENDIAN
-# define _PDP_ENDIAN
-# endif
# endif
# define IOCHANNEL_TRANSFER_BSD_RENO
# define NO_PTHREAD_RTL
@@ -341,10 +329,6 @@ int macxp_resolveAlias(char *path, int buflen);
# ifndef _BIG_ENDIAN
# define _BIG_ENDIAN
# endif
-# elif BYTE_ORDER == PDP_ENDIAN
-# ifndef _PDP_ENDIAN
-# define _PDP_ENDIAN
-# endif
# endif
# define IOCHANNEL_TRANSFER_BSD_RENO
# define NO_PTHREAD_RTL
--
1.7.6.3
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of tech. steering call ...
On Fri, Nov 25, 2011 at 09:48:22AM +, Michael Meeks wrote: So - (for me) the only missing piece now is the ability to quickly (ie. 12 minutes) get back to running precisely the failing test; Is it easy / possible to print a message at the end (after all this goodness) saying: run:\ncd sw; make foo_baa_sw_subsequent_check_baz_biff_boff ? :-) Done. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] message construction bloat ...
On Thursday 24 of November 2011, Marc-André Laverdière wrote: Can we get the c++ equivalent of logback/slf4j? I don't know what that actually means. Avoiding string concat most of the time is the better option. Not sure what you're trying to say here, but if the original data is split, then the concatenation has to happen at some level. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED] patch for a few German to English translations
Hi Mike, On Thu, 2011-11-24 at 23:56 -0800, Mike Whiteley wrote: I'm probably not doing this right, but I took a bit of time and decided to help out a bit here. It's much appreciated ! :-) thank you. Attached is a small patch for a few German to English translations for some comments. If this all goes well, I plan on doing more, but this is a test of some. Every little helps; and this looks fine (no doubt some nit picking is possible, but this is a real improvement so it's in). Please let me know if there is a more preferred way to submit these kinds of patches. This is fine; one thing that is missing is an explicit MPL/LGPLv3+ license. The preferred way to do that is to send a blanket mail to the list for all your contributions, so we can link it into: http://wiki.documentfoundation.org/Development/Developers Could you do that ? Anyhow - thanks so much for helping out, looking forward to your next patch :-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of tech. steering call ...
On Fri, Nov 25, 2011 at 08:58:06AM +, Caolán McNamara wrote: On Thu, 2011-11-24 at 23:38 +0100, Bjoern Michaelsen wrote: However, we are not so much interested in interactively working with soffice in the subsequenttest. Rather than return to the 60s ... Austin PowersYeah, Baby, yeah!/Austin Powers *SCNR*, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of tech. steering call ...
On Fri, Nov 25, 2011 at 11:20:50AM +0100, Michael Stahl wrote: the way i've always debugged it is something like: DISPLAY=:42 ./soffice --accept=pipe,name=$USER;urp; --norestore --nologo -env:UserInstallation=file:///tmp/xyz then attach gdb to soffice.bin then run subsequenttests e.g. make subsequentcheck OOO_TEST_SOFFICE=connect:pipe,name=$USER can run this in a loop as well... Feel free to add that hint to solenv/gbuild/JunitTest.mk in a concise manner. Bonus points for something like: gdb -ex at $! ... Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED][PATCH] SwSelBoxes: svarray - std::map
On Fri, 2011-11-25 at 11:32 +0100, Michael Stahl wrote: On 24/11/11 21:35, Caolán McNamara wrote: On Thu, 2011-11-24 at 15:58 +, Caolán McNamara wrote: On Thu, 2011-11-24 at 23:19 +0900, Daisuke Nishino wrote: I'm not sure if this is related to the problem, but I found an obvious mistake. I hope this patch fixes it. I'm sorry for inconvenience. aha, excellent. That clear's the most obvious one anyway. Will see if it fixes everything, or if the remaining glitch I see is preexisting. Indeed, all looks good now. make subsequentcheck just fails now I believe because we have some conversions to assert from DBG_ASSERT or OSL_ENSURE in SwIndex::operator so -o sw.SwXTextEmbeddedObject -o sw.SwXTextEmbeddedObjects fail, which is unrelated to the table stuff. sadly i cannot reproduce this here... (am on revision 48d9feabd967f28bff8e73475f700f2ab009c4bc) Hmm, easy peasy here. Some sort of CntntAnchor at a 0ed SwPosition or something of that nature. Will try and get a bt and/or find where the Anchor position gets created. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] [PATCH] More translated comments
Hi Philipp, many thanks, pushed with a few tweaks - not sure what your line numbers are referring to, the original files? Anyway, if there's a better translation, let's do the fixup iteratively. :) Cheers, -- Thorsten pgptO4rxanCu8.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Getting some press about Citrus.
HI Em 25-11-2011 08:54, Francois Tigeot escreveu: On Fri, Nov 25, 2011 at 10:48:26AM +, Michael Meeks wrote: Having said that: no-one is going to kill all our enterprise-users in one shot by mandating that thing for everyone :-) Personally, I'd prefer to see something that exposes more of our power features (like styles), Microsoft Word had a mode where the style name for each paragraph was shown on the left of the document beeing edited. I always found that handy. If you open the styles formatting window and dock it on the left, we have a similar effect. However, I agree that it could be better. If I may give a suggestion, I would start the new UI as a branch and with Math (because it is a small module and is not the most used). Also, does this new UI job consider changind VCL to something else? Regards -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Getting some press about Citrus.
On Fri, 2011-11-25 at 11:30 -0200, Olivier Hallot wrote: If I may give a suggestion, I would start the new UI as a branch and with Math (because it is a small module and is not the most used). So far, there is no-one (that I know of) working on any code-changes to make the Citrus UI happen ;-) you've just swallowed a reality distortion field created by pretty mockups. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Build failure in mysqlcppconn on Mac OSX when trying to build mysql connector
Hi all, I get this error message and build failure in mysqlcppconn when trying to build the mysql connector on Mac OSX. This used to work for me until recently, so the change must be fairly recent. I did a git pull ./g pull then make clean, even tried rebuilding directly in the module after sourcing and rm -f'ing, but no change. The error message is : Compiling: mysqlcppconn/unxmacxi.pro/misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/mysql_client_api.cpp /Users/Shared/LO/master/mysqlcppconn/unxmacxi.pro/misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp: In member function 'virtual long unsigned int sql::mysql::NativeAPI::LibmysqlDynamicProxy::real_escape_string(MYSQL*, char*, const char*, long unsigned int)': /Users/Shared/LO/master/mysqlcppconn/unxmacxi.pro/misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp:432: error: 'ptr2mysql_realescapestring' was not declared in this scope /Users/Shared/LO/master/mysqlcppconn/unxmacxi.pro/misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp:432: error: expected `;' before 'ptr2_realescapestring' /Users/Shared/LO/master/mysqlcppconn/unxmacxi.pro/misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp:434: error: 'ptr2_realescapestring' was not declared in this scope dmake: Error code 1, while making '../../../../../../unxmacxi.pro/slo/mysql_client_api.obj' dmake: Error code 255, while making './unxmacxi.pro/misc/build/so_built_so_mysqlcppconn' My autogen switch for building the connector on Mac is : --enable-ext-mysql-connector --with-libmysql-path=/Users/Shared/LO/mysql-connector-c-6.0.2-osx10.5-x86-32bit It appears that this commit might be to blame : commit 770cb8ae4d0472d8eb9b32046f5820181fb1de93Author: Lionel Elie Mamane lio...@mamane.luDate: Sun Nov 13 10:31:22 2011 +0100 Update mysqlcppcon to version 1.1.0 Help ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of tech. steering call ...
On Fri, Nov 25, 2011 at 11:20:50AM +0100, Michael Stahl wrote: DISPLAY=:42 ./soffice --accept=pipe,name=$USER;urp; --norestore --nologo -env:UserInstallation=file:///tmp/xyz instead of that monster you cant now run: make debugrun on Linux(*), which ... then attach gdb to soffice.bin ... will do that too. then run subsequenttests e.g. make subsequentcheck OOO_TEST_SOFFICE=connect:pipe,name=$USER Instead of that you can now: make subsequentcheck gb_JunitTest_DEBUGRUN=T And have one shell running gdb and the other running the test. Best, Bjoern (*) from gbuild modules or toplevel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] Remove unused PDP_ENDIAN defines
On Fri, Nov 25, 2011 at 11:59:53AM +0100, Francois Tigeot wrote: The attached patch removes the use of *PDP_ENDIAN* defines; besides the two .h files in the patch, nothing uses them. Pushed. -- Francois Tigeot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of tech. steering call ...
Hi *, On Thu, Nov 24, 2011 at 5:26 PM, Michael Meeks michael.me...@suse.com wrote: * Pending Action Items + ask Christian wrt. Mac / PPC (Fridrich) As I keep seeing this without being aware of any mail/question regarding this - Is that Christian me? I'd guess so since I run the Mac/PPC tinderbox, but... :-) So what is the question? I'm pretty sure this one can be answered via mail and doesn't need to wait for me attending the call again :-) * Release Engineering update (Petr) + 3.5.0-beta0 - coming soon, kicking the tires of the build process / stabilising + commit deadline is Monday Nov 28 (next Monday) Oh, crap - should probably nominate https://bugs.freedesktop.org/show_bug.cgi?id=42720 as blocker sooner than later... + feature freeze is 1 week later + Please check most annoying 3.5 bugs: + https://bugs.freedesktop.org/show_bug.cgi?id=37361 + Windows error / during installation + extension registration / terminal launch issues I'd suggest to add document file save to MS formats to that list. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Question about IAccessibility2
Hi all, On Thu, Nov 24, 2011 at 10:23 PM, Michael Meeks michael.me...@suse.com wrote: On Thu, 2011-11-24 at 21:20 +0100, Christophe Strobbe wrote: Those are already strings, which will be localized. I have no application to test, whether this is sufficient. But I guess it will, because otherwise people would have complained in a lot of other places where list boxes are used. :-) Just in case you would like to test this: there are two free options on Windows: I would recommend asking a friend to test this on Linux, where the accerciser tool will instantly show you whether you've got the new names right; and it is native code without any twisted java-ness. Just for information, I've Accerciser installed on my machine and am usually testing LibO with Orca, so if you need some tests, don't hesitate to ping me directly. Kind regards Sophie -- Founding member of The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of tech. steering call ...
On Fri, 2011-11-25 at 15:17 +0100, Christian Lohmaier wrote: * Pending Action Items + ask Christian wrt. Mac / PPC (Fridrich) As I keep seeing this without being aware of any mail/question regarding this - Is that Christian me? I'd guess so since I run the Mac/PPC tinderbox, but... :-) Hah :-) indeed - Fridrich just didn't show up for some weeks sadly. The question was: can you do the Mac / PPC release builds for the next release ? if not Fridrich can prolly handle them, but it'd be more ideal if that can be spread around. So what is the question? I'm pretty sure this one can be answered via mail and doesn't need to wait for me attending the call again :-) Too true :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] fdo#42286, do not shrink the selected area
Hi Pierre-André, On Thursday, 2011-11-24 22:47:56 +0100, Pierre-André Jacquod wrote: here attached an new patch (hopefully wiser) to solve the mentioned bug. This ensure that the call to ExtendDataArea does as commented in the code sc/source/core/tool/dbdata.cxx : // Extend the DB area to include data rows immediately below. and does not shrink the original area... So having a smaller area after the function is clearly wrong. If you agree, I will push it to master. Yes, that looks good, if it solves your problem then please go ahead. BUT this is a workaround, to compensate the not so correct behaviour of GetDataArea :-( I wouldn't say it's wrong unless I checked the original intention behind that code when GetDataArea() is called with bIncludeOld=false, maybe it's just the call in ExtendDataArea() that should pass true instead? About the root cause: I am still studing the code of the both mentioned functions and their integration with filters and filtered areas. Before touching it, I would like to define what should be the desired effect. Further some tests have shown me that the behaviour (regarding area) is not the same, depending if the filter is activated with Data-Filter-AutoFilter or Standard filter. I fear some parts will need to be quite overhauled. And the difference exactly is ...? Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpxdPKUpHM6E.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Blanket MPL/LGPLv3+ License
handle: protonspring real name: Michael Whiteley I hereby decree to the world that my interest in everything I have ever submitted, and anything I will ever submit to the Free Document Foundation (FDF) via libreoffice@lists.freedesktop.org is contributed to the FDF. This is an explicit license under MPL/LGPLv3+, for the FDF to do whatever they dang well please with my submission, and I make no claim to any of the intellectual property contained therein. Mike ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 41883] MinGW port Most Annoying Bugs
https://bugs.freedesktop.org/show_bug.cgi?id=41883 --- Comment #5 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2011-11-25 09:40:00 PST --- Nominate Bug 43246 - MinGW FILEOPEN FILESAVE: General Error message -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Possible little code simplification
Hello Michael, 2011/11/25 Michael Stahl mst...@redhat.com: On 24/11/11 19:07, Ivan Timofeev wrote: [...] What do you think about changing the code so that pSortedObjs will be alive every time? We will be able to return a reference to pSortedObjs in GetSortedObjs() instead of a pointer and remove the mentioned checks (there are a lot of such checks). I could do this. :-) the writer core and layout code is highly optimized, especially for 16-bit windows where memory is scarce :) Well, another possible memory optimization is to merge SwSortedObjsImpl into SwSortedObjs. What is the reason to use the pImpl pattern here? i guess for SwPageFrm it doesn't matter at all if the SwSortedObj always exists. Same problem with the field 'SwSortedObjs* pDrawObjs' in the class SwFrm. since this is the base class of all frames there will be a couple more instances of it, and most of these probably won't use pDrawObjs; would be interesting to know how much memory this would uses for a large document... Ok, there are many SwFrms in a big doc... We don't want to throw away memory. But we would use a shared between the SwFrm instances static variable for an empty list (null object), and return it in GetDrawObjects when our SwSortedObjs is dead. What do you think about it? Kind Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] MSVC class-in-class visibility (Re: Tinderbox failure, last success: 2011-11-24 15:00:56)
On Friday 25 of November 2011, ke...@suse.cz wrote: Hi folks, One of you broke the build of LibreOffice with your commit :-( Please commit and push a fix ASAP! ... c:/libreoffice/workdir/wntmsci12.pro/CxxObject/starmath/source/view.o c:/libreoffice/workdir/wntmsci12.pro/CxxObject/starmath/source/visitors.o Creating library c:/libreoffice/workdir/wntmsci12.pro/LinkTarget/Library/ism.lib and object c:/libreoffice/workdir/wntmsci12.pro/LinkTarget/Library/ism.exp ooxmlimport.o : error LNK2019: unresolved external symbol public: class rtl::OUString __thiscall oox::formulaimport::XmlStream::AttributeList::attribute(int,class rtl::OUString const )const (?attribute@AttributeList@XmlStream@formulaimport@oox@@QBE?AVOUString@rtl@@ HABV56@@Z) referenced in function private: class rtl::OUString __thiscall SmOoxmlImport::handleR(void) Hmm ... does the DLLPUBLIC stuff with MSVC not extend to everything in the scope it's applied to? (?handleR@SmOoxmlImport@@AAE?AVOUString@rtl@@XZ) ooxmlimport.o : error LNK2019: unresolved external symbol public: __thiscall oox::formulaimport::XmlStream::Tag::operator bool(void)const (??BTag@XmlStream@formulaimport@oox@@QBE_NXZ) referenced in function private: class rtl::OUString __thiscall SmOoxmlImport::handleR(void) (?handleR@SmOoxmlImport@@AAE?AVOUString@rtl@@XZ) ooxmlimport.o : error LNK2019: unresolved external symbol public: bool __thiscall oox::formulaimport::XmlStream::AttributeList::attribute(int,bool)const (?attribute@AttributeList@XmlStream@formulaimport@oox@@QBE_NH_N@Z) referenced in function private: class rtl::OUString __thiscall SmOoxmlImport::handleBorderBox(void) (?handleBorderBox@SmOoxmlImport@@AAE?AVOUString@rtl@@XZ) c:/libreoffice/workdir/wntmsci12.pro/LinkTarget/Library/smlo.dll : fatal error LNK1120: 3 unresolved externals make[1]: *** -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Spelling: Spechial - Special
Should replace all misspellings of Spechial to Special.
Spechial - Special
SPECHIAL - SPECIAL
From c73c5b0e714bec66ad386c34406568c08769446f Mon Sep 17 00:00:00 2001
From: mikew mi...@whiteley.org
Date: Fri, 25 Nov 2011 10:22:17 -0800
Subject: [PATCH] Fixed spelling: Spechial - Special
---
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(-)
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 a2226bd..1c88f91 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 ) )
-
[Libreoffice] WaE on vcl because of qt4 module
Hello, By compiling vcl module (Debian testing x86-32, WaE, debug and symbols enabled), I've got this : In file included from /usr/include/qt4/QtCore/qdatastream.h:45:0, from /usr/include/qt4/QtCore/qpair.h:45, from /usr/include/qt4/QtCore/qhash.h:49, from /home/maryline/compile-libreoffice/libo/vcl/unx/kde4/KDEXLib.hxx:35, from /home/maryline/compile-libreoffice/libo/vcl/unx/kde4/KDEData.cxx:31: /usr/include/qt4/QtCore/qscopedpointer.h: In static member function ‘static void QScopedPointerDeleterT::cleanup(T*)’: /usr/include/qt4/QtCore/qscopedpointer.h:55:5: error: declaration of ‘pointer’ shadows a global declaration [-Werror=shadow] /usr/include/qt4/QtCore/qscopedpointer.h: In static member function ‘static void QScopedPointerArrayDeleterT::cleanup(T*)’: /usr/include/qt4/QtCore/qscopedpointer.h:70:5: error: declaration of ‘pointer’ shadows a global declaration [-Werror=shadow] /usr/include/qt4/QtCore/qscopedpointer.h: In static member function ‘static void QScopedPointerPodDeleter::cleanup(void*)’: /usr/include/qt4/QtCore/qscopedpointer.h:83:47: error: declaration of ‘pointer’ shadows a global declaration [-Werror=shadow] cc1plus: all warnings being treated as errors For the moment, I disable WaE in autogen.lastrun just to compile vcl but where should I declare this pb ? Debian, qt devs, others ? Julien. -- View this message in context: http://nabble.documentfoundation.org/WaE-on-vcl-because-of-qt4-module-tp3536787p3536787.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] WaE on vcl because of qt4 module
Hi julien2412, On Friday, 2011-11-25 10:56:42 -0800, julien2412 wrote: By compiling vcl module (Debian testing x86-32, WaE, debug and symbols enabled), I've got this : In file included from /usr/include/qt4/QtCore/qdatastream.h:45:0, from /usr/include/qt4/QtCore/qpair.h:45, from /usr/include/qt4/QtCore/qhash.h:49, from /home/maryline/compile-libreoffice/libo/vcl/unx/kde4/KDEXLib.hxx:35, [...] For the moment, I disable WaE in autogen.lastrun just to compile vcl but where should I declare this pb ? Debian, qt devs, others ? What you can do in our code to get rid of the warning is to create a guard wrapper header and include that in KDEXLib.hxx instead of the original qhash.h For example see ucb/source/ucp/webdav/warnings_guard_ne_locks.h Best of course is to report it upstream so qt might fix it eventually, but unless there's some similar let's get rid of all warnings initiative that probably won't happen in near future. If you really care, the very best of course would be if you provided a patch to them that does it :) Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpnyp6uALpf6.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] solenv/bin/create-ids without outpaths
Hi, I should mention that I changed solenv/bin/create-ids such that it doesn't include */$INPATH/inc anymore, which also affects solver/$INPATH/inc, as usually one is interested in the real source and not also duplicated built and delivered stuff. If you want the old behavior back then use the --with-outpath option. workdir is always excluded. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgp3zkDzqs2TD.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Bug 35673 depends on bug 39950, which changed state. Bug 39950 Summary: Libreoffice Base crashes when trying to drag and drop or copy/paste controls in report builder. https://bugs.freedesktop.org/show_bug.cgi?id=39950 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED][PATCH] Spelling: Spechial - Special
On Fri, 2011-11-25 at 10:35 -0800, Mike Whiteley wrote: Should replace all misspellings of Spechial to Special. Spechial - Special SPECHIAL - SPECIAL Pushed, thanks for this. Reading the original spelling made me smile :-) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] windows make dev-install, was build break in smoketestoo_native : LibO_*_install-arc_en-US.zip: No such file or directory
On Fri, 2011-11-25 at 04:59 +0800, xuanyong.yang wrote: Hello! I got the following error in make dev-install . Any ideas? and I didn't make any changes in the code, just trying to build the master on winxp Yangxuanyong@mbp /cygdrive/x/lo $ /opt/lo/bin/make dev-install -o build Hmm, this is windows. I'm not altogether sure that the make dev-install suggestion makes sense for windows ? It may only makes sense for the other platforms, and to install under windows you need to explicitly run the setup or something like that inside the instsetoo_native/wntmsci*.pro/something/or/other dir I stand to be corrected there, I don't see any mention of this on http://wiki.documentfoundation.org/Development/Native_Build caolanm-tor: Is that the case ?, I mean, make dev-install isn't the right way to install a dev OOo under windows and we should have a different message at the end of the build for windows ? Or dev-install should work, and has just come unstuck here ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] windows make dev-install, was build break in smoketestoo_native : LibO_*_install-arc_en-US.zip: No such file or directory
Hmm, this is windows. I'm not altogether sure that the make dev-install suggestion makes sense for windows ? I don't think it does, no. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED][Patch] Unreachable code ?
On Wed, 2011-11-16 at 17:34 +0530, Muthu Subramanian K wrote: Hi, I have attached a trivial code removal with this mail. Marking as pushed as change is in-tree. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [SOLVED] Re: WaE on vcl because of qt4 module
Thank you for the tip Eike, I commited and pushed a patch on Master. (cf commit d2911992d9d46be3906923d3d334210aab76770f) Julien. -- View this message in context: http://nabble.documentfoundation.org/WaE-on-vcl-because-of-qt4-module-tp3536787p3537007.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] [PATCH] More translated comments
Hi Thorsten, Thanks for the additions. I was quite tired yesterday already when finishing the patch. ;) Sure, let's do the fix up like that. Cheers, Philipp On 25 November 2011 13:57, Thorsten Behrens t...@documentfoundation.org wrote: Hi Philipp, many thanks, pushed with a few tweaks - not sure what your line numbers are referring to, the original files? Anyway, if there's a better translation, let's do the fixup iteratively. :) Cheers, -- Thorsten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] more translations in VCL
Gents,
As promised ( to Michael) herewith 3 more file translations in the VCL
module many more to do..
As before (again repeating) my contributions are under LGPL3/MPL.
Cheers
--
Luc Castermans
mailto:luc.casterm...@gmail.com
From 00eab92f3d29c6cfe12e637ce555e128deb9995e Mon Sep 17 00:00:00 2001
From: Luc Castermans luc.casterm...@gmail.com
Date: Fri, 25 Nov 2011 23:13:14 +0100
Subject: [PATCH] translated comments from German to English
---
vcl/source/window/accel.cxx | 24 +++---
vcl/source/window/accmgr.cxx | 60 +++---
vcl/source/window/menu.cxx | 175 +-
3 files changed, 130 insertions(+), 129 deletions(-)
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 3fb5aab..9538774 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -50,7 +50,7 @@ typedef ::std::vector ImplAccelEntry* ImplAccelList;
class ImplAccelData
{
public:
-ImplAccelTable maKeyTable; // Fuer KeyCodes, die mit einem Code erzeugt wurden
+ImplAccelTable maKeyTable; // for keycodes, generated with a code
ImplAccelList maIdList; // Id-List
};
@@ -69,7 +69,7 @@ sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId,
size_t nCount = pList-size();
sal_uInt16 nCompareId;
-// Abpruefen, ob der erste Key groesser als der Vergleichskey ist
+// check if first key is larger then the key to compare
if ( !nCount || (nId (*pList)[ 0 ]-mnId) )
{
if ( pIndex )
@@ -77,7 +77,7 @@ sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId,
return ACCELENTRY_NOTFOUND;
}
-// Binaeres Suchen
+// Binairy search
nLow = 0;
nHigh = nCount-1;
do
@@ -188,12 +188,12 @@ ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode rKeyCode ) const
void Accelerator::ImplCopyData( ImplAccelData rAccelData )
{
-// Tabellen kopieren
+// copy table
for ( size_t i = 0, n = rAccelData.maIdList.size(); i n; ++i )
{
ImplAccelEntry* pEntry = new ImplAccelEntry( *rAccelData.maIdList[ i ] );
-// Folge-Accelerator, dann auch kopieren
+// sequence accelerator, then copy also
if ( pEntry-mpAccel )
{
pEntry-mpAccel = new Accelerator( *(pEntry-mpAccel) );
@@ -211,7 +211,7 @@ void Accelerator::ImplCopyData( ImplAccelData rAccelData )
void Accelerator::ImplDeleteData()
{
-// Accelerator-Eintraege ueber die Id-Tabelle loeschen
+// delete accelerator-entries using the id-table
for ( size_t i = 0, n = mpData-maIdList.size(); i n; ++i ) {
ImplAccelEntry* pEntry = mpData-maIdList[ i ];
if ( pEntry-mpAutoAccel ) {
@@ -254,7 +254,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode rKeyCode,
return;
}
-// Neuen Eintrag holen und fuellen
+// fetch and fill new entries
ImplAccelEntry* pEntry = new ImplAccelEntry;
pEntry-mnId= nItemId;
pEntry-maKeyCode = rKeyCode;
@@ -262,7 +262,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode rKeyCode,
pEntry-mpAutoAccel = pAutoAccel;
pEntry-mbEnabled = bEnable;
-// Ab in die Tabellen
+// now into the tables
sal_uLong nCode = rKeyCode.GetFullKeyCode();
if ( !nCode )
{
@@ -337,7 +337,7 @@ Accelerator::~Accelerator()
{
DBG_DTOR( Accelerator, NULL );
-// AccelManager benachrichtigen, das Accelrator geloescht wurde
+// inform AccelManager about deleting the Accelerator
if ( mpDel )
*mpDel = sal_True;
@@ -392,7 +392,7 @@ void Accelerator::InsertItem( const ResId rResId )
if ( nObjMask ACCELITEM_KEY )
{
-// es wird ein neuer Kontext aufgespannt
+// new context was created
RSHEADER_TYPE * pKeyCodeRes = (RSHEADER_TYPE *)GetClassRes();
ResId aResId( pKeyCodeRes, *rResId.GetResMgr());
aKeyCode = KeyCode( aResId );
@@ -463,14 +463,14 @@ Accelerator Accelerator::operator=( const Accelerator rAccel )
DBG_CHKTHIS( Accelerator, NULL );
DBG_CHKOBJ( rAccel, Accelerator, NULL );
-// Neue Daten zuweisen
+// assign new data
maHelpStr = rAccel.maHelpStr;
maCurKeyCode= KeyCode();
mnCurId = 0;
mnCurRepeat = 0;
mbIsCancel = sal_False;
-// Tabellen loeschen und kopieren
+// delete and copy tables
ImplDeleteData();
mpData-maKeyTable.Clear();
ImplCopyData( *((ImplAccelData*)(rAccel.mpData)) );
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index a14530a..85f10fb 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -69,7 +69,7 @@ sal_Bool ImplAccelManager::InsertAccel( Accelerator* pAccel )
void ImplAccelManager::RemoveAccel( Accelerator* pAccel )
{
-// Haben wir ueberhaupt eine Liste ?
+// do we have a list ?
if
Re: [Libreoffice] [REVIEWED] [PUSHED] Re: identical text for different (but close) locale at scp2/source/ooo
Hi Kaplan, 2011/11/25 Lior Kaplan kaplanl...@gmail.com: On Thu, Nov 24, 2011 at 8:28 PM, Andras Timar tima...@gmail.com wrote: Hi Kaplan, 2011/11/24 Lior Kaplan kaplanl...@gmail.com: On Thu, Nov 24, 2011 at 1:14 PM, Lior Kaplan kaplanl...@gmail.com wrote: On Thu, Nov 24, 2011 at 1:05 PM, Andras Timar tima...@gmail.com wrote: Hi Kaplan, 2011/11/24 Lior Kaplan kaplanl...@gmail.com: Hi, While translating some scp2 strings for 3.5 I notice duplicate strings which looks weird (e.g. Installs the Tamil user interface). I checked the sources and notice this is because we have two locales for Tamil: [STR_NAME_MODULE_LANGPACK_TA] en-US = Tamil [STR_DESC_MODULE_LANGPACK_TA] en-US = Installs the Tamil user interface [STR_NAME_MODULE_LANGPACK_TA_IN] en-US = Tamil [STR_DESC_MODULE_LANGPACK_TA_IN] en-US = Installs the Tamil user interface Do we really support two locales or this is a mistake? If we do support two locales, the users should have a way to differentiate between the two. We don't support ta_IN, only ta. In fact those lines could be removed from scp2 (there are more to clean up I suppose). For supported UI locales see http://opengrok.libreoffice.org/xref/core/solenv/inc/langlist.mk Good to know. I'll do the clean up and send a patch... Attaching two patches to clean the help and language pack translation strings. Also a small clean up patch for the langlist.mk file to have it sorted. Dictionary list is verified and is updated (no changes needed). Please push 0001 and 0003. In 0002 you were a bit greedy in deleting stuff. :) Save at least qtz. I would save all languages in helppack file which have an UI pack. So I don't have to remember to re-add them and translators don't have to re-translate them when a language team decides to translate the help, too. Fair enough. Attaching an updated patch instead of #0002... This time removing only languages without a translation, not without a help translation. qtz saved... ooops. Kaplan Thanks for this cleanup. I saw that you pushed it, well done. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [SOLVED] Re: WaE on vcl because of qt4 module
Just to tell I reported a bug to QT : https://bugreports.qt.nokia.com/browse/QTBUG-22908 Julien. -- View this message in context: http://nabble.documentfoundation.org/WaE-on-vcl-because-of-qt4-module-tp3536787p3537607.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Removing uses of OUString::setCharAt
Hello all,
Tonight I tried to remove some uses of setCharAt so that it can
eventually be removed, and I ran across a few cases that I would like
to get another pair of eyes on. Especially in one particular case, I
added a guard to make sure that the index was within range and I want
to make sure that it is necessary or if something more involved is
required. The patch is attached, and I remembered to add [PATCH] to
the subject this time :)
August Sodora
aug...@gmail.com
(201) 280-8138
From 6e9f990565c46f7dc46e8e3aae1a50122f3104c2 Mon Sep 17 00:00:00 2001
From: August Sodora aug...@gmail.com
Date: Sat, 26 Nov 2011 02:03:23 -0500
Subject: [PATCH] Remove uses of OUString::setCharAt
---
basic/source/sbx/sbxcurr.cxx | 10 +++---
sdext/source/pdfimport/tree/imagecontainer.cxx | 14
svl/source/misc/lngmisc.cxx |6 ++-
writerfilter/source/dmapper/ConversionHelper.cxx | 38 +++---
4 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index c227681..2a1f915 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -87,13 +87,13 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 rVal )
for ( sal_Int32 charCpyIndex = aAbsStr.getLength() - 1; nInsertIndex = nEndIndex; ++nDigitCount )
{
if ( nDigitCount == 4 )
-aBuf.setCharAt( nInsertIndex--, cDecimalSep );
+aBuf[nInsertIndex--] = cDecimalSep;
#if MAYBEFUTURE
if ( nDigitCount 4 ! ( ( nDigitCount - 4 ) % 3) )
-aBuf.setCharAt( nInsertIndex--, cThousandSep );
+aBuf[nInsertIndex--] = cThousandSep;
#endif
if ( nDigitCount initialLen )
-aBuf.setCharAt( nInsertIndex--, aAbsStr[ charCpyIndex-- ] );
+aBuf[nInsertIndex--] = aAbsStr[ charCpyIndex-- ];
else
// Handle leading 0's to right of decimal point
// Note: in VBA the stringification is a little more complex
@@ -106,10 +106,10 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 rVal )
// 0 0. 0
// 0.1 0.1000 0.1
-aBuf.setCharAt( nInsertIndex--, (sal_Unicode)'0' );
+aBuf[nInsertIndex--] = (sal_Unicode)'0';
}
if ( isNeg )
-aBuf.setCharAt( nInsertIndex, (sal_Unicode)'-' );
+aBuf[nInsertIndex] = (sal_Unicode)'-';
aAbsStr = aBuf.makeStringAndClear();
return aAbsStr;
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx
index 9be7bb5..0d0f461 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -75,16 +75,16 @@ rtl::OUString encodeBase64( const sal_Int8* i_pBuffer, const sal_uInt32 i_nBuffe
aBuf.appendAscii();
sal_uInt8 nIndex (static_castsal_uInt8((nBinary 0xFC) 18));
-aBuf.setCharAt(nBufPos, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos] = aBase64EncodeTable [nIndex];
nIndex = static_castsal_uInt8((nBinary 0x3F000) 12);
-aBuf.setCharAt(nBufPos+1, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos+1] = aBase64EncodeTable [nIndex];
nIndex = static_castsal_uInt8((nBinary 0xFC0) 6);
-aBuf.setCharAt(nBufPos+2, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos+2] = aBase64EncodeTable [nIndex];
nIndex = static_castsal_uInt8((nBinary 0x3F));
-aBuf.setCharAt(nBufPos+3, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos+3] = aBase64EncodeTable [nIndex];
}
if( nRemain 0 )
{
@@ -100,15 +100,15 @@ rtl::OUString encodeBase64( const sal_Int8* i_pBuffer, const sal_uInt32 i_nBuffe
break;
}
sal_uInt8 nIndex (static_castsal_uInt8((nBinary 0xFC) 18));
-aBuf.setCharAt(nBufPos, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos] = aBase64EncodeTable [nIndex];
nIndex = static_castsal_uInt8((nBinary 0x3F000) 12);
-aBuf.setCharAt(nBufPos+1, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos+1] = aBase64EncodeTable [nIndex];
if( nRemain == 2 )
{
nIndex = static_castsal_uInt8((nBinary 0xFC0) 6);
-aBuf.setCharAt(nBufPos+2, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos+2] = aBase64EncodeTable [nIndex];
}
}
diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx
index ca1b68a..147eee0 100644
--- a/svl/source/misc/lngmisc.cxx
+++ b/svl/source/misc/lngmisc.cxx
@@ -85,7 +85,8 @@ sal_Bool RemoveControlChars( OUString rTxt )
if (!IsControlChar( cChar ))
{
DBG_ASSERT( nCnt nSize, index out of range );
-aBuf.setCharAt( nCnt++, cChar );
+if(nCnt nSize)
+aBuf[nCnt++] = cChar;
}
}
DBG_ASSERT( nCnt == nSize,
[Libreoffice] [Bug 41883] MinGW port Most Annoying Bugs
https://bugs.freedesktop.org/show_bug.cgi?id=41883 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||41456 --- Comment #6 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2011-11-25 23:22:43 PST --- Nominate Bug 41456 - MinGW SPELL: Does not work at all, what has been fixed for MSVC -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] try to improve automatic detection for Windows building
I posted a message on cygwin mailing list about Windows registry not completely mapped by Cygwin 1.7. http://cygwin.com/ml/cygwin/2011-11/msg00397.html But what do you think about the patches I sent, especially about using regtool ? (perhaps regtool should be the only way to access Windows registry ?) Julien. -- View this message in context: http://nabble.documentfoundation.org/REVIEW-try-to-improve-automatic-detection-for-Windows-building-tp3522110p3537642.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 41883] MinGW port Most Annoying Bugs
https://bugs.freedesktop.org/show_bug.cgi?id=41883 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on|41456 | -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-qa] Java 7 in LO 3.5
Hi all, Support for Oracle's Java 7 had been enabled in Linux LO 3.5 for some time now (see http://cgit.freedesktop.org/libreoffice/core/commit/?id=549e54fb2f8113502743c443d6deadfe648dede1), and I duplicated the relevant code so that it should also be enabled in Windows LO 3.5 today (see http://cgit.freedesktop.org/libreoffice/core/commit/?id=f95052c29b076995a54b1d3f7c0becf35ebcd23f). The relevant issue is https://bugs.freedesktop.org/show_bug.cgi?id=39659 Java 1.7.0 not recognised. It would be great if people could give this a try, check that (a) an installed Java 7 is indeed detected by LO, on both Windows and Linux, and (b) there are no as-yet-undiscovered problems with the combination of LO and Java 7, on either Windows or Linux. Thanks a lot, Stephan ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 43196] PASTE SPECIAL help text in Dutch differs from actual caption on dialog
https://bugs.freedesktop.org/show_bug.cgi?id=43196 --- Comment #3 from Winfried Donkers o...@dci-electronics.nl 2011-11-25 00:15:55 PST --- (In reply to comment #2) Zonder verdere context kan ik de juiste tekst optellen niet vinden. Ik heb alle voorkomen van optellen nagekeken en geen tekst gevonden waar toevoegen zou hebben kunnen/moeten staan. Ik heb zowel in 3.4 als 3.5 gezocht en zowel de help als de gui. Ik heb in opengrok ook de tekst Optellen (Optellen) niet gevonden in de juiste context, maar hij staat wel in het 'plakken speciaal venster' onder 'bewerkingen' in versie 3.4.4 en 3.4.3 (Windows) en versie 3.4.2 (openSUSE). Kan je tekst wel vinden in de applicatie zelf (als gebruiker bedoel ik)? -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43206] FILEOPEN: RTF import regression -- MacRoman characters OK in LO 3.3 but not in LO 3.4 PPC
https://bugs.freedesktop.org/show_bug.cgi?id=43206 --- Comment #1 from sebast...@sspaeth.de sebast...@sspaeth.de 2011-11-25 00:28:26 PST --- Thanks for reporting,that should definitely being fixed. I have a good news and a bad informations. The good one first: The RTF import is currently getting some serious love, and has been redone in the current 3.5 (master) series. Regressions and improvements happen there and there are good chances that this has been fixed in the 3.5 branch. Can you test this by a) building current master or b) wait for the first 3.5 build to appear and report whether it still occurs there? The bad one is, that this is not likely to be fixed in the last release in the 3.4 branch, as the focus is now on the new RTF import code. Let us know if this is still the case with 3.5.x (or perhaps someone else can test that on current master). Just as a data point: on my Linux 3.4.4, the Mac.rtf opens just fine, showing all the characters, while the same file as .odt shows missing symbols (empty rectangles). -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43206] FILEOPEN: RTF import regression -- MacRoman characters OK in LO 3.3 but not in LO 3.4 PPC
https://bugs.freedesktop.org/show_bug.cgi?id=43206 --- Comment #2 from sebast...@sspaeth.de sebast...@sspaeth.de 2011-11-25 00:31:53 UTC --- Errata: MacRoman.odt has missing symbols with 3.4.4. on Linux. MacAnsi.odt shows up fine. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43193] Invalid view victor image in DOC
https://bugs.freedesktop.org/show_bug.cgi?id=43193 --- Comment #1 from sebast...@sspaeth.de sebast...@sspaeth.de 2011-11-25 00:34:13 PST --- Hello, thanks for reporting. Could you elaborate on what is exactly broken? I looked at both screenshots, but could not detect any flaw of difference... -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43206] FILEOPEN: RTF import regression -- MacRoman characters OK in LO 3.3 but not in LO 3.4 PPC
https://bugs.freedesktop.org/show_bug.cgi?id=43206 Cédric Bosdonnat cedric.bosdonnat@free.fr changed: What|Removed |Added CC||cedric.bosdonnat.ooo@free.f ||r, vmik...@frugalware.org --- Comment #3 from Cédric Bosdonnat cedric.bosdonnat@free.fr 2011-11-25 00:34:32 PST --- (In reply to comment #1) The RTF import is currently getting some serious love, and has been redone in the current 3.5 (master) series. Regressions and improvements happen there and there are good chances that this has been fixed in the 3.5 branch. Can you test this by a) building current master or b) wait for the first 3.5 build to appear and report whether it still occurs there? Or you could get a daily build from here: http://dev-builds.libreoffice.org/daily/ Adding myself and vmiklos to CC. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43196] PASTE SPECIAL help text in Dutch differs from actual caption on dialog
https://bugs.freedesktop.org/show_bug.cgi?id=43196 Freek de Kruijf f.de.kru...@gmail.com changed: What|Removed |Added Status|NEW |ASSIGNED --- Comment #4 from Freek de Kruijf f.de.kru...@gmail.com 2011-11-25 00:34:35 PST --- Ik ben niet zo thuis in LibreOffice dat ik op grond van de beschrijving de plaats kan vinden waar het hier over gaat. Gaarne een gedetailleerde beschrijving van hoe je in die dialoog geraakt. Welke toepassing Writer of... Klik op dat en dat en dat etc. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43206] FILEOPEN: RTF import regression -- MacRoman characters OK in LO 3.3 but not in LO 3.4 PPC
https://bugs.freedesktop.org/show_bug.cgi?id=43206 --- Comment #4 from Cédric Bosdonnat cedric.bosdonnat@free.fr 2011-11-25 01:07:23 PST --- Fixed the missing paragraph endings in master branch (future 3.5): http://cgit.freedesktop.org/libreoffice/core/commit/?id=52e6bfeb324574f2330d191c208860ddc2d532e0 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 39659] Java 1.7.0 not recognised
https://bugs.freedesktop.org/show_bug.cgi?id=39659 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added Status|NEW |ASSIGNED AssignedTo|libreoffice-b...@lists.free |sberg...@redhat.com |desktop.org | --- Comment #37 from Stephan Bergmann sberg...@redhat.com 2011-11-25 02:10:06 PST --- http://cgit.freedesktop.org/libreoffice/core/commit/?id=f95052c29b076995a54b1d3f7c0becf35ebcd23f should let current LO Windows builds (towards LO 3.5) detect Oracle's Java 7, too. It is unclear how well LO works with that Java 7, so I'll ask QA to give this a thorough test on Windows and Linux. At http://lists.freedesktop.org/archives/libreoffice/2011-November/021284.html we decided to wait with a backport to LO 3.4.5 until after QA has looked at it for LO 3.5 (although that item appears to be missing from the minutes). -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43196] PASTE SPECIAL help text in Dutch differs from actual caption on dialog
https://bugs.freedesktop.org/show_bug.cgi?id=43196 --- Comment #5 from Winfried Donkers o...@dci-electronics.nl 2011-11-25 02:13:05 PST --- (In reply to comment #4) Ik ben niet zo thuis in LibreOffice dat ik op grond van de beschrijving de plaats kan vinden waar het hier over gaat. Gaarne een gedetailleerde beschrijving van hoe je in die dialoog geraakt. Welke toepassing Writer of... Klik op dat en dat en dat etc. calc (bij aannmelding van de bug had ik spreadsheet ingevuld, er staat nu localisation en snap ik de verwarring): selecteer een cel en kies voor kopiëren, selecteer een andere cel (bestemming) en kies met de rechtermuisknop voor 'plakken speciaal', er verschijnt een dialoogvenster, links (selectie) kan je aangeven wat er geplakt moet worden, rechts(bewerking) kan je selecteren hoe hetplakken gebeurt. Bij bewerking geen wordt de bestemmingcel overschreven met wat is geselecteerd. Als je bijvoorbeeld alleen de opmaak van de broncel wilt overzetten, zonder de inhoud van de cel te wissen, slecteer je links (selectie) alleen opmaakprofielen en rechts (bewerking) toevoegen (waar nu optellen staat). Of als je juist de inhoud van de broncel wilt optellen aan de bestemmingcel, dan klik je links getallen aan. In dit ene geval is de term optellen, dus correct, in alle gevallen (incl. optellen van getallen) is de term toevoegen correct. In het helpbestand (onder plakken speciaal-bewerkingen-toevoegen en onder plakken speciaal-selectie-notities) wordt de term toevoegen gebruikt. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43188] small program that inject dll in LibreOffice Quickstarter in order to improve component start time.
https://bugs.freedesktop.org/show_bug.cgi?id=43188 --- Comment #1 from Maxime de Roucy maxime.dero...@linagora.com 2011-11-25 02:48:26 PST --- Created attachment 53845 -- https://bugs.freedesktop.org/attachment.cgi?id=53845 the exe with dll_loader_*.txt and licence file -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43188] small program that inject dll in LibreOffice Quickstarter in order to improve component start time.
https://bugs.freedesktop.org/show_bug.cgi?id=43188 --- Comment #2 from Maxime de Roucy maxime.dero...@linagora.com 2011-11-25 03:00:40 PST --- Some users seams to have problem with the GetModuleFileNameEx function. I changed it to GetProcessImageFileName but Dev-C++ can't compile it anymore since it doesn't have this function in his psapi.h. I attached a new folder with the main.cpp file ; both dll_loader_libreoffice.txt and dll_loader_openoffice.txt and licence file. In order to compile it you need to add Psapi.lib and Shlwapi.lib to the linker. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43188] small program that inject dll in LibreOffice Quickstarter in order to improve component start time.
https://bugs.freedesktop.org/show_bug.cgi?id=43188 Maxime de Roucy maxime.dero...@linagora.com changed: What|Removed |Added Attachment #53796|0 |1 is obsolete|| --- Comment #3 from Maxime de Roucy maxime.dero...@linagora.com 2011-11-25 03:02:17 PST --- Created attachment 53846 -- https://bugs.freedesktop.org/attachment.cgi?id=53846 source files -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43241] New: FILESAVE: Filesaving and Exporting fails with Files of huge size and huge names
https://bugs.freedesktop.org/show_bug.cgi?id=43241 Bug #: 43241 Summary: FILESAVE: Filesaving and Exporting fails with Files of huge size and huge names Classification: Unclassified Product: LibreOffice Version: LibO 3.4.2 release Platform: Other OS/Version: All Status: UNCONFIRMED Status Whiteboard: BSA Severity: normal Priority: medium Component: Writer AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: thomas.ko...@googlemail.com Problem description: Steps to reproduce: 1. Create a file with a lot of images to increase file size AND give it a long name 2. try to save it as (saving in the same file works) or export it 3. get error message Current behavior: saving / exporting fails Expected behavior: saving / exporting works current fix: rename with a shorter filename Platform (if different from the browser): opensuse 12.1 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
