[Libreoffice-commits] core.git: include/osl sal/osl sal/qa sal/util
include/osl/detail/file.h|3 ---
sal/osl/unx/file.cxx | 12 +---
sal/qa/osl/file/osl_File.cxx | 29 -
sal/util/sal.map |1 -
4 files changed, 5 insertions(+), 40 deletions(-)
New commits:
commit 3f72ad159c881d0a11e638c84064172f48f75026
Author: Stephan Bergmann
Date: Tue May 13 08:47:30 2014 +0200
osl_openMemoryAsFile is internal, Android-only functionality
Change-Id: I36734b0e5e1c0b15ed4f0845450b444b23579ffe
diff --git a/include/osl/detail/file.h b/include/osl/detail/file.h
index b9ddaba..a3cfc73 100644
--- a/include/osl/detail/file.h
+++ b/include/osl/detail/file.h
@@ -43,9 +43,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileOSHandle(
oslFileHandle Handle,
sal_IntPtr *piFileHandle );
-/* for unit testing. */
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_openMemoryAsFile( void *address,
size_t size, oslFileHandle *pHandle );
-
#if defined __cplusplus
}
#endif
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 792345d..99fee40 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -780,10 +780,12 @@ static bool osl_file_queryLocking (sal_uInt32 uFlags)
return false;
}
-#ifdef UNX
+#if defined ANDROID
+
+namespace {
static oslFileError
-osl_openMemoryAsFile( void *address, size_t size, oslFileHandle *pHandle,
const char *path )
+openMemoryAsFile( void *address, size_t size, oslFileHandle *pHandle, const
char *path )
{
oslFileError eRet;
FileHandle_Impl * pImpl = new FileHandle_Impl (-1,
FileHandle_Impl::KIND_MEM, path);
@@ -805,10 +807,6 @@ osl_openMemoryAsFile( void *address, size_t size,
oslFileHandle *pHandle, const
return osl_File_E_None;
}
-oslFileError
-SAL_CALL osl_openMemoryAsFile( void *address, size_t size, oslFileHandle
*pHandle )
-{
-return osl_openMemoryAsFile( address, size, pHandle, "" );
}
#endif
@@ -848,7 +846,7 @@ SAL_CALL osl_openFilePath( const char *cpFilePath,
oslFileHandle* pHandle, sal_u
errno = ENOENT;
return osl_File_E_NOENT;
}
-return osl_openMemoryAsFile(address, size, pHandle, cpFilePath);
+return openMemoryAsFile(address, size, pHandle, cpFilePath);
}
#endif
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index a403d33..0a387e8 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -2942,38 +2942,9 @@ namespace osl_File
*pEOF &&
( 0 == strncmp( ( const char *
)aSequence.getArray(), &pBuffer_Char[26], 26 ) ) );
}
-#ifdef UNX
-void readLine_android()
-{
-static const char buffer[] =
-"Hello\n\r\n\a\n"
-"Fun=Badness\n"
-"Some=Somethingelse\n\r";
-sal_Int32 aHash = rtl_str_hashCode( buffer );
-for (size_t i = 0; i < sizeof (buffer); i += 7)
-{
-oslFileHandle pFile( 0 );
-CPPUNIT_ASSERT( osl_openMemoryAsFile( (void *)buffer,
- sizeof( buffer ) - i,
&pFile )
-== osl_File_E_None );
-for (;;)
-{
-sal_Sequence *pSequence( 0 );
-if (osl_readLine( pFile, &pSequence ) != osl_File_E_None)
-break;
-rtl_byte_sequence_release (pSequence);
-}
-CPPUNIT_ASSERT( osl_closeFile( pFile ) == osl_File_E_None );
-}
-CPPUNIT_ASSERT( aHash == rtl_str_hashCode( buffer ) );
-}
-#endif
CPPUNIT_TEST_SUITE( readLine );
CPPUNIT_TEST( readLine_001 );
CPPUNIT_TEST( readLine_002 );
-#ifdef UNX
-CPPUNIT_TEST( readLine_android );
-#endif
CPPUNIT_TEST_SUITE_END();
};// class readLine
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 900d077..8380e7e 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -709,7 +709,6 @@ PRIVATE_textenc.1 { # LibreOffice 3.6
PRIVATE_file.1 { # LibreOffice 3.6
global:
osl_getFileOSHandle;
- osl_openMemoryAsFile;
};
# Unique libstdc++ symbols:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2014-05-13
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#60338: Saved files have incorrect permissions on linux in https://gerrit.libreoffice.org/9287 from Ulrich Kitzinger about module include, sal, unotools + fdo#78599: Fixed for file corruption which contains fields and hyperlink in https://gerrit.libreoffice.org/9330 from Priyanka Gaikwad about module sw + fdo#78300 File Corrupt:drawing objects into a text box. in https://gerrit.libreoffice.org/9325 from Priyanka Gaikwad about module sw End of freshness + -fsanitize=address does not like -z defs in https://gerrit.libreoffice.org/9334 from Markus Mohrhard about module external + libgltf: Update to the new version. in https://gerrit.libreoffice.org/9333 from Jan Holesovsky about module avmedia, build, external + Use collada2gltf to open .dae files and convert them to .json. in https://gerrit.libreoffice.org/9332 from Matúš Kukan about module avmedia + Introduce Collada2gltf external library in https://gerrit.libreoffice.org/9291 from Matúš Kukan about module build, external + Introduce OpenCollada external library in https://gerrit.libreoffice.org/9290 from Matúš Kukan about module build, external + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer about module sw + upgrade to python-3.3.5 in https://gerrit.libreoffice.org/9311 from Thomas Arnhold about module build, external + C string usage improvment in https://gerrit.libreoffice.org/9296 from Arnaud Versini about module cppuhelper, desktop, hwpfilter, rsc, sal, shell + fdo#78432 : DOCX: File gets corrupt after RoundTrip in https://gerrit.libreoffice.org/9328 from Pallavi Jadhav about module sw + fdo#77985 make calc function NETWORKDAYS comply with ODFF1.2 in https://gerrit.libreoffice.org/9327 from Winfried Donkers about module formula, include, sc, scaddins * Merged changes on master for project core changed in the last 25 hours: + fdo#75264 fix incorrect/missing function tips in Calc in https://gerrit.libreoffice.org/8218 from Winfried Donkers + fix crash when glDebugMessageCallback is 0 despite feature being there in https://gerrit.libreoffice.org/9331 from Markus Mohrhard + svtools: Translated ctrltool.hxx from English to German in https://gerrit.libreoffice.org/9321 from Tobias Mueller + svx: Translated the svdmodel.hxx from German to English in https://gerrit.libreoffice.org/9320 from Tobias Mueller + cli_ure: fix dbglevel=2 build on windows in https://gerrit.libreoffice.org/9318 from Thomas Arnhold + fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF in https://gerrit.libreoffice.org/8883 from Michaël Lefèvre + upgrade to lcms2-2.6 in https://gerrit.libreoffice.org/9317 from Thomas Arnhold + upgrade to zlib-1.2.8 in https://gerrit.libreoffice.org/9315 from Thomas Arnhold + fdo#78325: Table Preferred width in percent is not preserved after RT. in https://gerrit.libreoffice.org/9277 from Yogesh Bharate * Abandoned changes on master for project core changed in the last 25 hours: + fdo#77760 Calculate table height for Floating Tables in https://gerrit.libreoffice.org/9214 from Vinaya Mandke * Open changes needing tweaks, but being untouched for more than a week: + cppunittest_filter_xslt: fix fdo#77893 in https://gerrit.libreoffice.org/9177 from Douglas Mencken + DrawWaveLine/ImplDrawWaveLine fixes: - try to avoid huge looping due to in https://gerrit.libreoffice.org/9174 from Douglas Mencken + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + new method INetURLObject::getData() for data urls in https://gerrit.libreoffice.org/8737 from Christina Roßmanith + fdo#67544 Slide transistion sound(other sound) is not included in present in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt + fdo#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 + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + 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 + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + WIP: fdo#33980 Preserve selection ac
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Joel Madero changed: What|Removed |Added Depends on|68103 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|57215 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||57215 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|72614 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||72614 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 44617, which changed state. Bug 44617 Summary: The "resize shape to fit text" option causes irreversible problems when resizing groups of shapes in Drawing https://bugs.freedesktop.org/show_bug.cgi?id=44617 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|44617 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||44617 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/qa
basic/qa/vba_tests/cdec.vb | 26 --
1 file changed, 20 insertions(+), 6 deletions(-)
New commits:
commit a5b93782a18a2ddb6dee4033a578d919b10b6964
Author: Thomas Arnhold
Date: Tue May 13 06:06:54 2014 +0200
basic: update descriptions and add some more tests
Change-Id: Ice829c70482171bbfc22719e4b9e30c5ac058f5e
diff --git a/basic/qa/vba_tests/cdec.vb b/basic/qa/vba_tests/cdec.vb
index 50757de..3ed82b3 100644
--- a/basic/qa/vba_tests/cdec.vb
+++ b/basic/qa/vba_tests/cdec.vb
@@ -25,24 +25,38 @@ Function verify_testCDec() as String
On Error GoTo errorHandler
ret = CDec("")
-TestLog_ASSERT ret = 0, "Converts the string to uppercase characters:" &
ret
+TestLog_ASSERT ret = 0, "Empty string test:" & ret
ret = CDec("1234")
-TestLog_ASSERT ret = "1234", "Converts the string to uppercase
characters:" & ret
+TestLog_ASSERT ret = 1234, "Simple number:" & ret
ret = CDec(" 1234 ")
-TestLog_ASSERT ret = 1234, "Converts the string to uppercase characters:"
& ret
+TestLog_ASSERT ret = 1234, "Simple number with whitespaces:" & ret
+
+ret = CDec("-1234")
+TestLog_ASSERT ret = -1234, "Simple negative number:" & ret
+
+ret = CDec(" - 1234 ")
+TestLog_ASSERT ret = -1234, "Simple negative number with whitespaces:" &
ret
'''
' Those are erroneous, see i#64348
ret = CDec("1234-")
-TestLog_ASSERT ret = -1234, "Converts the string to uppercase characters:"
& ret
+TestLog_ASSERT ret = -1234, "Wrong negative number1:" & ret
ret = CDec(" 1234 -")
-TestLog_ASSERT ret = -1234, "Converts the string to uppercase characters:"
& ret
+TestLog_ASSERT ret = -1234, "Wrong negative number2:" & ret
+
+'ret = CDec("79228162514264301")
+'TestLog_ASSERT ret = 79228162514264301, "Very long number1:"
& ret
+'ret = ret+1
+'TestLog_ASSERT ret = 79228162514264302, "Very long number2:"
& ret
ret = CDec("79228162514264400")
-TestLog_ASSERT ret = 62406456049664, "Converts the string to uppercase
characters:" & ret
+TestLog_ASSERT ret = 62406456049664, "Very long number3:" & ret
+
+ret = CDec("79228162514264340") ' gives zero
+TestLog_ASSERT ret = 0, "Very long number4:" & ret
result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) &
"Tests failed: " & failCount & Chr$(10)
verify_testCDec = result
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/ChartView.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 876a54067cf9c70c1462c6694591365a863363bd Author: Markus Mohrhard Date: Tue May 13 05:38:06 2014 +0200 a better place to show the window Now the first repaint will already draw on the window and we never see the grey background. Change-Id: Ibf44a77b5768979f9081b4f80f6f0a73e5023437 diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 6c5d725..ff07ecd 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -3119,6 +3119,7 @@ void ChartView::createShapes3D() if(!pWindow) return; +pWindow->Show(); uno::Reference< XDiagram > xDiagram( mrChartModel.getFirstDiagram() ); uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY ); if( !xCooSysContainer.is()) @@ -3175,7 +3176,6 @@ void ChartView::createShapes3D() m_pGL3DPlotter->create3DShapes(aDataSeries, *pCatProvider); m_pGL3DPlotter->render(); -pWindow->Show(); } } //namespace chart ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - chart2/source include/vcl sc/Module_sc.mk vcl/source
chart2/source/view/charttypes/GL3DBarChart.cxx | 30 +---
chart2/source/view/inc/GL3DBarChart.hxx| 14 ++-
chart2/source/view/inc/GL3DPlotterBase.hxx |8 +-
chart2/source/view/main/ChartView.cxx | 90 -
include/vcl/openglwin.hxx | 13 +++
sc/Module_sc.mk|2
vcl/source/window/openglwin.cxx| 14 +++
7 files changed, 107 insertions(+), 64 deletions(-)
New commits:
commit 15e2c82acb60a2f9916f55a144299f64513fdde0
Author: Markus Mohrhard
Date: Tue May 13 05:28:18 2014 +0200
restore correct repaint after changed value in 3D chart
Change-Id: Ied1904a56b8d526288a89fd8df0bed639cd317d0
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index c164bd2..35bcb51 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -25,13 +25,10 @@ namespace chart {
GL3DBarChart::GL3DBarChart(
const css::uno::Reference& xChartType,
-const boost::ptr_vector& rDataSeries,
-OpenGLWindow& rWindow, ExplicitCategoriesProvider& rCatProvider ) :
+OpenGLWindow& rWindow) :
mxChartType(xChartType),
-maDataSeries(rDataSeries),
mpRenderer(new opengl3D::OpenGL3DRenderer()),
-mrWindow(rWindow),
-mrCatProvider(rCatProvider)
+mrWindow(rWindow)
{
mrWindow.setRenderer(this);
mpRenderer->init();
@@ -42,7 +39,8 @@ GL3DBarChart::~GL3DBarChart()
mrWindow.setRenderer(NULL);
}
-void GL3DBarChart::create3DShapes()
+void GL3DBarChart::create3DShapes(const boost::ptr_vector&
rDataSeriesContainer,
+ExplicitCategoriesProvider& rCatProvider)
{
// Each series of data flows from left to right, and multiple series are
// stacked vertically along y axis.
@@ -68,8 +66,8 @@ void GL3DBarChart::create3DShapes()
maShapes.clear();
maShapes.push_back(new opengl3D::Camera(mpRenderer.get()));
sal_Int32 nSeriesIndex = 0;
-for (boost::ptr_vector::const_iterator itr =
maDataSeries.begin(),
-itrEnd = maDataSeries.end(); itr != itrEnd; ++itr)
+for (boost::ptr_vector::const_iterator itr =
rDataSeriesContainer.begin(),
+itrEnd = rDataSeriesContainer.end(); itr != itrEnd; ++itr)
{
nYPos = nSeriesIndex * (nBarSizeY + nBarDistanceY) + nBarSizeY;
@@ -147,7 +145,7 @@ void GL3DBarChart::create3DShapes()
pRect->setLineColor(COL_BLUE);
// Create category texts along X-axis at the bottom.
-uno::Sequence aCats = mrCatProvider.getSimpleCategories();
+uno::Sequence aCats = rCatProvider.getSimpleCategories();
for (sal_Int32 i = 0; i < aCats.getLength(); ++i)
{
float nXPos = i * (nBarSizeX + nBarDistanceX);
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx
b/chart2/source/view/inc/GL3DBarChart.hxx
index 7c1fc51..1741b3d 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -34,12 +34,12 @@ class GL3DBarChart : public GL3DPlotterBase, public
IRenderer
public:
GL3DBarChart(
const css::uno::Reference& xChartType,
-const boost::ptr_vector& rDataSeries, OpenGLWindow&
rContext,
-ExplicitCategoriesProvider& rCatProvider );
+OpenGLWindow& rContext);
virtual ~GL3DBarChart();
-virtual void create3DShapes() SAL_OVERRIDE;
+virtual void create3DShapes(const boost::ptr_vector&
rDataSeries,
+ExplicitCategoriesProvider& rCatProvider) SAL_OVERRIDE;
virtual void render() SAL_OVERRIDE;
@@ -49,12 +49,10 @@ public:
private:
css::uno::Reference mxChartType;
-const boost::ptr_vector& maDataSeries;
boost::ptr_vector maShapes;
boost::scoped_ptr mpRenderer;
OpenGLWindow& mrWindow;
-ExplicitCategoriesProvider& mrCatProvider;
};
}
diff --git a/chart2/source/view/inc/GL3DPlotterBase.hxx
b/chart2/source/view/inc/GL3DPlotterBase.hxx
index 9c89008..cd69bf2 100644
--- a/chart2/source/view/inc/GL3DPlotterBase.hxx
+++ b/chart2/source/view/inc/GL3DPlotterBase.hxx
@@ -10,14 +10,20 @@
#ifndef CHART2_GL3DPLOTTERBASE_HXX
#define CHART2_GL3DPLOTTERBASE_HXX
+#include
+#include "VDataSeries.hxx"
+
namespace chart {
+class ExplicitCategoriesProvider;
+
class GL3DPlotterBase
{
public:
virtual ~GL3DPlotterBase();
-virtual void create3DShapes() = 0;
+virtual void create3DShapes(const boost::ptr_vector&
rDataSeries,
+ExplicitCategoriesProvider& rCatProvider) = 0;
virtual void render() = 0;
};
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 49c3202..6c5d725 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3115,65 +3115,67 @@ IMPL_LINK_NOARG(ChartView, UpdateTimeBased)
void ChartView::createShapes3D()
{
-if (!m_pGL3DPlotter)
-{
-uno::Reference< XDiagram > xDiagram( mrCh
[Libreoffice-commits] core.git: 5 commits - basic/qa basic/source lotuswordpro/source sw/source unusedcode.easy writerfilter/source
basic/qa/cppunit/test_vba.cxx |1
basic/qa/vba_tests/cdec.vb| 72 ++
basic/source/sbx/sbxdec.cxx |8 +-
lotuswordpro/source/filter/lwpfilter.cxx | 34
lotuswordpro/source/filter/lwpfilter.hxx | 37 -
sw/source/filter/html/css1atr.cxx | 33
unusedcode.easy |1
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |2
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |1
9 files changed, 80 insertions(+), 109 deletions(-)
New commits:
commit c4e301acd08df41a7236d24e454417393b707207
Author: Thomas Arnhold
Date: Tue May 13 05:23:49 2014 +0200
basic: Add CDec unit test
Change-Id: I9152f00239e5d407f9b33016caadb6a01770fed3
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 846cebb..87c6512 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -39,6 +39,7 @@ void VBATest::testMiscVBAFunctions()
{
const char* macroSource[] = {
"bytearraystring.vb",
+"cdec.vb",
// datevalue test seems to depend on both locale and language
// settings, should try and rewrite the test to deal with that
// for some reason tinderboxes don't seem to complain leaving enabled
diff --git a/basic/qa/vba_tests/cdec.vb b/basic/qa/vba_tests/cdec.vb
new file mode 100644
index 000..50757de
--- /dev/null
+++ b/basic/qa/vba_tests/cdec.vb
@@ -0,0 +1,72 @@
+Option VBASupport 1
+Option Explicit
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+
+Function doUnitTest() As String
+result = verify_testCDec()
+If failCount <> 0 And passCount > 0 Then
+doUnitTest = result
+Else
+doUnitTest = "OK"
+End If
+End Function
+
+Function verify_testCDec() as String
+passCount = 0
+failCount = 0
+
+result = "Test Results" & Chr$(10) & "" & Chr$(10)
+
+Dim testName As String
+Dim ret As Double
+testName = "Test CDec function"
+On Error GoTo errorHandler
+
+ret = CDec("")
+TestLog_ASSERT ret = 0, "Converts the string to uppercase characters:" &
ret
+
+ret = CDec("1234")
+TestLog_ASSERT ret = "1234", "Converts the string to uppercase
characters:" & ret
+
+ret = CDec(" 1234 ")
+TestLog_ASSERT ret = 1234, "Converts the string to uppercase characters:"
& ret
+
+'''
+' Those are erroneous, see i#64348
+ret = CDec("1234-")
+TestLog_ASSERT ret = -1234, "Converts the string to uppercase characters:"
& ret
+
+ret = CDec(" 1234 -")
+TestLog_ASSERT ret = -1234, "Converts the string to uppercase characters:"
& ret
+
+ret = CDec("79228162514264400")
+TestLog_ASSERT ret = 62406456049664, "Converts the string to uppercase
characters:" & ret
+
+result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) &
"Tests failed: " & failCount & Chr$(10)
+verify_testCDec = result
+
+Exit Function
+errorHandler:
+TestLog_ASSERT (False), testName & ": hit error handler"
+End Function
+
+Sub TestLog_ASSERT(assertion As Boolean, Optional testId As String, Optional
testComment As String)
+
+If assertion = True Then
+passCount = passCount + 1
+Else
+Dim testMsg As String
+If Not IsMissing(testId) Then
+testMsg = testMsg + " : " + testId
+End If
+If Not IsMissing(testComment) And Not (testComment = "") Then
+testMsg = testMsg + " (" + testComment + ")"
+End If
+
+result = result & Chr$(10) & " Failed: " & testMsg
+failCount = failCount + 1
+End If
+
+End Sub
commit 375b01bf747bb206c3fd6bad0acbd38271a8fb86
Author: Thomas Arnhold
Date: Tue May 13 05:22:47 2014 +0200
i#64348 basic: fix CDec() crash if string is empty
Change-Id: I92e9472e14c00a6550081f0d58a352faa5b78b98
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 59f5e01..f0cab34 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -194,6 +194,8 @@ void SbxDecimal::setUInt( unsigned int val )
bool SbxDecimal::setString( OUString* pOUString )
{
+assert(pOUString);
+
static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US );
// Convert delimiter
@@ -471,7 +473,11 @@ start:
case SbxLPSTR:
case SbxSTRING:
case SbxBYREF | SbxSTRING:
-pnDecRes->setString( p->pOUString ); break;
+if( !p->pOUString )
+pnDecRes->setString( new OUString );
+else
+pnDecRes->setString( p->pOUString );
+break;
case SbxOBJECT:
{
SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);
commit 52136cd3a2737aa913bd59d1d5d88c841a984846
Author: Thomas Arnhold
Date: Tue May 13 01:26:09 2014 +0200
writerfilter: unused
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|69495 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||69495 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 62475] Remove pointless comments and ASCII art
https://bugs.freedesktop.org/show_bug.cgi?id=62475 --- Comment #30 from mostthings...@gmail.com --- Created attachment 98954 --> https://bugs.freedesktop.org/attachment.cgi?id=98954&action=edit asciitool.py - semi-automated ASCII removal I have been working on a tool to semi-automate this process. I have attached an initial version; it's useable, but incomplete. Unless someone has an alternate suggestion, for the time being I will host it here: https://bitbucket.org/MostThingsWeb/asciitool (especially while I don't have commit access). The only preq is colorama: https://pypi.python.org/pypi/colorama Screenshots: http://imgur.com/a/BO0t2 Currently the tool detects ASCII art in addition to some (but not all) pointless comments. It makes a best effort at preserving justification (leading whitespace). I say the tool is semi-automated because while it will make a suggestion regarding what to do with each comment, it is ultimately up to you to decide what to do. The tool lets you jump immediately into Vim to edit either its suggestion or the original comment. It provides 5 lines of context before and after, like git diff. I'd be interested in getting some feedback regarding this, whether it's bug reports, suggested features, or even just "why bother?" -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/output2.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 162029e55af8f681966497ab7f20277888eac478
Author: Kohei Yoshida
Date: Mon May 12 20:59:29 2014 -0400
fdo#78391: When numbers are auto-fit, reset clipping parameters.
Else it would get processed further to a surprising result.
Change-Id: I3d6f0d680e0c4c3ffe1d28dcbaf51a156f569359
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 75efff3..c0d6473 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1842,7 +1842,11 @@ void ScOutputData::DrawStrings( bool bPixelToLogic )
(long) ( aVars.GetLeftTotal() * mnPPTX ) +
(long) (
aVars.GetMargin()->GetRightMargin() * mnPPTX );
if ( nNeededWidth <= aAreaParam.maClipRect.GetWidth() )
+{
+// Cell value is no longer clipped. Reset
relevant parameters.
aAreaParam.mbLeftClip = aAreaParam.mbRightClip =
false;
+aAreaParam.mnLeftClipLength =
aAreaParam.mnRightClipLength = 0;
+}
// If the "###" replacement doesn't fit into the
cells, no clip marks
// are shown, as the "###" already denotes too little
space.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 45bdefccfc532d73bed2f8182543e13a18a7ac1c Author: Kohei Yoshida Date: Mon May 12 20:05:25 2014 -0400 Turn this off by default. Not a good idea to make a "legacy" behavior on by default. Change-Id: Ib9f211dd57e3223b98f2ba6a076b05364b50ed48 diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 8feb9e9..d2b9692 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -720,7 +720,7 @@ Use legacy behaviour when selecting cells Use legacy behaviour when selecting cells -true +false ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 11 +--
chart2/source/controller/inc/dlg_CreationWizard.hxx | 11 ---
2 files changed, 9 insertions(+), 13 deletions(-)
New commits:
commit 36122c27539ae22c3a67fab89ecf1a262074c3b4
Author: Kohei Yoshida
Date: Mon May 12 19:54:18 2014 -0400
Replace auto_ptr with boost::scoped_ptr.
Change-Id: Ibc6d532eff59146d8fbe7dcc7f9155ce6119f474
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 6b018be..2a3e219 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -66,7 +66,7 @@ CreationWizard::CreationWizard( Window* pParent, const
uno::Reference< frame::XM
, m_aTimerTriggeredControllerLock( xChartModel )
, m_bCanTravel( true )
{
-m_apDialogModel.reset( new DialogModel( m_xChartModel, m_xCC ));
+m_pDialogModel.reset( new DialogModel( m_xChartModel, m_xCC ));
// Do not call FreeResource(), because there are no sub-elements defined in
// the dialog resource
ShowButtonFixedLine( true );
@@ -124,21 +124,20 @@ svt::OWizardPage* CreationWizard::createPage(WizardState
nState)
ChartTypeTabPage* pChartTypeTabPage = new
ChartTypeTabPage(this,m_xChartModel,m_xCC,bDoLiveUpdate);
pRet = pChartTypeTabPage;
m_pTemplateProvider = pChartTypeTabPage;
-if( m_pTemplateProvider &&
-m_apDialogModel.get() )
-m_apDialogModel->setTemplate(
m_pTemplateProvider->getCurrentTemplate());
+if (m_pTemplateProvider && m_pDialogModel)
+m_pDialogModel->setTemplate(
m_pTemplateProvider->getCurrentTemplate());
}
break;
case STATE_SIMPLE_RANGE:
{
m_aTimerTriggeredControllerLock.startTimer();
-pRet = new
RangeChooserTabPage(this,*(m_apDialogModel.get()),m_pTemplateProvider,this);
+pRet = new RangeChooserTabPage(this, *m_pDialogModel,
m_pTemplateProvider, this);
}
break;
case STATE_DATA_SERIES:
{
m_aTimerTriggeredControllerLock.startTimer();
-pRet = new
DataSourceTabPage(this,*(m_apDialogModel.get()),m_pTemplateProvider,this);
+pRet = new DataSourceTabPage(this, *m_pDialogModel,
m_pTemplateProvider, this);
}
break;
case STATE_OBJECTS:
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx
b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index 0b9739b..84e74ac 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -28,7 +28,8 @@
#include
#include
-#include
+#include
+#include
namespace chart
{
@@ -38,9 +39,7 @@ class DataSourceTabPage;
class ChartTypeTemplateProvider;
class DialogModel;
-class CreationWizard : public
-svt::RoadmapWizard
-, public TabPageNotifiable
+class CreationWizard : public svt::RoadmapWizard, public TabPageNotifiable,
private boost::noncopyable
{
public:
CreationWizard( Window* pParent,
@@ -77,9 +76,7 @@ private:
bool m_bIsClosable;
sal_Int32 m_nOnePageOnlyIndex;//if nOnePageOnlyIndex is an index of an
exsisting page starting with 0, then only this page is displayed without
next/previous and roadmap
ChartTypeTemplateProvider* m_pTemplateProvider;
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr< DialogModel > m_apDialogModel;
-SAL_WNODEPRECATED_DECLARATIONS_POP
+boost::scoped_ptr m_pDialogModel;
WizardState m_nFirstState;
WizardState m_nLastState;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/Library_vcl.mk vcl/source
vcl/Library_vcl.mk |1
vcl/source/window/clipping.cxx | 412 +
vcl/source/window/window.cxx | 299 -
3 files changed, 413 insertions(+), 299 deletions(-)
New commits:
commit 1b7aee193f8e99ec3984a93b47c6f506c1e5db2f
Author: Chris Sherlock
Date: Tue May 13 09:20:00 2014 +1000
vcl: move Window clipping functions to clipping.cxx
Change-Id: I19de157b90d52ab19fbd7c4ffc7eedeb9bf9a99a
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index d8764f5..bd9a541c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/window/brdwin \
vcl/source/window/accessibility \
vcl/source/window/legacyaccessibility \
+vcl/source/window/clipping \
vcl/source/window/btndlg \
vcl/source/window/builder \
vcl/source/window/cmdevt \
diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx
new file mode 100644
index 000..e6ffb04
--- /dev/null
+++ b/vcl/source/window/clipping.cxx
@@ -0,0 +1,412 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include
+
+#include
+
+#include "tools/time.hxx"
+#include "tools/debug.hxx"
+#include "tools/rc.h"
+
+#include "unotools/fontcfg.hxx"
+#include "unotools/confignode.hxx"
+
+#include "vcl/layout.hxx"
+#include "vcl/salgtype.hxx"
+#include "vcl/event.hxx"
+#include "vcl/fixed.hxx"
+#include "vcl/help.hxx"
+#include "vcl/cursor.hxx"
+#include "vcl/svapp.hxx"
+#include "vcl/window.hxx"
+#include "vcl/syswin.hxx"
+#include "vcl/syschild.hxx"
+#include "vcl/dockwin.hxx"
+#include "vcl/menu.hxx"
+#include "vcl/wrkwin.hxx"
+#include "vcl/wall.hxx"
+#include "vcl/gradient.hxx"
+#include "vcl/button.hxx"
+#include "vcl/taskpanelist.hxx"
+#include "vcl/dialog.hxx"
+#include "vcl/unowrap.hxx"
+#include "vcl/gdimtf.hxx"
+#include "vcl/pdfextoutdevdata.hxx"
+#include "vcl/popupmenuwindow.hxx"
+#include "vcl/lazydelete.hxx"
+#include "vcl/virdev.hxx"
+#include "vcl/settings.hxx"
+
+// declare system types in sysdata.hxx
+#include "svsys.h"
+#include "vcl/sysdata.hxx"
+
+#include "salframe.hxx"
+#include "salobj.hxx"
+#include "salinst.hxx"
+#include "salgdi.hxx"
+#include "svdata.hxx"
+#include "dbggui.hxx"
+#include "outfont.hxx"
+#include "window.h"
+#include "toolbox.h"
+#include "outdev.h"
+#include "PhysicalFontCollection.hxx"
+#include "brdwin.hxx"
+#include "helpwin.hxx"
+#include "sallayout.hxx"
+#include "dndlcon.hxx"
+#include "dndevdis.hxx"
+
+#include "com/sun/star/accessibility/XAccessible.hpp"
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+#include "com/sun/star/awt/XWindowPeer.hpp"
+#include "com/sun/star/awt/XTopWindow.hpp"
+#include "com/sun/star/awt/XWindow.hpp"
+#include "com/sun/star/awt/XDisplayConnection.hpp"
+#include "com/sun/star/datatransfer/dnd/XDragSource.hpp"
+#include "com/sun/star/datatransfer/dnd/XDropTarget.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp"
+#include "com/sun/star/datatransfer/clipboard/SystemClipboard.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XServiceName.hpp"
+#include "com/sun/star/rendering/CanvasFactory.hpp"
+#include "com/sun/star/rendering/XCanvas.hpp"
+#include "com/sun/star/rendering/XSpriteCanvas.hpp"
+#include "comphelper/processfactory.hxx"
+
+#include
+#include
+
+#include
+#include
+
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::datatransfer::clipboard;
+using namespace ::com::sun::star::datatransfer::dnd;
+using namespace ::com::sun::star;
+using namespace com::sun;
+
+using ::com::sun::star::awt::XTopWindow;
+
+void Window::InitClipRegion()
+{
+DBG_TESTSOLARMUTEX();
+
+Region aRegion;
+
+// Put back backed up background
+if ( mpWindowImpl->mpFrameData->mpFirstBackWin )
+ImplInvalidateAllOverlapBackgrounds();
+if ( mpWindowImpl->mbInPaint )
+aRegion = *(mpWindowImpl->mpPaintRegion);
+else
+{
+aRegion = *
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx | 418 ++
sc/source/ui/inc/inputhdl.hxx |2
2 files changed, 146 insertions(+), 274 deletions(-)
New commits:
commit 5a14766061f75e88791dc3134c9ec56e198144e2
Author: Eike Rathke
Date: Tue May 13 01:16:24 2014 +0200
distill copypasta
Change-Id: Ibb6e9e6f98041ddc81b3743f57c3335458be2cb0
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index f35ab6a..ec22405 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -792,186 +792,186 @@ void ScInputHandler::HideTipBelow()
aManualTip = OUString();
}
-void ScInputHandler::ShowTipCursor()
+void ScInputHandler::ShowArgumentsTip( const OUString& rParagraph, OUString&
rSelText, const ESelection& rSel,
+bool bTryFirstSel )
{
-HideTip();
-HideTipBelow();
-EditView* pActiveView = pTopView ? pTopView : pTableView;
ScDocShell* pDocSh = pActiveViewSh->GetViewData()->GetDocShell();
const sal_Unicode cSep = ScCompiler::GetNativeSymbolChar(ocSep);
const sal_Unicode cSheetSep = lcl_getSheetSeparator(pDocSh->GetDocument());
-
-if ( bFormulaMode && pActiveView && pFormulaDataPara &&
pEngine->GetParagraphCount() == 1 )
+FormulaHelper aHelper(ScGlobal::GetStarCalcFunctionMgr());
+bool bFound = false;
+while( !bFound )
{
-OUString aFormula = pEngine->GetText( 0 );
-ESelection aSel = pActiveView->GetSelection();
-aSel.Adjust();
-if( aSel.nEndPos )
+rSelText += ")";
+sal_Int32 nLeftParentPos = lcl_MatchParenthesis( rSelText,
rSelText.getLength()-1 );
+if( nLeftParentPos != -1 )
{
-if ( aFormula.getLength() < aSel.nEndPos )
-return;
-sal_Int32 nPos = aSel.nEndPos;
-OUString aSelText = aFormula.copy( 0, nPos );
-sal_Int32 nNextFStart = 0;
-sal_Int32 nArgPos = 0;
+sal_Int32 nNextFStart = aHelper.GetFunctionStart( rSelText,
nLeftParentPos, true);
const IFunctionDescription* ppFDesc;
::std::vector< OUString> aArgs;
-sal_uInt16 nArgs;
-bool bFound = false;
-FormulaHelper aHelper(ScGlobal::GetStarCalcFunctionMgr());
-
-while( !bFound )
+if( aHelper.GetNextFunc( rSelText, false, nNextFStart, NULL,
&ppFDesc, &aArgs ) )
{
-aSelText += ")";
-sal_Int32 nLeftParentPos = lcl_MatchParenthesis( aSelText,
aSelText.getLength()-1 );
-if( nLeftParentPos != -1 )
+if( !ppFDesc->getFunctionName().isEmpty() )
{
-sal_Unicode c = ( nLeftParentPos > 0 ) ? aSelText[
nLeftParentPos-1 ] : 0;
-if( !(comphelper::string::isalphaAscii(c)) )
-continue;
-nNextFStart = aHelper.GetFunctionStart( aSelText,
nLeftParentPos, true);
-if( aHelper.GetNextFunc( aSelText, false, nNextFStart,
NULL, &ppFDesc, &aArgs ) )
+sal_Int32 nArgPos = aHelper.GetArgStart( rSelText,
nNextFStart, 0 );
+sal_uInt16 nArgs =
static_cast(ppFDesc->getParameterCount());
+OUString aFuncName( ppFDesc->getFunctionName() + "(");
+OUString aNew;
+ScTypedCaseStrSet::const_iterator it =
+findText(*pFormulaDataPara, pFormulaDataPara->end(),
aFuncName, aNew, false);
+if (it != pFormulaDataPara->end())
{
-if( !ppFDesc->getFunctionName().isEmpty() )
+bool bFlag = false;
+sal_uInt16 nActive = 0;
+for( sal_uInt16 i=0; i < nArgs; i++ )
+{
+sal_Int32 nLength = aArgs[i].getLength();
+if( nArgPos <= rSelText.getLength()-1 )
+{
+nActive = i+1;
+bFlag = true;
+}
+nArgPos+=nLength+1;
+}
+if( bFlag )
{
-nArgPos = aHelper.GetArgStart( aSelText,
nNextFStart, 0 );
-nArgs =
static_cast(ppFDesc->getParameterCount());
-
-OUString aFuncName = ppFDesc->getFunctionName() +
"(";
-OUString aNew;
-ScTypedCaseStrSet::const_iterator it =
-findText(*pFormulaDataPara,
pFormulaDataPara->end(), aFuncName, aNew, false);
-if (it != pFormulaDataPara->end())
+sal_Int32 nCountSemicolon =
comphelper::string::getTokenCount(aNew, cSep) - 1;
+
Re: [libreoffice-l10n] Need info on sd/source/ui/accessibility.po for l10n
Thanks, Sophie, for taking this to the dev list, as I got no response on the l10n one. To make it short: can we use this notation in translations: Presentation_outliner_shape or even use spaces: Presentation outliner shape? Thanks, m. 2014-05-12 18:35 GMT+02:00 Sophie : > Hi all, > > We (l10n team) need some information for localization purpose. > In libo43_ui/sd/source/ui/accessibility.po, some strings in the form of > PresentationOutlinerShape > UnknownAccessiblePresentationShape > > Few of our languages support this sort of notation where there is a mix > of capitals in one attached word. How should we translate that, are we > allowed to separate the words (add spaces or underscores) and remove the > capitals? Where does it appears in the UI? > > Thanks in advance > Kind regards > Sophie > > -- > To unsubscribe e-mail to: l10n+unsubscr...@global.libreoffice.org > Problems? > http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ > Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette > List archive: http://listarchives.libreoffice.org/global/l10n/ > All messages sent to this list will be publicly archived and cannot be deleted > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - avmedia/source include/sal
avmedia/source/framework/modeltools.cxx| 12 ++--
avmedia/source/opengl/oglmanager.cxx |1
avmedia/source/opengl/oglplayer.cxx| 46 +++
avmedia/source/opengl/oglwindow.cxx| 87 -
avmedia/source/opengl/oglwindow.hxx|7 ++
avmedia/source/viewer/mediawindow_impl.cxx | 20 +++---
avmedia/source/viewer/mediawindow_impl.hxx |1
include/sal/log-areas.dox |2
8 files changed, 145 insertions(+), 31 deletions(-)
New commits:
commit bf703a7ef97008a19b7cd725acd98e3b86889283
Author: Zolnai Tamás
Date: Tue May 13 00:07:48 2014 +0200
glTF rendering: first try to move camera position
SystemChildWindow can't handle events by its own
that's why it's parent is used as an event handler.
Mouse pointer specify the active model.
This patch made for editing, in case of slideshow
we have one less window.
Change-Id: If8ac57176b9a0abab518f8d8a06a2a41177a4881
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index f74162b..43b8a71 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -211,7 +211,7 @@ uno::Reference< media::XPlayerWindow > SAL_CALL
OGLPlayer::createPlayerWindow( c
m_pHandle->viewport.y = 0;
m_pHandle->viewport.width = aSize.Width();
m_pHandle->viewport.height = aSize.Height();
-OGLWindow* pWindow = new OGLWindow(m_pHandle, &m_aContext);
+OGLWindow* pWindow = new OGLWindow(m_pHandle, &m_aContext, pChildWindow);
return uno::Reference< media::XPlayerWindow >( pWindow );
}
diff --git a/avmedia/source/opengl/oglwindow.cxx
b/avmedia/source/opengl/oglwindow.cxx
index 3168874..35b1ab4 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -14,9 +14,10 @@ using namespace com::sun::star;
namespace avmedia { namespace ogl {
-OGLWindow::OGLWindow( glTFHandle* pHandle, OpenGLContext* pContext )
+OGLWindow::OGLWindow( glTFHandle* pHandle, OpenGLContext* pContext,
SystemChildWindow* pChildWindow )
: m_pHandle( pHandle )
, m_pContext( pContext )
+, m_pEventHandler( pChildWindow->GetParent() )
, m_bVisible ( false )
, meZoomLevel( media::ZoomLevel_ORIGINAL )
{
@@ -122,7 +123,17 @@ void SAL_CALL OGLWindow::setVisible( sal_Bool bSet )
throw (uno::RuntimeException, std::exception)
{
if( bSet && !m_bVisible )
+{
update();
+m_pEventHandler->GetParent()->AddEventListener( LINK(this, OGLWindow,
FocusGrabber));
+m_pEventHandler->AddEventListener( LINK(this, OGLWindow,
CameraHandler));
+m_pEventHandler->GrabFocus();
+}
+else if( !bSet )
+{
+m_pEventHandler->GetParent()->RemoveEventListener( LINK(this,
OGLWindow, FocusGrabber));
+m_pEventHandler->RemoveEventListener( LINK(this, OGLWindow,
CameraHandler));
+}
m_bVisible = bSet;
}
@@ -196,6 +207,80 @@ void SAL_CALL OGLWindow::removePaintListener( const
uno::Reference< awt::XPaintL
{
}
+IMPL_LINK(OGLWindow, FocusGrabber, VclWindowEvent*, pEvent)
+{
+assert(m_pEventHandler);
+if( pEvent->GetId() == VCLEVENT_WINDOW_MOUSEMOVE )
+{
+MouseEvent* pMouseEvt = (MouseEvent*)pEvent->GetData();
+if(pMouseEvt)
+{
+const Point& rMousePos = pMouseEvt->GetPosPixel();
+const Rectangle
aWinRect(m_pEventHandler->GetPosPixel(),m_pEventHandler->GetSizePixel());
+if( aWinRect.IsInside(rMousePos) )
+{
+if ( !m_pEventHandler->HasFocus() )
+{
+m_pEventHandler->GrabFocus();
+}
+}
+else if ( m_pEventHandler->HasFocus() )
+{
+m_pEventHandler->GrabFocusToDocument();
+}
+}
+}
+
+return 0;
+}
+
+IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
+{
+if( pEvent->GetId() == VCLEVENT_WINDOW_KEYINPUT )
+{
+KeyEvent* pKeyEvt = (KeyEvent*)pEvent->GetData();
+if(pKeyEvt)
+{
+sal_uInt16 nCode = pKeyEvt->GetKeyCode().GetCode();
+m_pContext->makeCurrent();
+
+// Calculate movement
+glm::vec3 vMoveBy;
+{
+glm::vec3 vEye;
+glm::vec3 vView;
+glm::vec3 vUp;
+gltf_get_camera_pos(&vEye,&vView,&vUp);
+float fModelSize =(float)gltf_get_model_size();
+
+glm::vec3 vMove = vView-vEye;
+vMove = glm::normalize(vMove);
+vMove *= 25.0f;
+glm::vec3 vStrafe = glm::cross(vView-vEye, vUp);
+vStrafe = glm::normalize(vStrafe);
+vStrafe *= 25.0f;
+glm::vec3 vMup = glm::cross(vView-vEye,glm::vec3(1.f,0.f,0.f)
);
+vMup = glm::normalize(vMup);
+vMup *= 25.0f;
+
+
[Libreoffice-commits] core.git: 3 commits - sc/source sfx2/source
sc/source/ui/drawfunc/fuins2.cxx | 546 +++
sfx2/source/doc/objmisc.cxx | 29 +-
2 files changed, 291 insertions(+), 284 deletions(-)
New commits:
commit ee5cae3da45dec3c17bbff849cbbfd5363984bd0
Author: Kohei Yoshida
Date: Mon May 12 17:19:17 2014 -0400
Let's not forget to free the SdrOle2Obj instance here.
When the chart creation wizard is cancelled.
Change-Id: I5eb2b2719ce3ec1eaa180a8c7193df23794dc03d
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index ddc961b..9c7b192 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -746,7 +746,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
Window* pWin, ScDrawView*
OSL_ASSERT( pPage );
OSL_ASSERT( pObj );
if( pPage )
-pPage->RemoveObject( pObj->GetOrdNum());
+{
+// Remove the OLE2 object from the sdr page.
+SdrObject* pRemoved =
pPage->RemoveObject(pObj->GetOrdNum());
+OSL_ASSERT(pRemoved == pObj);
+SdrObject::Free(pRemoved); // Don't forget to free
it.
+}
bAddUndo = false; // don't create the undo
action for inserting
commit 13c9628c2641a44267e6681995b3261e4ac6d809
Author: Kohei Yoshida
Date: Mon May 12 17:16:30 2014 -0400
Bail out early if it's not a chart module.
Change-Id: I2e487b79671153786f02f12b4aac2b32476585e4
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 1505b28..ddc961b 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -439,346 +439,345 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
Window* pWin, ScDrawView*
if( ! rReq.IsAPI() )
rReq.Done();
-if( SvtModuleOptions().IsChart() )
-{
+if (!SvtModuleOptions().IsChart())
+return;
-// BM/IHA --
+// BM/IHA --
-// get range
-OUString aRangeString;
-ScRange aPositionRange; // cell range for chart positioning
-ScMarkData aMark = pViewSh->GetViewData()->GetMarkData();
-if( pReqArgs )
-{
-const SfxPoolItem* pItem;
-if( pReqArgs->HasItem( FN_PARAM_5, &pItem ) )
-aRangeString = OUString( ((const
SfxStringItem*)pItem)->GetValue());
+// get range
+OUString aRangeString;
+ScRange aPositionRange; // cell range for chart positioning
+ScMarkData aMark = pViewSh->GetViewData()->GetMarkData();
+if( pReqArgs )
+{
+const SfxPoolItem* pItem;
+if( pReqArgs->HasItem( FN_PARAM_5, &pItem ) )
+aRangeString = OUString( ((const
SfxStringItem*)pItem)->GetValue());
-aPositionRange = pViewSh->GetViewData()->GetCurPos();
+aPositionRange = pViewSh->GetViewData()->GetCurPos();
+}
+else
+{
+bool bAutomaticMark = false;
+if ( !aMark.IsMarked() && !aMark.IsMultiMarked() )
+{
+pViewSh->GetViewData()->GetView()->MarkDataArea( true );
+bAutomaticMark = true;
}
-else
+
+ScMarkData aMultiMark( aMark );
+aMultiMark.MarkToMulti();
+
+ScRangeList aRanges;
+aMultiMark.FillRangeListWithMarks( &aRanges, false );
+OUString aStr;
+ScDocument* pDocument = pViewSh->GetViewData()->GetDocument();
+aRanges.Format( aStr, SCR_ABS_3D, pDocument,
pDocument->GetAddressConvention() );
+aRangeString = aStr;
+
+// get "total" range for positioning
+if ( !aRanges.empty() )
{
-bool bAutomaticMark = false;
-if ( !aMark.IsMarked() && !aMark.IsMultiMarked() )
+aPositionRange = *aRanges[ 0 ];
+for ( size_t i = 1, nCount = aRanges.size(); i < nCount; ++i )
{
-pViewSh->GetViewData()->GetView()->MarkDataArea( true );
-bAutomaticMark = true;
+aPositionRange.ExtendTo( *aRanges[ i ] );
}
+}
-ScMarkData aMultiMark( aMark );
-aMultiMark.MarkToMulti();
+if(bAutomaticMark)
+pViewSh->GetViewData()->GetView()->Unmark();
+}
-ScRangeList aRanges;
-aMultiMark.FillRangeListWithMarks( &aRanges, false );
-OUString aStr;
-ScDocument* pDocument = pViewSh->GetViewData()->GetDocument();
-aRanges.Format( aStr, SCR_ABS_3D, pDocument,
pDocument->GetAddressConvention() );
-aRangeString = aStr;
-// get "total" range for positioning
-if ( !aRanges.empty() )
-{
-aPositionRange = *aRanges[ 0 ];
-for ( size_t i = 1, nCount = aRanges.si
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/ui/app/inputhdl.cxx | 31 +++
1 file changed, 23 insertions(+), 8 deletions(-)
New commits:
commit ad8a7bf570576186f37d5c30bb41bb119ded1626
Author: Eike Rathke
Date: Mon May 12 23:22:22 2014 +0200
include parentheses replacement in functions' formula data, fdo#75264
... to actually make hitting Enter on a function tip work so the
parentheses are added and the cursor is placed in between and the
correct description is displayed.
Change-Id: I2cbe8f9e2b745a8331aeb8744b64d0baa1f0513e
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index da4f5a2..f35ab6a 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -98,6 +98,11 @@ namespace {
// and the quotation mark (so string constants can be skipped)
const sal_Char pMinDelimiters[] = " !\"";
+// Formula data replacement character for a pair of parentheses at end of
+// function name, to force sorting parentheses before all other characters.
+// Collation may treat parentheses differently.
+const sal_Unicode cParenthesesReplacement = 0x0001;
+
sal_Unicode lcl_getSheetSeparator(ScDocument* pDoc)
{
ScCompiler aComp(pDoc, ScAddress());
@@ -720,6 +725,7 @@ void ScInputHandler::GetFormulaData()
else
pFormulaDataPara = new ScTypedCaseStrSet;
+const OUString aParenthesesReplacement( cParenthesesReplacement);
const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
sal_uLong nListCount = pFuncList->GetCount();
for(sal_uLong i=0;iGetFunction( i );
if ( pDesc->pFuncName )
{
-pFormulaData->insert(ScTypedStrData(*pDesc->pFuncName, 0.0,
ScTypedStrData::Standard));
const sal_Unicode* pName = pDesc->pFuncName->getStr();
const sal_Int32 nLen = pDesc->pFuncName->getLength();
// fdo#75264 fill maFormulaChar with all characters used in
formula names
@@ -736,6 +741,8 @@ void ScInputHandler::GetFormulaData()
sal_Unicode c = pName[ j ];
maFormulaChar.insert( c );
}
+OUString aFuncName = *pDesc->pFuncName +
aParenthesesReplacement;
+pFormulaData->insert(ScTypedStrData(aFuncName, 0.0,
ScTypedStrData::Standard));
pDesc->initArgumentInfo();
OUString aEntry = pDesc->getSignature();
pFormulaDataPara->insert(ScTypedStrData(aEntry, 0.0,
ScTypedStrData::Standard));
@@ -830,9 +837,10 @@ void ScInputHandler::ShowTipCursor()
nArgPos = aHelper.GetArgStart( aSelText,
nNextFStart, 0 );
nArgs =
static_cast(ppFDesc->getParameterCount());
+OUString aFuncName = ppFDesc->getFunctionName() +
"(";
OUString aNew;
ScTypedCaseStrSet::const_iterator it =
-findText(*pFormulaDataPara,
pFormulaDataPara->end(), ppFDesc->getFunctionName(), aNew, false);
+findText(*pFormulaDataPara,
pFormulaDataPara->end(), aFuncName, aNew, false);
if (it != pFormulaDataPara->end())
{
bool bFlag = false;
@@ -1084,7 +1092,8 @@ void ScInputHandler::UseFormulaData()
miAutoPosFormula = findText(*pFormulaData, miAutoPosFormula,
aText, aNew, false);
if (miAutoPosFormula != pFormulaData->end())
{
-aNew += "()";
+if (aNew[aNew.getLength()-1] == cParenthesesReplacement)
+aNew = aNew.copy( 0, aNew.getLength()-1) + "()";
ShowTip( aNew );
aAutoSearch = aText;
}
@@ -1227,6 +1236,8 @@ void ScInputHandler::NextFormulaEntry( bool bBack )
if (itNew != pFormulaData->end())
{
miAutoPosFormula = itNew;
+if (aNew[aNew.getLength()-1] == cParenthesesReplacement)
+aNew = aNew.copy( 0, aNew.getLength()-1) + "()";
ShowTip(aNew); // Display a quick help
}
}
@@ -1288,7 +1299,9 @@ void ScInputHandler::PasteFunctionData()
if (pFormulaData && miAutoPosFormula != pFormulaData->end())
{
const ScTypedStrData& rData = *miAutoPosFormula;
-const OUString& aInsert = rData.GetString();
+OUString aInsert = rData.GetString();
+if (aInsert[aInsert.getLength()-1] == cParenthesesReplacement)
+aInsert = aInsert.copy( 0, aInsert.getLength()-1) + "()";
bool bParInserted = false;
DataChanging(); // Cannot be new
commit ead754112a1ecaa456d8b5d7231ed178bbcb3a0b
Author: Eike Rathke
Date: Mon May 12 19:04:48 2014 +0200
nitpick: avoid triple redirection inside loop, fdo#75264 related
Also, it's
[Libreoffice-commits] dev-tools.git: leak-sanitizer/leak-suppress.txt
leak-sanitizer/leak-suppress.txt |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 196396ffc72bbb1e4f9bbc8ff83432e22bf638af Author: Markus Mohrhard Date: Mon May 12 23:15:41 2014 +0200 add one more entry to the leak sanitizer suppression file diff --git a/leak-sanitizer/leak-suppress.txt b/leak-sanitizer/leak-suppress.txt index c77a719..5e99d64 100644 --- a/leak-sanitizer/leak-suppress.txt +++ b/leak-sanitizer/leak-suppress.txt @@ -1,6 +1,9 @@ -#uno tepelib +#uno typelib leak:cppu/source/typelib/typelib.cxx +# uno component context +leak:cppu::defaultBootstrap_InitialComponentContext + # global objects leak:SfxFilterContainer::ReadSingleFilter_Impl ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Larsen changed: What|Removed |Added Depends on|38635 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Larsen changed: What|Removed |Added Depends on||38635 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 8 commits - connectivity/source
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 15 +++- connectivity/source/drivers/ado/AResultSet.cxx | 20 -- connectivity/source/drivers/ado/AStatement.cxx | 31 ++ connectivity/source/drivers/firebird/StatementCommonBase.cxx| 30 ++--- connectivity/source/drivers/jdbc/JStatement.cxx | 30 ++--- connectivity/source/drivers/jdbc/ResultSet.cxx | 22 +-- connectivity/source/drivers/kab/KResultSet.cxx | 23 +-- connectivity/source/drivers/kab/KStatement.cxx | 30 ++--- connectivity/source/drivers/macab/MacabResultSet.cxx| 23 +-- connectivity/source/drivers/macab/MacabStatement.cxx| 30 ++--- connectivity/source/drivers/mork/MResultSet.cxx | 19 -- connectivity/source/drivers/mork/MStatement.cxx | 29 ++--- connectivity/source/drivers/mozab/MResultSet.cxx| 19 -- connectivity/source/drivers/mozab/MStatement.cxx| 29 ++--- connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 15 +++- connectivity/source/drivers/odbc/OResultSet.cxx | 23 +-- connectivity/source/drivers/odbc/OStatement.cxx | 30 ++--- connectivity/source/inc/propertyids.hxx | 15 18 files changed, 290 insertions(+), 143 deletions(-) New commits: commit 0fadbdbbdbd55cf60f9a202f1cf7b1d60517078c Author: Julien Nabet Date: Mon May 12 22:52:25 2014 +0200 Kill DECL_PROP0 and the rest + clean propertyids.hxx Change-Id: I872bc07ff9b1fe96a35e06ad3c5d8aaa75199bdd diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index de43945..d711304 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -706,11 +706,16 @@ void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0) Sequence< com::sun::star::beans::Property > aProps(5); com::sun::star::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; -DECL_PROP0(CURSORNAME, OUString); -DECL_PROP0(FETCHDIRECTION, sal_Int32); -DECL_PROP0(FETCHSIZE, sal_Int32); -DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); -DECL_PROP0(RESULTSETTYPE, sal_Int32); +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), +PROPERTY_ID_CURSORNAME, cppu::UnoType::get(), 0); +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), +PROPERTY_ID_FETCHDIRECTION, cppu::UnoType::get(), 0); +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), +PROPERTY_ID_FETCHSIZE, cppu::UnoType::get(), 0); +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), +PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType::get(), 0); +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), +PROPERTY_ID_RESULTSETTYPE, cppu::UnoType::get(), 0); return new ::cppu::OPropertyArrayHelper(aProps); } diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index a232ad1..03e06a0 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -654,17 +654,26 @@ void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, R Sequence< com::sun::star::beans::Property > aProps(10); com::sun::star::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; -DECL_PROP0(CURSORNAME, OUString); -DECL_BOOL_PROP0(ESCAPEPROCESSING); -DECL_PROP0(FETCHDIRECTION,sal_Int32); -DECL_PROP0(FETCHSIZE, sal_Int32); -DECL_PROP0(MAXFIELDSIZE,sal_Int32); -DECL_PROP0(MAXROWS, sal_Int32); -DECL_PROP0(QUERYTIMEOUT,sal_Int32); -DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); -DECL_PROP0(RESULTSETTYPE,sal_Int32); -DECL_BOOL_PROP0(USEBOOKMARKS); - +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), +PROPERTY_ID_CURSORNAME, cppu::UnoType::get(), 0); +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), +PROPERTY_ID_ESCAPEPROCESSING, ::
[Libreoffice-commits] core.git: 2 commits - chart2/source sc/source
chart2/source/view/main/GL3DRenderer.cxx |3 +--
sc/source/ui/view/gridwin.cxx|3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 21162eab55e3ae6e21c5cef6f7fd1f35d71aac3e
Author: weigao
Date: Mon May 12 22:41:03 2014 +0200
some fixes for positioning problems
Change-Id: I4e970837ebe6867458e4a75c7cc323f8f6b3ecc8
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index 69e961b..686413d 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1287,7 +1287,7 @@ void OpenGL3DRenderer::RenderTextShape()
PosVecf3 angle = {0.0f, 0.0f, 0.0f};
PosVecf3 scale = {1.0, 1.0, 1.0f};
MoveModelf(trans, angle, scale);
-m_MVP = m_Projection * m_View * m_Model;
+m_MVP = m_3DProjection * m_3DView * m_Model;
glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
CHECK_GL_ERROR();
glBufferData(GL_ARRAY_BUFFER, sizeof(textInfo.vertex),
textInfo.vertex, GL_STATIC_DRAW);
@@ -1401,7 +1401,6 @@ void OpenGL3DRenderer::ProcessUnrenderedShape()
CreateSceneBoxView();
glViewport(0, 0, m_iWidth, m_iHeight);
glClearDepth(1.0f);
-glViewport(0, 0, m_iWidth, m_iHeight);
glClearColor(1.0, 1.0, 1.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
//Polygon
commit 3dbd2968025ab51fb961d64093a14f910828f57f
Author: Markus Mohrhard
Date: Mon May 12 22:39:50 2014 +0200
only send mouse events if the window is visible
Change-Id: I2564159cd21e068c0893fc96d1c7e90746788f39
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 95ce9fd..d1194bf 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1642,6 +1642,9 @@ void ScGridWindow::MouseButtonDown( const MouseEvent&
rMEvt )
for(boost::ptr_vector::iterator itr = maChildWindows.begin(),
itrEnd = maChildWindows.end(); itr != itrEnd; ++itr)
{
+if(!itr->IsVisible())
+continue;
+
Point aPoint = itr->GetPosPixel();
Size aSize = itr->GetSizePixel();
___
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 --- Comment #138 from Joel Madero --- Symbols being imported incorrectly from docx files - this was reported in the past and then corrected, now it's broken again. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Joel Madero changed: What|Removed |Added Depends on||78635 -- 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
[GSoC] Hello!
Hello everyone ! My name is Mihai and I have been selected to participate in this year's GSoC program. I will be working on the SharePoint and Sky Drive connection project. I am a CS student from Romania and I am in my 2nd year of study. I am looking forward to this summer, as I am eager to start hacking on this project :D. Best regards, Mihai. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dialog/uiregionsw.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 121e0d2e9d1b76fe89c5925b1b4a29b22895237e
Author: Michael Stahl
Date: Mon May 12 21:42:12 2014 +0200
fdo#78271: sw: Insert Section dialog: fix editing of name
... to not disable the "OK" button due to 32-bit combo-box no longer
using 2^16-1 for "not found".
(regression from 68ec95b3f80408ae50897b043eed69a07d084df9)
Change-Id: I691e5e81de4a112108741513251945f1b8dd88d4
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index 548d8ba..9f5385fd 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1732,7 +1732,8 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl,
Button *, pButton )
IMPL_LINK_NOARG_INLINE_START(SwInsertSectionTabPage, NameEditHdl)
{
const OUString aName = m_pCurName->GetText();
-GetTabDialog()->GetOKButton().Enable(!aName.isEmpty() &&
m_pCurName->GetEntryPos( aName ) == USHRT_MAX);
+GetTabDialog()->GetOKButton().Enable(!aName.isEmpty() &&
+m_pCurName->GetEntryPos( aName ) == LISTBOX_ENTRY_NOTFOUND);
return 0;
}
IMPL_LINK_NOARG_INLINE_END(SwInsertSectionTabPage, NameEditHdl)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|74557 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/o3tl sc/source
include/o3tl/deleter.hxx | 34 --
sc/source/core/data/column.cxx|4 ++--
sc/source/core/data/columnspanset.cxx |4 ++--
sc/source/core/data/document.cxx |4 ++--
sc/source/core/data/dptabres.cxx |8
sc/source/core/data/table3.cxx|4 ++--
sc/source/core/tool/chartlis.cxx |6 +++---
sc/source/core/tool/rangelst.cxx |6 +++---
sc/source/filter/xcl97/xcl97rec.cxx |4 ++--
sc/source/ui/unoobj/chart2uno.cxx |4 ++--
sc/source/ui/view/viewdata.cxx|4 ++--
11 files changed, 24 insertions(+), 58 deletions(-)
New commits:
commit 28fe3628ed22a17eeb5a402724fea6558b2ba6bf
Author: Caolán McNamara
Date: Mon May 12 20:24:25 2014 +0100
o3tl::default_deleter->boost::checked_deleter
has the same result
Change-Id: Ifbebcfb26c6fc54d03522c924da86837d7dfa3b9
diff --git a/include/o3tl/deleter.hxx b/include/o3tl/deleter.hxx
deleted file mode 100644
index 7f9e50d..000
--- a/include/o3tl/deleter.hxx
+++ /dev/null
@@ -1,34 +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/.
- */
-
-#ifndef INCLUDED_O3TL_DELETER_HXX
-#define INCLUDED_O3TL_DELETER_HXX
-
-#include
-
-namespace o3tl {
-
-/**
- * Function object to allow deleting instances stored in STL containers as
- * pointers.
- */
-template
-struct default_deleter : public std::unary_function
-{
-void operator() (T* p)
-{
-delete p;
-}
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 4a25df7..0a5a68e 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -51,11 +51,11 @@
#include
#include
#include
-#include
#include
#include
#include
+#include
#include
using ::editeng::SvxBorderLine;
@@ -2228,7 +2228,7 @@ class UpdateRefOnNonCopy :
std::unary_function
if (!mpUndoDoc->SetFormulaCells(rOldPos, aCells))
// Insertion failed. Delete all formula cells.
-std::for_each(aCells.begin(), aCells.end(),
o3tl::default_deleter());
+std::for_each(aCells.begin(), aCells.end(),
boost::checked_deleter());
}
public:
diff --git a/sc/source/core/data/columnspanset.cxx
b/sc/source/core/data/columnspanset.cxx
index 8cef966..e431361 100644
--- a/sc/source/core/data/columnspanset.cxx
+++ b/sc/source/core/data/columnspanset.cxx
@@ -15,7 +15,7 @@
#include "markdata.hxx"
#include "rangelst.hxx"
#include
-#include
+#include
#include
@@ -67,7 +67,7 @@ ColumnSpanSet::~ColumnSpanSet()
if (!pTab)
continue;
-std::for_each(pTab->begin(), pTab->end(),
o3tl::default_deleter());
+std::for_each(pTab->begin(), pTab->end(),
boost::checked_deleter());
delete pTab;
}
}
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 02a1bbb..bac82bd 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -98,10 +98,10 @@
#include
#include
-#include
#include
#include
+#include
#include
#include "mtvelements.hxx"
@@ -785,7 +785,7 @@ bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets )
TableContainer::iterator it = maTabs.begin() + nTab;
TableContainer::iterator itEnd = it + nSheets;
-std::for_each(it, itEnd, o3tl::default_deleter());
+std::for_each(it, itEnd, boost::checked_deleter());
maTabs.erase(it, itEnd);
// UpdateBroadcastAreas must be called between UpdateDeleteTab,
// which ends listening, and StartAllListeners, to not modify
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 542cf54..6382ae2 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -33,13 +33,13 @@
#include
#include
#include
-#include
#include
#include
#include
-#include
+#include
#include
+#include
#include
#include
@@ -757,7 +757,7 @@ ScDPResultData::ScDPResultData( ScDPSource& rSrc ) :
ScDPResultData::~ScDPResultData()
{
-std::for_each(maDimMembers.begin(), maDimMembers.end(),
o3tl::default_deleter());
+std::for_each(maDimMembers.begin(), maDimMembers.end(),
boost::checked_deleter());
}
void ScDPResultData::SetMeasureData(
@@ -3550,7 +3550,7 @@ ScDPDataDimension::ScDPDataDimension( const
ScDPResultData* pData ) :
ScDPDataDimension::~ScDPDataDimension()
{
-std::for_each(maMembers.begin(), maMembers.end(),
o3tl::default_deleter());
+std::for_each(maMembers.begin(),
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|34957 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||34957 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||50057 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|50057 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|71248 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Lionel Elie Mamane changed: What|Removed |Added Depends on|53473 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Lionel Elie Mamane changed: What|Removed |Added Depends on||53473 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - avmedia/source
avmedia/source/macavf/macavf_framegrabber.cxx | 12 +---
avmedia/source/macavf/macavf_framegrabber.hxx |1 +
avmedia/source/macavf/macavf_player.cxx | 23 ---
avmedia/source/macavf/macavf_player.hxx |4 +---
4 files changed, 15 insertions(+), 25 deletions(-)
New commits:
commit 976e787f6b33389ea9dcd35ff7680dedeace47ac
Author: Herbert Dürr
Date: Mon May 12 16:07:09 2014 +
#i124875# avoid wasteful loading of an AVAsset in MacAVF::Framegrabber
FrameGrabber used to load its own copy of a movie. Since multimedia content
is often very data-intensive this should and can be avoided by using the
movie asset already available in the Player.
diff --git a/avmedia/source/macavf/macavf_framegrabber.cxx
b/avmedia/source/macavf/macavf_framegrabber.cxx
index 1748199..55611af 100644
--- a/avmedia/source/macavf/macavf_framegrabber.cxx
+++ b/avmedia/source/macavf/macavf_framegrabber.cxx
@@ -51,8 +51,6 @@ FrameGrabber::~FrameGrabber()
bool FrameGrabber::create( const ::rtl::OUString& rURL )
{
-// TODO: use AVPlayer's movie directly instead of loading it here?
-
NSString* pNSStr = [NSString stringWithCharacters:rURL.getStr()
length:rURL.getLength()];
NSURL* pNSURL = [NSURL URLWithString: [pNSStr
stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
AVAsset* pMovie = [AVURLAsset URLAssetWithURL:pNSURL options:nil];
@@ -61,9 +59,17 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
OSL_TRACE( "AVGrabber::create() cannot load url=\"%s\"", [pNSStr
UTF8String] );
return false;
}
+
+return create( pMovie );
+}
+
+//
--
+
+bool FrameGrabber::create( AVAsset* pMovie )
+{
if( [[pMovie tracksWithMediaType:AVMediaTypeVideo] count] == 0)
{
-OSL_TRACE( "AVGrabber::create() found no video in url=\"%s\"", [pNSStr
UTF8String] );
+OSL_TRACE( "AVGrabber::create() found no video content!" );
return false;
}
diff --git a/avmedia/source/macavf/macavf_framegrabber.hxx
b/avmedia/source/macavf/macavf_framegrabber.hxx
index 21d1dad..940e54d 100644
--- a/avmedia/source/macavf/macavf_framegrabber.hxx
+++ b/avmedia/source/macavf/macavf_framegrabber.hxx
@@ -42,6 +42,7 @@ public:
virtual ~FrameGrabber();
boolcreate( const ::rtl::OUString& rURL );
+boolcreate( AVAsset* pMovie );
// XFrameGrabber
virtual ::com::sun::star::uno::Reference<
::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/avmedia/source/macavf/macavf_player.cxx
b/avmedia/source/macavf/macavf_player.cxx
index 2e15907..26bc07a 100644
--- a/avmedia/source/macavf/macavf_player.cxx
+++ b/avmedia/source/macavf/macavf_player.cxx
@@ -112,17 +112,6 @@ Player::~Player()
//
--
-AVAsset* Player::getMovie()
-{
-if( !mpPlayer )
-return nil;
-AVAsset* pMovie = [[mpPlayer currentItem] asset];
-OSL_ASSERT( pMovie );
-return pMovie;
-}
-
-//
--
-
bool Player::handleObservation( NSString* pKeyPath )
{
OSL_TRACE( "AVPlayer::handleObservation key=\"%s\"", [pKeyPath
UTF8String]);
@@ -139,8 +128,6 @@ bool Player::handleObservation( NSString* pKeyPath )
bool Player::create( const ::rtl::OUString& rURL )
{
-maURL = rURL;
-
// get the media asset
NSString* aNSStr = [NSString stringWithCharacters:rURL.getStr()
length:rURL.getLength()];
NSURL* aNSURL = [NSURL URLWithString: [aNSStr
stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
@@ -433,12 +420,10 @@ uno::Reference< media::XFrameGrabber > SAL_CALL
Player::createFrameGrabber()
uno::Reference< media::XFrameGrabber > xRet;
OSL_TRACE ("Player::createFrameGrabber");
-if( !maURL.isEmpty() )
-{
-FrameGrabber* pGrabber = new FrameGrabber( mxMgr );
-if( pGrabber->create( maURL ) )
-xRet = pGrabber;
-}
+FrameGrabber* pGrabber = new FrameGrabber( mxMgr );
+AVAsset* pMovie = [[mpPlayer currentItem] asset];
+if( pGrabber->create( pMovie ) )
+xRet = pGrabber;
return xRet;
}
diff --git a/avmedia/source/macavf/macavf_player.hxx
b/avmedia/source/macavf/macavf_player.hxx
index 98c5454..fc99551 100644
--- a/avmedia/source/macavf/macavf_player.hxx
+++ b/avmedia/source/macavf/macavf_player.hxx
@@ -46,6 +46,7 @@ public:
virtual ~Player();
bool create( const ::rtl::OUString& rURL );
+bool create( AVAsset* );
// XPlayer
virtual void SAL_CALL start() throw
(::com::sun::star::uno::RuntimeException);
@@ -72,15 +73,12 @@ public:
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString&
ServiceName ) throw (::com::sun::star::uno::RuntimeExcepti
[Libreoffice-commits] core.git: cli_ure/source
cli_ure/source/climaker/climaker_share.h |2 +-
cli_ure/source/native/native_share.h | 20 ++--
cli_ure/source/uno_bridge/cli_proxy.cxx |8
cli_ure/source/uno_bridge/cli_proxy.h|2 +-
4 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit acc04202e8b1e69381355eaae5ba456bee6fd9c9
Author: Thomas Arnhold
Date: Mon May 12 19:49:06 2014 +0200
use css prefix consistently
Change-Id: Ia2f827381ec768a7867918d61d7afb2f68457832
diff --git a/cli_ure/source/climaker/climaker_share.h
b/cli_ure/source/climaker/climaker_share.h
index 700321a..aa4648c 100644
--- a/cli_ure/source/climaker/climaker_share.h
+++ b/cli_ure/source/climaker/climaker_share.h
@@ -130,7 +130,7 @@ ref class TypeEmitter : public ::System::IDisposable
css::reflection::XCompoundTypeDescription > >& seq_exceptionsTd );
/* Creates ::System::Type object for UNO exceptions. The UNO exceptions are
obtained by
-
com::sun::star::reflection::XServiceConstructorDescription::getExceptions
+ css::reflection::XServiceConstructorDescription::getExceptions
In a first step the respective CLI types are created. Then it is
examined
if a Type represents a super class of another class. If so the Type of
the
derived class is discarded. For example there are a uno
RuntimeException and
diff --git a/cli_ure/source/native/native_share.h
b/cli_ure/source/native/native_share.h
index f8a22ef..7e1966e 100644
--- a/cli_ure/source/native/native_share.h
+++ b/cli_ure/source/native/native_share.h
@@ -47,17 +47,17 @@ inline OUString String_to_ustring( ::System::String ^ str )
template< typename T >
inline ::System::Object ^ to_cli(
-::com::sun::star::uno::Reference< T > const & x )
+css::uno::Reference< T > const & x )
{
-::com::sun::star::uno::Mapping mapping(
+css::uno::Mapping mapping(
CPPU_CURRENT_LANGUAGE_BINDING_NAME, UNO_LB_CLI );
OSL_ASSERT( mapping.is() );
if (! mapping.is())
{
-throw ::com::sun::star::uno::RuntimeException(
+throw css::uno::RuntimeException(
"cannot get mapping from C++ to CLI!",
-::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XInterface >() );
+css::uno::Reference<
+ css::uno::XInterface >() );
}
intptr_t intptr =
@@ -71,17 +71,17 @@ inline ::System::Object ^ to_cli(
template< typename T >
inline void to_uno(
-::com::sun::star::uno::Reference< T > * pRet, ::System::Object ^ x )
+css::uno::Reference< T > * pRet, ::System::Object ^ x )
{
-::com::sun::star::uno::Mapping mapping(
+css::uno::Mapping mapping(
UNO_LB_CLI, CPPU_CURRENT_LANGUAGE_BINDING_NAME );
OSL_ASSERT( mapping.is() );
if (! mapping.is())
{
-throw ::com::sun::star::uno::RuntimeException(
+throw css::uno::RuntimeException(
"cannot get mapping from CLI to C++!",
-::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XInterface >() );
+css::uno::Reference<
+ css::uno::XInterface >() );
}
::System::Runtime::InteropServices::GCHandle handle(
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx
b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 2983d93..86e5078 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -1106,11 +1106,11 @@ void SAL_CALL cli_proxy_dispatch(
catch (BridgeRuntimeError & err)
{
// binary identical struct
-::com::sun::star::uno::RuntimeException exc(
+css::uno::RuntimeException exc(
"[cli_uno bridge error] " + err.m_message,
-::com::sun::star::uno::Reference<
-::com::sun::star::uno::XInterface >() );
-::com::sun::star::uno::Type const & exc_type = ::getCppuType( & exc);
+css::uno::Reference<
+css::uno::XInterface >() );
+css::uno::Type const & exc_type = ::getCppuType( & exc);
uno_type_any_construct( *uno_exc, &exc, exc_type.getTypeLibType(), 0);
#if OSL_DEBUG_LEVEL >= 1
OString cstr_msg(OUStringToOString(exc.Message,
diff --git a/cli_ure/source/uno_bridge/cli_proxy.h
b/cli_ure/source/uno_bridge/cli_proxy.h
index 81f3704..77823f8 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.h
+++ b/cli_ure/source/uno_bridge/cli_proxy.h
@@ -176,7 +176,7 @@ struct CliProxy: public uno_Interface
const Bridge* m_bridge;
const gcroot m_cliI;
gcroot m_type;
-const com::sun::star::uno::TypeDescription m_unoType;
+const css::uno::TypeDescription m_unoType;
const gcroot m_oid;
const OUString m_usOid;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/inc chart2/Library_chartcore.mk chart2/source include/o3tl sc/inc sc/source
chart2/Library_chartcore.mk |1
chart2/inc/ChartView.hxx|2
chart2/source/view/inc/GL3DBarChart.hxx | 10 +--
chart2/source/view/inc/GL3DPlotterBase.hxx | 28
chart2/source/view/main/ChartView.cxx | 91 ++--
chart2/source/view/main/GL3DPlotterBase.cxx | 18 +
include/o3tl/deleter.hxx| 34 ++
sc/inc/stlalgorithm.hxx | 13
sc/source/core/data/column.cxx |3
sc/source/core/data/columnspanset.cxx |4 -
sc/source/core/data/document.cxx|4 -
sc/source/core/data/dptabres.cxx|6 -
sc/source/core/data/table3.cxx |4 -
sc/source/core/tool/chartlis.cxx|7 +-
sc/source/core/tool/rangelst.cxx|6 -
sc/source/filter/xcl97/xcl97rec.cxx |4 -
sc/source/ui/unoobj/chart2uno.cxx |4 -
sc/source/ui/view/viewdata.cxx |4 -
18 files changed, 162 insertions(+), 81 deletions(-)
New commits:
commit ef69c15bb98683ca6a70ad2f0b92fec54f7a23e0
Author: Kohei Yoshida
Date: Mon May 12 13:44:20 2014 -0400
Have ChartView keep the instance of GL3D chart object between rendering.
Change-Id: I49419d20bf283fba1c31d8516972b0ca7fddcb5b
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index e4e1fee..97245ca 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/view/main/Clipping \
chart2/source/view/main/DataPointSymbolSupplier \
chart2/source/view/main/DrawModelWrapper \
+chart2/source/view/main/GL3DPlotterBase \
chart2/source/view/main/GL3DRenderer \
chart2/source/view/main/LabelPositionHelper \
chart2/source/view/main/Linear3DTransformation \
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 0ba3bf8..69f1eed 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -54,6 +54,7 @@ class VCoordinateSystem;
class DrawModelWrapper;
class SeriesPlotterContainer;
class VDataSeries;
+class GL3DPlotterBase;
enum TimeBasedMode
{
@@ -271,6 +272,7 @@ private: //member
::com::sun::star::awt::Rectangle m_aResultingDiagramRectangleExcludingAxes;
+boost::shared_ptr m_pGL3DPlotter;
TimeBasedInfo maTimeBased;
osl::Mutex maTimeMutex;
};
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx
b/chart2/source/view/inc/GL3DBarChart.hxx
index 86115de..7a1733e 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -10,6 +10,8 @@
#ifndef CHART2_GL3DBARCHART_HXX
#define CHART2_GL3DBARCHART_HXX
+#include
+
#include
#include
#include "VDataSeries.hxx"
@@ -27,7 +29,7 @@ class OpenGL3DRenderer;
}
-class GL3DBarChart
+class GL3DBarChart : public GL3DPlotterBase
{
public:
GL3DBarChart(
@@ -35,11 +37,11 @@ public:
const boost::ptr_vector& rDataSeries, OpenGLWindow&
rContext,
ExplicitCategoriesProvider& rCatProvider );
-~GL3DBarChart();
+virtual ~GL3DBarChart();
-void create3DShapes();
+virtual void create3DShapes() SAL_OVERRIDE;
-void render();
+virtual void render() SAL_OVERRIDE;
private:
css::uno::Reference mxChartType;
diff --git a/chart2/source/view/inc/GL3DPlotterBase.hxx
b/chart2/source/view/inc/GL3DPlotterBase.hxx
new file mode 100644
index 000..9c89008
--- /dev/null
+++ b/chart2/source/view/inc/GL3DPlotterBase.hxx
@@ -0,0 +1,28 @@
+/* -*- 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/.
+ */
+
+#ifndef CHART2_GL3DPLOTTERBASE_HXX
+#define CHART2_GL3DPLOTTERBASE_HXX
+
+namespace chart {
+
+class GL3DPlotterBase
+{
+public:
+virtual ~GL3DPlotterBase();
+
+virtual void create3DShapes() = 0;
+virtual void render() = 0;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 13f4bf7..49c3202 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2461,11 +2461,12 @@ void ChartView::createShapes()
}
else
{
+m_pGL3DPlotter.reset();
+
// hide OpenGL window for now in normal charts
OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
if(pWindow)
pWindow->Show(false);
-
}
#endif
@@ -3114,61 +3115,65 @@ IMPL_LINK_NOARG(ChartView, UpdateTimeBased)
void ChartView::createShapes3D()
{
-uno::Reference< XDiagram > xDiagram( mrChartModel.getFirstDiagram() );
-uno::Referen
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx | 76 +-
sc/source/ui/inc/inputhdl.hxx |2 +
2 files changed, 48 insertions(+), 30 deletions(-)
New commits:
commit 5b0b7553241bb5150b12bbf7625b4b0b36970272
Author: Winfried Donkers
Date: Tue Feb 25 08:14:55 2014 +0100
fdo#75264 fix incorrect/missing function tips in Calc
Change-Id: Ibaed735ed1c8dd2dcaf69b82a4c089f1cb35b8cf
Reviewed-on: https://gerrit.libreoffice.org/8218
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index fd51370..22a0e05 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -530,7 +530,8 @@ ScInputHandler::ScInputHandler()
pEditDefaults( NULL ),
pLastState( NULL ),
pDelayTimer( NULL ),
-pRangeFindList( NULL )
+pRangeFindList( NULL ),
+maFormulaChar()
{
// The InputHandler is constructed with the view, so SfxViewShell::Current
// doesn't have the right view yet. pActiveViewSh is updated in
NotifyChange.
@@ -719,36 +720,20 @@ void ScInputHandler::GetFormulaData()
else
pFormulaDataPara = new ScTypedCaseStrSet;
-// MRU functions from the functions autopilot
-// Just like in ScPosWnd::FillFunctions (inputwin.cxx)
-const ScAppOptions& rOpt = SC_MOD()->GetAppOptions();
-sal_uInt16 nMRUCount = rOpt.GetLRUFuncListCount();
-const sal_uInt16* pMRUList = rOpt.GetLRUFuncList();
const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
sal_uLong nListCount = pFuncList->GetCount();
-if (pMRUList)
-{
-for (sal_uInt16 i=0; iGetFunction( j );
-if ( pDesc->nFIndex == nId && pDesc->pFuncName )
-{
-OUString aEntry = *pDesc->pFuncName;
-aEntry += "()";
-pFormulaData->insert(ScTypedStrData(aEntry, 0.0,
ScTypedStrData::Standard));
-break; // Stop searching
-}
-}
-}
-}
for(sal_uLong i=0;iGetFunction( i );
if ( pDesc->pFuncName )
{
+pFormulaData->insert(ScTypedStrData(*pDesc->pFuncName, 0.0,
ScTypedStrData::Standard));
+// fdo75264 fill maFormulaChar with all characters used in
formula names
+for ( sal_Int32 j = 0; j < pDesc->pFuncName->getLength(); j++ )
+{
+sal_Unicode c = pDesc->pFuncName->getStr()[ j ];
+maFormulaChar.insert( c );
+}
pDesc->initArgumentInfo();
OUString aEntry = pDesc->getSignature();
pFormulaDataPara->insert(ScTypedStrData(aEntry, 0.0,
ScTypedStrData::Standard));
@@ -1025,6 +1010,35 @@ void ScInputHandler::ShowTipBelow( const OUString& rText
)
}
}
+bool ScInputHandler::GetFuncName( OUString& aStart, OUString& aResult )
+{
+if ( aStart.isEmpty() )
+return false;
+
+aStart = ScGlobal::pCharClass->uppercase( aStart );
+sal_Int32 nPos = aStart.getLength() - 1;
+sal_Unicode c = aStart[ nPos ];
+// fdo75264 use maFormulaChar to check if characters are used in function
names
+::std::set< sal_Unicode >::const_iterator p = maFormulaChar.find( c );
+if ( p == maFormulaChar.end() )
+return false; // last character is not part of any function name, quit
+
+::std::vector aTemp;
+while ( nPos >= 0 && p != maFormulaChar.end() )
+{
+aTemp.push_back( c );
+c = aStart[ --nPos ];
+p = maFormulaChar.find( c );
+}
+
+::std::vector::reverse_iterator rIt = aTemp.rbegin();
+aResult = OUString( *rIt++ );
+while ( rIt != aTemp.rend() )
+aResult += OUString( *rIt++ );
+
+return true;
+}
+
void ScInputHandler::UseFormulaData()
{
EditView* pActiveView = pTopView ? pTopView : pTableView;
@@ -1058,20 +1072,26 @@ void ScInputHandler::UseFormulaData()
sal_uInt16 nArgs;
bool bFound = false;
-OUString aText = pEngine->GetWord( 0, aSel.nEndPos-1 );
-if (!aText.isEmpty())
+OUString aText;
+if ( GetFuncName( aFormula, aText ) )
{
+// function name is incomplete:
+// show first matching function name as tip above cell
OUString aNew;
miAutoPosFormula = pFormulaData->end();
miAutoPosFormula = findText(*pFormulaData, miAutoPosFormula,
aText, aNew, false);
if (miAutoPosFormula != pFormulaData->end())
{
+aNew += "()";
ShowTip( aNew );
aAutoSearch = aText;
}
+return;
}
FormulaHelper aHelper(ScGloba
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - embeddedobj/source
embeddedobj/source/msole/olepersist.cxx | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 4bf27036d6b8ff56bdc76325a874f17ad8f9ddcb
Author: Jan Holesovsky
Date: Tue Mar 4 22:49:08 2014 +0100
OLE: Turn an OSL_ENSURE() into a real condition (related: fdo#65631)
This is part of some STAMPIT workaround; no idea what it is, but for sure it
causes problems with PowerPoint OLE in Writer - so let's avoid updating if
it
is not "STAMPIT".
This appears to help for the problem in fdo#65631 comment #9 on master,
let's see if the same is true if it's backported to 4.2...
(cherry picked from commit a94e973bf5b5d0755a53881867961691633a4cbd)
Signed-off-by: Michael Stahl
Change-Id: I266b419ba3461c547f7ee8e447ef64a47a8511e8
diff --git a/embeddedobj/source/msole/olepersist.cxx
b/embeddedobj/source/msole/olepersist.cxx
index 528d0fc..077a847 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -885,13 +885,12 @@ void OleEmbeddedObject::OnViewChanged_Impl()
// - if the verb execution is in progress and the view is changed the
object will be stored
// after the execution, so there is no need to send the notification.
// - the STAMPIT object can never be active.
-if ( m_aVerbExecutionController.CanDoNotification()
- && m_pOleComponent && m_nUpdateMode ==
embed::EmbedUpdateModes::ALWAYS_UPDATE )
+if (m_aVerbExecutionController.CanDoNotification() &&
+m_pOleComponent && m_nUpdateMode ==
embed::EmbedUpdateModes::ALWAYS_UPDATE &&
+(MimeConfigurationHelper::ClassIDsEqual(m_aClassID,
MimeConfigurationHelper::GetSequenceClassID(0x852ee1c9, 0x9058, 0x44ba, 0x8c,
0x6c, 0x0c, 0x5f, 0xc6, 0x6b, 0xdb, 0x8d)) ||
+ MimeConfigurationHelper::ClassIDsEqual(m_aClassID,
MimeConfigurationHelper::GetSequenceClassID(0xcf1b4491, 0xbea3, 0x4c9f, 0xa7,
0x0f, 0x22, 0x1b, 0x1e, 0xca, 0xef, 0x3e)))
+ )
{
-OSL_ENSURE( MimeConfigurationHelper::ClassIDsEqual( m_aClassID,
MimeConfigurationHelper::GetSequenceClassID( 0x852ee1c9, 0x9058, 0x44ba,
0x8c,0x6c,0x0c,0x5f,0xc6,0x6b,0xdb,0x8d ) )
-|| MimeConfigurationHelper::ClassIDsEqual( m_aClassID,
MimeConfigurationHelper::GetSequenceClassID( 0xcf1b4491, 0xbea3, 0x4c9f,
0xa7,0x0f,0x22,0x1b,0x1e,0xca,0xef,0x3e ) ),
-"Expected to be triggered for STAMPIT only! Please contact
developers!\n" );
-
// The view is changed while the object is in running state, save the
new object
m_xCachedVisualRepresentation = uno::Reference< io::XStream >();
SaveObject_Impl();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Need info on sd/source/ui/accessibility.po for l10n
Hi all, We (l10n team) need some information for localization purpose. In libo43_ui/sd/source/ui/accessibility.po, some strings in the form of PresentationOutlinerShape UnknownAccessiblePresentationShape Few of our languages support this sort of notation where there is a mix of capitals in one attached word. How should we translate that, are we allowed to separate the words (add spaces or underscores) and remove the capitals? Where does it appears in the UI? Thanks in advance Kind regards Sophie ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Shared compilation cache & windows ...
Hi Thorsten, Thorsten Behrens píše v Pá 09. 05. 2014 v 22:59 +0200: > seems the mozilla guys are pushing some boundaries again - is this > sccache thing something we could try on windows? For me, the modified > ccache has never really worked... > > http://glandium.org/blog/?p=3275 "Because the MSVC preprocessor is not exactly fast, and because sccache doesn’t have a direct mode like ccache, it doesn’t make as much difference as ccache does." I believe the precompiled headers are still the way to go on Windows - the ccache on Windows will never be really fast, until MS speeds-up the pre-processor, or somebody creates standalone MSVC-like pre-processor ;-) All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18npool/CustomTarget_breakiterator.mk i18npool/qa i18npool/source
i18npool/CustomTarget_breakiterator.mk |2
i18npool/qa/cppunit/test_breakiterator.cxx | 14 +
i18npool/source/breakiterator/data/count_word_fi.txt | 134 -
i18npool/source/breakiterator/data/dict_word_fi.txt | 147 ---
4 files changed, 10 insertions(+), 287 deletions(-)
New commits:
commit 6e225b41f1ab3e6cac395b0c0c6db73414658625
Author: Caolán McNamara
Date: Mon May 12 17:07:21 2014 +0100
Resolves: fdo#55707 Word count incorrect if language is set to Finnish
Change-Id: I283dddaa4bd8baf05b90ce5f81d43b785021a3c4
diff --git a/i18npool/CustomTarget_breakiterator.mk
b/i18npool/CustomTarget_breakiterator.mk
index ce8a038..4aaf2e5 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -48,9 +48,7 @@ endif
i18npool_BRKTXTS := \
$(if $(i18npool_breakiterator_want_in),char_in.brk) \
char.brk \
-$(call gb_Helper_optional_locale,fi,count_word_fi.brk) \
count_word.brk \
-$(call gb_Helper_optional_locale,fi,dict_word_fi.brk) \
$(call gb_Helper_optional_locale,he,dict_word_he.brk) \
$(call gb_Helper_optional_locale,hu,dict_word_hu.brk) \
dict_word_nodash.brk \
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 36e3d3b..ccea424 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -405,7 +405,7 @@ void TestBreakIterator::testWordBoundaries()
}
//See https://issues.apache.org/ooo/show_bug.cgi?id=85411
-for (int j = 0; j < 2; ++j)
+for (int j = 0; j < 3; ++j)
{
switch (j)
{
@@ -417,6 +417,10 @@ void TestBreakIterator::testWordBoundaries()
aLocale.Language = "ca";
aLocale.Country = "ES";
break;
+case 2:
+aLocale.Language = "fi";
+aLocale.Country = "FI";
+break;
default:
CPPUNIT_ASSERT(false);
break;
@@ -484,15 +488,16 @@ void TestBreakIterator::testWordBoundaries()
}
//See https://issues.apache.org/ooo/show_bug.cgi?id=58513
+//See https://bugs.freedesktop.org/show_bug.cgi?id=55707
{
aLocale.Language = "fi";
aLocale.Country = "FI";
-OUString aTest("Kuorma-auto kaakkois- ja Keski-Suomi");
+OUString aTest("Kuorma-auto kaakkois- ja Keski-Suomi USA:n 90:n %:n");
{
sal_Int32 nPos = 0;
-sal_Int32 aExpected[] = {12, 22, 25, 36};
+sal_Int32 aExpected[] = {11, 21, 24, 36, 42, 47, 51};
size_t i = 0;
do
{
@@ -507,7 +512,8 @@ void TestBreakIterator::testWordBoundaries()
{
sal_Int32 nPos = 0;
-sal_Int32 aExpected[] = {0, 11, 12, 21, 22, 24, 25, 36};
+sal_Int32 aExpected[] = {0, 11, 12, 20, 22, 24, 25, 36, 37,
+40, 41, 42, 43, 45, 46, 47, 50, 51};
size_t i = 0;
do
{
diff --git a/i18npool/source/breakiterator/data/count_word_fi.txt
b/i18npool/source/breakiterator/data/count_word_fi.txt
deleted file mode 100644
index 0429edc..000
--- a/i18npool/source/breakiterator/data/count_word_fi.txt
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# Copyright (C) 2002-2003, International Business Machines Corporation and
others.
-# All Rights Reserved.
-#
-# file: count_word.txt
-#
-# ICU Word Break Rules
-# See Unicode Standard Annex #29.
-# These rules are based on Version 4.0.0, dated 2003-04-17
-#
-
-
-
-
-#
-# Character class definitions from TR 29
-#
-
-$Katakana = [[:Script = KATAKANA:] [:name = KATAKANA-HIRAGANA PROLONGED SOUND
MARK:]
- [:name = HALFWIDTH KATAKANA-HIRAGANA
PROLONGED SOUND MARK:]
- [:name = HALFWIDTH KATAKANA VOICED SOUND
MARK:]
- [:name = HALFWIDTH KATAKANA SEMI-VOICED
SOUND MARK:]];
-
-$ALetter = [[:Alphabetic:] [:name= HEBREW PUNCTUATION GERESH:] [:name =
HYPHEN-MINUS:]
- - $Katakana
- - [:Script = Thai:]
- - [:Script = Lao:]
- - [:Script = Hiragana:]];
-
-$MidLetter = [[:name = APOSTROPHE:] [:name = MIDDLE DOT:] [:name = HEBREW
PUNCTUATION GERSHAYIM:]
- [:name = RIGHT SINGLE QUOTATION MARK:] [:name = HYPHENATION
POINT:] [:name = COLON:]];
-
-$MidNumLet = [:name = FULL STOP:];
-
-$MidNum= [[:LineBreak = Infix_Numeric:] - $MidNumLet];
-$Numeric = [:LineBreak = Numeric:];
-
-
-$TheZWSP = \u200b;
-
-#
-# Character Class Definitions.
[Libreoffice-commits] core.git: vcl/source
vcl/source/opengl/OpenGLContext.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 3ddae832bbb71306a574c4e1087de0a0da318966
Author: Markus Mohrhard
Date: Mon May 12 17:49:00 2014 +0200
fix crash when glDebugMessageCallback is 0 despite feature being there
Change-Id: I1e6986e1e56f78f10f4677f471d2bdea2231f787
Reviewed-on: https://gerrit.libreoffice.org/9331
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 58202fb..1700488 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -525,7 +525,9 @@ bool OpenGLContext::ImplInit()
#ifdef DBG_UTIL
// only enable debug output in dbgutil build
-if( GLEW_ARB_debug_output )
+// somehow there are implementations where the feature is present and the
function
+// pointer is still NULL
+if( GLEW_ARB_debug_output && glDebugMessageCallback )
{
glEnable(GL_DEBUG_OUTPUT);
glDebugMessageCallback(&debug_callback, NULL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/frmpaint.cxx |8 1 file changed, 8 insertions(+) New commits: commit f7b88a2b03122360b2e60e2afa453603022d28df Author: Miklos Vajna Date: Mon May 12 17:11:37 2014 +0200 fdo#78608 SwTxtFrm::Paint: fix missing repaint problem on the left edge Change-Id: Iba66a82e4a92a0afe1ad923cf4e0922730bd03de diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 69eb302..112c148 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -437,6 +437,14 @@ SwRect SwTxtFrm::Paint() pRepaint->SetOfst( 0 ); aRet = *pRepaint; +// In case our left edge is the same as the body frame's left edge, +// then extend the rectangle to include the page margin as well, +// otherwise some font will be clipped. +SwLayoutFrm* pBodyFrm = GetUpper(); +if (pBodyFrm->IsBodyFrm() && aRet.Left() == (pBodyFrm->Frm().Left() + pBodyFrm->Prt().Left())) +if (SwLayoutFrm* pPageFrm = pBodyFrm->GetUpper()) +aRet.Left(pPageFrm->Frm().Left()); + if ( IsRightToLeft() ) SwitchLTRtoRTL( aRet ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools
include/svtools/ctrltool.hxx | 96 +++ 1 file changed, 44 insertions(+), 52 deletions(-) New commits: commit 5f0420450af03f606c8cd7afe337ca32d5857b9c Author: Tobias Mueller Date: Sun May 11 23:48:32 2014 +0200 svtools: Translated ctrltool.hxx from English to German Someone may want to move the comments into the right place, i.e. very close to the function definitions. Change-Id: Ibdb74b2f1020ef338852acbb3a06f292dc94da9b Reviewed-on: https://gerrit.libreoffice.org/9321 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index dd44b50..afc3e1b 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -33,19 +33,18 @@ class OutputDevice; /* -Beschreibung +Description class FontList -Diese Klasse verwaltet alle Fonts, die auf einem oder zwei Ausgabegeraeten -dargestellt werden koennen. Zusaetzlich bietet die Klasse Methoden an, um -aus Fett und Kursiv den StyleName zu generieren oder aus einem Stylename -die fehlenden Attribute. Zusaetzlich kann diese Klasse syntetisch nachgebildete -Fonts verarbeiten. Diese Klasse kann mit verschiedenen Standard-Controls und -Standard-Menus zusammenarbeiten. +This class manages all fonts which can be display on one or two output devices. +Additionally, this class offers methods for generating the StyleName from +bold and italics or the missing attributes from a StyleName. +Furthermore, this class can handle synthetically reproduced fonts. +It also works with several standard controls and standard menus. -Querverweise +Links: class FontNameBox, class FontStyleBox, class FontSizeBox, class FontNameMenu, class FontSizeMenu @@ -55,53 +54,47 @@ class FontNameMenu, class FontSizeMenu FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2 = NULL, bool bAll = true ); -Konstruktor der Klasse FontList. Vom uebergebenen OutputDevice werden die -entsprechenden Fonts abgefragt. Das OutputDevice muss solange existieren, -wie auch die Klasse FontList existiert. Optional kann noch ein 2tes -Ausgabedevice uebergeben werden, damit man zum Beispiel die Fonts von -einem Drucker und dem Bildschirm zusammen in einer FontListe verwalten kann -und somit auch den FontListen und FontMenus die Fonts von beiden OutputDevices -zu uebergeben. Auch das pDevice2 muss solange existieren, wie die Klasse -FontList existiert. - -Das OutputDevice, welches als erstes uebergeben wird, sollte das bevorzugte -sein. Dies sollte im normalfall der Drucker sein. Denn wenn 2 verschiede -Device-Schriften (eine fuer Drucker und eine fuer den Bildschirm) vorhanden -sind, wird die vom uebergebenen Device "pDevice" bevorzugt. - -Mit dem dritten Parameter kann man angeben, ob nur skalierbare Schriften -abgefragt werden sollen oder alle. Wenn sal_True uebergeben wird, werden auch -Bitmap-Schriften mit abgefragt. Bei sal_False werden Vector-Schriften und -scalierbare Schriften abgefragt. +Constructor of the FontList class. The relevant fonts will be queried from +the OutputDevice. The OutputDevice needs to exist as long as the FontList +class exists. Optionally, a second output device can be given in order to, +e.g., manage the fonts from both, a printer and a screen in a single FontList +and thus also give FontMenus the fonts if both OutputDevices. +The pDevice2 needs to exist as long as the FontList class exists. + +The OutputDevice given first should be the preferred one. This is usually +the printer. Because if two different device fonts (one for the printer and +one for the screen) exist, the ones from the "pDevice" are preferred. + +The third paramter governs whether only scalable or all fonts shall be queried. +With sal_True Bitmap-Schriften will also be queried. +With sal_False vectorized and scalable fonts will be queried. -- String FontList::GetStyleName( const FontInfo& rInfo ) const; -Diese Methode gibt den StyleName von einer FontInfo zurueck. Falls kein -StyleName gesetzt ist, wird aus den gesetzten Attributen ein entsprechender -Name generiert, der dem Anwender praesentiert werden kann. +This method returns the StyleName of a FontInfo. +If no StyleName is set, a name will be generated from the set attributes. -- OUString FontList::GetFontMapText( const FontInfo& rInfo ) const; -Diese Methode gibt einen Matchstring zurueck, der dem Anwender -anzeigen soll, welche Probleme es mit diesem Font geben kann. +This method returns a Matchstring which indicates the problem that could +arise when using a font. This string should be displayed to the user. -- FontInfo FontList::Get( const String& rName, const String& rStyleName ) const; -Diese M
[Libreoffice-commits] core.git: include/svx
include/svx/svdmodel.hxx | 336 ++-
1 file changed, 163 insertions(+), 173 deletions(-)
New commits:
commit fd5ce1335d1bbc7d0bd86e7f3328461af2367711
Author: Tobias Mueller
Date: Sun May 11 23:48:13 2014 +0200
svx: Translated the svdmodel.hxx from German to English
Change-Id: I98d5e1308f192c302a4db023044d9246eff3c320
Reviewed-on: https://gerrit.libreoffice.org/9320
Reviewed-by: Thomas Arnhold
Tested-by: Thomas Arnhold
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 3c1e6e5..e982cb5 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -96,18 +96,18 @@ namespace sfx2
enum SdrHintKind
{
- HINT_UNKNOWN, // Unbekannt
- HINT_LAYERCHG,// Layerdefinition geaendert
- HINT_LAYERORDERCHG, // Layerreihenfolge geaendert
(Insert/Remove/ChangePos)
- HINT_PAGEORDERCHG,// Reihenfolge der Seiten
(Zeichenseiten oder Masterpages) geaendert (Insert/Remove/ChangePos)
- HINT_OBJCHG, // Objekt geaendert
- HINT_OBJINSERTED, // Neues Zeichenobjekt eingefuegt
- HINT_OBJREMOVED, // Zeichenobjekt aus Liste entfernt
- HINT_MODELCLEARED,// gesamtes Model geloescht (keine
Pages mehr da). not impl.
- HINT_REFDEVICECHG,// RefDevice geaendert
- HINT_DEFAULTTABCHG, // Default Tabulatorweite geaendert
- HINT_DEFFONTHGTCHG, // Default FontHeight geaendert
- HINT_MODELSAVED, // Dokument wurde gesichert
+ HINT_UNKNOWN, // Unknown
+ HINT_LAYERCHG,// changed layer definition
+ HINT_LAYERORDERCHG, // order of layer changed
(Insert/Remove/ChangePos)
+ HINT_PAGEORDERCHG,// order of pages (object pages or
master pages) changed (Insert/Remove/ChangePos)
+ HINT_OBJCHG, // object changed
+ HINT_OBJINSERTED, // new object inserted
+ HINT_OBJREMOVED, // symbol object removed from list
+ HINT_MODELCLEARED,// deleted the whole model (no pages
exist anymore). not impl.
+ HINT_REFDEVICECHG,// RefDevice changed
+ HINT_DEFAULTTABCHG, // Default tabulator width changed
+ HINT_DEFFONTHGTCHG, // Default FontHeight changed
+ HINT_MODELSAVED, // Document was saved
HINT_SWITCHTOPAGE,// #94278# UNDO/REDO at an object
evtl. on another page
HINT_BEGEDIT, // Is called after the object has
entered text edit mode
HINT_ENDEDIT // Is called after the object has left
text edit mode
@@ -139,8 +139,9 @@ public:
-// Flag um nach dem Laden des Pools Aufzuraeumen (d.h. die RefCounts
-// neu zu bestimmen und unbenutztes wegzuwerfen). sal_False == aktiv
+// Flag for cleaning up after the loading of the pools, meaning the
+// recalculate the RefCounts and dispose unused items)
+// sal_False == active
#define LOADREFCOUNTS (false)
struct SdrModelImpl;
@@ -148,16 +149,16 @@ struct SdrModelImpl;
class SVX_DLLPUBLIC SdrModel : public SfxBroadcaster, public tools::WeakBase<
SdrModel >
{
protected:
-DateTime aReadDate; // Datum des Einstreamens
-std::vector maMaPag; // StammSeiten (Masterpages)
+DateTime aReadDate; // date of the incoming stream
+std::vector maMaPag; // master pages
std::vector maPages;
-Link aUndoLink; // Link fuer einen NotifyUndo-Handler
+Link aUndoLink; // link to a NotifyUndo-Handler
Link aIOProgressLink;
OUString aTablePath;
-Size aMaxObjSize; // z.B. fuer Autogrowing Text
-Fraction aObjUnit; // Beschreibung der Koordinateneinheiten fuer
ClipBoard, Drag&Drop, ...
+Size aMaxObjSize; // e.g. for auto-growing text
+Fraction aObjUnit; // description of the coordinate units for
ClipBoard, Drag&Drop, ...
MapUniteObjUnit; // see above
-FieldUnit eUIUnit; // Masseinheit, Masstab (z.B. 1/1000) fuer
die UI (Statuszeile) wird von ImpSetUIUnit() gesetzt
+FieldUnit eUIUnit; // unit, scale (e.g. 1/1000) for the UI
(status bar) is set by ImpSetUIUnit()
Fraction aUIScale; // see above
OUString aUIUnitStr; // see above
Fraction aUIUnitFact; // see above
@@ -167,11 +168,11 @@ protected:
SfxItemPool*pItemPool;
comphelper::IEmbeddedHelper*
m_pEmbeddedHelper; // helper for embedded objects to get
rid of the SfxObjectShell
-SdrOutliner*pDrawOutliner; // ein Outliner zur Textausgabe
-SdrOutliner*pHitTestOutliner;// ein Outliner fuer den HitTest
-sal_uIntPtr n
The newly published Email Hunter app for you
We have developed an email scanner android app, very cool. Could you please try it at: Amazon store http://www.amazon.com/gp/mas/dl/android/com.emailscanner, or Samsung store http://apps.samsung.com/mercury/topApps/topAppsDetail.as?productId=00805559 ?Thanks,Marketing 24/7 Team. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How can I become a part of developer community?
Hi Alex, On Mon, May 12, 2014 at 5:05 AM, Alex Bondarenko wrote: > Lately I've > been interested to making my favorite office suite better [..] > Can I become a part of developers community and that I need to do for this? > Thank you for attention. One become a dev by virtue of doing things. it is not a title, a test, or a 'club' :-)... and you are most welcome to become part of the community: As indicated the wiki is a good start... read about how to build... find a hitch to scratch, and propose patches to our gerrit (with the proper license statement posted on this ML)... and there you go, you are de facto a developer :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cli_ure/source
cli_ure/source/uno_bridge/cli_data.cxx| 10 ---
cli_ure/source/uno_bridge/cli_environment.cxx |4 -
cli_ure/source/uno_bridge/cli_proxy.cxx | 70 +++---
3 files changed, 22 insertions(+), 62 deletions(-)
New commits:
commit 49dff05943db6e58c5216e85fd2923d8da9ebbb5
Author: Thomas Arnhold
Date: Sun May 11 20:08:46 2014 +0200
cli_ure: fix dbglevel=2 build on windows
Some blocks are completely unused.
According to http://msdn.microsoft.com/de-de/library/ms235298.aspx
rtl_uString * __pin * pp_sInterfaces = &_sInterfaces;
should be
pin_ptr pp_sInterfaces = &_sInterfaces;
Change-Id: I039e94649d542fb5b51231b2e0df0a4dc1170c19
Reviewed-on: https://gerrit.libreoffice.org/9318
Reviewed-by: Thomas Arnhold
Tested-by: Thomas Arnhold
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx
b/cli_ure/source/uno_bridge/cli_data.cxx
index a5e2f38..9e3a327 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -1064,12 +1064,6 @@ void Bridge::map_to_uno(void * uno_data, System::Object^
cli_data,
for (; nPos < nMembers; ++nPos)
{
member_type= comp_td->ppTypeRefs[nPos];
-#if OSL_DEBUG_LEVEL >= 2
-System::String* __s;
-sr::FieldInfo* arFields[];
-__s = mapUnoString(comp_td->ppMemberNames[nPos]);
-arFields = cliType != NULL ? cliType->GetFields() : NULL;
-#endif
System::Object^ val= nullptr;
if (cli_data != nullptr)
{
@@ -1614,10 +1608,6 @@ void Bridge::map_to_cli(
OUString usMessageMember("Message");
for (int i = 0; i < pCTD->nMembers; i ++)
{
-#if OSL_DEBUG_LEVEL >= 2
-System::String* sMember;
-sMember = mapUnoString(pCTD->ppMemberNames[i]);
-#endif
if (usMessageMember.equals(pCTD->ppMemberNames[i]))
{
nPos = i;
diff --git a/cli_ure/source/uno_bridge/cli_environment.cxx
b/cli_ure/source/uno_bridge/cli_environment.cxx
index 28149b9..826b56e 100644
--- a/cli_ure/source/uno_bridge/cli_environment.cxx
+++ b/cli_ure/source/uno_bridge/cli_environment.cxx
@@ -96,8 +96,8 @@ void Cli_environment::revokeInterface(System::String^ oid,
System::Type^ type)
i = 0;
}
Trace::WriteLine(System::String::Format(
- new System::String(S"cli uno bridge: {0} remaining
registered interfaces"),
- __box(m_objects->get_Count() - 1)));
+ gcnew System::String("cli uno bridge: {0} remaining
registered interfaces"),
+ m_objects->Count - 1));
#endif
m_objects->Remove(key);
}
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx
b/cli_ure/source/uno_bridge/cli_proxy.cxx
index cbe3fb6..2983d93 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -128,8 +128,8 @@ UnoInterfaceProxy::~UnoInterfaceProxy()
{
#if OSL_DEBUG_LEVEL >= 2
sd::Trace::WriteLine(System::String::Format(
- new System::String(S"cli uno bridge: Destroying proxy "
- S"for UNO object, OID: \n\t{0} \n\twith uno interfaces: "),
+ gcnew System::String("cli uno bridge: Destroying proxy "
+ "for UNO object, OID: \n\t{0} \n\twith uno interfaces: "),
m_oid));
sd::Trace::WriteLine( mapUnoString(_sInterfaces));
@@ -166,14 +166,6 @@ void UnoInterfaceProxy::addUnoInterface(uno_Interface*
pUnoI,
{
UnoInterfaceInfo^ info = static_cast(
enumInfos->Current);
-#if OSL_DEBUG_LEVEL > 1
-System::Type * t1;
-System::Type * t2;
-t1 = mapUnoType(
-reinterpret_cast(info->m_typeDesc) );
-t2 = mapUnoType(
-reinterpret_cast(pTd) );
-#endif
if (typelib_typedescription_equals(
reinterpret_cast(info->m_typeDesc),
reinterpret_cast(pTd)))
@@ -189,21 +181,21 @@ void UnoInterfaceProxy::addUnoInterface(uno_Interface*
pUnoI,
m_listIfaces->Add(gcnew UnoInterfaceInfo(m_bridge, pUnoI, pTd));
m_numUnoIfaces = m_listIfaces->Count;
#if OSL_DEBUG_LEVEL >= 2
-System::String * sInterfaceName = static_cast(
-m_listIfaces->get_Item(m_numUnoIfaces - 1))->m_type->FullName;
+System::String^ sInterfaceName = static_cast(
+m_listIfaces[m_numUnoIfaces - 1])->m_type->FullName;
sd::Trace::WriteLine(System::String::Format(
- new System::String(S"cli uno bridge: Creating proxy for uno
object, "
- S"id:\n\t{0}\n\t{1}"), m_oid, sInterfaceName));
+ gcnew System::String("cli uno bridge: Creating proxy for uno
object, "
+
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/win32/filepicker/FilePicker.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 82a26c4bd03af4596ec0add69a52d20c77544144 Author: Thomas Arnhold Date: Mon May 12 15:58:36 2014 +0200 fix windows build Change-Id: If03c3d7d8c99b020f2d566b0bf58f03d981b diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index bfc75fc..6b4aab4 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -677,7 +677,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence& aArguments) } HINSTANCE hInstance = GetModuleHandle( FILE_PICKER_DLL_NAME ); -SAL_WARN_IF( !hInstance, "fpicker", The name of the service dll must have changed" ); +SAL_WARN_IF( !hInstance, "fpicker", "The name of the service dll must have changed" ); // create a new impl-class here based on the // given string, if the given string is empty ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx |1
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx |1
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 15 ++---
sd/source/ui/slidesorter/view/SlsTheme.cxx |9 ---
4 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit fd4b20efbb734f5a82c636ded2ec65dcb46c5129
Author: Caolán McNamara
Date: Mon May 12 14:06:37 2014 +0100
Resolves: rhbz#1096295 hard to distinguish selected from mouseover
Change-Id: Id6c11afd161bea15266a54a595bf7ee305e954f0
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index ec698d0..7d417da 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -85,6 +85,7 @@ private:
Bitmap maFocusedBackground;
Bitmap maMouseOverBackground;
Bitmap maMouseOverFocusedBackground;
+Bitmap maMouseOverSelectedBackground;
Bitmap maMouseOverSelectedAndFocusedBackground;
Size maSize;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index 5a69142..55188af 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -82,6 +82,7 @@ public:
Gradient_SelectedPage,
Gradient_SelectedAndFocusedPage,
Gradient_MouseOverPage,
+Gradient_MouseOverSelected,
Gradient_MouseOverSelectedAndFocusedPage,
Gradient_FocusedPage,
_GradientColorType_Size_
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 60c51fa..736c6dc 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -53,13 +53,7 @@ PageObjectPainter::PageObjectPainter (
mpTheme(rSlideSorter.GetTheme()),
mpPageNumberFont(Theme::GetFont(Theme::Font_PageNumber,
*rSlideSorter.GetContentWindow())),
mpShadowPainter(new
FramePainter(mpTheme->GetIcon(Theme::Icon_RawShadow))),
- mpFocusBorderPainter(new
FramePainter(mpTheme->GetIcon(Theme::Icon_FocusBorder))),
- maNormalBackground(),
- maSelectionBackground(),
- maFocusedSelectionBackground(),
- maMouseOverBackground(),
- maMouseOverFocusedBackground(),
- maSize()
+ mpFocusBorderPainter(new
FramePainter(mpTheme->GetIcon(Theme::Icon_FocusBorder)))
{
// Replace the color (not the alpha values) in the focus border with a
// color derived from the current selection color.
@@ -148,6 +142,7 @@ void PageObjectPainter::InvalidateBitmaps (void)
maFocusedSelectionBackground.SetEmpty();
maFocusedBackground.SetEmpty();
maMouseOverBackground.SetEmpty();
+maMouseOverSelectedBackground.SetEmpty();
maMouseOverFocusedBackground.SetEmpty();
maMouseOverSelectedAndFocusedBackground.SetEmpty();
}
@@ -399,6 +394,12 @@ Bitmap& PageObjectPainter::GetBackgroundForState (
true);
case MouseOver | Selected:
+return GetBackground(
+maMouseOverSelectedBackground,
+Theme::Gradient_MouseOverSelected,
+rReferenceDevice,
+false);
+
case MouseOver:
return GetBackground(
maMouseOverBackground,
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx
b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index c38951c..3ac38cc 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -110,11 +110,12 @@ void Theme::Update (const
::boost::shared_ptr& rpPropert
maColor[Color_PageCountFontColor] = White;
// Set up gradients.
-SetGradient(Gradient_SelectedPage, aSelectionColor, 50, 50, +100,+100,
+50,+25);
-SetGradient(Gradient_MouseOverPage, aSelectionColor, 75, 75, +100,+100,
+50,+25);
-SetGradient(Gradient_SelectedAndFocusedPage, aSelectionColor, 50, 50,
+100,+100, -50,-75);
-SetGradient(Gradient_MouseOverSelectedAndFocusedPage, aSelectionColor, 75,
75, +100,+100, -50,-75);
+SetGradient(Gradient_MouseOverPage, aSelectionColor, 0, 60, +80,+100,
+50,+25);
+SetGradient(Gradient_SelectedPage, aSelectionColor, 50, 50, +80,+100,
+50,+25);
SetGradient(Gradient_FocusedPage, aSelectionColor, -1,-1, 0,0, -50,-75);
+SetGradient(Gradient_MouseOverSelected, aSelectionColor, 55, 60, +80,+100,
+50,+25);
+SetGradient(Gradient_SelectedAndFocusedPage, aSelectionColor, 50, 50,
+80,+100, -50,-75);
+SetGradient(Gradient_MouseOverSelectedAndFocusedPage, aSelectionColor, 55,
60, +80,+100, -50,-75);
SetGradient(Gradient_NormalPage, maBackgroundColor, -1,-1, 0,0, 0,0);
___
Libreoffice-commits mailing list
libre
[Libreoffice-commits] core.git: bridges/source
bridges/source/jni_uno/jni_info.h |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 43fba707c11c853875168d6255333d6c510f131f
Author: Stephan Bergmann
Date: Mon May 12 15:00:39 2014 +0200
Coverity 441351, 441352: JNI_type_info's real dtor is "destroy"
...as it needs a JNIEnv passed in, so cannot use the dtor directly. Maybe
this
code clarification helps silence Coverity's false resource leak reports.
Change-Id: I32e043e3fa9097263302a6c639e6815512410f4e
diff --git a/bridges/source/jni_uno/jni_info.h
b/bridges/source/jni_uno/jni_info.h
index c92cd33..10263b2 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -82,6 +82,9 @@ struct JNI_interface_type_info : public JNI_type_info
virtual void destroy( JNIEnv * jni_env ) SAL_OVERRIDE;
explicit JNI_interface_type_info(
JNI_context const & jni, typelib_TypeDescription * td );
+
+private:
+virtual ~JNI_interface_type_info() {}
};
struct JNI_compound_type_info : public JNI_type_info
@@ -95,6 +98,9 @@ struct JNI_compound_type_info : public JNI_type_info
virtual void destroy( JNIEnv * jni_env ) SAL_OVERRIDE;
explicit JNI_compound_type_info(
JNI_context const & jni, typelib_TypeDescription * td );
+
+private:
+virtual ~JNI_compound_type_info() {}
};
struct JNI_type_info_holder
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Michael Stahl changed: What|Removed |Added Depends on||78603 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/win32/filepicker/dibpreview.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0f0c0d6cda1d236186f4e88c733371b02ea26b6c
Author: Stephan Bergmann
Date: Mon May 12 14:41:02 2014 +0200
Lost closing brace
Change-Id: Ieea3d8e93c0a0652dbaa7b78535094ec96089b09
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx
b/fpicker/source/win32/filepicker/dibpreview.cxx
index 8f9d1dc..1df00d6 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -403,6 +403,7 @@ ATOM SAL_CALL CDIBPreview::RegisterDibPreviewWindowClass()
SAL_WARN("fpicker", "Could not register preview window class");
throw std::runtime_error("Preview window class could not be
registered");
}
+}
// increment the register class counter
// so that we keep track of the number
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 77934, which changed state. Bug 77934 Summary: right-click 'Picture...' dialog does not appear https://bugs.freedesktop.org/show_bug.cgi?id=77934 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/win32/filepicker/getfilenamewrapper.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 3d9a284aa6d9c0bd5b62353fc7c3fdfa681c2d78 Author: Stephan Bergmann Date: Mon May 12 14:27:31 2014 +0200 Missing include Change-Id: I2cd0de285f9ac96716133d080ad11fcd9e1ca684 diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx index 181ae5f..6e1446d 100644 --- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx +++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx @@ -19,6 +19,7 @@ #include #include +#include #include "getfilenamewrapper.hxx" #if defined _MSC_VER ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 64900] Write a PyUNO tutorial/walktrough
https://bugs.freedesktop.org/show_bug.cgi?id=64900 Björn Michaelsen changed: What|Removed |Added Status|ASSIGNED|NEW --- Comment #7 from Björn Michaelsen --- Putting this back to new -- there ~never can be enough documentation and multiple people can work on this. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforfind.cxx | 69 +++-
1 file changed, 48 insertions(+), 21 deletions(-)
New commits:
commit 624e5c34ce815af6f65ce6699ad6b3f2aa1bf0da
Author: David Tardon
Date: Mon May 12 14:02:13 2014 +0200
fdo#78119 find the longest match for month name
Change-Id: Idad7b083ce5528f5c735f3a8bd091819bf043fc8
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index a022d2d..c77bb0a 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -563,6 +563,7 @@ short ImpSvNumberInputScan::GetMonth( const OUString&
rString, sal_Int32& nPos )
static const OUString aSepShortened("SEP");
short res = 0; // no month found
+int nMatchLen = 0;
if (rString.getLength() > nPos) // only if needed
{
@@ -571,52 +572,78 @@ short ImpSvNumberInputScan::GetMonth( const OUString&
rString, sal_Int32& nPos )
InitText();
}
sal_Int16 nMonths =
pFormatter->GetCalendar()->getNumberOfMonthsInYear();
+// Find the longest match. This is needed for, e.g., Czech, as
Červen (June)
+// is fully contained in Červenec (July), so the latter could
never be found
+// if we stopped at the first match.
for ( sal_Int16 i = 0; i < nMonths; i++ )
{
if ( bScanGenitiveMonths && StringContains(
pUpperGenitiveMonthText[i], rString, nPos ) )
{ // genitive full names first
-nPos = nPos + pUpperGenitiveMonthText[i].getLength();
-res = i + 1;
-break; // for
+const int nMonthLen = pUpperGenitiveMonthText[i].getLength();
+if (nMonthLen > nMatchLen)
+{
+nMatchLen = nMonthLen;
+res = i + 1;
+}
}
else if ( bScanGenitiveMonths && StringContains(
pUpperGenitiveAbbrevMonthText[i], rString, nPos ) )
{ // genitive abbreviated
-nPos = nPos + pUpperGenitiveAbbrevMonthText[i].getLength();
-res = sal::static_int_cast< short >(-(i+1)); // negative
-break; // for
+const int nMonthLen =
pUpperGenitiveAbbrevMonthText[i].getLength();
+if (nMonthLen > nMatchLen)
+{
+nMatchLen = nMonthLen;
+res = sal::static_int_cast< short >(-(i+1)); // negative
+}
}
else if ( bScanPartitiveMonths && StringContains(
pUpperPartitiveMonthText[i], rString, nPos ) )
{ // partitive full names
-nPos = nPos + pUpperPartitiveMonthText[i].getLength();
-res = i+1;
-break; // for
+const int nMonthLen = pUpperPartitiveMonthText[i].getLength();
+if (nMonthLen > nMatchLen)
+{
+nMatchLen = nMonthLen;
+res = i+1;
+}
}
else if ( bScanPartitiveMonths && StringContains(
pUpperPartitiveAbbrevMonthText[i], rString, nPos ) )
{ // partitive abbreviated
-nPos = nPos + pUpperPartitiveAbbrevMonthText[i].getLength();
-res = sal::static_int_cast< short >(-(i+1)); // negative
-break; // for
+const int nMonthLen =
pUpperPartitiveAbbrevMonthText[i].getLength();
+if (nMonthLen > nMatchLen)
+{
+nMatchLen = nMonthLen;
+res = sal::static_int_cast< short >(-(i+1)); // negative
+}
}
else if ( StringContains( pUpperMonthText[i], rString, nPos ) )
{ // noun full names
-nPos = nPos + pUpperMonthText[i].getLength();
-res = i+1;
-break; // for
+const int nMonthLen = pUpperMonthText[i].getLength();
+if (nMonthLen > nMatchLen)
+{
+nMatchLen = nMonthLen;
+res = i+1;
+}
}
else if ( StringContains( pUpperAbbrevMonthText[i], rString, nPos
) )
{ // noun abbreviated
-nPos = nPos + pUpperAbbrevMonthText[i].getLength();
-res = sal::static_int_cast< short >(-(i+1)); // negative
-break; // for
+const int nMonthLen = pUpperAbbrevMonthText[i].getLength();
+if (nMonthLen > nMatchLen)
+{
+nMatchLen = nMonthLen;
+res = sal::static_int_cast< short >(-(i+1)); // negative
+}
}
else if ( i == 8 && pUpperAbbrevMonthText[i] == aSeptCorrect &&
StringContains( aSepShortened, rString, nPos ) )
{ // #102136# SEPT/SEP
-nPos = nPos + aSe
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/linux.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit f90fce6568a04c67df9f487406831d7fdd5828e2 Author: Stephan Bergmann Date: Mon May 12 13:56:32 2014 +0200 Linux Clang -fsanitize=address does not like -z defs Change-Id: Ie64d5fe5100a6da7a9bb591da65980d2080fb84f diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index 4ffa868..88216b6 100644 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -7,9 +7,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +ifneq ($(COM_GCC_IS_CLANG)$(filter -fsanitize=address,$(CC)),TRUE-fsanitize=address) gb_LinkTarget_LDFLAGS += \ -Wl,-z,defs \ +endif + include $(GBUILDDIR)/platform/unxgcc.mk # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Using libreoffice libraries from python without UNO.
On 09/05/14 22:27, Jonny wrote:
> Hi,
>
> I am using some tools to generate odf-documents. In order to convert
> them to pdf I'm using writer, but I need to run the function
> tools->update->all for updating TOC.
>
> I thought that I would write a python script for doing this but I would
> like to call the libraries directly and not via UNO. My script would
> look something like:
>
> import libreoffice
>
> document = libreoffice.Writer('path/to/my/document.odt')
> document.update('all')
> document.save()
> document.close()
>
> What I need is some guidance to in which libraries the functionallity
> for open, update and save are located. I have been digging around in the
> code without success. If someone has an idea it would save me a lot of time.
the problem is that that's all implemented in C++, but worry not, you
can just use UNO to call the C++ code :)
to do this first get the indexes from the document and then use the
update method, as described here:
https://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Indexes_and_Index_Marks
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How can I become a part of developer community?
On Mon, 12 May 2014 12:05:46 +0200, Alex Bondarenko wrote: Hello. My name is Alex. ... degree from information technologies. Can I become a part of developers community and that I need to do for this? Thank you for attention. take a look at this: https://wiki.documentfoundation.org/Development/Easy_Hacks#Progress I know LibO devs suggest to new contributors to start with an easy hack first. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: shell/source
shell/source/win32/shlxthandler/classfactory.cxx|7 ---
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx |7 ---
2 files changed, 14 deletions(-)
New commits:
commit 096d1d6e7cb52591e30eb9ae16ff6eb562f9dbf1
Author: Stephan Bergmann
Date: Mon May 12 12:32:56 2014 +0200
This code is not linked against sal
Change-Id: I7f44cd54732a60e9655f0bbb90615f3d3988ce58
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx
b/shell/source/win32/shlxthandler/classfactory.cxx
index d5a394f..d3a14b9 100644
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
@@ -17,12 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#undef OSL_DEBUG_LEVEL
-
-
-#include
-#include
-
#include "internal/global.hxx"
#include "classfactory.hxx"
#include "internal/infotips.hxx"
@@ -122,7 +116,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance(
if (0 == pUnk)
{
-SAL_WARN("shell", "Could not create COM object");
return E_OUTOFMEMORY;
}
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 10deb73..acc0174 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#undef OSL_DEBUG_LEVEL
-
-
-#include
-
#include "internal/global.hxx"
#include "internal/propertyhdl.hxx"
#include "internal/fileextensions.hxx"
@@ -32,7 +27,6 @@
#include
#include
#include
-#include
#include
#include
@@ -383,7 +377,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance(
if (0 == pUnk)
{
-SAL_WARN("shell", "Could not create COM object");
return E_OUTOFMEMORY;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/breakiterator/xdictionary.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit f1570322af69d0d9e1dfd72e20ddc450cd7829a5
Author: Tor Lillqvist
Date: Mon May 12 13:20:45 2014 +0300
Fix compilation breakage for Android
Presumably helps for iOS, too.
Change-Id: Idadfa9c70b8206c6820f6c13374909f8d26ffd04
diff --git a/i18npool/source/breakiterator/xdictionary.cxx
b/i18npool/source/breakiterator/xdictionary.cxx
index e83b529..ddf6f20 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -139,6 +139,8 @@ namespace {
};
}
+#if !defined(DICT_JA_ZH_IN_DATAFILE) && !defined(DISABLE_DYNLOADING)
+
void xdictionary::initDictionaryData(const sal_Char *pLang)
{
// Global cache, never released for performance
@@ -184,6 +186,8 @@ void xdictionary::initDictionaryData(const sal_Char *pLang)
aLoadedCache.push_back( aEntry );
}
+#endif
+
void xdictionary::setJapaneseWordBreak()
{
japaneseWordBreak = true;
___
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' - svx/source
svx/source/dialog/graphctl.cxx | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
New commits:
commit c4e10ad83fe1fa92a115327c1909218f5dc8c8bd
Author: Caolán McNamara
Date: Wed Jan 8 11:22:25 2014 +
Resolves: rhbz#1096486 avoid access to nonexisting parent dialog
was Related: rhbz#1047174
(cherry picked from commit 794f5af121906668870a58700aed25b660381240)
Change-Id: I0bf9116d088adde838993ac5e909a6f3481f883e
Reviewed-on: https://gerrit.libreoffice.org/9326
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 4fc18b7..d70bb3d 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -309,6 +309,8 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
KeyCode aCode( rKEvt.GetKeyCode() );
boolbProc = false;
+Dialog* pDialog = GetParentDialog();
+
switch ( aCode.GetCode() )
{
case KEY_DELETE:
@@ -318,8 +320,8 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
{
pView->DeleteMarked();
bProc = true;
-if( !pView->AreObjectsMarked() )
-GetParentDialog()->GrabFocusToFirstControl();
+if (!pView->AreObjectsMarked() && pDialog)
+pDialog->GrabFocusToFirstControl();
}
}
break;
@@ -328,9 +330,11 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
{
if ( bSdrMode )
{
+bool bGrabFocusToFirstControl = true;
if ( pView->IsAction() )
{
pView->BrkAction();
+bGrabFocusToFirstControl = false;
}
else if ( pView->AreObjectsMarked() )
{
@@ -340,16 +344,11 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
if(pHdl)
{
((SdrHdlList&)rHdlList).ResetFocusHdl();
+bGrabFocusToFirstControl = false;
}
-else
-{
-GetParentDialog()->GrabFocusToFirstControl();
-}
-}
-else
-{
-GetParentDialog()->GrabFocusToFirstControl();
}
+if (bGrabFocusToFirstControl && pDialog)
+pDialog->GrabFocusToFirstControl();
bProc = true;
}
}
___
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' - sc/source
sc/source/ui/view/output.cxx | 96 ---
1 file changed, 54 insertions(+), 42 deletions(-)
New commits:
commit b30c08e3dd5e1c20923f66684a893a9c2ede6637
Author: Kohei Yoshida
Date: Sun May 11 19:50:53 2014 -0400
fdo#78535: Don't process borders of 0 width.
Or they would get drawn for real.
Change-Id: Iec24e70a80ff8aa1ef7512e71249a99243297c4e
(cherry picked from commit 224b235971a01971de626d38ccc8506d0a55771b)
Reviewed-on: https://gerrit.libreoffice.org/9323
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 1a5cdde..30d2ee8 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1716,50 +1716,62 @@ void ScOutputData::DrawRotatedFrame( const Color*
pForceColor )
const svx::frame::Style noStyle;
// Horizontal lines
-long nUpperRotate = lcl_getRotate( mpDoc, nTab, nX, nY
- 1 );
-pProcessor->process(
svx::frame::CreateBorderPrimitives(
-aPoints[bLayoutRTL?1:0],
aPoints[bLayoutRTL?0:1], aTopLine,
-svx::frame::Style(),
-svx::frame::Style(),
-aLeftLine,
-svx::frame::Style(),
-svx::frame::Style(),
-aRightLine,
-pForceColor, nUpperRotate, nAttrRotate ) );
-
-long nLowerRotate = lcl_getRotate( mpDoc, nTab, nX, nY
+ 1 );
-pProcessor->process(
svx::frame::CreateBorderPrimitives(
-aPoints[bLayoutRTL?2:3],
aPoints[bLayoutRTL?3:2], aBottomLine,
-aLeftLine,
-svx::frame::Style(),
-svx::frame::Style(),
-aRightLine,
-svx::frame::Style(),
-svx::frame::Style(),
-pForceColor, 18000 - nAttrRotate, 18000 -
nLowerRotate ) );
+if (aTopLine.Prim() || aTopLine.Secn())
+{
+long nUpperRotate = lcl_getRotate( mpDoc, nTab,
nX, nY - 1 );
+pProcessor->process(
svx::frame::CreateBorderPrimitives(
+aPoints[bLayoutRTL?1:0],
aPoints[bLayoutRTL?0:1], aTopLine,
+svx::frame::Style(),
+svx::frame::Style(),
+aLeftLine,
+svx::frame::Style(),
+svx::frame::Style(),
+aRightLine,
+pForceColor, nUpperRotate, nAttrRotate
) );
+}
+
+if (aBottomLine.Prim() || aBottomLine.Secn())
+{
+long nLowerRotate = lcl_getRotate( mpDoc, nTab,
nX, nY + 1 );
+pProcessor->process(
svx::frame::CreateBorderPrimitives(
+aPoints[bLayoutRTL?2:3],
aPoints[bLayoutRTL?3:2], aBottomLine,
+aLeftLine,
+svx::frame::Style(),
+svx::frame::Style(),
+aRightLine,
+svx::frame::Style(),
+svx::frame::Style(),
+pForceColor, 18000 - nAttrRotate,
18000 - nLowerRotate ) );
+}
// Vertical slanted lines
-long nLeftRotate = lcl_getRotate( mpDoc, nTab, nX - 1,
nY );
-pProcessor->process(
svx::frame::CreateBorderPrimitives(
-aPoints[0], aPoints[3], aLeftLine,
-aTopLine,
-svx::frame::Style(),
-svx::frame::Style(),
-aBottomLine,
-svx::frame::Style(),
-svx::frame::Style(),
-pForceColor, nAttrRotate, nLeftRotate ) );
-
-long nRightRotate = lcl_getRotate( mpDoc, nTab, nX +
1, nY );
-pProcessor->process(
svx::frame::CreateBorderPrimitives(
-aPoints[1], aPoints[2], aRightLine,
-
Access2Base - New release
A new release of the Access2Base library (V1.1.0) has been pushed to master. https://gerrit.libreoffice.org/9303 Its main purpose is to get rid of the previous limitations: 1 single database, 1 single (data-aware) form located in Writer documents only, ... From now on, simultaneous use of several forms from any LO document type is supported. Additionally the OpenDatabase method allows dynamic data access from any Basic macro, including, just as an example, from a user-defined function invoked in a Calc cell formula. Simplicity of programming remains key, anyway. A draft on-line documentation has been posted on http://www.access2base.com/access2base-draft.html A full list of the new features is on http://www.access2base.com/access2base-draft.html#ReleaseNotes Now my question. Soon all users of AOO and of LO 4.1 or before will benefit of the new version by downloading it from their respective extensions download centers. I presume it is compliant with the LO release policy to push the same patch also to the LO 4.2 branch ? Thanks. JPL --- This email is free from viruses and malware because avast! Antivirus protection is active. http://www.avast.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Using libreoffice libraries from python without UNO.
Hi,
I am using some tools to generate odf-documents. In order to
convert them to pdf I'm using writer, but I need to run the function
tools->update->all for updating TOC.
I thought that I would write a
python script for doing this but I would like to call the libraries
directly and not via UNO. My script would look something like:
import
libreoffice
document =
libreoffice.Writer('path/to/my/document.odt')
document.update('all')
document.save()
document.close()
What
I need is some guidance to in which libraries the functionallity for
open, update and save are located. I have been digging around in the
code without success. If someone has an idea it would save me a lot of
time.
Thanks,
/Jonny
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Hello from a Newb Here to Help
Hi, I know y'all are busy so I'll try to keep this short. I just started using Libre Office and I LOVE it. I want to learn all I can about it but I also hit some snags. I'm not really a dev - so I can't help with coding stuff but I can help with writing documentation, wikis, and anything in that regard. In the past I've found writing about things can go a long way to speed up the learning process. I really want to learn this and I also want to help out as I go. If someone would be so kind as to point me in the right direction, I'd be much obliged. Thank you! Cheers, L. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
How can I become a part of developer community?
Hello. My name is Alex. I use office suite LibreOffice since 2007 (then it was the OpenOffice). I like this software product and the way in which it evolution. Lately I've been interested to making my favorite office suite better as a developer (since this is open source project). I'm programming Python and Java. Unfortunately I have not take part in large projects, but I have a masters degree from information technologies. Can I become a part of developers community and that I need to do for this? Thank you for attention. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18npool/inc i18npool/qa i18npool/source
i18npool/inc/xdictionary.hxx | 26 +++-
i18npool/qa/cppunit/test_breakiterator.cxx| 20 ++-
i18npool/source/breakiterator/xdictionary.cxx | 147 ++
3 files changed, 117 insertions(+), 76 deletions(-)
New commits:
commit 69a74afb07c7c58b201d315dbd254bc50b9c9f03
Author: Michael Meeks
Date: Fri May 9 16:28:18 2014 +0100
Avoid expensive dlopen thrash for break iterators.
Change-Id: I770c1b3e5164cb486b5a5c2b1259f713914a1bae
diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index 13078e8..2b1ece0 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -40,17 +40,29 @@ struct WordBreakCache {
bool equals(const sal_Unicode *str, Boundary& boundary);// checking
cached string
};
-class xdictionary
+struct xdictionarydata
{
-private:
const sal_uInt8 * existMark;
const sal_Int16 * index1;
-const sal_Int32 * index2;
-const sal_Int32 * lenArray;
+const sal_Int32 * index2;
+const sal_Int32 * lenArray;
const sal_Unicode* dataArea;
-#ifndef DISABLE_DYNLOADING
-oslModule hModule;
-#endif
+xdictionarydata() :
+existMark( NULL ),
+index1( NULL ),
+index2( NULL ),
+lenArray( NULL ),
+dataArea( NULL )
+{
+}
+};
+
+class xdictionary
+{
+private:
+xdictionarydata data;
+void initDictionaryData(const sal_Char *lang);
+
Boundary boundary;
bool japaneseWordBreak;
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 6f7b537..36e3d3b 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -68,6 +68,7 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
uno::Reference m_xBreak;
+void doTestJapanese(uno::Reference< i18n::XBreakIterator > &xBreak);
};
void TestBreakIterator::testLineBreaking()
@@ -906,7 +907,7 @@ void TestBreakIterator::testKhmer()
}
#endif
-void TestBreakIterator::testJapanese()
+void TestBreakIterator::doTestJapanese(uno::Reference< i18n::XBreakIterator >
&xBreak)
{
lang::Locale aLocale;
aLocale.Language = "ja";
@@ -917,7 +918,7 @@ void TestBreakIterator::testJapanese()
const sal_Unicode JAPANESE[] = { 0x30B7, 0x30E3, 0x30C3, 0x30C8,
0x30C0, 0x30A6, 0x30F3 };
OUString aTest(JAPANESE, SAL_N_ELEMENTS(JAPANESE));
-aBounds = m_xBreak->getWordBoundary(aTest, 5, aLocale,
+aBounds = xBreak->getWordBoundary(aTest, 5, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 7);
@@ -927,18 +928,29 @@ void TestBreakIterator::testJapanese()
const sal_Unicode JAPANESE[] = { 0x9EBB, 0x306E, 0x8449, 0x9EBB,
0x306E, 0x8449 };
OUString aTest(JAPANESE, SAL_N_ELEMENTS(JAPANESE));
-aBounds = m_xBreak->getWordBoundary(aTest, 1, aLocale,
+aBounds = xBreak->getWordBoundary(aTest, 1, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 3);
-aBounds = m_xBreak->getWordBoundary(aTest, 5, aLocale,
+aBounds = xBreak->getWordBoundary(aTest, 5, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT(aBounds.startPos == 3 && aBounds.endPos == 6);
}
}
+void TestBreakIterator::testJapanese()
+{
+doTestJapanese(m_xBreak);
+
+// fdo#78479 - test second / cached instantiation of xdictionary
+uno::Reference< i18n::XBreakIterator >
xTmpBreak(m_xSFactory->createInstance(
+"com.sun.star.i18n.BreakIterator"), uno::UNO_QUERY_THROW);
+
+doTestJapanese(xTmpBreak);
+}
+
void TestBreakIterator::testChinese()
{
lang::Locale aLocale;
diff --git a/i18npool/source/breakiterator/xdictionary.cxx
b/i18npool/source/breakiterator/xdictionary.cxx
index 6ded123..e83b529 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
#include
#include
@@ -57,22 +58,9 @@ sal_Unicode* getDataArea_zh();
#endif
xdictionary::xdictionary(const sal_Char *lang) :
-existMark( NULL ),
-index1( NULL ),
-index2( NULL ),
-lenArray( NULL ),
-dataArea( NULL ),
-#ifndef DISABLE_DYNLOADING
-hModule( NULL ),
-#endif
boundary(),
japaneseWordBreak( false )
{
-existMark = NULL;
-index1 = NULL;
-index2 = NULL;
-lenArray = NULL;
-dataArea = NULL;
#ifdef DICT_JA_ZH_IN_DATAFILE
@@ -96,53 +84,33 @@ xdictionary::xdictionary(const sal_Char *lang) :
// We have the offsets to the parts of the file at its end, see
gendict.cxx
sal_Int64 *pEOF = (sal_Int64*)(pMapping + nFileSize);
-existMark = (sal_uInt8*) (pMapping + pEOF[-1]);
-index2 = (sal_Int32*) (pMapping + pEOF[-2]);
-index1 = (sal
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/cellsh2.cxx | 21 +++
sc/source/ui/view/cellsh3.cxx | 45 ++
sc/source/ui/view/dbfunc3.cxx | 12 +--
sc/source/ui/view/editsh.cxx | 16 --
4 files changed, 39 insertions(+), 55 deletions(-)
New commits:
commit 22259f02b211694525251afcdba12a5d3a43cbae
Author: Takeshi Abe
Date: Mon May 12 18:46:49 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: Ia2925804755220b8bd160da8997b1bf3161aa27b
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 097fa19..52ad408 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -64,6 +64,8 @@
#include
+#include
+
using namespace com::sun::star;
static bool lcl_GetTextToColumnsRange( const ScViewData* pData, ScRange&
rRange )
@@ -158,7 +160,7 @@ static bool lcl_GetSortParam( const ScViewData* pData,
ScSortParam& rSortParam )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
-AbstractScSortWarningDlg* pWarningDlg = pFact->CreateScSortWarningDlg(
pTabViewShell->GetDialogParent(), aExtendStr, aCurrentStr );
+boost::scoped_ptr
pWarningDlg(pFact->CreateScSortWarningDlg( pTabViewShell->GetDialogParent(),
aExtendStr, aCurrentStr ));
OSL_ENSURE(pWarningDlg, "Dialog create fail!");
short bResult = pWarningDlg->Execute();
if( bResult == BTN_EXTEND_RANGE || bResult == BTN_CURRENT_SELECTION )
@@ -175,7 +177,6 @@ static bool lcl_GetSortParam( const ScViewData* pData,
ScSortParam& rSortParam )
pData->GetDocShell()->CancelAutoDBRange();
}
-delete pWarningDlg;
pTabViewShell->ClearHighlightRanges();
}
return bSort;
@@ -467,7 +468,6 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
if( lcl_GetSortParam( pData, aSortParam ) )
{
-SfxAbstractTabDialog* pDlg = NULL;
ScDocument* pDoc = GetViewData()->GetDocument();
SfxItemSet aArgSet( GetPool(), SCITEM_SORTDATA,
SCITEM_SORTDATA );
@@ -481,7 +481,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
assert(pFact); //ScAbstractFactory create fail!
-pDlg =
pFact->CreateScSortDlg(pTabViewShell->GetDialogParent(), &aArgSet);
+boost::scoped_ptr
pDlg(pFact->CreateScSortDlg(pTabViewShell->GetDialogParent(), &aArgSet));
assert(pDlg); //Dialog create fail!
pDlg->SetCurPageId("criteria"); // 1=sort field tab
2=sort options tab
@@ -536,8 +536,6 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
else
GetViewData()->GetDocShell()->CancelAutoDBRange();
-
-delete pDlg;
}
}
}
@@ -724,8 +722,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
-AbstractScSelEntryDlg* pDlg =
pFact->CreateScSelEntryDlg( pTabViewShell->GetDialogParent(),
-
aList );
+boost::scoped_ptr
pDlg(pFact->CreateScSelEntryDlg( pTabViewShell->GetDialogParent(),
+
aList ));
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
{
@@ -734,8 +732,6 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
rReq.AppendItem( SfxStringItem( SID_SELECT_DB,
aName ) );
rReq.Done();
}
-
-delete pDlg;
}
}
}
@@ -964,8 +960,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
OSL_ENSURE( pFact, "ScCellShell::ExecuteDB:
SID_TEXT_TO_COLUMNS - pFact is null!" );
-AbstractScImportAsciiDlg *pDlg =
pFact->CreateScImportAsciiDlg(
-NULL, OUString(), &aStream, SC_TEXTTOCOLUMNS);
+boost::scoped_ptr
pDlg(pFact->CreateScImportAsciiDlg(
+NULL, OUString(), &aStream, SC_TEXTTOCOLUMNS));
OSL_ENSURE( pDlg, "ScCellShell::ExecuteDB:
SID_TEXT_TO_COLUMNS - pDlg is null!" );
[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=43157 --- Comment #24 from Commit Notification --- Michaël Lefèvre committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=70e744b2157ebe48f3a5c839560fedf6521d0464 fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/source dbaccess/source fpicker/source include/sal sal/osl shell/source store/source store/workben
basic/source/runtime/runtime.cxx|4 +-
dbaccess/source/core/api/resultset.cxx |4 +-
dbaccess/source/core/recovery/subcomponentrecovery.cxx |2 -
dbaccess/source/filter/xml/xmlExport.cxx|2 -
dbaccess/source/ui/dlg/dsselect.cxx |2 -
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx|2 -
dbaccess/source/ui/uno/copytablewizard.cxx |4 +-
fpicker/source/win32/filepicker/FilePicker.cxx |4 +-
fpicker/source/win32/filepicker/PreviewCtrl.cxx |2 -
fpicker/source/win32/filepicker/asynceventnotifier.cxx |2 -
fpicker/source/win32/filepicker/dibpreview.cxx | 14 ++--
fpicker/source/win32/filepicker/filepickerstate.cxx |4 +-
fpicker/source/win32/filepicker/getfilenamewrapper.cxx |2 -
fpicker/source/win32/folderpicker/MtaFop.hxx|2 -
include/sal/log-areas.dox |2 +
sal/osl/unx/file_path_helper.cxx|8 ++--
sal/osl/w32/file.cxx|5 +-
sal/osl/w32/file_dirvol.cxx |5 +-
sal/osl/w32/path_helper.cxx |3 +
sal/osl/w32/socket.cxx |5 +-
shell/source/win32/shlxthandler/classfactory.cxx|6 ++-
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx |6 ++-
store/source/lockbyte.cxx |2 -
store/source/storbios.cxx |4 +-
store/source/stordata.cxx | 13 +--
store/source/storpage.cxx |8 ++--
store/source/stortree.cxx | 28 +---
store/source/stortree.hxx |2 -
store/workben/t_store.cxx | 25 ++
29 files changed, 96 insertions(+), 76 deletions(-)
New commits:
commit 70e744b2157ebe48f3a5c839560fedf6521d0464
Author: Michaël Lefèvre
Date: Mon Apr 7 11:44:43 2014 +0200
fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF
Change-Id: Ia89a2dce799c7ba90bcd19919195bfd2c7a4a180
Signed-off-by: Stephan Bergmann
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 8bfdb52..43da658 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -924,11 +924,11 @@ void SbiRuntime::Error( SbError _errCode, const OUString&
_details )
if ( _errCode )
{
// Not correct for class module usage, remove for now
-//OSL_ENSURE( pInst->pRun == this, "SbiRuntime::Error: can't propagate
the error message details!" );
+//OSL_WARN_IF( pInst->pRun != this, "basic", "SbiRuntime::Error: can't
propagate the error message details!" );
if ( pInst->pRun == this )
{
pInst->Error( _errCode, _details );
-//OSL_POSTCOND( nError == _errCode, "SbiRuntime::Error: the
instance is expecte to propagate the error code back to me!" );
+//OSL_WARN_IF( nError != _errCode, "basic", "SbiRuntime::Error:
the instance is expecte to propagate the error code back to me!" );
}
else
{
diff --git a/dbaccess/source/core/api/resultset.cxx
b/dbaccess/source/core/api/resultset.cxx
index 8f9e48a..ed356f9 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -382,7 +382,7 @@ Reference< ::com::sun::star::container::XNameAccess >
OResultSet::getColumns(voi
{
const Reference< XNameAccess > xColNames( static_cast<
XNameAccess* >( m_pColumns ), UNO_SET_THROW );
const Sequence< OUString > aNames( xColNames->getElementNames() );
-OSL_POSTCOND( aNames.getLength() == nColCount,
+SAL_WARN_IF( aNames.getLength() != nColCount, "dbaccess",
"OResultSet::getColumns: invalid column count!" );
for ( const OUString* pName = aNames.getConstArray();
pName != aNames.getConstArray() + aNames.getLength();
@@ -392,7 +392,7 @@ Reference< ::com::sun::star::container::XNameAccess >
OResultSet::getColumns(voi
Reference< XPropertySet > xColProps( xColNames->getByName(
*pName ), UNO_QUERY_THROW );
OUString sName;
OSL_VERIFY( xColProps->getPropertyValue( PROPERTY_NAME ) >>=
sName );
-OSL_POSTCOND( sName == *pName, "OResultSet::getColumns:
invalid column name!" );
+SAL_WARN_IF( sName != *pName, "dbaccess",
"OResultSet::getColumns: invalid column name!" );
}
}
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 7055ec1..c5b977e 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/sour
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/main/ChartController.hxx |4
1 file changed, 4 deletions(-)
New commits:
commit d1516d488c081ec3a5d730d2b1626a0c8dc39a73
Author: Tor Lillqvist
Date: Mon May 12 12:06:16 2014 +0300
WaE: private field 'm_bOwnershipIsWellKnown' is not used
Change-Id: Ic4b784cb26f9127fe549f3866cbe53f0d0be0a78
diff --git a/chart2/source/controller/main/ChartController.hxx
b/chart2/source/controller/main/ChartController.hxx
index a207f51..485a2b7 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -476,10 +476,6 @@ private:
//the ownership between model and controller is not clear at first
//each controller might consider himself as owner of the model
first
bool volatile m_bOwnership;
-//with a XCloseable::close call and during
XCloseListener::queryClosing
-//the ownership can be regulated more explicit,
-//if so the ownership is considered to be well known
-bool volatile m_bOwnershipIsWellKnown;
};
class TheModelRef
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/lcms2
download.lst|3 ++- external/lcms2/ExternalPackage_lcms2.mk |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 5aa02dc294185708fc4a28a8308ecb7a402e6809 Author: Thomas Arnhold Date: Sun May 11 21:59:59 2014 +0200 upgrade to lcms2-2.6 Change-Id: Iaa5593d1593c9a54127c9019a4121af6a207d4c5 Reviewed-on: https://gerrit.libreoffice.org/9317 Tested-by: LibreOffice gerrit bot Reviewed-by: Thomas Arnhold diff --git a/download.lst b/download.lst index 7bdf41b..5a7a4e1 100644 --- a/download.lst +++ b/download.lst @@ -73,7 +73,8 @@ export JPEG_TARBALL := jpegsrc.v9a.tar.gz export LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97 export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2 export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 -export LCMS2_TARBALL := 861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz +export LCMS2_MD5SUM := f4c08d38ceade4a664ebff7228910a33 +export LCMS2_TARBALL := lcms2-2.6.tar.gz export LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk index 2785ea8..59e5f62 100644 --- a/external/lcms2/ExternalPackage_lcms2.mk +++ b/external/lcms2/ExternalPackage_lcms2.mk @@ -23,7 +23,7 @@ else ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll)) endif # $(COM) else # $(OS) != WNT/MACOSX -$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.6)) endif # $(OS) endif # $(DISABLE_DYNLOADING) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unotools/source
unotools/source/config/fltrcfg.cxx | 16
1 file changed, 16 deletions(-)
New commits:
commit cc4a3f1a88afff114311bddf462ca4bc00a485c7
Author: Tor Lillqvist
Date: Mon May 12 11:20:06 2014 +0300
Revert "Intermediate commit: un-revert last change"
Makes some SmartArt render better, some a bit worse, and some much
worse. Life is hard.
This reverts commit f66d64ab2e85f574a4b9f644ef709ff981483836.
Change-Id: I18b31deea8c14b401134551e74ba7ba208af3ad9
diff --git a/unotools/source/config/fltrcfg.cxx
b/unotools/source/config/fltrcfg.cxx
index dc8dbbd..6c2c473 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -584,24 +584,8 @@ void SvtFilterOptions::SetImpress2PowerPoint( bool bFlag )
SetModified();
}
-static bool lcl_DoTiledRendering()
-{
-#if !HAVE_FEATURE_DESKTOP
-// We do tiled rendering only for iOS at the moment, actually, but
-// let's see what happens if we assume it for Android, too.
-return true;
-#else
-// We need some way to know globally if this process will use
-// tiled rendering or not. Or should this be a per-window setting?
-// Or what?
-return false;
-#endif
-}
-
bool SvtFilterOptions::IsSmartArt2Shape() const
{
-if (lcl_DoTiledRendering())
-return true;
return pImp->IsFlag( FILTERCFG_SMARTART_SHAPE_LOAD );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/main/ChartController.cxx |6 +-
chart2/source/inc/LifeTime.hxx|5 -
chart2/source/tools/LifeTime.cxx |8 +++-
3 files changed, 4 insertions(+), 15 deletions(-)
New commits:
commit 4cbfbf4597f11ac12f3cf066c3eb71de12b858d7
Author: Caolán McNamara
Date: Mon May 12 09:18:51 2014 +0100
m_bOwnershipIsWellKnown is unused
Change-Id: I4dee9c4ce674249fca590e1c6d86685ed86da885
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index 79029e6..caf03db 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -139,8 +139,7 @@ void ChartController::RefCountable::release()
ChartController::TheModel::TheModel( const uno::Reference< frame::XModel > &
xModel ) :
m_xModel( xModel ),
m_xCloseable( NULL ),
-m_bOwnership( true ),
-m_bOwnershipIsWellKnown( false )
+m_bOwnership( true )
{
m_xCloseable =
uno::Reference< util::XCloseable >( xModel, uno::UNO_QUERY );
@@ -153,7 +152,6 @@ ChartController::TheModel::~TheModel()
void ChartController::TheModel::SetOwnership( bool bGetsOwnership )
{
m_bOwnership= bGetsOwnership;
-m_bOwnershipIsWellKnown = true;
}
void ChartController::TheModel::addListener( ChartController* pController )
@@ -206,7 +204,6 @@ void ChartController::TheModel::tryTermination()
m_xCloseable->close(sal_True);
m_bOwnership= false;
-m_bOwnershipIsWellKnown = true;
}
catch( const util::CloseVetoException& )
{
@@ -219,7 +216,6 @@ void ChartController::TheModel::tryTermination()
#endif
m_bOwnership= false;
-m_bOwnershipIsWellKnown = true;
return;
}
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 4b20858..2465875 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -83,10 +83,6 @@ protected:
//each controller might consider him as owner of the model first
//at start the model is not considered as owner of itself
bool volatile m_bOwnership;
-//with a XCloseable::close call and during XCloseListener::queryClosing
-//the ownership can be regulated more explicit,
-//if so the ownership is considered to be well known
-bool volatile m_bOwnershipIsWellKnown;
public:
OOO_DLLPUBLIC_CHARTTOOLSCloseableLifeTimeManager(
::com::sun::star::util::XCloseable* pCloseable
@@ -118,7 +114,6 @@ protected:
m_bClosed = false;
m_bInTryClose = false;
m_bOwnership = false;
-m_bOwnershipIsWellKnown = false;
m_aEndTryClosingCondition.set();
}
};
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index a063192..63b5acc 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -311,14 +311,12 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed(
bool bAssert )
impl_doClose();
}
-void CloseableLifeTimeManager
-::impl_setOwnership( bool bDeliverOwnership, bool bMyVeto )
+void CloseableLifeTimeManager::impl_setOwnership( bool bDeliverOwnership, bool
bMyVeto )
{
m_bOwnership= bDeliverOwnership && bMyVeto;
-m_bOwnershipIsWellKnown = true;
}
-bool CloseableLifeTimeManager
-::impl_shouldCloseAtNextChance()
+
+bool CloseableLifeTimeManager::impl_shouldCloseAtNextChance()
{
return m_bOwnership;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - writerfilter/source
writerfilter/source/dmapper/CellColorHandler.cxx |2 --
writerfilter/source/dmapper/ConversionHelper.cxx |3 +--
writerfilter/source/dmapper/DomainMapper.cxx |1 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 --
4 files changed, 1 insertion(+), 7 deletions(-)
New commits:
commit be267ff6338ba023a7230a41c92186b844bdd396
Author: Miklos Vajna
Date: Mon May 12 10:16:27 2014 +0200
writerfilter: write out table::BorderLineStyle::NONE
Change-Id: Ifc9e42f12c8e3d6ae1f98396fddf5bd6adcf3ba1
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx
b/writerfilter/source/dmapper/ConversionHelper.cxx
index bff0e82..af6ea70 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -31,7 +31,6 @@
#include
using namespace com::sun::star;
-using namespace com::sun::star::table::BorderLineStyle;
namespace writerfilter {
namespace dmapper{
@@ -85,7 +84,7 @@ void MakeBorderLine( sal_Int32 nLineThickness, sal_Int32
nLineType,
::editeng::SvxBorderStyle const nLineStyle(
::editeng::ConvertBorderStyleFromWord(nLineType));
rToFill.LineStyle = nLineStyle;
-double const fConverted( (NONE == nLineStyle) ? 0.0 :
+double const fConverted( (table::BorderLineStyle::NONE == nLineStyle) ?
0.0 :
::editeng::ConvertBorderWidthFromWord(nLineStyle, nLineThickness,
nLineType));
rToFill.LineWidth = convertTwipToMM100(fConverted);
commit 9655f94bb4f778e5dede0d8d45e001d1cc24275a
Author: Miklos Vajna
Date: Mon May 12 10:15:37 2014 +0200
writerfilter: unused 'using' in dmapper
Change-Id: Id6a8362872bb4602b840da388189fecc046dd97e
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx
b/writerfilter/source/dmapper/CellColorHandler.cxx
index c70936d..c069b4b 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -30,8 +30,6 @@ namespace writerfilter {
namespace dmapper {
using namespace ::com::sun::star::drawing;
-using namespace ::writerfilter;
-
CellColorHandler::CellColorHandler() :
LoggedProperties(dmapper_logger, "CellColorHandler"),
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index e50ccf4..dd92026 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -70,7 +70,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::rtl;
namespace writerfilter {
commit 2c95e104e942408948bb1134310884ab66a68a6c
Author: Miklos Vajna
Date: Mon May 12 10:12:06 2014 +0200
writerfilter: unused 'using' in rtftok
Change-Id: Ie28d898d490ff695143e9f09502fa10db092ccc7
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 38e8653..f62827e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -59,8 +59,6 @@
#define MM100_TO_EMU(MM100) (MM100 * 360)
-using std::make_pair;
-
namespace writerfilter
{
namespace rtftok
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Questions about getCppuType
On 05/12/2014 09:56 AM, Stephan Bergmann wrote: On 05/11/2014 10:12 AM, julien2412 wrote: As you may have seen, I've begun to replace occurences. Just to be sure, is "Sequence" always a shortcut of "css::uno::Sequence" or could it be something else sometimes? (I mean something not related to css::uno) Idem for "Reference", could it be something else that "css::uno::Reference"? Sure "Sequence" and "Reference" can potentially reference other things than css::uno::Sequence and css::uno::Reference. And esp. "Reference" likely does reference rtl::Reference occasionally. ...but they are rather unlikely to refer to anything but css::uno::* in getCppuType expressions, if that was your question. (Esp. since there appear to be no UNOIDL entities with such names defined in neither udkapi nor offapi.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extensions/source unusedcode.easy
extensions/source/abpilot/abspage.cxx |6 --
extensions/source/abpilot/abspage.hxx |1 -
unusedcode.easy |7 +++
3 files changed, 3 insertions(+), 11 deletions(-)
New commits:
commit ba3f3db7a77b2169591f94f9f349250deb52e913
Author: Caolán McNamara
Date: Mon May 12 09:14:45 2014 +0100
callcatcher: update unused code
Change-Id: If239c30e0e63311a91c757da466bb37d89abcfe4
diff --git a/extensions/source/abpilot/abspage.cxx
b/extensions/source/abpilot/abspage.cxx
index 687f527..b8f1663 100644
--- a/extensions/source/abpilot/abspage.cxx
+++ b/extensions/source/abpilot/abspage.cxx
@@ -30,12 +30,6 @@ namespace abp
using namespace ::com::sun::star::lang;
//= AddressBookSourcePage
-
-AddressBookSourcePage::AddressBookSourcePage( OAddessBookSourcePilot*
_pParent, const ResId& _rId )
-:AddressBookSourcePage_Base(_pParent, _rId)
-{
-}
-
AddressBookSourcePage::AddressBookSourcePage(OAddessBookSourcePilot*
_pParent, const OString& rID, const OUString& rUIXMLDescription)
:AddressBookSourcePage_Base(_pParent, rID, rUIXMLDescription)
{
diff --git a/extensions/source/abpilot/abspage.hxx
b/extensions/source/abpilot/abspage.hxx
index 24b0cd5..9be9efb 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -42,7 +42,6 @@ namespace abp
class AddressBookSourcePage : public AddressBookSourcePage_Base
{
protected:
-AddressBookSourcePage( OAddessBookSourcePilot* _pParent, const ResId&
_rId );
AddressBookSourcePage(OAddessBookSourcePilot *pParent, const OString&
rID, const OUString& rUIXMLDescription);
protected:
diff --git a/unusedcode.easy b/unusedcode.easy
index 028b69d..cd1cd17e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -51,6 +51,8 @@ ScDocument::CreateFormatTable() const
ScDocument::GetRowFlagsArray(short) const
ScExtIButton::GetSelected() const
ScFormulaCellGroup::scheduleCompilation()
+ScTabView::DrawMarkRect(Rectangle const&)
+ScTabViewShell::SetChartArea(tools::SvRef const&, Rectangle
const&)
ScTable::GetCellTextAttr(short, int) const
ScTable::TransferCellValuesFrom(short, int, sc::CellValues&)
ScVbaFormat::getAddIndent()
@@ -81,6 +83,7 @@ StyleSettings::SetTitleHeight(long)
StyleSettings::SetUseFlatBorders(bool)
StyleSettings::SetUseFlatMenus(bool)
SvpSalInstance::PostedEventsInQueue()
+SvtLanguageTable::AddLanguageTag(LanguageTag const&, rtl::OUString const&)
SvtListener::IsListening(SvtBroadcaster&) const
SvxDummyShapeContainer::SvxDummyShapeContainer(com::sun::star::uno::Reference)
SvxNumberFormatShell::IsAdded_Impl(unsigned long)
@@ -216,8 +219,6 @@
canvas::createSurfaceProxyManager(boost::shared_ptr const
chart::ChartTypeUnoDlg::Create(com::sun::star::uno::Reference
const&)
chart::ShapeToolbarController::create(com::sun::star::uno::Reference
const&)
chart::opengl3D::Camera::zoom(unsigned int)
-chart::opengl3D::Line::Line(chart::opengl3D::OpenGL3DRenderer*, unsigned int)
-chart::opengl3D::OpenGL3DRenderer::CreateBMPHeader(unsigned char*, int, int)
chart::opengl3D::OpenGL3DRenderer::GetTime()
chart::opengl3D::OpenGL3DRenderer::ProcessPickingBox()
chart::opengl3D::OpenGL3DRenderer::ProcessUnrenderedShape()
@@ -226,8 +227,6 @@ chart::opengl3D::OpenGL3DRenderer::RenderFPS(float)
chart::opengl3D::OpenGL3DRenderer::SetClickPos(Point)
chart::opengl3D::OpenGL3DRenderer::SetFPS(float)
chart::opengl3D::OpenGL3DRenderer::init()
-chart::opengl3D::Rectangle::Rectangle(chart::opengl3D::OpenGL3DRenderer*,
unsigned int)
-chart::opengl3D::Text::Text(chart::opengl3D::OpenGL3DRenderer*, unsigned int)
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr
const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString
const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr
const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Questions about getCppuType
On 05/11/2014 10:12 AM, julien2412 wrote: As you may have seen, I've begun to replace occurences. Just to be sure, is "Sequence" always a shortcut of "css::uno::Sequence" or could it be something else sometimes? (I mean something not related to css::uno) Idem for "Reference", could it be something else that "css::uno::Reference"? Sure "Sequence" and "Reference" can potentially reference other things than css::uno::Sequence and css::uno::Reference. And esp. "Reference" likely does reference rtl::Reference occasionally. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: download.lst
download.lst |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 4ea9b0fe1d0ee3801e615ba113f01c6f40f72285 Author: Thomas Arnhold Date: Sun May 11 21:56:17 2014 +0200 upgrade to zlib-1.2.8 Change-Id: I67db2bfb386f1cc7ffeb92ec12a64e12e4552160 Reviewed-on: https://gerrit.libreoffice.org/9315 Tested-by: LibreOffice gerrit bot Reviewed-by: Thomas Arnhold diff --git a/download.lst b/download.lst index 221e9cc..7bdf41b 100644 --- a/download.lst +++ b/download.lst @@ -120,7 +120,8 @@ export WPD_TARBALL := a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2 export WPG_TARBALL := b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2 export WPS_TARBALL := 46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -export ZLIB_TARBALL := 2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2 +export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40 +export ZLIB_TARBALL := zlib-1.2.8.tar.gz export MOZ_ZIP_INC := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)inc.zip export MOZ_ZIP_LIB := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)lib.zip ___ 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/data/tablePreferredWidth.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 13 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 19 ++---
3 files changed, 29 insertions(+), 3 deletions(-)
New commits:
commit 533e435acd116615b4c6d4872f51b467d623ddd6
Author: YogeshBharate
Date: Thu May 8 13:04:08 2014 +0530
fdo#78325: Table Preferred width in percent is not preserved after RT.
Problem Description :
- After RT, table preferred width in percent is change to '0'.
- After RT, width type change to 'auto' instead of 'pct'.
XML Difference:
In Original :
In Roundtrip :
Change-Id: I20f4011520715b7c1555e82dd1ca590c4b1b9b3a
Reviewed-on: https://gerrit.libreoffice.org/9277
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/tablePreferredWidth.docx
b/sw/qa/extras/ooxmlexport/data/tablePreferredWidth.docx
new file mode 100644
index 000..6546be9
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tablePreferredWidth.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 6564776..e2c7e58 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3217,6 +3217,19 @@ DECLARE_OOXMLEXPORT_TEST(testFloatingTable,
"fdo77887.docx")
}
+DECLARE_OOXMLEXPORT_TEST(testTablePreferredWidth, "tablePreferredWidth.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+if(!pXmlDoc)
+return;
+
+// Problem :If the table preferred width is in percent, then after RT it
changes to 0 & width type changes
+// to 'auto' instead of 'pct'.
+assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblW[1]", "w", "3000");
+assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblW[1]", "type","pct");
+}
+
DECLARE_OOXMLEXPORT_TEST(testFDO75431, "fdo75431.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4f29904..e969c0c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2679,17 +2679,30 @@ void DocxAttributeOutput::TableDefinition(
ww8::WW8TableNodeInfoInner::Pointer_t
const char* widthType = "dxa";
bool bRelBoxSize = false;
-// If actual width of table is relative it shoud export is as "auto".
+// If actual width of table is relative it shoud export is as "pct".`
const SwTable *pTable = pTableTextNodeInfoInner->getTable();
SwFrmFmt *pTblFmt = pTable->GetFrmFmt( );
+const SwFmtFrmSize &rSize = pTblFmt->GetFrmSize();
+int nWidthPercent = rSize.GetWidthPercent();
uno::Reference
xPropertySet(SwXTextTables::GetObject(const_cast(*pTable->GetFrmFmt(
))),uno::UNO_QUERY);
bool isWidthRelative = false;
xPropertySet->getPropertyValue("IsWidthRelative") >>= isWidthRelative;
if(isWidthRelative)
{
-nPageSize = 0;
-widthType = "auto";
+ /**
+ * As per ECMA Specification : ECMA-376, Second Edition, Part 1 -
Fundamentals And Markup Language Reference [ 17.18.90 ST_TblWidth (Table Width
Units)]
+ * http://www.schemacentral.com/sc/ooxml/a-w_type-7.html
+ *
+ * Fiftieths of a Percent :
+ *
http://startbigthinksmall.wordpress.com/2010/01/04/points-inches-and-emus-measuring-units-in-office-open-xml/
+ * pct Width is in Fiftieths of a Percent
+ *
+ * ex. If the Table width is 50% then
+ * Width in Fiftieths of a percent is (50 * 50) % or 0.5 * 5000 = 2500pct
+ **/
+nPageSize = nWidthPercent * 50 ;
+widthType = "pct" ;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/inc sc/source
chart2/inc/ChartView.hxx |8
sc/source/ui/view/gridwin.cxx | 27 +++
2 files changed, 31 insertions(+), 4 deletions(-)
New commits:
commit 30d6bf6f25c1531e10454739b791ee572b59b251
Author: Markus Mohrhard
Date: Mon May 12 08:51:51 2014 +0200
volatile does not make any sense here
Change-Id: I895f6d04bbd5bd1829ec72b2051e640cbc153b26
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index bc458a9..0ba3bf8 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -252,10 +252,10 @@ private: //member
::cppu::OMultiTypeInterfaceContainerHelper
m_aListenerContainer;
-bool volatile m_bViewDirty; //states whether the view needs to be
rebuild
-bool volatile m_bInViewUpdate;
-bool volatile m_bViewUpdatePending;
-bool volatile m_bRefreshAddIn;
+bool m_bViewDirty; //states whether the view needs to be rebuild
+bool m_bInViewUpdate;
+bool m_bViewUpdatePending;
+bool m_bRefreshAddIn;
//better performance for big data
::com::sun::star::awt::Size m_aPageResolution;
commit a2576b2d43684c54a9270ce93b5a721296faf8da
Author: Markus Mohrhard
Date: Mon May 12 08:28:36 2014 +0200
send mouse events to the OpenGL window
No idea why the events are send to ScgridWindow but this hack works for
now. It is not perfect and surely not beautiful but does work.
Change-Id: If620e471083d34004ee877a25f8731d7b4212f3c
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 2082d8d..95ce9fd 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1636,6 +1636,33 @@ bool ScGridWindow::TestMouse( const MouseEvent& rMEvt,
bool bAction )
void ScGridWindow::MouseButtonDown( const MouseEvent& rMEvt )
{
+if(!maChildWindows.empty())
+{
+const Point& rPos = rMEvt.GetPosPixel();
+for(boost::ptr_vector::iterator itr = maChildWindows.begin(),
+itrEnd = maChildWindows.end(); itr != itrEnd; ++itr)
+{
+Point aPoint = itr->GetPosPixel();
+Size aSize = itr->GetSizePixel();
+
+if(rPos.X() >= aPoint.X() && rPos.X() <= (aPoint.X() +
aSize.Width())
+&& rPos.Y() >= aPoint.Y() && rPos.Y() <= (aPoint.Y() +
aSize.Height()))
+{
+// we found a mouse event for the child window
+// we need to recalculate the position based on the child
window
+
+Point aNewPos = rPos - aPoint;
+sal_uInt16 nClicks = rMEvt.GetClicks();
+sal_uInt16 nMode = rMEvt.GetMode();
+sal_uInt16 nButtons = rMEvt.GetButtons();
+sal_uInt16 nModifier = rMEvt.GetModifier();
+
+MouseEvent aEvent(aNewPos, nClicks, nMode, nButtons,
nModifier);
+itr->MouseButtonDown(aEvent);
+return;
+}
+}
+}
nNestedButtonState = SC_NESTEDBUTTON_DOWN;
MouseEventState aState;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
