LibreOffice Gerrit News for core on 2014-04-10
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + cppcheck: Fix redundant assignments in the sw module in https://gerrit.libreoffice.org/8914 from Chris Laplante about module sw + Rewrite getHash to reduce code duplication improve maintainability. in https://gerrit.libreoffice.org/8912 from Chris Laplante about module sw + fdo#74697 Add dbus policy exceptions for Bluez 5 support. in https://gerrit.libreoffice.org/8913 from Andrzej Hunt about module bin, sysui + fdo#74697 Add Bluez 5 support for impress remote. in https://gerrit.libreoffice.org/8821 from Andrzej Hunt about module sd + Line spacing is not preserved for styles. in https://gerrit.libreoffice.org/8902 from Priyanka Gaikwad about module sw, writerfilter + fdo#77051: Preservation of Index field flag '\f'. in https://gerrit.libreoffice.org/8839 from Yogesh Bharate about module sw, writerfilter End of freshness + Kill the ImplSVGDIData::mbNoXORClipping flag in https://gerrit.libreoffice.org/8901 from Tor Lillqvist about module include, vcl + Unified OutputDevice::DrawGradient() functions in https://gerrit.libreoffice.org/8893 from Chris Sherlock about module include, vcl + Introduce twip/mm100 conversion functions instead of duplicated macros in https://gerrit.libreoffice.org/8837 from Tor Lillqvist about module cui, editeng, include, starmath, svl, svx, sw, writerfilter * Merged changes on master for project core changed in the last 25 hours: + vcl quartz: cache per-run glyphs information in https://gerrit.libreoffice.org/8879 from Norbert Thiebaud + fdo#73147 improve function code for speed in https://gerrit.libreoffice.org/8841 from Winfried Donkers + Fix gradient regressions in https://gerrit.libreoffice.org/8908 from Chris Sherlock + fdo#69157 Apply object-in front selection on mouseUp in https://gerrit.libreoffice.org/8866 from Lennard Wasserthal + Unit test for .doc export of full colour borders in https://gerrit.libreoffice.org/8887 from Luke Deller + Fix and deduplicate the test code in SwStyleNameMapper::getHashTable. in https://gerrit.libreoffice.org/8877 from Chris Laplante + fdo#76583 DOCX import: Floating table information is not preserved in RT in https://gerrit.libreoffice.org/8840 from Umesh Kadam * Abandoned changes on master for project core changed in the last 25 hours: + Fix regression 8659d189ec04a - rect. gradients no longer do grayscale in https://gerrit.libreoffice.org/8906 from Chris Sherlock * Open changes needing tweaks, but being untouched for more than a week: + new method INetURLObject::getData() for data urls in https://gerrit.libreoffice.org/8737 from Christina Roßmanith + fdo#67544 Slide transistion sound(other sound) is not included in present in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt + fdo#57950: Replace chained O(U)StringBuffer::append() with operator+ in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal + Refactored in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal + fdo#75757 Remove inheritance to std::map from PropertyMap in https://gerrit.libreoffice.org/8656 from Krisztian Pinter + Remove visual noise from ios in https://gerrit.libreoffice.org/8274 from Alexander Wilms + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + WIP: fdo#33980
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/framework/mediamisc.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 4f9674beaaa51b85d8405cf5d125ca19d55c1b32
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Apr 10 09:26:05 2014 +0200
Missing include
Change-Id: Icd3b57c4ae3dd79f4e57b72f9b241f15060322cf
diff --git a/avmedia/source/framework/mediamisc.cxx
b/avmedia/source/framework/mediamisc.cxx
index d3e9199..7fd6a9c 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -22,6 +22,8 @@
#include vcl/svapp.hxx
#include vcl/settings.hxx
+#include mediamisc.hxx
+
namespace avmedia {
ResMgr* GetResMgr()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/childwin.hxx |2 +
sfx2/source/appl/appdde.cxx | 23 --
sfx2/source/appl/appopen.cxx| 28 -
sfx2/source/appl/fwkhelper.cxx |5 ++-
sfx2/source/appl/helpinterceptor.cxx|4 --
sfx2/source/appl/linksrc.cxx|2 -
sfx2/source/bastyp/progress.cxx | 19 ---
sfx2/source/control/bindings.cxx| 20
sfx2/source/control/dispatch.cxx| 10 --
sfx2/source/control/querystatus.cxx | 11 +++---
sfx2/source/dialog/dinfdlg.cxx |3 -
sfx2/source/dialog/dockwin.cxx |4 --
sfx2/source/dialog/filedlghelper.cxx| 33
sfx2/source/dialog/mailmodel.cxx| 24 --
sfx2/source/dialog/tabdlg.cxx | 52
sfx2/source/dialog/taskpane.cxx |7
sfx2/source/dialog/versdlg.cxx | 35 ++---
sfx2/source/doc/SfxDocumentMetaData.cxx |9 ++---
sfx2/source/doc/docfile.cxx | 42 -
sfx2/source/doc/docinsert.cxx |4 --
sfx2/source/doc/doctempl.cxx|2 -
sfx2/source/doc/docundomanager.cxx |1
sfx2/source/doc/iframe.cxx |5 ---
sfx2/source/doc/new.cxx |1
sfx2/source/doc/objserv.cxx | 19 ---
sfx2/source/doc/objstor.cxx |3 -
sfx2/source/doc/oleprops.cxx|7
sfx2/source/doc/syspath.cxx |2 +
sfx2/source/explorer/nochaos.cxx|8 +---
sfx2/source/inc/appopen.hxx | 35 +
sfx2/source/sidebar/ResourceManager.cxx |9 -
sfx2/source/sidebar/ResourceManager.hxx |2 -
sfx2/source/view/frmload.cxx|5 ---
sfx2/source/view/viewfrm.cxx| 13
34 files changed, 77 insertions(+), 372 deletions(-)
New commits:
commit 1d25e1de0b9498e469cb052b2d86bf7f7ae6adae
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Apr 10 09:31:46 2014 +0200
Clean up function declarations and some unused functions
Change-Id: I9d6e9df0b686c61597aaa0e194ab321445671a20
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 0dec11a..966056e 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -364,7 +364,9 @@ public:
((SfxToolbox*)GetWindow())-FillInfo( aInfo ); \
return aInfo; }
+bool GetPosSizeFromString( const OUString rStr, Point rPos, Size rSize );
+bool GetSplitSizeFromString( const OUString rStr, Size rSize );
#endif
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 65080b5..c034467 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -44,7 +44,7 @@
#include comphelper/string.hxx
#include com/sun/star/ucb/IllegalIdentifierException.hpp
-
+#if defined WNT
OUString SfxDdeServiceName_Impl( const OUString sIn )
{
@@ -60,7 +60,6 @@ OUString SfxDdeServiceName_Impl( const OUString sIn )
return sReturn.makeStringAndClear();
}
-#if defined( WNT )
class ImplDdeService : public DdeService
{
public:
@@ -199,16 +198,19 @@ bool ImplDdeService::SysTopicExecute( const OUString*
pStr )
class SfxDdeTriggerTopic_Impl : public DdeTopic
{
+#if defined WNT
public:
SfxDdeTriggerTopic_Impl()
: DdeTopic( TRIGGER )
{}
-virtual bool Execute( const OUString* ) SAL_OVERRIDE;
+virtual bool Execute( const OUString* ) SAL_OVERRIDE { return true; }
+#endif
};
class SfxDdeDocTopic_Impl : public DdeTopic
{
+#if defined WNT
public:
SfxObjectShell* pSh;
DdeData aData;
@@ -223,6 +225,7 @@ public:
virtual bool Execute( const OUString* ) SAL_OVERRIDE;
virtual bool StartAdviseLoop() SAL_OVERRIDE;
virtual bool MakeItem( const OUString rItem ) SAL_OVERRIDE;
+#endif
};
@@ -555,6 +558,7 @@ void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
void SfxApplication::RemoveDdeTopic( SfxObjectShell* pSh )
{
+#if defined WNT
DBG_ASSERT( pAppData_Impl-pDocTopics, There is no Dde-Service );
//OV: DDE is disconnected in server mode!
if( !pAppData_Impl-pDocTopics )
@@ -570,6 +574,9 @@ void SfxApplication::RemoveDdeTopic( SfxObjectShell* pSh )
pAppData_Impl-pDocTopics-erase(
pAppData_Impl-pDocTopics-begin() + n );
}
}
+#else
+(void) pSh;
+#endif
}
const DdeService* SfxApplication::GetDdeService() const
@@ -582,13 +589,7 @@ DdeService* SfxApplication::GetDdeService()
return pAppData_Impl-pDdeService;
}
-
-
-bool SfxDdeTriggerTopic_Impl::Execute( const OUString* )
-{
-return true;
-}
-
+#if defined WNT
DdeData* SfxDdeDocTopic_Impl::Get( sal_uIntPtr nFormat )
{
@@ -648,4 +649,6 @@ bool SfxDdeDocTopic_Impl::StartAdviseLoop()
return bRet;
}
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc
solenv/inc/minor.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit db8e07f2634ef6edc206e99965e9a89b3e14673a Author: Oliver-Rainer Wittmann o...@apache.org Date: Thu Apr 10 07:57:12 2014 + completing 'adapt build meta data for better differentiation to 4.1' diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 21c4192..397a1e1 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -19,7 +19,7 @@ # # * RSCVERSION=420 -RSCREVISION=410m1(Build:9800) +RSCREVISION=420m1(Build:9800) BUILD=9800 LAST_MINOR=m1 SOURCEVERSION=AOO410 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source writerfilter/source
sw/inc/tox.hxx | 19 +++
sw/inc/unomap.hxx |1
sw/inc/unoprnms.hxx|1
sw/qa/extras/ooxmlexport/data/IndexFieldFlagF.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +
sw/source/core/tox/tox.cxx |7 +
sw/source/core/unocore/unoidx.cxx | 25 +
sw/source/core/unocore/unomap.cxx |1
sw/source/filter/ww8/ww8atr.cxx| 11 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 ++
writerfilter/source/dmapper/PropertyIds.cxx|1
writerfilter/source/dmapper/PropertyIds.hxx|1
12 files changed, 86 insertions(+)
New commits:
commit a7bc9c1e4977bd3430df69287fa0a8377a686c58
Author: YogeshBharate yogesh.bhar...@synerzip.com
Date: Fri Apr 4 15:56:03 2014 +0530
fdo#77051: Preservation of Index field flag '\f'.
Problem Description:
- In LibreOffice, the index field flag '\f' was not
getting preserved after roundtrip as there was no
support for it.
- '\f' field flag is used for Specific Entry Type.
ex. In our case it is Syn
Implementation:
- Provided import export support for Index field flag '\f'
and added UT for the same.
Change-Id: I97c2456dd73c8bdf89ab105f8cac71bf7e2ad164
Reviewed-on: https://gerrit.libreoffice.org/8839
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 360f1d4..859374f 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -67,6 +67,7 @@ class SW_DLLPUBLIC SwTOXMark
sal_uInt16 nLevel;
OUStringm_aBookmarkName;
+OUStringm_aEntryTypeName; // stored specific entry type name for
INDEX field \f
sal_BoolbAutoGenerated : 1; // generated using a concordance file
sal_BoolbMainEntry : 1; // main entry emphasized by character
style
@@ -107,6 +108,8 @@ public:
inline sal_uInt16 GetLevel() const;
inline void SetBookmarkName( const OUString bName);
inline OUString GetBookmarkName() const;
+inline void SetEntryTypeName( const OUString sName);
+inline OUString GetEntryTypeName() const;
// for alphabetical index only
inline void SetPrimaryKey(const OUString rStr );
@@ -394,6 +397,7 @@ namespace nsSwTOXElement
const SwTOXElement TOX_BOOKMARK = 1024;
const SwTOXElement TOX_NEWLINE = 2048;
const SwTOXElement TOX_PARAGRAPH_OUTLINE_LEVEL = 4096;
+const SwTOXElement TOX_INDEX_ENTRY_TYPE = 8192;
}
typedef sal_uInt16 SwTOIOptions;
@@ -438,6 +442,7 @@ class SW_DLLPUBLIC SwTOXBase : public SwClient
OUStringaName; // unique name
OUStringaTitle; // title
OUStringm_aBookmarkName; //Bookmark Name
+OUStringm_aEntryTypeName; // Type name
OUStringsMainEntryCharStyle; // name of the character style applied to
main index entries
@@ -507,6 +512,10 @@ public:
OUStringGetMainEntryCharStyle() const {return
sMainEntryCharStyle;}
voidSetMainEntryCharStyle(const OUString rSet)
{sMainEntryCharStyle = rSet;}
+// for record the Index field expression of MS Word
+OUString GetEntryTypeName() const;
+void SetEntryTypeName(const OUString sName);
+
// content index only
inline void SetLevel(sal_uInt16); //
consider outline level
inline sal_uInt16 GetLevel() const;
@@ -584,6 +593,9 @@ inline OUString SwTOXMark::GetAlternativeText() const
inline OUString SwTOXMark::GetBookmarkName() const
{ return m_aBookmarkName;}
+inline OUString SwTOXMark::GetEntryTypeName() const
+{ return m_aEntryTypeName;}
+
inline const SwTOXType* SwTOXMark::GetTOXType() const
{ return (SwTOXType*)GetRegisteredIn(); }
@@ -600,6 +612,10 @@ inline void SwTOXMark::SetBookmarkName(const OUString
bName)
m_aBookmarkName = bName;
}
+inline void SwTOXMark::SetEntryTypeName(const OUString sName)
+{
+m_aEntryTypeName = sName;
+}
inline void SwTOXMark::SetLevel( sal_uInt16 nLvl )
{
SAL_WARN_IF( GetTOXType() GetTOXType()-GetType() == TOX_INDEX, sw,
Wrong type);
@@ -730,6 +746,9 @@ inline OUString SwTOXBase::GetTitle() const
inline OUString SwTOXBase::GetBookmarkName() const
{ return m_aBookmarkName; }
+inline OUString SwTOXBase::GetEntryTypeName() const
+{ return m_aEntryTypeName; }
+
inline OUString SwTOXBase::GetTypeName() const
{ return GetTOXType()-GetTypeName(); }
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index 93c3fc5..cdd60de 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -220,6 +220,7 @@
#define
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - embeddedobj/source
embeddedobj/source/msole/graphconvert.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4e82c7876a5c66afe5694c92ac6f05857c7ba2d1
Author: Andras Timar andras.ti...@collabora.com
Date: Thu Apr 10 01:50:53 2014 -0700
build fix
Change-Id: I9b4e4f3fc60ee84e3c180360cc452ab1d9592acd
diff --git a/embeddedobj/source/msole/graphconvert.cxx
b/embeddedobj/source/msole/graphconvert.cxx
index 006073c..b6512b6 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -54,7 +54,7 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
GraphicFilter rFilter = GraphicFilter::GetGraphicFilter();
sal_uInt16 nRetFormat = 0;
if (rFilter.CanImportGraphic(OUString(), aMemoryStream,
GRFILTER_FORMAT_DONTKNOW, nRetFormat) == GRFILTER_OK
-rFilter.GetImportFormatMediaType(nRetFormat) == aMimeType)
+rFilter.GetImportFormatMediaType(nRetFormat) ==
String(aMimeType))
{
aResult = uno::Sequence sal_Int8 ( reinterpret_cast const
sal_Int8* ( aMemoryStream.GetData() ), aMemoryStream.Seek( STREAM_SEEK_TO_END
) );
return sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/findunusedcode editeng/source include/editeng linguistic/source sc/source sw/inc sw/source unusedcode.easy
bin/findunusedcode |1 +
editeng/source/uno/unotext.cxx |6 --
include/editeng/unotext.hxx |1 -
linguistic/source/dicimp.cxx | 12
linguistic/source/dicimp.hxx |1 -
sc/source/ui/dbgui/validate.cxx | 16
sc/source/ui/inc/validate.hxx|3 ---
sw/inc/SwStyleNameMapper.hxx |2 ++
sw/source/core/doc/SwStyleNameMapper.cxx |2 ++
unusedcode.easy |7 +++
10 files changed, 8 insertions(+), 43 deletions(-)
New commits:
commit f767d4580e455b91506cc43d11783093cead6d6c
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 10 09:36:21 2014 +0100
callcatcher: update unused code
OAuth2Handler is from libcmis
Change-Id: Ia1986d6df7ab45580c66b4e536c5882af41f357f
diff --git a/bin/findunusedcode b/bin/findunusedcode
index 22727cf..59dbade 100755
--- a/bin/findunusedcode
+++ b/bin/findunusedcode
@@ -76,4 +76,5 @@ grep ::.*\( unusedcode.all \
| grep -v ^WPS \
| grep -v WPX \
| grep -v ^WSObject \
+ | grep -v ^OAuth2Handler \
../unusedcode.easy
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index f0f2391..1c62b37 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2292,12 +2292,6 @@ sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const
uno::Sequence sal_Int8
}
}
-
-
-SvxUnoText::SvxUnoText( ) throw()
-{
-}
-
SvxUnoText::SvxUnoText( const SvxItemPropertySet* _pSet ) throw()
: SvxUnoTextBase( _pSet )
{
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 5c4eed6..90a2961 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -462,7 +462,6 @@ class EDITENG_DLLPUBLIC SvxUnoText : public SvxUnoTextBase,
public ::cppu::OWeakAggObject
{
public:
-SvxUnoText( ) throw();
SvxUnoText( const SvxItemPropertySet* _pSet ) throw();
SvxUnoText( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet,
::com::sun::star::uno::Reference ::com::sun::star::text::XText xParent )
throw();
SvxUnoText( const SvxUnoText rText ) throw();
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index ffab959..900a10b 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -182,18 +182,6 @@ sal_Int16 ReadDicVersion( SvStreamPtr rpStream,
sal_uInt16 nLng, sal_Bool bNe
return nDicVersion;
}
-DictionaryNeo::DictionaryNeo() :
-aDicEvtListeners( GetLinguMutex() ),
-eDicType(DictionaryType_POSITIVE),
-nLanguage (LANGUAGE_NONE)
-{
-nCount = 0;
-nDicVersion = DIC_VERSION_DONTKNOW;
-bNeedEntries = sal_False;
-bIsModified = bIsActive = sal_False;
-bIsReadonly = sal_False;
-}
-
DictionaryNeo::DictionaryNeo(const OUString rName,
sal_Int16 nLang, DictionaryType eType,
const OUString rMainURL,
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index 1f34748..5c6c259 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -81,7 +81,6 @@ class DictionaryNeo :
sal_Bool bIsLoadEntries = sal_False);
public:
-DictionaryNeo();
DictionaryNeo(const OUString rName, sal_Int16 nLang,
::com::sun::star::linguistic2::DictionaryType eType,
const OUString rMainURL,
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 83462fa..344e183 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -670,11 +670,6 @@ void ScTPValidationHelp::Init()
pTsbHelp-EnableTriState( false );
}
-sal_uInt16* ScTPValidationHelp::GetRanges()
-{
-return pValueRanges;
-}
-
SfxTabPage* ScTPValidationHelp::Create( Window* pParent,
const SfxItemSet rArgSet )
{
@@ -745,11 +740,6 @@ void ScTPValidationError::Init()
SelectActionHdl( NULL );
}
-sal_uInt16* ScTPValidationError::GetRanges()
-{
-return pValueRanges;
-}
-
SfxTabPage* ScTPValidationError::Create( Window*pParent,
const SfxItemSet rArgSet )
{
@@ -930,10 +920,4 @@ bool ScValidationDlg::IsChildFocus()
return false;
}
-
-boolScValidationDlg::IsAlive()
-{
-return SC_MOD()-IsAliveRefDlg( SLOTID, this );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index c27a52f..8acf4f6 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -102,7 +102,6 @@ public:
{
return static_castScValidationDlg *( SC_MOD()-Find1RefWindow(
SLOTID, pAncestor ) );
}
-bool
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - db/8e07f2634ef6edc206e99965e9a89b3e14673a
db/8e07f2634ef6edc206e99965e9a89b3e14673a |1 + 1 file changed, 1 insertion(+) New commits: commit 0ee3ec8c4a80e321710d75657aeac67994072db2 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 10 09:54:47 2014 +0100 Notes added by 'git notes add' diff --git a/db/8e07f2634ef6edc206e99965e9a89b3e14673a b/db/8e07f2634ef6edc206e99965e9a89b3e14673a new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/db/8e07f2634ef6edc206e99965e9a89b3e14673a @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/inc/swmodeltestbase.hxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 492c1da6be6ed7950bb58bd860748b81b52e7264 Author: Jan Holesovsky ke...@collabora.com Date: Thu Apr 10 09:54:19 2014 +0200 Off by one. Compared to 4c8d29f4f26bfa30689b2b98414fe874225b9a2e, we do not have to provide 0 to mark the end. Change-Id: I3b9a3de61df48caf271cb06b27cf9cfa174dc4ed diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index 907f3c9..7a2cf9a 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -572,11 +572,11 @@ protected: // Read the XML stream we're interested in. uno::Referencepackages::zip::XZipFileAccess2 xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), m_aTempFile.GetURL()); uno::Referenceio::XInputStream xInputStream(xNameAccess-getByName(rStreamName), uno::UNO_QUERY); + boost::shared_ptrSvStream pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); -pStream-Seek(STREAM_SEEK_TO_END); -sal_Size nSize = pStream-Tell(); -pStream-Seek(0); -rtl::ByteSequence aBuffer(nSize + 1); +sal_Size nSize = pStream-remainingSize(); + +rtl::ByteSequence aBuffer(nSize); pStream-Read(aBuffer.getArray(), nSize); // Parse the XML. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/sdr/table/tablecontroller.hxx|2
svx/source/accessibility/AccessibleEmptyEditSource.cxx |4
svx/source/accessibility/lookupcolorname.cxx |2
svx/source/core/coreservices.cxx | 29 -
svx/source/dialog/_bmpmask.cxx |5 -
svx/source/dialog/framelinkarray.cxx |2
svx/source/engine3d/helperhittest3d.cxx |1
svx/source/fmcomp/fmgridif.cxx | 11 --
svx/source/fmcomp/gridcell.cxx |7 -
svx/source/form/datanavi.cxx |2
svx/source/form/fmscriptingenv.cxx |9 -
svx/source/form/fmservs.cxx | 19 ---
svx/source/form/fmundo.cxx |6 -
svx/source/form/formcontroller.cxx |3
svx/source/form/legacyformcontroller.cxx |1
svx/source/form/tabwin.cxx |7 -
svx/source/form/xfm_addcondition.cxx |1
svx/source/inc/coreservices.hxx | 65 +
svx/source/inc/fmservs.hxx | 33 ++
svx/source/sdr/contact/viewcontactofunocontrol.cxx |8 -
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 74 ++-
svx/source/svdraw/svdedxv.cxx|5 -
svx/source/svdraw/svdotxln.cxx |2
svx/source/svdraw/svdovirt.cxx | 14 --
svx/source/table/svdotable.cxx | 22
svx/source/tbxctrls/extrusioncontrols.cxx|1
svx/source/tbxctrls/fontworkgallery.cxx |1
svx/source/tbxctrls/grafctrl.cxx |1
svx/source/tbxctrls/layctrl.cxx |2
svx/source/tbxctrls/lboxctrl.cxx |8 -
svx/source/tbxctrls/tbcontrl.cxx |1
svx/source/unodraw/UnoGraphicExporter.cxx|2
svx/source/unodraw/UnoGraphicExporter.hxx| 33 ++
svx/source/unodraw/gluepts.cxx |2
svx/source/unodraw/gluepts.hxx | 38 +++
svx/source/unodraw/tableshape.cxx|4
svx/source/unodraw/unoprov.cxx |2
svx/source/unodraw/unoshape.cxx | 14 --
svx/source/unodraw/unoshtxt.cxx |3
svx/source/xml/xmlgrhlp.cxx | 18 +--
svx/source/xml/xmlxtexp.cxx |1
svx/source/xml/xmlxtimp.cxx |2
42 files changed, 219 insertions(+), 248 deletions(-)
New commits:
commit 8f703221a0dcc772a6d5f6087c77747c7759d16d
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Apr 10 11:24:39 2014 +0200
Clean up function declarations and some unused functions
Change-Id: Ic720aa7b30bbe56d67e0b65f3e047ad3ae521a97
diff --git a/include/svx/sdr/table/tablecontroller.hxx
b/include/svx/sdr/table/tablecontroller.hxx
index 0ffe6c2..1550bc4 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -170,6 +170,8 @@ private:
sal_uLong mnUpdateEvent;
};
+rtl::Reference sdr::SelectionController CreateTableController(
SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference
sdr::SelectionController xRefController );
+
} }
#endif // INCLUDED_SVX_SDR_TABLE_TABLECONTROLLER_HXX
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index a8b03dc..776e964 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -84,9 +84,6 @@ namespace accessibility
AccessibleEmptyEditSource_Impl() {}
virtual ~AccessibleEmptyEditSource_Impl() {}
-// from the SfxListener interface
-voidNotify( SfxBroadcaster rBC, const SfxHint
rHint );
-
// SvxEditSource
SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE { return this;
}
SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE { return this;
}
@@ -136,7 +133,6 @@ namespace accessibility
boolIsValid() const SAL_OVERRIDE { return true; }
-voidSetNotifyHdl( const Link ) {}
LanguageTypeGetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE
{ return LANGUAGE_DONTKNOW; }
sal_Int32 GetFieldCount( sal_Int32 ) const SAL_OVERRIDE { return
0; }
EFieldInfo GetFieldInfo( sal_Int32, sal_uInt16 ) const
SAL_OVERRIDE { return EFieldInfo(); }
diff --git a/svx/source/accessibility/lookupcolorname.cxx
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - solenv/inc vcl/aqua vcl/source
solenv/inc/minor.mk |2 +-
vcl/aqua/source/gdi/ctlayout.cxx | 29 -
vcl/source/gdi/dibtools.cxx | 11 +++
3 files changed, 24 insertions(+), 18 deletions(-)
New commits:
commit 472884c5fd8f6008ca98f88d8a7b14eec5518117
Author: Herbert Dürr h...@apache.org
Date: Thu Apr 10 09:33:57 2014 +
#i124617# make CoreText tolerate PDF-export's unexpected font switches
For some documents it was observed that the PDF-export switches the font
after
text layout and before text drawing/measuring. This use case is quite
atrocious
and unexpected and crashed our CoreText glue code. The other platforms
survive
it though; to minimize the risk to them only the CoreText glue gets adapted
to
survive this scenario.
diff --git a/vcl/aqua/source/gdi/ctlayout.cxx b/vcl/aqua/source/gdi/ctlayout.cxx
index 4aa5112..6005b15 100644
--- a/vcl/aqua/source/gdi/ctlayout.cxx
+++ b/vcl/aqua/source/gdi/ctlayout.cxx
@@ -52,9 +52,8 @@ public:
virtual voidSimplify( bool bIsBase );
private:
-const CTTextStyle* constmpTextStyle;
-
// CoreText specific objects
+CFMutableDictionaryRef mpStyleDict;
CFAttributedStringRef mpAttrString;
CTLineRef mpCTLine;
@@ -67,6 +66,9 @@ private:
// in these cases the font scale becomes something bigger than 1.0
float mfFontScale; // TODO: does CoreText have a font size limit?
+CGFloat mfFontRotation; // text direction angle (in radians)
+CGFloat mfFontStretch; 1.0: font is squeezed, 1.0 font is stretched
+
// cached details about the resulting layout
// mutable members since these details are all lazy initialized
mutable double mfCachedWidth; // cached value of resulting
typographical width
@@ -79,17 +81,19 @@ private:
// ===
CTLayout::CTLayout( const CTTextStyle* pTextStyle )
-: mpTextStyle( pTextStyle )
+: mpStyleDict( pTextStyle-GetStyleDict() )
, mpAttrString( NULL )
, mpCTLine( NULL )
, mnCharCount( 0 )
, mnTrailingSpaceCount( 0 )
, mfTrailingSpaceWidth( 0.0 )
, mfFontScale( pTextStyle-mfFontScale )
+, mfFontRotation( pTextStyle-mfFontRotation )
+, mfFontStretch( pTextStyle-mfFontStretch )
, mfCachedWidth( -1 )
, mnBaseAdv( 0 )
{
-CFRetain( mpTextStyle-GetStyleDict() );
+CFRetain( mpStyleDict );
}
// ---
@@ -100,7 +104,7 @@ CTLayout::~CTLayout()
CFRelease( mpCTLine );
if( mpAttrString )
CFRelease( mpAttrString );
-CFRelease( mpTextStyle-GetStyleDict() );
+CFRelease( mpStyleDict );
}
// ---
@@ -131,7 +135,7 @@ bool CTLayout::LayoutText( ImplLayoutArgs rArgs )
}
// create the CoreText line layout using the requested text style
-mpAttrString = CFAttributedStringCreate( NULL, aCFText,
mpTextStyle-GetStyleDict() );
+mpAttrString = CFAttributedStringCreate( NULL, aCFText, mpStyleDict );
mpCTLine = CTLineCreateWithAttributedString( mpAttrString );
CFRelease( aCFText);
@@ -201,7 +205,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs rArgs )
CFRelease( mpCTLine );
CFStringRef aCFText = CFStringCreateWithCharactersNoCopy( NULL,
rArgs.mpStr + mnMinCharPos,
mnCharCount - mnTrailingSpaceCount, kCFAllocatorNull );
-CFAttributedStringRef pAttrStr = CFAttributedStringCreate( NULL,
aCFText, mpTextStyle-GetStyleDict() );
+CFAttributedStringRef pAttrStr = CFAttributedStringCreate( NULL,
aCFText, mpStyleDict );
mpCTLine = CTLineCreateWithAttributedString( pAttrStr );
CFRelease( aCFText);
CFRelease( pAttrStr );
@@ -249,12 +253,11 @@ void CTLayout::DrawText( SalGraphics rGraphics ) const
const Point aVclPos = GetDrawPosition( Point(mnBaseAdv,0) );
CGPoint aTextPos = { +aVclPos.X()/mfFontScale, -aVclPos.Y()/mfFontScale };
-if( mpTextStyle-mfFontRotation != 0.0 )
+if( mfFontRotation != 0.0 )
{
-const CGFloat fRadians = mpTextStyle-mfFontRotation;
-CGContextRotateCTM( rAquaGraphics.mrContext, +fRadians );
+CGContextRotateCTM( rAquaGraphics.mrContext, +mfFontRotation );
-const CGAffineTransform aInvMatrix = CGAffineTransformMakeRotation(
-fRadians );
+const CGAffineTransform aInvMatrix = CGAffineTransformMakeRotation(
-mfFontRotation );
aTextPos = CGPointApplyAffineTransform( aTextPos, aInvMatrix );
}
@@ -353,12 +356,12 @@ int CTLayout::GetNextGlyphs( int nLen, sal_GlyphId*
pOutGlyphIds, Point rPos, i
// convert glyph details for VCL
*(pOutGlyphIds++) = pCGGlyphIdx[ nSubIndex ];
if( pGlyphAdvances )
-*(pGlyphAdvances++) = pCGGlyphAdvs[ nSubIndex ].width;
+*(pGlyphAdvances++) = mfFontStretch * pCGGlyphAdvs[
[Libreoffice-commits] libcdr.git: README
README | 14 +- 1 file changed, 1 insertion(+), 13 deletions(-) New commits: commit 1c8d66f69f3df0a51b3720bde8ece1a4752c48fb Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Apr 10 12:08:39 2014 +0200 Sanitize the README file Correspond to the new simplified license Remove the mentions of supported CDR versions in order to be more future-proof Change-Id: I2d782a61ce938d521fb617744697e81a93dbec40 (cherry picked from commit ec11a06d7fc5ae6c3f53149b93902fea771d806c) diff --git a/README b/README index ed67853..02a5f78 100644 --- a/README +++ b/README @@ -1,25 +1,13 @@ libcdr is a library and a set of tools for reading and converting binary files produced by Corel DRAW. -libcdr currently supports just CDR files from V7 to X3 and the following -features: - -- pages and page sizes -- shapes, lines, Bezier curves, bitmaps -- flat color fills, both RGB, CMYK, HLS and HSB -- different kinds of strokes including dashed strokes - -Above that libcdr provides a public API for rendering preview of pages for -applications that have no notion of pages themselves. - libcdr requires boost, icu, lcms2, libwpd, libwpg and zlib to build. Most up to date code is available from Git repository at libreoffice.org (https://gerrit.libreoffice.org/gitweb?p=libcdr.git), which is mirrored at freedesktop.org (http://cgit.freedesktop.org/libreoffice/libcdr/). See http://www.freedesktop.org/wiki/Software/libcdr for more information. -For convenience of use in third-party projects the library is available under -three licenses: GNU GPL 2.1+, GNU Lesser GPL 2.1+ and MPL 1.1+. +The library is available under MPL 2.0. Corel DRAW is a trademark by Corel. The developers of libcdr are in no way affiliated with the company. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: Branch 'libcdr-0.0' - .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit 9d5e526216497693fb4a9b94bf31c35585c3c5ed Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Apr 10 12:11:23 2014 +0200 Add 'compile' to .gitignore Change-Id: Ibd3a2228f104650f63383a1df2ea5eeeaaac4d89 diff --git a/.gitignore b/.gitignore index 929b893..849a084 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ Makefile.in ar-lib aclocal.m4 autom4te.cache +compile config.guess config.h config.h.in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit fc01f33aff7981704fd2381ef2ad01a93e465040 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Apr 10 12:11:23 2014 +0200 Add 'compile' to .gitignore Change-Id: Ibd3a2228f104650f63383a1df2ea5eeeaaac4d89 (cherry picked from commit 9d5e526216497693fb4a9b94bf31c35585c3c5ed) diff --git a/.gitignore b/.gitignore index 929b893..849a084 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ Makefile.in ar-lib aclocal.m4 autom4te.cache +compile config.guess config.h config.h.in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: Branch 'libcdr-0.0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 01456f4ac17c5bc1a90bc5ca9185adddb0d1d5f2 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Apr 10 12:13:05 2014 +0200 Bump version Change-Id: I51d895688a36ffe56b43bdd95bfb8dd24a8e80e2 diff --git a/configure.ac b/configure.ac index 404a0f7..3900219 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ([2.65]) # m4_define([libcdr_version_major],[0]) m4_define([libcdr_version_minor],[0]) -m4_define([libcdr_version_micro],[15]) +m4_define([libcdr_version_micro],[16]) m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro]) # = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/CppunitTest_cppcanvas_emfplus.mk cppcanvas/Module_cppcanvas.mk cppcanvas/qa
cppcanvas/CppunitTest_cppcanvas_emfplus.mk| 65 ++
cppcanvas/Module_cppcanvas.mk |4 +
cppcanvas/qa/extras/emfplus/data/fdo77229.emf |binary
cppcanvas/qa/extras/emfplus/emfplus.cxx | 92 ++
4 files changed, 161 insertions(+)
New commits:
commit c3d90aa384d82cbd0dd9f60d5576dbdca9ec1e53
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Apr 10 11:56:47 2014 +0200
fdo#77229 testcase
We didn't have EMF+ rendering testcases so far, let's see if it works
out to render into a bitmap and then just assert pixel position colors
there. It's better than nothing for missing shapes at least.
Change-Id: I2d1c63fef1127f69af7156ed6c99553845f77c9f
diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
new file mode 100644
index 000..d6a73b5
--- /dev/null
+++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
@@ -0,0 +1,65 @@
+# -*- 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,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppcanvas_emfplus, \
+ cppcanvas/qa/extras/emfplus/emfplus \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,cppcanvas_emfplus, \
+ comphelper \
+ cppu \
+ sal \
+ sfx \
+ test \
+ tl \
+ unotest \
+ vcl \
+))
+
+$(eval $(call gb_CppunitTest_unset_headless,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_use_external,cppcanvas_emfplus,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\
+ canvas/source/cairo/cairocanvas \
+ canvas/source/factory/canvasfactory \
+ cppcanvas/source/uno/mtfrenderer \
+ configmgr/source/configmgr \
+ extensions/source/scanner/scn \
+ filter/source/config/cache/filterconfig1 \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ package/util/package2 \
+ sax/source/expatwrap/expwrap \
+ sfx2/util/sfx \
+ sd/util/sd \
+ sd/util/sdd \
+ svl/source/fsstor/fsstorage \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,cppcanvas_emfplus))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/Module_cppcanvas.mk b/cppcanvas/Module_cppcanvas.mk
index 9894f9c..62ba638 100644
--- a/cppcanvas/Module_cppcanvas.mk
+++ b/cppcanvas/Module_cppcanvas.mk
@@ -29,6 +29,10 @@ ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)
$(eval $(call gb_Module_add_check_targets,cppcanvas,\
CppunitTest_cppcanvas_test \
))
+
+$(eval $(call gb_Module_add_slowcheck_targets,cppcanvas,\
+CppunitTest_cppcanvas_emfplus \
+))
endif
# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/qa/extras/emfplus/data/fdo77229.emf
b/cppcanvas/qa/extras/emfplus/data/fdo77229.emf
new file mode 100755
index 000..1f12717
Binary files /dev/null and b/cppcanvas/qa/extras/emfplus/data/fdo77229.emf
differ
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx
b/cppcanvas/qa/extras/emfplus/emfplus.cxx
new file mode 100644
index 000..adfb11c
--- /dev/null
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -0,0 +1,92 @@
+/* -*- 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 com/sun/star/beans/XPropertySet.hpp
+#include com/sun/star/drawing/XDrawPagesSupplier.hpp
+#include com/sun/star/frame/Desktop.hpp
+#include com/sun/star/graphic/XGraphic.hpp
+
+#include comphelper/processfactory.hxx
+#include sfx2/objsh.hxx
+#include sfx2/sfxbasemodel.hxx
+#include test/bootstrapfixture.hxx
+#include unotest/macros_test.hxx
+#include vcl/bmpacc.hxx
+#include vcl/pngwrite.hxx
+
+using namespace com::sun::star;
+
+class Test : public test::BootstrapFixture, public unotest::MacrosTest
+{
+public:
+Test()
+: mpTestDocumentPath(/cppcanvas/qa/extras/emfplus/data/)
+{
+}
+
+virtual ~Test()
+{
+}
+
+virtual void setUp() SAL_OVERRIDE
+{
[Libreoffice-commits] libcdr.git: Branch 'libcdr-0.0' - 5 commits - astyle.options AUTHORS HACKING src/lib
AUTHORS |4
HACKING |8
astyle.options | 11 +++
src/lib/CDRContentCollector.cpp |4 ++--
src/lib/CDRParser.cpp |8
src/lib/CDRSVGGenerator.cpp | 31 +--
src/lib/CDRSVGGenerator.h | 30 +-
src/lib/CDRStringVector.cpp | 30 +-
src/lib/CDRStylesCollector.cpp |2 +-
src/lib/CDRZipStream.cpp| 32 +---
src/lib/CDRZipStream.h | 30 +-
11 files changed, 55 insertions(+), 135 deletions(-)
New commits:
commit b8ed81a2770a7ccf745b7cc014a54180039b2f85
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Apr 10 12:26:40 2014 +0200
Re-astyle
Change-Id: I542cb83920ef928fdb89c9398c1457f1933fe5e2
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 770093d..d14bb86 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -554,8 +554,8 @@ void libcdr::CDRContentCollector::collectFillStyle(unsigned
short fillType, cons
}
void libcdr::CDRContentCollector::collectLineStyle(unsigned short lineType,
unsigned short capsType, unsigned short joinType, double lineWidth,
- double stretch, double
angle, const CDRColor color, const std::vectorunsigned dashArray,
- const CDRPath startMarker,
const CDRPath endMarker)
+double stretch, double angle, const CDRColor color, const
std::vectorunsigned dashArray,
+const CDRPath startMarker, const CDRPath endMarker)
{
m_currentLineStyle = CDRLineStyle(lineType, capsType, joinType, lineWidth,
stretch, angle, color, dashArray, startMarker, endMarker);
}
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 9b8cb7a..f5f324c 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -285,9 +285,9 @@ bool libcdr::CDRParser::parseWaldo(WPXInputStream *input)
}
bool libcdr::CDRParser::gatherWaldoInformation(WPXInputStream *input,
std::vectorWaldoRecordInfo records, std::mapunsigned, WaldoRecordInfo
records2,
- std::mapunsigned,
WaldoRecordInfo records3, std::mapunsigned, WaldoRecordInfo records4,
- std::mapunsigned,
WaldoRecordInfo records6, std::mapunsigned, WaldoRecordInfo records7,
- std::mapunsigned,
WaldoRecordInfo records8, std::mapunsigned, WaldoRecordInfo recordsOther)
+std::mapunsigned, WaldoRecordInfo records3, std::mapunsigned,
WaldoRecordInfo records4,
+std::mapunsigned, WaldoRecordInfo records6, std::mapunsigned,
WaldoRecordInfo records7,
+std::mapunsigned, WaldoRecordInfo records8, std::mapunsigned,
WaldoRecordInfo recordsOther)
{
try
{
@@ -336,7 +336,7 @@ bool
libcdr::CDRParser::gatherWaldoInformation(WPXInputStream *input, std::vecto
bool libcdr::CDRParser::parseWaldoStructure(WPXInputStream *input,
std::stackWaldoRecordType1 waldoStack,
-const std::mapunsigned,
WaldoRecordType1 records1, std::mapunsigned, WaldoRecordInfo records2)
+const std::mapunsigned, WaldoRecordType1 records1, std::mapunsigned,
WaldoRecordInfo records2)
{
while (!waldoStack.empty())
{
diff --git a/src/lib/CDRStylesCollector.cpp b/src/lib/CDRStylesCollector.cpp
index 1fdb166..acfb92b 100644
--- a/src/lib/CDRStylesCollector.cpp
+++ b/src/lib/CDRStylesCollector.cpp
@@ -209,7 +209,7 @@ void
libcdr::CDRStylesCollector::collectPaletteEntry(unsigned colorId, unsigned
}
void libcdr::CDRStylesCollector::collectText(unsigned textId, unsigned
styleId, const std::vectorunsigned char data,
- const std::vectorunsigned char
charDescriptions, const std::mapunsigned, CDRCharacterStyle styleOverrides)
+const std::vectorunsigned char charDescriptions, const
std::mapunsigned, CDRCharacterStyle styleOverrides)
{
if (data.empty() || charDescriptions.empty())
return;
commit eb7f80fb5763c726ab6f9856f296e47b703a527c
Author: David Tardon dtar...@redhat.com
Date: Thu Nov 28 19:00:30 2013 +0100
add options file for astyle
Change-Id: Ifa12207d6d3bde25af615b293ca1f18c839a3a2f
(cherry picked from commit 70a49adcac0c7fa201ba75cae4784f68914cf778)
diff --git a/HACKING b/HACKING
index d1423ce..4f02df4 100644
--- a/HACKING
+++ b/HACKING
@@ -3,6 +3,6 @@
This project uses mostly the same file naming and coding style like
libwpd and the rest of Fridrich's libraries. Please run
-astyle -A1 -HU -k3 -y -n -s2 -r \*.cpp \*.h
+astyle --options=astyle.options \*.cpp \*.h
before committing.
diff --git a/astyle.options b/astyle.options
new file mode 100644
index 000..9d46215
--- /dev/null
+++
[Libreoffice-commits] libcdr.git: Branch 'libcdr-0.0' - libcdr.spec.in
libcdr.spec.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 880a1c4b3831ccd6c7233ed75939612dbca9c646
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Apr 10 12:27:36 2014 +0200
A license in spec file
Change-Id: I6533912dc5d7b40d7373e6235f7ec12038f3be51
diff --git a/libcdr.spec.in b/libcdr.spec.in
index 6cbc54e..9324ec3 100644
--- a/libcdr.spec.in
+++ b/libcdr.spec.in
@@ -12,7 +12,7 @@ Group: System Environment/Libraries
URL: http://libcdr.sf.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
BuildRequires: libwpd-devel = 0.9.0, gcc-c++, libstdc++-devel, pkgconfig =
0.9.0
-License: LGPL
+License: MPL-2.0
Prefix: %{prefix}
%description
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About parts in ODatabaseMetaData.cxx (connectivy module/odbc part)
It should be an option (though I've not looked at the code), because dbf is a *FILE* format that allows for deleted rows to remain in the dataset (as deleted). If you're working with a full database engine you would not (or at least, should not) expect that deleted data would remain in an accessible state. Regards Mark Stanton ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libcdr-0.0.16'
Tag 'libcdr-0.0.16' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2014-04-10 11:38 +0200 Tagging the libcdr 0.0.16 release Changes since libcdr-0.0.15-9: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: libcdr.spec.in
libcdr.spec.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8c30fab02698e5344cf4e6b04d70114ae2207ad4
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Apr 10 12:27:36 2014 +0200
A license in spec file
(cherry picked from commit 880a1c4b3831ccd6c7233ed75939612dbca9c646)
Conflicts:
libcdr.spec.in
Change-Id: I6533912dc5d7b40d7373e6235f7ec12038f3be51
diff --git a/libcdr.spec.in b/libcdr.spec.in
index ec2698b..0021d87 100644
--- a/libcdr.spec.in
+++ b/libcdr.spec.in
@@ -12,7 +12,7 @@ Group: System Environment/Libraries
URL: http://libcdr.sf.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
BuildRequires: librevenge-devel = 0.9.0, gcc-c++, libstdc++-devel, pkgconfig
= 0.9.0
-License: LGPL
+License: MPL-2.0
Prefix: %{prefix}
%description
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5cfbf353db6f5c62c100f80072ccb83d3c062a35
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Apr 10 12:53:22 2014 +0200
loplugin:bodynotinblock
Change-Id: I7262f0114f3bde17d81e14e0813cc7906e73fceb
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6892665..539eb51 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3007,7 +3007,7 @@ void DomainMapper_Impl::handleIndex
if( lcl_FindInCommand( pContext-GetCommand(), 'f', sValue ))
{
if(!sValue.isEmpty())
-sIndexEntryType = sValue ;
+sIndexEntryType = sValue ;
xTOC-setPropertyValue(rPropNameSupplier.GetName(
PROP_INDEX_ENTRY_TYPE ), uno::makeAny(sIndexEntryType));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) New commits: commit 0d8e3a145901ab0124d40d33a50e2de28dc0c8ab Author: Michael Stahl mst...@redhat.com Date: Thu Apr 10 12:48:41 2014 +0200 fdo#75376: configure: disable LTO by default for MSVC too MSVC 2010 LTO triggers some bug in painting Writer documents; unfortunately it's not possible to put a VCVER check in there to enable LTO by default only for MSVC2012 because the compiler detection actually uses the ENABLE_LTO value. Change-Id: I29ecdd552d8a8bbd673a844e6bf0c938a98825c2 diff --git a/configure.ac b/configure.ac index be8f22b..cbc7199 100644 --- a/configure.ac +++ b/configure.ac @@ -2535,12 +2535,6 @@ COMPATH=`echo $COMPATH | $SED s@/[[Bb]][[Ii]][[Nn]]\\\$@@` # Set the ENABLE_LTO variable # === AC_MSG_CHECKING([whether to use link-time optimization]) -if test $_os = WINNT -a $WITH_MINGW != yes -a -z $enable_lto -a \ -\( -z $enable_dbgutil -o $enable_dbgutil = no \) -a \ -\( -z $enable_debug -o $enable_debug = no \); then -# Turn on LTO for MSVC when optimising unless told not to -enable_lto=yes -fi if test -n $enable_lto -a $enable_lto != no; then ENABLE_LTO=TRUE AC_MSG_RESULT([yes]) @@ -3684,6 +3678,11 @@ if test $_os = WINNT; then 100) COMEX=13 WINDOWS_SDK_ACCEPTABLE_VERSIONS=7.1A 7.1 7.0A 6.0A +if test $ENABLE_LTO = TRUE; then + +AC_MSG_WARN([LTO is known to cause problems with MSVC 2010]) +add_warning LTO is known to cause problems with MSVC 2010 +fi ;; 110) COMEX=14 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
License statement : Synerzip
Hi All, For the record, All contributions past and present made to LibreOffice from Synerzip are available under the terms the MPL / LGPLv3+. Until further notice, future contributions made to LibreOffice from Synerzip are available under the terms the MPL / LGPLv3+. Regards, Ravindra Vidhate Synerzip, Pune. -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License statement : Synerzip
Hi All, For the record, All contributions past and present made to LibreOffice from Synerzip are available under the terms the MPL / LGPLv3+. Until further notice, future contributions made to LibreOffice from Synerzip are available under the terms the MPL / LGPLv3+. For reference read : https://wiki.documentfoundation.org/Development/Developers#Companies -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/ios vcl/osx vcl/source
include/vcl/outdev.hxx |1
vcl/inc/svdata.hxx |1
vcl/ios/iosinst.cxx|1
vcl/osx/salinst.cxx|1
vcl/source/gdi/outdev4.cxx | 59 -
5 files changed, 1 insertion(+), 62 deletions(-)
New commits:
commit cb10a184b96b0f52ac8aa2b10b3dc218e76e752d
Author: Tor Lillqvist t...@collabora.com
Date: Wed Apr 9 10:01:34 2014 +0300
Kill the ImplSVGDIData::mbNoXORClipping flag
Instead, act as if it was true on all platforms. Don't do XOR clipping on
any
platform. Simpler code is better code, and XOR tricks are generally very
much
out of fashion these days, I have been told. Didn't seem to have any visible
ill effects on Linux at least.
Change-Id: I6192006c77a4a81363ec7b3292f72d512d5e9b53
Reviewed-on: https://gerrit.libreoffice.org/8901
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 3c10cbd..be31840 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -843,7 +843,6 @@ protected:
virtual voidClipAndDrawGradientToBounds( Gradient
rGradient, const PolyPolygon rPolyPoly );
voidClipAndDrawGradient( Gradient rGradient,
const PolyPolygon rPolyPoly );
-voidXORClipAndDrawGradient( Gradient rGradient,
const PolyPolygon rPolyPoly );
virtual voidClipAndDrawGradientMetafile ( const Gradient
rGradient, const PolyPolygon rPolyPoly );
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 706271f..0ba6ee6 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -175,7 +175,6 @@ struct ImplSVGDIData
longmnAppFontY; // AppFont Y-Numenator for
80/tel Height
boolmbFontSubChanged; // true: FontSubstitution was
changed between Begin/End
boolmbNativeFontConfig; // true: do not override UI
font
-boolmbNoXORClipping;// true: do not use XOR to
achieve clipping effects
};
struct ImplSVWinData
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index fca7062..91735bb 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -265,7 +265,6 @@ SalInstance *CreateSalInstance()
IosSalInstance* pInstance = new IosSalInstance( new SalYieldMutex() );
new IosSalData( pInstance );
pInstance-AcquireYieldMutex(1);
-ImplGetSVData()-maGDIData.mbNoXORClipping = true;
ImplGetSVData()-maWinData.mbNoSaveBackground = true;
return pInstance;
}
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 4414bef..7b10141 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -336,7 +336,6 @@ SalInstance* CreateSalInstance()
ImplGetSVData()-maNWFData.mbProgressNeedsErase = true;
ImplGetSVData()-maNWFData.mbCheckBoxNeedsErase = true;
ImplGetSVData()-maNWFData.mnStatusBarLowerRightOffset = 10;
-ImplGetSVData()-maGDIData.mbNoXORClipping = true;
ImplGetSVData()-maWinData.mbNoSaveBackground = true;
return pInst;
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index f5ae9a7..a371384 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -722,10 +722,7 @@ void OutputDevice::ClipAndDrawGradientMetafile ( const
Gradient rGradient, cons
void OutputDevice::ClipAndDrawGradientToBounds ( Gradient rGradient, const
PolyPolygon rPolyPoly )
{
-if( ImplGetSVData()-maGDIData.mbNoXORClipping )
-ClipAndDrawGradient ( rGradient, rPolyPoly );
-else
-XORClipAndDrawGradient ( rGradient, rPolyPoly );
+ClipAndDrawGradient ( rGradient, rPolyPoly );
}
void OutputDevice::ClipAndDrawGradient ( Gradient rGradient, const
PolyPolygon rPolyPoly )
@@ -773,60 +770,6 @@ void OutputDevice::ClipAndDrawGradient ( Gradient
rGradient, const PolyPolygon
}
}
-void OutputDevice::XORClipAndDrawGradient ( Gradient rGradient, const
PolyPolygon rPolyPoly )
-{
-const PolyPolygon aPolyPoly( LogicToPixel( rPolyPoly ) );
-const Rectangle aBoundRect( rPolyPoly.GetBoundRect() );
-Point aPoint;
-Rectangle aDstRect( aPoint, GetOutputSizePixel() );
-
-aDstRect.Intersection( aBoundRect );
-
-ClipToPaintRegion( aDstRect );
-
-if( !aDstRect.IsEmpty() )
-{
-boost::scoped_ptrVirtualDevice pVDev;
-const Size aDstSize( aDstRect.GetSize() );
-
-if( HasAlpha() )
-{
-// #110958# Pay attention to alpha VDevs here, otherwise,
-// background will be wrong: Temp VDev has to have alpha, too.
-pVDev.reset(new VirtualDevice( *this, 0, GetAlphaBitCount() 1 ?
0 : 1 ));
-}
-else
-{
-// nothing special here. Plain VDev
-pVDev.reset(new VirtualDevice());
-}
-
-if(
License statement : Synerzip
Hi All, For the record, All contributions past and present made to LibreOffice from Synerzip are available under the terms the MPL / LGPLv3+. Until further notice, future contributions made to LibreOffice from Synerzip are available under the terms the MPL / LGPLv3+. Regards, Priyanka Gaikwad -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - starmath/source
starmath/source/smdetect.cxx | 64 ++-
1 file changed, 58 insertions(+), 6 deletions(-)
New commits:
commit 66090da6c85d3562de146b08842b61e7b2cb0038
Author: Armin Le Grand a...@apache.org
Date: Thu Apr 10 11:38:37 2014 +
i124636 refine StarMath filter detector to be more specific than just
checking for xml
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index b094bce..93a5644 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -326,17 +326,69 @@ SmFilterDetect::~SmFilterDetect()
}
else
{
-const sal_uInt16 nSize = 5;
-sal_Char aBuffer[nSize+1];
-aBuffer[nSize] = 0;
+// #124636# detection should not only check for xml,
but at least also for
+// the math start element and the MathML URL.
Additionally take their order
+// into account. Also allow the case where the start
element has a namespace
+// (e.g. bla:math), but in that case ensure that it
is in front of an evtl.
+// xmlns:math namespace declaration and thus not part
of that
+const sal_uInt16 nReadSize(4095);
+sal_Char aBuffer[nReadSize+1];
pStrm-Seek( STREAM_SEEK_TO_BEGIN );
-sal_uLong nBytesRead = pStrm-Read( aBuffer, nSize );
-if (nBytesRead == nSize)
+const sal_uLong nBytesRead(pStrm-Read( aBuffer,
nReadSize ));
+
+if(nBytesRead (5 + 1 + 34 + 5)) // xml + '' + URL +
'(|:)math'
{
-if (0 == strncmp( ?xml,aBuffer,nSize))
+// end string with null
+aBuffer[nBytesRead + 1] = 0;
+
+// is it a xml file?
+const sal_Char* pXML = strstr(aBuffer, ?xml);
+bool isMathFile(false);
+
+if(pXML)
+{
+// does it have the MathML URL?
+const sal_Char* pURL = strstr(aBuffer,
http://www.w3.org/1998/Math/MathML;);
+
+// URL has to be after XML start
+if(pURL pURL pXML)
+{
+// look if we have a direct math start
element
+sal_Char* pMathStart = strstr(aBuffer,
math);
+
+if(!pMathStart)
+{
+// if not, look if we have a math
start element in another namespace
+pMathStart = strstr(aBuffer, :math);
+
+if(pMathStart)
+{
+// if found, this has to be in
front of the evtl. also existing namespace
+// declaration also containing
:math to be the start element
+sal_Char* pNamespaceMath =
strstr(aBuffer, xmlns:math);
+
+if(pNamespaceMath pMathStart
pNamespaceMath)
+{
+// invalid :math found
(probably part of the namespace declaration)
+// - this cannot be the math
start element
+pMathStart = 0;
+}
+}
+}
+
+// MathStart has to be before the URL
+if(pMathStart pMathStart pURL)
+{
+isMathFile = true;
+}
+}
+}
+
+if(isMathFile)
{
static const sal_Char sFltrNm_2[] = MATHML_XML;
static const sal_Char sTypeNm_2[] =
math_MathML_XML_Math;
+
aFilterName.AssignAscii( sFltrNm_2 );
aTypeName.AssignAscii( sTypeNm_2 );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/Module_cppcanvas.mk
cppcanvas/Module_cppcanvas.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit bcd243793ee4174d71b5e61c88d2bc79fd0d7f1d Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Apr 10 14:01:03 2014 +0200 CppunitTest_cppcanvas_emfplus: disable this in case there is no display to use This test is already disabled on non-Linux, but it fails in case there is no display to use. For now just disable it in that case. Change-Id: I29c52e803a1fca5f2bdeeb655c573ad8fef622e8 diff --git a/cppcanvas/Module_cppcanvas.mk b/cppcanvas/Module_cppcanvas.mk index 62ba638..b341bc0 100644 --- a/cppcanvas/Module_cppcanvas.mk +++ b/cppcanvas/Module_cppcanvas.mk @@ -30,9 +30,11 @@ $(eval $(call gb_Module_add_check_targets,cppcanvas,\ CppunitTest_cppcanvas_test \ )) +ifneq ($(DISPLAY),) $(eval $(call gb_Module_add_slowcheck_targets,cppcanvas,\ CppunitTest_cppcanvas_emfplus \ )) endif +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: ucbhelper/source
ucbhelper/source/client/content.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit a7d3f57da50a21dbe27516948435255ad54249c7
Author: Michael Stahl mst...@redhat.com
Date: Thu Apr 10 14:12:13 2014 +0200
warning C4101: 'e': unreferenced local variable
Change-Id: I3fb8a4f2854fb034d6b184ee46c04e8a8d03ca6a
diff --git a/ucbhelper/source/client/content.cxx
b/ucbhelper/source/client/content.cxx
index a071786..4cb7628 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -298,6 +298,7 @@ static Reference XContent getContentNoThrow(
}
catch ( IllegalIdentifierException const e )
{
+SAL_WARN(ucbhelper, getContentNoThrow: exception: e.Message);
}
return xContent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/DialogModel.cxx | 20 +---
1 file changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 148d5192fc5d57c10045b837cc245fc018f13f64
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Apr 10 14:25:55 2014 +0200
Make implicit assignment etc. work for these iterator classes
...so they fulfil all the relevant iterator requirements out of the box.
Change-Id: I2a47fa18ba31e9680a2b18285a1640baaf0da40b
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx
b/chart2/source/controller/dialogs/DialogModel.cxx
index bc4e110..e3f9384 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -151,7 +151,7 @@ struct lcl_DataSeriesContainerAppend : public
{
typedef ::std::vector ::chart::DialogModel::tSeriesWithChartTypeByName
tContainerType;
-explicit lcl_DataSeriesContainerAppend( tContainerType rCnt )
+explicit lcl_DataSeriesContainerAppend( tContainerType * rCnt )
: m_rDestCnt( rCnt )
{}
@@ -168,7 +168,7 @@ struct lcl_DataSeriesContainerAppend : public
aRole = xCT-getRoleOfSequenceForSeriesLabel();
for( sal_Int32 nI = 0; nI aSeq.getLength(); ++ nI )
{
-m_rDestCnt.push_back(
+m_rDestCnt-push_back(
::chart::DialogModel::tSeriesWithChartTypeByName(
::chart::DataSeriesHelper::getDataSeriesLabel(
aSeq[nI], aRole ),
::std::make_pair( aSeq[nI], xCT )));
@@ -189,10 +189,9 @@ struct lcl_DataSeriesContainerAppend : public
lcl_DataSeriesContainerAppend operator* () { return *this; }
lcl_DataSeriesContainerAppend operator++ (){ return operator++(0); }
lcl_DataSeriesContainerAppend operator++ (int) { return *this; }
-lcl_DataSeriesContainerAppend operator= ( lcl_DataSeriesContainerAppend
) { return *this; }
private:
-tContainerType m_rDestCnt;
+tContainerType * m_rDestCnt;
};
struct lcl_RolesWithRangeAppend : public
@@ -200,7 +199,7 @@ struct lcl_RolesWithRangeAppend : public
{
typedef ::chart::DialogModel::tRolesWithRanges tContainerType;
-explicit lcl_RolesWithRangeAppend( tContainerType rCnt,
+explicit lcl_RolesWithRangeAppend( tContainerType * rCnt,
const OUString aLabelRole )
: m_rDestCnt( rCnt ),
m_aRoleForLabelSeq( aLabelRole )
@@ -220,7 +219,7 @@ struct lcl_RolesWithRangeAppend : public
Reference beans::XPropertySet xProp( xSeq,
uno::UNO_QUERY_THROW );
if( xProp-getPropertyValue( Role ) = aRole )
{
-m_rDestCnt.insert(
+m_rDestCnt-insert(
tContainerType::value_type(
aRole, xSeq-getSourceRangeRepresentation()));
// label
@@ -229,7 +228,7 @@ struct lcl_RolesWithRangeAppend : public
Reference data::XDataSequence xLabelSeq(
xVal-getLabel());
if( xLabelSeq.is())
{
-m_rDestCnt.insert(
+m_rDestCnt-insert(
tContainerType::value_type(
lcl_aLabelRole,
xLabelSeq-getSourceRangeRepresentation()));
}
@@ -252,10 +251,9 @@ struct lcl_RolesWithRangeAppend : public
lcl_RolesWithRangeAppend operator* () { return *this; }
lcl_RolesWithRangeAppend operator++ (){ return operator++(0); }
lcl_RolesWithRangeAppend operator++ (int) { return *this; }
-lcl_RolesWithRangeAppend operator= ( lcl_RolesWithRangeAppend ) {
return *this; }
private:
-tContainerType m_rDestCnt;
+tContainerType * m_rDestCnt;
OUString m_aRoleForLabelSeq;
};
@@ -466,7 +464,7 @@ Reference data::XDataProvider
DialogModel::getDataProvider() const
getAllDataSeriesContainers());
::std::copy( aContainers.begin(), aContainers.end(),
- lcl_DataSeriesContainerAppend( aResult ));
+ lcl_DataSeriesContainerAppend( aResult ));
return aResult;
}
@@ -481,7 +479,7 @@ DialogModel::tRolesWithRanges
DialogModel::getRolesWithRanges(
Reference data::XDataSource xSource( xSeries, uno::UNO_QUERY_THROW
);
const Sequence Reference data::XLabeledDataSequence aSeq(
xSource-getDataSequences());
::std::copy( aSeq.getConstArray(), aSeq.getConstArray() +
aSeq.getLength(),
- lcl_RolesWithRangeAppend( aResult,
aRoleOfSequenceForLabel ));
+ lcl_RolesWithRangeAppend( aResult,
aRoleOfSequenceForLabel ));
if( xChartType.is())
{
// add missing
[Libreoffice-commits] core.git: forms/source include/sfx2 oox/source sfx2/source svx/source sw/source
forms/source/component/clickableimage.cxx |2 +-
include/sfx2/docfile.hxx|2 +-
oox/source/drawingml/fillpropertiesgroupcontext.cxx |2 +-
sfx2/source/appl/fileobj.cxx| 16
sfx2/source/appl/fileobj.hxx|2 +-
sfx2/source/appl/opengrf.cxx|2 +-
sfx2/source/bastyp/sfxhtml.cxx |2 +-
sfx2/source/doc/docfile.cxx |2 +-
svx/source/gallery2/galmisc.cxx |2 +-
svx/source/svdraw/svdograf.cxx |2 +-
sw/source/core/uibase/app/docsh2.cxx|2 +-
sw/source/core/uibase/docvw/edtwin.cxx |2 +-
sw/source/core/uibase/uiview/view2.cxx |2 +-
sw/source/core/unocore/unocrsrhelper.cxx|2 +-
14 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 31911865e5bda29ff2394ddf80244fbf15517657
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Apr 10 14:49:52 2014 +0200
DownLoad - Download.
Change-Id: Ia1729f570cc80a0375532da6478de9d58518556e
diff --git a/forms/source/component/clickableimage.cxx
b/forms/source/component/clickableimage.cxx
index e30ba66..e94b6e1 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -799,7 +799,7 @@ namespace frm
m_bProdStarted = sal_False;
// Download anstossen (Achtung: Kann auch synchron sein).
-m_pMedium-DownLoad(STATIC_LINK(this, OClickableImageBaseModel,
DownloadDoneLink));
+m_pMedium-Download(STATIC_LINK(this, OClickableImageBaseModel,
DownloadDoneLink));
}
else
{
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index ab85627..132e2ac 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -134,7 +134,7 @@ public:
const OUString GetPhysicalName() const;
boolIsRemote();
boolIsOpen() const; // { return aStorage.Is() ||
pInStream; }
-voidDownLoad( const Link aLink = Link());
+voidDownload( const Link aLink = Link());
voidSetDoneLink( const Link rLink );
sal_uInt32 GetErrorCode() const;
diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
index ad8cf41..89fdb26 100644
--- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
+++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
@@ -159,7 +159,7 @@ BlipContext::BlipContext( ContextHandler2Helper rParent,
OUString aRelId = rAttribs.getString( R_TOKEN( link ), OUString() );
OUString aTargetLink = getFilter().getAbsoluteUrl(
getRelations().getExternalTargetFromRelId( aRelId ) );
SfxMedium xMed( aTargetLink, STREAM_STD_READ );
-xMed.DownLoad();
+xMed.Download();
Reference io::XInputStream xInStrm = xMed.GetInputStream();
if ( xInStrm.is() )
mrBlipProps.mxGraphic =
getFilter().getGraphicHelper().importGraphic( xInStrm );
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index e9670ae..e123285 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -58,7 +58,7 @@ SvFileObject::SvFileObject()
, bNativFormat(false)
, bClearMedium(false)
, bStateChangeCalled(false)
-, bInCallDownLoad(false)
+, bInCallDownload(false)
{
}
@@ -111,7 +111,7 @@ bool SvFileObject::GetData( ::com::sun::star::uno::Any
rData,
if( !xMed.Is() )
LoadFile_Impl();
-if( !bInCallDownLoad )
+if( !bInCallDownload )
{
xTmpMed = xMed;
while( bWaitForData )
@@ -263,19 +263,19 @@ bool SvFileObject::LoadFile_Impl()
bWaitForData = true;
SfxMediumRef xTmpMed = xMed;
-bInCallDownLoad = true;
-xMed-DownLoad( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
-bInCallDownLoad = false;
+bInCallDownload = true;
+xMed-Download( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
+bInCallDownload = false;
bClearMedium = !xMed.Is();
if( bClearMedium )
-xMed = xTmpMed; // If already finished in DownLoad
+xMed = xTmpMed; // If already finished in Download
return bDataReady;
}
bWaitForData = true;
bDataReady = bInNewData = false;
-xMed-DownLoad();
+xMed-Download();
bLoadAgain = !xMed-IsRemote();
bWaitForData = false;
@@ -464,7 +464,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*,
EMPTYARG )
// When we come form here there it can not be an error no more.
pThis-bLoadError = false;
pThis-bWaitForData =
GSOC 2014
I , Akhil Killawala would like to apply for an internship project for GSOC @)!$ with your company. In a fast-paced and dynamic world, it is important to be commercially aware, flexible and open-minded. My understanding of the role is that it requires quick learners with strong communication, interpersonal and numerical skills.I have completed basic level of programming languages like Linux and Latex as well as basic and advance level course in Visual Basic, C, C++, Java, Ubuntu, Python, PHP. In addition to possessing these attributes, my summer school courses in Macroeconomics (LSE, UK) would ideally help me understand and analyse the multi-dimensional economic scenario to ultimately contribute my bit. Also have started up a Campus Company called ResuMEntor where students are assisted with building resumes , mock GD and mock PI.With my scholarly background and analytical faculty, I would be able to bring a wider view upon the operations of the project. Supplementing my competitive academic qualifications, involvement in varied extra-curricular activities has given me immense confidence in my ability to pursue a rewarding career. My success as the First Year Engineering Headof KJSCE Students Chapter CSI (Computer Society of India) and Jt. General Secretary of SAHAS council (Students Association of Humanities and Science) and organiser of events like MUN, Tech-snakes and Ladder, temple run demonstrate my leadership qualities, interpersonal skills and ability to think creatively. Also organising seminar like Microsoft-Windows 8 Prelaunch and working on various successful group projects has helped develop my understanding for improving organizational efficiency and overall decision making through team work.Currently the General Secretary of UNICODE Cell which aims at research and technical papers. I feel it worthwhile to mention that most of my personal goals move in line with my career goals. Yours sincerely, Akhil Killawala Akhil Resume.docx Description: application/vnd.openxmlformats-officedocument.wordprocessingml.document ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: source/text
source/text/scalc/05/0214.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c78bb98ac5b6e8c434678c063fa1762a828833d5 Author: Eike Rathke er...@redhat.com Date: Thu Apr 10 15:12:31 2014 +0200 maximum number of tokens is 8192 Change-Id: Ie183c581c0382489a2b466c96ee8cb7017937f0f diff --git a/source/text/scalc/05/0214.xhp b/source/text/scalc/05/0214.xhp index c0c1ce0..3e6789c 100644 --- a/source/text/scalc/05/0214.xhp +++ b/source/text/scalc/05/0214.xhp @@ -159,7 +159,7 @@ /tablecell tablecell paragraph xml-lang=en-US id=par_id3159259 role=tablecontent l10n=U oldref=41 - emphCompiler:/emph the total number of internal tokens, (that is, operators, variables, brackets) in the formula exceeds 512./paragraph + emphCompiler:/emph the total number of internal tokens, (that is, operators, variables, brackets) in the formula exceeds 8192./paragraph /tablecell /tablerow tablerow ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 60cc9896c8d4f48c5e3225d09210be4bcc23e44e Author: Eike Rathke er...@redhat.com Date: Thu Apr 10 15:12:31 2014 +0200 Updated core Project: help c78bb98ac5b6e8c434678c063fa1762a828833d5 diff --git a/helpcontent2 b/helpcontent2 index 9ab507d..c78bb98 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9ab507d3f5fd419d7b1c88d6d43758e8361ae71d +Subproject commit c78bb98ac5b6e8c434678c063fa1762a828833d5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/kohei/chart-controller-study'
New branch 'private/kohei/chart-controller-study' available with the following commits: commit 3d8c6a46ba1de6308e40b1b16ddd3ecf9f2c23a6 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Apr 9 15:31:00 2014 -0400 Reduce indentation by early bailout. Change-Id: I64c88b007564d3ca7b4f4bd95a458fee6bda7854 commit cc1c938cdcb0a01b3b74030aeee1351637b9ab34 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Apr 9 12:34:38 2014 -0400 Let's remove these... Change-Id: Ie4f15c894c13fd52e1ee175381a1e62b33864d39 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: GSOC 2014
Unfortunately, your analytical faculty was apparently not enough to notice that the time to apply for GSoC ended already some weeks ago. Also, our organisation is more impressed by an applicant having successfully performed some of our Easy Hacks and displayed actual coding skills relevant for our codebase before applying than by a well-stuffed resume and lots of impressive words in the application. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: GSOC 2014
Hi Akhil, Sorry, as you can see from the timeline: http://www.google-melange.com/gsoc/events/google/gsoc2014 The application deadline is over for this year. However, even next year, please use ODF for any kind of attachments (instead of OOXML), if you consider applying seriously. Best, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: soltools/cpp
soltools/cpp/_getopt.c |2 ++
soltools/cpp/_getopt.h | 29 +
soltools/cpp/_unix.c |4 +---
3 files changed, 32 insertions(+), 3 deletions(-)
New commits:
commit 691a54ccdf89489b64ea9dfffd07b824b2f1a964
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Apr 10 15:31:22 2014 +0200
Clean up function declaration
Change-Id: I92c54f61fe8608d788cc236956f4a5a58e20a7df
diff --git a/soltools/cpp/_getopt.c b/soltools/cpp/_getopt.c
index cbbfc82..82506fa 100644
--- a/soltools/cpp/_getopt.c
+++ b/soltools/cpp/_getopt.c
@@ -20,6 +20,8 @@
#include stdio.h
#include string.h
+#include _getopt.h
+
#define EPR fprintf(stderr,
#define ERR(str, chr) if(opterr) { EPR %s%c\n, str, chr); }
diff --git a/soltools/cpp/_getopt.h b/soltools/cpp/_getopt.h
new file mode 100644
index 000..8a8fccd
--- /dev/null
+++ b/soltools/cpp/_getopt.h
@@ -0,0 +1,29 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SOLTOOLS_CPP_GETOPT_H
+#define INCLUDED_SOLTOOLS_CPP_GETOPT_H
+
+int stgetopt(int, char *const *, const char *);
+extern char *optarg;
+extern int optind;
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c
index e5f9eab..d1cd208 100644
--- a/soltools/cpp/_unix.c
+++ b/soltools/cpp/_unix.c
@@ -32,9 +32,7 @@
#include cpp.h
#if defined MACOSX || defined AIX || defined WNT
-extern int stgetopt(int, char *const *, const char *);
-extern char *optarg;
-extern int optind;
+#include _getopt.h
#else
#include getopt.h
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx|7 ++-
bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx| 37 ++
bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx |4 -
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 14 +-
4 files changed, 56 insertions(+), 6 deletions(-)
New commits:
commit abc1c428e028e081a94527b7cb5dc5199147fcfb
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Apr 10 15:45:58 2014 +0200
Clean up function declarations
Change-Id: I1f4a18e7aa6288e147c7f4c3f17bb99f1f0df5c5
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx
index 96834da..16f5e78 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx
@@ -18,8 +18,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-extern C void
-privateSnippetExecutor()
+#include sal/config.h
+
+#include call.hxx
+
+void privateSnippetExecutor()
{
asm volatile
(
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx
new file mode 100644
index 000..6738970
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx
@@ -0,0 +1,37 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_CALL_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_CALL_HXX
+
+#include sal/config.h
+
+#include sal/types.h
+#include typelib/typeclass.h
+
+extern C typelib_TypeClass cpp_vtable_call(
+sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
+void ** gpreg, void ** fpreg, void ** ovrflw,
+sal_uInt64 * pRegisterReturn /* space for register return */ );
+
+extern C void privateSnippetExecutor();
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index 67d2f88..86089c3 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -36,6 +36,7 @@
#include bridges/cpp_uno/shared/vtablefactory.hxx
#include abi.hxx
+#include call.hxx
#include share.hxx
using namespace ::osl;
@@ -250,8 +251,7 @@ static typelib_TypeClass cpp2uno_call(
}
}
-
-extern C typelib_TypeClass cpp_vtable_call(
+typelib_TypeClass cpp_vtable_call(
sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
void ** gpreg, void ** fpreg, void ** ovrflw,
sal_uInt64 * pRegisterReturn /* space for register return */ )
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 6988dcb..664a5c0 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -55,11 +55,13 @@ namespace CPPU_CURRENT_NAMESPACE {
namespace {
struct Fake_type_info {
-virtual ~Fake_type_info() {}
+virtual ~Fake_type_info() SAL_DELETED_FUNCTION;
char const * name;
};
-struct Fake_class_type_info: Fake_type_info {};
+struct Fake_class_type_info: Fake_type_info {
+virtual ~Fake_class_type_info() SAL_DELETED_FUNCTION;
+};
#if MACOSX_SDK_VERSION 1070
BOOST_STATIC_ASSERT(
@@ -67,6 +69,7 @@ BOOST_STATIC_ASSERT(
#endif
struct Fake_si_class_type_info: Fake_class_type_info {
+virtual ~Fake_si_class_type_info() SAL_DELETED_FUNCTION;
void const * base;
};
@@ -117,9 +120,16 @@ std::type_info * createFake_si_class_type_info(
}
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored -Wunused-function
+#endif
void dummy_can_throw_anything( char const * )
{
}
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
static OUString toUNOname( char const * p ) SAL_THROW(())
{
___
Libreoffice-commits mailing list
[Libreoffice-commits] core.git: Branch 'private/kohei/chart-controller-study' - chart2/Library_chartcore.mk chart2/source
chart2/Library_chartcore.mk |3
chart2/source/view/charttypes/3DBarChart.cxx | 76 --
chart2/source/view/charttypes/GL3DBarChart.cxx | 93 ++-
chart2/source/view/charttypes/GL3DBarChart.hxx | 30 ---
chart2/source/view/charttypes/VSeriesPlotter.cxx |3
chart2/source/view/inc/3DBarChart.hxx| 48 ---
chart2/source/view/inc/GL3DBarChart.hxx | 53 +
chart2/source/view/main/ChartView.cxx|4
8 files changed, 99 insertions(+), 211 deletions(-)
New commits:
commit 8e98ac515f1e5cbffdc596187a752e7200c35955
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Apr 10 10:08:51 2014 -0400
Rename 3DBarChart and Bar3DChart both to GL3DBarChart.
The old GL3DBarChart has been removed.
Change-Id: I0b052cdb875ee23a8c712772269ab0fcc4a1e758
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index dae64e9..af3b6f3 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -86,14 +86,13 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/view/axes/VPolarCoordinateSystem \
chart2/source/view/axes/VPolarGrid \
chart2/source/view/axes/VPolarRadiusAxis \
-chart2/source/view/charttypes/3DBarChart \
+chart2/source/view/charttypes/GL3DBarChart \
chart2/source/view/charttypes/AreaChart \
chart2/source/view/charttypes/BarChart \
chart2/source/view/charttypes/BarPositionHelper \
chart2/source/view/charttypes/BubbleChart \
chart2/source/view/charttypes/CandleStickChart \
chart2/source/view/charttypes/CategoryPositionHelper \
-chart2/source/view/charttypes/GL3DBarChart \
chart2/source/view/charttypes/NetChart \
chart2/source/view/charttypes/PieChart \
chart2/source/view/charttypes/Splines \
diff --git a/chart2/source/view/charttypes/3DBarChart.cxx
b/chart2/source/view/charttypes/3DBarChart.cxx
deleted file mode 100644
index 13e3faf..000
--- a/chart2/source/view/charttypes/3DBarChart.cxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- 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 GL/glew.h
-
-#include 3DBarChart.hxx
-
-#include glm/glm.hpp
-#include glm/gtx/transform.hpp
-
-#include 3DChartObjects.hxx
-
-namespace chart {
-
-Bar3DChart::Bar3DChart(const std::vectorVDataSeries* rDataSeries):
-maDataSeries(rDataSeries),
-mxContext(new opengl3D::temporary::TemporaryContext())
-{
-}
-
-Bar3DChart::~Bar3DChart()
-{
-}
-
-void Bar3DChart::create3DShapes()
-{
-const float nBarSizeX = 10;
-const float nBarSizeY = 10;
-const float nBarDistanceX = nBarSizeX / 2;
-const float nBarDistanceY = nBarSizeY / 2;
-
-maShapes.clear();
-maShapes.push_back(new opengl3D::Camera());
-sal_Int32 nSeriesIndex = 0;
-for(std::vectorVDataSeries*::const_iterator itr = maDataSeries.begin(),
-itrEnd = maDataSeries.end(); itr != itrEnd; ++itr)
-{
-VDataSeries* pDataSeries = *itr;
-sal_Int32 nPointCount = pDataSeries-getTotalPointCount();
-for(sal_Int32 nIndex = 0; nIndex nPointCount; ++nIndex)
-{
-float nVal = pDataSeries-getYValue(nIndex);
-float nXPos = nIndex * (nBarSizeX + nBarDistanceX);
-float nYPos = nSeriesIndex * (nBarSizeY + nBarDistanceY);
-
-glm::mat4 aBarPosition;
-glm::scale(aBarPosition, nBarSizeX, nBarSizeY, nVal);
-glm::translate(aBarPosition, nXPos, nYPos, nVal/2);
-
-maShapes.push_back(new opengl3D::Bar(aBarPosition));
-}
-
-++nSeriesIndex;
-}
-}
-
-void Bar3DChart::render()
-{
-mxContext-init();
-for(boost::ptr_vectoropengl3D::Renderable3DObject::iterator itr =
maShapes.begin(),
-itrEnd = maShapes.end(); itr != itrEnd; ++itr)
-{
-itr-render();
-}
-mxContext-render();
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 0249a65..6ea785d 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -7,20 +7,20 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include GL3DBarChart.hxx
-#include unonames.hxx
+#include GL3DBarChart.hxx
-#include com/sun/star/chart2/data/XDataSequence.hpp
-#include com/sun/star/chart2/data/LabelOrigin.hpp
+#include GL/glew.h
-#include stdio.h
+#include glm/glm.hpp
+#include glm/gtx/transform.hpp
-using namespace com::sun::star;
+#include 3DChartObjects.hxx
namespace chart {
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/az_AZ.xml |1 + i18npool/source/localedata/data/bm_ML.xml |1 + i18npool/source/localedata/data/bn_IN.xml |1 + i18npool/source/localedata/data/bo_CN.xml |1 + i18npool/source/localedata/data/bo_IN.xml |1 + i18npool/source/localedata/data/bs_BA.xml |1 + i18npool/source/localedata/data/cv_RU.xml |1 + i18npool/source/localedata/data/da_DK.xml |1 + i18npool/source/localedata/data/dsb_DE.xml |1 + i18npool/source/localedata/data/dz_BT.xml |1 + i18npool/source/localedata/data/eo.xml |1 + i18npool/source/localedata/data/es_CL.xml |1 + i18npool/source/localedata/data/fo_FO.xml |1 + i18npool/source/localedata/data/fy_NL.xml |1 + i18npool/source/localedata/data/hi_IN.xml |1 + i18npool/source/localedata/data/hsb_DE.xml |1 + i18npool/source/localedata/data/it_CH.xml |1 + i18npool/source/localedata/data/kk_KZ.xml |1 + i18npool/source/localedata/data/kl_GL.xml |1 + i18npool/source/localedata/data/ky_KG.xml |1 + i18npool/source/localedata/data/lb_LU.xml |1 + i18npool/source/localedata/data/ln_CD.xml |1 + i18npool/source/localedata/data/ltg_LV.xml |1 + i18npool/source/localedata/data/lv_LV.xml |1 + i18npool/source/localedata/data/mai_IN.xml |1 + i18npool/source/localedata/data/mk_MK.xml |1 + i18npool/source/localedata/data/ml_IN.xml |1 + i18npool/source/localedata/data/mn_Cyrl_MN.xml |1 + i18npool/source/localedata/data/pap_CW.xml |1 + i18npool/source/localedata/data/pl_PL.xml |1 + i18npool/source/localedata/data/plt_MG.xml |1 + i18npool/source/localedata/data/ro_RO.xml |1 + i18npool/source/localedata/data/sr_RS.xml |1 + i18npool/source/localedata/data/sv_FI.xml |1 + i18npool/source/localedata/data/tg_TJ.xml |1 + i18npool/source/localedata/data/tk_TM.xml |1 + i18npool/source/localedata/data/ug_CN.xml |1 + i18npool/source/localedata/data/uz_UZ.xml |1 + i18npool/source/localedata/data/zh_MO.xml |1 + 39 files changed, 39 insertions(+) New commits: commit f86e844a1d45fda789040cda47b32ae1b927f55b Author: Eike Rathke er...@redhat.com Date: Thu Apr 10 16:08:25 2014 +0200 added one abbreviated DateAcceptancePattern for locales that didn't have any Change-Id: I0ee3f1553b4efa67701385de5c7fe32e5992b537 diff --git a/i18npool/source/localedata/data/az_AZ.xml b/i18npool/source/localedata/data/az_AZ.xml index ae4d684..5e1f6a6 100644 --- a/i18npool/source/localedata/data/az_AZ.xml +++ b/i18npool/source/localedata/data/az_AZ.xml @@ -52,6 +52,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD.M/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement diff --git a/i18npool/source/localedata/data/bm_ML.xml b/i18npool/source/localedata/data/bm_ML.xml index 041f015..bb8dd1a 100644 --- a/i18npool/source/localedata/data/bm_ML.xml +++ b/i18npool/source/localedata/data/bm_ML.xml @@ -43,6 +43,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$CFA-62E] +DateAcceptancePatternD/M/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeGeneral/FormatCode /FormatElement diff --git a/i18npool/source/localedata/data/bn_IN.xml b/i18npool/source/localedata/data/bn_IN.xml index 2b83117..e642ab1 100644 --- a/i18npool/source/localedata/data/bn_IN.xml +++ b/i18npool/source/localedata/data/bn_IN.xml @@ -52,6 +52,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$â¹-445] +DateAcceptancePatternD-M/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement diff --git a/i18npool/source/localedata/data/bo_CN.xml b/i18npool/source/localedata/data/bo_CN.xml index 22b0fe8..14abfd0 100644 --- a/i18npool/source/localedata/data/bo_CN.xml +++ b/i18npool/source/localedata/data/bo_CN.xml @@ -52,6 +52,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$ï¿¥-451] +DateAcceptancePatternM-D/DateAcceptancePattern FormatElement msgid=DateFormatskey1 default=true type=short usage=DATE formatindex=18 FormatCode[NatNum1]YY-MM-DD/FormatCode /FormatElement diff --git a/i18npool/source/localedata/data/bo_IN.xml b/i18npool/source/localedata/data/bo_IN.xml index 06524a6..3ae0687 100644 --- a/i18npool/source/localedata/data/bo_IN.xml +++
[Libreoffice-commits] core.git: 2 commits - chart2/source
chart2/source/controller/main/ChartController.hxx|6
chart2/source/controller/main/ChartController_Window.cxx | 272 +++
2 files changed, 136 insertions(+), 142 deletions(-)
New commits:
commit 6f97be903beee9f6ad5f1e859ec1b402501a4d47
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Apr 9 15:31:00 2014 -0400
Reduce indentation by early bailout.
Change-Id: I64c88b007564d3ca7b4f4bd95a458fee6bda7854
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index d141d01..7cd99f2 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1848,165 +1848,165 @@ bool ChartController::impl_DragDataPoint( const
OUString rCID, double fAdditio
void ChartController::impl_SetMousePointer( const MouseEvent rEvent )
{
SolarMutexGuard aGuard;
-if( m_pDrawViewWrapper m_pChartWindow )
-{
-Point aMousePos( m_pChartWindow-PixelToLogic( rEvent.GetPosPixel()));
-sal_uInt16 nModifier = rEvent.GetModifier();
-sal_Bool bLeftDown = rEvent.IsLeft();
-if ( m_pDrawViewWrapper-IsTextEdit() )
-{
-if( m_pDrawViewWrapper-IsTextEditHit( aMousePos, HITPIX) )
-{
-m_pChartWindow-SetPointer(
m_pDrawViewWrapper-GetPreferredPointer(
-aMousePos, m_pChartWindow, nModifier, bLeftDown ) );
-return;
-}
-}
-else if( m_pDrawViewWrapper-IsAction() )
-{
-return;//don't change pointer during running action
-}
+if (!m_pDrawViewWrapper || !m_pChartWindow)
+return;
-SdrHdl* pHitSelectionHdl = 0;
-if( m_aSelection.isResizeableObjectSelected() )
-pHitSelectionHdl = m_pDrawViewWrapper-PickHandle( aMousePos );
+Point aMousePos( m_pChartWindow-PixelToLogic( rEvent.GetPosPixel()));
+sal_uInt16 nModifier = rEvent.GetModifier();
+sal_Bool bLeftDown = rEvent.IsLeft();
-if( pHitSelectionHdl )
+if ( m_pDrawViewWrapper-IsTextEdit() )
+{
+if( m_pDrawViewWrapper-IsTextEditHit( aMousePos, HITPIX) )
{
+m_pChartWindow-SetPointer(
m_pDrawViewWrapper-GetPreferredPointer(
+aMousePos, m_pChartWindow, nModifier, bLeftDown ) );
+return;
+}
+}
+else if( m_pDrawViewWrapper-IsAction() )
+{
+return;//don't change pointer during running action
+}
-Pointer aPointer = m_pDrawViewWrapper-GetPreferredPointer(
-aMousePos, m_pChartWindow, nModifier, bLeftDown );
-bool bForceArrowPointer = false;
+SdrHdl* pHitSelectionHdl = 0;
+if( m_aSelection.isResizeableObjectSelected() )
+pHitSelectionHdl = m_pDrawViewWrapper-PickHandle( aMousePos );
-ObjectIdentifier aOID( m_aSelection.getSelectedOID() );
+if( pHitSelectionHdl )
+{
+Pointer aPointer = m_pDrawViewWrapper-GetPreferredPointer(
+aMousePos, m_pChartWindow, nModifier, bLeftDown );
+bool bForceArrowPointer = false;
-switch( aPointer.GetStyle())
-{
-case POINTER_NSIZE:
-case POINTER_SSIZE:
-case POINTER_WSIZE:
-case POINTER_ESIZE:
-case POINTER_NWSIZE:
-case POINTER_NESIZE:
-case POINTER_SWSIZE:
-case POINTER_SESIZE:
-if( ! m_aSelection.isResizeableObjectSelected() )
-bForceArrowPointer = true;
-break;
-case POINTER_MOVE:
-if ( !aOID.isDragableObject() )
-bForceArrowPointer = true;
-break;
-case POINTER_MOVEPOINT:
-case POINTER_MOVEBEZIERWEIGHT:
-// there is no point-editing in a chart
-// the POINTER_MOVEBEZIERWEIGHT appears in 3d data points
-bForceArrowPointer = true;
-break;
-default:
-break;
-}
+ObjectIdentifier aOID( m_aSelection.getSelectedOID() );
-if( bForceArrowPointer )
-m_pChartWindow-SetPointer( Pointer( POINTER_ARROW ));
-else
-m_pChartWindow-SetPointer( aPointer );
+switch( aPointer.GetStyle())
+{
+case POINTER_NSIZE:
+case POINTER_SSIZE:
+case POINTER_WSIZE:
+case POINTER_ESIZE:
+case POINTER_NWSIZE:
+case POINTER_NESIZE:
+case POINTER_SWSIZE:
+case POINTER_SESIZE:
+if( ! m_aSelection.isResizeableObjectSelected() )
+bForceArrowPointer = true;
+break;
+case POINTER_MOVE:
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) New commits: commit b6a0eacbc36b9db10f12a246606d8e2f1c30fef9 Author: Michael Stahl mst...@redhat.com Date: Thu Apr 10 12:48:41 2014 +0200 fdo#75376: configure: disable LTO by default for MSVC too MSVC 2010 LTO triggers some bug in painting Writer documents; unfortunately it's not possible to put a VCVER check in there to enable LTO by default only for MSVC2012 because the compiler detection actually uses the ENABLE_LTO value. Change-Id: I29ecdd552d8a8bbd673a844e6bf0c938a98825c2 (cherry picked from commit 0d8e3a145901ab0124d40d33a50e2de28dc0c8ab) Reviewed-on: https://gerrit.libreoffice.org/8918 Tested-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/configure.ac b/configure.ac index f36cbaf..b352974 100644 --- a/configure.ac +++ b/configure.ac @@ -2522,12 +2522,6 @@ COMPATH=`echo $COMPATH | $SED s@/[[Bb]][[Ii]][[Nn]]\\\$@@` # Set the ENABLE_LTO variable # === AC_MSG_CHECKING([whether to use link-time optimization]) -if test $_os = WINNT -a $WITH_MINGW != yes -a -z $enable_lto -a \ -\( -z $enable_dbgutil -o $enable_dbgutil = no \) -a \ -\( -z $enable_debug -o $enable_debug = no \); then -# Turn on LTO for MSVC when optimising unless told not to -enable_lto=yes -fi if test -n $enable_lto -a $enable_lto != no; then ENABLE_LTO=TRUE AC_MSG_RESULT([yes]) @@ -3591,6 +3585,11 @@ if test $_os = WINNT; then 100) COMEX=13 WINDOWS_SDK_ACCEPTABLE_VERSIONS=7.1A 7.1 7.0A 6.0A +if test $ENABLE_LTO = TRUE; then + +AC_MSG_WARN([LTO is known to cause problems with MSVC 2010]) +add_warning LTO is known to cause problems with MSVC 2010 +fi ;; 110) COMEX=14 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/liblangtag Makefile.fetch
Makefile.fetch |1 + download.lst |2 ++ external/liblangtag/ExternalProject_langtag.mk |2 +- external/liblangtag/UnpackedTarball_langtag.mk |4 4 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 39d29be28b92328149430045f1e10e1ebeb6a0eb Author: Eike Rathke er...@redhat.com Date: Thu Apr 10 14:16:25 2014 +0200 build liblangtag with updated IANA language-subtag-registry ... as downloaded from https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry Change-Id: I7aee9c6e42aabc9e023ab9a2ec3880dbde940396 Reviewed-on: https://gerrit.libreoffice.org/8919 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Eike Rathke er...@redhat.com diff --git a/Makefile.fetch b/Makefile.fetch index 683f238..636a924 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -87,6 +87,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \ $(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \ $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \ + $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \ diff --git a/download.lst b/download.lst index d6fea9a..12cf008 100644 --- a/download.lst +++ b/download.lst @@ -36,6 +36,8 @@ LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 SERF_MD5SUM := 4f8e76c9c6567aee1d66aba49f76a58b export SERF_TARBALL := serf-1.2.1.tar.bz2 +LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97 +export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2 export APACHE_COMMONS_CODEC_TARBALL := 048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index fbf64bd..33a7bf2 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -23,7 +23,6 @@ $(eval $(call gb_ExternalProject_register_targets,langtag,\ $(call gb_ExternalProject_get_state_target,langtag,build): $(call gb_ExternalProject_run,build,\ ./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \ - $(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \ $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),lt_cv_has_atomic=yes,lt_cv_has_atomic=no) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) ac_cv_va_copy=no) \ $(if $(SYSTEM_LIBXML),\ @@ -36,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS=-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2) \ $(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC=$(shell cygpath -w $(lastword $(CC \ $(if $(VERBOSE)$(verbose),V=1) \ + $(gb_Helper_set_ld_path) \ $(MAKE) \ ) # vim: set noet sw=4 ts=4: diff --git a/external/liblangtag/UnpackedTarball_langtag.mk b/external/liblangtag/UnpackedTarball_langtag.mk index 3bce944..90068cb 100644 --- a/external/liblangtag/UnpackedTarball_langtag.mk +++ b/external/liblangtag/UnpackedTarball_langtag.mk @@ -11,6 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,langtag)) $(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL),,liblangtag)) +$(eval $(call gb_UnpackedTarball_set_pre_action,langtag,\ + $(GNUTAR) -x -j -f $(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \ +)) + $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ external/liblangtag/liblangtag-0.5.1-msvc-warning.patch \ external/liblangtag/liblangtag-0.5.1-vsnprintf.patch \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b8/5ed2610713a082bf2f17171177695557e86575
b8/5ed2610713a082bf2f17171177695557e86575 |1 + 1 file changed, 1 insertion(+) New commits: commit 0f977a20a9d2e5b6e2d74ef1e3341f5c5528e842 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 10 15:23:30 2014 +0100 Notes added by 'git notes add' diff --git a/b8/5ed2610713a082bf2f17171177695557e86575 b/b8/5ed2610713a082bf2f17171177695557e86575 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/b8/5ed2610713a082bf2f17171177695557e86575 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4d/57671f3bdd9628cd21d0991e50a96b10abf63a
4d/57671f3bdd9628cd21d0991e50a96b10abf63a |1 + 1 file changed, 1 insertion(+) New commits: commit 082b1b6bbc70a3381197458d0a9274fce3af4a6b Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 10 15:25:55 2014 +0100 Notes added by 'git notes add' diff --git a/4d/57671f3bdd9628cd21d0991e50a96b10abf63a b/4d/57671f3bdd9628cd21d0991e50a96b10abf63a new file mode 100644 index 000..f580a94 --- /dev/null +++ b/4d/57671f3bdd9628cd21d0991e50a96b10abf63a @@ -0,0 +1 @@ +prefer: 9984807f17593b97778fc31824c50706ea2e826c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 66/090da6c85d3562de146b08842b61e7b2cb0038
66/090da6c85d3562de146b08842b61e7b2cb0038 |1 + 1 file changed, 1 insertion(+) New commits: commit 108b5ef9b895a2afa9e79d1106bbcca3c3e5c0d2 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 10 15:31:12 2014 +0100 Notes added by 'git notes add' diff --git a/66/090da6c85d3562de146b08842b61e7b2cb0038 b/66/090da6c85d3562de146b08842b61e7b2cb0038 new file mode 100644 index 000..14dfb48 --- /dev/null +++ b/66/090da6c85d3562de146b08842b61e7b2cb0038 @@ -0,0 +1 @@ +prefer: aa4b8a8164f01a120ba9bfb2e86b1ed33cc1d69c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - unotools/source vcl/quartz
unotools/source/config/fltrcfg.cxx | 16 +
vcl/quartz/salbmp.cxx | 39 ++
vcl/quartz/salgdicommon.cxx| 63 +++--
3 files changed, 87 insertions(+), 31 deletions(-)
New commits:
commit 6807c13a39cfcfd16db221196e348f5fd374e967
Author: Tor Lillqvist t...@collabora.com
Date: Thu Apr 10 16:59:03 2014 +0300
More iOS-only debugging hackery: write CGImages out as PNGs for inspection
Change-Id: I966189a74414ea83b2ec7f5035cd7c9d4d674179
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 1e06fd43..45c3e1a 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -46,6 +46,38 @@ static const unsigned long k32BitRedColorMask = 0x00ff;
static const unsigned long k32BitGreenColorMask = 0xff00;
static const unsigned long k32BitBlueColorMask = 0x00ff;
+#if defined IOS defined DBG_UTIL
+
+#include MobileCoreServices/UTCoreTypes.h
+#include ImageIO/ImageIO.h
+
+static void writeImageToFile(CGImageRef image, const char *baseName)
+{
+static int counter = 0;
+NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,
NSUserDomainMask, YES);
+NSString *documentsDirectory = [paths objectAtIndex:0];
+NSString *path = [NSString stringWithFormat:@%@/%s.%d.png,
documentsDirectory, baseName, counter++];
+CFURLRef url = (CFURLRef)[NSURL fileURLWithPath:path];
+CGImageDestinationRef destination = CGImageDestinationCreateWithURL(url,
kUTTypePNG, 1, NULL);
+CGImageDestinationAddImage(destination, image, nil);
+
+if (!CGImageDestinationFinalize(destination)) {
+NSLog(@Failed to write image to %@, path);
+} else {
+SAL_DEBUG(--- saved image baseName to [path
UTF8String]);
+}
+
+CFRelease(destination);
+}
+
+#define DBG_WRITE_IMAGE(image, name) writeImageToFile(image, name)
+
+#else
+
+#define DBG_WRITE_IMAGE(image, name) /* empty */
+
+#endif
+
static bool isValidBitCount( sal_uInt16 nBitCount )
{
return (nBitCount == 1) || (nBitCount == 4) || (nBitCount == 8) ||
(nBitCount == 16) || (nBitCount == 24) || (nBitCount == 32);
@@ -753,6 +785,7 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const
QuartzSalBitmap rMask,
// CGImageCreateWithMask() only likes masks or greyscale images = convert
if needed
// TODO: isolate in an extra method?
+DBG_WRITE_IMAGE(xMask, xMask);
if( !CGImageIsMask(xMask) || rMask.GetBitCount() !=
8)//(CGImageGetColorSpace(xMask) != GetSalData()-mxGraySpace) )
{
const CGRect xImageRect=CGRectMake( 0, 0, nWidth, nHeight );//the rect
has no offset
@@ -763,7 +796,7 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const
QuartzSalBitmap rMask,
void* pMaskMem = rtl_allocateMemory( nMaskBytesPerRow * nHeight );
CGContextRef xMaskContext = CGBitmapContextCreate( pMaskMem,
nWidth, nHeight, 8, nMaskBytesPerRow, GetSalData()-mxGraySpace,
kCGImageAlphaNone );
-CG_TRACE( CGBitmapContextCreate( nWidth x nHeight x8)
= xMaskContext );
+CG_TRACE( CGBitmapContextCreate( nWidth x nHeight
x8, nMaskBytesPerRow ) = xMaskContext );
CG_TRACE( CGContextDrawImage( xMaskContext , xImageRect
, xMask ) );
CGContextDrawImage( xMaskContext, xImageRect, xMask );
CG_TRACE( CFRelease( xMask ) );
@@ -773,6 +806,7 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const
QuartzSalBitmap rMask,
static const CGFloat* pDecode = NULL;
xMask = CGImageMaskCreate( nWidth, nHeight, 8, 8, nMaskBytesPerRow,
xDataProvider, pDecode, false );
CG_TRACE( CGImageMaskCreate( nWidth , nHeight ,8,8) =
xMask );
+DBG_WRITE_IMAGE(xMask, xMask.new);
CFRelease( xDataProvider );
CG_TRACE( CFRelease( xMaskContext ) );
CFRelease( xMaskContext );
@@ -784,6 +818,8 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const
QuartzSalBitmap rMask,
// combine image and alpha mask
CGImageRef xMaskedImage = CGImageCreateWithMask( xImage, xMask );
CG_TRACE( CGImageCreateWithMask( xImage , xMask ) =
xMaskedImage );
+DBG_WRITE_IMAGE(xImage, xImage);
+DBG_WRITE_IMAGE(xMaskedImage, xMaskedImage);
CG_TRACE( CFRelease( xMask ) );
CFRelease( xMask );
CG_TRACE( CFRelease( xImage ) );
commit d0315bd4819416142b413c33f40db16c4fb2dbd8
Author: Tor Lillqvist t...@collabora.com
Date: Thu Apr 10 13:01:48 2014 +0300
Set mbPrinter anc mbVirDev for iOS, too
But, has no visible effect, doesn't fix rendering problems.
Change-Id: Ic79b38b665e357a2dafe679c35979250c3bff538
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 5f90fef..ceb1ee5 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -2140,9 +2140,9 @@ void AquaSalGraphics::SetVirDevGraphics( CGLayerRef
xLayer, CGContextRef xContex
#ifndef IOS
mbWindow= false;
+#endif
mbPrinter =
Patch for the bug 69195: Crash when delete a style in use
Hi, I submitted a patch to fix the issue in 4.1.4.2 version: https://gerrit.libreoffice.org/#/c/8917/ Thank you for reviewing it. -- View this message in context: http://nabble.documentfoundation.org/Patch-for-the-bug-69195-Crash-when-delete-a-style-in-use-tp4104801.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: test/user-template
test/user-template/registry/modifications.xcd | 10 ++ 1 file changed, 10 insertions(+) New commits: commit c0a4de1ede27c5911fea0829deabee0b599d5d40 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 10 16:20:25 2014 +0100 run unit test with en-US locale data Change-Id: I24c6a590b7b160cc2463af039310114f17273bc7 diff --git a/test/user-template/registry/modifications.xcd b/test/user-template/registry/modifications.xcd index c2598aa..a5db262 100644 --- a/test/user-template/registry/modifications.xcd +++ b/test/user-template/registry/modifications.xcd @@ -41,4 +41,14 @@ /node /node /oor:component-data + oor:component-data oor:name=Setup oor:package=org.openoffice + node oor:name=L10N +prop oor:name=ooLocale + valueen-US/value +/prop +prop oor:name=ooSetupSystemLocale + valueen-US/value +/prop + /node + /oor:component-data /oor:data ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Core dump while building for the first time
Hi, I am new to LibreOffice development and trying to build the code for the first time. I followed the steps as shown in following video: http://www.youtube.com/watch?v=2gIqOOajdYQhd=1 Below are last few lines of the 'make' command: [build CUT] tools_test [build CXX] vcl/qa/cppunit/canvasbitmaptest.cxx terminate called without an active exception Aborted (core dumped) make[1]: *** [/home/user/Hacking/libreoffice/core/workdir/CustomTarget/testtools/uno_test.done] Error 134 make[1]: *** Waiting for unfinished jobs make: *** [build] Error 2 It consistently fails at the same location. I am using Ubuntu 12.04.4 (32 bit) with g++ 4.6.3. I am referring the wiki help but not sure if I missed anything: https://wiki.documentfoundation.org/Development Any pointers? Thanks, Ganesh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - chart2/Library_chartcore.mk chart2/source
chart2/Library_chartcore.mk |3
chart2/source/view/charttypes/3DBarChart.cxx | 77 --
chart2/source/view/charttypes/GL3DBarChart.cxx | 94 ++-
chart2/source/view/charttypes/GL3DBarChart.hxx | 30 ---
chart2/source/view/charttypes/VSeriesPlotter.cxx |3
chart2/source/view/inc/3DBarChart.hxx| 48 ---
chart2/source/view/inc/GL3DBarChart.hxx | 53
chart2/source/view/main/ChartView.cxx|4
8 files changed, 100 insertions(+), 212 deletions(-)
New commits:
commit b49e42f358bc37c77824028ffadc6f51b9d12172
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Apr 10 11:45:20 2014 -0400
Rename 3DBarChart and Bar3DChart to GL3DBarChart.
Change-Id: If0449e00549d8e2f4a8cfac325a5f8c5e4ea3dcd
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 7851bd5..af3b6f3 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -86,7 +86,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/view/axes/VPolarCoordinateSystem \
chart2/source/view/axes/VPolarGrid \
chart2/source/view/axes/VPolarRadiusAxis \
-chart2/source/view/charttypes/3DBarChart \
+chart2/source/view/charttypes/GL3DBarChart \
chart2/source/view/charttypes/AreaChart \
chart2/source/view/charttypes/BarChart \
chart2/source/view/charttypes/BarPositionHelper \
diff --git a/chart2/source/view/charttypes/3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
similarity index 90%
rename from chart2/source/view/charttypes/3DBarChart.cxx
rename to chart2/source/view/charttypes/GL3DBarChart.cxx
index 68f612c..160f40e 100644
--- a/chart2/source/view/charttypes/3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -7,9 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include GL/glew.h
+#include GL3DBarChart.hxx
-#include 3DBarChart.hxx
+#include GL/glew.h
#include glm/glm.hpp
#include glm/gtx/transform.hpp
@@ -18,17 +18,17 @@
namespace chart {
-Bar3DChart::Bar3DChart(const std::vectorVDataSeries* rDataSeries):
+GL3DBarChart::GL3DBarChart(const std::vectorVDataSeries* rDataSeries):
maDataSeries(rDataSeries),
mxContext(new opengl3D::temporary::TemporaryContext())
{
}
-Bar3DChart::~Bar3DChart()
+GL3DBarChart::~GL3DBarChart()
{
}
-void Bar3DChart::create3DShapes()
+void GL3DBarChart::create3DShapes()
{
const float nBarSizeX = 10;
const float nBarSizeY = 10;
@@ -61,7 +61,7 @@ void Bar3DChart::create3DShapes()
}
}
-void Bar3DChart::render()
+void GL3DBarChart::render()
{
mxContext-init();
for(boost::ptr_vectoropengl3D::Renderable3DObject::iterator itr =
maShapes.begin(),
diff --git a/chart2/source/view/inc/3DBarChart.hxx
b/chart2/source/view/inc/GL3DBarChart.hxx
similarity index 83%
rename from chart2/source/view/inc/3DBarChart.hxx
rename to chart2/source/view/inc/GL3DBarChart.hxx
index 2f10ce2..6191fc1 100644
--- a/chart2/source/view/inc/3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#ifndef CHART2_GL3DBARCHART_HXX
+#define CHART2_GL3DBARCHART_HXX
+
#include vector
#include boost/ptr_container/ptr_vector.hpp
#include VDataSeries.hxx
@@ -25,11 +28,11 @@ class TemporaryContext;
} }
-class Bar3DChart
+class GL3DBarChart
{
public:
-Bar3DChart(const std::vectorVDataSeries* rDataSeries);
-~Bar3DChart();
+GL3DBarChart(const std::vectorVDataSeries* rDataSeries);
+~GL3DBarChart();
void create3DShapes();
@@ -45,4 +48,6 @@ private:
}
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index cd60243..da0e30a 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -48,7 +48,7 @@
#include DateHelper.hxx
#include defines.hxx
#include unonames.hxx
-#include 3DBarChart.hxx
+#include GL3DBarChart.hxx
#include rtl/uuid.h
#include comphelper/scopeguard.hxx
@@ -3149,7 +3149,7 @@ void ChartView::createShapes3D()
}
}
-Bar3DChart aBarChart(aDataSeries);
+GL3DBarChart aBarChart(aDataSeries);
aBarChart.create3DShapes();
aBarChart.render();
}
commit 085ab6263e470f81030c626b814698589ceaf8e8
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Apr 10 10:23:56 2014 -0400
Remove the old GL3DBarChart code.
Change-Id: Id7039021f252fb45464b5e42248cf3c68edc7be4
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index dae64e9..7851bd5 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -93,7 +93,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/view/charttypes/BubbleChart \
[Libreoffice-commits] core.git: Branch 'private/kohei/chart-controller-study' - chart2/Library_chartcore.mk chart2/source
chart2/Library_chartcore.mk|2
chart2/source/view/charttypes/3DBarChart.cxx | 77 -
chart2/source/view/charttypes/GL3DBarChart.cxx | 77 +
chart2/source/view/inc/3DBarChart.hxx | 48 ---
chart2/source/view/inc/GL3DBarChart.hxx| 53 +
chart2/source/view/main/ChartView.cxx |4 -
6 files changed, 133 insertions(+), 128 deletions(-)
New commits:
commit 492715e32ce37e1d4b54f6643cc2dfdb803babcb
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Apr 10 11:45:20 2014 -0400
Rename 3DBarChart and Bar3DChart to GL3DBarChart.
Change-Id: If0449e00549d8e2f4a8cfac325a5f8c5e4ea3dcd
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 7851bd5..af3b6f3 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -86,7 +86,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/view/axes/VPolarCoordinateSystem \
chart2/source/view/axes/VPolarGrid \
chart2/source/view/axes/VPolarRadiusAxis \
-chart2/source/view/charttypes/3DBarChart \
+chart2/source/view/charttypes/GL3DBarChart \
chart2/source/view/charttypes/AreaChart \
chart2/source/view/charttypes/BarChart \
chart2/source/view/charttypes/BarPositionHelper \
diff --git a/chart2/source/view/charttypes/3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
similarity index 90%
rename from chart2/source/view/charttypes/3DBarChart.cxx
rename to chart2/source/view/charttypes/GL3DBarChart.cxx
index 68f612c..160f40e 100644
--- a/chart2/source/view/charttypes/3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -7,9 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include GL/glew.h
+#include GL3DBarChart.hxx
-#include 3DBarChart.hxx
+#include GL/glew.h
#include glm/glm.hpp
#include glm/gtx/transform.hpp
@@ -18,17 +18,17 @@
namespace chart {
-Bar3DChart::Bar3DChart(const std::vectorVDataSeries* rDataSeries):
+GL3DBarChart::GL3DBarChart(const std::vectorVDataSeries* rDataSeries):
maDataSeries(rDataSeries),
mxContext(new opengl3D::temporary::TemporaryContext())
{
}
-Bar3DChart::~Bar3DChart()
+GL3DBarChart::~GL3DBarChart()
{
}
-void Bar3DChart::create3DShapes()
+void GL3DBarChart::create3DShapes()
{
const float nBarSizeX = 10;
const float nBarSizeY = 10;
@@ -61,7 +61,7 @@ void Bar3DChart::create3DShapes()
}
}
-void Bar3DChart::render()
+void GL3DBarChart::render()
{
mxContext-init();
for(boost::ptr_vectoropengl3D::Renderable3DObject::iterator itr =
maShapes.begin(),
diff --git a/chart2/source/view/inc/3DBarChart.hxx
b/chart2/source/view/inc/GL3DBarChart.hxx
similarity index 83%
rename from chart2/source/view/inc/3DBarChart.hxx
rename to chart2/source/view/inc/GL3DBarChart.hxx
index 2f10ce2..6191fc1 100644
--- a/chart2/source/view/inc/3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#ifndef CHART2_GL3DBARCHART_HXX
+#define CHART2_GL3DBARCHART_HXX
+
#include vector
#include boost/ptr_container/ptr_vector.hpp
#include VDataSeries.hxx
@@ -25,11 +28,11 @@ class TemporaryContext;
} }
-class Bar3DChart
+class GL3DBarChart
{
public:
-Bar3DChart(const std::vectorVDataSeries* rDataSeries);
-~Bar3DChart();
+GL3DBarChart(const std::vectorVDataSeries* rDataSeries);
+~GL3DBarChart();
void create3DShapes();
@@ -45,4 +48,6 @@ private:
}
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index cd60243..da0e30a 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -48,7 +48,7 @@
#include DateHelper.hxx
#include defines.hxx
#include unonames.hxx
-#include 3DBarChart.hxx
+#include GL3DBarChart.hxx
#include rtl/uuid.h
#include comphelper/scopeguard.hxx
@@ -3149,7 +3149,7 @@ void ChartView::createShapes3D()
}
}
-Bar3DChart aBarChart(aDataSeries);
+GL3DBarChart aBarChart(aDataSeries);
aBarChart.create3DShapes();
aBarChart.render();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - filter/source i18npool/source sdext/source svtools/source
filter/source/svg/svgexport.cxx | 84
filter/source/svg/svgfilter.cxx | 17
filter/source/svg/svgfilter.hxx |1
i18npool/source/localedata/data/localedata_euro.map | 17
i18npool/source/localedata/data/makefile.mk |1
i18npool/source/localedata/data/tt_RU.xml | 354
i18npool/source/localedata/localedata.cxx |1
sdext/source/minimizer/optimizerdialog.cxx |2
svtools/source/uno/wizard/unowizard.cxx |2
svtools/source/uno/wizard/wizardshell.cxx |5
svtools/source/uno/wizard/wizardshell.hxx |6
11 files changed, 470 insertions(+), 20 deletions(-)
New commits:
commit 6a820f13a5cadc3d6d8c7bac1e4042adcee379ac
Author: Ariel Constenla-Haile arie...@apache.org
Date: Thu Apr 10 15:33:21 2014 +
i124629 - UNO Wizard - avoid crash by removing unneeded reference
diff --git a/svtools/source/uno/wizard/unowizard.cxx
b/svtools/source/uno/wizard/unowizard.cxx
index 845adfc..b1da984 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -228,7 +228,7 @@ namespace svt { namespace uno
//
Dialog* Wizard::createDialog( Window* i_pParent )
{
-WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController,
m_aWizardSteps ) );
+WizardShell* pDialog( new WizardShell( i_pParent, m_xController,
m_aWizardSteps ) );
pDialog-SetHelpId( lcl_getHelpId( m_sHelpURL ) );
pDialog-setTitleBase( m_sTitle );
return pDialog;
diff --git a/svtools/source/uno/wizard/wizardshell.cxx
b/svtools/source/uno/wizard/wizardshell.cxx
index 51d85e6..a78503e 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -72,14 +72,13 @@ namespace svt { namespace uno
//= WizardShell
//==
//--
-WizardShell::WizardShell( Window* i_pParent, const Reference XWizard
i_rWizard, const Reference XWizardController i_rController,
+WizardShell::WizardShell( Window* i_pParent, const Reference
XWizardController i_rController,
const Sequence Sequence sal_Int16 i_rPaths )
:WizardShell_Base( i_pParent, WB_MOVEABLE | WB_CLOSEABLE )
-,m_xWizard( i_rWizard )
,m_xController( i_rController )
,m_nFirstPageID( lcl_determineFirstPageID( i_rPaths ) )
{
-ENSURE_OR_THROW( m_xWizard.is() m_xController.is(), invalid
wizard/controller );
+ENSURE_OR_THROW( m_xController.is(), invalid controller );
// declare the paths
for ( sal_Int32 i=0; ii_rPaths.getLength(); ++i )
diff --git a/svtools/source/uno/wizard/wizardshell.hxx
b/svtools/source/uno/wizard/wizardshell.hxx
index 0587f0d..6f218bc 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -51,7 +51,6 @@ namespace svt { namespace uno
public:
WizardShell(
Window* _pParent,
-const ::com::sun::star::uno::Reference
::com::sun::star::ui::dialogs::XWizard i_rWizard,
const ::com::sun::star::uno::Reference
::com::sun::star::ui::dialogs::XWizardController i_rController,
const ::com::sun::star::uno::Sequence
::com::sun::star::uno::Sequence sal_Int16 i_rPaths
);
@@ -70,10 +69,6 @@ namespace svt { namespace uno
virtual IWizardPageController*
getPageController( TabPage* _pCurrentPage ) const;
-// attribute access
-const ::com::sun::star::uno::Reference
::com::sun::star::ui::dialogs::XWizard
-getWizard() const { return m_xWizard; }
-
static sal_Int16 convertCommitReasonToTravelType( const
CommitPageReason i_eReason );
// operations
@@ -131,7 +126,6 @@ namespace svt { namespace uno
private:
typedef ::std::map TabPage*, PWizardPageController
Page2ControllerMap;
-const ::com::sun::star::uno::Reference
::com::sun::star::ui::dialogs::XWizard m_xWizard;
const ::com::sun::star::uno::Reference
::com::sun::star::ui::dialogs::XWizardController m_xController;
const sal_Int16
m_nFirstPageID;
Page2ControllerMap
m_aPageControllers;
commit 87a8aa9a79874c759631548545c63fe13d695f68
Author: Ariel Constenla-Haile arie...@apache.org
Date: Thu Apr 10 15:33:10 2014 +
Use high-contrast image
diff --git a/sdext/source/minimizer/optimizerdialog.cxx
[Libreoffice-commits] mso-dumper.git: emf-dump.py Makefile msodumper/emfrecord.py msodumper/wmfrecord.py
Makefile |1
emf-dump.py| 35 +++
msodumper/emfrecord.py | 108 +
msodumper/wmfrecord.py | 53
4 files changed, 197 insertions(+)
New commits:
commit 60006fe4c41c866dbaeeb43c4b3c0d23c9149707
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Apr 10 18:19:59 2014 +0200
Initial EMF dumper
It dumps the header record, but really nothing more yet.
diff --git a/Makefile b/Makefile
index a87ad52..1aa9120 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
check:
cd test/doc ./test.py
pep8 --ignore=E501 doc-dump.py
msodumper/doc{dirstream,record,sprm,stream}.py test/doc/test.py
+ pep8 --ignore=E501 emf-dump.py msodumper/{emf,wmf}record.py
diff --git a/emf-dump.py b/emf-dump.py
new file mode 100755
index 000..1023a9f
--- /dev/null
+++ b/emf-dump.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python2
+#
+# 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/.
+#
+
+import sys
+sys = reload(sys)
+sys.setdefaultencoding(utf-8)
+
+from msodumper import emfrecord
+
+
+class EMFDumper:
+def __init__(self, filepath):
+self.filepath = filepath
+
+def dump(self):
+file = open(self.filepath, 'rb')
+strm = emfrecord.EMFStream(file.read())
+file.close()
+print '?xml version=1.0?'
+strm.dump()
+
+
+def main(args):
+exname, args = args[0], args[1:]
+dumper = EMFDumper(args[0])
+dumper.dump()
+
+if __name__ == '__main__':
+main(sys.argv)
+
+# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py
new file mode 100644
index 000..df5d9cc
--- /dev/null
+++ b/msodumper/emfrecord.py
@@ -0,0 +1,108 @@
+#!/usr/bin/env python2
+#
+# 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/.
+#
+
+from docdirstream import DOCDirStream
+import wmfrecord
+
+# The FormatSignature enumeration defines valuesembedded data in EMF records.
+FormatSignature = {
+0x464D4520: ENHMETA_SIGNATURE,
+0x46535045: EPS_SIGNATURE
+}
+
+
+class EMFStream(DOCDirStream):
+def __init__(self, bytes):
+DOCDirStream.__init__(self, bytes)
+
+def dump(self):
+print 'stream type=EMF size=%d' % self.size
+EmrHeader(self).dump()
+print '/stream'
+
+
+class EMFRecord(DOCDirStream):
+def __init__(self, parent):
+DOCDirStream.__init__(self, parent.bytes)
+self.parent = parent
+self.pos = parent.pos
+
+
+class EmrHeader(EMFRecord):
+The EMR_HEADER record types define the starting points of EMF
metafiles.
+def __init__(self, parent):
+EMFRecord.__init__(self, parent)
+
+def dump(self):
+print 'emrHeader'
+self.printAndSet(Type, self.readuInt32())
+self.printAndSet(Size, self.readuInt32(), hexdump=False)
+Header(self).dump()
+if self.Size = 100:
+HeaderExtension1(self).dump()
+if self.Size = 108:
+HeaderExtension2(self).dump()
+print '/emrHeader'
+
+
+class Header(EMFRecord):
+The Header object defines the EMF metafile header.
+def __init__(self, parent):
+EMFRecord.__init__(self, parent)
+
+def dump(self):
+posOrig = self.pos
+print(header)
+wmfrecord.RectL(self, Bounds).dump()
+wmfrecord.RectL(self, Frame).dump()
+self.printAndSet(RecordSignature, self.readuInt32(),
dict=FormatSignature)
+self.printAndSet(Version, self.readuInt32())
+self.printAndSet(Bytes, self.readuInt32(), hexdump=False)
+self.printAndSet(Records, self.readuInt32(), hexdump=False)
+self.printAndSet(Handles, self.readuInt16(), hexdump=False)
+self.printAndSet(Reserved, self.readuInt16(), hexdump=False)
+self.printAndSet(nDescription, self.readuInt32(), hexdump=False)
+self.printAndSet(offDescription, self.readuInt32(), hexdump=False)
+self.printAndSet(nPalEntries, self.readuInt32(), hexdump=False)
+wmfrecord.SizeL(self, Device).dump()
+wmfrecord.SizeL(self, Millimeters).dump()
+print(/header)
+assert posOrig == self.pos - 80
+self.parent.pos = self.pos
+
+
+class HeaderExtension1(EMFRecord):
+The HeaderExtension1 object defines the first extension to the EMF
metafile header.
+def __init__(self, parent):
+EMFRecord.__init__(self, parent)
+
+def dump(self):
+posOrig = self.pos
+print(headerExtension1)
+self.printAndSet(cbPixelFormat, self.readuInt32(), hexdump=False)
+self.printAndSet(offPixelFormat, self.readuInt32(), hexdump=False)
+
minutes of ESC call ...
* Present + Eike, Stephan, David, Kendy, Astron, Bjoern, Miklos, Markus, Christian Jacobo, Andras, Kohei, Michael M, Robinson, Norbert, Lionel, Michael S * Completed Action Items + talk to fdo admins wrt. bugzilla dump (Norbert) * Pending Action Items: + crashtest box - more research (Moggi/Cloph) [ nailed it down to 4000 documents where the problem is ] + will try filing a lot of small string changes as easy hacks (Astron) + update wiki schedule to include new Alpha 1 (Cloph) * Release Engineering update (Christian) + 4.2.3 rc3 status / update. + released today, somewhat delayed by: + including a last-minute openssl / security update etc. AI:+ update the security page (Cloph) http://www.libreoffice.org/about-us/security/advisories + 4.2.4 rc1 - deadline is on Monday - April 14th + 4.1.6 RC1 + tagged, Windows still building will up-load today. + openssl issue didn't affect 4.1.x + on-schedule. + Android / iOS remote + ahunt fixing a few bugs testing with BlueZ 5.0 + problems around new requirement for dbus service file install here. * UX update (Astron) + nothing much done; will handle SpinachCon report shortly. + new version of Sifr potentially coming, re-colouring done manually + prefer that to be done programatically (Michael) + a few lines of code vs. 1.5Mb+ of theme + do we have SVG sources for all the icons ? (Kendy) + yes, we have SVG sources for all, but some keep on their hard-disks and not put into git. AI: + encourage icon authors to put them into git (Astron) + multiple repositories with icons (why?) can we flatten that ? + can we get git push access to contributing artists ? (Michael) + would like separate SVG files for icons for HiDPI (Kendy) * LTO / fields concerns (Michael S) + https://bugs.freedesktop.org/show_bug.cgi?id=75376#c20 comment 21 / 22 + looks like we have an LTO bug in VS 2010 affecting Writer rendering. + http://dev-builds.libreoffice.org/daily/master/Win-x86@47-TDF/2014-04-09_12.09.54/ (lto enabled build) + http://dev-builds.libreoffice.org/daily/master/Win-x86@47-TDF/2014-04-07_11.14.34/ (lto disabled) + would love community help investigating MSVC++ LTO compiler bug + in particular a unit test to catch that etc. + propose to disable LTO on libreoffice-4-2 branch AI: + agreed - turn it off / push gerrit patch (Michael S) + propose to move to MSVC 2012 for 4.3 release builds where LTO does not produce this bug + TODO: enable --mergelibs on Win32 for 4.3 + TODO: need to prevent JVM loading problem https://bugs.freedesktop.org/show_bug.cgi?id=50584 + currently happens to work because we use the same run-time as Java does. + there is a hack for JVM loading that looks around to manually load the run-time library that matches the JVM, apparently used to work with JVMv6 (used an older MS run-time) we could perhaps implement that for JVMv7 too - remains to be done. + I fixed this bug before, can give code pointers (Markus) AI: + look into fixing the Java bridge for MSVC2012 (Stephan) + should we still target Windows XP ? (Cloph) + by default it doesn't. + yes, should continue supporting WinXP + didn't MS drop support ? (Norbert) + not for everyone (Michael) * GSoC update (Fridrich/Cedric?) + still ranking / ordering students, check what's up + we've been kindly given 11 slots (whoot) * Crashtest update (Markus) + still manually bisecting the .doc files for the bad one, so no new data yet. + just hit it - down to 200 documents ... * Gran Canaria hack-fest (Bjoern) + April 24-25, 2014 (Thu-Fri) + see you there ... * Certification Committee (Stephan/Bjoern/Kendy) * QA (Robinson) + holding the unconfirmed count to ~1000 + BugHunting Session for 4.3 (May 23-25) https://wiki.documentfoundation.org/BugHunting_Session_4.3.0 + Sophie leading that + buzilla migration (Norbert) + Tollef responded ! we have a dump ... / sanitised themselves. + re-loaded on a VM setup for that; got it working; seems ok. + planning to re-do the install/restore so it's scripted + to avoid problems when we do it for real + also helps for disaster recovery. + concerns wrt. scalability (Michael) + bugs.fdo. runs on a ~huge machine, we need hardware to back that + in 3 years - we're 40% of fdo bugs. (Norbert) + havn't looked at that yet; mostly a money problem + intention to get to a point: where we can have an automated install / restore bugzilla. + Tollef agreed to
[Libreoffice-commits] core.git: 3 commits - vcl/headless vcl/quartz
vcl/headless/svpbmp.cxx |2 +-
vcl/headless/svpvd.cxx |2 +-
vcl/quartz/salbmp.cxx |1 -
vcl/quartz/salgdicommon.cxx |6 ++
vcl/quartz/salvd.cxx| 12 +++-
5 files changed, 7 insertions(+), 16 deletions(-)
New commits:
commit a8877197072523ec60fadb138f9790aa2bf66cd2
Author: Tor Lillqvist t...@collabora.com
Date: Thu Apr 10 19:42:06 2014 +0300
ImageIO does not handle CGImageMasks
Change-Id: Ie5a35f68041a9c65658b9ce569ed3202c8a72ecb
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 45c3e1a..5d6c400 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -806,7 +806,6 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const
QuartzSalBitmap rMask,
static const CGFloat* pDecode = NULL;
xMask = CGImageMaskCreate( nWidth, nHeight, 8, 8, nMaskBytesPerRow,
xDataProvider, pDecode, false );
CG_TRACE( CGImageMaskCreate( nWidth , nHeight ,8,8) =
xMask );
-DBG_WRITE_IMAGE(xMask, xMask.new);
CFRelease( xDataProvider );
CG_TRACE( CFRelease( xMaskContext ) );
CFRelease( xMaskContext );
commit ed2f0490f891b40a90eccc9d4143a18b31c79e63
Author: Tor Lillqvist t...@collabora.com
Date: Thu Apr 10 19:33:30 2014 +0300
Avoid a couple of pointless constant variables
Change-Id: If1dcb577d2dcc6477f43ad1be0e970e08d9093c6
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index ceb1ee5..4df173c 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1458,8 +1458,6 @@ SalColor AquaSalGraphics::getPixel( long nX, long nY )
return COL_BLACK;
}
// prepare creation of matching a CGBitmapContext
-CGColorSpaceRef aCGColorSpace = GetSalData()-mxRGBSpace;
-CGBitmapInfo aCGBmpInfo = kCGImageAlphaNoneSkipFirst |
kCGBitmapByteOrder32Big;
#if defined OSL_BIGENDIAN
struct{ unsigned char b, g, r, a; } aPixel;
#else
@@ -1469,8 +1467,8 @@ SalColor AquaSalGraphics::getPixel( long nX, long nY )
// create a one-pixel bitmap context
// TODO: is it worth to cache it?
CGContextRef xOnePixelContext =
-CGBitmapContextCreate( aPixel, 1, 1, 8, sizeof(aPixel),
- aCGColorSpace, aCGBmpInfo );
+CGBitmapContextCreate( aPixel, 1, 1, 8, 32,
+ GetSalData()-mxRGBSpace,
kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Big );
CG_TRACE( CGBitmapContextCreate(1x1x8) = xOnePixelContext );
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index ee75417..549bd9f 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -184,8 +184,6 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
if( mnBitmapDepth (mnBitmapDepth 16) )
{
mnBitmapDepth = 8; // TODO: are 1bit vdevs worth it?
-const CGColorSpaceRef aCGColorSpace = GetSalData()-mxGraySpace;
-const CGBitmapInfo aCGBmpInfo = kCGImageAlphaNone;
const int nBytesPerRow = (mnBitmapDepth * nDX + 7) / 8;
void* pRawData = rtl_allocateMemory( nBytesPerRow * nDY );
@@ -194,7 +192,7 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
((sal_uInt8*)pRawData)[i] = (i 0xFF);
#endif
mxBitmapContext = CGBitmapContextCreate( pRawData, nDX, nDY,
- mnBitmapDepth, nBytesPerRow,
aCGColorSpace, aCGBmpInfo );
+ mnBitmapDepth, nBytesPerRow,
GetSalData()-mxGraySpace, kCGImageAlphaNone );
CG_TRACE( CGBitmapContextCreate( nDX x nDY x
mnBitmapDepth ) = mxBitmapContext );
xCGContext = mxBitmapContext;
}
@@ -233,8 +231,6 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
{
// fall back to a bitmap context
mnBitmapDepth = 32;
-const CGColorSpaceRef aCGColorSpace = GetSalData()-mxRGBSpace;
-const CGBitmapInfo aCGBmpInfo = kCGImageAlphaNoneSkipFirst;
const int nBytesPerRow = (mnBitmapDepth * nDX) / 8;
void* pRawData = rtl_allocateMemory( nBytesPerRow * nDY );
@@ -243,15 +239,13 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
((sal_uInt8*)pRawData)[i] = (i 0xFF);
#endif
mxBitmapContext = CGBitmapContextCreate( pRawData, nDX, nDY,
- 8, nBytesPerRow,
aCGColorSpace, aCGBmpInfo );
+ 8, nBytesPerRow,
GetSalData()-mxRGBSpace, kCGImageAlphaNoneSkipFirst );
CG_TRACE( CGBitmapContextCreate( nDX x nDY
x32) = mxBitmapContext );
xCGContext = mxBitmapContext;
}
}
#else
mnBitmapDepth = 32;
-const CGColorSpaceRef aCGColorSpace = GetSalData()-mxRGBSpace;
-const CGBitmapInfo aCGBmpInfo = kCGImageAlphaNoneSkipFirst;
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/printer/ppdparser.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 23648e824fe41addb75a024374085bbc831b5d1b
Author: Thorsten Behrens t...@documentfoundation.org
Date: Thu Apr 10 19:35:15 2014 +0200
Fix crash in ppd parser.
Only access pKey after we've set it.
Change-Id: If0be3972c36b3da9d9a456fe3746224372a443dc
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 201f5e7..5322c98 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -935,8 +935,10 @@ void PPDParser::parse( ::std::list OString rLines )
OUString aUniKey(OStringToOUString(aKey,
RTL_TEXTENCODING_MS_1252));
keyit = m_aKeys.find( aUniKey );
if(keyit != m_aKeys.end())
+{
pKey = keyit-second;
-pKey-insertValue(Custom, eInvocation, true);
+pKey-insertValue(Custom, eInvocation, true);
+}
continue;
}
___
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/dialog/templdlg.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 058cfa72dcdd91df302be45f7fc59b0d961a420b
Author: Thorsten Behrens t...@documentfoundation.org
Date: Thu Apr 10 19:40:54 2014 +0200
Fix fdo#71423 - crash while editing Impress tables.
Band-aid fix for this nasty crasher, seems sometimes the
family item is not found.
Change-Id: I7f78d59cbf2c9595ad512fa7a78370629924cd06
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index d1a91fb..a5597e8 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1191,6 +1191,8 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
if(pStyleSheetPool nActFamily != 0x)
{
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
+if(!pItem)
+return;
pStyleSheetPool-SetSearchMask(pItem-GetFamily(),
SFXSTYLEBIT_ALL_VISIBLE);
StyleTreeArr_Impl aArr;
SfxStyleSheetBase *pStyle = pStyleSheetPool-First();
@@ -1533,7 +1535,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
// other filters for automatic
CheckItem( nActFamily, true );
const SfxStyleFamilyItem *pStyleItem = GetFamilyItem_Impl();
- if ( 0 == pStyleItem-GetFilterList()[ nActFilter ]-nFlags
+ if ( pStyleItem 0 == pStyleItem-GetFilterList()[ nActFilter
]-nFlags
nAppFilter != pItem-GetValue())
{
nAppFilter = pItem-GetValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/source
i18npool/source/localedata/data/tt_RU.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4019978dd2a8fd57e8d007a24b3c47e74317c57a Author: Ariel Constenla-Haile arie...@apache.org Date: Thu Apr 10 16:44:51 2014 + i124631 - Fix two DefaultFullName Patch by: Irek Khaziev khazi...@mail.ru diff --git a/i18npool/source/localedata/data/tt_RU.xml b/i18npool/source/localedata/data/tt_RU.xml index 9f4fce1..2445188 100644 --- a/i18npool/source/localedata/data/tt_RU.xml +++ b/i18npool/source/localedata/data/tt_RU.xml @@ -220,12 +220,12 @@ Day DayIDtue/DayID DefaultAbbrvNameСÑ/DefaultAbbrvName -DefaultFullNameСиÑÓмбе/DefaultFullName +DefaultFullNameÑиÑÓмбе/DefaultFullName /Day Day DayIDwed/DayID DefaultAbbrvNameЧÑ/DefaultAbbrvName -DefaultFullNameЧÓÑÑÓмбе/DefaultFullName +DefaultFullNameÑÓÑÑÓмбе/DefaultFullName /Day Day DayIDthu/DayID ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx | 670 +---
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |2
sd/source/ui/remotecontrol/Communicator.cxx |2
3 files changed, 602 insertions(+), 72 deletions(-)
New commits:
commit 664ceee384c07884cdb4fd8dbc80971bcadaa9a2
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Wed Apr 9 21:07:23 2014 +0100
fdo#74697 Add Bluez 5 support for impress remote.
Change-Id: I32f781e4cb662653a2993803cbdc0be90f8e3d0d
Reviewed-on: https://gerrit.libreoffice.org/8821
Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com
Tested-by: Andrzej Hunt andrzej.h...@collabora.com
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 63407a6..de04538 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -13,6 +13,8 @@
#include iomanip
#include new
+#include boost/scoped_ptr.hpp
+
#include sal/log.hxx
#ifdef LINUX_BLUETOOTH
@@ -90,12 +92,16 @@ struct DBusObject {
}
};
+static DBusObject* getBluez5Adapter(DBusConnection *pConnection);
+
struct sd::BluetoothServer::Impl {
// the glib mainloop running in the thread
GMainContext *mpContext;
DBusConnection *mpConnection;
DBusObject *mpService;
volatile bool mbExitMainloop;
+enum BluezVersion { BLUEZ4, BLUEZ5, UNKNOWN };
+BluezVersion maBluezVersion = UNKNOWN;
Impl()
: mpContext( g_main_context_new() )
@@ -106,9 +112,19 @@ struct sd::BluetoothServer::Impl {
DBusObject *getAdapter()
{
-if( !mpService )
+if (mpService)
+{
+DBusObject* pAdapter = mpService-cloneForInterface(
org.bluez.Adapter );
+return pAdapter;
+}
+else if (spServer-mpImpl-maBluezVersion == BLUEZ5)
+{
+return getBluez5Adapter(mpConnection);
+}
+else
+{
return NULL;
-return mpService-cloneForInterface( org.bluez.Adapter );
+}
}
};
@@ -156,37 +172,181 @@ sendUnrefAndWaitForReply( DBusConnection *pConnection,
DBusMessage *pMsg )
return pMsg;
}
+static bool
+isBluez5Available(DBusConnection *pConnection)
+{
+DBusMessage *pMsg;
+
+// Simplest wasy to check whether we have Bluez 5+ is to check
+// that we can obtain adapters using the new interfaces.
+// The first two error checks however don't tell us anything as they should
+// succeed as long as dbus is working correctly.
+pMsg = DBusObject( org.bluez, /, org.freedesktop.DBus.ObjectManager
).getMethodCall( GetManagedObjects );
+if (!pMsg)
+{
+SAL_INFO(sdremote.bluetooth, No GetManagedObjects call created);
+return false;
+}
+
+pMsg = sendUnrefAndWaitForReply( pConnection, pMsg );
+if (!pMsg)
+{
+SAL_INFO(sdremote.bluetooth, No reply received);
+return false;
+}
+
+// If dbus is working correctly and we aren't on bluez 5 this is where we
+// should actually get the error.
+if (dbus_message_get_error_name( pMsg ))
+{
+SAL_INFO( sdremote.bluetooth, GetManagedObjects call failed with \
+ dbus_message_get_error_name( pMsg )
+ \ -- we don't seem to have Bluez 5 available);
+return false;
+}
+SAL_INFO(sdremote.bluetooth, GetManagedObjects call seems to have
succeeded -- we must be on Bluez 5);
+dbus_message_unref(pMsg);
+return true;
+}
+
+
+static DBusObject*
+getBluez5Adapter(DBusConnection *pConnection)
+{
+DBusMessage *pMsg;
+// This returns a list of objects where we need to find the first
+// org.bluez.Adapter1 .
+pMsg = DBusObject( org.bluez, /, org.freedesktop.DBus.ObjectManager
).getMethodCall( GetManagedObjects );
+if (!pMsg)
+return NULL;
+
+const gchar* pInterfaceType = org.bluez.Adapter1;
+
+pMsg = sendUnrefAndWaitForReply( pConnection, pMsg );
+
+DBusMessageIter aObjectIterator;
+if (pMsg dbus_message_iter_init(pMsg, aObjectIterator))
+{
+if (DBUS_TYPE_ARRAY ==
dbus_message_iter_get_arg_type(aObjectIterator))
+{
+DBusMessageIter aObject;
+dbus_message_iter_recurse(aObjectIterator, aObject);
+do
+{
+if (DBUS_TYPE_DICT_ENTRY ==
dbus_message_iter_get_arg_type(aObject))
+{
+DBusMessageIter aContainerIter;
+dbus_message_iter_recurse(aObject, aContainerIter);
+char *pPath = 0;
+do
+{
+if (DBUS_TYPE_OBJECT_PATH ==
dbus_message_iter_get_arg_type(aContainerIter))
+{
+dbus_message_iter_get_basic(aContainerIter,
pPath);
+SAL_INFO( sdremote.bluetooth, Something
retrieved: '
+
[Libreoffice-commits] core.git: 13 commits - dbaccess/source sc/source svx/source sw/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 ++--
sc/source/ui/view/olinewin.cxx |5 +++--
sc/source/ui/view/viewutil.cxx |4
svx/source/tbxctrls/layctrl.cxx|5 +++--
svx/source/xml/xmlgrhlp.cxx|6 --
sw/source/core/draw/dcontact.cxx | 20 +++-
sw/source/core/edit/edlingu.cxx|7 ++-
sw/source/core/text/porlay.cxx |7 +++
sw/source/core/text/pormulti.cxx |6 --
sw/source/core/text/txtdrop.cxx|3 ++-
sw/source/core/text/txtfrm.cxx |2 +-
sw/source/core/unocore/unostyle.cxx| 10 +++---
sw/source/filter/html/htmlform.cxx | 10 +-
13 files changed, 59 insertions(+), 30 deletions(-)
New commits:
commit 5e00a299b634220e24771428266b4a796f46e944
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 10 21:05:28 2014 +0100
coverity#708390 Uninitialized scalar field
Change-Id: I59d6f396c82ca8f43939256a04c56a79f0795a67
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index fe928d6..e0fcd32 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -781,8 +781,9 @@ void SvxTableToolBoxControl::StateChanged( sal_uInt16,
SfxItemState eState, cons
// class SvxColumnsToolBoxControl --
-SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId,
sal_uInt16 nId, ToolBox rTbx ) :
-SfxToolBoxControl( nSlotId, nId, rTbx )
+SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId,
sal_uInt16 nId, ToolBox rTbx )
+: SfxToolBoxControl(nSlotId, nId, rTbx)
+, bEnabled(false)
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
rTbx.Invalidate();
commit 652c9faec724a554ef87761b39bf3525798fa2d1
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 10 21:02:50 2014 +0100
coverity#708393 Uninitialized scalar field
Change-Id: Ief5553eb76c09fe2ed2a05ab2b2f67d03837517e
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 3f4a051..7e00eb3 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -353,9 +353,11 @@ SvXMLGraphicHelper::SvXMLGraphicHelper(
SvXMLGraphicHelperMode eCreateMode ) :
Init( NULL, eCreateMode, false );
}
-SvXMLGraphicHelper::SvXMLGraphicHelper() :
-::cppu::WeakComponentImplHelper2
::com::sun::star::document::XGraphicObjectResolver,
+SvXMLGraphicHelper::SvXMLGraphicHelper()
+: ::cppu::WeakComponentImplHelper2
::com::sun::star::document::XGraphicObjectResolver,
::com::sun::star::document::XBinaryStreamResolver ( maMutex )
+, meCreateMode(GRAPHICHELPER_MODE_READ)
+, mbDirect(false)
{
}
commit 788c433a4a829f5054a0ee474de109317bdd6f3a
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 10 21:00:29 2014 +0100
coverity#708418 Uninitialized scalar field
Change-Id: Id33b99cbad88eea79a7ac75d8d99ffcc71d4f7b4
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index bc3a0fa..d0c84bd 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -181,7 +181,12 @@ const SwTxtNode *pLinguNode;
SwTxtFrm *pLinguFrm;
SwLinguIter::SwLinguIter()
-: pSh( 0 ), pStart( 0 ), pEnd( 0 ), pCurr( 0 ), pCurrX( 0 )
+: pSh(0)
+, pStart(0)
+, pEnd(0)
+, pCurr(0)
+, pCurrX(0)
+, nCrsrCnt(0)
{
// TODO missing: ensurance of re-entrance, OSL_ENSURE( etc.
}
commit cdf8c72cedfee96f956e210dee37cbb501709300
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 10 20:58:48 2014 +0100
coverity#708455 Uninitialized scalar field
Change-Id: I266adca95feb9817226c02b183de8efbf83b04d6
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 3df2be0..a099b74 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -2058,6 +2058,13 @@ SwScriptInfo* SwScriptInfo::GetScriptInfo( const
SwTxtNode rTNd,
}
SwParaPortion::SwParaPortion()
+: bFlag00(false)
+, bFlag11(false)
+, bFlag12(false)
+, bFlag13(false)
+, bFlag14(false)
+, bFlag15(false)
+, bFlag16(false)
{
FormatReset();
bFlys = bFtnNum = bMargin = false;
commit 4ef6d67ddb80cddd94716484c282cb646230ff0f
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 10 20:56:20 2014 +0100
coverity#708457 Uninitialized scalar field
Change-Id: I72a0a06bd341ce5527ff7ec88f8686a80e194117
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index d215d19..9965493 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -1269,8 +1269,10 @@ public:
};
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/filter/WriterFilterDetection.cxx | 54 ---
1 file changed, 13 insertions(+), 41 deletions(-)
New commits:
commit 83c888bdb0a6c9795cebfc53fa74d6da8bb692b2
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Apr 10 22:02:03 2014 +0200
writerfilter: remove dead doctok detection code
Change-Id: Ib39d54ce37b9e41ab6aff742d7680a7cd76168cd
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx
b/writerfilter/source/filter/WriterFilterDetection.cxx
index d7bc8e8..b417e8c 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -71,53 +71,25 @@ OUString WriterFilterDetection::detect( uno::Sequence
beans::PropertyValue r
else if ( pValues[nProperty].Name == InputStream )
pValues[nProperty].Value = xInputStream;
}
-bool bBinary = sTypeName == writer_MS_Word_97 ||
- sTypeName == writer_MS_Word_97_Vorlage;
-
try
{
-if(bBinary)
-{
-SvStream* pStream = ::utl::UcbStreamHelper::CreateStream(
xInputStream );
-if ( pStream SotStorage::IsStorageFile(pStream) )
-
-{
-SotStorageRef xStg = new SotStorage( pStream, false );
-
-bool bTable2 = xStg-IsContained(OUString(1Table));
-SotStorageStreamRef xRef =
xStg-OpenSotStream(OUString(WordDocument), STREAM_STD_READ | STREAM_NOCREATE
);
-
-if(bTable2 xStg.Is())
-{
-xRef-Seek(2);
-sal_Int16 nWord;
-xRef-ReadInt16( nWord );
-//version detection
-bWord = nWord = 0x6a nWord = 0xc1;
-}
-}
-}
+uno::Reference embed::XStorage xDocStorage;
+if ( sURL == private:stream )
+xDocStorage =
comphelper::OStorageHelper::GetStorageFromInputStream( xInputStream );
else
+xDocStorage = comphelper::OStorageHelper::GetStorageFromURL( sURL,
embed::ElementModes::READ );
+if( xDocStorage.is() )
{
-uno::Reference embed::XStorage xDocStorage;
-if ( sURL == private:stream )
-xDocStorage =
comphelper::OStorageHelper::GetStorageFromInputStream( xInputStream );
-else
-xDocStorage = comphelper::OStorageHelper::GetStorageFromURL(
-sURL, embed::ElementModes::READ );
-if( xDocStorage.is() )
+uno::Sequence OUString aNames = xDocStorage-getElementNames();
+const OUString* pNames = aNames.getConstArray();
+for(sal_Int32 nName = 0; nName aNames.getLength(); ++nName)
{
-uno::Sequence OUString aNames =
xDocStorage-getElementNames();
-const OUString* pNames = aNames.getConstArray();
-for(sal_Int32 nName = 0; nName aNames.getLength(); ++nName)
+if ( pNames[nName] == word )
{
-if ( pNames[nName] == word )
-{
-bWord = true;
-if( sTypeName.isEmpty() )
-sTypeName = writer_MS_Word_2007;
-break;
-}
+bWord = true;
+if( sTypeName.isEmpty() )
+sTypeName = writer_MS_Word_2007;
+break;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx | 673 +---
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |2
sd/source/ui/remotecontrol/Communicator.cxx |2
3 files changed, 605 insertions(+), 72 deletions(-)
New commits:
commit b15666fd7582729c75bd0dd1bd0cb5d7c5a77f0c
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Thu Apr 10 21:58:29 2014 +0100
fdo#74697 Add Bluez 5 support for impress remote.
This time we:
- Don't break SAL_WARN with an fprintf like syntax.
- Replace DBUS_TYPE_UNIX_FD with it's definition 'h' as we might
be building on dbus-glib versions that do not support it (however
presumably anyone running bluez 5 will have a dbus version that is
new enough to support this, i.e. purely a build-time issue).
- Remove various C++11'isms.
Change-Id: I736cad2122cd3789a5c7fb62c39e409d41fc1e32
Reviewed-on: https://gerrit.libreoffice.org/8924
Tested-by: Andrzej Hunt andrzej.h...@collabora.com
Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 63407a6..a447900 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -13,6 +13,8 @@
#include iomanip
#include new
+#include boost/scoped_ptr.hpp
+
#include sal/log.hxx
#ifdef LINUX_BLUETOOTH
@@ -90,25 +92,40 @@ struct DBusObject {
}
};
+static DBusObject* getBluez5Adapter(DBusConnection *pConnection);
+
struct sd::BluetoothServer::Impl {
// the glib mainloop running in the thread
GMainContext *mpContext;
DBusConnection *mpConnection;
DBusObject *mpService;
volatile bool mbExitMainloop;
+enum BluezVersion { BLUEZ4, BLUEZ5, UNKNOWN };
+BluezVersion maBluezVersion;
Impl()
: mpContext( g_main_context_new() )
, mpConnection( NULL )
, mpService( NULL )
, mbExitMainloop( false )
+, maBluezVersion( UNKNOWN )
{ }
DBusObject *getAdapter()
{
-if( !mpService )
+if (mpService)
+{
+DBusObject* pAdapter = mpService-cloneForInterface(
org.bluez.Adapter );
+return pAdapter;
+}
+else if (spServer-mpImpl-maBluezVersion == BLUEZ5)
+{
+return getBluez5Adapter(mpConnection);
+}
+else
+{
return NULL;
-return mpService-cloneForInterface( org.bluez.Adapter );
+}
}
};
@@ -156,37 +173,181 @@ sendUnrefAndWaitForReply( DBusConnection *pConnection,
DBusMessage *pMsg )
return pMsg;
}
+static bool
+isBluez5Available(DBusConnection *pConnection)
+{
+DBusMessage *pMsg;
+
+// Simplest wasy to check whether we have Bluez 5+ is to check
+// that we can obtain adapters using the new interfaces.
+// The first two error checks however don't tell us anything as they should
+// succeed as long as dbus is working correctly.
+pMsg = DBusObject( org.bluez, /, org.freedesktop.DBus.ObjectManager
).getMethodCall( GetManagedObjects );
+if (!pMsg)
+{
+SAL_INFO(sdremote.bluetooth, No GetManagedObjects call created);
+return false;
+}
+
+pMsg = sendUnrefAndWaitForReply( pConnection, pMsg );
+if (!pMsg)
+{
+SAL_INFO(sdremote.bluetooth, No reply received);
+return false;
+}
+
+// If dbus is working correctly and we aren't on bluez 5 this is where we
+// should actually get the error.
+if (dbus_message_get_error_name( pMsg ))
+{
+SAL_INFO( sdremote.bluetooth, GetManagedObjects call failed with \
+ dbus_message_get_error_name( pMsg )
+ \ -- we don't seem to have Bluez 5 available);
+return false;
+}
+SAL_INFO(sdremote.bluetooth, GetManagedObjects call seems to have
succeeded -- we must be on Bluez 5);
+dbus_message_unref(pMsg);
+return true;
+}
+
+
+static DBusObject*
+getBluez5Adapter(DBusConnection *pConnection)
+{
+DBusMessage *pMsg;
+// This returns a list of objects where we need to find the first
+// org.bluez.Adapter1 .
+pMsg = DBusObject( org.bluez, /, org.freedesktop.DBus.ObjectManager
).getMethodCall( GetManagedObjects );
+if (!pMsg)
+return NULL;
+
+const gchar* pInterfaceType = org.bluez.Adapter1;
+
+pMsg = sendUnrefAndWaitForReply( pConnection, pMsg );
+
+DBusMessageIter aObjectIterator;
+if (pMsg dbus_message_iter_init(pMsg, aObjectIterator))
+{
+if (DBUS_TYPE_ARRAY ==
dbus_message_iter_get_arg_type(aObjectIterator))
+{
+DBusMessageIter aObject;
+dbus_message_iter_recurse(aObjectIterator, aObject);
+do
+{
+if (DBUS_TYPE_DICT_ENTRY ==
dbus_message_iter_get_arg_type(aObject))
+{
+DBusMessageIter
[Libreoffice-commits] core.git: filter/source
filter/source/flash/swfexporter.cxx |8 ++--
filter/source/graphicfilter/eps/eps.cxx |6 ++
filter/source/graphicfilter/icgm/cgm.cxx |9 +++--
filter/source/graphicfilter/idxf/dxfreprd.cxx |7 +++
filter/source/msfilter/escherex.cxx | 23 +++
filter/source/msfilter/msdffimp.cxx | 15 +--
6 files changed, 26 insertions(+), 42 deletions(-)
New commits:
commit 896cacf059005e254f7d502a353f4cca74f9832e
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Apr 10 17:14:06 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: I43cce6b6c41582a65ff7e59de9a107b30cf8b1e8
diff --git a/filter/source/flash/swfexporter.cxx
b/filter/source/flash/swfexporter.cxx
index 26c8197..9f24474 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -36,6 +36,7 @@
#include vcl/wmf.hxx
#include vcl/graphicfilter.hxx
#include vcl/gdimetafiletools.hxx
+#include boost/scoped_ptr.hpp
#include swfexporter.hxx
#include swfwriter.hxx
@@ -601,7 +602,7 @@ void FlashExporter::exportShape( const Reference XShape
xShape, bool bMaster
com::sun::star::awt::Rectangle aBoundRect;
xPropSet-getPropertyValue( BoundRect ) = aBoundRect;
-ShapeInfo* pShapeInfo = new ShapeInfo();
+boost::scoped_ptrShapeInfo pShapeInfo(new ShapeInfo());
pShapeInfo-mnX = aBoundRect.X;
pShapeInfo-mnY = aBoundRect.Y;
pShapeInfo-mnWidth = aBoundRect.Width;
@@ -651,18 +652,13 @@ void FlashExporter::exportShape( const Reference XShape
xShape, bool bMaster
}
if (!nID)
-{
-delete pShapeInfo;
return;
-}
pShapeInfo-mnID = nID;
// pPageInfo-addShape( pShapeInfo );
mpWriter-placeShape( pShapeInfo-mnID, _uInt16(nPlaceDepth++),
pShapeInfo-mnX, pShapeInfo-mnY );
-
-delete pShapeInfo;
}
catch( const Exception )
{
diff --git a/filter/source/graphicfilter/eps/eps.cxx
b/filter/source/graphicfilter/eps/eps.cxx
index a385f18..be8dcd8 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -40,6 +40,7 @@
#include strings.hrc
#include math.h
+#include boost/scoped_ptr.hpp
using namespace ::com::sun::star::uno;
@@ -343,9 +344,7 @@ sal_Bool PSWriter::WritePS( const Graphic rGraphic,
SvStream rTargetStream, Fi
// try to get the dialog selection
if ( pFilterConfigItem )
{
-ResMgr* pResMgr;
-
-pResMgr = ResMgr::CreateResMgr( eps,
Application::GetSettings().GetUILanguageTag() );
+boost::scoped_ptrResMgr pResMgr(ResMgr::CreateResMgr( eps,
Application::GetSettings().GetUILanguageTag() ));
if( pResMgr )
{
@@ -366,7 +365,6 @@ sal_Bool PSWriter::WritePS( const Graphic rGraphic,
SvStream rTargetStream, Fi
mnTextMode = pFilterConfigItem-ReadInt32( TextMode, 0 );
if ( mnTextMode 2 )
mnTextMode = 0;
-delete pResMgr;
}
}
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx
b/filter/source/graphicfilter/icgm/cgm.cxx
index 08e81ad..cc3205c 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -28,6 +28,7 @@
#include main.hxx
#include elements.hxx
#include outact.hxx
+#include boost/scoped_ptr.hpp
using namespace ::com::sun::star;
@@ -707,16 +708,14 @@ ImportCGM( OUString rFileName, uno::Reference
frame::XModel rXModel, sal_u
if( rXModel.is() )
{
-CGM*pCGM= NULL;
-
try
{
-pCGM = new CGM( nMode, rXModel );
+boost::scoped_ptrCGM pCGM(new CGM( nMode, rXModel ));
if ( pCGM pCGM-IsValid() )
{
if ( nMode CGM_IMPORT_CGM )
{
-SvStream* pIn = ::utl::UcbStreamHelper::CreateStream(
rFileName, STREAM_READ );
+boost::scoped_ptrSvStream
pIn(::utl::UcbStreamHelper::CreateStream( rFileName, STREAM_READ ));
if ( pIn )
{
pIn-SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
@@ -763,7 +762,6 @@ ImportCGM( OUString rFileName, uno::Reference
frame::XModel rXModel, sal_u
if ( bProgressBar )
aXStatInd-end();
#endif
-delete pIn;
}
}
}
@@ -772,7 +770,6 @@ ImportCGM( OUString rFileName, uno::Reference
frame::XModel rXModel, sal_u
{
nStatus = 0;
}
-delete pCGM;
}
return nStatus;
}
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx
b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index 3ed0232..47cd94a 100644
---
[Libreoffice-commits] core.git: Branch 'private/kohei/chart-controller-study' - chart2/Library_chartcore.mk chart2/source
chart2/Library_chartcore.mk |1
chart2/source/controller/main/ChartController.cxx| 34 +
chart2/source/controller/main/ChartController.hxx|8 ++
chart2/source/controller/main/ChartController_Window.cxx | 18 +
chart2/source/inc/GL3DHelper.hxx | 29
chart2/source/tools/GL3DHelper.cxx | 54 +++
chart2/source/view/main/ChartView.cxx| 27 ---
7 files changed, 146 insertions(+), 25 deletions(-)
New commits:
commit 0540a40aa5daa7d43ceb9af4d0bc363396ad9895
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Apr 10 23:05:54 2014 -0400
Separate mouse event handlers for GL3D bar chart.
They are just skeletons for now.
Change-Id: I7e5e95ad8a2809125cbcf3affd17e663aafa99b0
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index af3b6f3..8de07e2 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -199,6 +199,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/tools/ExponentialRegressionCurveCalculator \
chart2/source/tools/FillProperties \
chart2/source/tools/FormattedStringHelper \
+chart2/source/tools/GL3DHelper \
chart2/source/tools/ImplOPropertySet \
chart2/source/tools/InternalData \
chart2/source/tools/InternalDataProvider \
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index 8b45213..8786b3f 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -43,6 +43,7 @@
#include DrawCommandDispatch.hxx
#include ShapeController.hxx
#include UndoActions.hxx
+#include GL3DHelper.hxx
#include comphelper/InlineContainer.hxx
@@ -107,6 +108,7 @@
ChartController::ChartController(uno::Referenceuno::XComponentContext const
m_bWaitingForDoubleClick(false),
m_bWaitingForMouseUp(false),
m_bConnectingToView(false),
+m_bGL3DChart(false),
m_xUndoManager( 0 ),
m_aDispatchContainer( m_xCC, this ),
m_eDrawMode( CHARTDRAW_SELECT )
@@ -483,6 +485,8 @@ void SAL_CALL ChartController::modeChanged( const
util::ModeChangeEvent rEvent
}
m_bConnectingToView = false;
+
+queryGL3DChart();
}
}
}
@@ -578,6 +582,8 @@ sal_Bool SAL_CALL ChartController::attachModel( const
uno::Reference frame::XMo
uno::Reference document::XUndoManagerSupplier xSuppUndo( getModel(),
uno::UNO_QUERY_THROW );
m_xUndoManager.set( xSuppUndo-getUndoManager(), uno::UNO_QUERY_THROW );
+queryGL3DChart();
+
return sal_True;
}
@@ -1388,6 +1394,34 @@ DrawViewWrapper* ChartController::GetDrawViewWrapper()
return m_pDrawViewWrapper;
}
+void ChartController::queryGL3DChart()
+{
+m_bGL3DChart = false;
+
+uno::Referenceframe::XModel xModel = m_aModel-getModel();
+if (!xModel.is())
+return;
+
+uno::ReferenceXChartDocument xChartDoc(xModel, uno::UNO_QUERY);
+if (!xChartDoc.is())
+return;
+
+uno::Referencechart2::XDiagram xDiagram = xChartDoc-getFirstDiagram();
+m_bGL3DChart = GL3DHelper::isGL3DDiagram(xDiagram);
+}
+
+void ChartController::executeGL3D_MouseButtonUp( const MouseEvent /*rMEvt*/ )
+{
+}
+
+void ChartController::executeGL3D_MouseButtonDown( const MouseEvent /*rMEvt*/
)
+{
+}
+
+void ChartController::executeGL3D_MouseMove( const MouseEvent /*rMEvt*/ )
+{
+}
+
uno::Reference XAccessible ChartController::CreateAccessible()
{
uno::Reference XAccessible xResult = new AccessibleChartView( m_xCC,
GetDrawViewWrapper() );
diff --git a/chart2/source/controller/main/ChartController.hxx
b/chart2/source/controller/main/ChartController.hxx
index d73d151..e62904a 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -431,6 +431,12 @@ private:
DrawModelWrapper* GetDrawModelWrapper();
DrawViewWrapper* GetDrawViewWrapper();
+void queryGL3DChart();
+
+void executeGL3D_MouseButtonUp( const MouseEvent rMEvt );
+void executeGL3D_MouseButtonDown( const MouseEvent rMEvt );
+void executeGL3D_MouseMove( const MouseEvent rMEvt );
+
private:
class TheModelRef;
friend class ChartController::TheModelRef;
@@ -517,6 +523,8 @@ private:
bool volatile m_bConnectingToView;
+bool m_bGL3DChart;
+
::com::sun::star::uno::Reference ::com::sun::star::document::XUndoManager
m_xUndoManager;
::std::auto_ptr UndoGuard
m_pTextActionUndoGuard;
/// needed for dispatching URLs in FeatureStateEvents
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index 7cd99f2..e420b3b 100644
---
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/column3.cxx | 108
sc/source/ui/docshell/docsh8.cxx | 116 ++-
2 files changed, 165 insertions(+), 59 deletions(-)
New commits:
commit c73c6b24e64b0fbfb7feab62966ba967fbad8411
Author: Eike Rathke er...@redhat.com
Date: Mon Mar 31 19:28:31 2014 +0200
re-enabled user-defined numeric fields for dBase export
Since commit f59e350d1733125055f1144f8b3b1b0a46f6d1ca it was impossible
to define a numeric field with a precision of less than 2 decimals, even
if all values were integers. It was also impossible to define a field
width larger than needed for any values in that column. Furthermore, the
integer part was shortened if the overall column's values resulted in
more precision than defined, but the overall length did not reach the
predefined length.
This does not change the behavior of the original intention of
f59e350d1733125055f1144f8b3b1b0a46f6d1ca to give the precision of number
formats precedence over precision defined in the column header, which is
debatable though because conflicts may silently change the field
definition.
(cherry picked from commit e65141e93a540fc9fb4343ee65a5a7da7e3b1769)
Plus comment translation.
Conflicts:
sc/source/ui/docshell/docsh8.cxx
Change-Id: I234c4bceaa1a6aadbd259cb8d9b6cb6f16bf91c2
Reviewed-on: https://gerrit.libreoffice.org/8806
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index d47893f..192efcb 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2710,25 +2710,42 @@ class MaxNumStringLenHandler
SvNumberFormatter* mpFormatter;
sal_Int32 mnMaxLen;
sal_uInt16 mnPrecision;
+sal_uInt16 mnMaxGeneralPrecision;
+bool mbHaveSigned;
void processCell(size_t nRow, ScRefCellValue rCell)
{
-if (rCell.meType == CELLTYPE_FORMULA !rCell.mpFormula-IsValue())
-return;
+sal_uInt16 nCellPrecision = mnMaxGeneralPrecision;
+if (rCell.meType == CELLTYPE_FORMULA)
+{
+if (!rCell.mpFormula-IsValue())
+return;
+
+// Limit unformatted formula cell precision to precision
+// encountered so far, if any, otherwise we'd end up with 15 just
+// because of =1/3 ... If no precision yet then arbitrarily limit
+// to a maximum of 4 unless a maximum general precision is set.
+if (mnPrecision)
+nCellPrecision = mnPrecision;
+else
+nCellPrecision = (mnMaxGeneralPrecision = 15) ? 4 :
mnMaxGeneralPrecision;
+}
+
+double fVal = rCell.getValue();
+if (!mbHaveSigned fVal 0.0)
+mbHaveSigned = true;
OUString aString;
+OUString aSep;
+sal_Int32 nLen;
+sal_uInt16 nPrec;
sal_uInt32 nFormat = static_castconst SfxUInt32Item*(
-mrColumn.GetAttr(nRow, ATTR_VALUE_FORMAT))-GetValue();
-ScCellFormat::GetInputString(rCell, nFormat, aString, *mpFormatter,
mrColumn.GetDoc());
-sal_Int32 nLen = aString.getLength();
-if (nLen = 0)
-// Ignore empty string.
-return;
-
-if (nFormat)
+mrColumn.GetAttr(nRow, ATTR_VALUE_FORMAT))-GetValue();
+if (nFormat % SV_COUNTRY_LANGUAGE_OFFSET)
{
+aSep = mpFormatter-GetFormatDecimalSep(nFormat);
+ScCellFormat::GetInputString(rCell, nFormat, aString,
*mpFormatter, mrColumn.GetDoc());
const SvNumberformat* pEntry = mpFormatter-GetEntry(nFormat);
-sal_uInt16 nPrec;
if (pEntry)
{
bool bThousand, bNegRed;
@@ -2737,15 +2754,54 @@ class MaxNumStringLenHandler
}
else
nPrec = mpFormatter-GetFormatPrecision(nFormat);
+}
+else
+{
+if (mnPrecision = mnMaxGeneralPrecision)
+return; // early bail out for nothing changes here
-if (nPrec != SvNumberFormatter::UNLIMITED_PRECISION nPrec
mnPrecision)
-mnPrecision = nPrec;
+if (!fVal)
+{
+// 0 doesn't change precision, but set a maximum length if
none yet.
+if (!mnMaxLen)
+mnMaxLen = 1;
+return;
+}
+
+// Simple number string with at most 15 decimals and trailing
+// decimal zeros eliminated.
+aSep = .;
+aString = rtl::math::doubleToUString( fVal,
rtl_math_StringFormat_F, nCellPrecision, '.', true);
+nPrec = SvNumberFormatter::UNLIMITED_PRECISION;
}
+nLen = aString.getLength();
+if (nLen = 0)
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/core/data/column3.cxx | 100 +-
sc/source/ui/docshell/docsh8.cxx | 112 ++-
2 files changed, 162 insertions(+), 50 deletions(-)
New commits:
commit 19d01c838c779d3326c65a798aa39cfc51bcd15e
Author: Eike Rathke er...@redhat.com
Date: Mon Mar 31 19:28:31 2014 +0200
re-enabled user-defined numeric fields for dBase export
Since commit f59e350d1733125055f1144f8b3b1b0a46f6d1ca it was impossible
to define a numeric field with a precision of less than 2 decimals, even
if all values were integers. It was also impossible to define a field
width larger than needed for any values in that column. Furthermore, the
integer part was shortened if the overall column's values resulted in
more precision than defined, but the overall length did not reach the
predefined length.
This does not change the behavior of the original intention of
f59e350d1733125055f1144f8b3b1b0a46f6d1ca to give the precision of number
formats precedence over precision defined in the column header, which is
debatable though because conflicts may silently change the field
definition.
(cherry picked from commit e65141e93a540fc9fb4343ee65a5a7da7e3b1769)
Plus comment translation.
Conflicts:
sc/source/core/data/column3.cxx
sc/source/ui/docshell/docsh8.cxx
Backported.
Change-Id: I234c4bceaa1a6aadbd259cb8d9b6cb6f16bf91c2
Reviewed-on: https://gerrit.libreoffice.org/8809
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 4bd6a5a..3630be3 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1906,15 +1906,19 @@ xub_StrLen ScColumn::GetMaxNumberStringLen(
sal_uInt16 nPrecision, SCROW nRowStart, SCROW nRowEnd ) const
{
xub_StrLen nStringLen = 0;
-nPrecision = pDocument-GetDocOptions().GetStdPrecision();
-if ( nPrecision == SvNumberFormatter::UNLIMITED_PRECISION )
-// In case of unlimited precision, use 2 instead.
-nPrecision = 2;
+nPrecision = 0;
if ( !maItems.empty() )
{
OUString aString;
+String aSep;
SvNumberFormatter* pNumFmt = pDocument-GetFormatTable();
+sal_uInt16 nMaxGeneralPrecision =
pDocument-GetDocOptions().GetStdPrecision();
+// Limit the decimals passed to doubleToUString().
+// Also, the dBaseIII maximum precision is 15.
+if (nMaxGeneralPrecision 15)
+nMaxGeneralPrecision = 15;
+bool bHaveSigned = false;
SCSIZE nIndex;
SCROW nRow;
Search( nRowStart, nIndex );
@@ -1926,16 +1930,33 @@ xub_StrLen ScColumn::GetMaxNumberStringLen(
if ( eType == CELLTYPE_VALUE || (eType == CELLTYPE_FORMULA
aCell.mpFormula-IsValue()) )
{
-sal_uLong nFormat = (sal_uLong) ((SfxUInt32Item*) GetAttr(
-nRow, ATTR_VALUE_FORMAT ))-GetValue();
-ScCellFormat::GetInputString(aCell, nFormat, aString,
*pNumFmt, pDocument);
-xub_StrLen nLen = aString.getLength();
-if ( nLen )
+do
{
-if ( nFormat )
+sal_uInt16 nCellPrecision = nMaxGeneralPrecision;
+if (eType == CELLTYPE_FORMULA)
{
+// Limit unformatted formula cell precision to
precision
+// encountered so far, if any, otherwise we'd end up
with 15 just
+// because of =1/3 ... If no precision yet then
arbitrarily limit
+// to a maximum of 4 unless a maximum general
precision is set.
+if (nPrecision)
+nCellPrecision = nPrecision;
+else
+nCellPrecision = (nMaxGeneralPrecision = 15) ? 4
: nMaxGeneralPrecision;
+}
+
+double fVal = aCell.getValue();
+if (!bHaveSigned fVal 0.0)
+bHaveSigned = true;
+
+sal_uInt16 nPrec;
+sal_uLong nFormat = (sal_uLong) ((SfxUInt32Item*) GetAttr(
+nRow, ATTR_VALUE_FORMAT ))-GetValue();
+if (nFormat % SV_COUNTRY_LANGUAGE_OFFSET)
+{
+aSep = pNumFmt-GetFormatDecimalSep(nFormat);
+ScCellFormat::GetInputString(aCell, nFormat, aString,
*pNumFmt, pDocument);
const SvNumberformat* pEntry = pNumFmt-GetEntry(
nFormat );
-sal_uInt16 nPrec;
if (pEntry)
{
bool bThousand, bNegRed;
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/view/output2.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 4a2c3371f3ca1cc05732041c96cff9bf494bddb6
Author: Hannah Lyhne hdlyh...@gmail.com
Date: Tue Apr 1 07:55:39 2014 -0400
fdo#73588: fix default alignment in RTL mode.
(cherry picked from commit 036b1fccbfb87a1aab36632843deb29e0a70630f)
Change-Id: Icb932ee51dbf32d8baf4382aa00e89a680f5a41d
Signed-off-by: Kohei Yoshida kohei.yosh...@collabora.com
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 9c09b5c..544e737 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1432,7 +1432,10 @@ static SvxCellHorJustify getAlignmentFromContext(
SvxCellHorJustify eInHorJust,
else if (nDirection == FRMDIR_ENVIRONMENT)
{
SAL_WARN_IF( !pDoc, sc.ui, getAlignmentFromContext -
pDoc==NULL);
-eHorJustContext = (pDoc pDoc-IsLayoutRTL(nTab)) ?
SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT;
+// fdo#73588: The content of the cell must also
+// begin with a RTL character to be right
+// aligned; otherwise, it should be left aligned.
+eHorJustContext = (pDoc pDoc-IsLayoutRTL(nTab)
(beginsWithRTLCharacter( rText))) ? SVX_HOR_JUSTIFY_RIGHT :
SVX_HOR_JUSTIFY_LEFT;
}
else
eHorJustContext = SVX_HOR_JUSTIFY_RIGHT;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc_sharedformula.cxx |8
sc/source/core/data/column4.cxx| 19 +++
2 files changed, 19 insertions(+), 8 deletions(-)
New commits:
commit 66c6a3bfc9cd89c562107d3d369b3d82bae94d68
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Apr 11 00:43:18 2014 -0400
fdo#77300: Don't re-compile formulas when the hybrid formula is not there.
Change-Id: I9b0f8d031fec08bb8d92333ff67074fdc739e034
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index c658124..7d87177 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -661,16 +661,19 @@ public:
ScFormulaCell* pCell = rEntry.mpCell;
OUString aFormula = pCell-GetHybridFormula();
-// Create token array from formula string.
-ScCompiler aComp(mrCompileFormulaCxt, pCell-aPos);
-ScTokenArray* pNewCode = aComp.CompileString(aFormula);
+if (!aFormula.isEmpty())
+{
+// Create token array from formula string.
+ScCompiler aComp(mrCompileFormulaCxt, pCell-aPos);
+ScTokenArray* pNewCode = aComp.CompileString(aFormula);
-// Generate RPN tokens.
-ScCompiler aComp2(mpDoc, pCell-aPos, *pNewCode);
-aComp2.CompileTokenArray();
+// Generate RPN tokens.
+ScCompiler aComp2(mpDoc, pCell-aPos, *pNewCode);
+aComp2.CompileTokenArray();
-pCell-SetCode(pNewCode);
-pCell-SetDirty();
+pCell-SetCode(pNewCode);
+pCell-SetDirty();
+}
}
}
};
commit bdc8d5f9e712fce35098352b8c1d9028f4095d8c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Apr 11 00:34:37 2014 -0400
fdo#77300: Add test for this.
Change-Id: Ib870d8f115b074a4ad80ee6910f92ba8d4b0c01e
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx
b/sc/qa/unit/ucalc_sharedformula.cxx
index acb249a..603e26e 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -1222,6 +1222,9 @@ void Test::testSharedFormulaUpdateOnNamedRangeChange()
m_pDoc-SetString(ScAddress(1,1,0), =SUM(MyRange));
m_pDoc-SetString(ScAddress(1,2,0), =SUM(MyRange));
+// Set single formula with no named range to B5.
+m_pDoc-SetString(ScAddress(1,4,0), =ROW());
+
// B1:B3 should be grouped.
ScFormulaCell* pFC = m_pDoc-GetFormulaCell(ScAddress(1,0,0));
CPPUNIT_ASSERT(pFC);
@@ -1232,6 +1235,8 @@ void Test::testSharedFormulaUpdateOnNamedRangeChange()
CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc-GetValue(ScAddress(1,1,0)));
CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc-GetValue(ScAddress(1,2,0)));
+CPPUNIT_ASSERT_EQUAL(5.0, m_pDoc-GetValue(ScAddress(1,4,0)));
+
// Set a single formula to C1.
m_pDoc-SetString(ScAddress(2,0,0), =AVERAGE(MyRange));
pFC = m_pDoc-GetFormulaCell(ScAddress(2,0,0));
@@ -1260,6 +1265,8 @@ void Test::testSharedFormulaUpdateOnNamedRangeChange()
CPPUNIT_FAIL(Wrong formula!);
if (!checkFormula(*m_pDoc, ScAddress(1,2,0), SUM(MyRange)))
CPPUNIT_FAIL(Wrong formula!);
+if (!checkFormula(*m_pDoc, ScAddress(1,4,0), ROW()))
+CPPUNIT_FAIL(Wrong formula!);
if (!checkFormula(*m_pDoc, ScAddress(2,0,0), AVERAGE(MyRange)))
CPPUNIT_FAIL(Wrong formula!);
@@ -1267,6 +1274,7 @@ void Test::testSharedFormulaUpdateOnNamedRangeChange()
CPPUNIT_ASSERT_EQUAL(10.0, m_pDoc-GetValue(ScAddress(1,0,0)));
CPPUNIT_ASSERT_EQUAL(10.0, m_pDoc-GetValue(ScAddress(1,1,0)));
CPPUNIT_ASSERT_EQUAL(10.0, m_pDoc-GetValue(ScAddress(1,2,0)));
+CPPUNIT_ASSERT_EQUAL(5.0, m_pDoc-GetValue(ScAddress(1,4,0)));
CPPUNIT_ASSERT_EQUAL(2.5, m_pDoc-GetValue(ScAddress(2,0,0)));
m_pDoc-DeleteTab(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc_sharedformula.cxx | 18 ++
sc/source/core/data/column4.cxx| 35 +++
2 files changed, 37 insertions(+), 16 deletions(-)
New commits:
commit 0e63ca4fde4e446f346e35849c756a30ca294aab
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Apr 11 00:55:10 2014 -0400
fdo#77300: Do the same for the shared formula case as well.
Change-Id: I560b0beabe81907e3f85d8845041a9df25d2200d
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 7d87177..ec938d8 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -637,23 +637,26 @@ public:
ScFormulaCell* pTop = *rEntry.mpCells;
OUString aFormula = pTop-GetHybridFormula();
-// Create a new token array from the hybrid formula string, and
-// set it to the group.
-ScCompiler aComp(mrCompileFormulaCxt, pTop-aPos);
-ScTokenArray* pNewCode = aComp.CompileString(aFormula);
-ScFormulaCellGroupRef xGroup = pTop-GetCellGroup();
-assert(xGroup);
-xGroup-setCode(pNewCode);
-xGroup-compileCode(*mpDoc, pTop-aPos, mpDoc-GetGrammar());
-
-// Propagate the new token array to all formula cells in the group.
-ScFormulaCell** pp = rEntry.mpCells;
-ScFormulaCell** ppEnd = pp + rEntry.mnLength;
-for (; pp != ppEnd; ++pp)
+if (!aFormula.isEmpty())
{
-ScFormulaCell* p = *pp;
-p-SyncSharedCode();
-p-SetDirty();
+// Create a new token array from the hybrid formula string, and
+// set it to the group.
+ScCompiler aComp(mrCompileFormulaCxt, pTop-aPos);
+ScTokenArray* pNewCode = aComp.CompileString(aFormula);
+ScFormulaCellGroupRef xGroup = pTop-GetCellGroup();
+assert(xGroup);
+xGroup-setCode(pNewCode);
+xGroup-compileCode(*mpDoc, pTop-aPos, mpDoc-GetGrammar());
+
+// Propagate the new token array to all formula cells in the
group.
+ScFormulaCell** pp = rEntry.mpCells;
+ScFormulaCell** ppEnd = pp + rEntry.mnLength;
+for (; pp != ppEnd; ++pp)
+{
+ScFormulaCell* p = *pp;
+p-SyncSharedCode();
+p-SetDirty();
+}
}
}
else
commit ed9d606306cc66ec89e9a6696494b6cdefd9b208
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Apr 11 00:53:49 2014 -0400
fdo#77300: Add more test to cover the shared formula case.
Change-Id: I076cb7b8d5f9b51e7337a512bb86efbabee021a8
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx
b/sc/qa/unit/ucalc_sharedformula.cxx
index 603e26e..d482216 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -1225,17 +1225,29 @@ void Test::testSharedFormulaUpdateOnNamedRangeChange()
// Set single formula with no named range to B5.
m_pDoc-SetString(ScAddress(1,4,0), =ROW());
+// Set shared formula with no named range to B7:B8.
+m_pDoc-SetString(ScAddress(1,6,0), =ROW());
+m_pDoc-SetString(ScAddress(1,7,0), =ROW());
+
// B1:B3 should be grouped.
ScFormulaCell* pFC = m_pDoc-GetFormulaCell(ScAddress(1,0,0));
CPPUNIT_ASSERT(pFC);
CPPUNIT_ASSERT_EQUAL(static_castSCROW(0), pFC-GetSharedTopRow());
CPPUNIT_ASSERT_EQUAL(static_castSCROW(3), pFC-GetSharedLength());
+// B7:B8 should be grouped.
+pFC = m_pDoc-GetFormulaCell(ScAddress(1,6,0));
+CPPUNIT_ASSERT(pFC);
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(6), pFC-GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(2), pFC-GetSharedLength());
+
CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc-GetValue(ScAddress(1,0,0)));
CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc-GetValue(ScAddress(1,1,0)));
CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc-GetValue(ScAddress(1,2,0)));
CPPUNIT_ASSERT_EQUAL(5.0, m_pDoc-GetValue(ScAddress(1,4,0)));
+CPPUNIT_ASSERT_EQUAL(7.0, m_pDoc-GetValue(ScAddress(1,6,0)));
+CPPUNIT_ASSERT_EQUAL(8.0, m_pDoc-GetValue(ScAddress(1,7,0)));
// Set a single formula to C1.
m_pDoc-SetString(ScAddress(2,0,0), =AVERAGE(MyRange));
@@ -1267,6 +1279,10 @@ void Test::testSharedFormulaUpdateOnNamedRangeChange()
CPPUNIT_FAIL(Wrong formula!);
if (!checkFormula(*m_pDoc, ScAddress(1,4,0), ROW()))
CPPUNIT_FAIL(Wrong formula!);
+if (!checkFormula(*m_pDoc, ScAddress(1,6,0), ROW()))
+CPPUNIT_FAIL(Wrong formula!);
+if (!checkFormula(*m_pDoc, ScAddress(1,7,0), ROW()))
+CPPUNIT_FAIL(Wrong formula!);
if (!checkFormula(*m_pDoc, ScAddress(2,0,0), AVERAGE(MyRange)))
CPPUNIT_FAIL(Wrong formula!);
@@ -1275,6 +1291,8 @@ void Test::testSharedFormulaUpdateOnNamedRangeChange()
Re: [Libreoffice-qa] Planing bug hunting session 4.3.0 beta 1
Hi, Le 09/04/2014 20:48, Joel Madero a écrit : On 04/07/2014 11:54 PM, Sophie wrote: Hi all, So I reintroduce this amended with Joel remarks: Target: 4.3.0 beta1 on week 21 (May 19-25) Banner on the website: week 16 (April 14-20) First communication: week 17 (April 21-27) Reminder: week 19 (May 5-11) Announcement: May 18. If you agree with that, I'll open a ticket on Redmine and request Italo's help. As you see the first action is for next week with the banner on the website. +1 So I've opened ticket #365 on Redmine, will take care of the banner for next week and will create the wiki page. Cheers 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/
[Libreoffice-qa] banner next bug hunt proposal
Hi all, Proposal for the banner is uploaded here, feedback welcome :) https://wiki.documentfoundation.org/File:Bughuntban.png Cheers Sophie Membership Certification Committee Member - Co-founder The Document Foundation ___ 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] Planing bug hunting session 4.3.0 beta 1
On Thu, Apr 10, 2014 at 5:49 AM, Sophie gautier.sop...@gmail.com wrote: Hi, Le 09/04/2014 20:48, Joel Madero a écrit : On 04/07/2014 11:54 PM, Sophie wrote: Hi all, So I reintroduce this amended with Joel remarks: Target: 4.3.0 beta1 on week 21 (May 19-25) Banner on the website: week 16 (April 14-20) First communication: week 17 (April 21-27) Reminder: week 19 (May 5-11) Announcement: May 18. If you agree with that, I'll open a ticket on Redmine and request Italo's help. As you see the first action is for next week with the banner on the website. +1 So I've opened ticket #365 on Redmine, will take care of the banner for next week and will create the wiki page. Hi, I can't seem to access issue #365 on Redmine -- could you double-check that # ? Thanks, --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] Planing bug hunting session 4.3.0 beta 1
Hi Robinson, Le 10/04/2014 15:24, Robinson Tryon a écrit : On Thu, Apr 10, 2014 at 5:49 AM, Sophie gautier.sop...@gmail.com wrote: Hi, Le 09/04/2014 20:48, Joel Madero a écrit : On 04/07/2014 11:54 PM, Sophie wrote: Hi all, So I reintroduce this amended with Joel remarks: Target: 4.3.0 beta1 on week 21 (May 19-25) Banner on the website: week 16 (April 14-20) First communication: week 17 (April 21-27) Reminder: week 19 (May 5-11) Announcement: May 18. If you agree with that, I'll open a ticket on Redmine and request Italo's help. As you see the first action is for next week with the banner on the website. +1 So I've opened ticket #365 on Redmine, will take care of the banner for next week and will create the wiki page. Hi, I can't seem to access issue #365 on Redmine -- could you double-check that # ? I've added it to the Public Relation folder which is one dedicated for Italo, that's why you don't access it I think. But that's only for info here, I only pasted the mail with the dates, it's easier for Italo to handle than scrolling in the archives :) Cheers 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] banner next bug hunt proposal
Hi Sophie, it's a very nice banner but, in my opinion, the green rectangle with the release number it's a little bit hidden. My two cents ;) Marina Marina Latini mar...@studiostorti.com Studio Storti Srl Viale Leonardo da Vinci, 18 36100 - Vicenza (VI) http://www.studiostorti.com - Messaggio originale - Da: Sophie gautier.sop...@gmail.com A: LibreOffice-QA libreoffice-qa@lists.freedesktop.org Inviato: Giovedì, 10 aprile 2014 14:57:37 Oggetto: [Libreoffice-qa] banner next bug hunt proposal Hi all, Proposal for the banner is uploaded here, feedback welcome :) https://wiki.documentfoundation.org/File:Bughuntban.png Cheers Sophie Membership Certification Committee Member - Co-founder The Document Foundation ___ 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/ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] minutes of ESC call ...
* Present + Eike, Stephan, David, Kendy, Astron, Bjoern, Miklos, Markus, Christian Jacobo, Andras, Kohei, Michael M, Robinson, Norbert, Lionel, Michael S * Completed Action Items + talk to fdo admins wrt. bugzilla dump (Norbert) * Pending Action Items: + crashtest box - more research (Moggi/Cloph) [ nailed it down to 4000 documents where the problem is ] + will try filing a lot of small string changes as easy hacks (Astron) + update wiki schedule to include new Alpha 1 (Cloph) * Release Engineering update (Christian) + 4.2.3 rc3 status / update. + released today, somewhat delayed by: + including a last-minute openssl / security update etc. AI:+ update the security page (Cloph) http://www.libreoffice.org/about-us/security/advisories + 4.2.4 rc1 - deadline is on Monday - April 14th + 4.1.6 RC1 + tagged, Windows still building will up-load today. + openssl issue didn't affect 4.1.x + on-schedule. + Android / iOS remote + ahunt fixing a few bugs testing with BlueZ 5.0 + problems around new requirement for dbus service file install here. * UX update (Astron) + nothing much done; will handle SpinachCon report shortly. + new version of Sifr potentially coming, re-colouring done manually + prefer that to be done programatically (Michael) + a few lines of code vs. 1.5Mb+ of theme + do we have SVG sources for all the icons ? (Kendy) + yes, we have SVG sources for all, but some keep on their hard-disks and not put into git. AI: + encourage icon authors to put them into git (Astron) + multiple repositories with icons (why?) can we flatten that ? + can we get git push access to contributing artists ? (Michael) + would like separate SVG files for icons for HiDPI (Kendy) * LTO / fields concerns (Michael S) + https://bugs.freedesktop.org/show_bug.cgi?id=75376#c20 comment 21 / 22 + looks like we have an LTO bug in VS 2010 affecting Writer rendering. + http://dev-builds.libreoffice.org/daily/master/Win-x86@47-TDF/2014-04-09_12.09.54/ (lto enabled build) + http://dev-builds.libreoffice.org/daily/master/Win-x86@47-TDF/2014-04-07_11.14.34/ (lto disabled) + would love community help investigating MSVC++ LTO compiler bug + in particular a unit test to catch that etc. + propose to disable LTO on libreoffice-4-2 branch AI: + agreed - turn it off / push gerrit patch (Michael S) + propose to move to MSVC 2012 for 4.3 release builds where LTO does not produce this bug + TODO: enable --mergelibs on Win32 for 4.3 + TODO: need to prevent JVM loading problem https://bugs.freedesktop.org/show_bug.cgi?id=50584 + currently happens to work because we use the same run-time as Java does. + there is a hack for JVM loading that looks around to manually load the run-time library that matches the JVM, apparently used to work with JVMv6 (used an older MS run-time) we could perhaps implement that for JVMv7 too - remains to be done. + I fixed this bug before, can give code pointers (Markus) AI: + look into fixing the Java bridge for MSVC2012 (Stephan) + should we still target Windows XP ? (Cloph) + by default it doesn't. + yes, should continue supporting WinXP + didn't MS drop support ? (Norbert) + not for everyone (Michael) * GSoC update (Fridrich/Cedric?) + still ranking / ordering students, check what's up + we've been kindly given 11 slots (whoot) * Crashtest update (Markus) + still manually bisecting the .doc files for the bad one, so no new data yet. + just hit it - down to 200 documents ... * Gran Canaria hack-fest (Bjoern) + April 24-25, 2014 (Thu-Fri) + see you there ... * Certification Committee (Stephan/Bjoern/Kendy) * QA (Robinson) + holding the unconfirmed count to ~1000 + BugHunting Session for 4.3 (May 23-25) https://wiki.documentfoundation.org/BugHunting_Session_4.3.0 + Sophie leading that + buzilla migration (Norbert) + Tollef responded ! we have a dump ... / sanitised themselves. + re-loaded on a VM setup for that; got it working; seems ok. + planning to re-do the install/restore so it's scripted + to avoid problems when we do it for real + also helps for disaster recovery. + concerns wrt. scalability (Michael) + bugs.fdo. runs on a ~huge machine, we need hardware to back that + in 3 years - we're 40% of fdo bugs. (Norbert) + havn't looked at that yet; mostly a money problem + intention to get to a point: where we can have an automated install / restore bugzilla. + Tollef agreed to
[Libreoffice-qa] [ANN] LibreOffice 4.1.6 RC1 test builds available
Hi *, for the upcoming new version 4.1.6, the builds for rc1 are now available on pre-releases. (some windows helppacks still uploading) See https://wiki.documentfoundation.org/ReleasePlan/4.1#4.1.6_release for the complete schedule. (one additional rc is planned for 4.1.6) Grab the builds from here here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report any severe bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. The list of fixed bugs relative to 4.1.5 final (rc3) is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-1-6-release-4.1.6.1.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 60443] When the clipboard contents are pasted in Writer, only text is pasted, not images
https://bugs.freedesktop.org/show_bug.cgi?id=60443 narayana...@outlook.com changed: What|Removed |Added Summary|when data copied from a |When the clipboard contents |website with images and |are pasted in Writer, only |pasted in liber office |text is pasted, not images |writer images or not| --- Comment #5 from narayana...@outlook.com --- The problem still exists in v4.2.3.2 also. BTW when the content (text+images) is pasted, the text is pasted instantly (no delays at all). But there is absolutely no trace of the images- Not even placeholders. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66419] UI: macro call to close() or dispose() fail to terminate soffice processes
https://bugs.freedesktop.org/show_bug.cgi?id=66419 --- Comment #8 from Vieri rentor...@yahoo.com --- Sorry for the late reply but I didn't get an e-mail notification. Tried with Java versions 1.7.0_51 and 1.6.0_20. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77262] New: VIEWING: Animated GIF display is quite broken os OS X
https://bugs.freedesktop.org/show_bug.cgi?id=77262 Priority: medium Bug ID: 77262 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: VIEWING: Animated GIF display is quite broken os OS X Severity: normal Classification: Unclassified OS: Mac OS X (All) Reporter: t...@iki.fi Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.2.1 release Component: Writer Product: LibreOffice Insert an animated GIF in a Writer document. Watch the weirdness. Does not seem to happen on Linux, so don't bother trying to reproduce on Linux. In case the bug depends on how complex the animated GIF is, it happens at least for the one I now added to the odk/examples/java/DocumentHandling/test/test1.odt document. Operating System: Mac OS X Version: 4.2.2.1 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77262] VIEWING: Animated GIF display is quite broken on OS X
https://bugs.freedesktop.org/show_bug.cgi?id=77262 Tor Lillqvist t...@iki.fi changed: What|Removed |Added Summary|VIEWING: Animated GIF |VIEWING: Animated GIF |display is quite broken os |display is quite broken on |OS X|OS X -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77262] VIEWING: Animated GIF display is quite broken on OS X
https://bugs.freedesktop.org/show_bug.cgi?id=77262 Tor Lillqvist t...@iki.fi changed: What|Removed |Added Version|4.2.2.1 release |unspecified -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76930] Creating an Index produces error message
https://bugs.freedesktop.org/show_bug.cgi?id=76930 Winfried Donkers winfrieddonk...@libreoffice.org changed: What|Removed |Added Status|RESOLVED|UNCONFIRMED Resolution|FIXED |--- Ever confirmed|1 |0 --- Comment #24 from Winfried Donkers winfrieddonk...@libreoffice.org --- (In reply to comment #19) That looks as I would expect, and now the user/registrymodifications.xcu ? I can reproduce the problem in 4.2 if I edit the paths manually (in the case where I have permissions to change the shared paths) and remove the common entry Caolán, I presume you don't need my user/registrymodifications.xcu anymore? Caolán, Michael, thank you for your efforts :) I will install a daily build soon and check and - I expect - set this bug report to fixed. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77261] Cut / Copy / Paste buttons clutter the standard toolbar while encouraging poor practices
https://bugs.freedesktop.org/show_bug.cgi?id=77261 Samuel M. s.mehrbr...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||s.mehrbr...@gmail.com Ever confirmed|0 |1 --- Comment #1 from Samuel M. s.mehrbr...@gmail.com --- I agree completely with Daniel - there is no need for these buttons in the toolbar. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77261] Cut / Copy / Paste buttons clutter the standard toolbar while encouraging poor practices
https://bugs.freedesktop.org/show_bug.cgi?id=77261 --- Comment #2 from Samuel M. s.mehrbr...@gmail.com --- Well, actually I sometimes use the Insert button in the toolbar since it lets you select _how_ you want to insert something (Unformatted, HTML, etc.) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77186] Custom animation timing repeat until next slide doesn't work
https://bugs.freedesktop.org/show_bug.cgi?id=77186 --- Comment #2 from Nicolas R nico2...@yopmail.com --- Another test with 3.6.7 ... It's worse. 'Until end of slide' = blink once Any number of repeat = not even one blink ! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77264] New: Libre Office 3.5.4.2 freezes when trying to save from ods to xlsx or xls
https://bugs.freedesktop.org/show_bug.cgi?id=77264 Priority: medium Bug ID: 77264 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Libre Office 3.5.4.2 freezes when trying to save from ods to xlsx or xls Severity: normal Classification: Unclassified OS: Linux (All) Reporter: lolackr...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 3.5.4 release Component: Libreoffice Product: LibreOffice Hi, This is my first post requesting you to solve my issue. am using linux mint 16 cinnamon edition Libre office 3.5.4.2 version at my office. when i update all my data in Calc finally when i click on save in either in Xlsx or in Xls it wont save and it stays idle and i cannot open any other application the cpu usage goes to 100% the system stops to respond when i force quit the Calc the cpu usage comes down and again when i open the calc it asks for the recovery but data never recovered me and my colleagues are loosing all our call tracker it is being very difficult for us. please help me in this issue Thanks In Advance Rajesh -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 74794] An image put in the right header only, appears on every odd and even pages on reload.
https://bugs.freedesktop.org/show_bug.cgi?id=74794 --- Comment #14 from pamartin64 pedromar...@lascabezas.es --- Con la version 4.1.5 tambien falla. With the 4.1.5 version also fail. Sorry i am spanish. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77117] FILESAVE : Labels in a group shape are not preserved after Round trip
https://bugs.freedesktop.org/show_bug.cgi?id=77117 Rohit Deshmukh rohit.deshm...@synerzip.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |rohit.deshm...@synerzip.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76930] Creating an Index produces error message
https://bugs.freedesktop.org/show_bug.cgi?id=76930 Winfried Donkers winfrieddonk...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |ASSIGNED Assignee|libreoffice-b...@lists.free |caol...@redhat.com |desktop.org | Ever confirmed|0 |1 --- Comment #25 from Winfried Donkers winfrieddonk...@libreoffice.org --- Can't properly test with daily build: 4.2.4.0.0 from April 9, 16:25 doesn't show the problem, but neither does 4.2.4.0.0 from April 8. Probably because it's a dev-build and not an installation as release(-candidate) builds. I will test again when the first 4.2.4 release candidate appears. (Meanwhile I've assigned this bug to Caolán to avoid confusing with triaging etc.) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 35064] Incorrect import of curves from PDF into Draw
https://bugs.freedesktop.org/show_bug.cgi?id=35064 --- Comment #10 from vv...@yandex.ru --- Fixed here: https://gerrit.libreoffice.org/8916 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77264] Libre Office 3.5.4.2 freezes when trying to save from ods to xlsx or xls
https://bugs.freedesktop.org/show_bug.cgi?id=77264 Foss f...@openmailbox.org changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #1 from Foss f...@openmailbox.org --- Is this bug still valid / reproducible with the latest LO release? Currently 4.2.2: http://www.libreoffice.org/download/libreoffice-fresh/ Please also try resetting your user profile and let us know if that helps: https://wiki.documentfoundation.org/UserProfile Should this be still reproducible for you with the latest LO release please set this bug back to UNCONFIRMED. Should this issue be solved set it to WORKSFORME. Setting to NEEDINFO until more detail is provided. Note that LO 3.5 extremely outdated and no longer supported. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77261] Cut / Copy / Paste buttons clutter the standard toolbar while encouraging poor practices
https://bugs.freedesktop.org/show_bug.cgi?id=77261 --- Comment #3 from Heiko Tietze heiko.tie...@user-prompt.com --- Good usability does not start with I do not use or I dislike (even if I agree with the philosophical consideration). According to user data [1] at least the copy function is used regularly. Removing all clipboard functions might confuse users because it's a quasi standard. But our results [2] confirm that standard toolbar should get a revision. [1] https://wiki.openoffice.org/wiki/Tracking_results#Impress_Usage_Data_for_Download [2] http://user-prompt.com/conclusions-of-the-libreoffice-icon-test/ -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76545] FILESAVE: LO crashes on saving, PDF exporting or opening a new document
https://bugs.freedesktop.org/show_bug.cgi?id=76545 --- Comment #4 from Zetok d...@o2.pl --- I also happened to run into this bug. Downstream (more info): https://bugs.sabayon.org/show_bug.cgi?id=4665 Summary: LO with gtk theme oxygen-gtk causes segfault when opening file dialog. Workaround: Change gtk theme to something different than oxygen-gtk. I myself haven't tested it, so confirmation would be nice. OS: Sabayon LO version: 4.2.1.1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76562] MATCH function doesn't work for large arrays
https://bugs.freedesktop.org/show_bug.cgi?id=76562 --- Comment #4 from Martijn mart...@thany.nl --- Yep, seems to be working fine now in 4.2.2 Thanks -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 58178] automatic hyphenation (last word of paragraph)
https://bugs.freedesktop.org/show_bug.cgi?id=58178 --- Comment #1 from r...@yopmail.com --- I guess it is not so difficult to fix (could anyone tell?), but it would nevertheless be a major improvement, indeed. It is time to give attention to typographic quality to make our soft stand out… -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71387] FORMATTING: Can't change page style.
https://bugs.freedesktop.org/show_bug.cgi?id=71387 --- Comment #6 from Jodie jodiematthewrobin...@gmail.com --- Hi. Sorry, I forgot about this bug. This is not a bug, but it was really confusing to figure out how it worked. I think this can be closed. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71387] FORMATTING: Can't change page style.
https://bugs.freedesktop.org/show_bug.cgi?id=71387 Jodie jodiematthewrobin...@gmail.com changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |NOTABUG -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
