LibreOffice Gerrit News for core on 2014-04-01
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + external: revert java 1.6 stuff (at least until we'd get a real check in in https://gerrit.libreoffice.org/8801 from Douglas Mencken about module build, external, reportbuilder, swext + vcl-quartz: fix build of recently introduced DrawTextSpecial for OSX10.6 in https://gerrit.libreoffice.org/8790 from Douglas Mencken about module vcl + sal: add universal aligned memory allocation with malloc in https://gerrit.libreoffice.org/8405 from Douglas Mencken about module build, sal End of freshness + fdo:43157 : clean up OSL_POSTCOND in https://gerrit.libreoffice.org/8805 from Michaël Lefèvre about module chart2, forms, include, sfx2, svx + fdo#43157 : clean up OSL_DEBUG_ONLY in https://gerrit.libreoffice.org/8804 from Michaël Lefèvre about module connectivity, include, slideshow, svx + fdo#69461 Don't show placeholder image before video starts in https://gerrit.libreoffice.org/8765 from Samuel Mehrbrodt about module slideshow + fdo#73147 add Excel2010 functions NETWORKDAYS.INTL and WORKDAY.INTL in https://gerrit.libreoffice.org/8772 from Winfried Donkers about module formula, include, sc * Merged changes on master for project core changed in the last 25 hours: + Improved coding style as shown in examples fdo#75240 in https://gerrit.libreoffice.org/8787 from Milan Zelenka + fdo#42164 Esc doesn't clear copy source overlay in panes of split/frozen in https://gerrit.libreoffice.org/8472 from Trent MacAlpine + coverity#735502 Logically dead code in https://gerrit.libreoffice.org/8789 from Caolán McNamara + fdo#74702 New abstract function UsePolyPolygonForComplexGradient() in https://gerrit.libreoffice.org/8802 from Chris Sherlock + fdo#57950 Replace chained append in htmlatr.cxx in https://gerrit.libreoffice.org/8661 from Krisztian Pinter + Presentation string for recently-added border types in https://gerrit.libreoffice.org/8781 from Luke Deller + .doc support for recently-added border line types in https://gerrit.libreoffice.org/8780 from Luke Deller + fdo#49431 PDF Import: Improve line and space detection algorithm in https://gerrit.libreoffice.org/8800 from Vort + fdo#74702 OutputDevice::ImplInitFontList() fails if no fonts on device in https://gerrit.libreoffice.org/8741 from Chris Sherlock + oox, writerfilter: add missing headers for C++ containers in https://gerrit.libreoffice.org/8796 from Douglas Mencken * Abandoned changes on master for project core changed in the last 25 hours: + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini * Open changes needing tweaks, but being untouched for more than a week: + 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
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/evoab2/NColumns.cxx |8
connectivity/source/drivers/evoab2/NColumns.hxx |2 +-
connectivity/source/drivers/evoab2/NTable.cxx |2 +-
connectivity/source/drivers/evoab2/NTables.hxx |2 +-
connectivity/source/drivers/kab/KColumns.cxx| 10 +-
connectivity/source/drivers/kab/KTable.cxx |2 +-
connectivity/source/drivers/kab/KTables.hxx |2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 1ea5e5c4a98fc7512de0fa6db60f24d50116ecb5
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 1 08:40:10 2014 +0200
loplugin:literaltoboolconversion
Change-Id: I9f0e84b63ee6e338fc273c137eb1d1470b8185dc
diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx
b/connectivity/source/drivers/evoab2/NColumns.cxx
index bb9a23c..89cec83 100644
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
@@ -65,10 +65,10 @@ sdbcx::ObjectType OEvoabColumns::createObject(const
OUString _rName)
xRow-getInt(7),
xRow-getInt(9),
xRow-getInt(5),
-sal_False,
-sal_False,
-sal_False,
-sal_True,
+false,
+false,
+false,
+true,
sCatalogName,
sSchemaName,
sTableName);
diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx
b/connectivity/source/drivers/evoab2/NColumns.hxx
index c565bdf..5a3c3f7 100644
--- a/connectivity/source/drivers/evoab2/NColumns.hxx
+++ b/connectivity/source/drivers/evoab2/NColumns.hxx
@@ -39,7 +39,7 @@ namespace connectivity
OEvoabColumns( OEvoabTable* _pTable,
::osl::Mutex _rMutex,
const TStringVector _rVector
-) :
sdbcx::OCollection(*_pTable,sal_True,_rMutex,_rVector),
+) : sdbcx::OCollection(*_pTable,true,_rMutex,_rVector),
m_pTable(_pTable)
{ }
};
diff --git a/connectivity/source/drivers/evoab2/NTable.cxx
b/connectivity/source/drivers/evoab2/NTable.cxx
index 15510ac..a4ef0117 100644
--- a/connectivity/source/drivers/evoab2/NTable.cxx
+++ b/connectivity/source/drivers/evoab2/NTable.cxx
@@ -40,7 +40,7 @@ OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables,
const OUString _Description ,
const OUString _SchemaName,
const OUString _CatalogName
-) : OEvoabTable_TYPEDEF(_pTables,sal_True,
+) : OEvoabTable_TYPEDEF(_pTables,true,
_Name,
_Type,
_Description,
diff --git a/connectivity/source/drivers/evoab2/NTables.hxx
b/connectivity/source/drivers/evoab2/NTables.hxx
index 2763f0e..98a066c 100644
--- a/connectivity/source/drivers/evoab2/NTables.hxx
+++ b/connectivity/source/drivers/evoab2/NTables.hxx
@@ -35,7 +35,7 @@ namespace connectivity
OEvoabTables(const ::com::sun::star::uno::Reference
::com::sun::star::sdbc::XDatabaseMetaData _rMetaData,
::cppu::OWeakObject _rParent, ::osl::Mutex _rMutex,
const TStringVector _rVector) :
-sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector),
+sdbcx::OCollection(_rParent,true,_rMutex,_rVector),
m_xMetaData(_rMetaData)
{}
virtual void SAL_CALL disposing(void) SAL_OVERRIDE;
diff --git a/connectivity/source/drivers/kab/KColumns.cxx
b/connectivity/source/drivers/kab/KColumns.cxx
index d3c0c8a..77c18ae 100644
--- a/connectivity/source/drivers/kab/KColumns.cxx
+++ b/connectivity/source/drivers/kab/KColumns.cxx
@@ -62,10 +62,10 @@ sdbcx::ObjectType KabColumns::createObject(const OUString
_rName)
xRow-getInt(7),
xRow-getInt(9),
xRow-getInt(5),
-sal_False,
-sal_False,
-sal_False,
-sal_True,
+false,
+false,
+false,
+true,
sCatalogName,
sSchemaName,
sTableName);
@@ -86,7 +86,7 @@ void KabColumns::impl_refresh() throw(RuntimeException)
KabColumns::KabColumns( KabTable* _pTable,
::osl::Mutex _rMutex,
const TStringVector _rVector)
-: sdbcx::OCollection(*_pTable, sal_True, _rMutex, _rVector),
+: sdbcx::OCollection(*_pTable, true, _rMutex, _rVector),
[Libreoffice-commits] core.git: 6 commits - basegfx/source cppuhelper/source stoc/source svl/source unotools/source
basegfx/source/polygon/b2dpolygon.cxx | 33
cppuhelper/source/factory.cxx | 11 -
stoc/source/namingservice/namingservice.cxx |5
svl/source/fsstor/fsstorage.cxx | 11 -
svl/source/misc/strmadpt.cxx| 11 -
unotools/source/ucbhelper/ucblockbytes.cxx |3 --
6 files changed, 74 deletions(-)
New commits:
commit ac1e33b069e0fb9136ac1e0807610adb4b2990ee
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 1 09:23:08 2014 +0200
Remove unused inline function
Change-Id: Ib1e05194fd51b914da45cbdfb75e142be5d852fe
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index 8023efb..83ea628 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -87,8 +87,6 @@ public:
bool addMark(sal_uInt32 nPosition);
bool removeMark(sal_uInt32 nPosition);
-inline sal_uInt32 getReadPosition() const;
-
SeekResult setReadPosition(sal_uInt32 nPosition);
};
@@ -123,15 +121,6 @@ inline bool SvDataPipe_Impl::isEOF() const
(!m_pReadPage || m_pReadPage-m_pRead == m_pReadPage-m_pEnd);
}
-inline sal_uInt32 SvDataPipe_Impl::getReadPosition() const
-{
-return m_pReadPage == 0 ? 0 :
- m_pReadPage-m_nOffset
- + (m_pReadPage-m_pRead
- - m_pReadPage-m_aBuffer);
-}
-
-
// SvOutputStreamOpenLockBytes
commit 43f55e39668858e110bf7f3735486bdf14025b4e
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 1 09:22:57 2014 +0200
Remove unused inline constructor
Change-Id: I1fbf53c19c55a37d4802be0828cc13bd6bba8f67
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 6a13862..d1f2f13 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -97,17 +97,6 @@ struct FSStorage_Impl
uno::Reference uno::XComponentContext m_xContext;
-FSStorage_Impl( const OUString aURL, sal_Int32 nMode, uno::Reference
uno::XComponentContext xContext )
-: m_aURL( aURL )
-, m_pContent( NULL )
-, m_nMode( nMode )
-, m_pListenersContainer( NULL )
-, m_pTypeCollection( NULL )
-, m_xContext( xContext )
-{
-OSL_ENSURE( !m_aURL.isEmpty(), The URL must not be empty );
-}
-
FSStorage_Impl( const ::ucbhelper::Content aContent, sal_Int32 nMode,
uno::Reference uno::XComponentContext xContext )
: m_aURL( aContent.getURL() )
, m_pContent( new ::ucbhelper::Content( aContent ) )
commit 82b517de560008673a204911b35aad4c7c297f14
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 1 09:22:39 2014 +0200
Remove unused inline function
Change-Id: I5601a1d6d37f5d30d50bbe22e1079d8c6acf2c4b
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx
b/unotools/source/ucbhelper/ucblockbytes.cxx
index 6585818..8193fa6 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -79,9 +79,6 @@ public:
: m_xLockBytes( pLockBytes )
{}
-SvLockBytes*getLockBytes (void)
-{ return m_xLockBytes; }
-
// XActiveDataControl.
virtual void SAL_CALL addListener ( const ReferenceXStreamListener
/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {}
virtual void SAL_CALL removeListener ( const ReferenceXStreamListener
/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {}
commit 288efb1b481abf6156d7ddaa68e4ea6d215f4875
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 1 09:22:21 2014 +0200
Remove unused inline function
Change-Id: Ieafdefb5a6981ee2f375cb9ba852de7b21688b42
diff --git a/stoc/source/namingservice/namingservice.cxx
b/stoc/source/namingservice/namingservice.cxx
index 93ab149..a4cb8f3 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -98,11 +98,6 @@ public:
throw(::com::sun::star::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
virtual Sequence OUString SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
-static Sequence OUString SAL_CALL getSupportedServiceNames_Static()
-{
-OUString aStr( SERVICENAME );
-return Sequence OUString ( aStr, 1 );
-}
virtual ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface SAL_CALL getRegisteredObject( const
OUString Name ) throw(Exception, RuntimeException, std::exception)
SAL_OVERRIDE;
virtual void SAL_CALL registerObject( const OUString Name, const
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface Object )
throw(Exception, RuntimeException, std::exception) SAL_OVERRIDE;
commit c1395fe0612aca4b1928e239a72c7faff574d8bd
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/memory.c | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit dfc2e4573157abcb70418f9c7738acda63602ddd
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sun Mar 30 02:32:16 2014 -0400
sal: add aligned memory allocation with malloc for OS X 10.6
Note that posix_memalign is not available everywhere
(as are its replacements like memalign). For example,
Darwin/OSX 10.6 has neither posix_memalign or memalign.
Incorporating changes by Stephan Bergmann sberg...@redhat.com.
Change-Id: I4a02b40c36d353c2b7a78d0bacb3b14e1f2d94da
Reviewed-on: https://gerrit.libreoffice.org/8405
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com
diff --git a/sal/osl/unx/memory.c b/sal/osl/unx/memory.c
index ca241b1..bde2fac 100644
--- a/sal/osl/unx/memory.c
+++ b/sal/osl/unx/memory.c
@@ -16,25 +16,36 @@
void* osl_aligned_alloc( sal_Size align, sal_Size size )
{
-#ifdef __ANDROID__
-return memalign(align, size);
-#else
if (size == 0)
{
return NULL;
}
else
{
+#if defined __ANDROID__
+return memalign(align, size);
+#elif defined MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_MAX_ALLOWED
1060
+void* ptr = malloc(size + (align - 1) + sizeof(void*));
+if (!ptr) return NULL;
+char* aptr = ((char*)ptr) + sizeof(void*);
+aptr += (align - ((size_t)aptr (align - 1))) (align - 1);
+((void**)aptr)[-1] = ptr;
+return aptr;
+#else
void* ptr;
int err = posix_memalign(ptr, align, size);
return err ? NULL : ptr;
-}
#endif
+}
}
void osl_aligned_free( void* p )
{
+#if defined __APPLE__ MAC_OS_X_VERSION_MAX_ALLOWED 1060
+free(((void**)p)[-1]);
+#else
free(p);
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/Executable_kdefilepicker.mk vcl/Library_vclplug_kde.mk
vcl/Executable_kdefilepicker.mk |2 -- vcl/Library_vclplug_kde.mk |2 -- 2 files changed, 4 deletions(-) New commits: commit 925aa78163cbba49e171dd0495fc652f0f8cebbb Author: Stephan Bergmann sberg...@redhat.com Date: Fri Mar 28 09:34:22 2014 +0100 Remove unnecessary(?) warnings_not_errors for vcl KDE code Change-Id: I6e342aed2832d7a6ab029889a019829a349b2dce Reviewed-on: https://gerrit.libreoffice.org/8775 Reviewed-by: Stephan Bergmann sberg...@redhat.com Tested-by: Stephan Bergmann sberg...@redhat.com diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk index 4b41b29..4bd6405 100644 --- a/vcl/Executable_kdefilepicker.mk +++ b/vcl/Executable_kdefilepicker.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Executable_add_generated_cxxobjects,kdefilepicker,\ CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc \ )) -$(eval $(call gb_Executable_set_warnings_not_errors,kdefilepicker)) - # KDE/Qt consider -Wshadow more trouble than benefit $(eval $(call gb_Executable_add_cxxflags,kdefilepicker,\ -Wno-shadow \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 40b5800..ef14fd6 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -69,8 +69,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ vcl/unx/kde/UnxNotifyThread \ )) -$(eval $(call gb_Library_set_warnings_not_errors,vclplug_kde)) - ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,vclplug_kde,\ -lm \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 -
sw/source/filter/ww8/docxattributeoutput.cxx | 12 +++-
2 files changed, 3 insertions(+), 18 deletions(-)
New commits:
commit ec221b7339f8fe5520926ef85b450daa94392780
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Apr 1 09:48:59 2014 +0200
DocxAttributeOutput: port to FillAttributes
Now that fill attributes are available in the item set of the shared
exporter, just had to adjust the WhichId of fill style / gradient fill,
and it's working again.
Change-Id: Iec7048ef77aea534a567799bfd385fcc029586b3
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 77e8370..2d96eb2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -538,8 +538,6 @@ DECLARE_OOXMLEXPORT_TEST(testTextFrameBorders,
textframe-borders.docx)
}
#endif
-#if 0
-// FIXME port to FillAttributes
DECLARE_OOXMLEXPORT_TEST(testTextframeGradient, textframe-gradient.docx)
{
uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
@@ -565,7 +563,6 @@ DECLARE_OOXMLEXPORT_TEST(testTextframeGradient,
textframe-gradient.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(318), getPropertysal_Int32(xFrame,
LeftMargin));
CPPUNIT_ASSERT_EQUAL(sal_Int32(318), getPropertysal_Int32(xFrame,
RightMargin));
}
-#endif
DECLARE_OOXMLEXPORT_TEST(testCellBtlr, cell-btlr.docx)
{
@@ -1717,8 +1714,6 @@ DECLARE_OOXMLEXPORT_TEST(testHyperlineIsEnd,
hyperlink.docx)
assertXPath(pXmlDoc, /w:document/w:body/w:p/w:hyperlink,1);
}
-#if 0
-// FIXME port to FillAttributes
DECLARE_OOXMLEXPORT_TEST(testTextBoxGradientAngle, fdo65295.docx)
{
uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
@@ -1773,7 +1768,6 @@ DECLARE_OOXMLEXPORT_TEST(testTextBoxGradientAngle,
fdo65295.docx)
awt::Gradient aGradient8 = getPropertyawt::Gradient(xFrame8,
FillGradient);
CPPUNIT_ASSERT_EQUAL(sal_Int16( 45 * 10), aGradient8.Angle);
}
-#endif
DECLARE_OOXMLEXPORT_TEST(testCellGridSpan, cell-grid-span.docx)
{
@@ -2126,15 +2120,12 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69649, fdo69649.docx)
assertXPathContent(pXmlDoc,
/w:document/w:body/w:p[21]/w:hyperlink/w:r[5]/w:t, 15);
}
-#if 0
-// FIXME port to FillAttributes
DECLARE_OOXMLEXPORT_TEST(testTextBoxPictureFill, textbox_picturefill.docx)
{
uno::Referencebeans::XPropertySet xFrame(getShape(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP,
getPropertydrawing::FillStyle(xFrame, FillStyle));
CPPUNIT_ASSERT(!(getPropertyOUString(xFrame,BackGraphicURL)).isEmpty());
}
-#endif
DECLARE_OOXMLEXPORT_TEST(testFDO73034, FDO73034.docx)
{
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 15874e3..6e71a6d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6497,9 +6497,7 @@ void DocxAttributeOutput::FormatBackground( const
SvxBrushItem rBrush )
else if (m_rExport.SdrExporter().getDMLTextFrameSyntax())
{
bool bImageBackground = false;
-#if 0
-// FIXME port to FillAttributes
-const SfxPoolItem* pItem = GetExport().HasItem(RES_FILL_STYLE);
+const SfxPoolItem* pItem = GetExport().HasItem(XATTR_FILLSTYLE);
if (pItem)
{
const XFillStyleItem* pFillStyle = static_castconst
XFillStyleItem*(pItem);
@@ -6508,7 +6506,6 @@ void DocxAttributeOutput::FormatBackground( const
SvxBrushItem rBrush )
bImageBackground = true;
}
}
-#endif
if (!bImageBackground)
{
m_pSerializer-startElementNS(XML_a, XML_solidFill, FSEND);
@@ -6614,9 +6611,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem
rBox )
if (m_rExport.SdrExporter().getDMLTextFrameSyntax())
{
// a:gradFill should be before a:ln.
-#if 0
-// FIXME port to FillAttributes
-const SfxPoolItem* pItem = GetExport().HasItem(RES_FILL_STYLE);
+const SfxPoolItem* pItem = GetExport().HasItem(XATTR_FILLSTYLE);
if (pItem)
{
const XFillStyleItem* pFillStyle = static_castconst
XFillStyleItem*(pItem);
@@ -6634,13 +6629,12 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem
rBox )
}
}
-pItem = GetExport().HasItem(RES_FILL_GRADIENT);
+pItem = GetExport().HasItem(XATTR_FILLGRADIENT);
if (pItem)
{
const XFillGradientItem* pFillGradient = static_castconst
XFillGradientItem*(pItem);
FormatFillGradient(*pFillGradient);
}
-#endif
m_bIgnoreNextFill = true;
}
if (m_rExport.SdrExporter().getTextFrameSyntax() ||
m_rExport.SdrExporter().getDMLTextFrameSyntax())
___
Libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salbmp.cxx |8
1 file changed, 8 deletions(-)
New commits:
commit 994da4b9738dafdc0654a439a40adfe4c02a507d
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 1 11:18:16 2014 +0300
Simplify
Change-Id: I9857afc5dd6652fc28be00bea81ad213712b3dc5
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 8003356..e0a57d3 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -207,11 +207,7 @@ bool QuartzSalBitmap::CreateContext()
AllocateUserData();
// default to RGBA color space
-#ifdef IOS
-CGColorSpaceRef aCGColorSpace = CGColorSpaceCreateDeviceRGB();
-#else
CGColorSpaceRef aCGColorSpace = GetSalData()-mxRGBSpace;
-#endif
CGBitmapInfo aCGBmpInfo = kCGImageAlphaNoneSkipFirst;
// convert data into something accepted by CGBitmapContextCreate()
@@ -226,11 +222,7 @@ bool QuartzSalBitmap::CreateContext()
{
// no conversion needed for grayscale
maContextBuffer = maUserBuffer;
-#ifdef IOS
-aCGColorSpace = CGColorSpaceCreateDeviceGray();
-#else
aCGColorSpace = GetSalData()-mxGraySpace;
-#endif
aCGBmpInfo = kCGImageAlphaNone;
bitsPerComponent = mnBits;
}
___
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' - 61/efddf5ab8cd318e022ca1ac817ba0879a55e23
61/efddf5ab8cd318e022ca1ac817ba0879a55e23 |1 + 1 file changed, 1 insertion(+) New commits: commit e1e4d652c6aa8a0f69e6d50a37d29a36ed159224 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 1 09:29:30 2014 +0100 Notes added by 'git notes add' diff --git a/61/efddf5ab8cd318e022ca1ac817ba0879a55e23 b/61/efddf5ab8cd318e022ca1ac817ba0879a55e23 new file mode 100644 index 000..b04a57b --- /dev/null +++ b/61/efddf5ab8cd318e022ca1ac817ba0879a55e23 @@ -0,0 +1 @@ +merged as: cc1a7748c867716966b6a38e75f89df5d92ee104 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/dibtools.cxx | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit cc1a7748c867716966b6a38e75f89df5d92ee104
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Mon Mar 31 14:37:21 2014 +
Resolves: #i124555# restore stream position after Seek to end of stream
(cherry picked from commit 61efddf5ab8cd318e022ca1ac817ba0879a55e23)
Conflicts:
vcl/source/gdi/dibtools.cxx
Change-Id: Ie6c0aeab5988b68954a0bdd460317ac9539d8a5f
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 1ffdcd9..5d71a46 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -766,17 +766,18 @@ bool ImplReadDIBBody( SvStream rIStm, Bitmap rBmp,
Bitmap* pBmpAlpha, sal_uLon
bool ImplReadDIBFileHeader( SvStream rIStm, sal_uLong rOffset )
{
-sal_uInt32 nTmp32;
-sal_uInt16 nTmp16 = 0;
-boolbRet = false;
+bool bRet = false;
-const sal_uLong nStreamLength (rIStm.Seek(STREAM_SEEK_TO_END));
-rIStm.Seek(STREAM_SEEK_TO_BEGIN);
+const sal_uInt64 nSavedStreamPos( rIStm.Tell() );
+const sal_uInt64 nStreamLength( rIStm.Seek( STREAM_SEEK_TO_END ) );
+rIStm.Seek( nSavedStreamPos );
+sal_uInt16 nTmp16 = 0;
rIStm.ReadUInt16( nTmp16 );
if ( ( 0x4D42 == nTmp16 ) || ( 0x4142 == nTmp16 ) )
{
+sal_uInt32 nTmp32(0);
if ( 0x4142 == nTmp16 )
{
rIStm.SeekRel( 12L );
@@ -794,7 +795,7 @@ bool ImplReadDIBFileHeader( SvStream rIStm, sal_uLong
rOffset )
bRet = ( rIStm.GetError() == 0UL );
}
-if (rOffset = nStreamLength)
+if ( rOffset = nStreamLength )
{
// Offset claims that image starts past the end of the
// stream. Unlikely.
___
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' - be/3e9eb3656451b3091f45011f33d701f13b3c13
be/3e9eb3656451b3091f45011f33d701f13b3c13 |1 + 1 file changed, 1 insertion(+) New commits: commit d259cf310b22f02d93c62b584c7c3cdb8774ff69 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 1 09:30:23 2014 +0100 Notes added by 'git notes add' diff --git a/be/3e9eb3656451b3091f45011f33d701f13b3c13 b/be/3e9eb3656451b3091f45011f33d701f13b3c13 new file mode 100644 index 000..07927b6 --- /dev/null +++ b/be/3e9eb3656451b3091f45011f33d701f13b3c13 @@ -0,0 +1 @@ +prefer: daac7e3828e97d325e11b165a04b58ff4f96b131 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source
vcl/source/gdi/dibtools.cxx | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 172c33146d7e8b4f741d52ab7c9dfdb55c847401
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Mon Mar 31 14:37:21 2014 +
Resolves: #i124555# restore stream position after Seek to end of stream
(cherry picked from commit 61efddf5ab8cd318e022ca1ac817ba0879a55e23)
Conflicts:
vcl/source/gdi/dibtools.cxx
(cherry picked from commit cc1a7748c867716966b6a38e75f89df5d92ee104)
Conflicts:
vcl/source/gdi/dibtools.cxx
Change-Id: Ie6c0aeab5988b68954a0bdd460317ac9539d8a5f
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index dac2c8c..2759c20 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -781,17 +781,18 @@ bool ImplReadDIBBody( SvStream rIStm, Bitmap rBmp,
Bitmap* pBmpAlpha, sal_uLon
bool ImplReadDIBFileHeader( SvStream rIStm, sal_uLong rOffset )
{
-sal_uInt32 nTmp32;
-sal_uInt16 nTmp16 = 0;
-boolbRet = false;
+bool bRet = false;
-const sal_uLong nStreamLength (rIStm.Seek(STREAM_SEEK_TO_END));
-rIStm.Seek(STREAM_SEEK_TO_BEGIN);
+const sal_Size nSavedStreamPos( rIStm.Tell() );
+const sal_Size nStreamLength( rIStm.Seek( STREAM_SEEK_TO_END ) );
+rIStm.Seek( nSavedStreamPos );
+sal_uInt16 nTmp16 = 0;
rIStm nTmp16;
if ( ( 0x4D42 == nTmp16 ) || ( 0x4142 == nTmp16 ) )
{
+sal_uInt32 nTmp32(0);
if ( 0x4142 == nTmp16 )
{
rIStm.SeekRel( 12L );
@@ -809,7 +810,7 @@ bool ImplReadDIBFileHeader( SvStream rIStm, sal_uLong
rOffset )
bRet = ( rIStm.GetError() == 0UL );
}
-if (rOffset = nStreamLength)
+if ( rOffset = nStreamLength )
{
// Offset claims that image starts past the end of the
// stream. Unlikely.
___
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' - 54/f27df803da7f9b0d7de9dc027dc89bc20ad560
54/f27df803da7f9b0d7de9dc027dc89bc20ad560 |1 + 1 file changed, 1 insertion(+) New commits: commit c4156d8ff9487eb83a04252f40a0b4a4efccf9c1 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 1 09:33:16 2014 +0100 Notes added by 'git notes add' diff --git a/54/f27df803da7f9b0d7de9dc027dc89bc20ad560 b/54/f27df803da7f9b0d7de9dc027dc89bc20ad560 new file mode 100644 index 000..3f16355 --- /dev/null +++ b/54/f27df803da7f9b0d7de9dc027dc89bc20ad560 @@ -0,0 +1 @@ +prefer: 78fde59e65bf1fbf8290e60b8cbe4b34e3489b93 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ship Maven meta information to ease creation of LO plugins with Maven
On 03/31/2014 09:46 PM, Sebastian Humenda wrote: to build software with Maven, you have to provide meta information (a pom.xml) to each jar, which is a dependency of your software. In turn, the build system Maven with automatically figure out which jar to fetch from where and in which version. To simplify the creation of Java dependencies for LO and to ease also the packaging of LO extension in Debian/Ubuntu, it would be of much help, if you could ship those pom.xml for this use case with the source. This meta information is easy and quick to generate and the only maintenance overhead is the version number increase at each LO release. You don't need to also use Maven for building LO, you just have to ship one pom.xml for one jar file. The LO jars generally need to be located at specific places within a LO installation tree. I am not sure that is compatible with the Maven concepts. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - vcl/quartz
vcl/quartz/salgdicommon.cxx |8 1 file changed, 8 insertions(+) New commits: commit e93a84d4857af442122d54c4d4857fa90d9f22f9 Author: Tor Lillqvist t...@collabora.com Date: Tue Apr 1 11:55:47 2014 +0300 Add two more CG_TRACEs Change-Id: Ib1ab15a0daa9e8cc1f48e6ff1b212b463fcb0004 diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 58fcc7f..7b5800d 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -1615,7 +1615,9 @@ void AquaSalGraphics::SetState() } // set RGB colorspace and line and fill colors +CG_TRACE( CGContextSetFillColor( mrContext , maFillColor ) ); CGContextSetFillColor( mrContext, maFillColor.AsArray() ); +CG_TRACE( CGContextSetStrokeColor( mrContext , maLineColor ) ); CGContextSetStrokeColor( mrContext, maLineColor.AsArray() ); CGContextSetShouldAntialias( mrContext, false ); if( mnXorMode == 2 ) commit 3972a2fecc63d2d01aa902359b02ef9929d51f62 Author: Tor Lillqvist t...@collabora.com Date: Tue Apr 1 11:54:26 2014 +0300 Stopgap fix to avoid using a null CGContext Change-Id: I445f09dd842b62e5153c53bb5af066af71d492bd diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index f0b9979..58fcc7f 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -308,6 +308,12 @@ void AquaSalGraphics::copyBits( const SalTwoRect rPosAry, SalGraphics *pSrcGrap return; } +#ifdef IOS +// If called from idle layout, mrContext is NULL, no idea what to do +if (!mrContext) +return; +#endif + // accelerate trivial operations /*const*/ AquaSalGraphics* pSrc = static_castAquaSalGraphics*(pSrcGraphics); const bool bSameGraphics = (this == pSrc) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/fixedhyper.hxx|8
vcl/source/control/fixedhyper.cxx | 29 ++---
2 files changed, 30 insertions(+), 7 deletions(-)
New commits:
commit 7c860af19bd8e0cf22a13e3987ec87555ebb5824
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Apr 1 10:56:31 2014 +0200
vcl: FixedHyper - take into account text alignment
Change-Id: Icc9b4d73cd2e4945299cbaaa1b55eebc3e1e3922
diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx
index 1b8fcd5..a2bc891 100644
--- a/include/vcl/fixedhyper.hxx
+++ b/include/vcl/fixedhyper.hxx
@@ -23,10 +23,7 @@
#include vcl/dllapi.h
#include vcl/fixed.hxx
-
-//= FixedHyperlink
-
-class VCL_DLLPUBLIC FixedHyperlink : public FixedText
+class VCL_DLLPUBLIC FixedHyperlink : public FixedText
{
private:
longm_nTextLen;
@@ -40,6 +37,9 @@
*/
voidInitialize();
+/** is position X positon hitting text */
+SAL_DLLPRIVATE bool ImplIsOverText(Point rPosition);
+
protected:
/** overwrites Window::MouseMove().
diff --git a/vcl/source/control/fixedhyper.cxx
b/vcl/source/control/fixedhyper.cxx
index 36d055b..6208374 100644
--- a/vcl/source/control/fixedhyper.cxx
+++ b/vcl/source/control/fixedhyper.cxx
@@ -52,10 +52,33 @@ void FixedHyperlink::Initialize()
m_nTextLen = GetCtrlTextWidth( GetText() );
}
+bool FixedHyperlink::ImplIsOverText(Point aPosition)
+{
+Size aSize = GetOutputSizePixel();
+
+bool bIsOver = false;
+
+if (GetStyle() WB_RIGHT)
+{
+return aPosition.X() (aSize.Width() - m_nTextLen);
+}
+else if (GetStyle() WB_CENTER)
+{
+bIsOver = aPosition.X() (aSize.Width() / 2 - m_nTextLen / 2)
+ aPosition.X() (aSize.Width() / 2 + m_nTextLen / 2);
+}
+else
+{
+bIsOver = aPosition.X() m_nTextLen;
+}
+
+return bIsOver;
+}
+
void FixedHyperlink::MouseMove( const MouseEvent rMEvt )
{
// changes the pointer if the control is enabled and the mouse is over the
text.
-if ( !rMEvt.IsLeaveWindow() IsEnabled() GetPointerPosPixel().X()
m_nTextLen )
+if ( !rMEvt.IsLeaveWindow() IsEnabled()
ImplIsOverText(GetPointerPosPixel()) )
SetPointer( POINTER_REFHAND );
else
SetPointer( m_aOldPointer );
@@ -64,13 +87,13 @@ void FixedHyperlink::MouseMove( const MouseEvent rMEvt )
void FixedHyperlink::MouseButtonUp( const MouseEvent )
{
// calls the link if the control is enabled and the mouse is over the text.
-if ( IsEnabled() GetPointerPosPixel().X() m_nTextLen )
+if ( IsEnabled() ImplIsOverText(GetPointerPosPixel()) )
ImplCallEventListenersAndHandler( VCLEVENT_BUTTON_CLICK, m_aClickHdl,
this );
}
void FixedHyperlink::RequestHelp( const HelpEvent rHEvt )
{
-if ( IsEnabled() GetPointerPosPixel().X() m_nTextLen )
+if ( IsEnabled() ImplIsOverText(GetPointerPosPixel()) )
FixedText::RequestHelp( rHEvt );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ship Maven meta information to ease creation of LO plugins with Maven
Hi Sebastian, May be this maven plugin for building LO extensions could interest you: https://github.com/cbosdo/maven-ooo-plugin I didn't touch this code since ages, but if it can help you, feel free to patch it ;) -- Cedric On Mon, 2014-03-31 at 21:46 +0200, Sebastian Humenda wrote: Hi, to build software with Maven, you have to provide meta information (a pom.xml) to each jar, which is a dependency of your software. In turn, the build system Maven with automatically figure out which jar to fetch from where and in which version. To simplify the creation of Java dependencies for LO and to ease also the packaging of LO extension in Debian/Ubuntu, it would be of much help, if you could ship those pom.xml for this use case with the source. This meta information is easy and quick to generate and the only maintenance overhead is the version number increase at each LO release. You don't need to also use Maven for building LO, you just have to ship one pom.xml for one jar file. Not only Debian/Ubuntu would benefit from this little adjustment, also other projects could use the provided meta information. It would be of course even greater to have the shipped jar files together with the meta information in a online repository, whereas this is not as important as the first issue. Such a repository existed for OpenOffice before they moved to Apache (see http://mvnrepository.com/artifact/org.openoffice). Thanks! Sebastian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac postprocess/Rdb_services.mk RepositoryExternal.mk Repository.mk sccomp/Library_coinmpsolver.mk sccomp/Library_solver.mk sccom
Repository.mk |3 RepositoryExternal.mk |8 +- config_host.mk.in |3 configure.ac| 95 +--- postprocess/Rdb_services.mk |5 + sccomp/Library_coinmpsolver.mk | 34 ++ sccomp/Library_solver.mk| 10 -- sccomp/Module_sccomp.mk |9 -- sccomp/source/solver/coinmpsolver.component | 15 sccomp/source/solver/solver.cxx |6 - sccomp/source/solver/solver.hrc |1 sccomp/source/solver/solver.src |5 + scp2/InstallModule_calc.mk |2 13 files changed, 122 insertions(+), 74 deletions(-) New commits: commit de7cdbc5840fd7d958d486901e405890eff224b9 Author: Matúš Kukan matus.ku...@collabora.com Date: Mon Mar 31 19:18:41 2014 +0200 Install coinmp and lpsolve linear solvers in parallel. Change-Id: If07d94a2f646c8377b76fdf645e85f9491e4f061 diff --git a/Repository.mk b/Repository.mk index f30540e..b0a9193 100644 --- a/Repository.mk +++ b/Repository.mk @@ -150,14 +150,15 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \ analysis \ calc \ + $(if $(ENABLE_COINMP),coinmpsolver) \ date \ pricing \ sc \ scd \ scfilt \ scui \ - $(if $(MPL_SUBSET),,$(if $(ENABLE_LPSOLVE),solver)) \ $(if $(ENABLE_OPENCL),scopencl) \ + $(if $(ENABLE_LPSOLVE),solver) \ $(if $(DISABLE_SCRIPTING),,vbaobj) \ $(if $(ENABLE_TELEPATHY),tubes) \ )) diff --git a/config_host.mk.in b/config_host.mk.in index 43d403f..bcb4e97 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -108,6 +108,7 @@ export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@ export ENABLE_AVAHI=@ENABLE_AVAHI@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@ export ENABLE_CMIS=@ENABLE_CMIS@ +export ENABLE_COINMP=@ENABLE_COINMP@ export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@ export ENABLE_CUPS=@ENABLE_CUPS@ export ENABLE_CURL=@ENABLE_CURL@ diff --git a/configure.ac b/configure.ac index f039f1b..3bd4575 100644 --- a/configure.ac +++ b/configure.ac @@ -654,6 +654,7 @@ linux-android*) enable_lotuswordpro=no enable_mpl_subset=yes enable_opengl=no +enable_coinmp=no enable_lpsolve=no enable_report_builder=no with_theme=tango @@ -7323,6 +7324,7 @@ if test $_os = iOS; then enable_mpl_subset=yes enable_opengl=no enable_lotuswordpro=no +enable_coinmp=no enable_lpsolve=no enable_postgresql_sdbc=no enable_lotuswordpro=no @@ -9408,8 +9410,17 @@ dnl === dnl How should we build the linear programming solver ? dnl === -# Should we check for system CoinMP ? How to do that ? -BUILD_TYPE=$BUILD_TYPE COINMP +ENABLE_COINMP= +AC_MSG_CHECKING([whether to build with CoinMP]) +if test $enable_coinmp != no; then +ENABLE_COINMP=TRUE +AC_MSG_RESULT([yes]) +# Should we check for system CoinMP ? How to do that ? +BUILD_TYPE=$BUILD_TYPE COINMP +else +AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_COINMP) ENABLE_LPSOLVE= AC_MSG_CHECKING([whether to build with lpsolve]) diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 8c56370..83ce7dc 100755 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -109,6 +109,9 @@ $(eval $(call gb_Rdb_add_components,services,\ xmlscript/util/xmlscript \ xmlsecurity/util/xmlsecurity \ xmlsecurity/util/xsec_fw \ + $(if $(ENABLE_COINMP), \ + sccomp/source/solver/coinmpsolver \ + ) \ $(if $(ENABLE_LPSOLVE), \ sccomp/source/solver/solver \ ) \ diff --git a/sccomp/Library_coinmpsolver.mk b/sccomp/Library_coinmpsolver.mk new file mode 100644 index 000..849ce0f --- /dev/null +++ b/sccomp/Library_coinmpsolver.mk @@ -0,0 +1,34 @@ +# -*- 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_Library_Library,coinmpsolver)) + +$(eval $(call gb_Library_set_componentfile,coinmpsolver,sccomp/source/solver/coinmpsolver)) + +$(eval $(call gb_Library_use_sdk_api,coinmpsolver)) + +$(eval $(call gb_Library_use_libraries,coinmpsolver,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + tl \ + i18nlangtag \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_externals,coinmpsolver,\ + boost_headers \ + coinmp \ +)) +
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |3 ---
sw/source/core/unocore/unoframe.cxx | 12 ++--
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 5ce92b73ce06c805c66e53c48aa2c70c722aaf60
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Apr 1 10:56:48 2014 +0200
SwXTextFrame: restore semi-lost BackColor property
In the past in case FillStyle was set, BackColor wasn't ignored, now it
is, since 6e61ecd09679a66060f932835622821d39e92f01 (Merge back branch
alg_writerframes to trunk, 2014-03-19).
The intention there was that in case FillStyle is set, FillColor will be
used: so to keep both new users and old filters happy, just restore
handling of BackColor in case FillStyle is set, but not FillColor.
Change-Id: Ie034a959e72e48b617cf598af8f7afd030bb50c4
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 4619fb7..da5472d 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1678,8 +1678,6 @@ DECLARE_OOXMLIMPORT_TEST(testMceWpg, mce-wpg.docx)
getParagraphOfText(1, xText, DML1);
}
-#if 0
-// FIXME port to FillAttributes
DECLARE_OOXMLIMPORT_TEST(testMceNested, mce-nested.docx)
{
// Vertical position of the textbox was incorrect due to incorrect nested
mce handling.
@@ -1704,7 +1702,6 @@ DECLARE_OOXMLIMPORT_TEST(testMceNested, mce-nested.docx)
CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD,
getPropertyfloat(getRun(xParagraph, 1), CharWeight));
CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM,
getPropertydrawing::TextVerticalAdjust(xGroup-getByIndex(1),
TextVerticalAdjust));
}
-#endif
DECLARE_OOXMLIMPORT_TEST(testMissingPath, missing-path.docx)
{
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index b77266a..8258f86 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -332,10 +332,10 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet rToSet, const SfxI
if(bXFillStyleItemUsed)
{
+XFillStyleItem aXFillStyleItem;
+
if(pXFillStyleItem)
{
-XFillStyleItem aXFillStyleItem;
-
aXFillStyleItem.PutValue(*pXFillStyleItem);
rToSet.Put(aXFillStyleItem);
}
@@ -348,6 +348,14 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet rToSet, const SfxI
aXFillColorItem.PutValue(*pXFillColorItem);
rToSet.Put(aXFillColorItem);
}
+else if (aXFillStyleItem.GetValue() == XFILL_SOLID pCol)
+{
+// Fill style set to solid, but no fill color is given.
+// On the other hand, we have a BackColor, so use that.
+SvxBrushItem aBrush(RES_BACKGROUND);
+aBrush.PutValue(*pCol, MID_BACK_COLOR);
+sw::setSvxBrushItemAsFillAttributesToTargetSet(aBrush, rToSet);
+}
if(pXFillGradientItem || pXFillGradientNameItem)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - cui/source fpicker/source include/tools sc/source sfx2/source svtools/source sw/source tools/source
cui/source/dialogs/linkdlg.cxx |4 -
fpicker/source/office/iodlg.cxx |4 -
include/tools/urlobj.hxx| 16
sc/source/core/tool/compiler.cxx|4 -
sc/source/ui/view/gridwin5.cxx |2
sc/source/ui/view/tabvwsh3.cxx |2
sfx2/source/appl/macroloader.cxx|6 -
sfx2/source/doc/objmisc.cxx |2
sfx2/source/notify/eventsupplier.cxx|2
svtools/source/control/inettbc.cxx |1
svtools/source/misc/imagemgr.cxx|8 +-
sw/source/core/doc/docdde.cxx |2
sw/source/core/doc/tblafmt.cxx |2
sw/source/core/doc/visiturl.cxx |2
sw/source/core/text/EnhancedPDFExportHelper.cxx |2
sw/source/core/uibase/config/uinums.cxx |4 -
sw/source/core/uibase/dbui/dbmgr.cxx|2
sw/source/core/uibase/misc/glosdoc.cxx |2
sw/source/core/uibase/shells/grfsh.cxx |2
sw/source/core/uibase/uiview/view2.cxx |2
sw/source/core/uibase/uno/unomailmerge.cxx |2
sw/source/core/uibase/utlui/content.cxx |6 -
sw/source/core/uibase/utlui/gloslst.cxx |2
sw/source/filter/html/htmlgrin.cxx |2
sw/source/filter/ww8/wrtw8nds.cxx |2
sw/source/filter/ww8/wrtww8.cxx |2
sw/source/filter/ww8/ww8par5.cxx|4 -
sw/source/ui/chrdlg/chardlg.cxx |2
sw/source/ui/dialog/uiregionsw.cxx |6 -
sw/source/ui/envelp/mailmrge.cxx|5 -
sw/source/ui/frmdlg/frmpage.cxx |4 -
sw/source/ui/index/cnttab.cxx |2
sw/source/ui/misc/glosbib.cxx |2
sw/source/ui/misc/glossary.cxx |2
tools/source/fsys/urlobj.cxx| 94 ++--
35 files changed, 59 insertions(+), 149 deletions(-)
New commits:
commit 856c749963b04604a52235a96b5af183fdf5125d
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 1 10:51:15 2014 +0300
Kill FSYS_MAC which is for ancient non-OS X Mac
Change-Id: I51e91b97217507bcdca8c82f8a8683758d871185
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 53027c8..ace1d76 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -251,10 +251,6 @@ public:
*/
FSYS_DOS = 0x4,
-/** Mac notation (e.g., dir:file).
- */
-FSYS_MAC = 0x8,
-
/** Detect the used notation.
@descr For the following descriptions, please note that
@@ -300,11 +296,10 @@ public:
becomes
file:/// *UCS4
replacing the delimiter by / within *UCS4. The delimiter is
- that character from the set { /, \, : } which appears most
+ that character from the set { /, \ } which appears most
often in *UCS4 (if FSYS_UNX is not among the style bits, /
is removed from the set; if FSYS_DOS is not among the style
- bits, \ is removed from the set; if FSYS_MAC is not among the
- style bits, : is removed from the set). If two or more
+ bits, \ is removed from the set). If two or more
characters appear the same number of times, the character
mentioned first in that set is chosen. If the first character
of *UCS4 is the delimiter, that character is not copied.
@@ -843,7 +838,7 @@ public:
@param pDelimiter Upon successful return, this parameter can return
the character that is the 'main' delimiter within the returned file
-system path (e.g., / for Unix, \ for DOS, : for Mac). This is
+system path (e.g., / for Unix, \ for DOS). This is
especially useful for routines that later try to shorten the returned
file system path at a 'good' position, e.g. to fit it into some
limited display space.
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index 6fe2ea3..8189d72 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -526,7 +526,6 @@ OUString SvtURLBox::ParseSmart( const OUString _aText,
const OUString _aBaseUR
// take base URL and append current input
bool bWasAbsolute = false;
#ifdef UNX
-// don't support FSYS_MAC under Unix, because here ':' is a valid
character for a filename
INetURLObject::FSysStyle eStyle = static_cast
INetURLObject::FSysStyle ( INetURLObject::FSYS_VOS | INetURLObject::FSYS_UNX |
INetURLObject::FSYS_DOS );
// encode file URL correctly
aSmart = INetURLObject::encode( aSmart, INetURLObject::PART_FPATH,
'%', INetURLObject::ENCODE_ALL );
diff
Re: ship Maven meta information to ease creation of LO plugins with Maven
Hi, On Tue, Apr 01, 2014 at 10:53:22AM +0200, Stephan Bergmann wrote: On 03/31/2014 09:46 PM, Sebastian Humenda wrote: to build software with Maven, you have to provide meta information (a pom.xml) to each jar, which is a dependency of your software. In turn, the build system Maven with automatically figure out which jar to fetch from where and in which version. To simplify the creation of Java dependencies for LO and to ease also the packaging of LO extension in Debian/Ubuntu, it would be of much help, if you could ship those pom.xml for this use case with the source. This meta information is easy and quick to generate and the only maintenance overhead is the version number increase at each LO release. You don't need to also use Maven for building LO, you just have to ship one pom.xml for one jar file. The LO jars generally need to be located at specific places within a LO installation tree. I am not sure that is compatible with the Maven concepts. isnt this what Rene already implemented for Debian (and thus Ubuntu) with: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git;a=commit;h=1c130152fdb881db51543513ddafb212ff5c6df2 So do you want that to be upstreamed? Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sccomp/source
sccomp/source/solver/solver-lpsolve.cxx |2 -
sccomp/source/solver/solver.cxx | 49 +++-
2 files changed, 24 insertions(+), 27 deletions(-)
New commits:
commit 530ea91927db14f10b78453accc51e1add7d990b
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Mar 27 09:12:06 2014 +0100
sccomp: Make the source files more similar and fix some problems.
Change-Id: I1e3c8aac52e9d2677937e08aac08db4ace5cb2b8
diff --git a/sccomp/source/solver/solver-lpsolve.cxx
b/sccomp/source/solver/solver-lpsolve.cxx
index 9bcf6e5..0c8e811 100644
--- a/sccomp/source/solver/solver-lpsolve.cxx
+++ b/sccomp/source/solver/solver-lpsolve.cxx
@@ -578,7 +578,7 @@ uno::Sequence OUString
SolverComponent_getSupportedServiceNames()
OUString SolverComponent_getImplementationName()
{
-return OUString(com.sun.star.comp.Calc.Solver );
+return OUString(com.sun.star.comp.Calc.Solver);
}
OUString SAL_CALL SolverComponent::getImplementationName()
throw(uno::RuntimeException, std::exception)
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index 5ea871e..76ac1af 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -37,13 +37,12 @@
#include cppuhelper/factory.hxx
#include cppuhelper/supportsservice.hxx
#include vector
-#include unordered_map
+#include boost/unordered_map.hpp
#include tools/resmgr.hxx
using namespace com::sun::star;
-#define C2U(constAsciiStr) (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
constAsciiStr ) ))
#define STR_NONNEGATIVE NonNegative
#define STR_INTEGER Integer
@@ -51,20 +50,20 @@ using namespace com::sun::star;
#define STR_EPSILONLEVEL EpsilonLevel
#define STR_LIMITBBDEPTH LimitBBDepth
-// ---
+
// Resources from tools are used for translated strings
static ResMgr* pSolverResMgr = NULL;
-OUString lcl_GetResourceString( sal_uInt32 nId )
+static OUString lcl_GetResourceString( sal_uInt32 nId )
{
if (!pSolverResMgr)
-pSolverResMgr = ResMgr::CreateResMgr( solver );
+pSolverResMgr = ResMgr::CreateResMgr(solver);
-return ResId( nId, *pSolverResMgr );
+return ResId(nId, *pSolverResMgr).toString();
}
-// ---
+
namespace
{
@@ -78,7 +77,7 @@ namespace
};
}
-// ---
+
// hash map for the coefficients of a dependent cell (objective or constraint)
// The size of each vector is the number of columns (variable cells) plus one,
first entry is initial value.
@@ -104,11 +103,11 @@ struct ScSolverCellEqual
}
};
-typedef std::unordered_map table::CellAddress, std::vectordouble,
ScSolverCellHash, ScSolverCellEqual ScSolverCellHashMap;
+typedef boost::unordered_map table::CellAddress, std::vectordouble,
ScSolverCellHash, ScSolverCellEqual ScSolverCellHashMap;
-// ---
-uno::Referencetable::XCell lcl_GetCell( const
uno::Referencesheet::XSpreadsheetDocument xDoc,
+
+static uno::Referencetable::XCell lcl_GetCell( const
uno::Referencesheet::XSpreadsheetDocument xDoc,
const table::CellAddress rPos )
{
uno::Referencecontainer::XIndexAccess xSheets( xDoc-getSheets(),
uno::UNO_QUERY );
@@ -116,19 +115,19 @@ uno::Referencetable::XCell lcl_GetCell( const
uno::Referencesheet::XSpreadshe
return xSheet-getCellByPosition( rPos.Column, rPos.Row );
}
-void lcl_SetValue( const uno::Referencesheet::XSpreadsheetDocument xDoc,
+static void lcl_SetValue( const uno::Referencesheet::XSpreadsheetDocument
xDoc,
const table::CellAddress rPos, double fValue )
{
lcl_GetCell( xDoc, rPos )-setValue( fValue );
}
-double lcl_GetValue( const uno::Referencesheet::XSpreadsheetDocument xDoc,
+static double lcl_GetValue( const uno::Referencesheet::XSpreadsheetDocument
xDoc,
const table::CellAddress rPos )
{
return lcl_GetCell( xDoc, rPos )-getValue();
}
-// -
+
SolverComponent::SolverComponent( const
uno::Referenceuno::XComponentContext /* rSMgr */ ) :
OPropertyContainer( GetBroadcastHelper() ),
@@ -142,11 +141,11 @@ SolverComponent::SolverComponent( const
uno::Referenceuno::XComponentContext
mfResultValue( 0.0 )
{
// for XPropertySet implementation:
-registerProperty( C2U(STR_NONNEGATIVE), PROP_NONNEGATIVE, 0,
mbNonNegative, getCppuType( mbNonNegative ) );
-registerProperty( C2U(STR_INTEGER), PROP_INTEGER, 0, mbInteger,
getCppuType( mbInteger ) );
-registerProperty( C2U(STR_TIMEOUT), PROP_TIMEOUT, 0, mnTimeout,
getCppuType( mnTimeout ) );
-registerProperty( C2U(STR_EPSILONLEVEL),
[Libreoffice-commits] core.git: 31 commits - basegfx/source canvas/source framework/source i18npool/source include/framework include/svl include/tools include/vcl include/xmloff rsc/source sd/source s
basegfx/source/polygon/b2dpolypolygontools.cxx|2
canvas/source/cairo/cairo_devicehelper.hxx|2
framework/source/recording/dispatchrecorder.cxx |3 -
framework/source/uielement/menubarmerger.cxx |1
framework/source/uielement/uicommanddescription.cxx | 10 ++-
i18npool/source/indexentry/indexentrysupplier_default.cxx |1
include/framework/menuconfiguration.hxx | 16 --
include/svl/filerec.hxx | 10 +++
include/tools/stream.hxx |1
include/vcl/animate.hxx |8 ++-
include/vcl/salnativewidgets.hxx | 12 +++-
include/xmloff/numehelp.hxx | 24 ++---
rsc/source/parser/rscyacc.y |1
sd/source/ui/unoidl/unosrch.cxx |3 -
sfx2/source/dialog/dinfdlg.cxx|4 +
svtools/source/control/ctrltool.cxx |3 -
svx/source/dialog/_contdlg.cxx|2
svx/source/dialog/dlgctrl.cxx |4 +
svx/source/dialog/fontlb.cxx |1
svx/source/xoutdev/_xpoly.cxx | 36 +++---
sw/source/core/access/accfrmobj.cxx |3 +
sw/source/core/attr/calbck.cxx|5 +
sw/source/core/inc/blink.hxx | 19 +--
sw/source/core/text/atrstck.cxx |6 +-
sw/source/core/text/inftxt.cxx| 21
sw/source/core/text/inftxt.hxx|2
sw/source/core/text/porfld.cxx|4 +
sw/source/core/unocore/unoframe.cxx | 12 ++--
tools/source/zcodec/zcodec.cxx| 36 ++
vcl/generic/print/prtsetup.cxx|4 -
vcl/inc/salsession.hxx|6 +-
31 files changed, 177 insertions(+), 85 deletions(-)
New commits:
commit 8fdd994aa793664652da2794b46d3a63a237b189
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 21:35:45 2014 +0100
coverity#984038 Uninitialized scalar variable
Change-Id: Ibab4b201d9412e0d32630957d4c85762c28974bc
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx
b/basegfx/source/polygon/b2dpolypolygontools.cxx
index d7b2b5f..35bc6ed 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -355,7 +355,7 @@ namespace basegfx
{
const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
sal_uInt32 nNewEdgeIndex;
-double fNewCut;
+double fNewCut(0.0);
const double
fNewDistance(getSmallestDistancePointToPolygon(aCandidate, rTestPoint,
nNewEdgeIndex, fNewCut));
if(DBL_MAX == fRetval || fNewDistance fRetval)
commit baa6b723d1c03348973bd80da529b3c4b8ab9a8e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 21:32:36 2014 +0100
coverity#707522 Uninitialized scalar variable
Change-Id: Ib655e3763c1d8deb1c10a10616390d5fdefe2291
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index 96d8e8e..7325b6d 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -360,6 +360,7 @@ resource_definitions
RscExpType aExpType;
sal_Int32 lValue;
+ aExpType.cUnused = false;
aExpType.cType = RSCEXP_NOTHING;
pExp = new RscExpression( aExpType, '+', $2 );
if( !pExp-Evaluate( lValue ) )
commit 9dc923b146f9e1c44282271eeb33e230b7927562
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 21:30:17 2014 +0100
coverity#738544 Uninitialized scalar variable
Change-Id: Idbf32e20ce81e6b726f32183c6f5e1bf0657b5ba
diff --git a/framework/source/uielement/menubarmerger.cxx
b/framework/source/uielement/menubarmerger.cxx
index f74a722..5083eb7 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -89,6 +89,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath(
if ( !nCount )
{
aResult.pPopupMenu = NULL;
+aResult.nPos = 0;
aResult.eResult = RP_MENUITEM_NOT_FOUND;
return aResult;
}
commit 79bd29fe6d2a383e80d10a9fee1765193eaa0686
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 21:23:53 2014 +0100
coverity#708217 Uninitialized scalar field
Change-Id: I06129c77b87890d45655da9e22a3b7716bc64d0a
diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx
index a90a2b7..a2a7d75 100644
--- a/include/xmloff/numehelp.hxx
+++
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 -
sw/source/core/unocore/unoframe.cxx | 11 +--
2 files changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 102bb87ca1a5dee3a09442bf503a54bb703c79ea
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Apr 1 12:01:05 2014 +0200
SwXTextFrame: also restore semi-lost BackColorTransparency property
Change-Id: I2af01a87218d08baf399069b90085d01d49983a8
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 2d96eb2..de70fa3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -518,8 +518,6 @@ DECLARE_OOXMLEXPORT_TEST(testTextFrames, textframes.odt)
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xIndexAccess-getCount());
}
-#if 0
-// FIXME port to FillAttributes
DECLARE_OOXMLEXPORT_TEST(testTextFrameBorders, textframe-borders.docx)
{
uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
@@ -536,7 +534,6 @@ DECLARE_OOXMLEXPORT_TEST(testTextFrameBorders,
textframe-borders.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int16(48), aShadowFormat.ShadowWidth);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x622423), aShadowFormat.Color);
}
-#endif
DECLARE_OOXMLEXPORT_TEST(testTextframeGradient, textframe-gradient.docx)
{
@@ -830,8 +827,6 @@ DECLARE_OOXMLEXPORT_TEST(testN822175, n822175.odt)
CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_PARALLEL,
getPropertytext::WrapTextMode(xFrame, Surround));
}
-#if 0
-// FIXME port to FillAttributes
DECLARE_OOXMLEXPORT_TEST(testFdo66688, fdo66688.docx)
{
// The problem was that TextFrame imported and exported the wrong value
for transparency
@@ -841,7 +836,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo66688, fdo66688.docx)
uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL( sal_Int32( 80 ), getProperty sal_Int32 ( xFrame,
BackColorTransparency ) );
}
-#endif
DECLARE_OOXMLEXPORT_TEST(testFdo66773, fdo66773.docx)
{
@@ -948,8 +942,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo66781, fdo66781.docx)
CPPUNIT_FAIL(Did not find bullet with level 0);
}
-#if 0
-// FIXME port to FillAttributes
DECLARE_OOXMLEXPORT_TEST(testFdo60990, fdo60990.odt)
{
// The shape had no background, no paragraph adjust and no font color.
@@ -960,7 +952,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo60990, fdo60990.odt)
CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER,
static_caststyle::ParagraphAdjust(getPropertysal_Int16(xParagraph,
ParaAdjust)));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00FF00),
getPropertysal_Int32(getRun(xParagraph, 1), CharColor));
}
-#endif
DECLARE_OOXMLEXPORT_TEST(testFdo65718, fdo65718.docx)
{
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index 3dd741b..5efcf0f 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -333,6 +333,7 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet rToSet, const SfxI
if(bXFillStyleItemUsed)
{
XFillStyleItem aXFillStyleItem;
+SvxBrushItem aBrush(RES_BACKGROUND);
if(pXFillStyleItem)
{
@@ -350,9 +351,8 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet rToSet, const SfxI
}
else if (aXFillStyleItem.GetValue() == XFILL_SOLID pCol)
{
-// Fill style set to solid, but no fill color is given.
+// Fill style is set to solid, but no fill color is given.
// On the other hand, we have a BackColor, so use that.
-SvxBrushItem aBrush(RES_BACKGROUND);
aBrush.PutValue(*pCol, MID_BACK_COLOR);
sw::setSvxBrushItemAsFillAttributesToTargetSet(aBrush, rToSet);
}
@@ -447,6 +447,13 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet rToSet, const SfxI
aXFillTransparenceItem.PutValue(*pXFillTransparenceItem);
rToSet.Put(aXFillTransparenceItem);
}
+else if (aXFillStyleItem.GetValue() == XFILL_SOLID pColTrans)
+{
+// Fill style is set to solid, but no fill transparency is given.
+// On the other hand, we have a BackColorTransparency, so use that.
+aBrush.PutValue(*pColTrans, MID_BACK_COLOR_TRANSPARENCY);
+sw::setSvxBrushItemAsFillAttributesToTargetSet(aBrush, rToSet);
+}
if(pXGradientStepCountItem)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: dailog conversion problem
On Sun, 2014-03-30 at 14:13 +0200, Mihály Palenik wrote: Hello! I'm making a dialog conversion. I have a ComboBox* pOldSymbols that is GtkComboBoxText in .ui file. When I runned program I got this: nwarn:vcl.layout:6634:1:include/vcl/builder.hxx:269: .ui widget oldSymbols needs to correspond to vcl type 8ComboBox. I saw with gdb and there is the problem: get(pOldSymbols, oldSymbols); Why do I get this nwarn?? Another GtkWidgets and CustomWidgets worked well in get function. And what is the type pf pOldSymbols ? If the GtkComboBoxText is a editable one then it probably should be a ComboBox and if its a non-editable one, then it probably should be a ListBox C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salgdicommon.cxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit f196005abb33f8bfbed9824733f18ff5b46df320
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 1 13:27:56 2014 +0300
Avoid one iOS ifdef
Did not seem to harm, but did not seem to do any good either, and the
less ifdefs the better. I think. Gawd this crack is ad-hoc.
Change-Id: Iaec8d2015e95ac46c787b4b2701d3e29684f1710
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 7b5800d..e0968e9 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1685,11 +1685,6 @@ bool AquaSalGraphics::supportsOperation(
OutDevSupportType eType ) const
bool AquaSalGraphics::setClipRegion( const Region i_rClip )
{
-#ifdef IOS
-if (mbForeignContext)
-return true;
-#endif
-
// release old clip path
if( mxClipPath )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ship Maven meta information to ease creation of LO plugins with Maven
On 01/04/14 11:16, Bjoern Michaelsen wrote:
Hi,
On Tue, Apr 01, 2014 at 10:53:22AM +0200, Stephan Bergmann wrote:
On 03/31/2014 09:46 PM, Sebastian Humenda wrote:
to build software with Maven, you have to provide meta information (a
pom.xml)
to each jar, which is a dependency of your software. In turn, the build
system
Maven with automatically figure out which jar to fetch from where and in
which
version. To simplify the creation of Java dependencies for LO and to ease
also the
packaging of LO extension in Debian/Ubuntu, it would be of much help, if you
could ship those pom.xml for this use case with the source. This meta
information is easy and quick to generate and the only maintenance overhead
is
the version number increase at each LO release. You don't need to also use
Maven
for building LO, you just have to ship one pom.xml for one jar file.
The LO jars generally need to be located at specific places within a
LO installation tree. I am not sure that is compatible with the
Maven concepts.
isnt this what Rene already implemented for Debian (and thus Ubuntu) with:
http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git;a=commit;h=1c130152fdb881db51543513ddafb212ff5c6df2
So do you want that to be upstreamed?
isn't this sort of the same as this upstream commit:
commit 78e4b97a18a18f84c228de64fc48cee48138fbfe
Author: David Ostrovsky da...@ostrovsky.org
AuthorDate: Sun Oct 27 20:32:40 2013 +0100
Set up tool chain to install LO artifacts in Maven repositories
Add path_to_libo/bin to your path.
After full LO compile, the LO Java artifacts can be installed in the
local
Maven repository:
mvn.py -a install -v 4.2.0 -s juh:jar:path_to/juh.jar
mvn.py -a install -v 4.2.0 -s jurt:jar:path_to/jurt.jar
mvn.py -a install -v 4.2.0 -s ridl:jar:path_to/ridl.jar
mvn.py -a install -v 4.2.0 -s unoil:jar:path_to/unoil.jar
With the artifacts installed this way, it is now possible
to consume LO artifacts from custom pom.xml:
[...]
properties
LibreOffice-Version4.2.0/LibreOffice-Version
/properties
[...]
dependencies
dependency
groupIdorg.libreoffice/groupId
artifactIdjuh/artifactId
version${LibreOffice-Version}/version
scopeprovided/scope
/dependency
dependency
groupIdorg.libreoffice/groupId
artifactIdjurt/artifactId
version${LibreOffice-Version}/version
scopeprovided/scope
/dependency
dependency
groupIdorg.libreoffice/groupId
artifactIdridl/artifactId
version${LibreOffice-Version}/version
scopeprovided/scope
/dependency
dependency
groupIdorg.libreoffice/groupId
artifactIdunoil/artifactId
version${LibreOffice-Version}/version
scopeprovided/scope
/dependency
/dependencies
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sd/qa
sd/qa/unit/import-tests.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit e4d78e1dd48f3cc80d64b8bb08b2f5f1cd7d29a5
Author: Muthu Subramanian sumu...@collabora.com
Date: Tue Apr 1 16:53:37 2014 +0530
Disable unit test.
(Export framework is not available on the branch)
Change-Id: I3e432625008aab725d96796a5ac26c10ed63afa2
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 518b022..df99e92 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -213,6 +213,7 @@ void SdFiltersTest::testFdo64512()
void SdFiltersTest::testFdo71961()
{
+#if 0 // FIXME
::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc(/sd/qa/unit/data/fdo71961.odp));
CPPUNIT_ASSERT_MESSAGE( failed to load, xDocShRef.Is() );
CPPUNIT_ASSERT_MESSAGE( not in destruction,
!xDocShRef-IsInDestruction() );
@@ -242,6 +243,7 @@ void SdFiltersTest::testFdo71961()
CPPUNIT_ASSERT_MESSAGE( no text object, pTxtObj != NULL);
CPPUNIT_ASSERT_EQUAL( OUString( Custom shape wrapped text ),
pTxtObj-GetOutlinerParaObject()-GetTextObject().GetText(0));
CPPUNIT_ASSERT_EQUAL( true, (static_castconst
SdrTextWordWrapItem(pTxtObj-GetMergedItem(SDRATTR_TEXT_WORDWRAP))).GetValue());
+#endif
}
CPPUNIT_TEST_SUITE_REGISTRATION(SdFiltersTest);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |7 --- source/text/shared/explorer/database/0503.xhp | 12 ++-- 2 files changed, 6 insertions(+), 13 deletions(-) New commits: commit 9bcb26d23cbda4a893b9e5550fc70cc39de2c91f Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 1 12:28:57 2014 +0100 update help ids for database admin user password dialog .ui conversion Change-Id: Ic18d9fc64253bc0e8c4b6dcb4c7b6daf6b7a1e52 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index ed967fb..ca8ef16 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1428,7 +1428,6 @@ HID_DLG_MAPPING,34842, HID_DLG_NAME,33818, HID_DLG_NEWERVERSIONWARNING,35848, HID_DLG_PASSWD_SECTION,53440, -HID_DLG_PASSWORD,38964, HID_DLG_TEXT,38843, HID_DLG_WORDCOUNT,54987, HID_DOCINFO_EDT,33070, @@ -5378,9 +5377,6 @@ dbaccess_Edit_DLG_ADABASSTAT_ET_TRANSACTIONLOG,1388611586, dbaccess_Edit_DLG_COLLECTION_VIEW_ED_EXPLORERFILE_FILENAME,1388759041, dbaccess_Edit_DLG_DOMAINPASSWORD_ET_PASSWORD,1388709890, dbaccess_Edit_DLG_PARAMETERS_ET_PARAM,1388398596, -dbaccess_Edit_DLG_PASSWORD_ED_OLDPASSWORD,1388693523, -dbaccess_Edit_DLG_PASSWORD_ED_PASSWORD,1388693525, -dbaccess_Edit_DLG_PASSWORD_ED_PASSWORD_REPEAT,1388693527, dbaccess_Edit_PAGE_ADABAS_ET_CTRLPASSWORD,851527681, dbaccess_Edit_PAGE_ADABAS_ET_CTRLUSERNAME,851527682, dbaccess_Edit_PAGE_ADABAS_ET_HOSTNAME,851527685, @@ -5968,9 +5964,6 @@ svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_NAME,1368918028, svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_REF,1368918034, svx_Edit_RID_SVXDLG_ASSIGNCOMPONENT_EDIT_METHOD,1242449965, svx_Edit_RID_SVXDLG_IMAP_EDT_TEXT,2318698497, -svx_Edit_RID_SVXDLG_PASSWORD_ED_NEW_PASSWD,1239894037, -svx_Edit_RID_SVXDLG_PASSWORD_ED_OLD_PASSWD,1239894027, -svx_Edit_RID_SVXDLG_PASSWORD_ED_REPEAT_PASSWD,1239894039, svx_Edit_RID_SVXDLG_RUBY_ED_LEFT_1,2315372554, svx_Edit_RID_SVXDLG_RUBY_ED_LEFT_2,2315372555, svx_Edit_RID_SVXDLG_RUBY_ED_LEFT_3,2315372556, diff --git a/source/text/shared/explorer/database/0503.xhp b/source/text/shared/explorer/database/0503.xhp index e0eb5fd..2cb3864 100644 --- a/source/text/shared/explorer/database/0503.xhp +++ b/source/text/shared/explorer/database/0503.xhp @@ -36,14 +36,14 @@ bookmark xml-lang=en-US branch=hid/sfx/ui/password/usered id=bm_id3149283 localize=false/ paragraph role=heading id=hd_id3157898 xml-lang=en-US level=2 l10n=U oldref=3User/paragraph paragraph role=paragraph id=par_id3149346 xml-lang=en-US l10n=U oldref=4ahelp hid=sfx/ui/password/useredSpecifies the name of the new user./ahelp This field is only visible if you have defined a new user./paragraph -bookmark xml-lang=en-US branch=hid/dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD id=bm_id3145346 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/password/oldpassword id=bm_id3145346 localize=false/ paragraph role=heading id=hd_id3153681 xml-lang=en-US level=2 l10n=U oldref=9Old password/paragraph -paragraph role=paragraph id=par_id3147576 xml-lang=en-US l10n=U oldref=10ahelp hid=DBACCESS_EDIT_DLG_PASSWORD_ED_OLDPASSWORDEnter the old password./ahelp This field is visible when you have started the dialog via emphChange password/emph./paragraph -bookmark xml-lang=en-US branch=hid/dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD id=bm_id3166411 localize=false/ +paragraph role=paragraph id=par_id3147576 xml-lang=en-US l10n=U oldref=10ahelp hid=dbaccess/ui/password/oldpasswordEnter the old password./ahelp This field is visible when you have started the dialog via emphChange password/emph./paragraph +bookmark xml-lang=en-US branch=hid/dbaccess/ui/password/newpassword id=bm_id3166411 localize=false/ paragraph role=heading id=hd_id3153311 xml-lang=en-US level=2 l10n=U oldref=5Password/paragraph -paragraph role=paragraph id=par_id3147243 xml-lang=en-US l10n=U oldref=6ahelp hid=DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORDEnter the new password./ahelp/paragraphcommentUFI: removed help id/comment -bookmark xml-lang=en-US branch=hid/dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD_REPEAT id=bm_id3163802 localize=false/ +paragraph role=paragraph id=par_id3147243 xml-lang=en-US l10n=U oldref=6ahelp hid=dbaccess/ui/password/newpasswordEnter the new password./ahelp/paragraphcommentUFI: removed help id/comment +bookmark xml-lang=en-US branch=hid/dbaccess/ui/password/confirmpassword id=bm_id3163802 localize=false/ paragraph role=heading id=hd_id3147275 xml-lang=en-US level=2 l10n=U oldref=7Confirm (password)/paragraph -paragraph role=paragraph id=par_id3153541 xml-lang=en-US l10n=U oldref=8ahelp hid=DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD_REPEATEnter the new password again./ahelp/paragraph +paragraph role=paragraph id=par_id3153541 xml-lang=en-US l10n=U oldref=8ahelp hid=dbaccess/ui/password/confirmpasswordEnter the new password again./ahelp/paragraph /body /helpdocument ___ Libreoffice-commits mailing list
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 545d396ca2d980bd27f1675934ff099cccfac91b Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 1 12:28:57 2014 +0100 Updated core Project: help 9bcb26d23cbda4a893b9e5550fc70cc39de2c91f diff --git a/helpcontent2 b/helpcontent2 index 2b799e2..9bcb26d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2b799e21a07d93f7b997bb1f3fa85e8cffb19356 +Subproject commit 9bcb26d23cbda4a893b9e5550fc70cc39de2c91f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/inc dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/inc/dbaccess_helpid.hrc|1
dbaccess/source/ui/dlg/UserAdmin.cxx| 64 --
dbaccess/source/ui/dlg/UserAdmin.hrc| 14 --
dbaccess/source/ui/dlg/UserAdmin.src| 83 -
dbaccess/source/ui/inc/dbu_resource.hrc |2
dbaccess/uiconfig/ui/password.ui| 194
7 files changed, 221 insertions(+), 138 deletions(-)
New commits:
commit 6dae22bd43747ab3631af021299642ae0c26da09
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 1 12:18:08 2014 +0100
convert user admin password dialog to .ui
Change-Id: Ia94c3b27b80d8c58e287ae588a5f6a40fb64fa38
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index a90e161..2caa8d8 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/generalpagewizard \
dbaccess/uiconfig/ui/generatedvaluespage \
dbaccess/uiconfig/ui/joindialog \
+dbaccess/uiconfig/ui/password \
dbaccess/uiconfig/ui/queryfilterdialog \
dbaccess/uiconfig/ui/querypropertiesdialog \
dbaccess/uiconfig/ui/relationdialog \
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 5da3fac..99a2a5d 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -190,7 +190,6 @@
#define HID_BROWSER_OPEN_DOCUMENT
DBACCESS_HID_BROWSER_OPEN_DOCUMENT
#define HID_BROWSER_EDIT_DOCUMENT
DBACCESS_HID_BROWSER_EDIT_DOCUMENT
#define HID_BROWSER_BEW_DOCUMENT
DBACCESS_HID_BROWSER_BEW_DOCUMENT
-#define HID_DLG_PASSWORD
DBACCESS_HID_DLG_PASSWORD
#define HID_DLGIDX_NEWINDEX
DBACCESS_HID_DLGIDX_NEWINDEX
#define HID_DLGIDX_DROPINDEX
DBACCESS_HID_DLGIDX_DROPINDEX
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx
b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 1c3256c..6fbbc52 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -38,6 +38,7 @@
#include dbadmin.hxx
#include moduledbu.hxx
#include vcl/msgbox.hxx
+#include vcl/layout.hxx
#include sfx2/passwd.hxx
using namespace ::com::sun::star::container;
@@ -52,16 +53,11 @@ using namespace comphelper;
class OPasswordDialog : public ModalDialog
{
-FixedLine aFLUser;
-FixedText aFTOldPassword;
-EditaEDOldPassword;
-FixedText aFTPassword;
-EditaEDPassword;
-FixedText aFTPasswordRepeat;
-EditaEDPasswordRepeat;
-OKButtonaOKBtn;
-CancelButtonaCancelBtn;
-HelpButton aHelpBtn;
+VclFrame* m_pUser;
+Edit* m_pEDOldPassword;
+Edit* m_pEDPassword;
+Edit* m_pEDPasswordRepeat;
+OKButton* m_pOKBtn;
DECL_LINK( OKHdl_Impl, void * );
DECL_LINK( ModifiedHdl, Edit * );
@@ -69,57 +65,47 @@ class OPasswordDialog : public ModalDialog
public:
OPasswordDialog( Window* pParent,const OUString _sUserName);
-OUStringGetOldPassword() const { return aEDOldPassword.GetText(); }
-OUStringGetNewPassword() const { return aEDPassword.GetText(); }
+OUStringGetOldPassword() const { return
m_pEDOldPassword-GetText(); }
+OUStringGetNewPassword() const { return m_pEDPassword-GetText(); }
};
-OPasswordDialog::OPasswordDialog(Window* _pParent,const OUString _sUserName) :
-
-ModalDialog( _pParent, ModuleRes( DLG_PASSWORD) ),
-
-aFLUser ( this, ModuleRes( FL_USER ) ),
-aFTOldPassword ( this, ModuleRes( FT_OLDPASSWORD ) ),
-aEDOldPassword ( this, ModuleRes( ED_OLDPASSWORD ) ),
-aFTPassword ( this, ModuleRes( FT_PASSWORD ) ),
-aEDPassword ( this, ModuleRes( ED_PASSWORD ) ),
-aFTPasswordRepeat ( this, ModuleRes( FT_PASSWORD_REPEAT ) ),
-aEDPasswordRepeat ( this, ModuleRes( ED_PASSWORD_REPEAT ) ),
-aOKBtn ( this, ModuleRes( BTN_PASSWORD_OK ) ),
-aCancelBtn ( this, ModuleRes( BTN_PASSWORD_CANCEL ) ),
-aHelpBtn( this, ModuleRes( BTN_PASSWORD_HELP ) )
+OPasswordDialog::OPasswordDialog(Window* _pParent,const OUString _sUserName)
+: ModalDialog(_pParent, PasswordDialog, dbaccess/ui/password.ui)
{
-// hide until a help is available
-aHelpBtn.Hide();
+get(m_pUser, userframe);
+get(m_pEDOldPassword, oldpassword);
+get(m_pEDPassword, newpassword);
+get(m_pEDPasswordRepeat, confirmpassword);
+get(m_pOKBtn, ok);
-FreeResource();
-OUString sUser = aFLUser.GetText();
+OUString sUser = m_pUser-get_label();
sUser = sUser.replaceFirst($name$: $,_sUserName);
-aFLUser.SetText(sUser);
-aOKBtn.Disable();
+m_pUser-set_label(sUser);
+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6bf6c90bf28fffcfcec968370325bb4732d228d0 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 1 13:00:06 2014 +0100 Updated core Project: help ca529581c5958569af6ef77ce3e006bd73dbd5bc diff --git a/helpcontent2 b/helpcontent2 index 9bcb26d..ca52958 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9bcb26d23cbda4a893b9e5550fc70cc39de2c91f +Subproject commit ca529581c5958569af6ef77ce3e006bd73dbd5bc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |3 --- 1 file changed, 3 deletions(-) New commits: commit ca529581c5958569af6ef77ce3e006bd73dbd5bc Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 1 13:00:06 2014 +0100 drop help ids that go nowhere Change-Id: I4c9ab608d75008ce8a457344206a4b89ce9404a9 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index ca8ef16..ba2d0d0 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3354,8 +3354,6 @@ HID_SPLDLG_BUTTON_EXPLAIN,39898, HID_SPLDLG_BUTTON_IGNORE,39885, HID_SPLDLG_BUTTON_IGNOREALL,39886, HID_SPLDLG_BUTTON_IGNORERULE,40076, -HID_SQLERROR_EXCHAIN_ERRORS,38909, -HID_SQLERROR_EXCHAIN_TEXT,38910, HID_STATUSBAR,40370, HID_STATUSINDICATOR_PROGRESS,33316, HID_STATUSINDICATOR_TEXT,33315, @@ -5408,7 +5406,6 @@ dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840, dbaccess_ModalDialog_DLG_INDEXDESIGN,1388625920, dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624, dbaccess_ModalDialog_DLG_PARAMETERS,1388396544, -dbaccess_ModalDialog_DLG_SQLEXCEPTIONCHAIN,1388363776, dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528, dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768, dbaccess_MultiLineEdit_TP_SUMMARY_ED_CHANGES,851495426, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sw/source vcl/unx
sw/source/core/access/acccell.cxx| 31 +--
sw/source/core/access/acccell.hxx|6 +++---
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |4 +++-
3 files changed, 15 insertions(+), 26 deletions(-)
New commits:
commit 577c82545201b0b736a21cd22b2bc9404e89ee44
Author: Andre Fischer a...@apache.org
Date: Tue Apr 1 11:44:40 2014 +
i124482: Special handling of input field backgrounds of Adwaita theme
(Merged from branch AOO410).
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 1ecc667..6dbe23f 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3615,7 +3615,9 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
bNeedButtonStyleAsEditBackgroundWorkaround = false;
// setup some workarounds for blueprint theme
-if( pThemeName strncasecmp( pThemeName, blueprint, 9 ) == 0 )
+if( pThemeName
+ ( strncasecmp( pThemeName, blueprint, 9 ) == 0
+|| strncasecmp( pThemeName, Adwaita, 7 ) == 0 ))
{
bNeedButtonStyleAsEditBackgroundWorkaround = true;
if( GetX11SalData()-GetDisplay()-GetServerVendor() == vendor_sun )
commit 4f34412da1ed29d51ba24fb4e33ecd9088811a08
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Apr 1 10:00:47 2014 +
124553: SwAcccessibleCell::SwAccessibleCell(..) - correct initialization
of new members introduced for IA2
diff --git a/sw/source/core/access/acccell.cxx
b/sw/source/core/access/acccell.cxx
index d3e747e..f92e807 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -114,17 +114,21 @@ SwAccessibleCell::SwAccessibleCell( SwAccessibleMap
*pInitMap,
: SwAccessibleContext( pInitMap, AccessibleRole::TABLE_CELL, pCellFrm )
, aSelectionHelper( *this )
, bIsSelected( sal_False )
+, m_xTableReference( NULL )
+, m_pAccTable( NULL )
{
-vos::OGuard aGuard(Application::GetSolarMutex());
+vos::OGuard aGuard( Application::GetSolarMutex() );
OUString sBoxName( pCellFrm-GetTabBox()-GetName() );
SetName( sBoxName );
bIsSelected = IsSelected();
-//Need not assign the pointer of accessible table object to m_pAccTable,
-//for it already done in SwAccessibleCell::GetTable(); Former codes:
-//m_pAccTable= GetTable();
-GetTable();
+m_xTableReference = getAccessibleParent();
+#if OSL_DEBUG_LEVEL 1
+uno::Reference XAccessibleContext xContextTable( m_xTableReference,
uno::UNO_QUERY );
+OSL_ASSERT( xContextTable.is() xContextTable-getAccessibleRole() ==
AccessibleRole::TABLE );
+#endif
+m_pAccTable = static_cast SwAccessibleTable * ( m_xTableReference.get()
);
}
sal_Bool SwAccessibleCell::_InvalidateMyCursorPos()
@@ -556,20 +560,3 @@ void SwAccessibleCell::deselectAccessibleChild(
aSelectionHelper.deselectAccessibleChild(nSelectedChildIndex);
}
-SwAccessibleTable *SwAccessibleCell::GetTable()
-{
-if (!m_pAccTable)
-{
-if (!xTableReference.is())
-{
-xTableReference = getAccessibleParent();
-#ifdef OSL_DEBUG_LEVEL
-uno::ReferenceXAccessibleContext xContextTable(xTableReference,
uno::UNO_QUERY);
-OSL_ASSERT(xContextTable.is()
xContextTable-getAccessibleRole() == AccessibleRole::TABLE);
-#endif
-//SwAccessibleTable aTable = *(static_castSwAccessibleTable
*(xTable.get()));
-}
-m_pAccTable = static_castSwAccessibleTable *(xTableReference.get());
-}
-return m_pAccTable;
-}
diff --git a/sw/source/core/access/acccell.hxx
b/sw/source/core/access/acccell.hxx
index 50152d2..7f32318 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -47,6 +47,9 @@ class SwAccessibleCell : public SwAccessibleContext,
SwAccessibleSelectionHelper aSelectionHelper;
sal_BoolbIsSelected;// protected by base class mutex
+::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessible m_xTableReference;
+SwAccessibleTable *m_pAccTable;
+
sal_BoolIsSelected();
sal_Bool _InvalidateMyCursorPos();
@@ -171,9 +174,6 @@ public:
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException );
-SwAccessibleTable *GetTable();
-::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessible xTableReference;
-SwAccessibleTable *m_pAccTable;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/inc dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/inc/dbaccess_helpid.hrc|2
dbaccess/source/ui/dlg/sqlmessage.cxx | 59 ---
dbaccess/source/ui/dlg/sqlmessage.hrc | 44
dbaccess/source/ui/dlg/sqlmessage.src | 69 +
dbaccess/source/ui/inc/dbu_dlg.hrc |4
dbaccess/source/ui/inc/dbu_resource.hrc |2
dbaccess/uiconfig/ui/sqlexception.ui| 165
8 files changed, 198 insertions(+), 148 deletions(-)
New commits:
commit a9dc79b35d446a966c4d18c1d23478213af58d93
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 1 12:53:24 2014 +0100
convert sql exception dialog to .ui
Change-Id: I57878f8c9fcae09e3904c4e316ffa6277625b960
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 2caa8d8..0eafe12 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/savedialog \
dbaccess/uiconfig/ui/specialsettingspage \
dbaccess/uiconfig/ui/sortdialog \
+dbaccess/uiconfig/ui/sqlexception \
dbaccess/uiconfig/ui/tablesfilterdialog \
dbaccess/uiconfig/ui/tablesfilterpage \
dbaccess/uiconfig/ui/tablesjoindialog \
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 99a2a5d..5128e46 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -144,8 +144,6 @@
#define HID_BROWSER_TABLE_CREATE_DESIGN
DBACCESS_HID_BROWSER_TABLE_CREATE_DESIGN
#define HID_BROWSER_TABLE_EDIT
DBACCESS_HID_BROWSER_TABLE_EDIT
#define HID_BROWSER_TABLE_DELETE
DBACCESS_HID_BROWSER_TABLE_DELETE
-#define HID_SQLERROR_EXCHAIN_ERRORS
DBACCESS_HID_SQLERROR_EXCHAIN_ERRORS
-#define HID_SQLERROR_EXCHAIN_TEXT
DBACCESS_HID_SQLERROR_EXCHAIN_TEXT
#define HID_TAB_WIZ_COLUMN_SELECT
DBACCESS_HID_TAB_WIZ_COLUMN_SELECT
#define HID_TAB_WIZ_TYPE_SELECT
DBACCESS_HID_TAB_WIZ_TYPE_SELECT
#define HID_TAB_NAMEMATCHING_COLS_AVAIL
DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx
b/dbaccess/source/ui/dlg/sqlmessage.cxx
index b66c0a5..efda833 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -19,7 +19,6 @@
#include sqlmessage.hxx
#include dbu_dlg.hrc
-#include sqlmessage.hrc
#include com/sun/star/sdbc/SQLException.hpp
#include com/sun/star/sdb/SQLContext.hpp
#include vcl/fixed.hxx
@@ -293,12 +292,8 @@ namespace
class OExceptionChainDialog : public ModalDialog
{
-FixedLine m_aFrame;
-FixedText m_aListLabel;
-SvTreeListBox m_aExceptionList;
-FixedText m_aDescLabel;
-MultiLineEdit m_aExceptionText;
-OKButtonm_aOK;
+SvTreeListBox*m_pExceptionList;
+VclMultiLineEdit* m_pExceptionText;
OUStringm_sStatusLabel;
OUStringm_sErrorCodeLabel;
@@ -307,36 +302,34 @@ class OExceptionChainDialog : public ModalDialog
public:
OExceptionChainDialog( Window* pParent, const ExceptionDisplayChain
_rExceptions );
-~OExceptionChainDialog();
protected:
DECL_LINK(OnExceptionSelected, void*);
};
-OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const
ExceptionDisplayChain _rExceptions )
-:ModalDialog(pParent, ModuleRes(DLG_SQLEXCEPTIONCHAIN))
-,m_aFrame (this, ModuleRes(FL_DETAILS))
-,m_aListLabel (this, ModuleRes(FT_ERRORLIST))
-,m_aExceptionList (this, ModuleRes(CTL_ERRORLIST))
-,m_aDescLabel (this, ModuleRes(FT_DESCRIPTION))
-,m_aExceptionText (this, ModuleRes(ME_DESCRIPTION))
-,m_aOK (this, ModuleRes(PB_OK))
-,m_aExceptions( _rExceptions )
+OExceptionChainDialog::OExceptionChainDialog(Window* pParent, const
ExceptionDisplayChain _rExceptions)
+: ModalDialog(pParent, SQLExceptionDialog, dbaccess/ui/sqlexception.ui)
+, m_aExceptions(_rExceptions)
{
+get(m_pExceptionList, list);
+Size aListSize(LogicToPixel(Size(85, 93), MAP_APPFONT));
+m_pExceptionList-set_width_request(aListSize.Width());
+m_pExceptionList-set_height_request(aListSize.Height());
+get(m_pExceptionText, description);
+Size aTextSize(LogicToPixel(Size(125 , 93), MAP_APPFONT));
+m_pExceptionText-set_width_request(aTextSize.Width());
+m_pExceptionText-set_height_request(aTextSize.Height());
m_sStatusLabel = ModuleRes( STR_EXCEPTION_STATUS );
m_sErrorCodeLabel = ModuleRes( STR_EXCEPTION_ERRORCODE );
-FreeResource();
+m_pExceptionList-SetSelectionMode(SINGLE_SELECTION);
+m_pExceptionList-SetDragDropMode(0);
+m_pExceptionList-EnableInplaceEditing(false);
+m_pExceptionList-SetStyle(m_pExceptionList-GetStyle() | WB_HASLINES |
[Libreoffice-commits] core.git: 2 commits - sc/source vcl/generic
sc/source/filter/lotus/lotform.cxx | 11 ---
sc/source/filter/qpro/qproform.cxx |7 ---
vcl/generic/print/genpspgraphics.cxx |1 +
3 files changed, 1 insertion(+), 18 deletions(-)
New commits:
commit 33b8636ced08abcb48c2424709db21e7a8fc27bf
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 1 12:02:03 2014 +0100
coverity#704264 Logically dead code
and coverity#704265 Logically dead code
Change-Id: Ice40fcb71de4cca07e3353cf579477c7e5363e52
diff --git a/sc/source/filter/lotus/lotform.cxx
b/sc/source/filter/lotus/lotform.cxx
index dc0dcba..ebb3eb2 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -35,9 +35,6 @@ static const sal_Char* GetAddInName( const sal_uInt8
nIndex );
static DefTokenId lcl_KnownAddIn(const OString rTest);
-//extern double decipher_Number123( sal_uInt32 nValue );
-
-
void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char*
pExtString )
{
TokenId eParam[ 256 ];
@@ -45,7 +42,6 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const
sal_Char* pExtStri
TokenId nMerk0, nMerk1;
sal_BoolbAddIn = false;
-sal_BoolbNeg = false;
OSL_ENSURE( nAnz 128, -LotusToSc::DoFunc(): Neee! -so viel kann ich
nicht! );
@@ -197,15 +193,8 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz,
const sal_Char* pExtStri
aPool ocClose;
aPool aStack;
-
-if( bNeg )
-{
-aPool ocOpen ocSub aStack ocClose;
-aPool aStack;
-}
}
-
void LotusToSc::LotusRelToScRel( sal_uInt16 nCol, sal_uInt16 nRow,
ScSingleRefData rSRD )
{
// Col-Bemachung
diff --git a/sc/source/filter/qpro/qproform.cxx
b/sc/source/filter/qpro/qproform.cxx
index ff47b00..a53060b 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -79,7 +79,6 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs,
const sal_Char* pExtStr
TokenId nPush, nPush1;
sal_Bool bAddIn = false;
-sal_Bool bNeg = false;
if( eOc == ocNoName )
{
@@ -160,12 +159,6 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs,
const sal_Char* pExtStr
aPool ocClose;
aPool aStack;
-
-if( bNeg )
-{
-aPool ocOpen ocSub aStack ocClose;
-aPool aStack;
-}
}
void QProToSc::IncToken( TokenId rParam )
commit 06284f399da1f504f58cc483651a3932f9746e63
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 1 10:56:46 2014 +0100
coverity#708657 Uninitialized pointer field
Change-Id: Ief35e66ef2e1bcad39f7ff70fd39e91973a4dc69
diff --git a/vcl/generic/print/genpspgraphics.cxx
b/vcl/generic/print/genpspgraphics.cxx
index 924faa6..5a6aecd 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -145,6 +145,7 @@ SalPrinterBmp::SalPrinterBmp (BitmapBuffer* pBuffer) :
default:
OSL_FAIL(Error: SalPrinterBmp::SalPrinterBmp() unknown bitmap
format);
+mpFncGetPixel = NULL;
break;
}
}
___
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' - 4f/34412da1ed29d51ba24fb4e33ecd9088811a08
4f/34412da1ed29d51ba24fb4e33ecd9088811a08 |1 + 1 file changed, 1 insertion(+) New commits: commit abc0b2d929a673ae4fb72611b6c1e53b3df0e374 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 1 13:28:20 2014 +0100 Notes added by 'git notes add' diff --git a/4f/34412da1ed29d51ba24fb4e33ecd9088811a08 b/4f/34412da1ed29d51ba24fb4e33ecd9088811a08 new file mode 100644 index 000..6d1add0 --- /dev/null +++ b/4f/34412da1ed29d51ba24fb4e33ecd9088811a08 @@ -0,0 +1 @@ +prefer: 354249086c0956d48337805bb98387f0eea9a19e ___ 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' - 57/7c82545201b0b736a21cd22b2bc9404e89ee44
57/7c82545201b0b736a21cd22b2bc9404e89ee44 |1 + 1 file changed, 1 insertion(+) New commits: commit f176e8a25da8234b16e3b67129263cf77c5775b0 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 1 13:30:30 2014 +0100 Notes added by 'git notes add' diff --git a/57/7c82545201b0b736a21cd22b2bc9404e89ee44 b/57/7c82545201b0b736a21cd22b2bc9404e89ee44 new file mode 100644 index 000..a9c5e95 --- /dev/null +++ b/57/7c82545201b0b736a21cd22b2bc9404e89ee44 @@ -0,0 +1 @@ +prefer: 8f2a08b9576a50b2046306132cb8cddcf876d0a4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/source svtools/source
sc/source/filter/oox/drawingmanager.cxx | 14 +++---
sc/source/ui/view/tabvwsh4.cxx |3 -
svtools/source/svhtml/parhtml.cxx | 68 ++--
3 files changed, 38 insertions(+), 47 deletions(-)
New commits:
commit 9a0e6204bba686945a1ab249b741d703ed3e84a6
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 1 13:38:37 2014 +0100
coverity#735505 Logically dead code
Change-Id: I7e7abf9192ee34c9f1c2080268751503aae90e55
diff --git a/svtools/source/svhtml/parhtml.cxx
b/svtools/source/svhtml/parhtml.cxx
index f54c741..93e8c2d 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -562,59 +562,51 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
break;
}
+assert(cChar != 0);
+
// 1 == Non Breaking Space
// 2 == SoftHyphen
-if( cChar 3U )
+if (cChar == 1 || cChar == 2)
{
if( '' == cBreak )
{
// When reading the content of a tag we have
// to change it to ' ' or '-'
-switch( cChar )
-{
-case 1U: cChar = ' '; break;
-case 2U: cChar = '-'; break;
-default:
-DBG_ASSERT( cChar==1U,
-\0x00 should be handled already! );
-break;
-}
+if( 1U == cChar )
+cChar = ' ';
+else //2U
+cChar = '-';
}
else
{
// If not scanning a tag return token
aToken += sTmpBuffer.makeStringAndClear();
-if( cChar )
+
+if( !aToken.isEmpty() )
{
-if( !aToken.isEmpty() )
-{
-// restart with character
-nNextCh = '';
-DBG_ASSERT( rInput.Tell()-nStreamPos ==
-
(sal_uLong)(nPos+1)*GetCharSize(),
-Wrong stream position );
-DBG_ASSERT( nlLinePos-nLinePos ==
-(sal_uLong)(nPos+1),
-Wrong line position );
-rInput.Seek( nStreamPos );
-nlLinePos = nLinePos;
-ClearTxtConvContext();
-return HTML_TEXTTOKEN;
-}
-
-// Hack: _GetNextChar shall not read the
-// next character
-if( ';' != nNextCh )
-aToken += ;
-if( 1U == cChar )
-return HTML_NONBREAKSPACE;
-if( 2U == cChar )
-return HTML_SOFTHYPH;
+// restart with character
+nNextCh = '';
+DBG_ASSERT( rInput.Tell()-nStreamPos ==
+
(sal_uLong)(nPos+1)*GetCharSize(),
+Wrong stream position );
+DBG_ASSERT( nlLinePos-nLinePos ==
+(sal_uLong)(nPos+1),
+Wrong line position );
+rInput.Seek( nStreamPos );
+nlLinePos = nLinePos;
+ClearTxtConvContext();
+return HTML_TEXTTOKEN;
}
-aToken += ;
-aToken += sEntityBuffer.makeStringAndClear();
-break;
+
+// Hack: _GetNextChar shall not read the
+// next character
+if( ';' !=
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/outdev4.cxx |8 +---
vcl/source/gdi/outdev6.cxx | 16 ++--
2 files changed, 3 insertions(+), 21 deletions(-)
New commits:
commit 04e08fa4aa419b8d89d80a39e6904bc4cd8883be
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Tue Apr 1 23:40:05 2014 +1100
fdo#74702 Refactor code to use ClipToPaintRegion()
There is a fair amount of code that should use ClipToPaintRegion().
Not only does this remove meOutDevType and decouples classes, but
we are using code, so code reuse FTW.
Change-Id: I05a2623b73f4a523230dc01d02db33a6df9911ab
Reviewed-on: https://gerrit.libreoffice.org/8810
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index 4d23620..0810e6b 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -852,13 +852,7 @@ void OutputDevice::DrawGradient( const PolyPolygon
rPolyPoly,
aDstRect.Intersection( aBoundRect );
-if( OUTDEV_WINDOW == meOutDevType )
-{
-const Region aPaintRgn( ( (Window*) this )-GetPaintRegion() );
-
-if( !aPaintRgn.IsNull() )
-aDstRect.Intersection( LogicToPixel( aPaintRgn
).GetBoundRect() );
-}
+ClipToPaintRegion( aDstRect );
if( !aDstRect.IsEmpty() )
{
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 0234df3..d96e59f 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -346,13 +346,7 @@ void OutputDevice::EmulateDrawTransparent ( const
PolyPolygon rPolyPoly,
aDstRect.Intersection( aPolyRect );
-if( OUTDEV_WINDOW == meOutDevType )
-{
-const Region aPaintRgn( ( (Window*) this )-GetPaintRegion() );
-
-if( !aPaintRgn.IsNull() )
-aDstRect.Intersection( LogicToPixel( aPaintRgn ).GetBoundRect() );
-}
+ClipToPaintRegion( aDstRect );
if( !aDstRect.IsEmpty() )
{
@@ -632,13 +626,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile
rMtf, const Point rPos,
mpMetaFile = NULL;
aDstRect.Intersection( aOutRect );
-if( OUTDEV_WINDOW == meOutDevType )
-{
-const Region aPaintRgn( ( (Window*) this )-GetPaintRegion() );
-
-if( !aPaintRgn.IsNull() )
-aDstRect.Intersection( LogicToPixel( aPaintRgn.GetBoundRect()
) );
-}
+ClipToPaintRegion( aDstRect );
if( !aDstRect.IsEmpty() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/outdev6.cxx |9 + 1 file changed, 5 insertions(+), 4 deletions(-) New commits: commit 65b3a78058e9d8a0e7c62ac9591c3b9e5c25eed7 Author: Chris Sherlock chris.sherloc...@gmail.com Date: Wed Apr 2 00:43:01 2014 +1100 fdo#74702 update bad advise in comment in DrawTransparentNatively() We really do *not* want to introduce the horror that is meOutDevType into our code. If we need to stop the Printer class from drawing a PolyPolygon then we should let Printer do this, not make OutputDevice make this decision on Printer's behalf! Change-Id: If74eccdf34688ce1164da2bb705ea48eefc18800 diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index d96e59f..ea60645 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -296,10 +296,11 @@ bool OutputDevice::DrawTransparentNatively ( const PolyPolygon rPolyPoly, // CAUTION: Only non printing (pixel-renderer) VCL commands from OutputDevices // should be used when printing. Normally this is avoided by the printer being // non-AAed and thus e.g. on WIN GdiPlus calls are not used. It may be necessary -// to add (OUTDEV_PRINTER != meOutDevType) to the entering if statement, thus -// using the fallbacl some lines below (which is not very good, though). For -// now, WinSalGraphics::drawPolyPolygon will detect printer usage and correct -// the wrong mapping (see there for details) +// to figure out a way of moving this code to it's own function that is +// overriden by the Print class, which will mean we deliberately override the +// functionality and we use the fallback some lines below (which is not very good, +// though. For now, WinSalGraphics::drawPolyPolygon will detect printer usage and +// correct the wrong mapping (see there for details) bDrawn = mpGraphics-DrawPolyPolygon( aB2DPolyPolygon, fTransparency, this ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/source padmin/source
desktop/source/app/app.cxx |2 +-
padmin/source/pamain.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 19cfea5843b4d992f9117925b8c1b070417a3d4f
Author: Andre Fischer a...@apache.org
Date: Tue Apr 1 13:49:43 2014 +
i124573: Initialize flags to allow acess bridge initialization to fail
gracefully (Merged from branch AOO410).
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b8fb316..6360e96 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1917,7 +1917,7 @@ void Desktop::Main()
RTL_LOGFILE_CONTEXT_TRACE( aLog, { GetEnableATToolSupport );
if(
Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{
-sal_Bool bQuitApp;
+sal_Bool bQuitApp (sal_False);
if( !InitAccessBridge( true, bQuitApp ) )
if( bQuitApp )
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index a9070c2..ca40ea5 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -145,7 +145,7 @@ void MyApp::Main()
if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{
-sal_Bool bQuitApp;
+sal_Bool bQuitApp (sal_False);
if( !InitAccessBridge( true, bQuitApp ) )
if( bQuitApp )
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit fecd4c53ffdb74881e88b8fc1707a58249e1a0a9
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 1 17:02:33 2014 +0300
Clear the VirtualDevice we create for an impBufferDevice on iOS
Helps rendering of complex SmartArt with shapes a lot, especially such
that include shadows. Exact mechanism unknown. Possibly on other
platforms virtual devices get implicitly cleared when created? Sigh,
fun.
SmartArt is still not rendered fully like on desktop (OS X), though.
Change-Id: I1bf92e85b5659ab7f9f4d843b77619de3af36d10
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 59d5885..2245520 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -233,7 +233,15 @@ namespace drawinglayer
if(isVisible())
{
+#ifdef IOS
+// Exact mechanism unknown, but for some reason SmartArt
+// rendering, especially shadows, is broken on iOS unless
+// we pass 'true' here. Are virtual devices always de
+// facto cleared when created on other platforms?
+mpContent = getVDevBuffer().alloc(mrOutDev, maDestPixel.GetSize(),
true, 0);
+#else
mpContent = getVDevBuffer().alloc(mrOutDev, maDestPixel.GetSize(),
false, 0);
+#endif
// #i93485# assert when copying from window to VDev is used
OSL_ENSURE(mrOutDev.GetOutDevType() != OUTDEV_WINDOW,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salgdicommon.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 2a163c787b991c57e7e32ea6909cce5e38427974
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 1 17:20:44 2014 +0300
Add some more CG_TRACEs
Change-Id: I076fd5957cac62f047778e63a1336bd322f90683
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index e0968e9..de28d5a 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -2002,6 +2002,7 @@ void AquaSalGraphics::SetVirDevGraphics( CGLayerRef
xLayer, CGContextRef xContex
// We will return early a few lines lower.
// Undo the stack initialization done at the initial call of
// this method, see end.
+CG_TRACE( CGContextRestoreGState( mrContext ) );
CGContextRestoreGState( mrContext );
}
#endif
@@ -2027,12 +2028,14 @@ void AquaSalGraphics::SetVirDevGraphics( CGLayerRef
xLayer, CGContextRef xContex
{
mnWidth = CGBitmapContextGetWidth( mrContext );
mnHeight = CGBitmapContextGetHeight( mrContext );
+CG_TRACE( CGBitmapContextGetWidthHeight( mrContext ) =
mnWidth x mnHeight );
}
else
{
const CGSize aSize = CGLayerGetSize( mxLayer );
mnWidth = static_castint(aSize.width);
mnHeight = static_castint(aSize.height);
+CG_TRACE( CGLayerGetSize( mxLayer ) = aSize );
}
// prepare graphics for drawing
@@ -2049,6 +2052,7 @@ void AquaSalGraphics::SetVirDevGraphics( CGLayerRef
xLayer, CGContextRef xContex
}
// initialize stack of CGContext states
+CG_TRACE( CGContextSaveGState( mrContext ) );
CGContextSaveGState( mrContext );
SetState();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source
sw/qa/unoapi/sw.sce |6 +++---
sw/source/core/docnode/nodedump.cxx |8
sw/source/core/unocore/unostyle.cxx |4 ++--
3 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 1e3c7b854baac2502bed72ff8e3e1b21b507735b
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Apr 1 15:54:58 2014 +0200
SwXStyle::getPropertyValue: don't try to read a float into a sal_Int32
The problem was that for the CharDiffHeight UNO property,
SvxFontHeightItem::QueryValue() put a float to the returned uno::Any.
When we noticed that it's not sal_Int16, we tried to read that into a
sal_Int32 (which failed), and then wrote back the result to the
uno::Any, that's how the result value was 0.
Fix this by checking if reading the uno::Any into a sal_Int32 succeeds.
Change-Id: Ie2269a24fe82ae241940811e7a2f5deaf9f1aeb0
diff --git a/sw/qa/unoapi/sw.sce b/sw/qa/unoapi/sw.sce
index cc6a359..4ea9fab 100644
--- a/sw/qa/unoapi/sw.sce
+++ b/sw/qa/unoapi/sw.sce
@@ -16,10 +16,10 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-# FIXME port to FillAttributes -o sw.CharacterStyle
-# FIXME port to FillAttributes -o sw.ConditionalParagraphStyle
+-o sw.CharacterStyle
+-o sw.ConditionalParagraphStyle
-o sw.PageStyle
-# FIXME port to FillAttributes -o sw.ParagraphStyle
+-o sw.ParagraphStyle
#i97 -o sw.SwAccessibleDocumentPageView
#i86751 -o sw.SwAccessibleDocumentView
-o sw.SwAccessibleEndnoteView
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 45047ed..1c417c8 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2557,8 +2557,8 @@ static uno::Any lcl_GetStyleProperty(const
SfxItemPropertySimpleEntry rEntry,
{
// since the sfx uint16 item now exports a sal_Int32, we may
have to fix this here
sal_Int32 nValue = 0;
-aRet = nValue;
-aRet = (sal_Int16)nValue;
+if (aRet = nValue)
+aRet = (sal_Int16)nValue;
}
// check for needed metric translation
commit 6f8ffc4eed5ff584bc9c9b9c210e7e0c58ccfd9b
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Apr 1 15:40:46 2014 +0200
sw doc model xml dump: handle SvxFontHeightItem
Change-Id: I27a9681fdf86a8814be48ba9875202705aa2b014
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 2d0cd2b..d6e1207 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -25,6 +25,7 @@
#include editeng/charrotateitem.hxx
#include editeng/rsiditem.hxx
#include editeng/fontitem.hxx
+#include editeng/fhgtitem.hxx
#include tools/datetimeutils.hxx
#include libxml/encoding.h
@@ -319,6 +320,13 @@ void lcl_dumpSfxItemSet(WriterHelper writer, const
SfxItemSet* pSet)
case RES_CHRATR_FONT: pWhich = character font; oValue =
OUStringToOString(static_castconst SvxFontItem*(pItem)-GetFamilyName(),
RTL_TEXTENCODING_UTF8); break;
case RES_CHRATR_BACKGROUND: pWhich = character background; break;
case RES_CHRATR_CTL_FONT: pWhich = character ctl font; break;
+case RES_CHRATR_FONTSIZE:
+{
+pWhich = character font size;
+const SvxFontHeightItem* pFontHeightItem = static_castconst
SvxFontHeightItem*(pItem);
+oValue = nHeight: +
OString::number(pFontHeightItem-GetHeight()) + , nProp: +
OString::number(pFontHeightItem-GetProp());
+}
+break;
}
if (pWhich)
writer.writeFormatAttribute(which, %s, BAD_CAST(pWhich));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bug 73552 - Set name of CSV import sheet to something friendly
On Sat, 2014-03-01 at 16:43 +0800, voilavoil...@yahoo.in wrote: diff file submitted on bugzilla: https://bugassistant.libreoffice.org/attachment.cgi?id=93826 I tweaked this for recent changes and submitted it via gerrit now as https://gerrit.libreoffice.org/#/c/8811/ C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Aw: Re: ship Maven meta information to ease creation of LO plugins with Maven
Hi, The LO jars generally need to be located at specific places within a LO installation tree. I am not sure that is compatible with the Maven concepts. Is is. After some nudging I from Sebastian I did this in Debian: libreoffice (1:4.1.5-1) unstable; urgency=low * new upstream release * debian/patches/kde-yield-fix.diff: backport patch from LO 4.2.0 which rewrites Qt4 based nested yield mutex locking (closes: #728987, #723087) * debian/control.ure.in: - add missing second a in additional (closes: #734512) * debian/pom.*.xml.in, debian/*.poms, debian/rules: - install maven stuff for juh,jurt,ridl and unoil (based on the poms from http://bertfrees.github.io/snapshots/org/libreoffice/), thanks Sebastian Humenda * debian/tests/junit-subsequentcheck: - temporarily disable the report builder here; Depends: generation for -subsequentcheckbase somehow misses the needed build-deps now...?! -- Rene Engelhard r...@debian.org Tue, 11 Feb 2014 15:36:06 +0100 See https://packages.debian.org/sid/ure https://packages.debian.org/sid/libreoffice-common $ dpkg --contents ure_4.1.5-2_amd64.deb drwxr-xr-x root/root 0 2014-03-02 03:37 ./ drwxr-xr-x root/root 0 2014-03-02 03:36 ./usr/ drwxr-xr-x root/root 0 2014-03-02 03:36 ./usr/lib/ drwxr-xr-x root/root 0 2014-03-02 03:23 ./usr/lib/ure/ drwxr-xr-x root/root 0 2014-03-02 03:42 ./usr/lib/ure/lib/ -rw-r--r-- root/root 10440 2014-03-02 03:42 ./usr/lib/ure/lib/libunsafe_uno_uno.so -rw-r--r-- root/root 35584 2014-03-02 03:42 ./usr/lib/ure/lib/libtextinstreamlo.so -rw-r--r-- root/root105560 2014-03-02 03:42 ./usr/lib/ure/lib/libjvmfwklo.so -rw-r--r-- root/root 14656 2014-03-02 03:42 ./usr/lib/ure/lib/libaffine_uno_uno.so -rw-r--r-- root/root 43800 2014-03-02 03:42 ./usr/lib/ure/lib/libjavaloaderlo.so -rw-r--r-- root/root 10248 2014-03-02 03:42 ./usr/lib/ure/lib/libjpipe.so -rw-r--r-- root/root 27280 2014-03-02 03:42 ./usr/lib/ure/lib/libnamingservicelo.so -rw-r--r-- root/root 52040 2014-03-02 03:42 ./usr/lib/ure/lib/libinvocadaptlo.so -rw-r--r-- root/root170704 2014-03-02 03:42 ./usr/lib/ure/lib/libunoidllo.so -rw-r--r-- root/root 27032 2014-03-02 03:42 ./usr/lib/ure/lib/libjvmaccesslo.so -rw-r--r-- root/root146816 2014-03-02 03:42 ./usr/lib/ure/lib/libjavavmlo.so -rw-r--r-- root/root 64744 2014-03-02 03:42 ./usr/lib/ure/lib/libacceptorlo.so -rw-r--r-- root/root 60648 2014-03-02 03:42 ./usr/lib/ure/lib/libconnectorlo.so -rw-r--r-- root/root183432 2014-03-02 03:42 ./usr/lib/ure/lib/libreflectionlo.so -rw-r--r-- root/root 10288 2014-03-02 03:42 ./usr/lib/ure/lib/libjuh.so -rw-r--r-- root/root117624 2014-03-02 03:42 ./usr/lib/ure/lib/libjava_uno.so -rw-r--r-- root/root163224 2014-03-02 03:42 ./usr/lib/ure/lib/libbinaryurplo.so -rw-r--r-- root/root121680 2014-03-02 03:42 ./usr/lib/ure/lib/libinvocationlo.so -rw-r--r-- root/root 2258 2014-03-01 21:05 ./usr/lib/ure/lib/JREProperties.class -rw-r--r-- root/root 73496 2014-03-02 03:42 ./usr/lib/ure/lib/libsunjavapluginlo.so -rw-r--r-- root/root793736 2014-03-02 03:42 ./usr/lib/ure/lib/libbootstraplo.so -rw-r--r-- root/root 64152 2014-03-02 03:42 ./usr/lib/ure/lib/libjuhx.so -rw-r--r-- root/root 31456 2014-03-02 03:42 ./usr/lib/ure/lib/libuuresolverlo.so -rw-r--r-- root/root 31504 2014-03-02 03:42 ./usr/lib/ure/lib/libproxyfaclo.so -rw-r--r-- root/root126736 2014-03-02 03:42 ./usr/lib/ure/lib/libstocserviceslo.so -rw-r--r-- root/root 1072 2014-02-05 16:04 ./usr/lib/ure/lib/unorc -rw-r--r-- root/root179088 2014-03-02 03:42 ./usr/lib/ure/lib/libintrospectionlo.so -rw-r--r-- root/root 1060 2014-02-05 16:04 ./usr/lib/ure/lib/jvmfwk3rc -rw-r--r-- root/root 14648 2014-03-02 03:42 ./usr/lib/ure/lib/liblog_uno_uno.so -rw-r--r-- root/root 60320 2014-03-02 03:42 ./usr/lib/ure/lib/libgcc3_uno.so -rw-r--r-- root/root184520 2014-03-02 03:42 ./usr/lib/ure/lib/libstreamslo.so -rw-r--r-- root/root 27312 2014-03-02 03:42 ./usr/lib/ure/lib/libtextoutstreamlo.so -rw-r--r-- root/root 1685544 2014-03-02 03:42 ./usr/lib/ure/lib/libsal_textenclo.so drwxr-xr-x root/root 0 2014-03-02 03:23 ./usr/lib/ure/share/ drwxr-xr-x root/root 0 2014-03-02 03:37 ./usr/lib/ure/share/java/ drwxr-xr-x root/root 0 2014-03-02 03:33 ./usr/lib/ure/share/misc/ -rw-r--r-- root/root 7885 2014-03-01 21:44 ./usr/lib/ure/share/misc/services.rdb -rw-r--r-- root/root 57175 2014-03-02 02:48 ./usr/lib/ure/share/misc/types.rdb -rw-r--r-- root/root 2311 2014-02-05 16:04 ./usr/lib/ure/share/misc/javavendors.xml drwxr-xr-x root/root 0 2014-03-02 03:42 ./usr/lib/ure/bin/ -rwxr-xr-x root/root 1508 2014-02-05 16:04 ./usr/lib/ure/bin/startup.sh -rwxr-xr-x root/root 89080 2014-03-02 03:42 ./usr/lib/ure/bin/uno.bin -rwxr-xr-x root/root 18960 2014-03-02 03:42 ./usr/lib/ure/bin/regmerge
Aw: Re: ship Maven meta information to ease creation of LO plugins with Maven
Hi, Is is. After some nudging I from Sebastian I did this in Debian: [...] https://packages.debian.org/sid/libreoffice-common https://packages.debian.org/sid/libreoffice-java-common, obviously. Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Aw: Re: ship Maven meta information to ease creation of LO plugins with Maven
Hi, isnt this what Rene already implemented for Debian (and thus Ubuntu) with: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git;a=commit;h=1c130152fdb881db51543513ddafb212ff5c6df2 So do you want that to be upstreamed? isn't this sort of the same as this upstream commit: commit 78e4b97a18a18f84c228de64fc48cee48138fbfe Author: David Ostrovsky da...@ostrovsky.org AuthorDate: Sun Oct 27 20:32:40 2013 +0100 Set up tool chain to install LO artifacts in Maven repositories Seems so, yes. Of course I didn't see that when I did that as I was doing this in 4.1.x first. Thanks for the pointer, will use that one in 4.2.x. Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig svx/source
starmath/inc/dialog.hxx |2
starmath/inc/helpids.h|1
starmath/source/dialog.cxx| 27 +---
starmath/source/dialog.hrc| 29
starmath/uiconfig/smath/ui/symdefinedialog.ui | 168 +++---
svx/source/dialog/charmap.cxx |2
6 files changed, 115 insertions(+), 114 deletions(-)
New commits:
commit 519f4b75a5f089b6ef98260ff6265f5000fe4659
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 1 16:19:26 2014 +0100
teach SmShowChar how to resize
and other cleanups
Change-Id: I1f6a57a6cb7c06a37e9c845fa93815d31008e6e1
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 4df16cd..ae3d214 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -373,6 +373,7 @@ public:
class SmShowChar : public Control
{
virtual voidPaint(const Rectangle) SAL_OVERRIDE;
+virtual voidResize() SAL_OVERRIDE;
public:
SmShowChar(Window *pParent, WinBits nStyle)
@@ -424,7 +425,6 @@ class SmSymDefineDialog : public ModalDialog
DECL_LINK(AddClickHdl, Button *);
DECL_LINK(ChangeClickHdl, Button *);
DECL_LINK(DeleteClickHdl, Button *);
-DECL_LINK(HelpButtonClickHdl, Button *);
voidFillSymbols(ComboBox rComboBox, bool bDeleteText = true);
voidFillSymbolSets(ComboBox rComboBox, bool bDeleteText = true);
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index b6d554f..66d8189 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -21,7 +21,6 @@
#define HID_SMA_FONTDIALOG
STARMATH_HID_SMA_FONTDIALOG
#define HID_SMA_DISTANCEDIALOG
STARMATH_HID_SMA_DISTANCEDIALOG
-#define HID_SMA_SYMDEFINEDIALOG
STARMATH_HID_SMA_SYMDEFINEDIALOG
#define HID_SMA_WIN_DOCUMENT
STARMATH_HID_SMA_WIN_DOCUMENT
#define HID_SMA_COMMAND_WIN_EDIT
STARMATH_HID_SMA_COMMAND_WIN_EDIT
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 4c87f59..cc22063 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -269,7 +269,6 @@ void SmShowFont::SetFont(const Font rFont)
SetTextColor( aTxtColor );
}
-
IMPL_LINK_INLINE_START( SmFontDialog, FontSelectHdl, ComboBox *, pComboBox )
{
Face.SetName(pComboBox-GetText());
@@ -1615,8 +1614,16 @@ void SmShowChar::SetSymbol( sal_UCS4 cChar, const Font
rFont )
Invalidate();
}
-
-
+void SmShowChar::Resize()
+{
+Control::Resize();
+const OUString rText = GetText();
+if (rText.isEmpty())
+return;
+sal_Int32 nStrIndex = 0;
+sal_UCS4 cChar = rText.iterateCodePoints(nStrIndex);
+SetSymbol(cChar, GetFont()); //force recalculation of size
+}
void SmSymDefineDialog::FillSymbols(ComboBox rComboBox, bool bDeleteText)
{
@@ -1963,17 +1970,6 @@ void SmSymDefineDialog::UpdateButtons()
pDeleteBtn-Enable(bDelete);
}
-IMPL_LINK( SmSymDefineDialog, HelpButtonClickHdl, Button *, EMPTYARG
/*pButton*/ )
-{
-// start help system
-Help* pHelp = Application::GetHelp();
-if( pHelp )
-{
-pHelp-Start( OUString( HID_SMA_SYMDEFINEDIALOG ), pHelpBtn );
-}
-return 0;
-}
-
SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
OutputDevice *pFntListDevice, SmSymbolManager rMgr) :
ModalDialog (pParent, EditSymbols,
modules/smath/ui/symdefinedialog.ui),
@@ -1995,13 +1991,10 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
get(pSymbolName, symbolName);
get(pSymbolDisplay, symbolDisplay);
get(pSymbolSetName, symbolSetName);
-get(pHelpBtn, help);
get(pAddBtn, add);
get(pChangeBtn, modify);
get(pDeleteBtn, delete);
-pHelpBtn-SetClickHdl(LINK(this, SmSymDefineDialog, HelpButtonClickHdl));
-
pFontList = new FontList( pFntListDevice );
pOrigSymbol = 0;
diff --git a/starmath/source/dialog.hrc b/starmath/source/dialog.hrc
deleted file mode 100644
index a726226..000
--- a/starmath/source/dialog.hrc
+++ /dev/null
@@ -1,29 +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/.
- *
- * 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.
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 11 - source/text/smath/01/06010100.xhp | 44 +++--- 2 files changed, 22 insertions(+), 33 deletions(-) New commits: commit ada2b43cf78b9cd4e69bd4d6bc4a5185def85295 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 1 16:29:53 2014 +0100 update help ids for math define symbol dialog .ui conversion Change-Id: Ia58d81494f02a92497577bb8002c9992ef4fc5f7 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index ba2d0d0..1f3f951 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5830,17 +5830,6 @@ sfx2_ModalDialog_RID_URLOPEN,1112571904, sfx2_ModalDialog_RID_WARN_PRINTTRANSPARENCY,1113047040, sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711, sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830, -starmath_ComboBox_RID_SYMDEFINEDIALOG_1,1401573377, -starmath_ComboBox_RID_SYMDEFINEDIALOG_2,1401573378, -starmath_ComboBox_RID_SYMDEFINEDIALOG_3,1401573379, -starmath_ComboBox_RID_SYMDEFINEDIALOG_4,1401573380, -starmath_ComboBox_RID_SYMDEFINEDIALOG_5,1401573381, -starmath_ListBox_RID_SYMDEFINEDIALOG_1,1401572865, -starmath_ListBox_RID_SYMDEFINEDIALOG_LB_FONTS_SUBSET,1401572975, -starmath_ModalDialog_RID_SYMDEFINEDIALOG,1401569280, -starmath_PushButton_RID_SYMDEFINEDIALOG_1,1401573889, -starmath_PushButton_RID_SYMDEFINEDIALOG_2,1401573890, -starmath_PushButton_RID_SYMDEFINEDIALOG_3,1401573891, svtools_CheckBox_DLG_LOGIN_CB_LOGIN_SAVEPASSWORD,1336427552, svtools_CheckBox_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE,1338786859, svtools_CheckBox_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT,1338786829, diff --git a/source/text/smath/01/06010100.xhp b/source/text/smath/01/06010100.xhp index 6772fd3..9d482da 100644 --- a/source/text/smath/01/06010100.xhp +++ b/source/text/smath/01/06010100.xhp @@ -31,53 +31,53 @@ /history /meta body -bookmark xml-lang=en-US branch=hid/starmath:ModalDialog:RID_SYMDEFINEDIALOG id=bm_id3149379 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/smath/ui/symdefinedialog/EditSymbols id=bm_id3149379 localize=false/ bookmark xml-lang=en-US branch=index id=bm_id2123477bookmark_valuenew symbols in %PRODUCTNAME Math/bookmark_value bookmark_valuesymbols; adding in %PRODUCTNAME Math/bookmark_value /bookmark paragraph role=heading id=hd_id3151075 xml-lang=en-US level=1 l10n=CHG oldref=1Edit Symbols/paragraph -paragraph role=paragraph id=par_id3154513 xml-lang=en-US l10n=CHG oldref=2ahelp hid=STARMATH_MODALDIALOG_RID_SYMDEFINEDIALOGUse this dialog to add symbols to a symbol set, to edit symbol sets, or to modify symbol notations./ahelp You can also define new symbol sets, assign names to symbols, or to modify existing symbol sets./paragraph +paragraph role=paragraph id=par_id3154513 xml-lang=en-US l10n=CHG oldref=2ahelp hid=modules/smath/ui/symdefinedialog/EditSymbolsUse this dialog to add symbols to a symbol set, to edit symbol sets, or to modify symbol notations./ahelp You can also define new symbol sets, assign names to symbols, or to modify existing symbol sets./paragraph section id=howtoget embed href=text/smath/00/0004.xhp#etssba/ /section -bookmark xml-lang=en-US branch=hid/starmath:ComboBox:RID_SYMDEFINEDIALOG:1 id=bm_id3154253 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/smath/ui/symdefinedialog/oldSymbols id=bm_id3154253 localize=false/ paragraph role=heading id=hd_id3146066 xml-lang=en-US level=2 l10n=CHG oldref=3Old Symbol/paragraph -paragraph role=paragraph id=par_id3153965 xml-lang=en-US l10n=CHG oldref=4ahelp hid=STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_1Select the name of the current symbol./ahelp The symbol, the name of the symbol, and the set that the symbol belongs to are displayed in the left preview pane at the bottom of the dialog box./paragraph -bookmark xml-lang=en-US branch=hid/starmath:ComboBox:RID_SYMDEFINEDIALOG:2 id=bm_id3145791 localize=false/ +paragraph role=paragraph id=par_id3153965 xml-lang=en-US l10n=CHG oldref=4ahelp hid=modules/smath/ui/symdefinedialog/oldSymbolsSelect the name of the current symbol./ahelp The symbol, the name of the symbol, and the set that the symbol belongs to are displayed in the left preview pane at the bottom of the dialog box./paragraph +bookmark xml-lang=en-US branch=hid/modules/smath/ui/symdefinedialog/oldSymbolSets id=bm_id3145791 localize=false/ paragraph role=heading id=hd_id3154020 xml-lang=en-US level=2 l10n=CHG oldref=7Old Symbol Set/paragraph -paragraph role=paragraph id=par_id3150209 xml-lang=en-US l10n=CHG oldref=8ahelp hid=STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_2This list box contains the name of the current symbol set. If you want, you can also select a different symbol set./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/starmath:ComboBox:RID_SYMDEFINEDIALOG:4 id=bm_id3153816 localize=false/ +paragraph role=paragraph id=par_id3150209 xml-lang=en-US l10n=CHG oldref=8ahelp
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 36fe4a2d75cb009340f505c3cea7187e9e08ec7c Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 1 16:29:53 2014 +0100 Updated core Project: help ada2b43cf78b9cd4e69bd4d6bc4a5185def85295 diff --git a/helpcontent2 b/helpcontent2 index ca52958..ada2b43 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ca529581c5958569af6ef77ce3e006bd73dbd5bc +Subproject commit ada2b43cf78b9cd4e69bd4d6bc4a5185def85295 ___ 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' - 19/cfea5843b4d992f9117925b8c1b070417a3d4f
19/cfea5843b4d992f9117925b8c1b070417a3d4f |1 + 1 file changed, 1 insertion(+) New commits: commit 49557335396d2958ae89749d250bc6755358297d Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 1 16:35:41 2014 +0100 Notes added by 'git notes add' diff --git a/19/cfea5843b4d992f9117925b8c1b070417a3d4f b/19/cfea5843b4d992f9117925b8c1b070417a3d4f new file mode 100644 index 000..9e3bb75 --- /dev/null +++ b/19/cfea5843b4d992f9117925b8c1b070417a3d4f @@ -0,0 +1 @@ +prefer: 130833f80e89774269108cf30b2d1155a00354ce ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/metaact.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e3dad060929de9bd2978f1b1427a91152073
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 1 16:52:21 2014 +0100
valgrind: Conditional jump or move depends on uninitialised value
Change-Id: Ia0b22f7c394d1c2387d1cad7e3d99c79eaeca81a
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index eaa511f..75f1465 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1083,7 +1083,7 @@ void MetaPolygonAction::Read( SvStream rIStm,
ImplMetaReadData* )
if( aCompat.GetVersion() = 2 ) // Version 2
{
-sal_uInt8 bHasPolyFlags;
+sal_uInt8 bHasPolyFlags(0);
rIStm.ReadUChar( bHasPolyFlags );
if ( bHasPolyFlags )
maPoly.Read( rIStm );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source
vcl/source/gdi/metaact.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a37f474a2272c505778774cd1d92897d8a744863
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 1 16:52:21 2014 +0100
valgrind: Conditional jump or move depends on uninitialised value
(cherry picked from commit e3dad060929de9bd2978f1b1427a91152073)
Conflicts:
vcl/source/gdi/metaact.cxx
Change-Id: Ia0b22f7c394d1c2387d1cad7e3d99c79eaeca81a
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index d205723..e7aed0d 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1066,7 +1066,7 @@ void MetaPolygonAction::Read( SvStream rIStm,
ImplMetaReadData* )
if( aCompat.GetVersion() = 2 ) // Version 2
{
-sal_uInt8 bHasPolyFlags;
+sal_uInt8 bHasPolyFlags(0);
rIStm bHasPolyFlags;
if ( bHasPolyFlags )
maPoly.Read( rIStm );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source
vcl/source/gdi/metaact.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d57b9a55a8fd77f24211a6196e0f7d360730ceb5
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 1 16:52:21 2014 +0100
valgrind: Conditional jump or move depends on uninitialised value
(cherry picked from commit e3dad060929de9bd2978f1b1427a91152073)
Conflicts:
vcl/source/gdi/metaact.cxx
Change-Id: Ia0b22f7c394d1c2387d1cad7e3d99c79eaeca81a
(cherry picked from commit a37f474a2272c505778774cd1d92897d8a744863)
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index ef702cc..2ab9faa 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1063,7 +1063,7 @@ void MetaPolygonAction::Read( SvStream rIStm,
ImplMetaReadData* )
if( aCompat.GetVersion() = 2 ) // Version 2
{
-sal_uInt8 bHasPolyFlags;
+sal_uInt8 bHasPolyFlags(0);
rIStm bHasPolyFlags;
if ( bHasPolyFlags )
maPoly.Read( rIStm );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/memory.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 81ad1147360d9a3ff339671ebe15acde8a6b7c67
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 1 19:17:07 2014 +0300
WaE: 'MAC_OS_X_VERSION_MAX_ALLOWED' is not defined, evaluates to 0
(When compiling for iOS.)
Change-Id: I9f9f5b122c1bfac4ff670a4302fb10b6b82685ac
diff --git a/sal/osl/unx/memory.c b/sal/osl/unx/memory.c
index bde2fac..f31c28c 100644
--- a/sal/osl/unx/memory.c
+++ b/sal/osl/unx/memory.c
@@ -41,7 +41,7 @@ void* osl_aligned_alloc( sal_Size align, sal_Size size )
void osl_aligned_free( void* p )
{
-#if defined __APPLE__ MAC_OS_X_VERSION_MAX_ALLOWED 1060
+#if defined MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_MAX_ALLOWED 1060
free(((void**)p)[-1]);
#else
free(p);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx
include/svx/svxids.hrc |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit b66d87086804460c1986df1b832fd6b2ea075a90 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Apr 1 18:59:12 2014 +0200 svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID As commit 669ad519902e21e0cb3537fb7e203987f75a4077 (colliding SID_SVX_START based ids, 2013-06-24) suggests, new SID_SVX_START-based SID's shouldn't be added to include/editeng/editids.hrc. However, if it was done, at least add a comment about it to include/svx/svxids.hrc, so it becomes obvious that the two slots have the same ID. This makes Format - Frame - Area - Bitmap have the Import Graphic button again. Change-Id: I2fc852200d3cc5dfbf073ed615ac83a46040e16c diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index f8921ad..a4fe309 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -1020,9 +1020,10 @@ #define SID_ATTR_BORDER_STYLES ( SID_SVX_START + 1140 ) #define SID_ATTR_BORDER_DEFAULT_WIDTH ( SID_SVX_START + 1141 ) +// 1142 is used by editeng (SID_ATTR_CHAR_GRABBAG) // -#define SID_OFFER_IMPORT( SID_SVX_START + 1142 ) +#define SID_OFFER_IMPORT( SID_SVX_START + 1143 ) // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id #define SID_SVX_FIRSTFREE (SID_OFFER_IMPORT + 1) ___ 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_ios_arm/uno2cpp-arm64.cxx | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
New commits:
commit f470434b364ae223934cc4436cdc07eb03710c49
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 1 20:17:30 2014 +0300
WaE: unused parameter 'nGPR' and 'nFPR'
Change-Id: If1de390588d9f73f1dd47a622e3b183062386043
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
index 49e0191..788b98e 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
@@ -125,9 +125,7 @@ void callVirtualMethod(
sal_uInt64 *pStack,
int nStack,
sal_uInt64 *pGPR,
-int nGPR,
-double *pFPR,
-int nFPR)
+double *pFPR)
{
// never called
if (! pThis)
@@ -141,9 +139,6 @@ void callVirtualMethod(
memcpy( stack, pStack, nStackBytes );
}
-assert( nGPR = arm::MAX_GPR_REGS );
-assert( nFPR = arm::MAX_FPR_REGS );
-
sal_uInt64 pMethod = *((sal_uInt64*)pThis);
pMethod += 8 * nVtableIndex;
pMethod = *((sal_uInt64 *)pMethod);
@@ -348,6 +343,9 @@ static void cpp_call(
}
}
+assert( nGPR = arm::MAX_GPR_REGS );
+assert( nFPR = arm::MAX_FPR_REGS );
+
try
{
callVirtualMethod(
@@ -355,8 +353,8 @@ static void cpp_call(
pCppReturn, pReturnTypeRef,
pStackStart,
(pStack - pStackStart),
-pGPR, nGPR,
-pFPR, nFPR);
+pGPR,
+pFPR);
// NO exception occurred...
*ppUnoExc = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source
forms/source/inc/FormComponent.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6478730e126f0bf90790eb89c99a5eebced1409d Author: Stephan Bergmann sberg...@redhat.com Date: Tue Apr 1 19:42:02 2014 +0200 Forgotten TODO Change-Id: I4fb1c155c533445856639498e73c728933bb3dd7 diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 27e6f8d..adfb2ed 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -529,7 +529,7 @@ public: // simple destructor #define DECLARE_DEFAULT_DTOR( classname ) \ -~classname()override/*TODO*/\ +virtual ~classname() // constructor for cloning a class #define DECLARE_DEFAULT_CLONE_CTOR( classname ) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/headless/svpgdi.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 80ae2acd00d89fd9dda183affb5a0251e233c2de
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 1 20:49:51 2014 +0300
Fix error: out-of-line definition of does not match declaration
Change-Id: I3e3d215eb6c94fd86481bc1666d94139692bc209
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 028d71c..800ab1a 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -257,7 +257,7 @@ public:
boolIsPenVisible() const{ return
maLineColor.IsVisible(); }
boolIsBrushVisible() const { return
maFillColor.IsVisible(); }
voidImplDrawPixel( long nX, long nY, const RGBAColor );
// helper to draw single pixels
-CGPoint*makeCGptArray(sal_uLong nPoints, const SalPoint*
pPtAry);
+CGPoint*makeCGptArray(sal_uInt32 nPoints, const SalPoint*
pPtAry);
bool IsFlipped() const { return false; }
void ApplyXorContext();
void Pattern50Fill();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc
starmath/inc/dialog.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit f7e2f60d51e811aa2dbd0d8acf2c4c0dcefe14de Author: Tor Lillqvist t...@collabora.com Date: Tue Apr 1 21:54:54 2014 +0300 WaE: private field 'pHelpBtn' is not used Change-Id: I7c8e9f33e8b36cb36a0e0e4f4be4241b23df270b diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 6a34c6e..7efaa1f 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -403,7 +403,6 @@ class SmSymDefineDialog : public ModalDialog FixedText* pSymbolName; SmShowChar* pSymbolDisplay; FixedText* pSymbolSetName; -HelpButton* pHelpBtn; PushButton* pAddBtn; PushButton* pChangeBtn; PushButton* pDeleteBtn; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - connectivity/source shell/source slideshow/source vcl/inc vcl/osx
connectivity/source/drivers/macab/MacabColumns.cxx | 10
connectivity/source/drivers/macab/MacabTable.cxx |4 +--
connectivity/source/drivers/macab/MacabTables.hxx|2 -
shell/source/backends/macbe/macbackend.hxx |2 -
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx | 12
+-
vcl/inc/quartz/salgdi.h |2 -
vcl/osx/DragSourceContext.hxx|2 -
vcl/osx/clipboard.hxx|2 -
8 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 4ffb0830ad0a3ee2b596f771423b4a8438e74357
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 1 21:24:56 2014 +0200
loplugin:literaltoboolconversion
Change-Id: I90f590a64f6004aecf7da5253db158e382a5b801
diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx
b/connectivity/source/drivers/macab/MacabColumns.cxx
index 713ff04..2556e21 100644
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
@@ -62,10 +62,10 @@ sdbcx::ObjectType MacabColumns::createObject(const
OUString _rName)
xRow-getInt(7),
xRow-getInt(9),
xRow-getInt(5),
-sal_False,
-sal_False,
-sal_False,
-sal_True,
+false,
+false,
+false,
+true,
sCatalogName,
sSchemaName,
sTableName);
@@ -86,7 +86,7 @@ void MacabColumns::impl_refresh() throw(RuntimeException)
MacabColumns::MacabColumns( MacabTable* _pTable,
::osl::Mutex _rMutex,
const TStringVector _rVector)
-: sdbcx::OCollection(*_pTable, sal_True, _rMutex, _rVector),
+: sdbcx::OCollection(*_pTable, true, _rMutex, _rVector),
m_pTable(_pTable)
{
}
diff --git a/connectivity/source/drivers/macab/MacabTable.cxx
b/connectivity/source/drivers/macab/MacabTable.cxx
index 26c83eb..f0f4291 100644
--- a/connectivity/source/drivers/macab/MacabTable.cxx
+++ b/connectivity/source/drivers/macab/MacabTable.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::lang;
MacabTable::MacabTable( sdbcx::OCollection* _pTables, MacabConnection*
_pConnection)
-: MacabTable_TYPEDEF(_pTables, sal_True),
+: MacabTable_TYPEDEF(_pTables, true),
m_pConnection(_pConnection)
{
construct();
@@ -48,7 +48,7 @@ MacabTable::MacabTable( sdbcx::OCollection* _pTables,
const OUString _Description ,
const OUString _SchemaName,
const OUString _CatalogName
-) : MacabTable_TYPEDEF(_pTables,sal_True,
+) : MacabTable_TYPEDEF(_pTables,true,
_Name,
_Type,
_Description,
diff --git a/connectivity/source/drivers/macab/MacabTables.hxx
b/connectivity/source/drivers/macab/MacabTables.hxx
index 160312e..e177b30 100644
--- a/connectivity/source/drivers/macab/MacabTables.hxx
+++ b/connectivity/source/drivers/macab/MacabTables.hxx
@@ -41,7 +41,7 @@ namespace connectivity
::cppu::OWeakObject _rParent,
::osl::Mutex _rMutex,
const TStringVector _rVector)
-: sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector),
+: sdbcx::OCollection(_rParent,true,_rMutex,_rVector),
m_xMetaData(_rMetaData)
{ }
commit 6a3b0b7cc45b7aab2611331476decfd06211a73d
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 1 21:22:51 2014 +0200
Explicitly mark overriding destructors as virtual, Mac OS X redux
Change-Id: Ib7ab02bc3cdadbdfe0e0787560d1dd562eb85be9
diff --git a/shell/source/backends/macbe/macbackend.hxx
b/shell/source/backends/macbe/macbackend.hxx
index 33687e8..75d3288 100644
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
@@ -123,7 +123,7 @@ protected:
MacOSXBackend();
/** Destructor */
-~MacOSXBackend(void);
+virtual ~MacOSXBackend(void);
};
#endif // INCLUDED_SHELL_SOURCE_BACKENDS_MACBE_MACBACKEND_HXX
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
index ef0d6ea..d747550 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
@@ -349,7 +349,7 @@ public:
*/
SRotate(const basegfx::B3DVector Axis,const basegfx::B3DVector
Origin,double Angle,bool bInter, double T0, double T1);
-
[Libreoffice-commits] core.git: 4 commits - sw/source
sw/source/core/layout/movedfwdfrmsbyobjpos.cxx |1 - sw/source/core/layout/newfrm.cxx| 12 sw/source/core/layout/objectformatter.cxx |3 --- sw/source/core/layout/objectformatterlayfrm.cxx |1 - 4 files changed, 17 deletions(-) New commits: commit 7fcab08f36fe8bceeab7235e3b83cddeb06fd103 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Apr 1 21:34:13 2014 +0200 sw: unused include in objectformatterlayfrm Change-Id: I12bdb00e89978c977d1d9cb721462bf23849a876 diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx index 6fee581..fcfe539 100644 --- a/sw/source/core/layout/objectformatterlayfrm.cxx +++ b/sw/source/core/layout/objectformatterlayfrm.cxx @@ -20,7 +20,6 @@ #include objectformatterlayfrm.hxx #include anchoredobject.hxx #include sortedobjs.hxx -#include layfrm.hxx #include pagefrm.hxx // #124218# commit f90898d8c25436307a0a96e8cbe78322b6eda2d0 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Apr 1 21:32:48 2014 +0200 sw: unused include in objectformatter Change-Id: I7d789c2467c03a20d033b146ef2f89cbf6e9104a diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx index b27473d..fa2d735 100644 --- a/sw/source/core/layout/objectformatter.cxx +++ b/sw/source/core/layout/objectformatter.cxx @@ -17,17 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include objectformatter.hxx #include objectformattertxtfrm.hxx #include objectformatterlayfrm.hxx -#include anchoredobject.hxx #include anchoreddrawobject.hxx #include sortedobjs.hxx #include pagefrm.hxx #include flyfrms.hxx #include txtfrm.hxx #include layact.hxx -#include frmfmt.hxx #include fmtanchr.hxx #include doc.hxx commit 96851a755b4d2d8a57f6ef6553c6b31606fc1d05 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Apr 1 21:29:20 2014 +0200 sw: unused include in newfrm Change-Id: Ie7542d39555be3c649a0712a147281cc1066ca2f diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index a8cf7d8..5a8d3c1 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -19,30 +19,18 @@ #include svx/svdmodel.hxx #include svx/svdpage.hxx -#include fmtfordr.hxx #include fmtpdsc.hxx -#include frmfmt.hxx #include swtable.hxx #include rootfrm.hxx #include pagefrm.hxx -#include cntfrm.hxx -#include viewsh.hxx -#include doc.hxx -#include node.hxx #include dflyobj.hxx #include frmtool.hxx #include virtoutp.hxx #include blink.hxx -#include ndindex.hxx #include sectfrm.hxx #include notxtfrm.hxx #include pagedesc.hxx #include viewimp.hxx -#include IDocumentTimerAccess.hxx -#include IDocumentLayoutAccess.hxx -#include IDocumentFieldsAccess.hxx -#include IDocumentSettingAccess.hxx -#include IDocumentDrawModelAccess.hxx #include hints.hxx #include viewopt.hxx #include set commit 0e9e11526c0941496dd9393c2a997aca957dce5a Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Apr 1 21:21:38 2014 +0200 sw: unused include in movedfwdfrmsbyobjpos Change-Id: I61aad02e598ca8a286772f8757f980b91ee08bcc diff --git a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx index ebb624d..d812aa3 100644 --- a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx +++ b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx @@ -21,7 +21,6 @@ #include txtfrm.hxx #include rowfrm.hxx #include pagefrm.hxx -#include ndtxt.hxx #include switerator.hxx SwMovedFwdFrmsByObjPos::SwMovedFwdFrmsByObjPos() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 m.a.riosv mari...@miguelangel.mobi changed: What|Removed |Added Depends on||76912 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRParser.cpp | 176 ++
src/lib/CDRParser.h |1
2 files changed, 94 insertions(+), 83 deletions(-)
New commits:
commit 7e91dba8fbcb237f281ad0a113cf51326154b4d5
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Wed Apr 2 01:37:02 2014 +0200
CorelDraw X7 txsm
Change-Id: I2f0507fe2a72f3c1adb3ff60c557ca14c977ec6a
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 5782ff7..62d967d 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -151,85 +151,6 @@ static int parseColourString(const char *colourString,
libcdr::CDRColor colour,
return 1;
}
-static void _readX6StyleString(librevenge::RVNGInputStream *input, unsigned
length, libcdr::CDRCharacterStyle style)
-{
- std::vectorunsigned char styleBuffer(length);
- unsigned long numBytesRead = 0;
- const unsigned char *tmpBuffer = input-read(length, numBytesRead);
- if (numBytesRead)
-memcpy(styleBuffer[0], tmpBuffer, numBytesRead);
- librevenge::RVNGString styleString;
- libcdr::appendCharacters(styleString, styleBuffer);
- CDR_DEBUG_MSG((CDRParser::_readX6StyleString - styleString = \%s\\n,
styleString.cstr()));
-
- boost::property_tree::ptree pt;
- try
- {
-std::stringstream ss;
-ss styleString.cstr();
-boost::property_tree::read_json(ss, pt);
- }
- catch (...)
- {
-return;
- }
-
- if (pt.count(character))
- {
-boost::optionalstd::string fontName =
pt.get_optionalstd::string(character.latin.font);
-if (!!fontName)
- style.m_fontName = fontName.get().c_str();
-unsigned short encoding = pt.get(character.latin.charset, 0);
-if (encoding || style.m_charSet == (unsigned short)-1)
- style.m_charSet = encoding;
-processNameForEncoding(style.m_fontName, style.m_charSet);
-boost::optionalunsigned fontSize =
pt.get_optionalunsigned(character.latin.size);
-if (!!fontSize)
- style.m_fontSize = (double)fontSize.get() / 254000.0;
-
-if (pt.count(character.outline))
-{
- style.m_lineStyle.lineType = 0;
- boost::optionalunsigned lineWidth =
pt.get_optionalunsigned(character.outline.width);
- if (!!lineWidth)
-style.m_lineStyle.lineWidth = (double)lineWidth.get() / 254000.0;
- boost::optionalstd::string color =
pt.get_optionalstd::string(character.outline.color);
- if (!!color)
- {
-double opacity = 1.0;
-parseColourString(color.get().c_str(), style.m_lineStyle.color,
opacity);
- }
-}
-
-if (pt.count(character.fill))
-{
- boost::optionalunsigned short type = pt.get_optionalunsigned
short(character.fill.type);
- if (!!type)
-style.m_fillStyle.fillType = type.get();
- boost::optionalstd::string color1 =
pt.get_optionalstd::string(character.fill.primaryColor);
- if (!!color1)
- {
-double opacity = 1.0;
-parseColourString(color1.get().c_str(), style.m_fillStyle.color1,
opacity);
- }
- boost::optionalstd::string color2 =
pt.get_optionalstd::string(character.fill.primaryColor);
- if (!!color2)
- {
-double opacity = 1.0;
-parseColourString(color2.get().c_str(), style.m_fillStyle.color2,
opacity);
- }
-}
- }
-
- if (pt.count(paragraph))
- {
-boost::optionalunsigned align =
pt.get_optionalunsigned(paragraph.justify);
-if (!!align)
- style.m_align = align.get();
- }
-}
-
-
} // anonymous namespace
libcdr::CDRParser::CDRParser(const std::vectorlibrevenge::RVNGInputStream *
externalStreams, libcdr::CDRCollector *collector)
@@ -3044,7 +2965,9 @@ void
libcdr::CDRParser::readTxsm16(librevenge::RVNGInputStream *input)
{
input-seek(28, librevenge::RVNG_SEEK_CUR);
unsigned tlen = readU32(input);
- input-seek(2*tlen + 4, librevenge::RVNG_SEEK_CUR);
+ if (m_version 1700)
+tlen *= 2;
+ input-seek(tlen + 4, librevenge::RVNG_SEEK_CUR);
}
else
{
@@ -3076,8 +2999,10 @@ void
libcdr::CDRParser::readTxsm16(librevenge::RVNGInputStream *input)
input-seek(1, librevenge::RVNG_SEEK_CUR);
unsigned len2 = readU32(input);
+if (m_version 1700)
+ len2 *= 2;
CDRCharacterStyle defaultStyle;
-_readX6StyleString(input, 2*len2, defaultStyle);
+_readX6StyleString(input, len2, defaultStyle);
unsigned numRecords = readU32(input);
@@ -3093,10 +3018,13 @@ void
libcdr::CDRParser::readTxsm16(librevenge::RVNGInputStream *input)
if (flag 0x04)
{
lenN = readU32(input);
-input-seek(2*lenN, librevenge::RVNG_SEEK_CUR);
+lenN *= 2;
+input-seek(lenN, librevenge::RVNG_SEEK_CUR);
}
lenN = readU32(input);
- _readX6StyleString(input, 2*lenN, charStyles[i*2]);
+ if (m_version 1700)
+lenN *= 2;
+ _readX6StyleString(input, lenN, charStyles[i*2]);
}
unsigned numChars = readU32(input);
@@ -3392,4 +3320,86 @@ void
[Libreoffice-commits] core.git: Branch 'private/moggi/opengl-3D-bar-rendering' - 3 commits - include/svx include/vcl svx/Library_svxcore.mk svx/source vcl/source
include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx |4 +
include/vcl/OpenGLContext.hxx|2
svx/Library_svxcore.mk |3 +
svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx |3 +
vcl/source/opengl/OpenGLContext.cxx | 37 ---
5 files changed, 34 insertions(+), 15 deletions(-)
New commits:
commit b48f11667dc28abf8fbbb0c4136909a437c0e00b
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Apr 2 03:31:38 2014 +0200
fix crash when passing external Window to OpenGLContext::init
The external window is not controlled by OpenGLContext so it is not
allowed to delete the window
Change-Id: Id2c79a3612cc875fd94b8cd1206b30af2f185875
diff --git a/include/vcl/OpenGLContext.hxx b/include/vcl/OpenGLContext.hxx
index 91355bf..e84e8fc 100644
--- a/include/vcl/OpenGLContext.hxx
+++ b/include/vcl/OpenGLContext.hxx
@@ -108,6 +108,7 @@ private:
GLWindow m_aGLWin;
boost::scoped_ptrWindow m_pWindow;
+Window* mpWindow; //points to m_pWindow or the parent window, don't delete
it
boost::scoped_ptrSystemChildWindow m_pChildWindow;
bool mbInitialized;
};
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 8540da3..b9b9125 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -14,6 +14,7 @@
using namespace com::sun::star;
OpenGLContext::OpenGLContext():
+mpWindow(NULL),
mbInitialized(false)
{
}
@@ -319,13 +320,15 @@ int oglErrorHandler( Display* /*dpy*/, XErrorEvent*
/*evnt*/ )
bool OpenGLContext::init( Window* pParent )
{
-m_pWindow.reset(pParent ? pParent : new Window(0,
WB_NOBORDER|WB_NODIALOGCONTROL));
if(mbInitialized)
return true;
+m_pWindow.reset(pParent ? NULL : new Window(0,
WB_NOBORDER|WB_NODIALOGCONTROL));
+mpWindow = pParent ? pParent : m_pWindow.get();
SAL_INFO(vcl.opengl, OpenGLContext::OpenGLContextstart);
initWindow();
-m_pWindow-setPosSizePixel(0,0,0,0);
+if(m_pWindow)
+m_pWindow-setPosSizePixel(0,0,0,0);
m_aGLWin.Width = 0;
m_aGLWin.Height = 0;
@@ -396,10 +399,10 @@ bool OpenGLContext::init( Window* pParent )
double nGLXVersion = 0;
if( glXQueryVersion( m_aGLWin.dpy, glxMajor, glxMinor ) )
nGLXVersion = glxMajor + 0.1*glxMinor;
-SAL_INFO(vcl.opengl, available GLX version: %f, nGLXVersion);
+SAL_INFO(vcl.opengl, available GLX version: nGLXVersion);
m_aGLWin.GLExtensions = glGetString( GL_EXTENSIONS );
-SAL_INFO(vcl.opengl, available GL extensions: %s,
m_aGLWin.GLExtensions);
+SAL_INFO(vcl.opengl, available GL extensions:
m_aGLWin.GLExtensions);
if( m_aGLWin.HasGLXExtension(GLX_SGI_swap_control ) )
{
@@ -451,7 +454,8 @@ bool OpenGLContext::init( Window* pParent )
void OpenGLContext::setWinSize(const Size rSize)
{
-m_pWindow-SetSizePixel(rSize);
+if(m_pWindow)
+m_pWindow-SetSizePixel(rSize);
m_pChildWindow-SetSizePixel(rSize);
}
@@ -464,12 +468,11 @@ GLWindow OpenGLContext::getOpenGLWindow()
bool OpenGLContext::initWindow()
{
-const SystemEnvData* sysData(m_pWindow-GetSystemData());
+const SystemEnvData* sysData(mpWindow-GetSystemData());
m_aGLWin.hWnd = sysData-hWnd;
SystemWindowData winData;
winData.nSize = sizeof(winData);
-m_pChildWindow.reset(new SystemChildWindow(m_pWindow.get(), 0, winData,
sal_False));
-
+m_pChildWindow.reset(new SystemChildWindow(mpWindow.get(), 0, winData,
sal_False));
if( m_pChildWindow )
{
@@ -503,14 +506,13 @@ void initOpenGLFunctionPointers()
glXChooseFBConfig = (GLXFBConfig*(*)(Display *dpy, int screen, const int
*attrib_list, int
*nelements))glXGetProcAddressARB((GLubyte*)glXChooseFBConfig);
glXGetVisualFromFBConfig = (XVisualInfo*(*)(Display *dpy, GLXFBConfig
config))glXGetProcAddressARB((GLubyte*)glXGetVisualFromFBConfig);// try
to find a visual for the current set of attributes
glXGetFBConfigAttrib = (int(*)(Display *dpy, GLXFBConfig config, int
attribute, int* value))glXGetProcAddressARB((GLubyte*)glXGetFBConfigAttrib);
-
}
}
bool OpenGLContext::initWindow()
{
-const SystemEnvData* sysData(m_pWindow-GetSystemData());
+const SystemEnvData* sysData(mpWindow-GetSystemData());
m_aGLWin.dpy = reinterpret_castDisplay*(sysData-pDisplay);
@@ -519,7 +521,7 @@ bool OpenGLContext::initWindow()
m_aGLWin.win = sysData-aWindow;
-SAL_INFO(vcl.opengl, parent window: %d, m_aGLWin.win);
+SAL_INFO(vcl.opengl, parent window: m_aGLWin.win);
XWindowAttributes xattr;
XGetWindowAttributes( m_aGLWin.dpy, m_aGLWin.win, xattr );
@@ -582,9 +584,9 @@ bool OpenGLContext::initWindow()
{
SystemWindowData winData;
winData.nSize = sizeof(winData);
-SAL_INFO(vcl.opengl, using VisualID %08X, vi-visualid);
+
[Libreoffice-commits] core.git: Branch 'private/moggi/opengl-3D-bar-rendering' - include/svx svx/source
include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx |5 +
include/svx/svdoopengl.hxx | 10 ++
svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx |3 ---
3 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit aff868fb3a240d176372fa5771c86a7ee993caff
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Apr 2 03:42:03 2014 +0200
move the OpenGLContext to the model object
In the next step we need to initialize it again but in the ViewContact
it gets destroyed several times which is a problem.
Change-Id: I3efe4311bfb279b7407eabd0dd673f33603d8e9b
diff --git a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
b/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
index 00e1dff..f540624c 100644
--- a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
@@ -24,11 +24,8 @@ public:
ViewObjectContactOfOpenGLObj(ObjectContact rObjectContact, ViewContact
rViewContact);
virtual ~ViewObjectContactOfOpenGLObj();
-protected:
-Window* getWindow() const;
-
private:
-OpenGLContext m_aOpenGLContext;
+Window* getWindow() const;
};
} // namespace sdr
diff --git a/include/svx/svdoopengl.hxx b/include/svx/svdoopengl.hxx
index 857e313..4510f56 100644
--- a/include/svx/svdoopengl.hxx
+++ b/include/svx/svdoopengl.hxx
@@ -12,6 +12,7 @@
#include svx/svdobj.hxx
#include svx/sdr/contact/viewcontactofopenglobj.hxx
+#include vcl/OpenGLContext.hxx
class SVX_DLLPUBLIC SdrOpenGLObj : public SdrObject
{
@@ -20,6 +21,15 @@ public:
{
return new sdr::contact::ViewContactOfOpenGLObj(*this);
}
+
+OpenGLContext getOpenGLContext()
+{
+return maContext;
+}
+
+private:
+
+OpenGLContext maContext;
};
#endif
diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
index 1689468..2cf0086 100644
--- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
@@ -18,9 +18,6 @@ ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj(
ObjectContact rObjectContact, ViewContact rViewContact )
: ViewObjectContactOfSdrObj( rObjectContact, rViewContact )
{
-m_aOpenGLContext.init(getWindow());
-// Set a dummy size to make the window visible
-m_aOpenGLContext.setWinSize(Size(200,200));
}
ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/opengl-3D-bar-rendering' - include/svx svx/Library_svxcore.mk svx/source
include/svx/svdoopengl.hxx | 19 +--
svx/Library_svxcore.mk |1 +
svx/source/svdraw/svdoopengl.cxx | 33 +
3 files changed, 43 insertions(+), 10 deletions(-)
New commits:
commit ac7c75d26bb706a569c733e084b530d037fb050d
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Apr 2 04:09:43 2014 +0200
initial work on allowing to resize the OpenGL object
Change-Id: I29799522d32e31b4ffbba9d931fda352ee080e2d
diff --git a/include/svx/svdoopengl.hxx b/include/svx/svdoopengl.hxx
index 4510f56..4bd4bc2 100644
--- a/include/svx/svdoopengl.hxx
+++ b/include/svx/svdoopengl.hxx
@@ -11,21 +11,20 @@
#define INCLUDED_SVX_SVDO_OPENGL_HXX
#include svx/svdobj.hxx
-#include svx/sdr/contact/viewcontactofopenglobj.hxx
#include vcl/OpenGLContext.hxx
+namespace sdr { namespace contact {
+class ViewContact;
+} }
+
class SVX_DLLPUBLIC SdrOpenGLObj : public SdrObject
{
public:
-virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact()
SAL_OVERRIDE
-{
-return new sdr::contact::ViewContactOfOpenGLObj(*this);
-}
-
-OpenGLContext getOpenGLContext()
-{
-return maContext;
-}
+virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact()
SAL_OVERRIDE;
+
+OpenGLContext getOpenGLContext();
+
+virtual void NbcResize(const Point rRef, const Fraction xFact, const
Fraction yFact);
private:
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index b3c3521..8826d9f 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -297,6 +297,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/svdraw/svdomeas \
svx/source/svdraw/svdomedia \
svx/source/svdraw/svdoole2 \
+svx/source/svdraw/svdoopengl \
svx/source/svdraw/svdopage \
svx/source/svdraw/svdopath \
svx/source/svdraw/svdorect \
diff --git a/svx/source/svdraw/svdoopengl.cxx b/svx/source/svdraw/svdoopengl.cxx
new file mode 100644
index 000..45d23ae
--- /dev/null
+++ b/svx/source/svdraw/svdoopengl.cxx
@@ -0,0 +1,33 @@
+/* -*- 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 svx/svdoopengl.hxx
+#include svx/sdr/contact/viewcontactofopenglobj.hxx
+
+sdr::contact::ViewContact* SdrOpenGLObj::CreateObjectSpecificViewContact()
+{
+return new sdr::contact::ViewContactOfOpenGLObj(*this);
+}
+
+OpenGLContext SdrOpenGLObj::getOpenGLContext()
+{
+return maContext;
+}
+
+void SdrOpenGLObj::NbcResize(const Point rRef, const Fraction xFact, const
Fraction yFact)
+{
+SdrObject::NbcResize(rRef, xFact, yFact);
+
+//now pass the information to the OpenGL context
+maContext.setWinSize(aOutRect.GetSize());
+SAL_WARN(svx.opengl, resized opengl drawinglayer object);
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Crash in Impress, when you add a directory and a single picture to the Photo Album
Hello Pedro, *, On Montag, 31. März 2014 22:55 Pedro wrote: Thomas Hackert wrote Maybe this is related to https://bugs.freedesktop.org/show_bug.cgi?id=76778 which has already been fixed in Master (I haven't verified because I stopped using daily builds) I tested it with LO Version: 4.3.0.0.alpha0+ Build ID: 8bf22e7fe67b3321e2b2dcc8fb98882ef0eef4ca TinderBox: Linux-rpm_deb- x86@45-TDF, Branch:master, Time: 2014-03-25_23:30:53 under Debian Testing i686, but it is still the same ... :( If I do not disable LO's own dialog, it crashes, and when I use KDE's own dialog, LO does nothing ... :( You probably didn't notice that the patch for the bug was submitted yesterday. So your build from the 25th couldn't possibly include the fix :) oh sorry, really missed it ... ( Try with today and/or tomorrow's build and if it isn't fixed report a new bug. As there is no new build released until now, I will look at it tomorrow ... ;) I have found https://bugs.freedesktop.org/show_bug.cgi?id=64654, which is related to the Photo Album. Do you think, this could be related to my bug (though I only used a directory with one picture inside the subdirectory and one additional in the main directory)? Have a nice evening Thomas. -- I smell a RANCID CORN DOG! ___ 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] Crash in Impress, when you add a directory and a single picture to the Photo Album
Hi Thomas, all Thomas Hackert wrote I have found https://bugs.freedesktop.org/show_bug.cgi?id=64654, which is related to the Photo Album. Do you think, this could be related to my bug (though I only used a directory with one picture inside the subdirectory and one additional in the main directory)? I don't think so. The problem here is selecting a folder (which the program is not expecting and shouldn't allow) When using the Windows dialog the folder is ignored and there is no crash. Bug 64654 is about reaching some limit... Regards, Pedro -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Crash-in-Impress-when-you-add-a-directory-and-a-single-picture-to-the-Photo-Album-tp4103514p4103726.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Crash in Impress, when you add a directory and a single picture to the Photo Album
Hello Pedro, *, On Dienstag, 1. April 2014 18:54 Pedro wrote: Thomas Hackert wrote I have found https://bugs.freedesktop.org/show_bug.cgi?id=64654, which is related to the Photo Album. Do you think, this could be related to my bug (though I only used a directory with one picture inside the subdirectory and one additional in the main directory)? I don't think so. The problem here is selecting a folder (which the program is not expecting and shouldn't allow) When using the Windows dialog the folder is ignored and there is no crash. Bug 64654 is about reaching some limit... O.K. Thanks for your explanation Thomas. -- Hey, what do you expect from a culture that *drives* on *parkways* and *parks* on *driveways*? -- Gallagher ___ 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] Calc Import Unit Tests - Database Functions
Hello, Attached are tests for all calc database functions. -Ken kenbio...@hotmail.com database-functions.csv Description: Binary data database-functions.ods Description: Binary data ___ 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 76881] New: FORMATTING: Lines and characters dissapear from graph after closing calc
https://bugs.freedesktop.org/show_bug.cgi?id=76881 Priority: medium Bug ID: 76881 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FORMATTING: Lines and characters dissapear from graph after closing calc Severity: normal Classification: Unclassified OS: Mac OS X (All) Reporter: aleoli...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.1.1 release Component: Spreadsheet Product: LibreOffice Created attachment 96694 -- https://bugs.freedesktop.org/attachment.cgi?id=96694action=edit Screenshot with expected result. Problem description: After creating a graph elements added to the graph are not saved and disappear after closing calc. Steps to reproduce: 1. Create a bar graph. 2. Add straight lines and change the line width to 0.1 cm. 3. Add characters inside the graph. 4. Add y error bars and change the width to 0.1 cm. 5. Save file. 6. Quit libreoffice. 7. Reopen file. 8. Graph is changed. Current behavior: Line width edit for y error bars are reverted. Lines added to graph disappear after reopening the file. Characters added to graph disappear after reopening the file. Expected behavior: Line width should be preserved after closing the file. Lines added to graph should not disappear. Character added to graph should not disappear. Operating System: Mac OS X Version: 4.2.1.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 76881] FORMATTING: Lines and characters dissapear from graph after closing calc
https://bugs.freedesktop.org/show_bug.cgi?id=76881 --- Comment #1 from Alejandro Oliva aleoli...@gmail.com --- Created attachment 96695 -- https://bugs.freedesktop.org/attachment.cgi?id=96695action=edit Graph after quitting Calc and reopening file -- 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 66380] FILEOPEN: MS .xlsx Fails to import properly. category axis not displayed (4/6)
https://bugs.freedesktop.org/show_bug.cgi?id=66380 Luke lukebe...@hotmail.com changed: What|Removed |Added Attachment #81716|0 |1 is obsolete|| Attachment #81717|0 |1 is obsolete|| --- Comment #6 from Luke lukebe...@hotmail.com --- Created attachment 96696 -- https://bugs.freedesktop.org/attachment.cgi?id=96696action=edit LO 4.3 status with Per Participant column copied from Excel Charts 6 is missing data because of the Format As Table feature from Bug 66377. If you copy the plain text from the Per Participant column in Excel and paste in Calc, chart 6 will display correctly. So all 3 charts are showing legends now in 4.3. Nice work LO team! The only remaining issue is that the 2012 Percentage and Medals per Participant charts need to manually set: Format Axis - Text Flow - Overlap While the Medals vs. Athletes per Country chart needs: Format Axis - Text Flow - break Are these values something that the Calc importer could extract from the .xlsx file or determine automatically? -- 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 76836] CSV export problem with formatted text cells (again)
https://bugs.freedesktop.org/show_bug.cgi?id=76836 --- Comment #5 from Philipp Tobler philipp.tob...@id.unibe.ch --- Interesting: - using Format Category Text and Format code 192.168.0.@ shows correctly formatted values in the table, but only the original value of the cells are exported to the CSV - using Format Category Number and Format code 192.168.0.# shows correctly formatted values both in the table and in the exported CSV If this isn't a bug, its still unfortunate... -- 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 66380] FILEOPEN: MS .xlsx Fails to import properly. category axis not displayed (4/6)
https://bugs.freedesktop.org/show_bug.cgi?id=66380 --- Comment #7 from Luke lukebe...@hotmail.com --- In my previous post on 2012 Percentage and Medals per Participant charts, I should have said to fix the legend import errors, you need to manually set: Format Axis - Text Flow - Overlap Format Axis - Text Orientation - 45 -- 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 75057] [META] .docx MSO related CHART object issues
https://bugs.freedesktop.org/show_bug.cgi?id=75057 Luke lukebe...@hotmail.com changed: What|Removed |Added Depends on||75658, 75659 -- 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 75659] FILEOPEN: Imported .docx charts missing legend
https://bugs.freedesktop.org/show_bug.cgi?id=75659 Luke lukebe...@hotmail.com changed: What|Removed |Added Blocks||75057 -- 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 75658] FILEOPEN: Imported .docx charts have 2nd empty series
https://bugs.freedesktop.org/show_bug.cgi?id=75658 Luke lukebe...@hotmail.com changed: What|Removed |Added Blocks||75057 -- 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 76882] New: In CALC, the Data autofilter GUI does not have consistent controls
https://bugs.freedesktop.org/show_bug.cgi?id=76882 Priority: medium Bug ID: 76882 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: In CALC, the Data autofilter GUI does not have consistent controls Severity: normal Classification: Unclassified OS: All Reporter: narayana...@outlook.com Hardware: Other Status: UNCONFIRMED Version: 4.2.0.2 rc Component: UI Product: LibreOffice Created attachment 96697 -- https://bugs.freedesktop.org/attachment.cgi?id=96697action=edit How to make the controls consistent In CALC, create a data range. Now activate the Data Filter Autofilter menu. Now use the drop-down filter GUI on any column. At the bottom of this GUI, there are three options: All, select current item, hide current item. But they are not represented uniformly: While The All option is text-based, the other two options are presented with icons. This can be made consistent by converting the All option to icon, as the attached file shows. -- 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 76693] FILEOPEN: Open docx leads to wrong page numbers in table of contents
https://bugs.freedesktop.org/show_bug.cgi?id=76693 bugzi...@team.cortado.com changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED --- Comment #3 from bugzi...@team.cortado.com --- We re-tested the issue with: Version: 4.3.0.0.alpha0+ Build ID: c66229bfa4284758b787bf80ddd1b2e3795881df TinderBox: Win-x86@42, Branch:master, Time: 2014-03-17_07:15:58 I can confirm that the problem with the page numbers has vanished. We tested the same document again, and the pages were correct, no matter if the TOC was outdated or refreshed or created from scratch. -- 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 75316] FILEOPEN: .xlsx Fails to import chart properly - title axis alignment lost
https://bugs.freedesktop.org/show_bug.cgi?id=75316 --- Comment #3 from Luke lukebe...@hotmail.com --- The attachment 85112 from Bug 68884 has the same issue with the axis formatting of the Y title. -- 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 76885] New: FORMATTING: Frames get get border around
https://bugs.freedesktop.org/show_bug.cgi?id=76885 Priority: medium Bug ID: 76885 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FORMATTING: Frames get get border around Severity: normal Classification: Unclassified OS: Linux (All) Reporter: www.libreoffice@sjau.ch Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.3.1 rc Component: Writer Product: LibreOffice Problem description: Steps to reproduce: 1. Open a document with frames 2. It now has borders around that weren't there before 3. Omit borders in the frame dialog 4. save document Current behavior: 1. Borders are back again Expected behavior: 1. Borders should be omitted Version: 4.2.3.2 Build ID: 420m0(Build:2) Operating System: Ubuntu Version: 4.2.3.1 rc -- 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 75316] FILEOPEN: .xlsx Fails to import chart properly - title axis alignment lost
https://bugs.freedesktop.org/show_bug.cgi?id=75316 Luke lukebe...@hotmail.com changed: What|Removed |Added CC||k...@bakdong.com --- Comment #4 from Luke lukebe...@hotmail.com --- *** Bug 68884 has been marked as a duplicate of this bug. *** -- 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 68884] FILEOPEN: graphs in DOCX don't supported
https://bugs.freedesktop.org/show_bug.cgi?id=68884 --- Comment #4 from Luke lukebe...@hotmail.com --- In LO 4.3, the Y axis title - Alignment - 270 formatting is lost. Also, in the X axis labels of the Speed - Time Graph chart have too many decimal places. *** This bug has been marked as a duplicate of bug 75316 *** -- 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 75316] FILEOPEN: .xlsx Fails to import chart properly - title axis alignment lost
https://bugs.freedesktop.org/show_bug.cgi?id=75316 Luke lukebe...@hotmail.com changed: What|Removed |Added Blocks||75057 -- 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 75309] FILEOPEN: Legend position lost when importing/exporting MS .docx charts
https://bugs.freedesktop.org/show_bug.cgi?id=75309 Luke lukebe...@hotmail.com changed: What|Removed |Added Blocks||75057 -- 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 75057] [META] .docx MSO related CHART object issues
https://bugs.freedesktop.org/show_bug.cgi?id=75057 Luke lukebe...@hotmail.com changed: What|Removed |Added Depends on||75316, 75309, 75317 -- 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 75317] FILEOPEN: .xlsx Fails to import chart properly - First data label of 2nd column is displayed on the bottom
https://bugs.freedesktop.org/show_bug.cgi?id=75317 Luke lukebe...@hotmail.com changed: What|Removed |Added Blocks||75057 -- 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 76887] New: VIEWING: cant't filter on numeric fields in microsoft access databases
https://bugs.freedesktop.org/show_bug.cgi?id=76887 Priority: medium Bug ID: 76887 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: VIEWING: cant't filter on numeric fields in microsoft access databases Severity: normal Classification: Unclassified OS: Windows (All) Reporter: pasqual.milvaq...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 4.1.5.3 release Component: Database Product: LibreOffice Opening a Microsoft Access (mdb) database in LibreOffice base works ok but when trying to apply a filter, in a numeric field in a table, it fails to be applied without showing any error. Filtering in standard text fields works correctly Using autofilter in a numeric fiels works ok -- 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 76887] VIEWING: cant't filter on numeric fields in microsoft access databases
https://bugs.freedesktop.org/show_bug.cgi?id=76887 pasqual milvaques pasqual.milvaq...@gmail.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=69957 -- 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 69957] not possible to use memo fields for filtering
https://bugs.freedesktop.org/show_bug.cgi?id=69957 pasqual milvaques pasqual.milvaq...@gmail.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=76887 -- 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 76887] VIEWING: cant't filter on numeric fields in microsoft access databases
https://bugs.freedesktop.org/show_bug.cgi?id=76887 --- Comment #1 from pasqual milvaques pasqual.milvaq...@gmail.com --- Created attachment 96699 -- https://bugs.freedesktop.org/attachment.cgi?id=96699action=edit testcase to reproduce the problem To test the problem open the testcase_filter.odb file (in a windows machine, the mdb file must be in the same directory as the odb) In the UI enter in the sample_table table and try to apply a standard filter to the num_field field (for example num_field = 500), the filter is not applied and the UI shows no change -- 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 67956] EDITING: Chart (including data series, elements) not transferable from .ODS to .XLSX
https://bugs.freedesktop.org/show_bug.cgi?id=67956 Luke lukebe...@hotmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Luke lukebe...@hotmail.com --- This bug was fixed in LO 4.2 with Bug 40594 -- 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 76888] New: EDITING -Forms Design Mode selected but does not allow Design of Field Properties
https://bugs.freedesktop.org/show_bug.cgi?id=76888 Priority: medium Bug ID: 76888 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING -Forms Design Mode selected but does not allow Design of Field Properties Severity: normal Classification: Unclassified OS: All Reporter: jacqueline.tarle...@gmail.com Hardware: Other Status: UNCONFIRMED Version: unspecified Component: Database Product: LibreOffice Created attachment 96700 -- https://bugs.freedesktop.org/attachment.cgi?id=96700action=edit picture of screen when design mode button is depressed In LibreOffice Database: Database Form In Field Label (column name) section, the property for the field appeared to be a list but no list was shown. When attempted to use the Open In Design Mode button to edit the form, the button could be selected but no other options became available. Column Label has limited options. Tried reinstalling Java Runtime Environment and Libre Office. Cannot edit the property of the column to add a list of options to the listbox. Cannot save the new records because the property for the Column is that a selection from a list must be made. Cannot create data for the database because without a listbox, the software will not allow the form to be saved. When the Open in Design Mode is selected, the button is depressed but no other icons show they are active. The picture shows what I see when the design mode is selected. -- 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 76889] New: EDITING -Forms Design Mode selected but does not allow Design of Field Properties
https://bugs.freedesktop.org/show_bug.cgi?id=76889 Priority: medium Bug ID: 76889 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING -Forms Design Mode selected but does not allow Design of Field Properties Severity: normal Classification: Unclassified OS: All Reporter: jacqueline.tarle...@gmail.com Hardware: Other Status: UNCONFIRMED Version: unspecified Component: Database Product: LibreOffice In LibreOffice Database: Database Form In Field Label (column name) section, the property for the field appeared to be a list but no list was shown. When attempted to use the Open In Design Mode button to edit the form, the button could be selected but no other options became available. Column Label has limited options. Tried reinstalling Java Runtime Environment and Libre Office. Cannot edit the property of the column to add a list of options to the listbox. Cannot save the new records because the property for the Column is that a selection from a list must be made. Cannot create data for the database because without a listbox, the software will not allow the form to be saved. When the Open in Design Mode is selected, the button is depressed but no other icons show they are active. The picture shows what I see when the design mode is selected. -- 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 73186] FILESAVE does not remember color settings to objects
https://bugs.freedesktop.org/show_bug.cgi?id=73186 Jorendc jore...@libreoffice.org changed: What|Removed |Added Attachment #91360|text/plain |application/vnd.oasis.opend mime type||ocument.graphics -- 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 73226] Multi selection in Select data range dialbox
https://bugs.freedesktop.org/show_bug.cgi?id=73226 Jorendc jore...@libreoffice.org changed: What|Removed |Added Attachment #91422|text/plain |image/jpeg mime type|| -- 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 73310] image in drawing doesn't print properly
https://bugs.freedesktop.org/show_bug.cgi?id=73310 Jorendc jore...@libreoffice.org changed: What|Removed |Added Attachment #91527|text/plain |application/ogg mime type|| -- 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
