[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 2 commits - connectivity/Library_ado.mk
connectivity/Library_ado.mk |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit c7d5e1656d52927839394509e8498ef5d8a408f5 Author: David Tardon dtar...@redhat.com Date: Sun Apr 15 08:44:49 2012 +0200 set include path properly diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index 63996f8..254ff65 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -29,6 +29,11 @@ $(eval $(call gb_Library_Library,ado)) $(eval $(call gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado)) +$(eval $(call gb_Library_set_include,ado,\ + -I$(SRCDIR)/connectivity/source/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Library_add_api,ado,\ offapi \ udkapi \ commit 59fbdb7da14cd0434b07a88bf2733c01313fb3e7 Author: David Tardon dtar...@redhat.com Date: Sun Apr 15 08:44:18 2012 +0200 have to use gb_Library_add_cxxflags for C++ lib diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index 5cb183f..63996f8 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_add_api,ado,\ )) ifeq ($(COM),GCC) -$(eval $(call gb_Library_add_cflags,ado,\ +$(eval $(call gb_Library_add_cxxflags,ado,\ -fpermissive \ )) endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c6ec7ed43b0861e1c96d62aa75b594b1dd81e315 Author: Jan Holesovsky ke...@suse.cz Date: Sun Apr 15 12:43:27 2012 +0200 findbar: Allow F3 to search next when in the find combobox. diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index de6f161..4e63eef 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -157,7 +157,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent rNEvt ) } } -if ( KEY_RETURN == nCode || (bMod1 (KEY_G == nCode)) ) +if ( KEY_RETURN == nCode || (bMod1 (KEY_G == nCode)) || (KEY_F3 == nCode) ) { Remember_Impl(GetText()); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/rtfexport.cxx |9 + 1 file changed, 9 insertions(+) New commits: commit 1d256da4dcbeb623c146e197bc20d3583d9bb3b8 Author: Miklos Vajna vmik...@suse.cz Date: Sun Apr 15 03:30:06 2012 +0200 sw: implement writing of RTF_VIEWSCALE diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 9d9cc37..d5a90ad 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -35,6 +35,8 @@ #include com/sun/star/i18n/ScriptType.hdl #include docsh.hxx +#include viewsh.hxx +#include viewopt.hxx #include ndtxt.hxx #include fmtpdsc.hxx #include section.hxx @@ -504,6 +506,13 @@ void RtfExport::ExportDocument_Impl() WriteInfo(); // Default TabSize Strm() m_pAttrOutput-m_aTabStop.makeStringAndClear().getStr() sNewLine; +// Zoom +ViewShell *pViewShell(pDoc-GetCurrentViewShell()); +if (pViewShell) +{ +Strm() OOO_STRING_SVTOOLS_RTF_VIEWSCALE; +OutULong(pViewShell-GetViewOptions()-GetZoom()); +} // Page description WritePageDescTable(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/qa writerfilter/source
sw/qa/extras/rtftok/data/fdo39053.rtf |binary sw/qa/extras/rtftok/rtftok.cxx | 21 +++ writerfilter/source/rtftok/rtfdocumentimpl.cxx | 66 + writerfilter/source/rtftok/rtfdocumentimpl.hxx |4 + writerfilter/source/rtftok/rtftokenizer.cxx|4 + 5 files changed, 74 insertions(+), 21 deletions(-) New commits: commit 385017e0f2147d2a49e36d6c44ae76a1e7600668 Author: Miklos Vajna vmik...@suse.cz Date: Sun Apr 15 14:39:27 2012 +0200 testcase for fdo#39053 diff --git a/sw/qa/extras/rtftok/data/fdo39053.rtf b/sw/qa/extras/rtftok/data/fdo39053.rtf new file mode 100644 index 000..71d2691 Binary files /dev/null and b/sw/qa/extras/rtftok/data/fdo39053.rtf differ diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx index 9fbffca..2b5146a 100644 --- a/sw/qa/extras/rtftok/rtftok.cxx +++ b/sw/qa/extras/rtftok/rtftok.cxx @@ -82,6 +82,7 @@ public: void testFdo45182(); void testFdo44176(); void testZoom(); +void testFdo39053(); CPPUNIT_TEST_SUITE(RtfModelTest); #if !defined(MACOSX) !defined(WNT) @@ -105,6 +106,7 @@ public: CPPUNIT_TEST(testFdo45182); CPPUNIT_TEST(testFdo44176); CPPUNIT_TEST(testZoom); +CPPUNIT_TEST(testFdo39053); #endif CPPUNIT_TEST_SUITE_END(); @@ -548,6 +550,25 @@ void RtfModelTest::testZoom() CPPUNIT_ASSERT_EQUAL(sal_Int16(42), nValue); } +void RtfModelTest::testFdo39053() +{ +load(fdo39053.rtf); + +uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY); +int nAsCharacter = 0; +for (int i = 0; i xDraws-getCount(); ++i) +{ +uno::Referencebeans::XPropertySet xPropertySet(xDraws-getByIndex(i), uno::UNO_QUERY); +text::TextContentAnchorType eValue; +xPropertySet-getPropertyValue(AnchorType) = eValue; +if (eValue == text::TextContentAnchorType_AS_CHARACTER) +nAsCharacter++; +} +// The image in binary format was ignored. +CPPUNIT_ASSERT_EQUAL(1, nAsCharacter); +} + CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest); CPPUNIT_PLUGIN_IMPLEMENT(); commit 5187174cd4054486100ef29125ee4a36f7e3bee3 Author: Miklos Vajna vmik...@suse.cz Date: Sun Apr 15 14:10:49 2012 +0200 fdo#39053 writerfilter: implement RTF_BIN diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index e00458d..54fdac2 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -574,34 +574,42 @@ void RTFDocumentImpl::resolve(Stream rMapper) int RTFDocumentImpl::resolvePict(bool bInline) { SvMemoryStream aStream; -int b = 0, count = 2; +SvStream *pStream = 0; -// Feed the destination text to a stream. -OString aStr = OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); -const char *str = aStr.getStr(); -for (int i = 0; i aStr.getLength(); ++i) +if (!m_pBinaryData.get()) { -char ch = str[i]; -if (ch != 0x0d ch != 0x0a) +pStream = aStream; +int b = 0, count = 2; + +// Feed the destination text to a stream. +OString aStr = OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); +const char *str = aStr.getStr(); +for (int i = 0; i aStr.getLength(); ++i) { -b = b 4; -sal_Int8 parsed = m_pTokenizer-asHex(ch); -if (parsed == -1) -return ERROR_HEX_INVALID; -b += parsed; -count--; -if (!count) -{ -aStream (char)b; -count = 2; -b = 0; +char ch = str[i]; +if (ch != 0x0d ch != 0x0a) +{ +b = b 4; +sal_Int8 parsed = m_pTokenizer-asHex(ch); +if (parsed == -1) +return ERROR_HEX_INVALID; +b += parsed; +count--; +if (!count) +{ +aStream (char)b; +count = 2; +b = 0; +} } } } +else +pStream = m_pBinaryData.get(); // Store, and get its URL. -aStream.Seek(0); -uno::Referenceio::XInputStream xInputStream(new utl::OInputStreamWrapper(aStream)); +pStream-Seek(0); +uno::Referenceio::XInputStream xInputStream(new utl::OInputStreamWrapper(pStream)); WMF_EXTERNALHEADER aExtHeader; aExtHeader.mapMode = m_aStates.top().aPicture.eWMetafile; aExtHeader.xExt = m_aStates.top().aPicture.nWidth; @@ -736,6 +744,19 @@ int RTFDocumentImpl::resolvePict(bool bInline) int RTFDocumentImpl::resolveChars(char ch) { +
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/stringutil.hxx | 10 ++ sc/source/core/data/column3.cxx| 21 + sc/source/core/data/dpoutput.cxx |3 +++ sc/source/core/tool/stringutil.cxx |3 ++- sc/source/filter/rtf/eeimpars.cxx |1 + sc/source/ui/docshell/impex.cxx|1 + 6 files changed, 30 insertions(+), 9 deletions(-) New commits: commit 5a560e4300295629592716697f13bc803bdeba3c Author: Eike Rathke er...@redhat.com Date: Sun Apr 15 14:56:55 2012 +0200 resolved fdo#48731 in CSV import do not strip leading apostrophe diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx index 66b68a2..245714f 100644 --- a/sc/inc/stringutil.hxx +++ b/sc/inc/stringutil.hxx @@ -61,6 +61,16 @@ struct SC_DLLPUBLIC ScSetStringParam */ bool mbSetTextCellFormat; +/** + * When true, treat input with a leading apostrophe / single quote special + * in that it escapes numeric or date/time input such that it is not + * interpreted and the input string is taken instead. This can be used + * during text file import so the leading apostrophe is not lost if it + * precedes a numeric value. + * Usually set mbHandleApostrophe = !mbSetTextCellFormat + */ +bool mbHandleApostrophe; + ScSetStringParam(); }; diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 8f6397e..0e48e9b 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -1234,14 +1234,19 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String rString, } else if ( cFirstChar == '\'') // 'Text { -// Cell format is not 'Text', and the first char -// is an apostrophe. Check if the input is considered a number. -String aTest = rString.Copy(1); -double fTest; -if (aParam.mpNumFormatter-IsNumberFormat(aTest, nIndex, fTest)) -// This is a number. Strip out the first char. -pNewCell = new ScStringCell(aTest); -else +bool bNumeric = false; +if (aParam.mbHandleApostrophe) +{ +// Cell format is not 'Text', and the first char +// is an apostrophe. Check if the input is considered a number. +String aTest = rString.Copy(1); +double fTest; +bNumeric = aParam.mpNumFormatter-IsNumberFormat(aTest, nIndex, fTest); +if (bNumeric) +// This is a number. Strip out the first char. +pNewCell = new ScStringCell(aTest); +} +if (!bNumeric) // This is a normal text. Take it as-is. pNewCell = new ScStringCell(rString); } diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index f903f0d..875371f 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -794,11 +794,13 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, { aParam.mbDetectNumberFormat = true; aParam.mbSetTextCellFormat = false; +aParam.mbHandleApostrophe = true; } else { aParam.mbDetectNumberFormat = false; aParam.mbSetTextCellFormat = true; +aParam.mbHandleApostrophe = false; } pDoc-SetString(nCol, nRow, nTab, rData.Caption, aParam); } @@ -836,6 +838,7 @@ void ScDPOutput::FieldCell( ScSetStringParam aParam; aParam.mbDetectNumberFormat = false; aParam.mbSetTextCellFormat = true; +aParam.mbHandleApostrophe = false; pDoc-SetString(nCol, nRow, nTab, rData.maCaption, aParam); if (bInTable) diff --git a/sc/source/core/tool/stringutil.cxx b/sc/source/core/tool/stringutil.cxx index 263e22c..a4cb4b3 100644 --- a/sc/source/core/tool/stringutil.cxx +++ b/sc/source/core/tool/stringutil.cxx @@ -39,7 +39,8 @@ using ::rtl::OUStringBuffer; ScSetStringParam::ScSetStringParam() : mpNumFormatter(NULL), mbDetectNumberFormat(true), -mbSetTextCellFormat(false) +mbSetTextCellFormat(false), +mbHandleApostrophe(true) { } diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 36ece2b..2ecf7dd 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -337,6 +337,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu aParam.mpNumFormatter = pFormatter; aParam.mbDetectNumberFormat = true; aParam.mbSetTextCellFormat = true; +aParam.mbHandleApostrophe = false; if (!aValStr.isEmpty()) mpDoc-SetValue( nCol, nRow, nTab, fVal ); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index cf51c07..f9d00ab 100644 ---
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/defnamesbuffer.cxx |8 sc/source/filter/oox/drawingmanager.cxx |6 -- sc/source/filter/oox/pivottablebuffer.cxx |9 - 3 files changed, 23 deletions(-) New commits: commit bc3f0bd3e28b2be1175db685cbb6d60de495777c Author: Tor Lillqvist t...@iki.fi Date: Sun Apr 15 15:08:50 2012 +0200 WaE: unused functions diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 9f63afc..ea767da 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -160,14 +160,6 @@ sal_Unicode lclGetBuiltinIdFromBaseName( const OUString rModelName ) return BIFF_DEFNAME_UNKNOWN; } -bool lclIsFilterDatabaseName( const OUString rModelName ) -{ -for( const sal_Char* const* ppcName = sppcFilterDbNames; ppcName STATIC_ARRAY_END( sppcFilterDbNames ); ++ppcName ) -if( rModelName.equalsIgnoreAsciiCaseAscii( *ppcName ) ) -return true; -return false; -} - OUString lclGetUpcaseModelName( const OUString rModelName ) { // TODO: i18n? diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index 8c46db1..a667e88 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -171,12 +171,6 @@ const sal_uInt16 BIFF_OBJCMO_AUTOFILL = 0x4000; /// Automatic fill forma // -inline BiffInputStream operator( BiffInputStream rStrm, ShapeAnchor rAnchor ) -{ -rAnchor.importBiffAnchor( rStrm ); -return rStrm; -} - } // namespace // diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index c203cbf..21659b1 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -210,15 +210,6 @@ const sal_Int16 BIFF_PTPAGEFIELDS_ALLITEMS = 0x7FFD; const sal_Int16 BIFF_PTDATAFIELD_PREVIOUS = 0x7FFB; const sal_Int16 BIFF_PTDATAFIELD_NEXT = 0x7FFC; -// - -OUString lclReadPivotString( const WorkbookHelper rHelper, BiffInputStream rStrm, sal_uInt16 nLen ) -{ -if( nLen == BIFF_PT_NOSTRING ) -return OUString(); -return (rHelper.getBiff() == BIFF8) ? rStrm.readUniStringBody( nLen ) : rStrm.readCharArrayUC( nLen, rHelper.getTextEncoding() ); -} - } // namespace // ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/coretext' - vcl/aqua vcl/inc
vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx | 10 +++--- vcl/inc/aqua/coretext/salcoretextlayout.hxx|4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) New commits: commit 1317fed72bef90eda11b2602557b0210a4a37516 Author: Norbert Thiebaud nthieb...@gmail.com Date: Sun Apr 15 08:08:23 2012 -0500 fix accidental virtual function overload diff --git a/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx b/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx index dce1d09..408f2b2 100644 --- a/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx +++ b/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx @@ -169,13 +169,14 @@ long CoreTextLayout::FillDXArray( long* pDXArray ) const return width; } -bool CoreTextLayout::GetBoundRect( CGContextRef context, Rectangle rVCLRect ) const +bool CoreTextLayout::GetBoundRect( SalGraphics rGraphics, Rectangle rVCLRect ) const { msgs_debug(layout,--); if ( !m_has_bound_rec ) { -CGRect bound_rect = CTLineGetImageBounds( m_line, context ); +AquaSalGraphics gr = static_castAquaSalGraphics(rGraphics); +CGRect bound_rect = CTLineGetImageBounds( m_line, gr.mrContext ); if ( !CGRectIsNull( bound_rect ) ) { m_bound_rect = Rectangle( @@ -300,7 +301,10 @@ long CoreTextLayout::GetTextWidth() const } // not needed. CoreText manage fallback directly -void CoreTextLayout::InitFont() {} +void CoreTextLayout::InitFont() const +{ +msgs_debug(layout,--); +} bool CoreTextLayout::InitGIA() const { diff --git a/vcl/inc/aqua/coretext/salcoretextlayout.hxx b/vcl/inc/aqua/coretext/salcoretextlayout.hxx index 51a9532..e427522 100644 --- a/vcl/inc/aqua/coretext/salcoretextlayout.hxx +++ b/vcl/inc/aqua/coretext/salcoretextlayout.hxx @@ -20,14 +20,14 @@ public: virtual void DrawText( SalGraphics ) const; virtual void DropGlyph( int nStart ); virtual long FillDXArray( long* pDXArray ) const; -virtual bool GetBoundRect( CGContextRef, Rectangle ) const; +virtual bool GetBoundRect( SalGraphics, Rectangle ) const; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const; virtual bool GetGlyphOutlines( SalGraphics, PolyPolyVector ) const; virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point rPos, int, sal_Int32* pGlyphAdvances, int* pCharIndexes ) const; virtual int GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const; virtual long GetTextWidth() const; -virtual void InitFont(); +virtual void InitFont() const; virtual bool LayoutText( ImplLayoutArgs ); virtual void MoveGlyph( int nStart, long nNewXPos ); virtual void Simplify( bool bIsBase ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/inc/rootfrm.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit edcf5270f0a4d6ef59fe914e41e25df494ceca54 Author: Michael Meeks michael.me...@suse.com Date: Sun Apr 15 18:45:59 2012 +0200 remove extraneous '2' diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index dc62618..85c2a07 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -114,7 +114,6 @@ class SwRootFrm: public SwLayoutFrm //Die letzte Seite wollen wir uns nicht immer muehsam zusammensuchen. SwPageFrm *pLastPage; -2 // [ Comment from the original StarOffice checkin ]: // The root takes care of the shell access. Via the document // it should be possible to get at the root frame, and thus always ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc
sc/inc/conditio.hxx |7 --- 1 file changed, 7 deletions(-) New commits: commit e7b440a0afd700cfeed5418ad85a874ecae24100 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sun Apr 15 15:04:15 2012 +0200 remove no longer used enumeration diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 2567f79..66db567 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -66,13 +66,6 @@ enum ScConditionMode SC_COND_NONE }; -enum ScConditionValType -{ -SC_VAL_VALUE, -SC_VAL_STRING, -SC_VAL_FORMULA -}; - class ScConditionalFormat; class SC_DLLPUBLIC ScConditionEntry ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - cppuhelper/source ios/qa sal/cppunittester sal/inc
cppuhelper/source/shlib.cxx|2 ++ ios/qa/sc/Makefile |2 +- ios/qa/sc/filters-test.m | 13 + sal/cppunittester/cppunittester.cxx| 17 +++-- sal/inc/cppunittester/protectorfactory.hxx |1 + 5 files changed, 24 insertions(+), 11 deletions(-) New commits: commit 8dd4fa9a102c705496aef7aca97de0818fea47db Author: Tor Lillqvist t...@iki.fi Date: Mon Apr 16 01:40:26 2012 +0200 Link with libpackage2 diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile index ea3440f..3747e38 100644 --- a/ios/qa/sc/Makefile +++ b/ios/qa/sc/Makefile @@ -39,7 +39,7 @@ SRCS = filters-test.m CFLAGS = $(SOLARINC) -LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/i18npool.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldrawinglayerlo -leditenglo -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licudata -licui18n -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc +LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/i18npool.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldrawinglayerlo -leditenglo -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licudata -licui18n -licuuc -ljpeg -ljvmfwk -llnglo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc all: $(APPDIR)/$(APP) stuff commit 2aadb6f9f4197f247373e4b54cab1461bc673981 Author: Tor Lillqvist t...@iki.fi Date: Mon Apr 16 01:40:02 2012 +0200 Add the package2 component diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index b336100..ba8ea8d 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -468,6 +468,7 @@ extern C extern void * comphelp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * filterconfig1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * fwk_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); +extern void * package2_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sfx_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * stocservices_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * i18npool_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); @@ -540,6 +541,7 @@ Reference XInterface SAL_CALL loadSharedLibComponentFactory( { libcomphelp CPPU_STRINGIFY(CPPU_ENV) .a, comphelp_component_getFactory }, { libfilterconfiglo.a, filterconfig1_component_getFactory }, { libfwklo.a, fwk_component_getFactory }, +{ libpackage2.a, package2_component_getFactory }, { libsfxlo.a, sfx_component_getFactory }, { libucb1.a, ucb_component_getFactory }, { libucpfile1.a, ucpfile_component_getFactory }, commit b20a10d5f845d0e4a4f21f360afd126c2cdacc4c Author: Tor Lillqvist t...@iki.fi Date: Mon Apr 16 01:35:30 2012 +0200 We need also unobootstrapprotector now diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile index d674098..ea3440f 100644 --- a/ios/qa/sc/Makefile +++ b/ios/qa/sc/Makefile @@ -39,7 +39,7 @@ SRCS = filters-test.m CFLAGS = $(SOLARINC) -LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/i18npool.uno lib/stocservices.uno lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo