LibreOffice Gerrit News for core on 2013-10-22
Moin! * Open changes on master for project core changed in the last 25 hours: + Related fdo#54938: Adapt supportsService ... in https://gerrit.libreoffice.org/6370 from Marcos Souza + fdo#70616: proper picture format to export docx in https://gerrit.libreoffice.org/6367 from Jacobo Aragunde Pérez + #65836- Fix for exporting image inside vml data was corrupting file. in https://gerrit.libreoffice.org/6369 from Sushil Shinde + Created an automatic lib linkage with no copy to source tree in https://gerrit.libreoffice.org/6368 from Roi Illouz + w:pict element was wrongly exported as child of w:rPr element. in https://gerrit.libreoffice.org/6366 from Sushil Shinde + remove RTL_CONSTASCII_(U)STRINGPARAM in https://gerrit.libreoffice.org/6352 from Christina Roßmanith + Name threads for debug purpose in https://gerrit.libreoffice.org/6322 from Arnaud Versini + fix for the font issue in https://gerrit.libreoffice.org/6319 from Yogesh Bharate + Fix for Chart Series Names in https://gerrit.libreoffice.org/6350 from vinaya mandke * Merged changes on master for project core changed in the last 25 hours: + i18nutil: Add new enumeration values from ICU 52 in https://gerrit.libreoffice.org/6365 from Thomas Arnhold + fdo#68849 add some header guards in https://gerrit.libreoffice.org/6364 from Thomas Arnhold + Remove GetKernPairs() with no implementation in https://gerrit.libreoffice.org/6260 from Khaled Hosny + Removed unused kerning stuff in https://gerrit.libreoffice.org/6259 from Khaled Hosny + Drop support for non-Unicode fonts in https://gerrit.libreoffice.org/6258 from Khaled Hosny * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/Library_scopencl.mk
sc/Library_scopencl.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 0dab391bdb18378ee304f56177bb572e418edaf0 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Oct 22 08:18:23 2013 +0200 missing dependency on mdds diff --git a/sc/Library_scopencl.mk b/sc/Library_scopencl.mk index cb702e8..75dcaf0 100644 --- a/sc/Library_scopencl.mk +++ b/sc/Library_scopencl.mk @@ -21,6 +21,7 @@ $(eval $(call gb_Library_use_sdk_api,scopencl)) $(eval $(call gb_Library_use_externals,scopencl,\ boost_headers \ + mdds_headers \ )) $(eval $(call gb_Library_use_libraries,scopencl,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938
--- Comment #7 from Stephan Bergmann sberg...@redhat.com ---
(In reply to comment #5)
In reportdesign, I saw a lot of uses of comhelper::existsValue:
::sal_Bool SAL_CALL OToolboxController::supportsService( const OUString
ServiceName ) throw (uno::RuntimeException)
{
return
::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
}
We want to remove this too and use cppuhelper::supportsService?
Yes, I would suggest to rewrite those supportsService member functions to use
cppuhelper::supportsService, for the sake of consistency.
(In reply to comment #6)
sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const OUString
ServiceName, const ::com::sun::star::uno::Sequence OUString
SupportedServices ) throw()
{
const OUString * pArray = SupportedServices.getConstArray();
for( sal_Int32 i = 0; i SupportedServices.getLength(); i++ )
if( pArray[i] == ServiceName )
return sal_True;
return sal_False;
}
Maybe we want to remove this too?
Yes, the static comphelper::ServiceInfoHelper::supportsService can go.
--
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-commits] core.git: unotest/source
unotest/source/cpp/filters-test.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 30823bce29b4e5007cf045e9923a2f2e749ab091 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 22 08:55:24 2013 +0200 Improve test assertion Change-Id: If1f41f9c25600199ba4fb8c2f75ddd7c8ce8c8b3 diff --git a/unotest/source/cpp/filters-test.cxx b/unotest/source/cpp/filters-test.cxx index 4aa0510..a14fa67 100644 --- a/unotest/source/cpp/filters-test.cxx +++ b/unotest/source/cpp/filters-test.cxx @@ -111,7 +111,7 @@ void FiltersTest::recursiveScan(filterStatus nExpected, sal_uInt32 nEndTime = osl_getGlobalTimer(); if (bEncrypted) -CPPUNIT_ASSERT(osl::FileBase::E_None == osl::File::remove(sTmpFile)); +CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, osl::File::remove(sTmpFile)); fprintf(stderr, %s,% SAL_PRIuUINT32\n, bRes?Pass:Fail,nEndTime-nStartTime); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: cppunit framework
Hi, On Mon, Oct 21, 2013 at 06:20:01PM -0200, José Guilherme Vanz v...@libreoffice.org wrote: has libo its own cppunit? I was thinking that it uses the old project of cppunit in the sourceforge.com Markus knows the details, but in short the new upstream is on freedesktop.org. So no, this is not our cppunit, even Debian plans to package from this tree, etc. OTOH yes, we can build our own cppunit during the build of LO, which is useful if the system cppunit is not built using debug STL, and LO is, for example. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: cppunit framework
Hey, On Mon, Oct 21, 2013 at 06:20:01PM -0200, José Guilherme Vanz v...@libreoffice.org wrote: has libo its own cppunit? I was thinking that it uses the old project of cppunit in the sourceforge.com Markus knows the details, but in short the new upstream is on freedesktop.org. So no, this is not our cppunit, even Debian plans to package from this tree, etc. OTOH yes, we can build our own cppunit during the build of LO, which is useful if the system cppunit is not built using debug STL, and LO is, for example. So more or less we are upstream now. Debian, Gentoo, Ubuntu (as Debian's downstream), Arch Linux, some BSD versions, ... already switched. We already maintained a number of patches that were not included into the upstream builds and fixed another set of problems since then. I explored different testing frameworks when we faced the decision whether to fork cppunit or switch to a different testing framework and decided that it is better to stay with cppunit. It is mature and well tested and except for a few nice to have features more or less what we need. Additionally switching testing frameworks requires to rewrite quite a large piece of our code base that is better spend improving the existing tests. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/collab/sendfunc.cxx | 14 +++---
sc/source/ui/collab/sendfunc.hxx | 14 +++---
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit e847e6758ef51cc2f2f6622c40bf6c7b0bc0cdae
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Oct 22 08:54:47 2013 +0100
fixup ScDocFunc OUString changes.
Change-Id: I2f319d9e168b2ba950c5d831163e946b52b76137
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 1ee3da7..8bf3e14 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -321,7 +321,7 @@ void ScDocFuncSend::EndListAction()
SendMessage( aOp );
}
-sal_Bool ScDocFuncSend::SetNormalString( bool o_rbNumFmtSet, const ScAddress
rPos, const String rText, sal_Bool bApi )
+sal_Bool ScDocFuncSend::SetNormalString( bool o_rbNumFmtSet, const ScAddress
rPos, const OUString rText, sal_Bool bApi )
{
ScChangeOpWriter aOp( setNormalString );
aOp.appendAddress( rPos );
@@ -404,7 +404,7 @@ bool ScDocFuncSend::ShowNote( const ScAddress rPos, bool
bShow )
return true; // needs some code auditing action
}
-bool ScDocFuncSend::SetNoteText( const ScAddress rPos, const String
rNoteText, sal_Bool bApi )
+bool ScDocFuncSend::SetNoteText( const ScAddress rPos, const OUString
rNoteText, sal_Bool bApi )
{
ScChangeOpWriter aOp( setNoteText );
aOp.appendAddress( rPos );
@@ -414,8 +414,8 @@ bool ScDocFuncSend::SetNoteText( const ScAddress rPos,
const String rNoteText,
return true; // needs some code auditing action
}
-sal_Bool ScDocFuncSend::RenameTable( SCTAB nTab, const String rName,
- sal_Bool bRecord, sal_Bool bApi )
+sal_Bool ScDocFuncSend::RenameTable( SCTAB nTab, const OUString rName,
+ sal_Bool bRecord, sal_Bool bApi )
{
ScChangeOpWriter aOp( renameTable );
aOp.appendInt( nTab );
@@ -427,14 +427,14 @@ sal_Bool ScDocFuncSend::RenameTable( SCTAB nTab, const
String rName,
}
sal_Bool ScDocFuncSend::ApplyAttributes( const ScMarkData rMark, const
ScPatternAttr rPattern,
- sal_Bool bRecord, sal_Bool bApi )
+ sal_Bool bRecord, sal_Bool bApi )
{
SAL_INFO( sc.tubes, ApplyAttributes not implemented! );
return ScDocFunc::ApplyAttributes( rMark, rPattern, bRecord, bApi );
}
-sal_Bool ScDocFuncSend::ApplyStyle( const ScMarkData rMark, const String
rStyleName,
- sal_Bool bRecord, sal_Bool bApi )
+sal_Bool ScDocFuncSend::ApplyStyle( const ScMarkData rMark, const OUString
rStyleName,
+sal_Bool bRecord, sal_Bool bApi )
{
SAL_INFO( sc.tubes, ApplyStyle not implemented! );
return ScDocFunc::ApplyStyle( rMark, rStyleName, bRecord, bApi );
diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx
index 6efeb25..5dad421 100644
--- a/sc/source/ui/collab/sendfunc.hxx
+++ b/sc/source/ui/collab/sendfunc.hxx
@@ -33,7 +33,7 @@ public:
virtual voidEnterListAction( sal_uInt16 nNameResId );
virtual voidEndListAction();
-virtual sal_BoolSetNormalString( bool o_rbNumFmtSet, const ScAddress
rPos, const String rText, sal_Bool bApi );
+virtual sal_BoolSetNormalString( bool o_rbNumFmtSet, const ScAddress
rPos, const OUString rText, sal_Bool bApi );
virtual bool SetValueCell( const ScAddress rPos, double fVal, bool
bInteraction );
virtual bool SetStringCell( const ScAddress rPos, const OUString rStr,
bool bInteraction );
virtual bool SetEditCell( const ScAddress rPos, const EditTextObject
rStr, bool bInteraction );
@@ -43,14 +43,14 @@ public:
const ScAddress rPos, const OUString rText, bool bInterpret, bool
bEnglish,
bool bApi, const formula::FormulaGrammar::Grammar eGrammar );
virtual boolShowNote( const ScAddress rPos, bool bShow = true );
-virtual boolSetNoteText( const ScAddress rPos, const String
rNoteText, sal_Bool bApi );
-virtual sal_BoolRenameTable( SCTAB nTab, const String rName, sal_Bool
bRecord, sal_Bool bApi );
+virtual boolSetNoteText( const ScAddress rPos, const OUString
rNoteText, sal_Bool bApi );
+virtual sal_BoolRenameTable( SCTAB nTab, const OUString rName,
sal_Bool bRecord, sal_Bool bApi );
virtual sal_BoolApplyAttributes( const ScMarkData rMark, const
ScPatternAttr rPattern,
-sal_Bool bRecord, sal_Bool bApi );
-virtual sal_BoolApplyStyle( const ScMarkData rMark, const String
rStyleName,
-sal_Bool bRecord, sal_Bool bApi );
+ sal_Bool bRecord, sal_Bool bApi );
+virtual sal_BoolApplyStyle( const ScMarkData rMark, const OUString
rStyleName,
+sal_Bool bRecord, sal_Bool bApi );
virtual sal_Bool
[Libreoffice-commits] core.git: 3 commits - sw/source
sw/source/core/layout/atrfrm.cxx |1 -
sw/source/core/layout/laycache.cxx |4 ++--
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
sw/source/filter/ww8/wrtww8.hxx |2 +-
sw/source/ui/chrdlg/break.cxx|1 -
5 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 80d4770ee093531d619df65b7f8260e7a05823b5
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 22 10:02:28 2013 +0200
DocxAttributeOutput: comment wanted to refer to boost::none
Change-Id: Ia3ecac669f35c57467e62c777e18d176753fdb0e
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f010a7c..c5a80a4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3911,7 +3911,7 @@ void DocxAttributeOutput::SectionPageNumbering(
sal_uInt16 nNumType, ::boost::op
FastAttributeList* pAttr = m_pSerializer-createAttrList();
-// -1 means no restart: then don't output that attribute if it is negative
+// boost::none means no restart: then don't output that attribute if it is
negative
if ( oPageRestartNumber )
pAttr-add( FSNS( XML_w, XML_start ), OString::number(
oPageRestartNumber.get() ) );
commit 9585faa059a880111d797cfd0b0c2d32baec2ce2
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 22 10:01:39 2013 +0200
rFollowDesc - aFollowDesc, it's not a reference
Change-Id: I1dd5626a1ff8d8209003a7c4e6df05d01fd7c7d9
diff --git a/sw/source/core/layout/laycache.cxx
b/sw/source/core/layout/laycache.cxx
index 5a525763..2bb2a792 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -626,8 +626,8 @@ bool SwLayHelper::CheckInsertPage()
{
pDesc = rpPage-GetPageDesc()-GetFollow();
-SwFmtPageDesc rFollowDesc( pDesc );
-oPgNum = rFollowDesc.GetNumOffset();
+SwFmtPageDesc aFollowDesc( pDesc );
+oPgNum = aFollowDesc.GetNumOffset();
if ( oPgNum )
((SwRootFrm*)rpPage-GetUpper())-SetVirtPageNum(sal_True);
}
commit 8b5f059ed097635758684b64decd59d8d5c499d7
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 22 10:00:02 2013 +0200
boost::optional default ctor uses boost::none already
Change-Id: I14b1a0987f18acab2f309ba423a4f31dd34211f5
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index e5b1ac6..8fc790c 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -559,7 +559,6 @@ SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc rCpy )
SwFmtPageDesc::SwFmtPageDesc( const SwPageDesc *pDesc )
: SfxPoolItem( RES_PAGEDESC ),
SwClient( (SwPageDesc*)pDesc ),
-oNumOffset( boost::none ),
nDescNameIdx( 0x ), // IDX_NO_VALUE
pDefinedIn( 0 )
{
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 5506b4e..36892f6 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -155,7 +155,7 @@ struct WW8_SepInfo
::boost::optionalsal_uInt16 oPgRestartNo;
WW8_SepInfo()
-: pPageDesc(0), pSectionFmt(0), pPDNd(0), pNumNd(0),
nLnNumRestartNo(0), oPgRestartNo(boost::none)
+: pPageDesc(0), pSectionFmt(0), pPDNd(0), pNumNd(0), nLnNumRestartNo(0)
{}
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 37fa66c..d865d57 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -133,7 +133,6 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell rS )
: SvxStandardDialog(pParent, BreakDialog,
modules/swriter/ui/insertbreak.ui)
, rSh(rS)
, nKind(0)
-, oPgNum(boost::none)
, bHtmlMode(0 != ::GetHtmlMode(rS.GetView().GetDocShell()))
{
get(m_pLineBtn, linerb);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/firebird
external/firebird/ExternalPackage_firebird.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit b0f00d38254eca70e196e1580faac4a215bc2b12 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 22 10:05:14 2013 +0200 Copy fbembed library to instdir Change-Id: I2923ec4c5f0516fb3048622dc3e74692ef7a5959 diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk index 6419c30..6eaaf1c 100644 --- a/external/firebird/ExternalPackage_firebird.mk +++ b/external/firebird/ExternalPackage_firebird.mk @@ -12,12 +12,12 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,firebird,firebird)) $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) ifeq ($(OS)-$(COM),WNT-MSC) -$(eval $(call gb_ExternalPackage_add_file,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll)) +$(eval $(call gb_ExternalPackage_add_library_for_install,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll)) $(eval $(call gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird/bin/ifbembed.lib)) else ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2)) +$(eval $(call gb_ExternalPackage_add_library_for_intsall,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2)) else -$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2)) +$(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2)) $(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so.2.5.2)) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/tools tools/source
include/tools/string.hxx|1
tools/source/rc/rc.cxx | 44 +++
tools/source/string/strucvt.cxx | 63
3 files changed, 43 insertions(+), 65 deletions(-)
New commits:
commit 5d9889070846e2e0d1d836ecf867590ebee7c027
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 21 19:57:45 2013 +0100
move ResId::toString
Change-Id: I287a92de9ae30255990595263c3302d753fdbccf
diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx
index af2cc3d..f3e966d 100644
--- a/tools/source/rc/rc.cxx
+++ b/tools/source/rc/rc.cxx
@@ -18,7 +18,7 @@
*/
#include string.h
-
+#include rtl/ustrbuf.hxx
#include tools/date.hxx
#include tools/time.hxx
#include tools/rc.hxx
@@ -78,4 +78,46 @@ Date::Date( const ResId rResId ) : nDate(0)
SetDay( (sal_uInt16)pResMgr-ReadShort() );
}
+OUString ResId::toString() const
+{
+SetRT( RSC_STRING );
+ResMgr* pResMgr = GetResMgr();
+
+if ( !pResMgr || !pResMgr-GetResource( *this ) )
+{
+OUString sRet;
+
+#if OSL_DEBUG_LEVEL 0
+sRet = OUStringBuffer().
+append(resource id ).
+append(static_castsal_Int32(GetId())).
+append( not found).
+makeStringAndClear();
+#endif
+
+if( pResMgr )
+pResMgr-PopContext();
+
+return sRet;
+}
+
+// String loading
+RSHEADER_TYPE * pResHdr = (RSHEADER_TYPE*)pResMgr-GetClass();
+
+sal_Int32 nStringLen = rtl_str_getLength( (char*)(pResHdr+1) );
+OUString sRet((const char*)(pResHdr+1), nStringLen, RTL_TEXTENCODING_UTF8);
+
+sal_uInt32 nSize = sizeof( RSHEADER_TYPE )
++ sal::static_int_cast sal_uInt32 (nStringLen) + 1;
+nSize += nSize % 2;
+pResMgr-Increment( nSize );
+
+ResHookProc pImplResHookProc = ResMgr::GetReadStringHook();
+if ( pImplResHookProc )
+sRet = pImplResHookProc(sRet);
+return sRet;
+}
+
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx
index be8c72d..916eb04 100644
--- a/tools/source/string/strucvt.cxx
+++ b/tools/source/string/strucvt.cxx
@@ -55,48 +55,4 @@ UniString UniString::Assign( const OUString rStr )
return *this;
}
-#include rtl/ustrbuf.hxx
-#include tools/rc.hxx
-#include tools/rcid.h
-
-OUString ResId::toString() const
-{
-SetRT( RSC_STRING );
-ResMgr* pResMgr = GetResMgr();
-
-if ( !pResMgr || !pResMgr-GetResource( *this ) )
-{
-OUString sRet;
-
-#if OSL_DEBUG_LEVEL 0
-sRet = OUStringBuffer().
-append(resource id ).
-append(static_castsal_Int32(GetId())).
-append( not found).
-makeStringAndClear();
-#endif
-
-if( pResMgr )
-pResMgr-PopContext();
-
-return sRet;
-}
-
-// String loading
-RSHEADER_TYPE * pResHdr = (RSHEADER_TYPE*)pResMgr-GetClass();
-
-sal_Int32 nStringLen = rtl_str_getLength( (char*)(pResHdr+1) );
-OUString sRet((const char*)(pResHdr+1), nStringLen, RTL_TEXTENCODING_UTF8);
-
-sal_uInt32 nSize = sizeof( RSHEADER_TYPE )
-+ sal::static_int_cast sal_uInt32 (nStringLen) + 1;
-nSize += nSize % 2;
-pResMgr-Increment( nSize );
-
-ResHookProc pImplResHookProc = ResMgr::GetReadStringHook();
-if ( pImplResHookProc )
-sRet = pImplResHookProc(sRet);
-return sRet;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit b2e954e300f51120387a55bf237cafdcd40ed7e6
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 21 19:56:01 2013 +0100
Related: fdo#38838 remove UniString::UniString(const ResId)
Change-Id: Id881fe3f9c7c89a7bcc1a5d8f653e18494ffa913
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 3933595..9efa5d7 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -101,7 +101,6 @@ private:
UniString Append( const UniString rStr );
public:
UniString();
-UniString( const ResId rResId );
UniString( const UniString rStr );
UniString( const OUString rStr );
~UniString();
diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx
index 9ed5a20..be8c72d 100644
--- a/tools/source/string/strucvt.cxx
+++ b/tools/source/string/strucvt.cxx
@@ -59,25 +59,6 @@ UniString UniString::Assign( const OUString rStr )
#include tools/rc.hxx
#include tools/rcid.h
-UniString::UniString( const ResId rResId )
-: mpData(NULL)
-{
-OUString sStr(rResId.toString());
-
-OSL_ENSURE(sStr.pData-length STRING_MAXLEN,
- Overflowing OUString - UniString cut to zero length);
-
-if (sStr.pData-length STRING_MAXLEN)
-{
-mpData = reinterpret_cast UniStringData * (sStr.pData);
-STRING_ACQUIRE((STRING_TYPE *)mpData);
-}
-else
-{
-
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #96 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=b2e954e300f51120387a55bf237cafdcd40ed7e6 Related: fdo#38838 remove UniString::UniString(const ResId) The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 Caolán McNamara caol...@redhat.com changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |caol...@redhat.com |desktop.org | -- 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-commits] core.git: bin/lo-generate-source-tarball
bin/lo-generate-source-tarball |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7a6043c20b1df3ed90341d9d079a16d385ccca4b
Author: Andras Timar andras.ti...@collabora.com
Date: Tue Oct 22 11:03:33 2013 +0200
typo: s/helcontent2/helpcontent2/
Change-Id: Ie3d94cef7570f943c1e07ef2a6b239df26be04bb
diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball
index cbaace5..06d5da4 100755
--- a/bin/lo-generate-source-tarball
+++ b/bin/lo-generate-source-tarball
@@ -144,7 +144,7 @@ git archive --format=tar --prefix=${base_name?} -o
${OUT_DIR}/${base_name}.ta
concatenate_list=
-for module in dictionaries helcontent2 translations ; do
+for module in dictionaries helpcontent2 translations ; do
if [ ! -f ${module?}/.git ] ; then
echo Warning: module $module is not present 12
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - config_host.mk.in configure.ac mysqlc/Extension_mysql-connector-ooo.mk mysqlc/Library_mysqlc.mk mysqlcppconn/Library_mysqlcppconn.mk mysqlc/s
config_host.mk.in |3 ++
configure.ac| 43 +---
mysqlc/Extension_mysql-connector-ooo.mk |6
mysqlc/Library_mysqlc.mk|2 +
mysqlc/source/mysqlc_driver.cxx | 23 -
mysqlc/source/mysqlc_driver.hxx |4 ++
mysqlcppconn/Library_mysqlcppconn.mk|1
7 files changed, 76 insertions(+), 6 deletions(-)
New commits:
commit f4d728ab649f0f743e09a744a63565f1cbdf6e88
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Sat Oct 19 22:57:40 2013 +0200
fdo#70496 revert to using libmysqlclient
Change-Id: I5b98b5e7840e4f1c6005aee0c1f43ef814ecf77b
Reviewed-on: https://gerrit.libreoffice.org/6353
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/config_host.mk.in b/config_host.mk.in
index 9268c7b..175bab3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -322,6 +322,9 @@ export MARIADBC_MICRO=@MARIADBC_MICRO@
export MARIADBC_MINOR=@MARIADBC_MINOR@
export MARIADB_CFLAGS=$(gb_SPACE)@MARIADB_CFLAGS@
export MARIADB_LIBS=$(gb_SPACE)@MARIADB_LIBS@
+export LIBMARIADB=@LIBMARIADB@
+export LIBMARIADB_PATH=@LIBMARIADB_PATH@
+export BUNDLE_MARIADB=@BUNDLE_MARIADB@
export MD5SUM=@MD5SUM@
export MDDS_CPPFLAGS=$(gb_SPACE)@MDDS_CPPFLAGS@
export MERGELIBS=@MERGELIBS@
diff --git a/configure.ac b/configure.ac
index 4084f3a..fc52cb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1399,6 +1399,11 @@ AC_ARG_WITH(system-mariadb,
extension.]),,
[with_system_mariadb=$with_system_libs])
+AC_ARG_ENABLE(bundle-mariadb,
+AS_HELP_STRING([--enable-bundle-mariadb],
+[When using MariaDB/MySQL libraries already on system, bundle them
with the MariaDB Connector/LibreOffice extension.])
+)
+
AC_ARG_WITH(system-mysql-cppconn,
AS_HELP_STRING([--with-system-mysql-cppconn],
[Use MySQL C++ Connector libraries already on system.]),,
@@ -7631,11 +7636,12 @@ if test $ENABLE_MARIADBC = YES; then
if test $with_system_mariadb = yes; then
AC_MSG_RESULT([external])
SYSTEM_MARIADB=YES
-AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
+#AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
if test -z $MARIADBCONFIG; then
AC_PATH_PROG(MARIADBCONFIG, [mysql_config])
if test -z $MARIADBCONFIG; then
-AC_MSG_ERROR([mariadb_config and mysql_config are missing.
Install MariaDB or MySQL package.])
+#AC_MSG_ERROR([mariadb_config and mysql_config are missing.
Install MariaDB or MySQL package.])
+AC_MSG_ERROR([mysql_config is missing. Install MySQL client
library development package.])
fi
fi
AC_MSG_CHECKING([MariaDB version])
@@ -7648,10 +7654,36 @@ if test $ENABLE_MARIADBC = YES; then
fi
AC_MSG_CHECKING([for MariaDB Client library])
MARIADB_CFLAGS=`$MARIADBCONFIG --cflags`
-MARIADB_LIBS=`$MARIADBCONFIG --libs`
-AC_MSG_RESULT([includes $MARIADB_CFLAGS, libraries $MARIADB_LIBS])
+MARIADB_LIBS=`$MARIADBCONFIG --libs_r`
+AC_MSG_RESULT([includes '$MARIADB_CFLAGS', libraries '$MARIADB_LIBS'])
+AC_MSG_CHECKING([whether to bundle the MySQL/MariaDB client library])
+if test $enable_bundle_mariadb = yes; then
+AC_MSG_RESULT([yes])
+BUNDLE_MARIADB=YES
+LIBMARIADB=lib$(echo ${MARIADB_LIBS} | sed -e
's/[[[:space:]]]\+-l/\n/g' | grep -E '(mysqlclient|mariadb)')
+if test $_os = Darwin; then
+LIBMARIADB=${LIBMARIADB}.dylib
+elif test $_os = WINNT; then
+LIBMARIADB=${LIBMARIADB}.dll
+else
+LIBMARIADB=${LIBMARIADB}.so
+fi
+LIBMARIADB_PATH=$($MARIADBCONFIG --variable=pkglibdir)
+AC_MSG_CHECKING([for $LIBMARIADB in $LIBMARIADB_PATH])
+if test -e $LIBMARIADB_PATH/$LIBMARIADB; then
+AC_MSG_RESULT([found.])
+PathFormat $LIBMARIADB_PATH
+LIBMARIADB_PATH=$formatted_path
+else
+AC_MSG_ERROR([not found.])
+fi
+else
+AC_MSG_RESULT([no])
+BUNDLE_MARIADB=NO
+fi
else
AC_MSG_RESULT([internal])
+AC_MSG_ERROR([libmariadb is known to be broken as of 2013-10; use
libmysqlclient])
SYSTEM_MARIADB=NO
MARIADB_CFLAGS=-I${WORKDIR}/UnpackedTarball/mariadb/include
MARIADB_LIBS=-L${OUTDIR}/lib -lmariadblib
@@ -7661,6 +7693,9 @@ if test $ENABLE_MARIADBC = YES; then
AC_SUBST(SYSTEM_MARIADB)
AC_SUBST(MARIADB_CFLAGS)
AC_SUBST(MARIADB_LIBS)
+AC_SUBST(LIBMARIADB)
+AC_SUBST(LIBMARIADB_PATH)
+AC_SUBST(BUNDLE_MARIADB)
AC_LANG_PUSH([C++])
dnl ===
diff --git
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - writerfilter/source
writerfilter/source/dmapper/GraphicHelpers.cxx | 23 +++
writerfilter/source/dmapper/GraphicHelpers.hxx | 11 ++-
writerfilter/source/dmapper/GraphicImport.cxx | 12 ++--
3 files changed, 35 insertions(+), 11 deletions(-)
New commits:
commit 8e2b91cc93a3a1e68ba53a68ffe83b02a4377030
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue May 21 15:56:12 2013 +0200
map docx line alignment properly to writer's line-of-text align (bnc#820792)
Apparently the top/bottom line of text alignment in writer is backwards
compared to all others, while alignment to the top of a page puts
an object's top edge at the top of the page, top of line of text
puts the object on top of the line (i.e. bottom edge of the object
at the line). The handling of NS_rtf::LN_YAlign suggests that swapping
bottom and top in the input filter is the right way of handling this.
Change-Id: I916c8ea0f2fd00de3e17b16b31433c9b6ba92e64
(cherry picked from commit 007f2dcf166838540ed945c55fe48a944e95610a)
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx
b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 4564f3a..9a259b9 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -134,6 +134,29 @@ void PositionHandler::lcl_sprm( Sprm )
{
}
+sal_Int16 PositionHandler::orientation() const
+{
+if( m_nRelation == text::RelOrientation::TEXT_LINE )
+{ // It appears that to 'line of text' alignment is backwards to other
alignments,
+ // 'top' meaning putting on top of the line instead of having top at the
line.
+if( m_nOrient == text::VertOrientation::TOP )
+return text::VertOrientation::BOTTOM;
+else if( m_nOrient == text::VertOrientation::BOTTOM )
+return text::VertOrientation::TOP;
+}
+return m_nOrient;
+}
+
+sal_Int16 PositionHandler::relation() const
+{
+return m_nRelation;
+}
+
+sal_Int32 PositionHandler::position() const
+{
+return m_nPosition;
+}
+
void PositionHandler::setPositionOffset(const OUString sText, bool vertical)
{
if( vertical )
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx
b/writerfilter/source/dmapper/GraphicHelpers.hxx
index f60da10..e3e4be6 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -39,14 +39,15 @@ public:
static void setPositionOffset(const OUString sText, bool vertical);
static void setAlignH(const OUString sText);
static void setAlignV(const OUString sText);
-
-sal_Int16 m_nOrient;
-sal_Int16 m_nRelation;
-sal_Int32 m_nPosition;
-
+sal_Int16 orientation() const;
+sal_Int16 relation() const;
+sal_Int32 position() const;
private:
virtual void lcl_attribute( Id aName, Value rVal );
virtual void lcl_sprm( Sprm rSprm );
+sal_Int16 m_nOrient;
+sal_Int16 m_nRelation;
+sal_Int32 m_nPosition;
static int savedPositionOffsetV, savedPositionOffsetH;
static int savedAlignV, savedAlignH;
};
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 302f66d..a6c6295 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1235,9 +1235,9 @@ void GraphicImport::lcl_sprm(Sprm rSprm)
pProperties-resolve( *pHandler );
if( !m_pImpl-bUseSimplePos )
{
-m_pImpl-nHoriRelation = pHandler-m_nRelation;
-m_pImpl-nHoriOrient = pHandler-m_nOrient;
-m_pImpl-nLeftPosition = pHandler-m_nPosition;
+m_pImpl-nHoriRelation = pHandler-relation();
+m_pImpl-nHoriOrient = pHandler-orientation();
+m_pImpl-nLeftPosition = pHandler-position();
}
}
}
@@ -1252,9 +1252,9 @@ void GraphicImport::lcl_sprm(Sprm rSprm)
pProperties-resolve( *pHandler );
if( !m_pImpl-bUseSimplePos )
{
-m_pImpl-nVertRelation = pHandler-m_nRelation;
-m_pImpl-nVertOrient = pHandler-m_nOrient;
-m_pImpl-nTopPosition = pHandler-m_nPosition;
+m_pImpl-nVertRelation = pHandler-relation();
+m_pImpl-nVertOrient = pHandler-orientation();
+m_pImpl-nTopPosition = pHandler-position();
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Caolán McNamara caol...@redhat.com changed: What|Removed |Added Depends on||70750 -- 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-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source
oox/source/drawingml/chart/typegroupconverter.cxx | 19 +++
1 file changed, 19 insertions(+)
New commits:
commit 59f17072a0999c83293a0497132fc08dfd7d3f5e
Author: Muthu Subramanian sumu...@collabora.com
Date: Tue Oct 22 14:47:56 2013 +0530
n#839727: Chart missing dataset.
This was because there is no explicit category
in the chart - while libreoffice expects it.
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx
b/oox/source/drawingml/chart/typegroupconverter.cxx
index 7b72fd4..164abb0 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -270,6 +270,7 @@ Reference XCoordinateSystem
TypeGroupConverter::createCoordinateSystem()
Reference XLabeledDataSequence TypeGroupConverter::createCategorySequence()
{
+sal_Int32 nMaxValues = 0;
Reference XLabeledDataSequence xLabeledSeq;
/* Find first existing category sequence. The bahaviour of Excel 2007 is
different to Excel 2003, which always used the category sequence of the
@@ -281,6 +282,24 @@ Reference XLabeledDataSequence
TypeGroupConverter::createCategorySequence()
SeriesConverter aSeriesConv( *this, **aIt );
xLabeledSeq = aSeriesConv.createCategorySequence( CREATE_OUSTRING(
categories ) );
}
+else if( nMaxValues = 0 (*aIt)-maSources.has( SeriesModel::VALUES
) )
+{
+DataSourceModel *pValues = (*aIt)-maSources.get(
SeriesModel::VALUES ).get();
+if( pValues-mxDataSeq.is() )
+nMaxValues = pValues-mxDataSeq.get()-maData.size();
+}
+}
+/* n#839727 Create Category Sequence when none are found */
+if( !xLabeledSeq.is() mrModel.maSeries.size() 0 ) {
+if( nMaxValues 0 )
+nMaxValues = 2;
+SeriesModel aModel = mrModel.maSeries.create();
+DataSourceModel aSrc = aModel.maSources.create(
SeriesModel::CATEGORIES );
+DataSequenceModel aSeq = aSrc.mxDataSeq.create();
+for( sal_Int32 i = 0; i nMaxValues; i++ )
+aSeq.maData[ i ] = OUString::number( i + 1 );
+SeriesConverter aSeriesConv( *this, aModel );
+xLabeledSeq = aSeriesConv.createCategorySequence( categories );
}
return xLabeledSeq;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/chart/seriesconverter.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e5f24e0c7c8f4799223c19359f4228f0b1a71461
Author: Muthu Subramanian sumu...@collabora.com
Date: Tue Oct 22 15:13:41 2013 +0530
n#839727: Crash fix.
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx
b/oox/source/drawingml/chart/seriesconverter.cxx
index cc05567..1b56fef 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -660,7 +660,8 @@ Reference XDataSeries SeriesConverter::createDataSeries(
const TypeGroupConve
{
// Use number format code from Value series
DataSourceModel* pValues = mrModel.maSources.get(
SeriesModel::VALUES ).get();
-xLabels-maNumberFormat.maFormatCode =
pValues-mxDataSeq-maFormatCode;
+if( pValues )
+xLabels-maNumberFormat.maFormatCode =
pValues-mxDataSeq-maFormatCode;
}
DataLabelsConverter aLabelsConv( *this, *xLabels );
aLabelsConv.convertFromModel( xDataSeries, rTypeGroup );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: bibisect/bibisect.cfg bibisect/build.sh bibisect/Makefile
bibisect/Makefile |7 ++-
bibisect/bibisect.cfg |4 +++-
bibisect/build.sh | 32 ++--
3 files changed, 31 insertions(+), 12 deletions(-)
New commits:
commit 7e9a2976cdfa0adee9b077e73acf78fed6be380e
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Tue Oct 22 11:37:29 2013 +0200
bibisect update tweaks
Change-Id: I9016e8351036f4b0edcd52fc7fa29d68cc43e903
diff --git a/bibisect/Makefile b/bibisect/Makefile
index 79f6102..e2899bf 100755
--- a/bibisect/Makefile
+++ b/bibisect/Makefile
@@ -33,6 +33,7 @@ BINREPO:=$(WORKDIR)/binrepo
BUILDDIR:=$(WORKDIR)/build
ARTIFACTDIR:=$(WORKDIR)/artifact
ORDERMODE?=master
+SHELL:=/bin/bash
ifeq ($(ORDERMODE),master)
SOURCETYPE:=hash
@@ -90,7 +91,11 @@ endif
ifeq ($(ORDERMODE),tags)
$(WORKDIR)/buildorder: $(WORKDIR)/init
- git --git-dir=$(SOURCEREPO) tag|grep ^libreoffice|sed -e
's/\./-/g'|paste - (git --git-dir=$(SOURCEREPO) tag|grep
^libreoffice)|sort|cut -f2 $@
+ git --git-dir=$(SOURCEREPO) tag|grep ^libreoffice|sed -e
's/\./-/g'|paste - (git --git-dir=$(SOURCEREPO) tag|grep
^libreoffice)|sort|cut -f2| \
+ awk \
+ 'BEGIN { last=$@ } \
+ { current=$(WORKDIR)/milestone/ $$0; printf %s:
%s\n, current, last; last = current} \
+ END { printf $(TO): %s\nall: $(TO), last }' $@
endif
diff --git a/bibisect/bibisect.cfg b/bibisect/bibisect.cfg
index d7c5106..fc997a2 100644
--- a/bibisect/bibisect.cfg
+++ b/bibisect/bibisect.cfg
@@ -1,6 +1,8 @@
-FROM:=libreoffice-3-5-branch-point
+#FROM:=8450a99c
+FROM:=8450a99c
TO:=master
INTERVAL:=64
+ORDERMODE:=master
WORKDIR:=$(HOME)/bibisect
SOURCEREPO:=$(WORKDIR)/source/.git
diff --git a/bibisect/build.sh b/bibisect/build.sh
index 4242722..c1747e4 100755
--- a/bibisect/build.sh
+++ b/bibisect/build.sh
@@ -81,17 +81,19 @@ fi
cat EOF autogen.lastrun
--disable-dependency-tracking
---disable-mozilla
---disable-binfilter
--disable-linkoo
+--disable-option-checking
--without-junit
--without-help
--without-myspell-dicts
--without-doxygen
+--disable-gnome-vfs
+--disable-odk
+--without-system-jpeg
--with-external-tar=`readlink -f ${BUILDDIR}/../tarfiles`
EOF
-export CCACHE_DIR=`readlink -f ${BUILDDIR}/../ccache`
+export CCACHE_DIR=`readlink -f /root/ccache`
export CCACHE_BASEDIR=`readlink -f .`
#export CCACHE_PREFIX=distcc
#export DISTCC_HOSTS=localhost/8 192.168.0.103/8 192.168.0.98/16
@@ -109,17 +111,27 @@ echo second try: ${ARTIFACTDIR}/make.log 21
make ${ARTIFACTDIR}/make.log 21
make dev-install ${ARTIFACTDIR}/dev-install.log 21
echo second try: ${ARTIFACTDIR}/make.log 21
-make dev-install ${ARTIFACTDIR}/dev-install.log 21
+make dev-install ${ARTIFACTDIR}/dev-install.log 21
+
# shelve away the ccache, just in case
ccache -s ${ARTIFACTDIR}/ccache.log
#mkdir -p ../ccaches
#cp -a ${CCACHE_DIR} ../ccaches/ccache-`git log -1 --pretty=format:%H`
-if test -n `find . -name opt -type d`
+#pwd
+#echo ${BUILDDIR}
+if test -d ${BUILDDIR}/solver/unxlngx6.pro/installation/opt
then
-mv `find . -name opt -type d` ${ARTIFACTDIR}/opt
-if test -f ${ARTIFACTDIR}/opt/program/soffice
-then
-exit 0
-fi
+echo found install
+cp -a ${BUILDDIR}/solver/unxlngx6.pro/installation/opt ${ARTIFACTDIR}/opt
+else
+echo no install found
+fi
+if test ! -f ${ARTIFACTDIR}/opt/program/soffice.bin
+then
+cp -a `find . -name instdir -type d`/unxlngx6.pro ${ARTIFACTDIR}/opt
+fi
+if test -f ${ARTIFACTDIR}/opt/program/soffice.bin
+then
+exit 0
fi
exit 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] voting.git: include/evilsedhack
include/evilsedhack |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f7206af01641cae0e531f88253a17d64e092b2f7 Author: Thorsten Behrens t...@documentfoundation.org Date: Tue Oct 22 12:08:08 2013 +0200 Remove protocol from stylesheet links some more. Forgot the php pages it seems. diff --git a/include/evilsedhack b/include/evilsedhack index 14181fd..5e30061 100755 --- a/include/evilsedhack +++ b/include/evilsedhack @@ -2,7 +2,7 @@ PAGE=$1 ROOT=$2 -sed s,head,headmeta http-equiv=\Content-Type\ content=\text/html; charset=UTF-8\ /link rel=\stylesheet\ type=\text/css\ href=\http://www.documentfoundation.org/themes/tdf/css/layout.css?m=1300292397\/link rel=\stylesheet\ type=\text/css\ href=\http://www.documentfoundation.org/themes/tdf/css/typography.css?m=1292094211\/link rel=\stylesheet\ type=\text/css\ href=\http://www.documentfoundation.org/themes/tdf/css/form.css?m=1305575430\/link rel=\icon\ href=\http://www.documentfoundation.org/favicon.ico\/,i;s,body,body xmlns=\http://www.w3.org/1999/xhtml\;div id=\BgContainer\div id=\Container\div id=\Header\h1The Document Foundation/h1pThe home of LibreOffice/p/divdiv class=\clear\!-- --/divdiv id=\Layout\,i;s,\/body/,//,g $PAGE +sed s,head,headmeta http-equiv=\Content-Type\ content=\text/html; charset=UTF-8\ /link rel=\stylesheet\ type=\text/css\ href=\//www.documentfoundation.org/themes/tdf/css/layout.css?m=1300292397\/link rel=\stylesheet\ type=\text/css\ href=\//www.documentfoundation.org/themes/tdf/css/typography.css?m=1292094211\/link rel=\stylesheet\ type=\text/css\ href=\//www.documentfoundation.org/themes/tdf/css/form.css?m=1305575430\/link rel=\icon\ href=\//www.documentfoundation.org/favicon.ico\/,i;s,body,body xmlns=\//www.w3.org/1999/xhtml\div id=\BgContainer\div id=\Container\div id=\Header\h1The Document Foundation/h1pThe home of LibreOffice/p/divdiv class=\clear\!-- --/divdiv id=\Layout\,i;s,\/body/,//,g $PAGE cat -FOOT div id=Footer ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 148 +--
1 file changed, 98 insertions(+), 50 deletions(-)
New commits:
commit 5e094619364dce3e575d2edcf7c68dcec701c44e
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu May 23 16:32:44 2013 +0200
improve exporting of picture alignment to docx
Basing this on anchoring is wrong, as SwFmt{Hori/Vert}Orient seems to
provide
everything. Also try avoid hardcoding position if possible.
Change-Id: I880bc5c3eeabdde9e52c0c16d1033e44e203a8a3
(cherry picked from commit 9413f2124dff0c38fd52d318d5ac2f392a7d36e0)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d7c008f..59440f5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2192,65 +2192,113 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
m_pSerializer-singleElementNS( XML_wp, XML_simplePos, XML_x, 0,
XML_y, 0, FSEND ); // required, unused
const char* relativeFromH;
const char* relativeFromV;
-switch( pFrmFmt-GetAnchor().GetAnchorId())
+const char* alignH = NULL;
+const char* alignV = NULL;
+switch (pFrmFmt-GetVertOrient().GetRelationOrient() )
{
-case FLY_AT_PAGE:
-relativeFromV = relativeFromH = page;
+case text::RelOrientation::PAGE_PRINT_AREA:
+relativeFromV = margin;
break;
-case FLY_AT_PARA:
-relativeFromH = column;
+case text::RelOrientation::PAGE_FRAME:
+relativeFromV = page;
+break;
+case text::RelOrientation::FRAME:
relativeFromV = paragraph;
break;
-case FLY_AT_CHAR:
+case text::RelOrientation::TEXT_LINE:
default:
-// We apply the same conversion that we do in import
-// (see writerfilter/source/dmapper/GraphicHelper.cxx)
-switch (pFrmFmt-GetVertOrient().GetRelationOrient() )
-{
-case text::RelOrientation::PAGE_PRINT_AREA:
-relativeFromV = margin;
-break;
-case text::RelOrientation::PAGE_FRAME:
-relativeFromV = page;
-break;
-case text::RelOrientation::FRAME:
-relativeFromV = paragraph;
-break;
-case text::RelOrientation::TEXT_LINE:
-default:
-relativeFromV = line;
-}
-switch (pFrmFmt-GetHoriOrient().GetRelationOrient() )
-{
-case text::RelOrientation::PAGE_PRINT_AREA:
-relativeFromH = margin;
-break;
-case text::RelOrientation::PAGE_FRAME:
-relativeFromH = page;
-break;
-case text::RelOrientation::CHAR:
-relativeFromH = character;
-break;
-case text::RelOrientation::FRAME:
-default:
-relativeFromH = column;
-}
+relativeFromV = line;
+break;
+}
+switch (pFrmFmt-GetVertOrient().GetVertOrient() )
+{
+case text::VertOrientation::TOP:
+case text::VertOrientation::CHAR_TOP:
+case text::VertOrientation::LINE_TOP:
+if( pFrmFmt-GetVertOrient().GetRelationOrient() ==
text::RelOrientation::TEXT_LINE)
+alignV = bottom;
+else
+alignV = top;
+break;
+case text::VertOrientation::BOTTOM:
+case text::VertOrientation::CHAR_BOTTOM:
+case text::VertOrientation::LINE_BOTTOM:
+if( pFrmFmt-GetVertOrient().GetRelationOrient() ==
text::RelOrientation::TEXT_LINE)
+alignV = top;
+else
+alignV = bottom;
+break;
+case text::VertOrientation::CENTER:
+case text::VertOrientation::CHAR_CENTER:
+case text::VertOrientation::LINE_CENTER:
+alignV = center;
+break;
+default:
+break;
+}
+switch (pFrmFmt-GetHoriOrient().GetRelationOrient() )
+{
+case text::RelOrientation::PAGE_PRINT_AREA:
+relativeFromH = margin;
+break;
+case text::RelOrientation::PAGE_FRAME:
+relativeFromH = page;
+break;
+case text::RelOrientation::CHAR:
+relativeFromH = character;
+
[Libreoffice-commits] core.git: qadevOOo/tests
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java | 60
+-
1 file changed, 32 insertions(+), 28 deletions(-)
New commits:
commit ee337e7ed61d1ee6fe37520eed30805329c44fb6
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 22 12:24:31 2013 +0200
Try make this more robust in slow environments
...where the previous .uno:PrintPreview request has not yet been processed,
the
same way it had been made more robust for ScAccessiblePageHeader.java in
5b5c52a3a4d048bba8c18dfb06ffca25c670d099 Try make this more robust in slow
environments plus b5dd2b4218f966e177d880bcc29fa5fba3bfe1c1 Also cope with
intermittend DisposedExceptions.
Change-Id: I4b0ca00c04c2b1c8ffbfe4aaf926305ee9b51f30
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
index 0419b9e..e9fea34 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
@@ -38,6 +38,7 @@ import com.sun.star.frame.XController;
import com.sun.star.frame.XDispatch;
import com.sun.star.frame.XDispatchProvider;
import com.sun.star.frame.XModel;
+import com.sun.star.lang.DisposedException;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sheet.XSpreadsheet;
@@ -118,8 +119,6 @@ public class ScAccessiblePreviewHeaderCell extends TestCase
{
*/
protected synchronized TestEnvironment
createTestEnvironment(TestParameters Param,
PrintWriter
log) {
-XInterface oObj = null;
-
if (xSheetDoc != null) {
XComponent oComp = UnoRuntime.queryInterface(
XComponent.class, xSheetDoc);
@@ -241,20 +240,37 @@ public class ScAccessiblePreviewHeaderCell extends
TestCase {
throw new StatusException(Status.failed(Couldn't change mode));
}
-shortWait();
-
-AccessibilityTools at = new AccessibilityTools();
-
-XWindow xWindow = AccessibilityTools.getCurrentWindow(
(XMultiServiceFactory) Param.getMSF(), xModel);
-XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
-
-oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot,
AccessibleRole.TABLE, A);
-
-if (oObj == null) {
-log.println(Version with a fixed #103863#);
-oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot,
- AccessibleRole.TABLE_CELL,
- true);
+XInterface oObj = null;
+for (int i = 0;; ++i) {
+try {
+Thread.sleep(500);
+} catch (InterruptedException e) {
+throw new RuntimeException(e);
+}
+try {
+XAccessible xRoot = AccessibilityTools.getAccessibleObject(
+AccessibilityTools.getCurrentWindow(
+(XMultiServiceFactory) Param.getMSF(), xModel));
+if (xRoot != null) {
+oObj = AccessibilityTools.getAccessibleObjectForRole(
+xRoot, AccessibleRole.TABLE, A);
+if (oObj == null) {
+log.println(Version with a fixed #103863#?);
+oObj = AccessibilityTools.getAccessibleObjectForRole(
+xRoot, AccessibleRole.TABLE_CELL, true);
+}
+if (oObj != null) {
+break;
+}
+}
+} catch (DisposedException e) {
+log.println(Ignoring DisposedException);
+}
+if (i == 20) { // give up after 10 sec
+throw new RuntimeException(
+Couldn't get AccessibleRolte.TABLE/TABLE_CELL object);
+}
+log.println(No TABLE/TABLE_CELL found yet, retrying);
}
log.println(ImplementationName + utils.getImplName(oObj));
@@ -269,16 +285,4 @@ public class ScAccessiblePreviewHeaderCell extends
TestCase {
return tEnv;
}
-
-/**
-* Sleeps for 0.5 sec. to allow StarOffice to react on code
-* reset/code call.
-*/
-private void shortWait() {
-try {
-Thread.sleep(500);
-} catch (InterruptedException e) {
-System.out.println(While waiting : + e);
-}
-}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/objxtor.cxx |1 - sfx2/source/inc/objshimp.hxx |1 - 2 files changed, 2 deletions(-) New commits: commit c82a36f9c7d89fa434d3dff896c290964326f5bf Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 22 12:25:42 2013 +0200 Remove unused SfxObjectShell_Impl::bIsTmp Change-Id: I4040d4758a3753c2177aa2a7d3dba6c85b089b25 diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 8c0e0f9..154ed3f 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -223,7 +223,6 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell _rDocShell ) ,bClosing( sal_False) ,bIsSaving( sal_False) ,bPasswd( sal_False) -,bIsTmp( sal_False) ,bIsNamedVisible( sal_False) ,bIsTemplate(sal_False) ,bIsAbortingImport ( sal_False) diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index 3db5353..9c396d1 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -71,7 +71,6 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess bClosing:1, // sal_True while Close(), to prevent recurrences Notification bIsSaving:1, bPasswd:1, -bIsTmp:1, bIsNamedVisible:1, bIsTemplate:1, bIsAbortingImport:1, // Import operation should be canceled. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #8 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Marcos Paulo de Souza committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=ee5661ecd3bbeae38b04cd3f582a320a231d11bd fdo#54938: Adapt supportsService implementations.. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - oox/source
oox/source/drawingml/chart/seriesconverter.cxx|3 ++-
oox/source/drawingml/chart/typegroupconverter.cxx | 19 +++
2 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 812a175d736cf32aa756408b0d7906cd269d2a03
Author: Muthu Subramanian sumu...@collabora.com
Date: Tue Oct 22 15:13:41 2013 +0530
n#839727: Crash fix.
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx
b/oox/source/drawingml/chart/seriesconverter.cxx
index 9ef1f3f..020b141 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -632,7 +632,8 @@ Reference XDataSeries SeriesConverter::createDataSeries(
const TypeGroupConve
{
// Use number format code from Value series
DataSourceModel* pValues = mrModel.maSources.get(
SeriesModel::VALUES ).get();
-xLabels-maNumberFormat.maFormatCode =
pValues-mxDataSeq-maFormatCode;
+if( pValues )
+xLabels-maNumberFormat.maFormatCode =
pValues-mxDataSeq-maFormatCode;
}
DataLabelsConverter aLabelsConv( *this, *xLabels );
aLabelsConv.convertFromModel( xDataSeries, rTypeGroup );
commit 1cd5bef6fd9edef708334e3590c57c6aa6f1371f
Author: Muthu Subramanian sumu...@collabora.com
Date: Tue Oct 22 14:47:56 2013 +0530
n#839727: Chart missing dataset.
This was because there is no explicit category
in the chart - while libreoffice expects it.
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx
b/oox/source/drawingml/chart/typegroupconverter.cxx
index 12d086d..bf8e166 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -272,6 +272,7 @@ Reference XCoordinateSystem
TypeGroupConverter::createCoordinateSystem()
Reference XLabeledDataSequence TypeGroupConverter::createCategorySequence()
{
+sal_Int32 nMaxValues = 0;
Reference XLabeledDataSequence xLabeledSeq;
/* Find first existing category sequence. The bahaviour of Excel 2007 is
different to Excel 2003, which always used the category sequence of the
@@ -283,6 +284,24 @@ Reference XLabeledDataSequence
TypeGroupConverter::createCategorySequence()
SeriesConverter aSeriesConv( *this, **aIt );
xLabeledSeq = aSeriesConv.createCategorySequence( categories );
}
+else if( nMaxValues = 0 (*aIt)-maSources.has( SeriesModel::VALUES
) )
+{
+DataSourceModel *pValues = (*aIt)-maSources.get(
SeriesModel::VALUES ).get();
+if( pValues-mxDataSeq.is() )
+nMaxValues = pValues-mxDataSeq.get()-maData.size();
+}
+}
+/* n#839727 Create Category Sequence when none are found */
+if( !xLabeledSeq.is() mrModel.maSeries.size() 0 ) {
+if( nMaxValues 0 )
+nMaxValues = 2;
+SeriesModel aModel = mrModel.maSeries.create();
+DataSourceModel aSrc = aModel.maSources.create(
SeriesModel::CATEGORIES );
+DataSequenceModel aSeq = aSrc.mxDataSeq.create();
+for( sal_Int32 i = 0; i nMaxValues; i++ )
+aSeq.maData[ i ] = OUString::number( i + 1 );
+SeriesConverter aSeriesConv( *this, aModel );
+xLabeledSeq = aSeriesConv.createCategorySequence( categories );
}
return xLabeledSeq;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/lo.xcconfig.in ios/MobileLibreOffice
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |8
ios/lo.xcconfig.in|2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 073ee020d01da56906ab1d40a3688a372f423fb2
Author: Roi Illouz roi.ill...@cloudon.com
Date: Tue Oct 22 13:46:35 2013 +0300
emantic name changing fro LO_LDFLAGS to LINK_LDFLAGS
Change-Id: Iee16bd0d774a9c24834a2a0882d301a9255d7bd9
Reviewed-on: https://gerrit.libreoffice.org/6372
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 5ba311a..48aea55 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -453,7 +453,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript =
dest_lib=$LO_BUILDDIR/ios/lib\ndest_resource=resource_link\nproduct_ver=`sed
-ne 's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p'
$LO_BUILDDIR/config_host.mk`\nbuildid=`(cd $LO_SRCDIR git log -1
--format=%H)`\n\nrm -rf $dest_lib $dest_resource\nmkdir -p $dest_lib
$dest_resource\n\n# Libs #\nfor file in $LO_OUTDIR/lib/*.a
$LO_INSTDIR/program/*.a $LO_WORKDIR/LinkTarget/StaticLibrary/*.a
$LO_WORKDIR/UnpackedTarball/*/.libs/*.a
$LO_WORKDIR/UnpackedTarball/*/src/.libs/*.a
$LO_WORKDIR/UnpackedTarball/*/src/*/.libs/*.a
$LO_WORKDIR/UnpackedTarball/openssl/*.a; do\nln -f $file
$dest_lib/${file##*/}\ndone\n\n# Populate lo.xcconfig\nflags=-L$dest_lib\nfor
lib in $dest_lib/lib*.a; do\nbase=${lib##*/lib}\nbase=${base%\\.a}\n
flags+=\ -l${base}\\ndone\n\nfile=../lo.xcconfig\nsed -i '' -e
\s|^\\(LO_LDFLAGS =\\).*$|\\1 $flags|\ $file\n\n# Resources #\nmkdir -p
$dest_resource/ure\n\n# copy rdb files\ncp $LO_OUTDIR/bin/offapi.rdb
$dest_resou
rce\ncp $LO_OUTDIR/bin/udkapi.rdb $dest_resource\ncp
$LO_OUTDIR/bin/oovbaapi.rdb$dest_resource\ncp
$LO_INSTDIR/program/services/services.rdb $dest_resource\ncp
$LO_INSTDIR/ure/share/misc/services.rdb$dest_resource/ure\n\n# copy .res
files\n# program/resource is hardcoded in tools/source/rc/resmgr.cxx. Sure,\n#
we could set STAR_RESOURCE_PATH instead. sigh...\nmkdir -p
$dest_resource/program/resource\ncp $LO_INSTDIR/program/resource/*en-US.res
$dest_resource/program/resource\n\n# soffice.cfg\nmkdir -p
$dest_resource/share/config\ncp -R $LO_INSTDIR/share/config/soffice.cfg
$dest_resource/share/config\n\n# \registry\\ncp -R
$LO_INSTDIR/share/registry $dest_resource/share\n\n# Set up rc, the
\inifile\. See getIniFileName_Impl().\nfile=$dest_resource/rc\necho
'[Bootstrap]'$file\necho
'URE_BOOTSTRAP=file://$APP_DATA_DIR/fundamentalrc' $file\necho
'HOME=$APP_DATA_DIR/tmp'
$file\n\n# Set up fundamentalrc, unorc, bootstraprc and
versionrc.\n# Do we really need all
these?\nfile=$dest_resource/fundamentalrc\necho '[Bootstrap]'
$file\necho 'BRAND_BASE_DIR=file://$APP_DATA_DIR'
$file\necho
'CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry
res:${BRAND_BASE_DIR}/registry' $file\n\nfile=$dest_resource/unorc\necho
'[Bootstrap]' $file\n\n# bootstraprc must be in
$BRAND_BASE_DIR/program\nmkdir -p
$dest_resource/program\nfile=$dest_resource/program/bootstraprc\necho
'[Bootstrap]'
$file\necho 'InstallMode=installmode'
$file\necho \ProductKey=LibreOffice $product_ver\
$file\necho
'UserInstallation=file://$APP_DATA_DIR/../Library/Application%20Support'
$file\n\n# Is this really needed?\nfile=$dest_resource/program/
versionrc\necho '[Version]' $file\necho 'AllLanguages=en-US'
$file\necho 'BuildVersion=' $file\necho \buildid=$buildid\
$file\necho 'ProductMajor=360' $file\necho 'ProductMinor=1'
$file\n ;
+ shellScript =
dest_lib=$LO_BUILDDIR/ios/lib\ndest_resource=resource_link\nproduct_ver=`sed
-ne 's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p'
$LO_BUILDDIR/config_host.mk`\nbuildid=`(cd $LO_SRCDIR git log -1
--format=%H)`\n\nrm -rf $dest_lib $dest_resource\nmkdir -p $dest_lib
$dest_resource\n\n# Libs #\nfor file in $LO_OUTDIR/lib/*.a
$LO_INSTDIR/program/*.a $LO_WORKDIR/LinkTarget/StaticLibrary/*.a
$LO_WORKDIR/UnpackedTarball/*/.libs/*.a
$LO_WORKDIR/UnpackedTarball/*/src/.libs/*.a
$LO_WORKDIR/UnpackedTarball/*/src/*/.libs/*.a
$LO_WORKDIR/UnpackedTarball/openssl/*.a; do\nln -f $file
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - solenv/bin
solenv/bin/modules/installer/windows/feature.pm |1 +
1 file changed, 1 insertion(+)
New commits:
commit 978c83321ac9d5a66ecf2c82b4ade7b3c673b622
Author: Andras Timar andras.ti...@collabora.com
Date: Sat Oct 12 10:00:51 2013 -0700
fdo#33798 msidbFeatureAttributesUIDisallowAbsent for hidden feat.
Change-Id: I0c8788f88b3c219e789af7f8bfa79e5dd31c5b3a
diff --git a/solenv/bin/modules/installer/windows/feature.pm
b/solenv/bin/modules/installer/windows/feature.pm
index 602beaf..f360337 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -179,6 +179,7 @@ sub get_feature_attributes
if ( $onefeature-{'ParentID'} ) { $parentgid = $onefeature-{'ParentID'};
}
if (( $parentgid eq ) || ( $parentgid eq
$installer::globals::rootmodulegid )) { $attributes = 8; }
+elsif ( get_feature_display($onefeature) eq 0 ) { $attributes = 26; }
# fdo#33798
else { $attributes = 10; }
return $attributes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39428] audit / remove SvStream long operators
https://bugs.freedesktop.org/show_bug.cgi?id=39428 --- Comment #17 from Keith McRae keithco...@gmail.com --- Hi Julien Sorry for the delay in replying. I'm currently involved in some projects that are eating up all of my time. I'm not sure when I'll be able to get back to it to be honest. Kind regards Keith On Sat, Sep 14, 2013 at 10:29 AM, bugzilla-dae...@freedesktop.org wrote: Julien Nabet serval2...@yahoo.fr changed bug 39428https://bugs.freedesktop.org/show_bug.cgi?id=39428 What Removed Added CC serval2...@yahoo.fr *Comment # 15 https://bugs.freedesktop.org/show_bug.cgi?id=39428#c15on bug 39428 https://bugs.freedesktop.org/show_bug.cgi?id=39428 from Julien Nabet serval2...@yahoo.fr * Keith: any update here? -- You are receiving this mail because: - You are on the CC list for the bug. - You are the assignee for the bug. -- 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-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - editeng/source include/unotools oox/source sd/source sw/source unotools/source vcl/generic vcl/source
editeng/source/items/textitem.cxx |4 +---
include/unotools/fontdefs.hxx |9 +
oox/source/export/drawingml.cxx |2 +-
sd/source/filter/eppt/pptx-text.cxx |2 +-
sw/source/core/txtnode/fntcache.cxx | 17 +
sw/source/filter/ww8/writerhelper.cxx |8
sw/source/filter/ww8/writerhelper.hxx | 12
sw/source/filter/ww8/writerwordglue.cxx |2 +-
sw/source/filter/ww8/wrtw8num.cxx |5 +++--
unotools/source/misc/fontcvt.cxx|2 +-
unotools/source/misc/fontdefs.cxx |8
vcl/generic/fontmanager/fontsubst.cxx |7 +++
vcl/generic/glyphs/gcach_ftyp.cxx |8 ++--
vcl/source/filter/wmf/wmfwr.cxx |6 --
vcl/source/gdi/metaact.cxx |6 +++---
vcl/source/gdi/outdev3.cxx |3 +--
16 files changed, 51 insertions(+), 50 deletions(-)
New commits:
commit 08472b22d101a7b9e61a937e1f2c5b6e3e43cb8c
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jun 7 11:31:05 2013 +0200
ugly workaround for external leading with symbol fonts (bnc#823626)
I'd much rather find the code using external leading in Writer's layout,
but this font rendering and layout stuff is so complicated.
Change-Id: Iaf58af387a6727eb18f5a9d1613de3ae30d7c35e
(cherry picked from commit 85f892a3a1dbaa3c36ac3f31186eef1ec0eea464)
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index 80b2ea8..2468f18 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -379,6 +379,23 @@ sal_uInt16 SwFntObj::GetFontLeading( const ViewShell *pSh,
const OutputDevice r
bSymbol = RTL_TEXTENCODING_SYMBOL == aMet.GetCharSet();
GuessLeading( *pSh, aMet );
nExtLeading = static_castsal_uInt16(aMet.GetExtLeading());
+/* HACK: There is something wrong with Writer's bullet rendering,
causing lines
+ with bullets to be higher than they should be. I think this is
because
+ Writer uses font's external leading incorrect, as the vertical
distance
+ added to every line instead of only a distance between multiple
lines,
+ which means a single bullet has external leading added even
though it
+ shouldn't, but frankly this is just an educated guess rather
than understanding
+ Writer's layout (heh).
+ Symbol font in some documents is 'StarSymbol; Arial Unicode
MS', and Windows
+ machines often do not have StarSymbol, falling back to Arial
Unicode MS, which
+ has unusually high external leading. So just reset external
leading for fonts
+ which are used to bullets, as those should not be used on
multiple lines anyway,
+ so in correct rendering external leading should be irrelevant
anyway.
+ Interestingly enough, bSymbol is false for 'StarSymbol; Arial
Unicode MS', so
+ also check explicitly.
+*/
+if( bSymbol || IsStarSymbol( pPrtFont-GetName()))
+nExtLeading = 0;
}
const IDocumentSettingAccess rIDSA =
*pSh-getIDocumentSettingAccess();
commit f91c9e418f76cd254cabe7f6180f444a4e6ebb4c
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue May 28 10:53:03 2013 +0200
Make use of IsStarSymbol()
Reviewed-on: https://gerrit.libreoffice.org/4077
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
(cherry picked from commit 8079f40743f86c4f7e6c9af8393ff699378a0797)
Conflicts:
editeng/source/items/textitem.cxx
sd/source/filter/eppt/pptx-text.cxx
vcl/generic/glyphs/gcach_ftyp.cxx
Change-Id: I7a2e3a6f11bbaaaff50e8163e4ce3e2583b1d03c
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index c026f1d..f9f342e 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -373,9 +373,7 @@ SfxPoolItem* SvxFontItem::Clone( SfxItemPool * ) const
SvStream SvxFontItem::Store( SvStream rStrm , sal_uInt16 /*nItemVersion*/ )
const
{
-sal_Bool bToBats =
-GetFamilyName().EqualsAscii( StarSymbol, 0, sizeof(StarSymbol)-1 )
||
-GetFamilyName().EqualsAscii( OpenSymbol, 0, sizeof(OpenSymbol)-1 );
+sal_Bool bToBats = IsStarSymbol( GetFamilyName() );
rStrm (sal_uInt8) GetFamily() (sal_uInt8) GetPitch()
(sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL :
GetSOStoreTextEncoding(GetCharSet()));
diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx
index 60c37d4..d1bf777 100644
--- a/include/unotools/fontdefs.hxx
+++ b/include/unotools/fontdefs.hxx
@@ -90,6 +90,15 @@ UNOTOOLS_DLLPUBLIC OUString GetNextFontToken( const
OUString rTokenStr, sal_Int
UNOTOOLS_DLLPUBLIC void GetEnglishSearchFontName(
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt |1 + instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt |1 + 2 files changed, 2 insertions(+) New commits: commit 83c5d9f401c7cfd21eeddc7040a98886cc30a3df Author: Andras Timar ati...@suse.com Date: Mon Apr 29 22:08:13 2013 +0200 property REINSTALL should be set only when we apply a PATCH with 11dd1094cb5452a8b61ad6bd284ba9517d3d869a I introduced REINSTALL=ALL in the Property table, because without this MSP patches did not work as expected -- some files were not patched. I found The file represented by File table key 'foo.bar' has no eligible binary patches lines in the log, and I did not find a better solution. I'll revisit the problem later, maybe file versioning can be changed. Windows Installer usually ignores the fourth digit in version numbers, and we bump the the fourth digit only (i.e. 3.6.10.304 - 3.6.10.520). However, when upgrading a patched 3.6 to 4.0, REINSTALL=ALL strikes back. Windows Installer passes REMOVE=ALL argument to 3.6 package, but REINSTALL=ALL takes precedence, so 3.6 will not be removed, but reinstalled! 3.6 and 4.0 both will be installed, there will be an entry for each in Add/Remove Programs Control Panel applet. So I made REINSTALL=ALL conditional, and as a side effect, normal MSI packages built from PTF branches will be fully useable again. If REINSTALL is set for a product that is yet to be installed, no installation action will take place at all. It really makes sense to selectively enable it only for patches. I'm sorry that I did not figure this out earlier. Conflicts: instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt Change-Id: Ic05dc66579c60f1eb599baf6be4289b22301cebe diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index 3402975..a0acc7a 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -14,3 +14,4 @@ ResetLanguageSelected 51 LANG_SELECTED 0 SetApplicationSelected 51 APP_SELECTED1 ResetApplicationSelected 51 APP_SELECTED0 SetAdminInstallProperty51 ADMININSTALL1 +PatchInstall 51 REINSTALL ALL diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index c92b882..6aa662c 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -15,6 +15,7 @@ FileCost 400 FindRelatedProductsNOT ISSETUPDRIVEN 100 InstallFiles 1950 InstallFinalize3150 +PatchInstall PATCH 699 InstallInitialize 700 InstallODBC2600 InstallServicesVersionNT 2750 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/inc/rootfrm.hxx |2 --
sw/source/core/text/itrform2.cxx |2 --
sw/source/core/text/porexp.hxx |6 --
sw/source/core/text/porfld.hxx |8
sw/source/core/text/porfly.hxx |4
sw/source/core/text/porftn.hxx |6 --
sw/source/core/text/porglue.hxx |5 -
sw/source/core/text/porhyph.hxx |6 --
sw/source/core/text/porlay.hxx |3 ---
sw/source/core/text/porlin.hxx |8
sw/source/core/text/pormulti.hxx |2 --
sw/source/core/text/porref.hxx |8
sw/source/core/text/porrst.hxx | 11 ---
sw/source/core/text/portab.hxx |8
sw/source/core/text/portox.hxx |8
sw/source/core/text/portxt.hxx |4
16 files changed, 91 deletions(-)
New commits:
commit ad24ad98818fed80980ac5f49b431d0fa66e5eed
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 22 14:16:31 2013 +0300
CLASSIO is dead
Change-Id: Ib08fe1f8faf9d4a527ac84d69eaaa19eb7102a6a
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index ab5a623..1fd8c78 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -859,8 +859,6 @@ public:
//OUTPUT_OPERATOR
};
-//CLASSIO( SwMetaPortion )
-
/*
* virtual SwMetaPortion::Paint()
*/
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index fc99428..4c9e087 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -90,12 +90,6 @@ public:
OUTPUT_OPERATOR
};
-
-CLASSIO( SwExpandPortion )
-CLASSIO( SwBlankPortion )
-CLASSIO( SwPostItsPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index e0df8b4..fb6ff64 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -246,14 +246,6 @@ public:
OUTPUT_OPERATOR
};
-
-CLASSIO( SwHiddenPortion )
-CLASSIO( SwNumberPortion )
-CLASSIO( SwBulletPortion )
-CLASSIO( SwGrfNumPortion )
-CLASSIO( SwCombinedPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 2057b6e..f5fbfa8 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -94,10 +94,6 @@ public:
OUTPUT_OPERATOR
};
-CLASSIO( SwFlyPortion )
-CLASSIO( SwFlyCntPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index a3c80c2..b20e1eb 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -108,12 +108,6 @@ public:
OUTPUT_OPERATOR
};
-CLASSIO( SwFtnPortion )
-CLASSIO( SwFtnNumPortion )
-CLASSIO( SwQuoVadisPortion )
-CLASSIO( SwErgoSumPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index c47d127..f368fbf 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -115,11 +115,6 @@ inline void SwGluePortion::MoveHalfGlue( SwGluePortion
*pTarget )
MoveGlue( pTarget, GetPrtGlue() / 2 );
}
-CLASSIO( SwGluePortion )
-CLASSIO( SwFixPortion )
-CLASSIO( SwMarginPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 9da5395..3b7450e 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -103,12 +103,6 @@ public:
OUTPUT_OPERATOR
};
-CLASSIO( SwHyphPortion )
-CLASSIO( SwHyphStrPortion )
-CLASSIO( SwSoftHyphPortion )
-CLASSIO( SwSoftHyphStrPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 8635645..b8e5668 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -399,9 +399,6 @@ inline void SwParaPortion::FormatReset()
inline SwLinePortion *SwLineLayout::GetFirstPortion() const
{ return( pPortion ? pPortion : (SwLinePortion*)this ); }
-CLASSIO( SwLineLayout )
-CLASSIO( SwParaPortion )
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index fb8065c..48329b4 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -31,8 +31,6 @@ class SwTxtFormatInfo;
class SwPortionHandler;
// The portions output operators are virtual methods of the portion.
-// The CLASSIO macro implements the 'levitating' function.
-// In doing so we end up with both benefits: virtual output operators and
general utility
#ifdef DBG_UTIL
#define OUTPUT_OPERATOR
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/SalAquaFilePicker.mm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4e40d2ef4b187183d13eef98b976b00765d94ae5
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 22 13:32:39 2013 +0200
typo
Change-Id: I7bb89ac8acf42183e9d7ffaf942365ffa9da9815
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm
b/fpicker/source/aqua/SalAquaFilePicker.mm
index 50d251c..3366753 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -659,7 +659,7 @@ throw( uno::RuntimeException )
sal_Bool SAL_CALL SalAquaFilePicker::supportsService( const rtl::OUString
sServiceName )
throw( uno::RuntimeException )
{
-return cppu:supportsService(this, sServiceName);
+return cppu::supportsService(this, sServiceName);
}
uno::Sequencertl::OUString SAL_CALL
SalAquaFilePicker::getSupportedServiceNames()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/Module_sw.mk sw/qa sw/UIConfig_qa.mk
sw/Module_sw.mk |1
sw/UIConfig_qa.mk | 16 +
sw/qa/tiledrendering/tiledrendering.cxx | 18 +-
sw/qa/tiledrendering/tiledrendering.ui | 273
4 files changed, 300 insertions(+), 8 deletions(-)
New commits:
commit b9eaa646815bf9b400ecc0d5726de5241428cf34
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Oct 22 13:36:59 2013 +0200
Tiled rendering: Finishing touch to the tiledrendering.ui.
Change-Id: I1fb7c2cfdf8ffd69f8a2b4e1aba195939424606b
diff --git a/sw/UIConfig_qa.mk b/sw/UIConfig_qa.mk
index 7bc46b4..13e19e3 100644
--- a/sw/UIConfig_qa.mk
+++ b/sw/UIConfig_qa.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UIConfig_UIConfig,modules/swriter))
+$(eval $(call gb_UIConfig_UIConfig,qa/sw))
-$(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
+$(eval $(call gb_UIConfig_add_uifiles,qa/sw,\
sw/qa/tiledrendering/tiledrendering \
))
diff --git a/sw/qa/tiledrendering/tiledrendering.cxx
b/sw/qa/tiledrendering/tiledrendering.cxx
index d849cec..5ea5f48 100644
--- a/sw/qa/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/tiledrendering/tiledrendering.cxx
@@ -66,7 +66,7 @@ int UIPreviewApp::Main()
try
{
-Dialog *pDialog = new ModalDialog(DIALOG_NO_PARENT, TiledRendering,
sw/qa/tiledrendering/tiledrendering.ui);
+Dialog *pDialog = new ModalDialog(DIALOG_NO_PARENT, TiledRendering,
qa/sw/ui/tiledrendering.ui);
pDialog-Execute();
/*
diff --git a/sw/qa/tiledrendering/tiledrendering.ui
b/sw/qa/tiledrendering/tiledrendering.ui
index 3b727d6..7d051fb 100644
--- a/sw/qa/tiledrendering/tiledrendering.ui
+++ b/sw/qa/tiledrendering/tiledrendering.ui
@@ -1,7 +1,7 @@
?xml version=1.0 encoding=UTF-8?
interface
!-- interface-requires gtk+ 3.0 --
- object class=GtkWindow id=window1
+ object class=GtkWindow id=TiledRendering
property name=can_focusFalse/property
child
object class=GtkBox id=box1
commit b3ed2a26e77c89c7b305b12c2ac1b422ef9d9821
Author: Ptyl Dragon p...@cloudon.com
Date: Tue Oct 22 14:22:58 2013 +0200
added the tiledrendering ui from glade
Change-Id: I8c32f5f3e09d2dc6214a76cd15a0b3adba62824e
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index c53dd15..7401742 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_targets,sw,\
UIConfig_swreport \
UIConfig_swriter \
UIConfig_swxform \
+UIConfig_qa \
))
ifneq ($(DISABLE_SCRIPTING),TRUE)
diff --git a/sw/UIConfig_qa.mk b/sw/UIConfig_qa.mk
new file mode 100644
index 000..7bc46b4
--- /dev/null
+++ b/sw/UIConfig_qa.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/swriter))
+
+$(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
+ sw/qa/tiledrendering/tiledrendering \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/qa/tiledrendering/tiledrendering.cxx
b/sw/qa/tiledrendering/tiledrendering.cxx
index 923c79d..d849cec 100644
--- a/sw/qa/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/tiledrendering/tiledrendering.cxx
@@ -55,21 +55,23 @@ int UIPreviewApp::Main()
uifiles.push_back(aFileUrl);
}
-if (uifiles.empty())
-{
-fprintf(stderr, Usage: ui-previewer file.ui\n);
-return EXIT_FAILURE;
-}
+//if (uifiles.empty())
+//{
+//fprintf(stderr, Usage: ui-previewer file.ui\n);
+//return EXIT_FAILURE;
+//}
// turn on tooltips
Help::EnableQuickHelp();
try
{
-Dialog *pDialog = new Dialog(DIALOG_NO_PARENT, WB_STDDIALOG);
+Dialog *pDialog = new ModalDialog(DIALOG_NO_PARENT, TiledRendering,
sw/qa/tiledrendering/tiledrendering.ui);
+pDialog-Execute();
+/*
{
-VclBuilder aBuilder(pDialog, OUString(), uifiles[0]);
+VclBuilder aBuilder(pDialog, OUString(),
sw/qa/tiledrendering/tiledrendering.ui);
Dialog *pRealDialog =
dynamic_castDialog*(aBuilder.get_widget_root());
if (!pRealDialog)
@@ -81,7 +83,7 @@ int UIPreviewApp::Main()
pRealDialog-SetStyle(pDialog-GetStyle()|WB_CLOSEABLE);
pRealDialog-Execute();
}
-}
+}*/
delete pDialog;
}
diff --git a/sw/qa/tiledrendering/tiledrendering.ui
b/sw/qa/tiledrendering/tiledrendering.ui
new file mode 100644
index 000..3b727d6
--- /dev/null
+++ b/sw/qa/tiledrendering/tiledrendering.ui
@@ -0,0 +1,273 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+ !-- interface-requires gtk+ 3.0 --
+ object class=GtkWindow id=window1
+
[Libreoffice-commits] core.git: basic/source cui/source editeng/source extensions/source filter/source include/tools include/vcl sc/source solenv/gdb svx/source sw/source tools/Library_tl.mk tools/sou
basic/source/runtime/inputbox.cxx |2 cui/source/options/certpath.cxx |1 editeng/source/editeng/editdoc.hxx |1 extensions/source/scanner/grid.cxx |4 filter/source/graphicfilter/ios2met/ios2met.cxx |3 filter/source/graphicfilter/ipict/ipict.cxx |1 include/tools/solar.h |1 include/tools/string.hxx| 212 include/vcl/vclmedit.hxx|1 sc/source/core/data/documen2.cxx|1 sc/source/core/data/documen9.cxx|1 sc/source/core/tool/ddelink.cxx |1 sc/source/core/tool/interpr1.cxx|1 sc/source/ui/dbgui/asciiopt.cxx |1 sc/source/ui/dbgui/imoptdlg.cxx |1 sc/source/ui/dbgui/scuiasciiopt.cxx |1 sc/source/ui/dbgui/scuiimoptdlg.cxx |1 solenv/gdb/libreoffice/tl.py| 25 -- svx/source/gallery2/gallery1.cxx|1 svx/source/svdraw/svdotxln.cxx |1 sw/source/core/edit/edtox.cxx |2 sw/source/core/fields/ddefld.cxx|1 sw/source/ui/config/uinums.cxx |1 sw/source/ui/docvw/edtwin2.cxx |2 sw/source/ui/utlui/content.cxx |1 tools/Library_tl.mk |1 tools/source/string/strimp.cxx | 136 --- tools/source/string/strucvt.cxx | 58 -- tools/source/string/tustring.cxx| 96 -- vcl/source/app/dbggui.cxx |3 vcl/source/control/button.cxx |1 vcl/source/filter/sgvtext.cxx |1 vcl/source/gdi/cvtsvm.cxx |1 vcl/source/gdi/metaact.cxx |1 34 files changed, 30 insertions(+), 536 deletions(-) New commits: commit b37e2dd071c83454b3b06c0959a76b6012f53abb Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 22 09:20:52 2013 +0100 Resolves: fdo#38838 remove UniString hammer silver nails into coffin and bury in concrete Change-Id: I3fda2ff47738bb33793adab97faba2d439ac9a28 diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index db45760..af59f84 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - +#include tools/lineend.hxx #include vcl/button.hxx #include vcl/fixed.hxx #include vcl/edit.hxx diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 482873d..89dc712 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -10,6 +10,7 @@ #include officecfg/Office/Common.hxx #include osl/file.hxx #include osl/security.hxx +#include osl/thread.h #include svtools/stdctrl.hxx #include svtools/treelistentry.hxx #include unotools/securityoptions.hxx diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index ab6d577..7234f6b 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -28,6 +28,7 @@ #include svl/itemset.hxx #include svl/style.hxx #include svl/itempool.hxx +#include tools/lineend.hxx #include vector #include deque diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 1e9af52..6fe68ec 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include sal/config.h - +#include sal/config.h +#include osl/thread.h #include grid.hrc #include cstdio #include math.h // for M_LN10 and M_E diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 5ec8e34..fb74fc4 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -17,8 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include vcl/graph.hxx +#include osl/thread.h #include tools/poly.hxx +#include vcl/graph.hxx #include vcl/dibtools.hxx #include vcl/virdev.hxx #include vcl/lineinfo.hxx diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index c69dc01..f1903e9 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -19,6 +19,7 @@ #include string.h +#include osl/thread.h #include vcl/bmpacc.hxx #include vcl/graph.hxx #include tools/poly.hxx diff --git a/include/tools/solar.h b/include/tools/solar.h index b6d90e6..2bc9160 100644 --- a/include/tools/solar.h +++ b/include/tools/solar.h @@
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/objsh.hxx |3 +--
sfx2/source/doc/objmisc.cxx |1 -
sfx2/source/doc/objstor.cxx |1 -
3 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit ab1b996afac5dcaa222598dd29628b52a5e1903d
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 22 13:51:26 2013 +0200
Remove unused SfxObjectShell::bIsTmp
Change-Id: I14b495067e25e9a80c08b08ff2034b7bfe1e6759
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index ee2ff12..e2f2c6e 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -196,9 +196,8 @@ private:
// storage that contains the object
SfxStyleSheetBasePool* pStyleSheetPool;// StyleSheets
SfxObjectCreateMode eCreateMode; // Purpose of the object
-sal_BoolbHasName :1, // sal_True := existing
object,
+sal_BoolbHasName :1; // sal_True := existing
object,
// sal_False := new object
-bIsTmp :1;// temporary Storage
sal_BoolbIsInGenerateThumbnail; //optimize thumbnail
generate and store procedure to improve odt saving performance, i120030
private:
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 4cc674e..7b13438 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -977,7 +977,6 @@ void SfxObjectShell::SetNamedVisibility_Impl()
void SfxObjectShell::SetNoName()
{
bHasName = 0;
-bIsTmp = sal_True;
GetModel()-attachResource( OUString(), GetModel()-getArgs() );
}
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 165c680..67da658 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -511,7 +511,6 @@ sal_Bool SfxObjectShell::DoInitNew( SfxMedium* pMed )
pMedium = pMed;
if ( !pMedium )
{
-bIsTmp = sal_True;
pMedium = new SfxMedium;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sd/source
sd/source/ui/inc/slideshow.hxx |5 ++
sd/source/ui/slideshow/slideshowimpl.cxx |6 +-
sd/source/ui/slideshow/slideshowimpl.hxx |2
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 29
sd/source/ui/view/drviewse.cxx | 40 +++--
sd/source/ui/view/outlnvs2.cxx | 30
6 files changed, 39 insertions(+), 73 deletions(-)
New commits:
commit 438f5cf4229dafe2100e36d818b05535091054d7
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 22 12:28:39 2013 +0100
Resolves: fdo#69975 honour custom show settings
if a custom show is set, then don't override it with
current/first page, just accept it
Change-Id: Icd04711028b3e11a576df6cd325ddb0db8974111
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 4793653..f8a4268 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1648,29 +1648,35 @@ namespace slideshowhelp
Reference XPresentation2 xPresentation( rDoc.getPresentation() );
if( xPresentation.is() )
{
-if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) )
+if (SID_REHEARSE_TIMINGS == rReq.GetSlot())
+xPresentation-rehearseTimings();
+else if (rDoc.getPresentationSettings().mbCustomShow)
{
-if( (SID_PRESENTATION == rReq.GetSlot() ) )
-{
-Sequence PropertyValue aArguments(1);
-PropertyValue aPage;
-OUString sValue(0);
-
-aPage.Name = FirstPage;
-aPage.Value = sValue;
-
-aArguments[0] = aPage;
-
-xPresentation-startWithArguments( aArguments );
-}
-else
-{
-xPresentation-start();
-}
+//fdo#69975 if a custom show has been set, then
+//use it whether or not we've been asked to
+//start from the current or first slide
+xPresentation-start();
+}
+else if (SID_PRESENTATION_CURRENT_SLIDE == rReq.GetSlot())
+{
+//If there is no custom show set, start will automatically
+//start at the current page
+xPresentation-start();
}
else
{
-xPresentation-rehearseTimings();
+//Start at page 0, this would blow away any custom
+//show settings if any were set
+Sequence PropertyValue aArguments(1);
+PropertyValue aPage;
+OUString sValue(0);
+
+aPage.Name = FirstPage;
+aPage.Value = sValue;
+
+aArguments[0] = aPage;
+
+xPresentation-startWithArguments( aArguments );
}
}
}
commit 368e94ce33bb4de1d2c0348082a349331a17f332
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 22 12:23:38 2013 +0100
merge all three ShowSlideShow impls together
Change-Id: If82f6313b258a79d59fbe34ab7846db5f9f45f76
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index a309c82..be44a51 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -214,6 +214,11 @@ private:
sal_Int32 mnInPlaceConfigEvent;
};
+namespace slideshowhelp
+{
+void ShowSlideShow(SfxRequest rReq, SdDrawDocument rDoc);
+}
+
}
#endif /* _SD_SLIDESHOW_HXX */
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 79c409c..53f077b 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -884,34 +884,7 @@ void SlotManager::GetStatusBarState (SfxItemSet rSet)
void SlotManager::ShowSlideShow( SfxRequest rReq)
{
-Reference XPresentation2 xPresentation(
mrSlideSorter.GetModel().GetDocument()-getPresentation() );
-if( xPresentation.is() )
-{
-if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) )
-{
-if( (SID_PRESENTATION == rReq.GetSlot() ) )
-{
-Sequence PropertyValue aArguments(1);
-PropertyValue aPage;
-OUString sValue(0);
-
-aPage.Name = FirstPage;
-aPage.Value = sValue;
-
-aArguments[0] = aPage;
-
-xPresentation-startWithArguments( aArguments );
-}
-else
-{
-xPresentation-start();
-}
-}
-else
-{
-xPresentation-rehearseTimings();
-}
-}
+slideshowhelp::ShowSlideShow(rReq,
*mrSlideSorter.GetModel().GetDocument());
}
void
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #97 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=b37e2dd071c83454b3b06c0959a76b6012f53abb Resolves: fdo#38838 remove UniString The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 Caolán McNamara caol...@redhat.com changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- 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-commits] core.git: vcl/aqua
vcl/aqua/source/window/salframeview.mm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b0e6fcc9fd7c22744b74ef35a38446f853ef9532
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 22 13:09:22 2013 +0100
sneaky macosx Strings
Change-Id: I4baa3c144c357d3622c1d6b6a32435e52059d897
diff --git a/vcl/aqua/source/window/salframeview.mm
b/vcl/aqua/source/window/salframeview.mm
index 86271dd..2931aaf 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -1064,7 +1064,7 @@ private:
{
SalExtTextInputEvent aEvent;
aEvent.mnTime = mpFrame-mnLastEventTime;
-aEvent.maText = String();
+aEvent.maText = OUString();
aEvent.mpTextAttr = NULL;
aEvent.mnCursorPos = 0;
aEvent.mnDeltaStart = 0;
@@ -1610,7 +1610,7 @@ private:
aInputEvent.mpTextAttr = aInputFlags[0];
mpFrame-CallCallback( SALEVENT_EXTTEXTINPUT, (void *)aInputEvent );
} else {
-aInputEvent.maText = String();
+aInputEvent.maText = OUString();
aInputEvent.mnCursorPos = 0;
aInputEvent.mnCursorFlags = 0;
aInputEvent.mpTextAttr = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source
canvas/source/directx/dx_9rm.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 858d3adbd734cb2955f8255a619117c25bf15b01 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 22 13:11:01 2013 +0100 missing headers Change-Id: I62a0e0d4d1d297c8faf1b684d845a630aa3a1a81 diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index e62a29f..3af55ad 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -31,6 +31,9 @@ // has 3 vertices) #include string.h +#include osl/thread.h +#include osl/time.h + #include vcl/syschild.hxx #include vcl/window.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2 librelogo/source
helpcontent2|2 +- librelogo/source/LibreLogo/LibreLogo.py |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit a888280ccbbfab1fbff3ff8e99c1cc500b9ff3db Author: László Németh nem...@numbertext.org Date: Tue Oct 22 14:03:03 2013 +0200 librelogo: fix black (not refreshed) invisible filling color Change-Id: If0f37d480a745a4d245c4c6cf114374223fda610 diff --git a/helpcontent2 b/helpcontent2 index f81edbd..0d8b37c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f81edbd66fc4d0b6cf03949bb2339c9be9ee989c +Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index a331642..5fc3aa5 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -48,7 +48,7 @@ __COLORS__ = ['BLACK', 0x00], ['SILVER', 0xc0c0c0], ['GRAY', 0x808080], \ ['AQUA', 0x00], ['PINK', 0xffc0cb], ['TOMATO', 0xff6347], \ ['ORANGE', 0xffa500], ['GOLD', 0xffd700], ['VIOLET', 0x9400d3], \ ['SKYBLUE', 0x87ceeb], ['CHOCOLATE', 0xd2691e], ['BROWN', 0xa52a2a], \ -['INVISIBLE', 0xff00] +['INVISIBLE', 0x] __STRCONST__ = [i[0] for i in __COLORS__] + ['NONE', 'BEVEL', 'MITER', 'ROUNDED', 'SOLID', 'DASH', 'DOTTED', 'BOLD', 'ITALIC', 'UPRIGHT', 'NORMAL', HOUR, PT, INCH, MM, CM] __SLEEP_SLICE_IN_MILLISECONDS__ = 500 __PT_TO_TWIP__ = 20 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: io/source
io/source/TextOutputStream/TextOutputStream.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit ed445d95eda257aef5efeb4ed55ceb43a00b8343
Author: Jürgen Schmidt j...@apache.org
Date: Mon Oct 21 15:55:06 2013 +
Resolves: #i75731# check output stream and...
throw IOExceptioin if it is not intialized
(cherry picked from commit cf17f922f01bd75643749a7fd01a03f8167bccee)
Change-Id: I07f6def513ef54b736689bf22565645f0c313982
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx
b/io/source/TextOutputStream/TextOutputStream.cxx
index f7d309c..84f9f48 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -63,6 +63,7 @@ class OTextOutputStream : public TextOutputStreamHelper
rtl_UnicodeToTextContextmContextUnicode2Text;
Sequencesal_Int8 implConvert( const OUString rSource );
+void checkOutputStream() throw(IOException);
public:
OTextOutputStream();
@@ -163,6 +164,7 @@ Sequencesal_Int8 OTextOutputStream::implConvert( const
OUString rSource )
void OTextOutputStream::writeString( const OUString aString )
throw(IOException, RuntimeException)
{
+checkOutputStream();
if( !mbEncodingInitialized )
{
OUString aUtf8Str(utf8);
@@ -194,22 +196,35 @@ void OTextOutputStream::setEncoding( const OUString
Encoding )
void OTextOutputStream::writeBytes( const Sequence sal_Int8 aData )
throw(NotConnectedException, BufferSizeExceededException, IOException,
RuntimeException)
{
+checkOutputStream();
mxStream-writeBytes( aData );
}
void OTextOutputStream::flush( )
throw(NotConnectedException, BufferSizeExceededException, IOException,
RuntimeException)
{
+checkOutputStream();
mxStream-flush();
}
void OTextOutputStream::closeOutput( )
throw(NotConnectedException, BufferSizeExceededException, IOException,
RuntimeException)
{
+checkOutputStream();
mxStream-closeOutput();
}
+void OTextOutputStream::checkOutputStream()
+throw(IOException)
+{
+if (! mxStream.is() )
+throw IOException(
+OUString(output stream is not initialized, you have to use
setOutputStream first),
+ReferenceXInterface());
+}
+
+
//===
// XActiveDataSource
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salgdi3.cxx | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 989cffdd126c3e1ec404500997d6e95865f1c890
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 22 13:20:41 2013 +0100
some sneaky strings in vcl/win
Change-Id: I489b0088302016fb403fed090be9de9d6c213350
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 7bbb009..c9b7f6b 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -88,7 +88,7 @@ static bool bImplSalCourierNew = false;
// ---
// TODO: also support temporary TTC font files
-typedef std::map String, ImplDevFontAttributes FontAttrMap;
+typedef std::map OUString, ImplDevFontAttributes FontAttrMap;
class ImplFontAttrCache
{
@@ -108,8 +108,8 @@ public:
const OUString rBaseURL);
~ImplFontAttrCache();
-ImplDevFontAttributes GetFontAttr( const String rFontFileName ) const;
-void AddFontAttr( const String rFontFileName, const
ImplDevFontAttributes );
+ImplDevFontAttributes GetFontAttr( const OUString rFontFileName ) const;
+void AddFontAttr( const OUString rFontFileName, const
ImplDevFontAttributes );
};
ImplFontAttrCache::ImplFontAttrCache( const OUString rFileNameURL, const
OUString rBaseURL ) : aBaseURL( rBaseURL )
@@ -130,12 +130,12 @@ ImplFontAttrCache::ImplFontAttrCache( const OUString
rFileNameURL, const OUStri
return; // ignore cache and rewrite if no match
// read the cache entries from the file
-String aFontFileURL, aFontName;
+OUString aFontFileURL;
ImplDevFontAttributes aDFA;
for(;;)
{
aFontFileURL =
read_lenPrefixed_uInt8s_ToOUStringsal_uInt16(aCacheFile,
RTL_TEXTENCODING_UTF8);
-if( !aFontFileURL.Len() )
+if( aFontFileURL.isEmpty() )
break;
aDFA.SetFamilyName(read_lenPrefixed_uInt8s_ToOUStringsal_uInt16(aCacheFile,
RTL_TEXTENCODING_UTF8));
@@ -169,7 +169,7 @@ ImplFontAttrCache::~ImplFontAttrCache()
FontAttrMap::const_iterator aIter = aFontAttributes.begin();
while ( aIter != aFontAttributes.end() )
{
-const String rFontFileURL( (*aIter).first );
+const OUString rFontFileURL( (*aIter).first );
const ImplDevFontAttributes rDFA( (*aIter).second );
write_lenPrefixed_uInt8s_FromOUStringsal_uInt16(aCacheFile,
rFontFileURL, RTL_TEXTENCODING_UTF8);
write_lenPrefixed_uInt8s_FromOUStringsal_uInt16(aCacheFile,
rDFA.GetFamilyName(), RTL_TEXTENCODING_UTF8);
@@ -199,7 +199,7 @@ OUString ImplFontAttrCache::OptimizeURL( const OUString
rURL ) const
return aOptimizedFontFileURL;
}
-ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const String
rFontFileName ) const
+ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const OUString
rFontFileName ) const
{
ImplDevFontAttributes aDFA;
FontAttrMap::const_iterator it = aFontAttributes.find( OptimizeURL(
rFontFileName ) );
@@ -210,7 +210,7 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const
String rFontFileNam
return aDFA;
}
-void ImplFontAttrCache::AddFontAttr( const String rFontFileName, const
ImplDevFontAttributes rDFA )
+void ImplFontAttrCache::AddFontAttr( const OUString rFontFileName, const
ImplDevFontAttributes rDFA )
{
SAL_WARN_IF(!rFontFileName.Len() || rDFA.GetFamilyName().isEmpty(),
vcl.gdi, ImplFontNameCache::AddFontName - invalid data!);
@@ -600,7 +600,7 @@ struct ImplEnumInfo
{
HDC mhDC;
ImplDevFontList*mpList;
-String* mpName;
+OUString* mpName;
LOGFONTA* mpLogFontA;
LOGFONTW* mpLogFontW;
UINTmnPreferedCharSet;
@@ -1801,7 +1801,7 @@ int CALLBACK SalEnumFontsProcExA( const ENUMLOGFONTEXA*
pLogFont,
pInfo-mbCourier = stricmp( pLogFont-elfLogFont.lfFaceName,
Courier ) == 0;
else
pInfo-mbCourier = FALSE;
-String aName( ImplSalGetUniString( pLogFont-elfLogFont.lfFaceName
) );
+OUString aName( ImplSalGetUniString(
pLogFont-elfLogFont.lfFaceName ) );
pInfo-mpName = aName;
strncpy( pInfo-mpLogFontA-lfFaceName,
pLogFont-elfLogFont.lfFaceName, LF_FACESIZE );
pInfo-mpLogFontA-lfCharSet = pLogFont-elfLogFont.lfCharSet;
@@ -1857,7 +1857,7 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW*
pLogFont,
pInfo-mbCourier = ImplSalWICompareAscii(
pLogFont-elfLogFont.lfFaceName, Courier ) == 0;
else
pInfo-mbCourier = FALSE;
-String aName = OUString(reinterpret_castconst
sal_Unicode*(pLogFont-elfLogFont.lfFaceName));
+OUString aName =
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cf/17f922f01bd75643749a7fd01a03f8167bccee
cf/17f922f01bd75643749a7fd01a03f8167bccee |1 + 1 file changed, 1 insertion(+) New commits: commit 039fea01d950ff77fe89eeb2aad9331b607fd3cd Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 22 13:21:07 2013 +0100 Notes added by 'git notes add' diff --git a/cf/17f922f01bd75643749a7fd01a03f8167bccee b/cf/17f922f01bd75643749a7fd01a03f8167bccee new file mode 100644 index 000..244e257 --- /dev/null +++ b/cf/17f922f01bd75643749a7fd01a03f8167bccee @@ -0,0 +1 @@ +merged as: ed445d95eda257aef5efeb4ed55ceb43a00b8343 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/gdi/atsui/salatslayout.cxx |2 +-
vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx | 14 +++---
vcl/aqua/source/window/salmenu.cxx | 16
3 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 6d7c2a44870ef6427dd944769b1bdbd80b9f8f91
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 22 13:23:30 2013 +0100
aqua String remnants
Change-Id: Ic574acda26775848918dc42ce3bce43c731ae267
diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index fd080f6..311d28d 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -232,7 +232,7 @@ bool ATSLayout::LayoutText( ImplLayoutArgs rArgs )
Fixed fFontSize = 0;
ByteCount nDummy;
ATSUGetAttribute( mrATSUStyle, kATSUSizeTag, sizeof(fFontSize),
fFontSize, nDummy);
-String aUniName( rArgs.mpStr[rArgs.mnMinCharPos], mnCharCount );
+OUString aUniName( rArgs.mpStr[rArgs.mnMinCharPos], mnCharCount );
OString aCName(OUStringToOString(aUniName, RTL_TEXTENCODING_UTF8));
fprintf( stderr, ATSLayout( \%s\ %d..%d of %d) with h=%4.1f\n,
aCName.getStr(),rArgs.mnMinCharPos,rArgs.mnEndCharPos,rArgs.mnLength,Fix2X(fFontSize)
);
diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index 0c0f580..18509e9 100644
--- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -38,7 +38,7 @@
// since neither head's macStyle nor OS/2's panose are easily available
// during font enumeration. macStyle bits would be not sufficient anyway
// and SFNT fonts on Mac usually do not contain an OS/2 table.
-static void UpdateAttributesFromPSName( const String rPSName,
ImplDevFontAttributes rDFA )
+static void UpdateAttributesFromPSName( const OUString rPSName,
ImplDevFontAttributes rDFA )
{
OString aPSName( OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8
).toAsciiLowerCase() );
@@ -163,20 +163,20 @@ static void UpdateAttributesFromPSName( const String
rPSName, ImplDevFontAttrib
// #i100020# special heuristic for names with single-char styles
// NOTE: we are checking name that hasn't been lower-cased
- if( rPSName.Len() 3 )
+ if( rPSName.getLength() 3 )
{
-int i = rPSName.Len();
-sal_Unicode c = rPSName.GetChar( --i );
+int i = rPSName.getLength();
+sal_Unicode c = rPSName[--i];
if( c == 'C' ) { // capitals
rDFA.SetFamilyType(FAMILY_DECORATIVE);
-c = rPSName.GetChar( --i );
+c = rPSName[--i];
}
if( c == 'O' ) { // CFF-based OpenType
-c = rPSName.GetChar( --i );
+c = rPSName[--i];
}
if( c == 'I' ) { // italic
rDFA.SetItalic(ITALIC_NORMAL);
-c = rPSName.GetChar( --i );
+c = rPSName[--i];
}
if( c == 'B' ) // bold
rDFA.SetWeight(WEIGHT_BOLD);
diff --git a/vcl/aqua/source/window/salmenu.cxx
b/vcl/aqua/source/window/salmenu.cxx
index 5d29c23..0e73a75 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -115,7 +115,7 @@ static void initAppMenu()
if( pAppMenu )
{
// insert about entry
-String aAbout( ResId( SV_STDTEXT_ABOUT, *pMgr ) );
+OUString aAbout( ResId( SV_STDTEXT_ABOUT, *pMgr ) );
NSString* pString = CreateNSString( aAbout );
NSMenuItem* pNewItem = [pAppMenu insertItemWithTitle:
pString
action:
@selector(showAbout:)
@@ -130,7 +130,7 @@ static void initAppMenu()
}
// insert preferences entry
-String aPref( ResId( SV_STDTEXT_PREFERENCES, *pMgr ) );
+OUString aPref( ResId( SV_STDTEXT_PREFERENCES, *pMgr ) );
pString = CreateNSString( aPref );
pNewItem = [pAppMenu insertItemWithTitle: pString
action: @selector(showPreferences:)
@@ -152,7 +152,7 @@ static void initAppMenu()
pNewItem = [pAppMenu itemAtIndex: 4];
if( pNewItem )
{
-pString = CreateNSString( String( ResId(
SV_MENU_MAC_SERVICES, *pMgr ) ) );
+pString = CreateNSString( OUString( ResId(
SV_MENU_MAC_SERVICES, *pMgr ) ) );
[pNewItem setTitle: pString];
if( pString )
[pString release];
@@ -162,7 +162,7 @@ static void initAppMenu()
pNewItem = [pAppMenu itemAtIndex: 6];
if( pNewItem )
{
-pString =
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fd2b292f0d5c1994244c41555d403f14f9f44875 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 22 10:11:13 2013 +0100 Updated core Project: dictionaries 8106a55e4469c5d2bbdfac8a6816153843ee6b83 diff --git a/dictionaries b/dictionaries index f1a4eca..8106a55 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit f1a4ecab4b10fe7e5daadd6529516d5ffeba0fda +Subproject commit 8106a55e4469c5d2bbdfac8a6816153843ee6b83 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: pt_PT/pt_PT.dic
pt_PT/pt_PT.dic |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 8106a55e4469c5d2bbdfac8a6816153843ee6b83 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 22 10:11:13 2013 +0100 remove duplicate entry Change-Id: I8c8dc81d31a4bedde4931e146bda478f0bf5a211 diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index fad14ba..7f148c1 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ -43938 +43937 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -23,7 +23,6 @@ abanadura/p [CAT=nc,G=f,N=s] abananado/fp [CAT=adj,N=s,G=m] abanão/p [CAT=nc,G=m,N=s] abanar/XYPLD [CAT=v,T=inf,TR=t] -abanar/XYPLD [CAT=v,T=inf,TR=t] abandonar/XYPLMv [CAT=v,T=inf,TR=t] abandono/p [CAT=nc,G=m,N=s] aba/p [CAT=nc,G=f,N=s] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-1' - pt_PT/pt_PT.dic
pt_PT/pt_PT.dic |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 3bb9a7d303fbf1bf10a67a220598abb38363032c Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 22 10:11:13 2013 +0100 remove duplicate entry Change-Id: I8c8dc81d31a4bedde4931e146bda478f0bf5a211 (cherry picked from commit 8106a55e4469c5d2bbdfac8a6816153843ee6b83) diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index fad14ba..7f148c1 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ -43938 +43937 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -23,7 +23,6 @@ abanadura/p [CAT=nc,G=f,N=s] abananado/fp [CAT=adj,N=s,G=m] abanão/p [CAT=nc,G=m,N=s] abanar/XYPLD [CAT=v,T=inf,TR=t] -abanar/XYPLD [CAT=v,T=inf,TR=t] abandonar/XYPLMv [CAT=v,T=inf,TR=t] abandono/p [CAT=nc,G=m,N=s] aba/p [CAT=nc,G=f,N=s] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a8b7a51193f49d93767b937fb93f122f14533d59 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 22 10:11:13 2013 +0100 Updated core Project: dictionaries 3bb9a7d303fbf1bf10a67a220598abb38363032c diff --git a/dictionaries b/dictionaries index 8349227..3bb9a7d 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 8349227a9dd98665d90b1ce744247fdaf5582936 +Subproject commit 3bb9a7d303fbf1bf10a67a220598abb38363032c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-3' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f72d49d808ce055c959b1c63513335797230bf50 Author: Andras Timar andras.ti...@collabora.com Date: Thu Oct 10 09:22:36 2013 +0200 Updated core Project: dictionaries e8bf825ab1c881bdddc78f0660db8caf993a065e updated pt dictionary Change-Id: I9380049c2e0b6716287c71aa2693f40dc78facf6 Reviewed-on: https://gerrit.libreoffice.org/6179 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Michael Stahl mst...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/dictionaries b/dictionaries index bfb57df..e8bf825 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit bfb57df4dcb7ccc879069914652f3252ece06b02 +Subproject commit e8bf825ab1c881bdddc78f0660db8caf993a065e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-1-3' - pt_PT/description.xml pt_PT/pt_PT.dic
pt_PT/description.xml |2 - pt_PT/pt_PT.dic | 75 ++ 2 files changed, 53 insertions(+), 24 deletions(-) New commits: commit e8bf825ab1c881bdddc78f0660db8caf993a065e Author: Andras Timar andras.ti...@collabora.com Date: Thu Oct 10 09:22:36 2013 +0200 updated pt dictionary Change-Id: I9380049c2e0b6716287c71aa2693f40dc78facf6 Reviewed-on: https://gerrit.libreoffice.org/6179 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Michael Stahl mst...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/pt_PT/description.xml b/pt_PT/description.xml index f3196f2..92bec39 100644 --- a/pt_PT/description.xml +++ b/pt_PT/description.xml @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? description xmlns=http://openoffice.org/extensions/description/2006; xmlns:d=http://openoffice.org/extensions/description/2006; xmlns:xlink=http://www.w3.org/1999/xlink; -version value=13.7.2.1 / +version value=13.10.1.2 / identifier value=Natura.OOo3.pt-PT-dictionary / display-name diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index e73e46c..fad14ba 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ -43909 +43938 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -20,9 +20,10 @@ abalo/p [CAT=nc,G=m,N=s] abalroar/XYPLcM[CAT=v,T=inf,TR=t] abanadela/p[CAT=nc,G=f,N=s] abanadura/p[CAT=nc,G=f,N=s] +abananado/fp [CAT=adj,N=s,G=m] abanão/p [CAT=nc,G=m,N=s] abanar/XYPLD [CAT=v,T=inf,TR=t] -abandalhar/XYPLcM [CAT=v,T=inf,TR=t] +abanar/XYPLD [CAT=v,T=inf,TR=t] abandonar/XYPLMv [CAT=v,T=inf,TR=t] abandono/p [CAT=nc,G=m,N=s] aba/p [CAT=nc,G=f,N=s] @@ -824,6 +825,7 @@ agarrar/XYPLDW [CAT=v,T=inf,TR=_] agasalhar/XYPLD[CAT=v,T=inf,TR=t] agasalho/p [CAT=nc,G=m,N=s] agastar/XYPLM [CAT=v,T=inf,TR=t] +ágata/p [CAT=nc,G=f,N=s] agemado[CAT=adj,N=s,G=m] agência/p [CAT=nc,G=f,N=s] agenciar/LP[CAT=v,T=inf,TR=t] @@ -935,6 +937,7 @@ aguadeiro/p [CAT=a_nc,G=m,N=s] água-marinha [CAT=nc,G=f,N=s] água-oxigenada[CAT=nc,G=f,N=s] água-pé/p[CAT=nc,G=f,N=s] +aguapé/p [CAT=nc,G=f,N=s] aguardar/XYPLD [CAT=v,T=inf,TR=t] aguardenteiro [CAT=nc,G=m,N=s] aguardente/p [CAT=nc,G=f,N=s] @@ -1097,7 +1100,7 @@ alcoolemia[CAT=nc,G=f,N=s] alcoólico/fpx [CAT=adj,N=s,G=m] alcoolificar/XYPLc [CAT=v,T=inf,TR=t] alcoolismo/p [CAT=nc,G=m,N=s] -alcoolizar/XYPLc [CAT=v,T=inf,TR=t] +alcoolizar/XYPLcv [CAT=v,T=inf,TR=t] álcool[CAT=nc,G=m,N=s] alcoolometria/p[CAT=nc,G=f,N=s] alcoolómetro [CAT=nc,G=m,N=s] @@ -1114,7 +1117,7 @@ aldeÃdo/p[CAT=nc,G=m,N=s] aldeola/p [CAT=nc,G=f,N=s] aldeota[CAT=nc,G=f,N=s] aldrabada [CAT=nc,G=f,N=s] -aldrabão/p[CAT=a_nc,G=m,N=s] +aldrabão/pf [CAT=a_nc,G=m,N=s] aldrabar/XYPLc [CAT=v,T=inf,TR=t] aldrabeiro [CAT=a_nc,G=m,N=s] aldrabice/p[CAT=nc,G=f,N=s] @@ -2672,12 +2675,12 @@ arcaz [CAT=nc,G=m,N=s] arcebispado[CAT=nc,G=m,N=s] arcebispal [CAT=adj,N=s,G=_] arcebispo/p[CAT=nc,G=m,N=s] -arcediago [CAT=nc,G=m,N=s] +arcediago/p[CAT=nc,G=m,N=s] archeiro/p [CAT=nc,G=m,N=s] archoteiro [CAT=nc,G=m,N=s] archote/pt [CAT=nc,G=m,N=s] arciforme/p[CAT=adj,N=s,G=_] -arcipreste [CAT=nc,G=m,N=s] +arcipreste/p [CAT=nc,G=m,N=s] arco-celeste [CAT=nc,G=m,N=s] arco-irisar/XYPL [CAT=v,T=inf,TR=_] arco-Ãris [CAT=nc,G=m,N=s] @@ -3728,6 +3731,7 @@ autógamo [CAT=adj,N=s,G=m] autogéneo [CAT=adj,N=s,G=m] autogénese[CAT=nc,G=f,N=s] autogenético [CAT=adj,N=s,G=m] +autogestão[CAT=nc,G=f,N=s] autognose [CAT=nc,G=f,N=s] autogolo/p [CAT=nc,G=m,N=s] autogoverno/p [CAT=nc,G=m,N=s] @@ -3964,7 +3968,7 @@ babadura [CAT=nc,G=f,N=s] baba/p [CAT=nc,G=f,N=s] babão/fp [CAT=a_nc,G=m,N=s] babar/XYPL [CAT=v,T=inf,TR=t] -babeiro[CAT=nc,G=m,N=s] +babeiro/p [CAT=nc,G=m,N=s] babélico [CAT=adj,N=s,G=m] babel [CAT=nc,G=f,N=s] babilónia [CAT=nc,G=f,N=s] @@ -9283,7 +9287,7 @@ convento/p[CAT=nc,G=m,N=s] conventual/p [CAT=nc,G=m,N=s] convergência/p[CAT=nc,G=f,N=s] convergente/p [CAT=adj,N=s,G=_] -convergir/XYL [CAT=v,T=inf,TR=i] +convergir/YL [CAT=v,T=inf,TR=i] conversadeira [CAT=a_nc,G=f,N=s] conversado [CAT=a_nc,G=m,N=s] conversador[CAT=a_nc,G=m,N=s] @@ -11931,7 +11935,7 @@ dissociar/XYPLcv[CAT=v,T=inf,TR=t] dissociativo [CAT=adj,N=s,G=m] dissolução/p [CAT=nc,G=f,N=s] dissolutivo[CAT=adj,N=s,G=m] -dissoluto [CAT=adj,N=s,G=m] +dissoluto/pf [CAT=adj,N=s,G=m] dissolúvel/dpI[CAT=adj,N=s,G=_] dissolvência/p[CAT=nc,G=f,N=s] dissolvente/p [CAT=a_nc,G=2,N=s] @@ -17340,7 +17344,7 @@ harmónica
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-3' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d723808846b145914a53078b8cf246cc8aa538a5 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 22 10:11:13 2013 +0100 Updated core Project: dictionaries fb1411e191d714703b7e90db009a96830e0152ec diff --git a/dictionaries b/dictionaries index e8bf825..fb1411e 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit e8bf825ab1c881bdddc78f0660db8caf993a065e +Subproject commit fb1411e191d714703b7e90db009a96830e0152ec ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-1-3' - pt_PT/pt_PT.dic
pt_PT/pt_PT.dic |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit fb1411e191d714703b7e90db009a96830e0152ec Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 22 10:11:13 2013 +0100 remove duplicate entry Change-Id: I8c8dc81d31a4bedde4931e146bda478f0bf5a211 (cherry picked from commit 8106a55e4469c5d2bbdfac8a6816153843ee6b83) (cherry picked from commit 3bb9a7d303fbf1bf10a67a220598abb38363032c) diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index fad14ba..7f148c1 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ -43938 +43937 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -23,7 +23,6 @@ abanadura/p [CAT=nc,G=f,N=s] abananado/fp [CAT=adj,N=s,G=m] abanão/p [CAT=nc,G=m,N=s] abanar/XYPLD [CAT=v,T=inf,TR=t] -abanar/XYPLD [CAT=v,T=inf,TR=t] abandonar/XYPLMv [CAT=v,T=inf,TR=t] abandono/p [CAT=nc,G=m,N=s] aba/p [CAT=nc,G=f,N=s] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/abstract-chart-rendering' - 2 commits - chart2/inc chart2/Library_chartopengl.mk chart2/source
chart2/Library_chartopengl.mk |3
chart2/inc/ChartModel.hxx |1
chart2/source/model/main/ChartModel.cxx |8
chart2/source/view/inc/AbstractShapeFactory.hxx |2
chart2/source/view/inc/DummyXShape.hxx | 74
chart2/source/view/inc/OpenglShapeFactory.hxx |3
chart2/source/view/inc/ShapeFactory.hxx |2
chart2/source/view/main/ChartView.cxx |1
chart2/source/view/main/DummyXShape.cxx | 360
chart2/source/view/main/OpenglShapeFactory.cxx | 50 +++
chart2/source/view/main/ShapeFactory.cxx|4
11 files changed, 504 insertions(+), 4 deletions(-)
New commits:
commit 3da7f09e23de54a9950bab2806ce71bda4c90d9b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Oct 22 14:06:56 2013 +0200
fix lifetime problems of ChartView
Change-Id: I99b24b026c50a05f8f3803348c76277e29a45ec7
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index ffc49aa..d3719da 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -120,6 +120,7 @@ private:
sal_Int32 m_nInLoad;
sal_Bool volatile m_bUpdateNotificationsPending;
+com::sun::star::uno::Reference com::sun::star::uno::XInterface
xChartView; // for the ref count
ChartView* mpChartView;
OUString m_aResource;
diff --git a/chart2/source/model/main/ChartModel.cxx
b/chart2/source/model/main/ChartModel.cxx
index c25b346..4fbda9a 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -186,8 +186,6 @@ ChartModel::~ChartModel()
OSL_TRACE( ChartModel: DTOR called );
if( m_xOldModelAgg.is())
m_xOldModelAgg-setDelegator( NULL );
-
-delete mpChartView;
}
void SAL_CALL ChartModel::initialize( const Sequence Any /*rArguments*/ )
@@ -1200,7 +1198,10 @@ Reference uno::XInterface SAL_CALL
ChartModel::createInstance( const OUString
case SERVICE_MARKER_TABLE:
{
if(!mpChartView)
+{
mpChartView = new ChartView( m_xContext, *this);
+xChartView = static_cast ::cppu::OWeakObject* (
mpChartView );
+}
return mpChartView-createInstance( rServiceSpecifier );
}
break;
@@ -1211,7 +1212,10 @@ Reference uno::XInterface SAL_CALL
ChartModel::createInstance( const OUString
else if(rServiceSpecifier == CHART_VIEW_SERVICE_NAME)
{
if(!mpChartView)
+{
mpChartView = new ChartView( m_xContext, *this);
+xChartView = static_cast ::cppu::OWeakObject* ( mpChartView );
+}
return static_cast ::cppu::OWeakObject* ( mpChartView );
}
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 61860d0..0708ad8 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -680,6 +680,7 @@ int oglErrorHandler( unx::Display* /*dpy*/,
unx::XErrorEvent* /*evnt*/ )
bool DummyChart::initOpengl()
{
+initWindow();
mpWindow-setPosSizePixel(0,0,0,0);
GLWin.Width = 0;
GLWin.Height = 0;
@@ -804,7 +805,7 @@ DummyChart::DummyChart():
void DummyChart::createGLContext()
{
-
+initOpengl();
}
void DummyChart::setPosition( const awt::Point aPosition )
commit 43233a870f441f1664c1743c3ffed1e468dea48c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Oct 22 13:49:15 2013 +0200
it builds again
Change-Id: I969ff5ed6fd979e9fd126e8d0b79a518697e7915
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index 88c8e5f..d1f2c4b 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Library_use_libraries,chartopengl,\
cppu \
cppuhelper \
sal \
+vcl \
$(gb_UWINAPI) \
))
@@ -43,6 +44,8 @@ else ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,chartopengl,\
-ldl \
-lGL \
+-lGLU \
+-lX11 \
))
endif
diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx
b/chart2/source/view/inc/AbstractShapeFactory.hxx
index 8dd8137..36b2554 100644
--- a/chart2/source/view/inc/AbstractShapeFactory.hxx
+++ b/chart2/source/view/inc/AbstractShapeFactory.hxx
@@ -227,6 +227,8 @@ public:
getOrCreateChartRootShape( const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XDrawPage xPage ) = 0;
+virtual void setPageSize( com::sun::star::uno::Reference
com::sun::star::drawing::XShapes xChartShapes, const
com::sun::star::awt::Size rSize ) = 0;
+
virtual void createSeries( const com::sun::star::uno::Reference
com::sun::star::drawing::XShapes xTarget,
diff --git a/chart2/source/view/inc/DummyXShape.hxx
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salgdi3.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 800f387af08f243e7d532ad7a78df1e3d6ad80e4
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 22 13:34:52 2013 +0100
bah, Len-!isEmpty
Change-Id: Icc09ef129d39575e02de4eaf1e371e3de8758eb3
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index c9b7f6b..8e9dee6 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -212,9 +212,9 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const
OUString rFontFileN
void ImplFontAttrCache::AddFontAttr( const OUString rFontFileName, const
ImplDevFontAttributes rDFA )
{
-SAL_WARN_IF(!rFontFileName.Len() || rDFA.GetFamilyName().isEmpty(),
+SAL_WARN_IF(rFontFileName.isEmpty() || rDFA.GetFamilyName().isEmpty(),
vcl.gdi, ImplFontNameCache::AddFontName - invalid data!);
-if ( rFontFileName.Len() !rDFA.GetFamilyName().isEmpty() )
+if ( !rFontFileName.isEmpty() !rDFA.GetFamilyName().isEmpty() )
{
aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL(
rFontFileName ), rDFA ) );
bModified = TRUE;
@@ -1859,7 +1859,7 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW*
pLogFont,
pInfo-mbCourier = FALSE;
OUString aName = OUString(reinterpret_castconst
sal_Unicode*(pLogFont-elfLogFont.lfFaceName));
pInfo-mpName = aName;
-memcpy( pInfo-mpLogFontW-lfFaceName,
pLogFont-elfLogFont.lfFaceName, (aName.Len()+1)*sizeof( wchar_t ) );
+memcpy( pInfo-mpLogFontW-lfFaceName,
pLogFont-elfLogFont.lfFaceName, (aName.getLength()+1)*sizeof( wchar_t ) );
pInfo-mpLogFontW-lfCharSet = pLogFont-elfLogFont.lfCharSet;
EnumFontFamiliesExW( pInfo-mhDC, pInfo-mpLogFontW,
(FONTENUMPROCW)SalEnumFontsProcExW,
(LPARAM)(void*)pInfo, 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/misc/DExport.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit ef23018f6f3338adeee06de8a989781347a1dea8 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 22 13:53:42 2013 +0100 missing header Change-Id: I84aebf0e107add76dfb293b3a34a30705fd0b3a6 diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 1c8c649..eccb7d9 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -35,6 +35,7 @@ #include dbustrings.hrc #include dbu_misc.hrc #include connectivity/dbconversion.hxx +#include osl/thread.h #include sfx2/sfxhtml.hxx #include svl/numuno.hxx #include connectivity/dbtools.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/scanner/scanwin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c0e827297bfc7cc723059648fff590b798ff2109
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 22 13:55:46 2013 +0100
stray String in extensions
Change-Id: Iea98e52fd026d93f68ab9916ccb583b156d5c9a7
diff --git a/extensions/source/scanner/scanwin.cxx
b/extensions/source/scanner/scanwin.cxx
index d671ebc..fb3aea3 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -255,7 +255,7 @@ void ImpTwain::ImplOpenSourceManager()
{
nCurState = 2;
-if( ( ( pDSM = (DSMENTRYPROC) pMod-getSymbol( String(
TWAIN_FUNCNAME ) ) ) != NULL )
+if( ( ( pDSM = (DSMENTRYPROC) pMod-getSymbol( OUString(
TWAIN_FUNCNAME ) ) ) != NULL )
( PFUNC( aAppIdent, NULL, DG_CONTROL, DAT_PARENT,
MSG_OPENDSM, hTwainWnd ) == TWRC_SUCCESS ) )
{
nCurState = 3;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/scanner/scanwin.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e0280873b89aa5ac518b2e76175bc2c6103729dc
Author: Michael Stahl mst...@redhat.com
Date: Tue Oct 22 14:55:17 2013 +0200
extensions: try to fix WNT String
Change-Id: I17ec25a836eda7bb023c440db1f40186b6156067
diff --git a/extensions/source/scanner/scanwin.cxx
b/extensions/source/scanner/scanwin.cxx
index fb3aea3..12f8fcb 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -255,7 +255,8 @@ void ImpTwain::ImplOpenSourceManager()
{
nCurState = 2;
-if( ( ( pDSM = (DSMENTRYPROC) pMod-getSymbol( OUString(
TWAIN_FUNCNAME ) ) ) != NULL )
+pDSM = (DSMENTRYPROC) pMod-getSymbol(OUString(TWAIN_FUNCNAME));
+if (pDSM
( PFUNC( aAppIdent, NULL, DG_CONTROL, DAT_PARENT,
MSG_OPENDSM, hTwainWnd ) == TWRC_SUCCESS ) )
{
nCurState = 3;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 69975, which changed state. Bug 69975 Summary: SLIDESHOW: Customized slideshow broken; shows all slides (see comment #1 ) https://bugs.freedesktop.org/show_bug.cgi?id=69975 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- 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-commits] core.git: sc/qa
sc/qa/extras/macros-test.cxx | 19 +++ 1 file changed, 11 insertions(+), 8 deletions(-) New commits: commit 2bcb5f5c36616611880e29d15a6f7327d506c54d Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 22 15:09:32 2013 +0200 Fix tools/string.hxx remnants Change-Id: I06c95dcfcf2af14e109fabdde69bf98d06801331 diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 074edb5..a353380 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -70,8 +70,6 @@ void ScMacrosTest::testMSP() CPPUNIT_ASSERT_MESSAGE(Failed to load MasterScriptProviderProblem.ods, xComponent.is()); -OUString aURL(vnd.sun.Star.script:Standard.Module1.TestMSP?language=Basiclocation=document); -String sUrl = aURL; Any aRet; Sequence sal_Int16 aOutParamIndex; Sequence Any aOutParam; @@ -83,7 +81,10 @@ void ScMacrosTest::testMSP() ScDocShell* xDocSh = dynamic_castScDocShell*(pFoundShell); CPPUNIT_ASSERT(xDocSh != NULL); -pFoundShell-CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam); +pFoundShell-CallXScript( +xComponent, + vnd.sun.Star.script:Standard.Module1.TestMSP?language=Basiclocation=document, +aParams, aRet, aOutParamIndex, aOutParam); OUString sResult; aRet = sResult; @@ -102,8 +103,6 @@ void ScMacrosTest::testStarBasic() CPPUNIT_ASSERT_MESSAGE(Failed to load StarBasic.ods, xComponent.is()); -OUString aURL(vnd.sun.Star.script:Standard.Module1.Macro1?language=Basiclocation=document); -String sUrl = aURL; Any aRet; Sequence sal_Int16 aOutParamIndex; Sequence Any aOutParam; @@ -115,7 +114,10 @@ void ScMacrosTest::testStarBasic() ScDocShell* xDocSh = static_castScDocShell*(pFoundShell); ScDocument* pDoc = xDocSh-GetDocument(); -pFoundShell-CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam); +pFoundShell-CallXScript( +xComponent, + vnd.sun.Star.script:Standard.Module1.Macro1?language=Basiclocation=document, +aParams, aRet, aOutParamIndex, aOutParam); double aValue; pDoc-GetValue(0,0,0,aValue); std::cout returned value = aValue std::endl; @@ -238,7 +240,6 @@ void ScMacrosTest::testVba() OUString sMsg( Failed to load + aFileName ); CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg, RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() ); -String sUrl = testInfo[i].sMacroUrl; Any aRet; Sequence sal_Int16 aOutParamIndex; Sequence Any aOutParam; @@ -256,7 +257,9 @@ void ScMacrosTest::testVba() CPPUNIT_ASSERT_MESSAGE(Failed to access document shell, pFoundShell); std::cout about to invoke vba test in OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() std::endl; -pFoundShell-CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam); +pFoundShell-CallXScript( +xComponent, testInfo[i].sMacroUrl, aParams, aRet, aOutParamIndex, +aOutParam); OUString aStringRes; aRet = aStringRes; std::cout value of Ret OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() std::endl; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: nss/ExternalPackage_nss.mk nss/README
nss/ExternalPackage_nss.mk |3 --- nss/README |9 - 2 files changed, 4 insertions(+), 8 deletions(-) New commits: commit 48e590c9a95339d2ad8ef6cbaeac43d57aad Author: Michael Stahl mst...@redhat.com Date: Tue Oct 22 15:24:51 2013 +0200 nss: stop delivering libsqlite on Mac Change-Id: I90fcfb9f5fe62eb394359716d0ae96b216f2e07e diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk index c50a718..18211f2 100644 --- a/nss/ExternalPackage_nss.mk +++ b/nss/ExternalPackage_nss.mk @@ -30,9 +30,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\ mozilla/dist/out/lib/libsoftokn3.dylib \ mozilla/dist/out/lib/libssl3.dylib \ )) -$(eval $(call gb_ExternalPackage_add_files,nss,lib/sqlite,\ - $(if $(filter 1060 1070 1080,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,mozilla/dist/out/lib/libsqlite3.dylib) \ -)) else ifeq ($(OS),WNT) ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_files,nss,lib,\ diff --git a/nss/README b/nss/README index 18267eb..77bc817 100644 --- a/nss/README +++ b/nss/README @@ -61,14 +61,13 @@ The direct link: == libsqlite3 == -The problem described here was found on Mac with OS 10.6 -NSS cannot use the system sqlite on Mac because the base line is still MacOS -10.4. That system sqlite is incompatible with the softokn3 in nss which requires -a later version of sqlite. -When we used a more current Mac SDK then we could set +The system sqlite in Mac OS X versions older than 10.6 is incompatible +with the softokn3 in nss which requires a later version of sqlite. +Since the baseline is Mac OS X 10.6 we use NSS_USE_SYSTEM_SQLITE=1 to build using the system sqlite. +The problem described here was found on Mac with OS 10.6 We cannot deliver sqlite in the lib directory of the solver. This directory is used by tools of the build environment. Using the sqlite from NSS breaks the tools if they use system libraries which are linked with the system ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Help please
Please, I need an example of a program made in java to call libreoffice spellchecker. Thank you very much.Jose. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/libxml2 external/libxslt
external/libxml2/ExternalPackage_xml2.mk |2 +- external/libxslt/ExternalPackage_xslt.mk |3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit 8ce49bb3f45d2dbae594b24c4a3b936cc4feaf09 Author: Michael Stahl mst...@redhat.com Date: Tue Oct 22 15:38:45 2013 +0200 libxml2/libxslt: no need for libfoo.so.X.Y.Z files Change-Id: I0ed69bcfee650ae403d793b27db4ad906132efed diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk index 24dd5ef..cbd06b2 100644 --- a/external/libxml2/ExternalPackage_xml2.mk +++ b/external/libxml2/ExternalPackage_xml2.mk @@ -35,9 +35,9 @@ $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,wi $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,win32/bin.msvc/xmllint.exe)) endif else # OS!=WNT -$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.so.2.7.6,.libs/libxml2.so.2.7.6)) $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.so.2,.libs/libxml2.so.2.7.6,xml2)) $(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.so,.libs/libxml2.so.2.7.6)) $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) endif + # vim: set noet sw=4 ts=4: diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk index c9586b8..909405e 100644 --- a/external/libxslt/ExternalPackage_xslt.mk +++ b/external/libxslt/ExternalPackage_xslt.mk @@ -42,12 +42,11 @@ $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,w $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,win32/bin.msvc/xsltproc.exe)) endif else # OS!=WNT -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.so.1.1.26,libxslt/.libs/libxslt.so.1.1.26)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.26)) $(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.so,libxslt/.libs/libxslt.so.1.1.26)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.so.0.8.15,libexslt/.libs/libexslt.so.0.8.15)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.15)) $(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.so,libexslt/.libs/libexslt.so.0.8.15)) $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc)) endif + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/misc/syntaxhighlight.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1cbe2313edda8a04f0fe233b4a29ef4e2485f557 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 22 15:55:21 2013 +0200 Terminating NUL at end of its buffer is not considered part of OUString Change-Id: I3eb11659d1bd45327b66abb567e3ccf132d31915 diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index 1995cd4..82fc060 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -540,7 +540,7 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes reType, // All other will remain TT_UNKNOWN // Save end position -rpEndPos = mpActualPos; +rpEndPos = *mpActualPos == CHAR_EOF ? mpActualPos - 1 : mpActualPos; return sal_True; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/basflt/fltini.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c9bca105cae2768fc8b80ed35fcbb6ed11391c9a
Author: Michael Stahl mst...@redhat.com
Date: Tue Oct 22 16:30:29 2013 +0200
sw: try to fix Android tinderbox re String
Change-Id: I73ab199eb12a89373ca75cb659a77550d3512653
diff --git a/sw/source/filter/basflt/fltini.cxx
b/sw/source/filter/basflt/fltini.cxx
index 897006f..9b6cc60 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -671,7 +671,7 @@ void SwAsciiOptions::WriteUserData(OUString rStr)
extern C {
Reader *ImportRTF();
-void ExportRTF( const String, const String rBaseURL, WriterRef );
+void ExportRTF( const OUString, const OUString rBaseURL, WriterRef );
Reader *ImportDOC();
void ExportDOC( const OUString, const OUString rBaseURL, WriterRef );
sal_uLong SaveOrDelMSVBAStorage_ww8( SfxObjectShell, SotStorage,
sal_Bool, const OUString );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ATTENTION, creators of mysql-connector-ooo.oxt (--enable-ext-mariadb-connector)
Top post: I am the one that created the Linux 32 bit and 64 bit version of the extension. However, I no longer have 24/7 access to the Internet so I can not create the updates to either extension. Please advise. --Dan On 10/19/2013 05:52 PM, Lionel Elie Mamane wrote: If you use the LO git repo or release tarballs to build the mysql-connector-ooo.oxt extension (via --enable-ext-mariadb-connector, formerly --enable-ext-mysql-connector) then use/distribute it, then please be aware that as a consequence of http://bugs.freedesktop.org/70496 I have *disabled* internal libmariadb (client library) in favour of system libmysqlclient. Please use libmysqlclient, and not libmariadb, due to the above bug, which leads to crashes/freezes. I (and your users) would appreciate if you regenerated your builds. To build off the master branch, make sure you have: commit 02a11749da521e8e2099b464c0fcbebce9e95e22 Author: Lionel Elie Mamane lio...@mamane.lu Date: Sat Oct 19 22:57:40 2013 +0200 fdo#70496 revert to using libmysqlclient Change-Id: I5b98b5e7840e4f1c6005aee0c1f43ef814ecf77b or newer, then configure with: --enable-ext-mariadb-connector --with-system-mariadb --enable-bundle-mariadb GNU/Linux distributions will want to use --disable-bundle-mariadb (which is the default), while people distributing an .oxt for general consumption (cross-distro GNU/Linux, MacOS X, Microsoft Windows, ...) will want --enable-bundle-mariadb. To build of the libreoffice-4-1 branch, use the feature/base-preview branch or cherry-pick from master: commit 02a11749da521e8e2099b464c0fcbebce9e95e22 Author: Lionel Elie Mamane lio...@mamane.lu Date: Sat Oct 19 22:57:40 2013 +0200 fdo#70496 revert to using libmysqlclient Change-Id: I5b98b5e7840e4f1c6005aee0c1f43ef814ecf77b Then, proceed as with master. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 62525] Convert manual refcounting / copy-on-write implementations to cow_wrapper
https://bugs.freedesktop.org/show_bug.cgi?id=62525 Noel Grandin noelgran...@gmail.com changed: What|Removed |Added Whiteboard|EasyHack,DifficultyInterest |EasyHack |ing,SkillCpp,TopicCleanup |DifficultyInteresting |target:4.1.0|SkillCpp TopicCleanup ||target:4.1.0 -- 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-commits] mso-dumper.git: src/docdirstream.py src/docrecord.py src/globals.py test/doc
src/docdirstream.py | 20
src/docrecord.py |6 +++---
src/globals.py |7 ++-
test/doc/pass/novell717594-2.doc |binary
4 files changed, 21 insertions(+), 12 deletions(-)
New commits:
commit a3d4647e737f2640c96062cd481797fa71ba5ba4
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 22 17:29:08 2013 +0200
fix DOCDirStream::getString()
For all the other methods that read numbers, the getFoo variant just
reads the memory, while the readFoo version also adjusts the stream
position. Do the same for strings: make getString() not adjust the
stream position, add a readString() that does so and adapt callers.
With that, we can use the new getString() in DopTypography, and then
seek to the expected position, without trying to figure out what the new
position is.
Also, remove xml mode in globals::getUTF8FromUTF16(): that was used by
docdirstream only, and now even that no longer uses it.
diff --git a/src/docdirstream.py b/src/docdirstream.py
index 5cf1493..e73c935 100644
--- a/src/docdirstream.py
+++ b/src/docdirstream.py
@@ -120,21 +120,33 @@ class DOCDirStream:
self.pos += 8
return ret
-def getString(self, limit = None):
+def __getString(self, limit):
bytes = []
count = 0
+pos = self.pos
while True:
if (not limit is None) and count == limit:
break
-i = self.readuInt8()
-j = self.readuInt8()
+i = self.getuInt8(pos = pos)
+pos += 1
+j = self.getuInt8(pos = pos)
+pos += 1
if i != 0 or j != 0:
bytes.append(i)
bytes.append(j)
else:
break
count += 1
-return globals.getUTF8FromUTF16(.join(map(lambda x: chr(x), bytes)),
xml = True)
+return
(self.quoteAttr(globals.encodeName(globals.getUTF8FromUTF16(.join(map(lambda
x: chr(x), bytes), pos)
+
+def getString(self, limit = None):
+ret, pos = self.__getString(limit)
+return ret
+
+def readString(self, limit = None):
+ret, pos = self.__getString(limit)
+self.pos = pos
+return ret
def getBit(self, byte, bitNumber):
return (byte (1 bitNumber)) bitNumber
diff --git a/src/docrecord.py b/src/docrecord.py
index 04cf8c0..a0d3ec3 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -2035,10 +2035,10 @@ class DopTypography(DOCDirStream):
self.printAndSet(cchLeadingPunct, self.readInt16())
self.printAndSet(rgxchFPunct,
self.getString(self.cchFollowingPunct), hexdump = False)
-self.pos += (202 - 2 * self.cchFollowingPunct)
+self.pos += 202
self.printAndSet(rgxchLPunct, self.getString(self.cchLeadingPunct),
hexdump = False)
-self.pos += (102 - 2 * self.cchLeadingPunct)
+self.pos += 102
print '/dopTypography'
assert self.pos == self.dop.pos + DopTypography.size
@@ -2514,7 +2514,7 @@ class FFN(DOCDirStream):
self.pos += 10
FontSignature(self.bytes, self.pos).dump()
self.pos += 24
-print 'xszFfn value=%s/' % self.getString()
+print 'xszFfn value=%s/' % self.readString()
print '/ffn'
class SttbfFfn(DOCDirStream):
diff --git a/src/globals.py b/src/globals.py
index 31e995a..68aae93 100644
--- a/src/globals.py
+++ b/src/globals.py
@@ -412,7 +412,7 @@ def getDouble (bytes):
return struct.unpack('d', text)[0]
-def getUTF8FromUTF16 (bytes, xml = False):
+def getUTF8FromUTF16 (bytes):
# little endian utf-16 strings
byteCount = len(bytes)
loopCount = int(byteCount/2)
@@ -431,10 +431,7 @@ def getUTF8FromUTF16 (bytes, xml = False):
try:
text += unicode(code, 'utf-8')
except UnicodeDecodeError:
-close =
-if xml:
-close=/
-text += %d invalid chars%s%(len(code), close)
+text += %d invalid chars%len(code)
return text
class StreamWrap(object):
diff --git a/test/doc/pass/novell717594-2.doc b/test/doc/pass/novell717594-2.doc
new file mode 100644
index 000..03c455d
Binary files /dev/null and b/test/doc/pass/novell717594-2.doc differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d6ee64b75581cbeb92534271ee6f4e87f07aa5cd Author: László Németh nem...@numbertext.org Date: Tue Oct 22 17:34:23 2013 +0200 librelogo: fix black (not refreshed) invisible filling color Change-Id: Iabfd91f7c72f3dc30f9f1cebe3dfb45a7d1f6763 Reviewed-on: https://gerrit.libreoffice.org/6381 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index f0b78bf..84be810 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -48,7 +48,7 @@ __COLORS__ = ['BLACK', 0x00], ['SILVER', 0xc0c0c0], ['GRAY', 0x808080], \ ['AQUA', 0x00], ['PINK', 0xffc0cb], ['TOMATO', 0xff6347], \ ['ORANGE', 0xffa500], ['GOLD', 0xffd700], ['VIOLET', 0x9400d3], \ ['SKYBLUE', 0x87ceeb], ['CHOCOLATE', 0xd2691e], ['BROWN', 0xa52a2a], \ -['INVISIBLE', 0xff00] +['INVISIBLE', 0x] __STRCONST__ = [i[0] for i in __COLORS__] + ['NONE', 'BEVEL', 'MITER', 'ROUNDED', 'SOLID', 'DASH', 'DOTTED', 'BOLD', 'ITALIC', 'UPRIGHT', 'NORMAL', HOUR, PT, INCH, MM, CM] __SLEEP_SLICE_IN_MILLISECONDS__ = 500 __PT_TO_TWIP__ = 20 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - basctl/source comphelper/source helpcompiler/source include/comphelper svtools/source writerfilter/source
basctl/source/basicide/baside2b.cxx | 82 +
comphelper/source/misc/syntaxhighlight.cxx| 28 ++
helpcompiler/source/BasCodeTagger.cxx | 12 +-
include/comphelper/syntaxhighlight.hxx| 21 ++--
svtools/source/edit/editsyntaxhighlighter.cxx |8 -
writerfilter/source/doctok/Dff.cxx| 121 --
writerfilter/source/doctok/Dff.hxx| 34 ---
7 files changed, 79 insertions(+), 227 deletions(-)
New commits:
commit a4d39c8a2938b7d2b4d4a07e3718c3c1a5fc8df7
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 22 18:13:38 2013 +0200
writerfilter: remove unused DffBlock class in doctok
Change-Id: I4b8cd7d7166f100bd718d2bf00ae44d347000f6d
diff --git a/writerfilter/source/doctok/Dff.cxx
b/writerfilter/source/doctok/Dff.cxx
index 202bbd1..a2dd077 100644
--- a/writerfilter/source/doctok/Dff.cxx
+++ b/writerfilter/source/doctok/Dff.cxx
@@ -323,127 +323,6 @@ Sprm::Kind DffRecord::getKind()
return Sprm::UNKNOWN;
}
-DffBlock::DffBlock(WW8Stream rStream, sal_uInt32 nOffset,
- sal_uInt32 nCount, sal_uInt32 nPadding)
-: WW8StructBase(rStream, nOffset, nCount), mnPadding(nPadding)
-{
-}
-
-DffBlock::DffBlock(WW8StructBase * pParent, sal_uInt32 nOffset,
- sal_uInt32 nCount, sal_uInt32 nPadding)
-: WW8StructBase(pParent, nOffset, nCount), mnPadding(nPadding)
-{
-}
-
-DffBlock::DffBlock(const DffBlock rSrc)
-: WW8StructBase(rSrc), writerfilter::ReferenceProperties(rSrc),
- mnPadding(rSrc.mnPadding)
-{
-}
-
-Records_t DffBlock::findRecords(sal_uInt32 nType, bool bRecursive, bool bAny)
-{
-Records_t aResult;
-
-findRecords(nType, aResult, bRecursive, bAny);
-
-return aResult;
-}
-
-void DffBlock::findRecords
-(sal_uInt32 nType, Records_t rRecords, bool bRecursive, bool bAny)
-{
-Records_t::iterator aIt = begin();
-
-while (aIt != end())
-{
-DffRecord::Pointer_t pPointer(*aIt);
-
-if (bAny || pPointer-getRecordType() == nType)
-rRecords.push_back(pPointer);
-
-if (bRecursive)
-pPointer-findRecords(nType, rRecords, bRecursive,
- bAny);
-
-++aIt;
-}
-}
-
-void DffBlock::resolve(Properties rHandler)
-{
-Records_t::iterator aIt;
-
-for (aIt = begin(); aIt != end(); ++aIt)
-{
-DffRecord * pDff = aIt-get();
-rHandler.sprm(*pDff);
-}
-}
-
-DffRecord::Pointer_t DffBlock::getShape(sal_uInt32 nSpid)
-{
-DffRecord::Pointer_t pResult;
-
-Records_t aRecords = findRecords(0xf004);
-Records_t::iterator aIt;
-for (aIt = aRecords.begin(); aIt != aRecords.end(); ++aIt)
-{
-DffRecord::Pointer_t pPointer = *aIt;
-
-Records_t aFSPs = pPointer-findRecords(0xf00a);
-Records_t::iterator aItFSP = aFSPs.begin();
-
-if (aItFSP != aFSPs.end())
-{
-DffFSP * pFSP = dynamic_castDffFSP *((*aItFSP).get());
-
-if (pFSP-get_shpid() == nSpid)
-{
-pResult = pPointer;
-
-break;
-}
-}
-}
-
-return pResult;
-}
-
-DffRecord::Pointer_t DffBlock::getBlip(sal_uInt32 nBlip)
-{
-DffRecord::Pointer_t pResult;
-
-if (nBlip 0)
-{
-nBlip--;
-
-Records_t aRecords = findRecords(0xf007);
-
-if (nBlip aRecords.size())
-{
-pResult = aRecords[nBlip];
-}
-}
-
-return pResult;
-}
-
-Records_t::iterator DffBlock::begin()
-{
-return mRecords.begin();
-}
-
-Records_t::iterator DffBlock::end()
-{
-return mRecords.end();
-}
-
-string DffBlock::getType() const
-{
-return DffBlock;
-}
-
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/Dff.hxx
b/writerfilter/source/doctok/Dff.hxx
index 3cb66e9..cf78ff7 100644
--- a/writerfilter/source/doctok/Dff.hxx
+++ b/writerfilter/source/doctok/Dff.hxx
@@ -29,8 +29,6 @@ namespace doctok
{
using std::vector;
-class DffBlock;
-
class DffRecord : public WW8StructBase, public
writerfilter::ReferenceProperties,
public Sprm
{
@@ -92,38 +90,6 @@ public:
typedef vectorDffRecord::Pointer_t Records_t;
-class DffBlock : public WW8StructBase,
- public writerfilter::ReferenceProperties
-{
-sal_uInt32 mnPadding;
-
-Records_t mRecords;
-
-public:
-typedef boost::shared_ptrDffBlock Pointer_t;
-
-DffBlock(WW8Stream rStream, sal_uInt32 nOffset, sal_uInt32 nCount,
sal_uInt32 nPadding);
-DffBlock(WW8StructBase * pParent, sal_uInt32 nOffset, sal_uInt32 nCount,
sal_uInt32 nPadding);
-DffBlock(const DffBlock rSrc);
-virtual ~DffBlock() {}
-
-Records_t findRecords(sal_uInt32 nType, bool bRecursive = true,
- bool bAny = false);
-
-void findRecords(sal_uInt32 nType, Records_t rRecords,
- bool bRecursive = true, bool bAny = false);
-
-
[Libreoffice-commits] core.git: Branch 'private/moggi/abstract-chart-rendering' - 2 commits - chart2/inc chart2/source
chart2/inc/ChartView.hxx |3 +++
chart2/source/tools/AxisHelper.cxx|1 -
chart2/source/view/main/ChartView.cxx | 14 --
3 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit b0ecb84453326a6f830cd053a14216d9d37da0cf
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Oct 22 19:03:23 2013 +0200
dbgutil build fix
Change-Id: I54abcc2a9fbe7d30bdf64d194df1a435d21f24ac
diff --git a/chart2/source/tools/AxisHelper.cxx
b/chart2/source/tools/AxisHelper.cxx
index cb8c9ef..6bbf472 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -98,7 +98,6 @@ bool AxisHelper::isLogarithmic( const Reference XScaling
xScaling )
chart2::ScaleData AxisHelper::getDateCheckedScale( const Reference
chart2::XAxis xAxis, ChartModel rModel )
{
-OSL_ENSURE(xChartModel.is(),missing chart model);
ScaleData aScale = xAxis-getScaleData();
Reference chart2::XCoordinateSystem xCooSys(
ChartModelHelper::getFirstCoordinateSystem( rModel ) );
if( aScale.AutoDateAxis aScale.AxisType == AxisType::CATEGORY )
commit 1d1890a32e4cb04956396ff07bd7ea417be0b319
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Oct 22 19:02:46 2013 +0200
we need to init manually now
Change-Id: I1374814e549dcbb33de75ffa118d1eccfd168893
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 916b02a..8997bd0 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -76,6 +76,9 @@ class ChartView : public ::cppu::WeakImplHelper10
, public ExplicitValueProvider
, private SfxListener
{
+private:
+void init();
+
public:
ChartView(::com::sun::star::uno::Reference
::com::sun::star::uno::XComponentContext const xContext,
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 8017109..f501aa9 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -165,15 +165,11 @@ ChartView::ChartView(
, m_bSdrViewIsInEditMode(sal_False)
, m_aResultingDiagramRectangleExcludingAxes(0,0,0,0)
{
+init();
}
-void SAL_CALL ChartView::initialize( const uno::Sequence uno::Any
aArguments )
-throw ( uno::Exception, uno::RuntimeException)
+void ChartView::init()
{
-OSL_PRECOND(aArguments.getLength() = 1,need 1 argument to initialize the
view: xModel);
-if( !(aArguments.getLength() = 1) )
-return;
-
if( !m_pDrawModelWrapper.get() )
{
SolarMutexGuard aSolarGuard;
@@ -184,6 +180,12 @@ void SAL_CALL ChartView::initialize( const uno::Sequence
uno::Any aArguments
}
}
+void SAL_CALL ChartView::initialize( const uno::Sequence uno::Any )
+throw ( uno::Exception, uno::RuntimeException)
+{
+init();
+}
+
ChartView::~ChartView()
{
// #i120831#. In ChartView::initialize(), m_xShapeFactory is created from
SdrModel::getUnoModel() and indirectly
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/tools include/vcl vcl/source
include/tools/string.hxx |3 ---
include/vcl/menu.hxx |4 ++--
vcl/source/window/menu.cxx |4 ++--
3 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit b566f08a480d2af3c71dad9b33f0b69adafaf0f1
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 22 16:33:21 2013 +0100
ImplCalcSize etc can be const
Change-Id: Idd1e33b6da8be9575e74701735f0dbc742849c07
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 78a1644..454ddd0 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -148,7 +148,7 @@ protected:
SAL_DLLPRIVATE Menu*ImplGetStartMenu();
SAL_DLLPRIVATE Menu*ImplFindSelectMenu();
SAL_DLLPRIVATE Menu*ImplFindMenu( sal_uInt16 nId );
-SAL_DLLPRIVATE Size ImplCalcSize( Window* pWin );
+SAL_DLLPRIVATE Size ImplCalcSize( const Window* pWin );
SAL_DLLPRIVATE sal_Bool ImplIsVisible( sal_uInt16 nPos ) const;
SAL_DLLPRIVATE sal_Bool ImplIsSelectable( sal_uInt16 nPos )
const;
SAL_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const;
@@ -168,7 +168,7 @@ protected:
// returns native check and option menu symbol height in rCheckHeight and
rRadioHeight
// return value is maximum width and height of checkboxes and radiobuttons
-SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize( Window*,
long rCheckHeight, long rRadioHeight ) const;
+SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize( const
Window*, long rCheckHeight, long rRadioHeight ) const;
// returns native submenu arrow size and spacing from right border
// return value is whether it's supported natively
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 23545a9..f567ba3 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2252,7 +2252,7 @@ void Menu::SetAccessible( const
::com::sun::star::uno::Reference ::com::sun::st
mxAccessible = rxAccessible;
}
-Size Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long rCheckHeight,
long rRadioHeight ) const
+Size Menu::ImplGetNativeCheckAndRadioSize( const Window* pWin, long
rCheckHeight, long rRadioHeight ) const
{
long nCheckWidth = 0, nRadioWidth = 0;
rCheckHeight = rRadioHeight = 0;
@@ -2367,7 +2367,7 @@ void Menu::ImplRemoveDel( ImplMenuDelData rDel )
// ---
-Size Menu::ImplCalcSize( Window* pWin )
+Size Menu::ImplCalcSize( const Window* pWin )
{
// | Check/Radio/Image| Text| Accel/Popup|
commit 7e322f2d784de63085a84c0012ed5096ad863b83
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 22 14:59:40 2013 +0100
drop unused StringCompare
Change-Id: I09a350dbd35a04f737d360bff7804dab74fdce82
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 1757a64..0c4571d 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -24,15 +24,12 @@
/***
* THIS CODE IS DEPRECATED. DO NOT USE IT IN ANY NEW CODE.
- * There will not be any fixes to the code here.
**/
#define STRING_NOTFOUND((xub_StrLen)0x)
#define STRING_LEN ((xub_StrLen)0x)
#define STRING_MAXLEN ((xub_StrLen)0x)
-enum StringCompare { COMPARE_LESS = -1, COMPARE_EQUAL = 0, COMPARE_GREATER = 1
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fc66932b69e67737ace6efcdc4e200bcb66e7752 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Oct 22 19:12:30 2013 +0200 Updated core Project: translations 8a78967669fd1fae870d63c156411ee523b4707e diff --git a/translations b/translations index 6e9c933..8a78967 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 6e9c9338c74a57ff1b5c63562e4596a33fbd627f +Subproject commit 8a78967669fd1fae870d63c156411ee523b4707e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.3.2'
Tag 'libreoffice-4.1.3.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-10-22 18:49 -0700 Tag libreoffice-4.1.3.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSZrqzAAoJEPQ0oe+v7q6jW9MP/Al/CU3EN2WAZWItUu4NzEjd czx3XYVaynqIl2Cf26rdzaYReepSba6y/qQszd6EEgq70D5XID41wZGojzQufiU0 33h+kjyiy2SwA9u0G1DYpYzxBMrbTknpzDPVcBwQnl5SLqRFCTJuOhPzcLYWbW/v nvh/ZOcOwuWDXrnkbNW7TWEHBW7IW3Wxa2HyBYqQxhntKXP4J1rvu6HebIprLptd OlYE67Qw4vQ8cJ6b0EOda6LAaPLdCTbTccWaxvEELUEP5cP82MrgZcegb3PfPpFw +WoeDVO1qTCy6JN5vkS/hYZ1qmBjHrFfz/JIpq4YVGNLehNs/UuR0mjtwgqjwG/V 1lBPiF468zbeaII9Ia3FBIEZtSyDfCf1mqrevbQvR4+7aJBfDjlLr8B1pY0BT+7i aArSlm3+G/Da8AOs6SzfvyWTp9wt694Fodok+Vy6Uj/W1/F0if9uhzR4ovY/GpOz axjvAX+VukQsQR7FuAZkRsDJGN703Ho9Uv+xGQENNTpjL53Mv9yOfvV1zUT27yge 6l56dHI1vEPBHFQ/Bdx0SeMmoVnl2dBaVULmuwQjpjcgSjx7r/DCUakPPw1dVGN3 akKaU7Ou1CYZt3Wf+uW2lAy/lqUHHCMPB4kmsi3o0EZk6h8LRsaytews+8GgucTX UTFop8dIuKZyPmxNwgMZ =bDdk -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-20: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.3.2'
Tag 'libreoffice-4.1.3.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-10-22 18:49 -0700 Tag libreoffice-4.1.3.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSZrrBAAoJEPQ0oe+v7q6jEQwP/28juR4DopOeFifIU1AI8SHf 42pqcBgLNuyjkMqgZf/FyVckbyrGF3WYX9+xwJtdGUDErTvqIGChi41juorTh61h /qTFzmjDARStzKtalroddFAiligKPSD+6L3Fqjrh7BSUSMaaavkmKFE801/5R4c2 rIFKYERRDSpwvh7I1wKxP77XgC8+P6ZHznVykT56NH3FRC6P0S13ObYhub35lL7I mR+ZJiHmzGrRFjp9aiejk9Ck8v+t29T2WDI6R0dzd+Zb2XywhpFoJpY0P+9qsFBy pnw3z3Zu93Bb2DEMJJ2gclURp4+M4CUWPhVpMyz8maeVPR4oihKTJaQHwwhBXOMI MAjKq8FVbHiP814THec270PT9tlsrchipINnPHCs0wZLtmzeksExTfQ61D/KI2uG 1rtWwVY+g9qOTKVndQa0bYHn7MVIbAE5D4FG+UKH33tzvoPRnc4WrNBArDbDtnxG OQT5YrM6pwLjZTjomDgAD7Y6wxvpjgkKEJFr0W1kltybZJa6DAGz8gcsPcpzsexe pRNMIQfN5FRyqMSKJHta6+mZ4wOLjSDd9QZo/f7v/QZG8QlcB/Bs5qu2xBhp2rXF K39tjB972Dfl/k7q0kpLr0y8ooLWoz6PI+u8S2eeyOnDWpH5ls12YvMs981DgkP5 qnpcRW6nLSB2T30duC2C =DWFH -END PGP SIGNATURE- Changes since libreoffice-4.1.0.1-619: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.3.2'
Tag 'libreoffice-4.1.3.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-10-22 18:49 -0700 Tag libreoffice-4.1.3.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSZrq5AAoJEPQ0oe+v7q6j5SMP/2Rbl11ePjd36rR4Z3nkVTCz SBYvOyglwL1YYdPd287NFpq9gO6/8p7kp3IHfDzADurLjUOa0w0wcZxCQH25mlZz FL9gMOVvIRE6lHvUXvYmHOWYYUw6bJ8by0aT+hC/ar0F2hIS9cA1xsWLY5/sgQyI V6RLupXcl7W3+eIQPNFTDaZiy7xWkOLAVH5hxFCVoqp36TbT6xpr6QjFQ/stTsCK yZW6gDzSPN1jGf7l1DuN5rFGYWBdukMYKKEAzdV17wv8L+nWYje0pRgEpCwykpjY QxtEq65dM0+ZZUSrNZ+xCDdxSJay07MYjop2Giz9ajO/+sz8uWTGLy0l9yKR3n4n J8BhT+rbZOuhnG82YVp+lGJwF0JiJmNTbRISAW508aMVFdTKRHL3PoYw2MQT/Mn5 BGyV28+ZGGVAph1SAdwwPf1/RLY+IM0qN0/aGzFRBORn5ShIG+AX7s/23i8DJ4XW wnPVgJfHHddbcuzCMRV78uDRYxE67aL/2vyse0JAJLnR4NlG5XiZ8OvA5D7NNatt bG4ZDXffrCVGbG8ABECWMbTW6bJzWOlCeu//RdztyzLQpXnPAF6kQogWifIrQmWF 6C72RHDDuKqRYWYdjdLMOsQLQMIMvM/FvbxeMedzgnw3voR9DVraXp1B1dcFVbfG o5x5n2b0r/ivQe2A5Npt =iACM -END PGP SIGNATURE- Changes since cp-4.1-branch-point-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.3.2'
Tag 'libreoffice-4.1.3.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-10-22 18:49 -0700 Tag libreoffice-4.1.3.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSZrq9AAoJEPQ0oe+v7q6jfaMP/3lcq20KvBdtkfaegzjgGSOY FEBklYPApNKeekK4niM/aFGYPDgc1TieuwN5o/OQjqxrCivACrOOBO2UFRL71IQS MHtxYjNyhK/smaCpmOsCS4eLp221cwQLVjHWWCyzZ7qKz6EWCFt1pWG0DDPAHpQI 2yemdASjJeEkivdVDww2+B06S9pfghcwPdYdKgPotirNCo+xwNB5Osd9+ZMUJCyp 1vTJu6v4J7OFMLIpzzlIlzzYwq1cFAObUal24FuLrHXpFyOyAvvFPqSLkJsAsB+E u9bNbe9vbGsZtCNo2lXScrk4PAu+mVgIkkSIz0p0Ezxv/da+KYNCkjflUXRThdb6 dvisOoGqebcmiMLfesQnV7+K4/W3nZpk2H1nPbrcwmUS0AQOAw2TAn0ST5qC0bXg 0U7XXpX3u3boKUr9zBnBbsrxaBDca5D8gip5+6+jrJI5wftUtDiqhN9FL36gGdxj OFnzmZ7dLWQ297CMxcP/+P11FGLGp69OzKvETK8b2RC593I+meJNXjOJrGU4xKK/ N/6yH5pgVm8C0o50cqLmv8ALjXlo+UxSpgnp8HLEF6NlhIcwj46Zk7VoxQxgYXHT HaZ77Up/ic4SFCnik74mVDv6kuEqKwBTop/qk/1NlR8jFuKNikU/QR6gTLh41YEB MWZ0g8wDiAineMKTv1ZL =UMg8 -END PGP SIGNATURE- Changes since cp-4.1-branch-point-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 57ba637e90187852e3c29ba9aff7f84c2043901e Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Oct 22 19:52:35 2013 +0200 bump product version to 4.1.3.2+ Change-Id: Ic18f174a709668e68cf107840b058d7207ac8ab9 diff --git a/configure.ac b/configure.ac index 6f062c5..168e8c4 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.1.3.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.3.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) save_CC=$CC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/abstract-chart-rendering' - chart2/source
chart2/source/view/inc/DummyXShape.hxx |3 ++-
chart2/source/view/main/DummyXShape.cxx | 17 +
2 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 73e5583ca37f009f7d7e2e720655d1bd46a06103
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Oct 22 19:54:44 2013 +0200
fix crash in opengl backend
Change-Id: I1257f4568e55ca545e96bda8a53f272ba8e1f0b0
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index 0d56924..6cc9630 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -100,7 +100,7 @@ class DummyChart;
struct OpenglContext;
-class DummyXShape : public cppu::WeakImplHelper6
+class DummyXShape : public cppu::WeakAggImplHelper6
::com::sun::star::drawing::XShape,
com::sun::star::beans::XPropertySet,
com::sun::star::beans::XMultiPropertySet,
@@ -364,6 +364,7 @@ class DummyXShapes : public DummyXShape, public
com::sun::star::drawing::XShapes
public:
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type rType )
throw(::com::sun::star::uno::RuntimeException);
+virtual com::sun::star::uno::Any SAL_CALL queryAggregation( const
com::sun::star::uno::Type rType )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire() throw();
virtual void SAL_CALL release() throw();
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 0708ad8..164c10f4 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -396,12 +396,29 @@ DummyChart* DummyChart::getRootShape()
return this;
}
+#define QUERYINT( xint ) \
+if( rType == ::getCppuType((const uno::Reference xint *)0) ) \
+aAny = uno::Reference xint (this)
+
uno::Any DummyXShapes::queryInterface( const uno::Type rType )
throw(uno::RuntimeException)
{
return DummyXShape::queryInterface(rType);
}
+uno::Any DummyXShapes::queryAggregation( const uno::Type rType )
+throw(uno::RuntimeException)
+{
+uno::Any aAny;
+
+//QUERYINT( drawing::XShapeGroup );
+QUERYINT( drawing::XShapes );
+else
+return DummyXShape::queryAggregation( rType );
+
+return aAny;
+}
+
void DummyXShapes::acquire()
throw()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/abstract-chart-rendering' - chart2/source
chart2/source/view/inc/DummyXShape.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit e51f864665b0f6d4ee9583a333d72f65d40d4e22 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Oct 22 19:56:47 2013 +0200 removed unused variable Change-Id: I74af65aba6d19e39f889a28b15d04f7e293168c5 diff --git a/chart2/source/view/inc/DummyXShape.hxx b/chart2/source/view/inc/DummyXShape.hxx index 6cc9630..d4147de 100644 --- a/chart2/source/view/inc/DummyXShape.hxx +++ b/chart2/source/view/inc/DummyXShape.hxx @@ -432,7 +432,6 @@ private: bool initWindow(); bool initOpengl(); -OpenglContext* mpContext; boost::scoped_ptrWindow mpWindow; boost::scoped_ptrSystemChildWindow pWindow; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl' - chart2/Library_chartopengl.mk
chart2/Library_chartopengl.mk |5 + 1 file changed, 5 insertions(+) New commits: commit 8b6140ca92cb6013ebdb88efbd5a1427aae67fcc Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Oct 22 20:19:41 2013 +0200 we need to depend on mesa headers for windows unix without opengl Change-Id: I0144586864045b5f6091dc49ed7e1e1a73705ce1 diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk index d1f2c4b..0aa88e7b0 100644 --- a/chart2/Library_chartopengl.mk +++ b/chart2/Library_chartopengl.mk @@ -19,6 +19,11 @@ $(eval $(call gb_Library_set_include,chartopengl,\ $(eval $(call gb_Library_use_sdk_api,chartopengl)) +$(eval $(call gb_Library_use_externals,chartopengl,\ + boost_headers \ + mesa_headers \ +)) + $(eval $(call gb_Library_use_libraries,chartopengl,\ chartcore \ cppu \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/abstract-chart-rendering' - chart2/Library_chartopengl.mk
chart2/Library_chartopengl.mk |5 + 1 file changed, 5 insertions(+) New commits: commit c95a9570a93e6f0bb0b6efc65745ea18fedec3eb Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Oct 22 20:19:41 2013 +0200 we need to depend on mesa headers for windows unix without opengl Change-Id: I0144586864045b5f6091dc49ed7e1e1a73705ce1 diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk index d1f2c4b..0aa88e7b0 100644 --- a/chart2/Library_chartopengl.mk +++ b/chart2/Library_chartopengl.mk @@ -19,6 +19,11 @@ $(eval $(call gb_Library_set_include,chartopengl,\ $(eval $(call gb_Library_use_sdk_api,chartopengl)) +$(eval $(call gb_Library_use_externals,chartopengl,\ + boost_headers \ + mesa_headers \ +)) + $(eval $(call gb_Library_use_libraries,chartopengl,\ chartcore \ cppu \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx
include/svx/imapdlg.hxx | 21 +++-- 1 file changed, 3 insertions(+), 18 deletions(-) New commits: commit 67b368c54ab2a7e2d29231e20d89ddfdc2f263f6 Author: Thomas Arnhold tho...@arnhold.org Date: Tue Oct 22 12:13:09 2013 +0200 imapdlg.hxx: cleanup Change-Id: I27240d18099f73e6a327ad1c259ddc3f32a02ce6 Reviewed-on: https://gerrit.libreoffice.org/6387 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 5c1fdfd..3c1c1cd 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -17,32 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#ifndef _IMAPDLG_HXX_ -#define _IMAPDLG_HXX_ +#ifndef INCLUDED_SVX_IMAPDLG_HXX +#define INCLUDED_SVX_IMAPDLG_HXX #include svtools/inettbc.hxx #include sfx2/childwin.hxx #include sfx2/ctrlitem.hxx #include sfx2/basedlgs.hxx - #include vcl/fixed.hxx - #include vcl/combobox.hxx - #include vcl/edit.hxx - #include vcl/toolbox.hxx - #include vcl/status.hxx #include svx/svxdllapi.h #include vector - -#ifndef _GOMISC_HXX class ImageMap; -#endif - /* |* @@ -66,9 +56,6 @@ class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow }; -#ifndef _REDUCED_IMAPDLG_HXX_ -#define _REDUCED_IMAPDLG_HXX_ - class SvxIMapDlg; class SvxIMapDlgItem : public SfxControllerItem @@ -173,8 +160,6 @@ public: GetWindow() ) ) -#endif // _REDUCED_IMAPDLG_HXX_ -#endif // _IMAPDLG_HXX_ - +#endif // INCLUDED_SVX_IMAPDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: cppunit framework
Ok. Thank you for explanation. :-) On Oct 22, 2013 5:41 AM, Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey, On Mon, Oct 21, 2013 at 06:20:01PM -0200, José Guilherme Vanz v...@libreoffice.org wrote: has libo its own cppunit? I was thinking that it uses the old project of cppunit in the sourceforge.com Markus knows the details, but in short the new upstream is on freedesktop.org. So no, this is not our cppunit, even Debian plans to package from this tree, etc. OTOH yes, we can build our own cppunit during the build of LO, which is useful if the system cppunit is not built using debug STL, and LO is, for example. So more or less we are upstream now. Debian, Gentoo, Ubuntu (as Debian's downstream), Arch Linux, some BSD versions, ... already switched. We already maintained a number of patches that were not included into the upstream builds and fixed another set of problems since then. I explored different testing frameworks when we faced the decision whether to fork cppunit or switch to a different testing framework and decided that it is better to stay with cppunit. It is mature and well tested and except for a few nice to have features more or less what we need. Additionally switching testing frameworks requires to rewrite quite a large piece of our code base that is better spend improving the existing tests. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/xmloff sw/inc
include/xmloff/xmlcnimp.hxx |2 +-
sw/inc/editsh.hxx |7 +++
sw/inc/fmtcol.hxx |2 +-
sw/inc/ndtxt.hxx| 10 --
sw/inc/txtatr.hxx |3 +--
5 files changed, 10 insertions(+), 14 deletions(-)
New commits:
commit db9d9c1277fc77f3a3ea2d755bce94608b732018
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 22 21:50:37 2013 +0300
Bin some pointless comments
Change-Id: Ia7c5b1654f3decc549b363c4443863f40c3f26e6
diff --git a/include/xmloff/xmlcnimp.hxx b/include/xmloff/xmlcnimp.hxx
index fa6fcb3..6dd2117 100644
--- a/include/xmloff/xmlcnimp.hxx
+++ b/include/xmloff/xmlcnimp.hxx
@@ -24,7 +24,7 @@
#include sal/types.h
#include boost/scoped_ptr.hpp
-class SvXMLAttrCollection; //Forward declaration only.
+class SvXMLAttrCollection;
class XMLOFF_DLLPUBLIC SvXMLAttrContainerData
{
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 43987f8..35cff35 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -65,15 +65,14 @@ class SwTxtFmtColl;
class SwGrfNode;
class SwFlyFrmFmt;
-class SwFrmFmt; /// For GetTxtNodeFmts().
+class SwFrmFmt;
class SwCharFmt;
class SwExtTextInput;
-class SwRootFrm;/// For CTOR.
class Graphic;
class GraphicObject;
-class SwFmtINetFmt; /// InsertURL.
+class SwFmtINetFmt;
class SwTable;
-class SwTextBlocks; /// For GlossaryRW.
+class SwTextBlocks;
class SwFmtFtn;
class SwSection;
class SwSectionData;
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 85e54ec..280effd 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -25,7 +25,7 @@
#include boost/ptr_container/ptr_vector.hpp
#include rtl/ustring.hxx
-class SwDoc; // For friend.
+class SwDoc;
class SwFmtColl : public SwFmt
{
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 3a7f544..1e4c26e 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -46,14 +46,12 @@ namespace utl {
class SwTxtFmtColl;
class SwCntntFrm;
-class SwTxtFld; /// For GetTxtFld().
class SfxItemSet;
class SwUndoTransliterate;
-
-struct SwSpellArgs; /// for Spell(), splargs.hxx
-struct SwConversionArgs;/// for Convert(), splargs.hxx
-class SwInterHyphInfo; /// for Hyphenate(), splargs.hxx
-class SwWrongList; /// For OnlineSpelling.
+struct SwSpellArgs;
+struct SwConversionArgs;
+class SwInterHyphInfo;
+class SwWrongList;
class SwGrammarMarkUp;
class OutputDevice;
class SwScriptInfo;
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index 0536e65..bbee271 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -22,8 +22,7 @@
#include txatbase.hxx
#include calbck.hxx
-
-class SwTxtNode;// For SwTxtFld.
+class SwTxtNode;
class SwCharFmt;
namespace sw {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 10 commits - external/firebird external/liblangtag external/libxml2 external/libxslt include/postmac.h include/postx.h include/premac.h include/prex.h libxmlsec/Externa
RepositoryExternal.mk | 49 +++--
external/firebird/ExternalPackage_firebird.mk |4 --
external/liblangtag/ExternalProject_langtag.mk |7 ++-
external/libxml2/ExternalPackage_xml2.mk | 19 +
external/libxml2/libxml2-configure.patch |6 +--
external/libxslt/ExternalPackage_xslt.mk | 24 +---
external/libxslt/ExternalProject_xslt.mk |3 +
external/libxslt/libxslt-configure.patch |8 ++--
include/postmac.h |1
include/postx.h|5 --
include/premac.h |1
include/prex.h |4 --
libxmlsec/ExternalProject_xmlsec.mk|3 +
redland/ExternalProject_redland.mk |6 ++-
sc/source/filter/excel/xecontent.cxx | 12 +++---
sc/source/filter/inc/xecontent.hxx |7 +--
sfx2/source/doc/graphhelp.cxx | 10 -
solenv/gbuild/ExternalExecutable.mk|3 +
vcl/unx/generic/gdi/salgdi.cxx |6 +--
19 files changed, 76 insertions(+), 102 deletions(-)
New commits:
commit 4c3b1dc1a10952288e3f0886fc638ee48454a9ad
Author: Michael Stahl mst...@redhat.com
Date: Tue Oct 22 22:13:13 2013 +0200
postx.h: BYTE, BOOL, INT8, INT64 should no longer cause problems
Change-Id: Ifd5e918028c15c4b2b61ff1612ae27ed96f45d3b
diff --git a/include/postx.h b/include/postx.h
index 88699c0..ff5228a 100644
--- a/include/postx.h
+++ b/include/postx.h
@@ -26,10 +26,6 @@
/* X Types */
#undef Window
-#undef BYTE
-#undef INT8
-#undef INT64
-#undef BOOL
#undef Font
#undef Cursor
#undef KeyCode
commit 4853cd4991c4f27d3bbfb8dbbcc5f2c4b84ee6b0
Author: Michael Stahl mst...@redhat.com
Date: Tue Oct 22 22:08:39 2013 +0200
vcl: convert some BOOL to sal_uInt8
Change-Id: Ib0d90de832bc8006eaa62b55abb416e2d19b4782
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index eacd35b..feba94a 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -928,18 +928,18 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32
nPoly,
drawPolyLine( pPoints[i], pPtAry[i], true );
}
-sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const
BYTE* )
+sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const
sal_uInt8* )
{
return sal_False;
}
-sal_Bool X11SalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const
BYTE* )
+sal_Bool X11SalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const
sal_uInt8* )
{
return sal_False;
}
sal_Bool X11SalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*,
-const SalPoint* const*, const
BYTE* const* )
+const SalPoint* const*, const
sal_uInt8* const* )
{
return sal_False;
}
commit 93f9f1bfd10560882380970603aa934955598053
Author: Michael Stahl mst...@redhat.com
Date: Tue Oct 22 21:53:01 2013 +0200
sfx2: remove obsolete redefinitions of Win32 UINT64 etc. types
Change-Id: I6b7acb44c16bcf4d3f8bcc338cb785fb7262eae6
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 2bf194a..2b7ea66 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -23,11 +23,6 @@
#undef WB_LEFT
#undef WB_RIGHT
-#define UINT64 USE_WIN_UINT64
-#define INT64 USE_WIN_INT64
-#define UINT32 USE_WIN_UINT32
-#define INT32 USE_WIN_INT32
-
#include tools/presys.h
#if defined _MSC_VER
#pragma warning(push, 1)
@@ -38,11 +33,6 @@
#endif
#include tools/postsys.h
-#undef UINT64
-#undef INT64
-#undef UINT32
-#undef INT32
-
#endif
#include com/sun/star/uno/Exception.hpp
#include com/sun/star/datatransfer/XTransferable.hpp
commit 1bfbb58082f9b600110b4a7b7510fbd8d35fc3d4
Author: Michael Stahl mst...@redhat.com
Date: Tue Oct 22 21:40:11 2013 +0200
premac.h: remove StringPtr mangling
Change-Id: I94f5331fd00602778421ff6ba5f96cf2366cf1da
diff --git a/include/postmac.h b/include/postmac.h
index f157e67..bc16849 100644
--- a/include/postmac.h
+++ b/include/postmac.h
@@ -35,7 +35,6 @@
#undef Region
#undef SetCursor
#undef Size
-#undef StringPtr
#undef TimeValue
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/premac.h b/include/premac.h
index 3f3f9b2..e67b315 100644
--- a/include/premac.h
+++ b/include/premac.h
@@ -35,7 +35,6 @@
#define Region MacOSRegion
#define SetCursor MacOSSetCursor
#define Size MacOSSize
-#define StringPtr MacOSStringPtr
#define TimeValue MacOSTimeValue
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit eeffa03b51efaaa6361ef876bffa476e31598002
Author: Michael Stahl mst...@redhat.com
Date: Tue Oct 22 21:39:55 2013 +0200
prex.h: remove String mangling
Change-Id:
[Libreoffice-commits] core.git: 2 commits - include/touch ios/experimental sw/source vcl/inc vcl/ios
include/touch/touch-impl.h |4
include/touch/touch.h |7 -
ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj |2
ios/experimental/LibreOffice/LibreOffice/View.m| 48
+++-
sw/source/core/crsr/viscrs.cxx | 58
+-
sw/source/ui/docvw/edtwin.cxx | 31 -
vcl/inc/ios/iosinst.hxx|6 +
vcl/ios/iosinst.cxx| 26
8 files changed, 119 insertions(+), 63 deletions(-)
New commits:
commit 54ef5bd641ef5c6938b591697115d63af381ebc3
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 22 23:30:26 2013 +0300
More work on selection handling in iOS
Got the selection start and end handle dragging working... The trick was not
to call SwWrtShell::SetCursor(), but SwCrsrShell::SetCrsr(). Sounds easy but
took a lot of guessing and experimentation to figure out. Anyway, now it
does
what I had expected it to do a few das ago already.
There are glitches, especially in corner cases like if you move the start
handle past the end handle or vice versa.
more
Change-Id: Id6c1d99a4052531789bccf0d48165cfb41b89cfe
9b94c0dd55b04a7b6b3c40654562a9c51fa9b450
diff --git a/include/touch/touch-impl.h b/include/touch/touch-impl.h
index a2550b1..f786f44 100644
--- a/include/touch/touch-impl.h
+++ b/include/touch/touch-impl.h
@@ -20,6 +20,10 @@ extern C {
// Implementation of touch_lo_* functions, called on the LO thread through
// the PostUserEvent mechanism. Not called by UI thread code.
+void touch_lo_selection_start_move_impl(const void *documentHandle,
+int x,
+int y);
+
void touch_lo_selection_end_move_impl(const void *documentHandle,
int x,
int y);
diff --git a/include/touch/touch.h b/include/touch/touch.h
index f999eca..7dddaf3 100644
--- a/include/touch/touch.h
+++ b/include/touch/touch.h
@@ -113,9 +113,12 @@ void touch_lo_draw_tile(void *context, int contextWidth,
int contextHeight, int
void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state);
+// Move the start of the selection to (x,y)
+void touch_lo_selection_start_move(const void *documentHandle,
+ int x,
+ int y);
+
// Move the end of the selection to (x,y)
-// (work in progress, of course there should be a corresponding function
-// to move the start of the selection, too.)
void touch_lo_selection_end_move(const void *documentHandle,
int x,
int y);
diff --git a/ios/experimental/LibreOffice/LibreOffice/View.m
b/ios/experimental/LibreOffice/LibreOffice/View.m
index cb96e48..3a9b35b 100644
--- a/ios/experimental/LibreOffice/LibreOffice/View.m
+++ b/ios/experimental/LibreOffice/LibreOffice/View.m
@@ -154,71 +154,59 @@
- (void)panGesture:(UIPanGestureRecognizer *)gestureRecognizer
{
+const int N = self.selectionRectangleCount;
+
static enum { NONE, TOPLEFT, BOTTOMRIGHT } draggedHandle = NONE;
-static CGFloat previousX, previousY;
+static CGPoint previous;
+static CGPoint dragOffset;
CGPoint location = [gestureRecognizer locationInView:self];
CGPoint translation = [gestureRecognizer translationInView:self];
if (gestureRecognizer.state == UIGestureRecognizerStateBegan) {
-previousX = previousY = 0;
+previous = CGPointMake(0, 0);
}
CGPoint delta;
-delta.x = translation.x - previousX;
-delta.y = translation.y - previousY;
+delta.x = translation.x - previous.x;
+delta.y = translation.y - previous.y;
// NSLog(@location: (%f,%f) , drag: (%f,%f), location.x, location.y,
delta.x, delta.y);
-previousX = translation.x;
-previousY = translation.y;
+previous = translation;
if (gestureRecognizer.state == UIGestureRecognizerStateBegan
gestureRecognizer.numberOfTouches == 1) {
if (CGRectContainsPoint([self topLeftResizeHandle], location)) {
NSLog(@=== dragging TOPLEFT handle);
draggedHandle = TOPLEFT;
+dragOffset.x = location.x - self.selectionRectangles[0].origin.x;
+dragOffset.y = location.y - self.selectionRectangles[0].origin.y;
} else if (CGRectContainsPoint([self bottomRightResizeHandle],
location)) {
NSLog(@=== dragging BOTTOMRIGHT handle);
draggedHandle = BOTTOMRIGHT;
+dragOffset.x = location.x - self.selectionRectangles[N-1].origin.x;
+dragOffset.y = location.y - self.selectionRectangles[N-1].origin.y;
}
}
if (draggedHandle ==
Re: UNO API doesn't work as expected when ATT enabled
2013/10/22 Stephan Bergmann sberg...@redhat.com I'm still not sure I get you. That the catch(uno::Exception) block at cui/source/options/**optaboutconfig.cxx:234 will eventually catch an exception is obviously not unexpected. You mean, on Windows you observe that that catch block is never reached? (If yes, how do you observe that, with a debugger? If yes, are you sure the debugger does not fool you, as can happen with optimized code?) I couldn't make it work a debugger on Windows. I couldn't properly build it actually :( So I can only assume it is. So I assume recursion is not end because of up to 1.5 GB of the ram usage and crash after that. Because exit condition relies exception. Anyways If i can build LO on Windows tonight I will be a happier person... On Linux there is no crash as you said. Unresponsive UI and CPU load. But on windows program crashes without anything shown to user. It is not related to UNO I think. Any chance to present a backtrace of that crash on Windows? (I'm currently doing a local Windows build here and will try to reproduce the problem, if I manage to remember how to enable AT on Windows...) Stephan PS, any reason you dropped the mailing list from cc? Gmail's user interface tricked me on here. :) -- Efe Gürkan YALAMAN http://about.me/efegurkan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - comphelper/source desktop/source include/comphelper include/tools sd/source
comphelper/source/processfactory/processfactory.cxx | 11 ---
desktop/source/app/check_ext_deps.cxx|5 +++--
desktop/source/deployment/misc/dp_descriptioninfoset.cxx |5 ++---
desktop/source/deployment/misc/dp_misc.cxx |2 +-
include/comphelper/processfactory.hxx|8
include/tools/solar.h| 14 +++---
sd/source/core/annotations/Annotation.cxx|4 ++--
7 files changed, 11 insertions(+), 38 deletions(-)
New commits:
commit 5040ad523e0e4ad336e2449030516f5a90ea5656
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 22 23:48:51 2013 +0200
Remove unnecessary component_getProcessComponentContext C wrapper
Change-Id: I9d9f1a542dbbfc461dd27c32b57e4cad5532fab0
diff --git a/comphelper/source/processfactory/processfactory.cxx
b/comphelper/source/processfactory/processfactory.cxx
index a193a6e..32aff0f 100644
--- a/comphelper/source/processfactory/processfactory.cxx
+++ b/comphelper/source/processfactory/processfactory.cxx
@@ -99,15 +99,4 @@ Reference XComponentContext getProcessComponentContext()
} // namespace comphelper
-extern C {
-uno::XComponentContext * comphelper_getProcessComponentContext()
-{
-uno::Referenceuno::XComponentContext xRet;
-xRet = ::comphelper::getProcessComponentContext();
-if (xRet.is())
-xRet-acquire();
-return xRet.get();
-}
-} // extern C
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/check_ext_deps.cxx
b/desktop/source/app/check_ext_deps.cxx
index 4f834d32..23c6b92 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -392,7 +392,8 @@ sal_Bool Desktop::CheckExtensionDependencies()
return false;
}
-uno::Reference uno::XComponentContext xContext =
comphelper_getProcessComponentContext();
+uno::Reference uno::XComponentContext xContext(
+comphelper::getProcessComponentContext());
bool bDependenciesValid = impl_checkDependencies( xContext );
@@ -414,7 +415,7 @@ void Desktop::SynchronizeExtensionRepositories()
{
SAL_INFO( desktop.app, desktop (jl)
::Desktop::SynchronizeExtensionRepositories);
uno::Reference uno::XComponentContext context(
-comphelper_getProcessComponentContext());
+comphelper::getProcessComponentContext());
uno::Reference ucb::XCommandEnvironment silent(
new SilentCommandEnv(context, this));
if (m_bCleanedExtensionCache) {
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 53d7e7f..8b00b55 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -324,9 +324,8 @@ namespace dp_misc {
DescriptionInfoset getDescriptionInfoset(OUString const sExtensionFolderURL)
{
Reference css::xml::dom::XNode root;
-Referencecss::uno::XComponentContext context =
-comphelper_getProcessComponentContext();
-OSL_ASSERT(context.is());
+Referencecss::uno::XComponentContext context(
+comphelper::getProcessComponentContext());
try {
root =
ExtensionDescription(
diff --git a/desktop/source/deployment/misc/dp_misc.cxx
b/desktop/source/deployment/misc/dp_misc.cxx
index 17c4fb2..3dfb355 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -548,7 +548,7 @@ void syncRepositories(
{
xExtensionManager =
deployment::ExtensionManager::get(
-comphelper_getProcessComponentContext());
+comphelper::getProcessComponentContext());
if (xExtensionManager.is())
{
diff --git a/include/comphelper/processfactory.hxx
b/include/comphelper/processfactory.hxx
index e6833fc..a7edbb9 100644
--- a/include/comphelper/processfactory.hxx
+++ b/include/comphelper/processfactory.hxx
@@ -71,14 +71,6 @@ getProcessComponentContext();
}
-
-extern C {
-/// @internal ATTENTION returns ACQUIRED pointer! release it explicitly!
-COMPHELPER_DLLPUBLIC
-::com::sun::star::uno::XComponentContext *
-comphelper_getProcessComponentContext();
-} // extern C
-
#endif // _COMPHELPER_PROCESSFACTORY_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/core/annotations/Annotation.cxx
b/sd/source/core/annotations/Annotation.cxx
index 3904447..4b2184b 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -162,8 +162,8 @@ protected:
void createAnnotation( Reference XAnnotation xAnnotation, SdPage* pPage )
{
-ReferenceXComponentContext xContext
(comphelper_getProcessComponentContext());
-xAnnotation.set( new Annotation(xContext, pPage) );
+xAnnotation.set(
+new
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/viscrs.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 1533952b46abaafdc6f05356d2d5a71749146b7c
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 23 01:16:50 2013 +0300
WaE: declaration shadows a member of 'this'
Change-Id: I1f5b3ffccb89a5b9111e60c0a1943e1642c3499b
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index e766fa5..68e6a5b 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -297,12 +297,14 @@ void SwSelPaintRects::Show()
for (size_t i = 0; i size(); ++i)
{
Point origin = pOut-LogicToPixel((*this)[i].Pos());
-Size size = pOut-LogicToPixel((*this)[i].SSize());
+Size ssize = pOut-LogicToPixel((*this)[i].SSize());
#ifdef IOS
rects[i] = CGRectMake(origin.X(), origin.Y(),
- size.Width(), size.Height());
+ ssize.Width(), ssize.Height());
#else
// Not yet implemented
+(void) origin;
+(void) ssize;
#endif
}
// GetShell returns a SwCrsrShell which actually is a
SwWrtShell
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - external/curl nss/ExternalPackage_nss.mk nss/ExternalProject_nss.mk nss/nss-config.in RepositoryExternal.mk
RepositoryExternal.mk | 41 +++-- external/curl/UnpackedTarball_curl.mk |1 external/curl/curl-7.26.0_nspr.patch | 17 --- nss/ExternalPackage_nss.mk| 39 - nss/ExternalProject_nss.mk|7 - nss/nss-config.in | 147 -- 6 files changed, 33 insertions(+), 219 deletions(-) New commits: commit 7f614ac933524d798724895827b255b0d36dcc6b Author: Michael Stahl mst...@redhat.com Date: Wed Oct 23 00:19:36 2013 +0200 nss: handle libsqlite3.so like other libs Change-Id: Ic000787d9a3155d95bd2f5db531192791650392f diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk index 3ce82b2..e4323ea 100644 --- a/nss/ExternalPackage_nss.mk +++ b/nss/ExternalPackage_nss.mk @@ -53,9 +53,7 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\ mozilla/dist/out/lib/libsmime3.so \ mozilla/dist/out/lib/libsoftokn3.so \ mozilla/dist/out/lib/libssl3.so \ -)) -$(eval $(call gb_ExternalPackage_add_files,nss,lib/sqlite,\ - mozilla/dist/out/lib/libsqlite3.so \ + mozilla/dist/out/lib/libsqlite3.so \ )) endif commit cffad630256b5a7f9bb9c075d39b71b7c4f4c989 Author: Michael Stahl mst...@redhat.com Date: Wed Oct 23 00:17:25 2013 +0200 nss: remove nss-config and nspr-config Apparently curl is the only external that is looking for these, but it turns out that we already pass --with-nss=dir to its configure which overrides the nss-config/nspr-config calls. Change-Id: I967e74a74690a64b5bccfd98d1509bba1dd12259 diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index aa3e413..2e75f38 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -19,7 +19,6 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\ )) $(eval $(call gb_UnpackedTarball_add_patches,curl,\ external/curl/curl-7.26.0.patch \ - external/curl/curl-7.26.0_nspr.patch \ external/curl/curl-aix.patch \ external/curl/curl-7.26.0_win.patch \ external/curl/curl-7.26.0_mingw.patch \ diff --git a/external/curl/curl-7.26.0_nspr.patch b/external/curl/curl-7.26.0_nspr.patch deleted file mode 100644 index 4eee75e..000 --- a/external/curl/curl-7.26.0_nspr.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ur curl-7.26.0/configure misc/build/curl-7.26.0/configure curl-7.26.0/configure 2012-07-11 10:06:15.249214153 +0200 -+++ misc/build/curl-7.26.0/configure 2012-07-11 10:09:48.967225739 +0200 -@@ -22779,6 +22779,13 @@ - addcflags= - version=unknown - fi -+ -+# NSPR includes and libs are needed with nss -+check=`nspr-config --version 2/dev/null` -+if test -n $check; then -+ addlib=$addlib `nspr-config --libs` -+ addcflags=$addcflags `nspr-config --cflags` -+fi - fi - else - # Without pkg-config, we'll kludge in some defaults diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk index 69a3a45b..3ce82b2 100644 --- a/nss/ExternalPackage_nss.mk +++ b/nss/ExternalPackage_nss.mk @@ -11,11 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,nss,nss)) $(eval $(call gb_ExternalPackage_use_external_project,nss,nss)) -$(eval $(call gb_ExternalPackage_add_files,nss,bin,\ - config/nspr-config \ - config/nss-config \ -)) - ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\ mozilla/dist/out/lib/libfreebl3.dylib \ diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index 843a153..89f4e74 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -20,13 +20,6 @@ $(call gb_ExternalProject_get_state_target,nss,configure): mozilla/nsprpub/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MSCX,$(COM)$(CPU)),--enable-64bit) \ -sed -e 's%@prefix@%$(OUTDIR)%' \ - -e 's%@includedir@%$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss%' \ - -e 's%@MOD_MAJOR_VERSION@%$(NSS_MAJOR)%' \ - -e 's%@MOD_MINOR_VERSION@%$(NSS_MINOR)%' \ - -e 's%@MOD_PATCH_VERSION@%$(NSS_PATCH)%' \ - $(SRCDIR)/nss/nss-config.in $(EXTERNAL_WORKDIR)/config/nss-config \ -chmod a+x $(EXTERNAL_WORKDIR)/config/nss-config \ ,,nss_configure.log) ifeq ($(OS),WNT) diff --git a/nss/nss-config.in b/nss/nss-config.in deleted file mode 100644 index 2b8d045..000 --- a/nss/nss-config.in +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ - -major_version=@MOD_MAJOR_VERSION@ -minor_version=@MOD_MINOR_VERSION@
Updating Whiteboard/Keyword Wiki - Need Input
Hi All, I'm going to be updating the wiki for whiteboard and keyword to make it more legible. There has been talk about taking a minimilistic approach to the wiki, less formal, less rules (although we don't have rules, just guidelines), this vs. the comprehensive, answers any question someone might have approach. My question is, which is preferred? Should I strip the wiki to the minimum with very basic info or include the details needed where someone could technically use the wiki without additional input in a relatively cohesive way? Thanks all, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk comphelper/qa
comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk | 29 +++
comphelper/qa/unit/syntaxhighlighttest.cxx| 53 ++
2 files changed, 82 insertions(+)
New commits:
commit eb13f2d92ca7a1688a5b7849b58e0e36f16fe557
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Oct 23 04:26:39 2013 +0200
add inital test for syntaxhighlighter
Test is partly disabled as we still generate invalid tokens
Change-Id: I1a9b03b9bbe2ed7087c6ab7b6d0823ac1d058ba7
diff --git a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
new file mode 100644
index 000..3c9960c
--- /dev/null
+++ b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
@@ -0,0 +1,29 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,comphelper_syntaxhighlight_test))
+
+$(eval $(call
gb_CppunitTest_add_exception_objects,comphelper_syntaxhighlight_test, \
+comphelper/qa/unit/syntaxhighlighttest \
+))
+
+$(eval $(call gb_CppunitTest_use_api,comphelper_syntaxhighlight_test, \
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,comphelper_syntaxhighlight_test, \
+comphelper \
+cppuhelper \
+cppu \
+sal \
+ $(gb_UWINAPI) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/comphelper/qa/unit/syntaxhighlighttest.cxx
b/comphelper/qa/unit/syntaxhighlighttest.cxx
new file mode 100644
index 000..244a1a0
--- /dev/null
+++ b/comphelper/qa/unit/syntaxhighlighttest.cxx
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include comphelper/syntaxhighlight.hxx
+#include cppunit/TestAssert.h
+#include cppunit/TestFixture.h
+#include cppunit/extensions/HelperMacros.h
+#include cppunit/plugin/TestPlugIn.h
+#include rtl/ustring.hxx
+
+#include vector
+
+class SyntaxHighlightTest : public CppUnit::TestFixture
+{
+public:
+void testBasicString();
+
+CPPUNIT_TEST_SUITE(SyntaxHighlightTest);
+CPPUNIT_TEST(testBasicString);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void SyntaxHighlightTest::testBasicString()
+{
+OUString aBasicString(if Mid(sText,iRun,1 ) \ \ then Mid(
sText ,iRun, 1, Chr( 1 + Asc( Mid(sText,iRun,1 )) ) ');
+
+SyntaxHighlighter aHighlighter;
+aHighlighter.initialize( HIGHLIGHT_BASIC );
+
+std::vectorHighlightPortion aPortions;
+aHighlighter.getHighlightPortions( 0, aBasicString, aPortions );
+
+
+// check that all strings are valid
+for(std::vectorHighlightPortion::const_iterator itr =
+aPortions.begin(), itrEnd = aPortions.end(); itr != itrEnd; ++itr)
+{
+CPPUNIT_ASSERT(itr-nBegin aBasicString.getLength());
+//CPPUNIT_ASSERT(itr-nEnd aBasicString.getLength());
+}
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(SyntaxHighlightTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - distro-configs/LibreOfficeMacOSX64.conf sysui/desktop
distro-configs/LibreOfficeMacOSX64.conf | 16 sysui/desktop/macosx/Info.plist.in |6 -- 2 files changed, 20 insertions(+), 2 deletions(-) New commits: commit a55d02bacb2c8f21cba759c8fe3931df07a85b0c Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Oct 22 21:51:11 2013 -0500 macosx: add a LSMinimumSystemVersion in Info.plist the minimum version is set based on MACOSX_DEPLOYMENT_VERSION It's purpose is to prevent the generated app to be executed on a system that does not meet the requirement Change-Id: I4ec09f8d1f96af1263d40bbe0e4b144c9622bba4 diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index 6cc1343..9602a25 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -71,7 +71,7 @@ /array /dict /dict - + !-- Calc documents -- dict keyUTTypeIdentifier/key @@ -847,7 +847,7 @@ /dict /dict /array - + !-- Document type declaration for OS X 10.4 -- keyCFBundleDocumentTypes/key array @@ -1422,6 +1422,8 @@ stringVCL_NSApplication/string keyLSApplicationCategoryType/key stringpublic.app-category.productivity/string +keyLSMinimumSystemVersion/key +string@MACOSX_DEPLOYMENT_TARGET@.0string /dict /plist commit 48331c402fa5f22aed4067947fffac20fe61df14 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Oct 22 21:49:48 2013 -0500 add a distro config for MacOSX 64 bits build (10.8 min sdk) Change-Id: I21fbfce72cdf7446845df8ae8f65d6d899163d2f diff --git a/distro-configs/LibreOfficeMacOSX64.conf b/distro-configs/LibreOfficeMacOSX64.conf new file mode 100644 index 000..73a50b5 --- /dev/null +++ b/distro-configs/LibreOfficeMacOSX64.conf @@ -0,0 +1,16 @@ +--with-vendor=The Document Foundation +--enable-64-bit +--enable-epm +--enable-scripting-beanshell +--enable-scripting-javascript +--enable-ext-wiki-publisher +--enable-ext-nlpsolver +--enable-extension-integration +--enable-online-update +--without-system-postgresql +--disable-gtk +--with-help +--with-myspell-dicts +--with-package-format=dmg +--with-macosx-sdk=10.8 +--with-macosx-version-min-required=10.8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] QA Call Time [was Minutes of QA Call]
Hi Robinson, Le 19/10/2013 17:06, Robinson Tryon a écrit : On Sat, Oct 19, 2013 at 2:16 AM, Florian Effenberger flo...@documentfoundation.org wrote: Hi, Robinson Tryon wrote on 2013-10-18 23:01: Our next call is going to be in about 2 weeks (tentatively scheduled for November 1st): https://wiki.documentfoundation.org/QA/Meetings/2013/November_01 FYI: on that day, some people might not be able to join, at least not via phone, as its the first evening of the Freiburg hackfest. It might make sense to have the call then, but probably using IRC is better. I'm happy to move to IRC for one meeting, if that might suit our situation better: How many QA people are going to be in Freiburg? Based on the current responses on the doodle, it looks like there's strong support for meetings at approximately 17:00 GMT on Fridays or Mondays. I'd still like to hear from more people active in QA including Bjoern, Sophie, SteveBell, Tommy, etc... before we make any final decisions. Fridays evening are more difficult for me, but any other day is ok. Kind regards Sophie ___ 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/
Re: [Libreoffice-qa] The garbage into the dev-builds.libreoffice.org
Pedro wrote: Regarding your question, I made a similar request over a month ago but nobody bothered to answer... I hope someone answers to you... Noticing now, cleaned up there. Best course of action in the future - poke one of the tinderbox admins (visible from the log / detailed tb info page) directly, they all have access to that dir. Cheers, -- Thorsten signature.asc Description: Digital signature ___ 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/
Re: [Libreoffice-qa] QA Call Time [was Minutes of QA Call]
On Sat, 19 Oct 2013 17:06:44 +0200, Robinson Tryon bishop.robin...@gmail.com wrote: On Sat, Oct 19, 2013 at 2:16 AM, Florian Effenberger flo...@documentfoundation.org wrote: Hi, Robinson Tryon wrote on 2013-10-18 23:01: Our next call is going to be in about 2 weeks (tentatively scheduled for November 1st): https://wiki.documentfoundation.org/QA/Meetings/2013/November_01 Based on the current responses on the doodle, it looks like there's strong support for meetings at approximately 17:00 GMT on Fridays or Mondays. I'd still like to hear from more people active in QA including Bjoern, Sophie, SteveBell, Tommy, etc... before we make any final decisions. --R actually you meetings are done friday from 6 to 7 PM (italian time) and I'm still at work at that time. it would be better for me from 7 to 8 PM (italian time) but I understand it cannot be changed just for me. bye, Tommy ___ 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/
Re: [Libreoffice-qa] QA Call Time [was Minutes of QA Call]
On Tue, Oct 22, 2013 at 4:22 PM, Tommy ba...@quipo.it wrote: actually you meetings are done friday from 6 to 7 PM (italian time) and I'm still at work at that time. it would be better for me from 7 to 8 PM (italian time) but I understand it cannot be changed just for me. bye, Tommy Hi Tommy, Thanks for the update. Would it be possible for you to add your preferred times to the doodle? http://doodle.com/z5xic72ng9q3hz8v Best, --R ___ 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/
Re: [Libreoffice-qa] The garbage into the dev-builds.libreoffice.org
Hi Thorsten Thorsten Behrens wrote Noticing now, cleaned up there. Best course of action in the future - poke one of the tinderbox admins (visible from the log / detailed tb info page) directly, they all have access to that dir. Thanks for cleaning up. But there is a deeper problem with Master daily builds for the Windows platform http://nabble.documentfoundation.org/Windows-builds-last-2013-10-16-tp4078857.html Regarding poking: I tried that in the past... I was either ignored or told I was disrespectful. I'm done with that. When there are builds I run them, when there aren't I don't. Simple :) Best regards, Pedro -- View this message in context: http://nabble.documentfoundation.org/The-garbage-into-the-dev-builds-libreoffice-org-tp4074218p4079291.html Sent from the QA mailing list archive at Nabble.com. ___ 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/
Re: [Libreoffice-qa] The garbage into the dev-builds.libreoffice.org
El 23/10/13 0:14, Pedro [via Document Foundation Mail Archive] escribió: Regarding poking: I tried that in the past... I was either ignored or told I was disrespectful. I'm done with that. When there are builds I run them, when there aren't I don't. Simple :) Best regards, Pedro You are right Pedro, so simple [:) Miguel Ángel. * Inglés - detectado * Inglés * Español * Gallego * Italiano * Inglés * Español * Gallego * Italiano javascript:void(0); # -- View this message in context: http://nabble.documentfoundation.org/The-garbage-into-the-dev-builds-libreoffice-org-tp4074218p4079295.html Sent from the QA mailing list archive at Nabble.com.___ 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/
