[Bug 66754] Remove own implementations of various Perl functions in installer
https://bugs.documentfoundation.org/show_bug.cgi?id=66754 Jan Holesovsky changed: What|Removed |Added CC||j...@documentfoundation.org --- Comment #7 from Jan Holesovsky --- Josh: Great to see you hacking on this! Let me CC JanI who will be able to help you with pushing your patches etc. :-) -- 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: sal/rtl
sal/rtl/bootstrap.cxx |4 1 file changed, 4 deletions(-) New commits: commit 478e2ad48ea345ec0d8058f03c1547cc29ab0cda Author: Tor Lillqvist Date: Tue Jan 26 10:09:33 2016 +0200 Bin leftover cruft Change-Id: I15a4237a1ab6d7c180b52c3f8d2834c0e034b7db diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index bd1e948..16af289 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -16,10 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef WINNT -#define NOMINMAX -#endif - #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclprocessor2d.cxx | 16
1 file changed, 16 deletions(-)
New commits:
commit 526b0a566db7628c6a31258efefc8409c5e74386
Author: Tor Lillqvist
Date: Tue Jan 26 09:36:22 2016 +0200
Bin some unneeded 'using' and includes
Change-Id: Ia91b3837ce39ae48e8c660274a08415ee4f9e5c7
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index ebace48..c765602 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -39,7 +39,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -55,16 +54,11 @@
// control support
-#include
-#include
-#include
#include
#include
-// for test, can be removed again
#include
#include
-// <- for test
using namespace com::sun::star;
@@ -98,16 +92,6 @@ namespace drawinglayer
{
namespace processor2d
{
-// UNO class usages
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::awt::XView;
-using ::com::sun::star::awt::XGraphics;
-using ::com::sun::star::awt::XWindow;
-using ::com::sun::star::awt::PosSize::POSSIZE;
-
// rendering support
// directdraw of text simple portion or decorated portion primitive.
When decorated, all the extra
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/qa
sd/qa/unit/tiledrendering/tiledrendering.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3bd5a251925d8660718553a7702198d6d2251502
Author: Stephan Bergmann
Date: Tue Jan 26 09:18:42 2016 +0100
loplugin:defaultparams
Change-Id: I592b8f678288c1229e66abb98f6bb5f865f177a0
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 7081b5d..4bf086a 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -491,7 +491,7 @@ void SdTiledRenderingTest::testSearchAllFollowedBySearch()
pXImpressDocument->registerCallback(&SdTiledRenderingTest::callback, this);
lcl_search("third", /*bFindAll=*/true);
-lcl_search("match", /*bFindAll=false*/);
+lcl_search("match" /*,bFindAll=false*/);
OString aUsedFormat;
// This used to give wrong result: 'search' after 'search all' still
commit 5614bcb6acf3462a7edd56470fb60683da6937c1
Author: Stephan Bergmann
Date: Tue Jan 26 09:18:21 2016 +0100
loplugin:defaultparams
Change-Id: I4c80f7055ccb9979bfb89cf9139561287d9659a4
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index fab2c4e..7081b5d 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -491,7 +491,7 @@ void SdTiledRenderingTest::testSearchAllFollowedBySearch()
pXImpressDocument->registerCallback(&SdTiledRenderingTest::callback, this);
lcl_search("third", /*bFindAll=*/true);
-lcl_search("match", /*bFindAll=*/false);
+lcl_search("match", /*bFindAll=false*/);
OString aUsedFormat;
// This used to give wrong result: 'search' after 'search all' still
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 45775] PgSQL new DB allow empty Datasource
https://bugs.documentfoundation.org/show_bug.cgi?id=45775 --- Comment #19 from Lionel Elie Mamane --- (In reply to Akshay Deep from comment #18) > Can you help me by helping me find code where the dialog is created and the > buttons get enabled. I need to somehow perform a check that if the chosen db > is PostgreSQl, then the next button should be enabled by default. > I am trying to look in "dbwizsetup.cxx". Is comment 10 helpful? -- 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 'libreoffice-5-1' - i18nlangtag/qa i18nlangtag/source i18npool/Library_localedata_euro.mk i18npool/source
i18nlangtag/qa/cppunit/test_languagetag.cxx |1
i18nlangtag/source/isolang/isolang.cxx |4
i18npool/Library_localedata_euro.mk |2
i18npool/source/localedata/data/eu.xml | 376
i18npool/source/localedata/data/eu_ES.xml | 376
i18npool/source/localedata/localedata.cxx |2
6 files changed, 381 insertions(+), 380 deletions(-)
New commits:
commit e0591f72d6088ee392b4c2e41fda8c0dc4faf2a3
Author: Eike Rathke
Date: Fri Jan 22 21:46:30 2016 +0100
tdf#97315 add Basque [eu-ES] and map [eu] to [eu-ES]
(cherry picked from commit 72c5e230f9cda8e18f63f7bbc6567487b4c5a5e0)
i18npool: fix build
Looks like 72c5e230f9cda8e18f63f7bbc6567487b4c5a5e0 missed the
makefile change.
(cherry picked from commit a6c8b41c4df79183c5d2c1450c010768ac7d82f6)
2d887ca6cb6c698fdb2d24029f38cce6050e0881
Change-Id: I89641fa82f0d0129aeff0d86a10be26cdc721dfc
Reviewed-on: https://gerrit.libreoffice.org/21725
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 76ef5a3..8696408 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -684,6 +684,7 @@ static bool checkMapping( const OUString& rStr1, const
OUString& rStr2 )
if (rStr1 == "ku-SY" ) return rStr2 == "kmr-Latn-SY";
if (rStr1 == "ku-IQ" ) return rStr2 == "ckb-IQ";
if (rStr1 == "ku-IR" ) return rStr2 == "ckb-IR";
+if (rStr1 == "eu" ) return rStr2 == "eu-ES";
return rStr1 == rStr2;
}
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 3b50dd5..196b9e1 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -239,7 +239,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_ARABIC_SOMALIA, "ar", "SO", 0 },
{ LANGUAGE_USER_ARABIC_SUDAN, "ar", "SD", 0 },
{ LANGUAGE_ARABIC_PRIMARY_ONLY, "ar", "" , 0 },
-{ LANGUAGE_BASQUE, "eu", "" , 0 },
+{ LANGUAGE_BASQUE, "eu", "ES", 0 },
+{ LANGUAGE_BASQUE, "eu", "" , kSAME },// our
earlier definition
{ LANGUAGE_BULGARIAN, "bg", "BG", 0 },
{ LANGUAGE_CZECH, "cs", "CZ", 0 },
{ LANGUAGE_CZECH, "cz", "" , kSAME },
@@ -1113,7 +1114,6 @@ css::lang::Locale
MsLangId::Conversion::lookupFallbackLocale(
switch (pEntry->mnLang)
{
// These are known to have no country assigned.
-case LANGUAGE_BASQUE:
case LANGUAGE_USER_ESPERANTO:
case LANGUAGE_USER_INTERLINGUA:
case LANGUAGE_USER_LOJBAN:
diff --git a/i18npool/Library_localedata_euro.mk
b/i18npool/Library_localedata_euro.mk
index 9b5aaae..caece13 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -36,7 +36,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,localedata_euro,\
CustomTarget/i18npool/localedata/localedata_dsb_DE \
CustomTarget/i18npool/localedata/localedata_el_GR \
CustomTarget/i18npool/localedata/localedata_et_EE \
- CustomTarget/i18npool/localedata/localedata_eu \
+ CustomTarget/i18npool/localedata/localedata_eu_ES \
CustomTarget/i18npool/localedata/localedata_fi_FI \
CustomTarget/i18npool/localedata/localedata_fo_FO \
CustomTarget/i18npool/localedata/localedata_fr_BE \
diff --git a/i18npool/source/localedata/data/eu.xml
b/i18npool/source/localedata/data/eu_ES.xml
similarity index 99%
rename from i18npool/source/localedata/data/eu.xml
rename to i18npool/source/localedata/data/eu_ES.xml
index 8de7c60..cc7c6d5 100644
--- a/i18npool/source/localedata/data/eu.xml
+++ b/i18npool/source/localedata/data/eu_ES.xml
@@ -24,8 +24,8 @@
Basque
-
-
+ ES
+ Spain
diff --git a/i18npool/source/localedata/localedata.cxx
b/i18npool/source/localedata/localedata.cxx
index e91ac3f3..d8f5ed0 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -152,7 +152,7 @@ static const struct {
{ "sr_CS", lcl_DATA_EURO },
{ "hr_HR", lcl_DATA_EURO },
{ "bs_BA", lcl_DATA_EURO },
-{ "eu", lcl_DATA_EURO },
+{ "eu_ES", lcl_DATA_EURO },
{ "fo_FO", lcl_DATA_EURO },
{ "ga_IE", lcl_DATA_EURO },
{ "gd_GB", lcl_DATA_EURO },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - vcl/source
vcl/source/filter/igif/gifread.cxx | 29 +
vcl/source/filter/wmf/enhwmf.cxx |6 +++---
vcl/source/filter/wmf/winmtf.cxx | 10 --
vcl/source/filter/wmf/winmtf.hxx |2 +-
vcl/source/filter/wmf/winwmf.cxx |4 ++--
5 files changed, 23 insertions(+), 28 deletions(-)
New commits:
commit 6fed035cf1eb62db8029e615e1b5f2d3ab825f78
Author: Caolán McNamara
Date: Thu Jan 21 09:28:12 2016 +
valgrind: memleak on thrown exception
(cherry picked from commit f5aefab2a62a90c631e05ec29022a2f7e19f00c3)
Change-Id: I2788c5fe04a984d6534adbd3186cc652685152e8
Reviewed-on: https://gerrit.libreoffice.org/21737
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 636d45438f317d7ef39d660c11f6bab1dc42302a)
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index bb029b5..dfc7790 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1244,7 +1244,7 @@ bool EnhWMFReader::ReadEnhWMF()
Rectangle aCropRect( Point( xSrc, ySrc ),
Size( cxSrc, cySrc ) );
aBitmap.Crop( aCropRect );
}
-aBmpSaveList.push_back( new BSaveStruct( aBitmap,
aRect, dwRop, pOut->GetFillStyle () ) );
+aBmpSaveList.emplace_back(new BSaveStruct(aBitmap,
aRect, dwRop, pOut->GetFillStyle ()));
}
}
}
@@ -1305,7 +1305,7 @@ bool EnhWMFReader::ReadEnhWMF()
Rectangle aCropRect( Point( xSrc, ySrc ),
Size( cxSrc, cySrc ) );
aBitmap.Crop( aCropRect );
}
-aBmpSaveList.push_back( new BSaveStruct( aBitmap,
aRect, dwRop, pOut->GetFillStyle () ) );
+aBmpSaveList.emplace_back(new BSaveStruct(aBitmap,
aRect, dwRop, pOut->GetFillStyle ()));
}
}
}
@@ -1372,7 +1372,7 @@ bool EnhWMFReader::ReadEnhWMF()
Rectangle aCropRect( Point( xSrc, ySrc ),
Size( cxSrc, cySrc ) );
aBitmap.Crop( aCropRect );
}
-aBmpSaveList.push_back( new BSaveStruct( aBitmap,
aRect, dwRop, pOut->GetFillStyle () ) );
+aBmpSaveList.emplace_back(new BSaveStruct(aBitmap,
aRect, dwRop, pOut->GetFillStyle ()));
}
}
}
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index c19642a..3f71773 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1576,7 +1576,7 @@ void WinMtfOutput::ResolveBitmapActions(
BSaveStructList_impl& rSaveList )
size_t nObjectsOfSameSize = 0;
size_t nObjectStartIndex = nObjects - nObjectsLeft;
-BSaveStruct*pSave = rSaveList[ nObjectStartIndex ];
+BSaveStruct*pSave = rSaveList[nObjectStartIndex].get();
Rectangle aRect( pSave->aOutRect );
for ( i = nObjectStartIndex; i < nObjects; )
@@ -1584,7 +1584,7 @@ void WinMtfOutput::ResolveBitmapActions(
BSaveStructList_impl& rSaveList )
nObjectsOfSameSize++;
if ( ++i < nObjects )
{
-pSave = rSaveList[ i ];
+pSave = rSaveList[i].get();
if ( pSave->aOutRect != aRect )
break;
}
@@ -1594,7 +1594,7 @@ void WinMtfOutput::ResolveBitmapActions(
BSaveStructList_impl& rSaveList )
for ( i = nObjectStartIndex; i < ( nObjectStartIndex +
nObjectsOfSameSize ); i++ )
{
-pSave = rSaveList[ i ];
+pSave = rSaveList[i].get();
sal_uInt32 nWinRop = pSave->nWinRop;
sal_uInt8 nRasterOperation = (sal_uInt8)( nWinRop >> 16 );
@@ -1622,7 +1622,7 @@ void WinMtfOutput::ResolveBitmapActions(
BSaveStructList_impl& rSaveList )
{
if ( nObjectsOfSameSize == 2 )
{
-BSaveStruct* pSave2 = rSaveList[ i + 1 ];
+BSaveStruct* pSave2 = rSaveList[i + 1].get();
if ( ( pSave->aBmp.GetPrefSize() ==
pSave2->aBmp.GetPrefSize() ) &&
( pSave->aBmp.GetPrefMapMode() ==
pSave2->aBmp.GetPrefMapMode() ) )
{
@@ -1791,8 +1791,6 @@ void WinMtfOutput::ResolveBitmapActions(
BSaveStructList_impl& rSaveList )
nObjectsLeft -= nObjectsOfSameSize;
}
-for( size_t i = 0, n = rSaveList.size(); i < n; ++i )
-delete rSaveList[ i ];
rSaveList.clear();
}
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index 087c3
[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgstyleattributes.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 7c151f39144b7401a99c7b736a41e5dce4ac4db1
Author: Xisco Fauli
Date: Sun Jan 17 23:54:31 2016 +0100
SVGIO: Fix issue when font size is in percentage and ...
... there's no parent style set
Sample:
http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink";
font-size="100%">
Sample 1
Change-Id: Iec88c148475bf8a610286414083e9801faaf8d78
Reviewed-on: https://gerrit.libreoffice.org/21553
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx
b/svgio/source/svgreader/svgstyleattributes.cxx
index 0bb05b4..3e3fa00 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -2314,6 +2314,10 @@ namespace svgio
SvgNumber SvgStyleAttributes::getFontSizeNumber() const
{
+// default size is 'medium' or 16px, which is equal to the default
PPI used in svgio ( 96.0 )
+// converted to pixels
+const double aDefaultSize = F_SVG_PIXEL_PER_INCH / 6.0;
+
if(maFontSizeNumber.isSet())
{
// #122524# Handle Unit_percent realtive to parent FontSize
(see SVG1.1
@@ -2332,15 +2336,15 @@ namespace svgio
aParentNumber.getUnit(),
true);
}
+// if there's no parent style, set the font size based on
the default size
+// 100% = 16px
+return SvgNumber(
+maFontSizeNumber.getNumber() * aDefaultSize / 100.0,
Unit_px, true);
}
return maFontSizeNumber;
}
-// default size is 'medium' or 16px, which is equal to the default
PPI used in svgio ( 96.0 )
-// converted to pixels
-const double aDefaultSize = F_SVG_PIXEL_PER_INCH / 6.0;
-
//In CSS2, the suggested scaling factor between adjacent indexes
is 1.2
switch(maFontSize)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl offapi/com toolkit/Library_tk.mk toolkit/source vcl/source
include/vcl/opengl/OpenGLContext.hxx |5 +
offapi/com/sun/star/awt/XToolkitExperimental.idl |5 +
toolkit/Library_tk.mk|5 -
toolkit/source/awt/vclxtoolkit.cxx | 19 +++
vcl/source/opengl/OpenGLContext.cxx |9 +
5 files changed, 42 insertions(+), 1 deletion(-)
New commits:
commit 2c55288357c9d5410afae58c1fbb97cdfabf0360
Author: Tor Lillqvist
Date: Tue Jan 26 11:17:57 2016 +0200
Add API to get the number of OpenGL buffer swaps, including through UNO
Change-Id: Iff29ac615ad4b6516790b1cbbde0215a3cd0efe6
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index d5a9e31..2b4af08 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -186,6 +186,9 @@ public:
/// reset the GL context so this context is not implicit in subsequent GL
calls.
void resetCurrent();
void swapBuffers();
+
+static sal_Int64 getBufferSwapCounter();
+
void sync();
void show();
@@ -249,6 +252,8 @@ private:
ProgramCollection maPrograms;
OpenGLProgram* mpCurrentProgram;
+static sal_Int64 mnBufferSwapCounter;
+
public:
vcl::Region maClipRegion;
int mnPainting;
diff --git a/offapi/com/sun/star/awt/XToolkitExperimental.idl
b/offapi/com/sun/star/awt/XToolkitExperimental.idl
index 3b73057..7c5d363 100644
--- a/offapi/com/sun/star/awt/XToolkitExperimental.idl
+++ b/offapi/com/sun/star/awt/XToolkitExperimental.idl
@@ -22,6 +22,11 @@ interface XToolkitExperimental : XToolkit2
/** Process all pending idle events
*/
void processEventsToIdle();
+
+
+ /** Get the number of OpenGL buffer swaps.
+ */
+ hyper getOpenGLBufferSwapCounter();
};
}; }; }; };
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index e5aaad5..1136e2e 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -21,7 +21,10 @@ $(eval $(call gb_Library_Library,tk))
$(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk))
-$(eval $(call gb_Library_use_external,tk,boost_headers))
+$(eval $(call gb_Library_use_externals,tk,\
+boost_headers \
+glew \
+))
$(eval $(call gb_Library_set_include,tk,\
$$(INCLUDE) \
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 6929c58..7fe5032 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -22,6 +22,13 @@
#include
#include
#endif
+#if defined UNX && !defined MACOSX
+#include
+#include "GL/glxew.h"
+#include
+#undef None // Avoid clash with the one in
+#undef Status // Sigh... used for instance as parameter name in
css::awt::XImageConsumer
+#endif
#include
#include
#include
@@ -113,6 +120,7 @@
#include
#include
#include
+#include
#include "toolkit/awt/vclxspinbutton.hxx"
#include
#include
@@ -195,6 +203,9 @@ public:
virtual void SAL_CALL processEventsToIdle()
throw (css::uno::RuntimeException, std::exception) override;
+virtual sal_Int64 SAL_CALL getOpenGLBufferSwapCounter()
+throw (css::uno::RuntimeException, std::exception) override;
+
// css::awt::XToolkit
css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getDesktopWindow(
) throw(css::uno::RuntimeException, std::exception) override;
css::awt::RectangleSAL_CALL
getWorkArea( ) throw(css::uno::RuntimeException, std::exception) override;
@@ -1906,6 +1917,8 @@ void SAL_CALL VCLXToolkit::reschedule()
Application::Reschedule(true);
}
+// css::awt::XToolkitExperimental
+
void SAL_CALL VCLXToolkit::processEventsToIdle()
throw (css::uno::RuntimeException, std::exception)
{
@@ -1913,6 +1926,12 @@ void SAL_CALL VCLXToolkit::processEventsToIdle()
Scheduler::ProcessEventsToIdle();
}
+sal_Int64 SAL_CALL VCLXToolkit::getOpenGLBufferSwapCounter()
+throw (css::uno::RuntimeException, std::exception)
+{
+ return OpenGLContext::getBufferSwapCounter();
+}
+
// css:awt:XToolkitRobot
void SAL_CALL VCLXToolkit::keyPress( const css::awt::KeyEvent & aKeyEvent )
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index f409bec..a1296a9 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -50,6 +50,8 @@ static std::vector g_vShareList;
static std::vector g_vShareList;
#endif
+sal_Int64 OpenGLContext::mnBufferSwapCounter = 0;
+
GLWindow::~GLWindow()
{
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID &&
!defined(LIBO_HEADLESS)
@@ -1535,6 +1537,8 @@ void OpenGLContext::swapBuffers()
glXSwapBuffers(m_aGLWin.dpy, m_aGLWin.win);
#endif
+mnBufferSwapCounter++;
+
static bool bSleep = getenv("SAL_GL_SLEEP_ON_SWAP");
if (bSleep)
{
@@ -1544,6 +1548,11 @@ void OpenGLContext::swapBuffers()
}
}
+sal_Int64 OpenGLContext::getBufferSwapCo
[Bug 45775] PgSQL new DB allow empty Datasource
https://bugs.documentfoundation.org/show_bug.cgi?id=45775 --- Comment #20 from Akshay Deep --- (In reply to Lionel Elie Mamane from comment #19) > (In reply to Akshay Deep from comment #18) > > > Can you help me by helping me find code where the dialog is created and the > > buttons get enabled. I need to somehow perform a check that if the chosen db > > is PostgreSQl, then the next button should be enabled by default. > > > I am trying to look in "dbwizsetup.cxx". > > Is comment 10 helpful? Yes, It was really explanatory and I did what was required. Somehow, the NEXT button needs to be activated as soon as the dialog is created. And here I think I need to look into dbwizsetup.cxx from beginning of [comment 10]. I believe somewhere in ODbTypeWizDialogSetup::createPage()function of dbwizsetup.cxx, we can enable next button by default. -- 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
Re: Getting a click on a reference mark
I can answer my question myself: Instead of attaching a listener to a textfield I can use a XSelectionChangeListener on the CurrentController and check, if the viewcursor is on a textfield. Xaver Am 24.01.2016 um 21:38 schrieb X Roemer: Hi, does anyone know if it's possible to catch a click on a reference mark? Can a listener be attached to a textfield to receive a onclick message somehow? Thanks for help, Xaver ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Suggestion
Hi Rick,
On Monday, 2016-01-25 16:26:53 -0500, Rick C. Hodgin wrote:
> On Mon, Jan 25, 2016 at 3:21 PM, Rick C. Hodgin
> > On Tue, Jan 12, 2016 at 8:00 AM, Eike Rathke wrote:
> >> On Friday, 2016-01-08 19:52:49 -0500, Rick C. Hodgin wrote:
> >>
> >> > The category is called *"Metric."*
> >> >
> >> > When conveying fractional values, such that 1.2345E-08 (which is
> >> > 0.000,000,012,345), it would do so in a metric-relative way using the
> >> > standard milli (10^-3), micro (10^-6), nano (10^-9), pico (10^-12), and
> >> so
> >> > on...
> >> >
> >> > In the example, the *Metric* display would cause the value to show up
> >> > as "*12,345
> >> > pu*" (pico-units) if the thousands separator was used.
> >>
> >> Could you give some examples what you think how the format code actually
> >> should look like?
> >>
> > Eike, I never heard back from you after my reply.
> >
> > The format would be "Metric" with "Metric:seconds" given for a specific
> > override for the units name. And there are a few other options that I
> > would like to append including a bias that the data may already be in, such
> > as kilo-units ("Metric[:seconds][:bias=kilo]") and an override base to use,
> > such as always displaying in milli-units
> > ("Metric[:seconds][:bias=kilo][affix:milli]").
> >
>
> Please forgive my dyslexia. It should be:
> Metric[:seconds][:bias=kilo][:affix=milli]
>
> Each of the [] portions are optional, and would actually appear in a form
> like this:
>
> Metric:seconds:bias=kilo:affix=milli
I don't see how that would fit into the existing number format code
syntax. It looks like something completely different.
Eike
--
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack
signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl toolkit/source vcl/source
include/vcl/opengl/OpenGLContext.hxx |5 -
include/vcl/openglwin.hxx|6 ++
toolkit/source/awt/vclxtoolkit.cxx | 11 ++-
vcl/source/opengl/OpenGLContext.cxx |9 +
4 files changed, 13 insertions(+), 18 deletions(-)
New commits:
commit 32d98b2551644dea50e58f99ae921a82a0f69753
Author: Tor Lillqvist
Date: Tue Jan 26 12:31:04 2016 +0200
Put getBufferSwapCounter() in OpenGLWindow instead
is a more light-weight include file and including
that causes less trouble on the various platforms.
Change-Id: I5c9baa171278d291468ef45a47d9fdbc64326957
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index 2b4af08..d5a9e31 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -186,9 +186,6 @@ public:
/// reset the GL context so this context is not implicit in subsequent GL
calls.
void resetCurrent();
void swapBuffers();
-
-static sal_Int64 getBufferSwapCounter();
-
void sync();
void show();
@@ -252,8 +249,6 @@ private:
ProgramCollection maPrograms;
OpenGLProgram* mpCurrentProgram;
-static sal_Int64 mnBufferSwapCounter;
-
public:
vcl::Region maClipRegion;
int mnPainting;
diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx
index 6b2e58d..9ae5d14 100644
--- a/include/vcl/openglwin.hxx
+++ b/include/vcl/openglwin.hxx
@@ -48,6 +48,12 @@ public:
virtual void MouseMove( const MouseEvent& rMEvt ) override;
virtual void Command( const CommandEvent& rCEvt ) override;
+/**
+ * Returns the number of times OpenGL buffers have been swapped.
+ * Not really any good reason why this is in this class, but...
+ */
+static sal_Int64 getBufferSwapCounter();
+
private:
std::unique_ptr mxImpl;
IRenderer* mpRenderer;
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 7fe5032..0053928 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -22,13 +22,6 @@
#include
#include
#endif
-#if defined UNX && !defined MACOSX
-#include
-#include "GL/glxew.h"
-#include
-#undef None // Avoid clash with the one in
-#undef Status // Sigh... used for instance as parameter name in
css::awt::XImageConsumer
-#endif
#include
#include
#include
@@ -105,6 +98,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -120,7 +114,6 @@
#include
#include
#include
-#include
#include "toolkit/awt/vclxspinbutton.hxx"
#include
#include
@@ -1929,7 +1922,7 @@ void SAL_CALL VCLXToolkit::processEventsToIdle()
sal_Int64 SAL_CALL VCLXToolkit::getOpenGLBufferSwapCounter()
throw (css::uno::RuntimeException, std::exception)
{
- return OpenGLContext::getBufferSwapCounter();
+ return OpenGLWindow::getBufferSwapCounter();
}
// css:awt:XToolkitRobot
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index a1296a9..d6458c8 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -11,6 +11,7 @@
#include
#include
+#include
#include
#include
@@ -50,7 +51,7 @@ static std::vector g_vShareList;
static std::vector g_vShareList;
#endif
-sal_Int64 OpenGLContext::mnBufferSwapCounter = 0;
+static sal_Int64 nBufferSwapCounter = 0;
GLWindow::~GLWindow()
{
@@ -1537,7 +1538,7 @@ void OpenGLContext::swapBuffers()
glXSwapBuffers(m_aGLWin.dpy, m_aGLWin.win);
#endif
-mnBufferSwapCounter++;
+nBufferSwapCounter++;
static bool bSleep = getenv("SAL_GL_SLEEP_ON_SWAP");
if (bSleep)
@@ -1548,9 +1549,9 @@ void OpenGLContext::swapBuffers()
}
}
-sal_Int64 OpenGLContext::getBufferSwapCounter()
+sal_Int64 OpenGLWindow::getBufferSwapCounter()
{
-return mnBufferSwapCounter;
+return nBufferSwapCounter;
}
void OpenGLContext::sync()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: floating point comparison plugin results
Hi Noel, On Thursday, 2016-01-21 14:47:47 +0200, Noel Grandin wrote: > This is the list of source locations where my new fpcomparison clang plugin > detects the use of == or != on floating > point values. Comparing ==0.0 or !=0.0 is fine, you can exclude those. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09e46424c510924bae09c6e0147095e2958fa009 Author: Christian Lohmaier Date: Tue Jan 26 00:12:22 2016 +0100 Updated core Project: help 184121fb7abffe19012e3a64187281f0332a4b20 lists cannot be nested directly - use hackaround using switch instead Change-Id: I9a39112dbaca103ddb6b2783b5a142b280fbba8b diff --git a/helpcontent2 b/helpcontent2 index 6eb5558..184121f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6eb5558b50b74b2ad51f05b8273c7e1bd72ba8f3 +Subproject commit 184121fb7abffe19012e3a64187281f0332a4b20 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/0512.xhp |2 ++ source/text/simpress/guide/gluepoints.xhp |2 ++ source/text/swriter/librelogo/LibreLogo.xhp |4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 184121fb7abffe19012e3a64187281f0332a4b20 Author: Christian Lohmaier Date: Tue Jan 26 00:12:22 2016 +0100 lists cannot be nested directly - use hackaround using switch instead Change-Id: I9a39112dbaca103ddb6b2783b5a142b280fbba8b diff --git a/source/text/scalc/01/0512.xhp b/source/text/scalc/01/0512.xhp index 7838769..51f8fbf 100644 --- a/source/text/scalc/01/0512.xhp +++ b/source/text/scalc/01/0512.xhp @@ -49,6 +49,7 @@ If you select Cell value is: + FIXME: Hack to get a nested list Select a condition in the drop down list for the format to be applied to the selected cells and enter the value. @@ -63,6 +64,7 @@ In the Range field, define the range of cells concerned by the conditional formatting. Click on the Shrink button to minimize the dialog box. Click again on the button to come back to the dialog box once the range is selected. + If you select Formula is as a reference, enter a cell reference. diff --git a/source/text/simpress/guide/gluepoints.xhp b/source/text/simpress/guide/gluepoints.xhp index ff57579..49975d3 100644 --- a/source/text/simpress/guide/gluepoints.xhp +++ b/source/text/simpress/guide/gluepoints.xhp @@ -37,6 +37,7 @@ Do one of the following to get existing glue points visible for all elements: +FIXME: Hack to get a nested list Click the Glue Point icon on the Drawing toolbar. @@ -45,6 +46,7 @@ Choose Edit - Glue Points. + Click the Insert Glue Point icon on the Gluepoints toolbar. diff --git a/source/text/swriter/librelogo/LibreLogo.xhp b/source/text/swriter/librelogo/LibreLogo.xhp index e131f00..a81766e 100644 --- a/source/text/swriter/librelogo/LibreLogo.xhp +++ b/source/text/swriter/librelogo/LibreLogo.xhp @@ -59,7 +59,7 @@ Program blocks and lists are different - +FIXME: Hack to get a nested list Program blocks need space or new line at parenthesization: REPEAT 10 [ FORWARD 10 LEFT 36 ] @@ -68,7 +68,7 @@ Lists need close parenthesization: POSITION [0, 0], and not POSITION [ 0, 0 ] - + 1-line function declarations are not supported (TO and END need new lines). ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 94228] replace BOOST_PP macros with C++11 variadic templates where possible
https://bugs.documentfoundation.org/show_bug.cgi?id=94228 Björn Michaelsen changed: 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 94228] replace BOOST_PP macros with C++11 variadic templates where possible
https://bugs.documentfoundation.org/show_bug.cgi?id=94228 --- Comment #6 from Björn Michaelsen --- (In reply to Daniel L Robertson from comment #4) > The last commit should have removed the last use of BOOST_PP in include. I > know of at least two other uses of BOOST_PP, but I'm not sure if they should > be removed. I'll continue to look for cases in which handwritten macros are > used, but I expect my activity on this will slow down significantly. Hi Daniel, thanks a lot for your work here. Closing this issue for now as per above, if only to not block people from seeing more interesting easyHacks. -- 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
Re: [Bug 93151] "Expand references when new columns/rows are inserted" broken for named ranges
Hi Oliver, On Monday, 2016-01-25 18:37:24 +0100, Oliver Brinzing wrote: > is there a chance to get this bug fixed in lo5.1? > https://bugs.documentfoundation.org/show_bug.cgi?id=93151 I'm at it. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 96407] Mac OS X version doesnt appear in About dialog
https://bugs.documentfoundation.org/show_bug.cgi?id=96407 Yousuf (Jay) Philips changed: What|Removed |Added Whiteboard| target:5.2.0 | target:5.2.0 ||backportRequest --- Comment #12 from Yousuf (Jay) Philips --- With steve confirming it works, it would be good to backport this into 5.1. -- 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 87933] Easier visibility of automatic page breaks
https://bugs.documentfoundation.org/show_bug.cgi?id=87933 --- Comment #15 from Heiko Tietze --- I agree with suggestion 1a), but we should make sure that it has no side effects on other cell status like selection or not. Furthermore the difference between manual and automatic page break should be clear. Excel does the trick with dashed and dotted lines, LibO uses blue vs. navy as well as bold or not. We should go with the line type only as indicator for where the break comes from, and the color (darker gray or blue, btw: why always blue, isn't Calc all about green?) to show the break on/off feature. -- 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 87933] Easier visibility of automatic page breaks
https://bugs.documentfoundation.org/show_bug.cgi?id=87933 --- Comment #16 from Yousuf (Jay) Philips --- Created attachment 122216 --> https://bugs.documentfoundation.org/attachment.cgi?id=122216&action=edit Automatic vs Manual page breaks So this is how it presently looks between manual (blue) and automatic (gray 7) page breaks. -- 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: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/tdf95376.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 +
writerfilter/source/dmapper/DomainMapper.cxx |8
3 files changed, 17 insertions(+)
New commits:
commit 3915bf2dc877d5f1140798e24933db0f21386a4a
Author: Miklos Vajna
Date: Tue Jan 26 13:21:28 2016 +0100
tdf#95376 DOCX import: fix incorrectly indented tab stops
Regression from commit f4badd9a485f32f787d78431ed673e2932973887
(tdf#92454 DOCX import: allow overriding para prop from num style in
para style, 2015-09-22), the problem was yet another priority
mishandling in the maze of various styles and indentation handling.
In the tdf#92454 bugdoc, both a numbering-from-paragraph-style and a
paragraph-style defined indentation, and Word preferred the numbering,
while Writer preferred the paragraph style, that's why the import-time
conversion was added.
However, it turns out there is a 3rd source that's still not direct
indentation formatting: a direct numbering. So the correct priority is:
direct-ind > ind-from-num > ind-from-parastyle > ind-from-num-from-parastyle
Which means in this case the indentation should not be set directly: the
two conflicting value (ind-from-num and ind-from-parastyle) will be
resolved correctly by Writer core.
Given that we always first get the para style info, and only then the
numbering, we just need to undo the conversion added for the other bug
if we see a direct numbering, then both the old bugdoc and this new one
will be handled properly.
Change-Id: I09cc84605d5df6159da985ad069d46b580a53358
diff --git a/sw/qa/extras/ooxmlimport/data/tdf95376.docx
b/sw/qa/extras/ooxmlimport/data/tdf95376.docx
new file mode 100644
index 000..9bd2d05
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf95376.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 5fd2bf8..14ddf51 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2859,6 +2859,15 @@ DECLARE_OOXMLIMPORT_TEST(testTdf92454, "tdf92454.docx")
CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DIRECT_VALUE,
xParagraph->getPropertyState("ParaFirstLineIndent"));
}
+DECLARE_OOXMLIMPORT_TEST(testTdf95376, "tdf95376.docx")
+{
+uno::Reference xParagraph(getParagraph(2),
uno::UNO_QUERY);
+// This was beans::PropertyState_DIRECT_VALUE: indentation-from-numbering
+// did not have priority over indentation-from-paragraph-style, due to a
+// filter workaround that's not correct here.
+CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DEFAULT_VALUE,
xParagraph->getPropertyState("ParaFirstLineIndent"));
+}
+
DECLARE_OOXMLIMPORT_TEST(testTdf92124, "tdf92124.docx")
{
// Get the second paragraph's numbering style's 1st level's suffix.
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index d54127b..4f2e981 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1213,6 +1213,14 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext )
rContext->Insert( PROP_NUMBERING_RULES, aRules );
// erase numbering from pStyle if already set
rContext->Erase(PROP_NUMBERING_STYLE_NAME);
+
+// Indentation can came from:
+// 1) Paragraph style's numbering's indentation: the
current non-style numId has priority over it.
+// 2) Numbering's indentation: Writer handles that
natively, so it should not be set on rContext.
+// 3) Paragraph style's indentation: ditto.
+// 4) Direct paragraph formatting: that will came later.
+// So no situation where keeping indentation at this point
would make sense -> erase.
+rContext->Erase(PROP_PARA_FIRST_LINE_INDENT);
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libxmlsec
external/libxmlsec/xmlsec1-nss-sha256.patch.1 | 96 +++---
1 file changed, 88 insertions(+), 8 deletions(-)
New commits:
commit 93fdb8dc67bf04c7a1e22c8dd15152212799c4f2
Author: Miklos Vajna
Date: Tue Jan 26 13:22:28 2016 +0100
tdf#76142 libxmlsec: extend SHA-256 support in the NSS backend
With this, the xmlSecTransformIdListFindByHref() call in
xmlSecTransformNodeRead() recognizes the
http://www.w3.org/2001/04/xmldsig-more#rsa-sha256 string as a valid
signature method as well. Previously SHA-256 was recognized as a digest
method only.
Change-Id: Ib20ab97dd5bc86dff761f0c58a87afdde112e1e8
diff --git a/external/libxmlsec/xmlsec1-nss-sha256.patch.1
b/external/libxmlsec/xmlsec1-nss-sha256.patch.1
index 4a4fcc0..af5b956 100644
--- a/external/libxmlsec/xmlsec1-nss-sha256.patch.1
+++ b/external/libxmlsec/xmlsec1-nss-sha256.patch.1
@@ -1,19 +1,36 @@
-From 8008aca4daa92316dcd44f2bb8d21b5439d8baf1 Mon Sep 17 00:00:00 2001
+From 0e343965d4c84480207a90d5a83dacfb826be386 Mon Sep 17 00:00:00 2001
From: Miklos Vajna
Date: Mon, 25 Jan 2016 11:24:01 +0100
Subject: [PATCH] NSS glue layer: add SHA-256 support
---
- include/xmlsec/nss/crypto.h | 16 +
- src/nss/crypto.c| 3 +++
+ include/xmlsec/nss/crypto.h | 25
+ src/nss/crypto.c| 4
src/nss/digests.c | 57 +
- 3 files changed, 76 insertions(+)
+ src/nss/signatures.c| 44 ++
+ 4 files changed, 130 insertions(+)
diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
-index 42ba6ca..8164f45 100644
+index 42ba6ca..707f8d9 100644
--- a/include/xmlsec/nss/crypto.h
+++ b/include/xmlsec/nss/crypto.h
-@@ -304,6 +304,22 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId
xmlSecNssTransformRsaOaepGetKlass(void);
+@@ -263,6 +263,15 @@ XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId
xmlSecNssKeyDataRsaGetKlass (void);
+ XMLSEC_CRYPTO_EXPORT xmlSecTransformId
xmlSecNssTransformRsaSha1GetKlass(void);
+
+ /**
++ * xmlSecNssTransformRsaSha256Id:
++ *
++ * The RSA-SHA256 signature transform klass.
++ */
++#define xmlSecNssTransformRsaSha256Id \
++ xmlSecNssTransformRsaSha256GetKlass()
++XMLSEC_CRYPTO_EXPORT xmlSecTransformId
xmlSecNssTransformRsaSha256GetKlass(void);
++
++/**
+ * xmlSecNssTransformRsaPkcs1Id:
+ *
+ * The RSA PKCS1 key transport transform klass.
+@@ -304,6 +313,22 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId
xmlSecNssTransformRsaOaepGetKlass(void);
XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecNssTransformSha1GetKlass (void);
#endif /* XMLSEC_NO_SHA1 */
@@ -37,10 +54,18 @@ index 42ba6ca..8164f45 100644
}
#endif /* __cplusplus */
diff --git a/src/nss/crypto.c b/src/nss/crypto.c
-index 0495165..80adc50 100644
+index 0495165..33f17cc 100644
--- a/src/nss/crypto.c
+++ b/src/nss/crypto.c
-@@ -132,6 +132,9 @@ xmlSecCryptoGetFunctions_nss(void) {
+@@ -120,6 +120,7 @@ xmlSecCryptoGetFunctions_nss(void) {
+
+ #ifndef XMLSEC_NO_RSA
+ gXmlSecNssFunctions->transformRsaSha1GetKlass =
xmlSecNssTransformRsaSha1GetKlass;
++gXmlSecNssFunctions->transformRsaSha256GetKlass =
xmlSecNssTransformRsaSha256GetKlass;
+ gXmlSecNssFunctions->transformRsaPkcs1GetKlass=
xmlSecNssTransformRsaPkcs1GetKlass;
+
+ /* RSA OAEP is not supported by NSS yet */
+@@ -132,6 +133,9 @@ xmlSecCryptoGetFunctions_nss(void) {
#ifndef XMLSEC_NO_SHA1
gXmlSecNssFunctions->transformSha1GetKlass=
xmlSecNssTransformSha1GetKlass;
#endif /* XMLSEC_NO_SHA1 */
@@ -131,6 +156,61 @@ index 5a1db91..0c4657c 100644
+#endif /* XMLSEC_NO_SHA256 */
+diff --git a/src/nss/signatures.c b/src/nss/signatures.c
+index 3c9639c..c9afa4e 100644
+--- a/src/nss/signatures.c
b/src/nss/signatures.c
+@@ -545,6 +545,50 @@ xmlSecNssTransformRsaSha1GetKlass(void) {
+ return(&xmlSecNssRsaSha1Klass);
+ }
+
++/
++ *
++ * RSA-SHA256 signature transform
++ *
++ ***/
++static xmlSecTransformKlass xmlSecNssRsaSha256Klass = {
++/* klass/object sizes */
++sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */
++xmlSecNssSignatureSize, /* xmlSecSize objSize */
++
++xmlSecNameRsaSha256, /* const xmlChar* name;
*/
++xmlSecHrefRsaSha256, /* const xmlChar* href;
*/
++xmlSecTransformUsageSignatureMethod, /* xmlSecTransformUsage usage;
*/
++
++xmlSecNssSignatureInitialize, /* xmlSecTransformInitializeMethod
initialize; */
++xmlSecNssSignatureFinalize, /*
xmlSecTransformFinalizeMethod finalize; */
++NULL, /*
xmlSecTransformNodeReadMethod readNode; */
++NULL, /*
xmlSecTransform
[Bug 96407] Mac OS X version doesnt appear in About dialog
https://bugs.documentfoundation.org/show_bug.cgi?id=96407 --- Comment #13 from Tor Lillqvist --- Backport to 5.1 submitted to gerrit. -- 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] dev-tools.git: helpauthoring/filter
helpauthoring/filter/xmlhelp.dtd | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) New commits: commit 33c72614de2a9d3add66a9fce81233f66fb55e6d Author: Christian Lohmaier Date: Tue Jan 26 13:54:35 2016 +0100 add superscript "sup" and subscript "sub" tags to xmlhelp.dtd were added to the one in helpcontent repository in e3ed3283b7867afa0084371e2050ed6a23a59d37 diff --git a/helpauthoring/filter/xmlhelp.dtd b/helpauthoring/filter/xmlhelp.dtd index 50ffe8e..3d915d8 100644 --- a/helpauthoring/filter/xmlhelp.dtd +++ b/helpauthoring/filter/xmlhelp.dtd @@ -20,7 +20,7 @@ Version 03-Feb-2006 added optional localize attribute to images --> - + - + - + @@ -73,7 +73,7 @@ Version 03-Feb-2006 - + + + + + @@ -113,7 +117,7 @@ Version 03-Feb-2006 type CDATA #REQUIRED > - + - + - + http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 87933] Easier visibility of automatic page breaks
https://bugs.documentfoundation.org/show_bug.cgi?id=87933 --- Comment #17 from Heiko Tietze --- Created attachment 122217 --> https://bugs.documentfoundation.org/attachment.cgi?id=122217&action=edit Manual vs. automatic page break in 'page break' view mode (In reply to Heiko Tietze from comment #15) > Furthermore the difference between manual and automatic page break should be > clear. Excel does the trick with dashed and dotted lines, LibO uses blue vs. > navy as well as bold or not. We should go with the line type only as > indicator for where the break comes from, and the color (darker gray or > blue, btw: why always blue, isn't Calc all about green?) to show the break > on/off feature. This consideration was about the 'page break' view mode. Attachment shows how it looks. -- 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 39849] exchange SfxItemset implementation
https://bugs.documentfoundation.org/show_bug.cgi?id=39849 Björn Michaelsen changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #7 from Björn Michaelsen --- Closing this one as WONTFIX -- too much happened in the meantime, this would need a reevaluation and reimplementation from scratch -- and that isnt an easyHack. -- 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 38887] Improvement of SmNodeToTextVisitor
https://bugs.documentfoundation.org/show_bug.cgi?id=38887 Björn Michaelsen changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #8 from Björn Michaelsen --- Is there still work to do here? If so, who is the mentor? -- 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 45904] move java based api tests to c++
https://bugs.documentfoundation.org/show_bug.cgi?id=45904 Björn Michaelsen changed: What|Removed |Added Keywords||skillUno -- 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
Re: Suggestion
On Tue, Jan 26, 2016 at 5:50 AM, Eike Rathke wrote:
> Hi Rick,
>
> On Monday, 2016-01-25 16:26:53 -0500, Rick C. Hodgin wrote:
>
> > On Mon, Jan 25, 2016 at 3:21 PM, Rick C. Hodgin >
> > > On Tue, Jan 12, 2016 at 8:00 AM, Eike Rathke wrote:
> > >> On Friday, 2016-01-08 19:52:49 -0500, Rick C. Hodgin wrote:
> > >>
> > >> > The category is called *"Metric."*
> > >> >
> > >> > When conveying fractional values, such that 1.2345E-08 (which is
> > >> > 0.000,000,012,345), it would do so in a metric-relative way using
> the
> > >> > standard milli (10^-3), micro (10^-6), nano (10^-9), pico (10^-12),
> and
> > >> so
> > >> > on...
> > >> >
> > >> > In the example, the *Metric* display would cause the value to show
> up
> > >> > as "*12,345
> > >> > pu*" (pico-units) if the thousands separator was used.
> > >>
> > >> Could you give some examples what you think how the format code
> actually
> > >> should look like?
> > >>
> > > Eike, I never heard back from you after my reply.
> > >
> > > The format would be "Metric" with "Metric:seconds" given for a specific
> > > override for the units name. And there are a few other options that I
> > > would like to append including a bias that the data may already be in,
> such
> > > as kilo-units ("Metric[:seconds][:bias=kilo]") and an override base to
> use,
> > > such as always displaying in milli-units
> > > ("Metric[:seconds][:bias=kilo][affix:milli]").
> > >
> >
> > Please forgive my dyslexia. It should be:
> > Metric[:seconds][:bias=kilo][:affix=milli]
> >
> > Each of the [] portions are optional, and would actually appear in a form
> > like this:
> >
> > Metric:seconds:bias=kilo:affix=milli
>
> I don't see how that would fit into the existing number format code
> syntax. It looks like something completely different.
>
When I look to the existing formats, they seem to be a string parsed from
left-to-right indicating what is conveyed in those places. So, I don't see
where this one would be "something completely different" or anything that's
unusable.
It would be applied using this type of logic (given in easily
human-readable form):
if (string.lowercase().beginsWith("metric")) {
// "Metric" parsing
} else {
// Use the existing code for other format parsing
}
I'm open to suggestions. What do you propose?
The reason I used colons was to keep the formatting options concatenated,
though it could use another character, or different words or symbols for
words, as in: Metric:seconds:B-K:A-M
And if they used the default "units" then it would simply be:
Metric:B-K:A-M
-
Number: General, "General"
Number: -1234, "0"
Number: -1234.12, "0.00"
Number: -1,234, "#,##0"
Number: -1,234.12, "#,##0.00"
Number: -1,234.12, "#,###.00"
Number: (1,234), "#,##0_);(#,##0)"
Number: (1,234.12), "#,##0.00_);(#,##0.00)"
Percent: -13%, "0%"
Percent: -12.95%, "0.00%"
Currency: -$1,234 (black), "[$$-409]#,##0;-[$$-409]#,##0"
Currency: -$1,234.00 (black), "[$$-409]#,##0.00;-[$$-409]#,##0.00"
Currency: -$1,234 (red), "[$$-409]#,##0;[RED]-[$$-409]#,##0"
Currency: -$1,234.00 (red), "[$$-409]#,##0.00;[RED]-[$$-409]#,##0.00"
Currency: -$1,234.-- (red), "[$$-409]#,##0.--;[RED]-[$$-409]#,##0.--"
Currency: -1,234.00 USD (black), "#,##0.00 [$USD];-#,##0.00 [$USD]"
Currency: -1,234.00 USD (red), "#,##0.00 [$USD];[RED]-#,##0.00 [$USD]"
Currency: -$1,234 (black), "[$$-409]* #,##0;-[$$-409]* #,##0"
Currency: -$1,234.00 (black), "[$$-409]* #,##0.00;-[$$-409]* #,##0.00"
Date: 12/31/99, "M/D/YY"
Date: Friday, December 31, 1999, " DD, "
Date: 12/31/99, "MM/DD/YY"
Date: 12/31/1999, "MM/DD/"
Date: Dec 31, 99, "MMM D, YY"
Date: Dec 31, 1999, "MMM D, "
Date: 31. Dec. 1999, "D. MMM. "
Date: December 31, 1999, " D, "
Date: 31. December 1999, "D. "
Date: Fri, Dec 31, 99, "NN, MMM D, YY"
Date: Fri 31/Dec 99, "NN DD/MMM YY"
Date: Fri, December 31, 1999, "NN, D, "
Date: Friday, December 31, 1999, " D, "
Date: 12-31, "MM-DD"
Date: 99-12-31, "YY-MM-DD"
Date: 1999-12-31, "-MM-DD"
Date: 12/99, "MM/YY"
Date: Dec 31, "MMM DD"
Date: December, ""
Date: 4th quarter 99, "QQ YY"
Date: 1, "WW"
Date: 12/31/99 01:37 PM, "MM/DD/YY HH:MM AM/PM"
Date: 12/31/1999 13:37:46, "MM/DD/ HH:MM:SS"
Date: Friday, 22 Tevet 5760, "[~jewish]D "
Date: Friday, Tevet 22 5760, "[~jewish] D "
Date: Fri Tevet 22 5760, "[~jewish]NN D "
Date: Fri 22 Tevet 5760, "[~jewish]NN D "
Date: 22 Tevet 5760, "[~jewish]D "
Date: Tevet 22 5760, "[~jewish] D "
Date: 22 Tevet, "[~jewish]D "
Date: Tevet 22, "[~jewish] D"
Date: Tevet 5760, "[~jewish] "
Date: Tevet, "[~jewish]"
Time: 13:37, "HH:MM"
Time: 13:37:46, "HH:MM:SS"
Time: 01:37 PM, "HH:MM AM/PM"
Time: 01:37:46 PM, "HH:MM:SS AM/PM"
Time: 876613:37:46, "[HH]:MM:SS"
Time: 37:46.00, "MM:SS.00"
Time: 876613:37:46.00, "[HH]:MM:SS.00"
Time: 12/31/99 01:37 PM, "MM/DD/YY HH:MM AM/PM"
Time: 12
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkframe.hxx | 30 +++
vcl/inc/unx/gtk/gtkinst.hxx | 81
vcl/unx/gtk/gtkobject.cxx |2
vcl/unx/gtk3/gtk3gtkframe.cxx | 277
vcl/unx/gtk3/gtk3gtkinst.cxx | 413 --
5 files changed, 668 insertions(+), 135 deletions(-)
New commits:
commit 0b354d18ccfc05e7c2582f851d9201e2aa353d7d
Author: Caolán McNamara
Date: Sat Jan 23 21:10:03 2016 +
Related: tdf#93054 gtk3: implement enough dnd to be dragged into...
from another application, e.g. text from gedit or a standalone
image (view image) from firefox
Change-Id: I68b82217eb2513cedc096f5ff653fb7c75b48052
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index fbf84e0..584a2ab 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -54,6 +54,8 @@ typedef ::Window GdkNativeWindow;
#define GDK_WINDOW_XWINDOW(o) GDK_WINDOW_XID(o)
#define gdk_set_sm_client_id(i) gdk_x11_set_sm_client_id(i)
#define gdk_window_foreign_new_for_display(a,b)
gdk_x11_window_foreign_new_for_display(a,b)
+class GtkDropTarget;
+class GtkDnDTransferable;
#endif
#if !(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 26)
@@ -206,6 +208,9 @@ class GtkSalFrame : public SalFrame
longm_nWidthRequest;
longm_nHeightRequest;
cairo_region_t* m_pRegion;
+GtkDropTarget* m_pDropTarget;
+boolm_bInDrag;
+GtkDnDTransferable* m_pFormatConversionRequest;
#else
GdkRegion* m_pRegion;
#endif
@@ -237,6 +242,13 @@ class GtkSalFrame : public SalFrame
static gboolean signalTooltipQuery(GtkWidget*, gint x, gint y,
gboolean keyboard_mode, GtkTooltip
*tooltip,
gpointer frame);
+static gboolean signalDragMotion(GtkWidget *widget, GdkDragContext
*context, gint x, gint y,
+ guint time, gpointer frame);
+static gboolean signalDragDrop(GtkWidget* widget, GdkDragContext
*context, gint x, gint y,
+ guint time, gpointer frame);
+static void signalDragDropReceived(GtkWidget *widget,
GdkDragContext *context, gint x, gint y,
+ GtkSelectionData *data, guint
ttype, guint time, gpointer frame);
+static void signalDragLeave(GtkWidget *widget, GdkDragContext
*context, guint time, gpointer frame);
#if GTK_CHECK_VERSION(3,14,0)
static void gestureSwipe(GtkGestureSwipe* gesture, gdouble
velocity_x, gdouble velocity_y, gpointer frame);
static void gestureLongPress(GtkGestureLongPress* gesture,
gpointer frame);
@@ -360,6 +372,24 @@ public:
cairo_t* getCairoContext() const;
void damaged(sal_Int32 nExtentsLeft, sal_Int32 nExtentsTop,
sal_Int32 nExtentsRight, sal_Int32 nExtentsBottom) const;
+
+void registerDropTarget(GtkDropTarget* pDropTarget)
+{
+assert(!m_pDropTarget);
+m_pDropTarget = pDropTarget;
+}
+
+void deregisterDropTarget(GtkDropTarget* pDropTarget)
+{
+assert(m_pDropTarget == pDropTarget); (void)pDropTarget;
+m_pDropTarget = nullptr;
+}
+
+void SetFormatConversionRequest(GtkDnDTransferable *pRequest)
+{
+m_pFormatConversionRequest = pRequest;
+}
+
#endif
virtual ~GtkSalFrame();
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index adcb142..a2f8f78 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -23,6 +23,11 @@
#include
#include
#include
+#include
+#include
+#include
+#include
+#include
#include
namespace vcl
@@ -44,6 +49,82 @@ public:
void ThreadsLeave();
};
+#if GTK_CHECK_VERSION(3,0,0)
+class GtkSalFrame;
+
+struct VclToGtkHelper
+{
+std::vector aInfoToFlavor;
+std::vector FormatsToGtk(const
css::uno::Sequence &rFormats);
+private:
+GtkTargetEntry makeGtkTargetEntry(const css::datatransfer::DataFlavor&
rFlavor);
+};
+
+class GtkTransferable : public
cppu::WeakImplHelper
+{
+protected:
+std::map m_aMimeTypeToAtom;
+
+std::vector
getTransferDataFlavorsAsVector(GdkAtom *targets, gint n_targets);
+public:
+
+virtual css::uno::Any SAL_CALL getTransferData(const
css::datatransfer::DataFlavor& rFlavor)
+throw(css::datatransfer::UnsupportedFlavorException,
+ css::io::IOException,
+ css::uno::RuntimeException, std::exception) override = 0;
+
+virtual std::vector
getTransferDataFlavorsAsVector() = 0;
+
+virtual css::uno::Sequence SAL_CALL
getTransferDataFlavors()
+throw(css::uno::RuntimeException, std::exception) override;
+virtual sal_Bool SAL_CALL isDataFlavorSupported(const
css::datatransfer::DataFlavor& rFlavor
[Bug 87933] Easier visibility of automatic page breaks
https://bugs.documentfoundation.org/show_bug.cgi?id=87933 --- Comment #18 from V Stuart Foote --- (In reply to Heiko Tietze from comment #17) > This consideration was about the 'page break' view mode. Attachment shows > how it looks. Granted, but lets not conflate issues between grids for the normal view, with rendering of the page break views. This issue was only about the normal view and distinguishing between the grid lines, automatic page break lines, and manual page break lines. Only the work to render the page break lines dashed remains to be done here. Work on the page break / print preview (the Navy line color is quite subtle) would be a completely new issue. -- 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 'refs/notes/commits' - 00/2caf7f2a2505938e7e3c37ded4a501c3c05976
00/2caf7f2a2505938e7e3c37ded4a501c3c05976 |1 + 1 file changed, 1 insertion(+) New commits: commit 39717f0267af1f5bfdee866a203078178e70ae7f Author: Caolán McNamara Date: Tue Jan 26 13:33:39 2016 + Notes added by 'git notes add' diff --git a/00/2caf7f2a2505938e7e3c37ded4a501c3c05976 b/00/2caf7f2a2505938e7e3c37ded4a501c3c05976 new file mode 100644 index 000..cab9fbd --- /dev/null +++ b/00/2caf7f2a2505938e7e3c37ded4a501c3c05976 @@ -0,0 +1 @@ +prefer: fff2d18a08a37c0fa6a370e56591117fc08664d2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
EasuHacks spring cleanup
Hi, So looking at the EasyHacks, I'd suggest the following actions: - make the queries on: https://wiki.documentfoundation.org/Development/Easy_Hacks/lists/by_Required_Skill https://wiki.documentfoundation.org/Development/Easy_Hacks/lists/by_Difficulty https://wiki.documentfoundation.org/Development/Easy_Hacks/lists/by_Topic exclude easyHacks in state NEEDINFO - update EasyHack docs to encourage mentees to set an issue to NEEDINFO, if it doesnt seem actionable to them - check open easyHacks with Bug IDs < 4: https://bugs.documentfoundation.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bug_status=NEEDINFO&bug_status=PLEASETEST&f1=bug_id&keywords=easyHack%2C%20&keywords_type=allwords&list_id=587248&o1=lessthan&product=LibreOffice&query_format=advanced&resolution=---&v1=4 those were mostly the EasyHack I copied over from the wiki, thus I am the reporter although for most of them, I dont want to mentor them. Checking them should include: - since this one is open since before 2011-09, why isnt this solved? If its neither easy nor interesting but actionable, remove the easyHack tag. - otherwise is there a mentor explicitly named? -> if not, set them to NEEDINFO - look at the 99 easyHacks with more than 10 comments: These have to be highly daunting to newcomers. Unless these are all commit notifications, either remove the easyHack tag, or: - open a new easyHack consolidating all the info from the back an forth in the comments - close the old easyHack with a link to the new one in "see also:" The goal of all of this is to focus newcomers on our best EasyHacks, instead of letting them wade though lots of rotten ones. Lets discuss in the ESC call (or on this list, if you cant join), if any of that is controversial. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: framework/inc framework/source
framework/inc/xml/acceleratorconfigurationreader.hxx | 10 ---
framework/inc/xml/acceleratorconfigurationwriter.hxx | 11 ---
framework/source/accelerators/acceleratorconfiguration.cxx | 14
+-
framework/source/accelerators/keymapping.cxx | 11 ++-
framework/source/inc/accelerators/acceleratorconfiguration.hxx |4 --
framework/source/inc/accelerators/keymapping.hxx |3 +-
framework/source/xml/acceleratorconfigurationreader.cxx|5 ++-
framework/source/xml/acceleratorconfigurationwriter.cxx|5 ++-
8 files changed, 26 insertions(+), 37 deletions(-)
New commits:
commit 7d9ac365039a23b704738b63a54bbbae6e9f6f3a
Author: Stephan Bergmann
Date: Tue Jan 26 15:09:30 2016 +0100
Replace salhelper::SingletonRef with rtl::Static
When destroying the static vcl::CommandInfoProvider aProvider from
vcl::CommandInfoProvider::Instance
(vcl/source/helper/commandinfoprovider.cxx)
during exit, it releases its mxCachedGlobalAcceleratorConfiguration
reference on
GlobalAcceleratorConfiguration
(framework/source/accelerators/globalacceleratorconfiguration.cxx), which
may
get destroyed, whose base class framework::XCUBasedAcceleratorConfiguration
(framework/source/inc/accelerators/acceleratorconfiguration.hxx) has a
salhelper::SingletonRef member, whose destructor
(include/salhelper/singletonref.hxx) uses
salhelper::SingletonRef::SingletonLockInit::operator
()'s
static osl::Mutex aInstance.
If, during construction, the instantiation of
salhelper::SingletonRef::SingletonLockInit::operator
()'s
static osl::Mutex aInstance finishes before the instantiation of
vcl::CommandInfoProvider::Instance's static vcl::CommandInfoProvider
aProvider,
the corresponding atexit cleanup actions will be recorded in the right
order,
causing the above chain of calls to find the static Mutex still alive when
used
from within the static CommandInfoProvider's destruction.
However, vcl::CommandInfoProvider's mxCachedGlobalAcceleratorConfiguration
is
only set to css::ui::GlobalAcceleratorConfiguration::create in
vcl::CommandInfoProvider::GetGlobalAcceleratorConfiguration, so the
instantiation of the static Mutex instance can finish after the
instantiation of
the static CommandInfoProvider instance, recording the atexit cleanup
actions in
the wrong order, causing the static Mutex to be used after destruction.
This occasionally caused PythonTest_sfx2_python to hang during exit for me
on
Linux, where trying to lock a destroyed pthread mutex can apparently
deadlock.
rtl::Static does away with the need to do anything in the destructor, at the
expense of always keeping the instance alive until exit (and not being able
to
recreate an already destroyed instance during exit, but code that would
require
that behavior would probably already be broken to begin with), so the order
of
creation of the CommandInfoProvider and GlobalAcceleratorConfiguration
instances
becomes less of a concern.
Change-Id: Id6e3860ad9e5b7045980a0b9bf9eaef2e24129bb
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx
b/framework/inc/xml/acceleratorconfigurationreader.hxx
index 6dc343d..90365e5 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -23,7 +23,6 @@
#include // HACK: needed for MSVC 2013 ENABLE_LTO
build: WeakImplHelper
#include
-#include
#include
#include
@@ -31,7 +30,6 @@
#include
-#include
#include
#include
@@ -85,14 +83,6 @@ class AcceleratorConfigurationReader : public
::cppu::WeakImplHelper< css::xml::
occurs recursive inside xml. */
bool m_bInsideAcceleratorItem;
-/** @short is used to map key codes to its
-string representation.
-
-@descr To perform this operation is
-created only one time and kept
-alive forever ...*/
-::salhelper::SingletonRef< KeyMapping > m_rKeyMapping;
-
/** @short provide information about the parsing state.
@descr We use it to find out the line and column, where
diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx
b/framework/inc/xml/acceleratorconfigurationwriter.hxx
index d46b2e9..e71c889 100644
--- a/framework/inc/xml/acceleratorconfigurationwriter.hxx
+++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx
@@ -21,12 +21,9 @@
#define INCLUDED_FRAMEWORK_INC_XML_ACCELERATORCONFIGURATIONWRITER_HXX
#include
-#include
#include
#include
-
-#include
#include
namespace framework{
@@ -45,14 +42,6 @@ class AcceleratorConfigurationWriter
writer must work on. */
const AcceleratorCache& m_rContainer;
-/** @short is used to map key
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx |2 +-
vcl/unx/gtk3/gtk3gtkinst.cxx |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c55c469ea5fc1608696f4fbfaa9aead09b734969
Author: Stephan Bergmann
Date: Tue Jan 26 15:16:58 2016 +0100
-Werror,-Winconsistent-missing-override
Change-Id: I254c7a4b6f822c71b3ad5150cf674d25defbf1ed
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index c94c5d7..e24efad 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3161,7 +3161,7 @@ public:
return aRet;
}
-virtual std::vector
getTransferDataFlavorsAsVector()
+virtual std::vector
getTransferDataFlavorsAsVector() override
{
std::vector targets;
for (GList* l = gdk_drag_context_list_targets(m_pContext); l; l =
l->next)
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 030f7c5..566444e 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -218,6 +218,7 @@ public:
}
std::vector getTransferDataFlavorsAsVector()
+override
{
std::vector aVector;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f94a77682bed8815ac2e400cadb9244b784cffda
Author: Stephan Bergmann
Date: Tue Jan 26 15:17:32 2016 +0100
loplugin:nullptr
Change-Id: Ic8e7a7c0f6f40521dfb20ebf4ef11f2776c0cde8
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index e24efad..b5677a1 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3119,7 +3119,7 @@ public:
* gtk_drag_get_data
*/
{
-m_pLoop = g_main_loop_new(NULL, true);
+m_pLoop = g_main_loop_new(nullptr, true);
m_pFrame->SetFormatConversionRequest(this);
gtk_drag_get_data(m_pWidget, m_pContext, it->second, m_nTime);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl toolkit/source vcl/source
include/vcl/opengl/OpenGLWrapper.hxx |6 ++
include/vcl/openglwin.hxx|6 --
toolkit/source/awt/vclxtoolkit.cxx |4 ++--
vcl/source/opengl/OpenGLContext.cxx |4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 4cd058f3f6568724c65ac88769f17fcc6078da23
Author: Tor Lillqvist
Date: Tue Jan 26 15:15:36 2016 +0200
OpenGLWrapper is the right place for getBufferSwapCounter()
Change-Id: I3f7db276ab00d5fa493f993736f1010e76fcbcc8
diff --git a/include/vcl/opengl/OpenGLWrapper.hxx
b/include/vcl/opengl/OpenGLWrapper.hxx
index e73aa08..3b7f6a7 100644
--- a/include/vcl/opengl/OpenGLWrapper.hxx
+++ b/include/vcl/opengl/OpenGLWrapper.hxx
@@ -23,6 +23,12 @@ struct VCL_DLLPUBLIC OpenGLWrapper
* Returns true if VCL has OpenGL rendering enabled
*/
static bool isVCLOpenGLEnabled();
+
+
+/**
+ * Returns the number of times OpenGL buffers have been swapped.
+ */
+static sal_Int64 getBufferSwapCounter();
};
#endif // INCLUDED_VCL_OPENGL_OPENGLWRAPPER_HXX
diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx
index 9ae5d14..6b2e58d 100644
--- a/include/vcl/openglwin.hxx
+++ b/include/vcl/openglwin.hxx
@@ -48,12 +48,6 @@ public:
virtual void MouseMove( const MouseEvent& rMEvt ) override;
virtual void Command( const CommandEvent& rCEvt ) override;
-/**
- * Returns the number of times OpenGL buffers have been swapped.
- * Not really any good reason why this is in this class, but...
- */
-static sal_Int64 getBufferSwapCounter();
-
private:
std::unique_ptr mxImpl;
IRenderer* mpRenderer;
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 0053928..a3fed7c 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -98,7 +98,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -114,6 +113,7 @@
#include
#include
#include
+#include
#include "toolkit/awt/vclxspinbutton.hxx"
#include
#include
@@ -1922,7 +1922,7 @@ void SAL_CALL VCLXToolkit::processEventsToIdle()
sal_Int64 SAL_CALL VCLXToolkit::getOpenGLBufferSwapCounter()
throw (css::uno::RuntimeException, std::exception)
{
- return OpenGLWindow::getBufferSwapCounter();
+ return OpenGLWrapper::getBufferSwapCounter();
}
// css:awt:XToolkitRobot
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index d6458c8..d40564a 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -11,7 +11,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -1549,7 +1549,7 @@ void OpenGLContext::swapBuffers()
}
}
-sal_Int64 OpenGLWindow::getBufferSwapCounter()
+sal_Int64 OpenGLWrapper::getBufferSwapCounter()
{
return nBufferSwapCounter;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/winproc.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 5d29ed1801a07d4649e095c25935b50f5ad32eb4
Author: Caolán McNamara
Date: Tue Jan 26 14:46:49 2016 +
Resolves: tdf#97331 use VclPtr instead of pointers to avoid crash
Change-Id: Ia653a67046cb2cfb7c96367a7483ddc0cb29819e
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 9e9a7fc..e484f7d 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1314,7 +1314,7 @@ static bool ImplCallWheelCommand( const
VclPtr& pWindow, const Poin
static bool acceptableWheelScrollTarget(const vcl::Window *pMouseWindow)
{
-return (pMouseWindow && pMouseWindow->IsInputEnabled() &&
!pMouseWindow->IsInModalMode());
+return (pMouseWindow && !pMouseWindow->isDisposed() &&
pMouseWindow->IsInputEnabled() && !pMouseWindow->IsInModalMode());
}
//If the last event at the same absolute screen position was handled by a
@@ -1480,26 +1480,26 @@ public:
bool HandleWheelEvent::HandleEvent(const SalWheelMouseEvent& rEvt)
{
static SalWheelMouseEvent aPreviousEvent;
-static vcl::Window *pPreviousWindow;
+static VclPtr xPreviousWindow;
if (!Setup())
return false;
-vcl::Window *pMouseWindow = FindTarget();
+VclPtr xMouseWindow = FindTarget();
// avoid the problem that scrolling via wheel to this point brings a widget
// under the mouse that also accepts wheel commands, so stick with the old
// widget if the time gap is very small
-if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt) &&
acceptableWheelScrollTarget(pPreviousWindow))
+if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt) &&
acceptableWheelScrollTarget(xPreviousWindow))
{
-pMouseWindow = pPreviousWindow;
+xMouseWindow = xPreviousWindow.get();
}
aPreviousEvent = rEvt;
-pPreviousWindow = Dispatch(pMouseWindow);
+xPreviousWindow = Dispatch(xMouseWindow);
-return pPreviousWindow != nullptr;
+return xPreviousWindow;
}
class HandleGestureEvent : public HandleGestureEventBase
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source
vcl/source/window/winproc.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 53e693ccfb19aa653ab2b5762c10ae87c9320954
Author: Caolán McNamara
Date: Tue Jan 26 14:46:49 2016 +
Resolves: tdf#97331 use VclPtr instead of pointers to avoid crash
Change-Id: Ia653a67046cb2cfb7c96367a7483ddc0cb29819e
(cherry picked from commit 5d29ed1801a07d4649e095c25935b50f5ad32eb4)
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index ef4cb76..66e89448 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1343,7 +1343,7 @@ static bool ImplCallWheelCommand( vcl::Window* pWindow,
const Point& rPos,
static bool acceptableWheelScrollTarget(const vcl::Window *pMouseWindow)
{
-return (pMouseWindow && pMouseWindow->IsInputEnabled() &&
!pMouseWindow->IsInModalMode());
+return (pMouseWindow && !pMouseWindow->isDisposed() &&
pMouseWindow->IsInputEnabled() && !pMouseWindow->IsInModalMode());
}
//If the last event at the same absolute screen position was handled by a
@@ -1509,26 +1509,26 @@ public:
bool HandleWheelEvent::HandleEvent(const SalWheelMouseEvent& rEvt)
{
static SalWheelMouseEvent aPreviousEvent;
-static vcl::Window *pPreviousWindow;
+static VclPtr xPreviousWindow;
if (!Setup())
return false;
-vcl::Window *pMouseWindow = FindTarget();
+VclPtr xMouseWindow = FindTarget();
// avoid the problem that scrolling via wheel to this point brings a widget
// under the mouse that also accepts wheel commands, so stick with the old
// widget if the time gap is very small
-if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt) &&
acceptableWheelScrollTarget(pPreviousWindow))
+if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt) &&
acceptableWheelScrollTarget(xPreviousWindow))
{
-pMouseWindow = pPreviousWindow;
+xMouseWindow = xPreviousWindow.get();
}
aPreviousEvent = rEvt;
-pPreviousWindow = Dispatch(pMouseWindow);
+xPreviousWindow = Dispatch(xMouseWindow);
-return pPreviousWindow != nullptr;
+return xPreviousWindow;
}
class HandleGestureEvent : public HandleGestureEventBase
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/cppunittester
sal/cppunittester/cppunittester.cxx | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 2a3a9dec50068321125e4a76de7042bf2d741bc7
Author: Markus Mohrhard
Date: Tue Jan 26 10:30:47 2016 +0100
support unnamed namespaces with CPPUNIT_TEST_NAME
Change-Id: I1ce50ce0ce8a4a461d1b2a34de132cbf57dd7d25
Reviewed-on: https://gerrit.libreoffice.org/21802
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/sal/cppunittester/cppunittester.cxx
b/sal/cppunittester/cppunittester.cxx
index 34911e2..fb9f85f 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -171,13 +171,29 @@ private:
namespace {
+struct test_name_compare
+{
+test_name_compare(const std::string& rName):
+maName(rName)
+{
+}
+
+bool operator()(const std::string& rCmp)
+{
+size_t nEndPos = maName.find(rCmp) + rCmp.size();
+return nEndPos == maName.size();
+}
+
+std::string maName;
+};
+
void addRecursiveTests(const std::vector& test_names,
CppUnit::Test* pTest, CppUnit::TestRunner& rRunner)
{
for (int i = 0; i < pTest->getChildTestCount(); ++i)
{
CppUnit::Test* pNewTest = pTest->getChildTestAt(i);
addRecursiveTests(test_names, pNewTest, rRunner);
-if (std::find(test_names.begin(), test_names.end(),
pNewTest->getName()) != test_names.end())
+if (std::find_if(test_names.begin(), test_names.end(),
test_name_compare(pNewTest->getName())) != test_names.end())
rRunner.addTest(pNewTest);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/token.cxx | 106 ++
1 file changed, 97 insertions(+), 9 deletions(-)
New commits:
commit 02e69f0c3acec2c2e81692bc53c4356591a84ba5
Author: Eike Rathke
Date: Tue Jan 26 16:10:06 2016 +0100
Resolves: tdf#93151 handle ExpandRefs and mnColDelta the same as mnRowDelta
Change-Id: I8cd00494fc63124443fc01582296ef17f4cd5e27
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index f6d37a0..abee22c 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3388,17 +3388,33 @@ bool adjustDoubleRefInName(
ScComplexRefData& rRef, const sc::RefUpdateContext& rCxt, const ScAddress&
rPos )
{
bool bRefChanged = false;
-if (rCxt.mnRowDelta > 0 && rCxt.mrDoc.IsExpandRefs() &&
!rRef.Ref1.IsRowRel() && !rRef.Ref2.IsRowRel())
+if (rCxt.mrDoc.IsExpandRefs())
{
-// Check and see if we should expand the range at the top.
-ScRange aSelectedRange = getSelectedRange(rCxt);
-ScRange aAbs = rRef.toAbs(rPos);
-if (aSelectedRange.Intersects(aAbs))
+if (rCxt.mnRowDelta > 0 && !rRef.Ref1.IsRowRel() &&
!rRef.Ref2.IsRowRel())
{
-// Selection intersects the referenced range. Only expand the
-// bottom position.
-rRef.IncEndRowSticky(rCxt.mnRowDelta, rPos);
-return true;
+// Check and see if we should expand the range at the top.
+ScRange aSelectedRange = getSelectedRange(rCxt);
+ScRange aAbs = rRef.toAbs(rPos);
+if (aSelectedRange.Intersects(aAbs))
+{
+// Selection intersects the referenced range. Only expand the
+// bottom position.
+rRef.IncEndRowSticky(rCxt.mnRowDelta, rPos);
+return true;
+}
+}
+if (rCxt.mnColDelta > 0 && !rRef.Ref1.IsColRel() &&
!rRef.Ref2.IsColRel())
+{
+// Check and see if we should expand the range at the left.
+ScRange aSelectedRange = getSelectedRange(rCxt);
+ScRange aAbs = rRef.toAbs(rPos);
+if (aSelectedRange.Intersects(aAbs))
+{
+// Selection intersects the referenced range. Only expand the
+// right position.
+rRef.IncEndColSticky(rCxt.mnColDelta, rPos);
+return true;
+}
}
}
@@ -3540,6 +3556,66 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
aRes.mbReferenceModified = true;
}
+else if (rCxt.mnColDelta < 0)
+{
+// column(s) deleted.
+
+if (rRef.IsEntireRow())
+// Rows of entire rows are not affected.
+break;
+
+if (rRef.Ref1.IsColRel() || rRef.Ref2.IsColRel())
+// Don't modify relative references in names.
+break;
+
+if (aAbs.aStart.Row() < rCxt.maRange.aStart.Row()
|| rCxt.maRange.aEnd.Row() < aAbs.aEnd.Row())
+// row range of the reference is not entirely
in the deleted row range.
+break;
+
+if (aAbs.aStart.Tab() > rCxt.maRange.aEnd.Tab() ||
aAbs.aEnd.Tab() < rCxt.maRange.aStart.Tab())
+// wrong tables
+break;
+
+ScRange aDeleted = rCxt.maRange;
+aDeleted.aStart.IncCol(rCxt.mnColDelta);
+
aDeleted.aEnd.SetCol(aDeleted.aStart.Col()-rCxt.mnColDelta-1);
+
+if (aAbs.aEnd.Col() < aDeleted.aStart.Col() ||
aDeleted.aEnd.Col() < aAbs.aStart.Col())
+// reference range doesn't intersect with the
deleted range.
+break;
+
+if (aDeleted.aStart.Col() <= aAbs.aStart.Col() &&
aAbs.aEnd.Col() <= aDeleted.aEnd.Col())
+{
+// This reference is entirely deleted.
+rRef.Ref1.SetColDeleted(true);
+rRef.Ref2.SetColDeleted(true);
+aRes.mbReferenceModified = true;
+break;
+}
+
+if (aAbs.aStart.Col() < aDeleted.aStart.Col())
+{
+if (!aAbs.IsEndColSticky())
+{
+if (aDeleted.aEnd.Col() < aAbs.aEnd.Col())
+// Deleted in the middle. Make the
reference shorter.
+
[Bug 38808] Removal of ATL dependency on Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=38808 Michael Stahl changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX -- 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: svx/source
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit ad99c633908f7c70d06812ebfb4e069f0158
Author: Caolán McNamara
Date: Tue Jan 26 15:33:40 2016 +
Resolves: tdf#97276 don't clip out line if the underlying page size is
unknown
Change-Id: I77d88d8020e9ac26bd6b7277e6d8afefed5e3ee7
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 9666db1..358d5de 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -91,15 +91,17 @@ namespace sdr
if(bIsLine)
{
const SdrPage* pPage = GetPathObj().GetPage();
-if (pPage)
+double fPageWidth = pPage ? pPage->GetWdt() : 0.0;
+double fPageHeight = pPage ? pPage->GetHgt() : 0.0;
+if (fPageWidth && fPageHeight)
{
//tdf#63955 if we have an extremely long line then clip it
//to a very generous range of -1 page width/height vs +1
//page width/height to avoid oom and massive churn
//generating a huge polygon chain to cover the length in
//applyLineDashing if this line is dashed
-double fPageWidth = pPage->GetWdt();
-double fPageHeight = pPage->GetHgt();
+//tdf#97276 don't clip if the underlying page dimension
+//is unknown
basegfx::B2DRange aClipRange(-fPageWidth, -fPageHeight,
fPageWidth*2, fPageHeight*2);
aUnitPolyPolygon =
basegfx::tools::clipPolyPolygonOnRange(aUnitPolyPolygon,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkinst.hxx |1 +
vcl/unx/gtk3/gtk3gtkinst.cxx |2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7345aaf69a9d88cde3deabb6818a00938d8ad392
Author: Caolán McNamara
Date: Tue Jan 26 15:43:40 2016 +
wrong CreateDropTarget
Change-Id: I7df8c17863f1e16f1658c061a324d6f1f0699833
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index a2f8f78..a649f62 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -175,6 +175,7 @@ public:
#if GTK_CHECK_VERSION(3,0,0)
virtual css::uno::Reference< css::uno::XInterface > CreateClipboard( const
css::uno::Sequence< css::uno::Any >& i_rArguments ) override;
+virtual css::uno::Reference< css::uno::XInterface > CreateDropTarget()
override;
#endif
virtual const cairo_font_options_t* GetCairoFontOptions() override;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 566444e..5ab81ac 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -805,7 +805,7 @@ void GtkDropTarget::setDefaultActions(sal_Int8
nDefaultActions) throw(std::excep
m_nDefaultActions = nDefaultActions;
}
-Reference< XInterface > SalInstance::CreateDropTarget()
+Reference< XInterface > GtkInstance::CreateDropTarget()
{
return Reference< XInterface >( static_cast(new
GtkDropTarget()) );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39631] add optimisation helpers
https://bugs.documentfoundation.org/show_bug.cgi?id=39631 Michael Stahl changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED Assignee|high...@gmail.com |sheikha...@gmail.com --- Comment #15 from Michael Stahl --- looks like Sheikha fixed this one, thanks! -- 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 'libreoffice-5-1' - svx/source
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 38b362c58abd0df654665956ffc751d40cfb67ab
Author: Caolán McNamara
Date: Tue Jan 26 15:33:40 2016 +
Resolves: tdf#97276 don't clip out line if the underlying page size is
unknown
Change-Id: I77d88d8020e9ac26bd6b7277e6d8afefed5e3ee7
(cherry picked from commit ad99c633908f7c70d06812ebfb4e069f0158)
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index b86a9f4..481ab67 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -91,15 +91,17 @@ namespace sdr
if(bIsLine)
{
const SdrPage* pPage = GetPathObj().GetPage();
-if (pPage)
+double fPageWidth = pPage ? pPage->GetWdt() : 0.0;
+double fPageHeight = pPage ? pPage->GetHgt() : 0.0;
+if (fPageWidth && fPageHeight)
{
//tdf#63955 if we have an extremely long line then clip it
//to a very generous range of -1 page width/height vs +1
//page width/height to avoid oom and massive churn
//generating a huge polygon chain to cover the length in
//applyLineDashing if this line is dashed
-double fPageWidth = pPage->GetWdt();
-double fPageHeight = pPage->GetHgt();
+//tdf#97276 don't clip if the underlying page dimension
+//is unknown
basegfx::B2DRange aClipRange(-fPageWidth, -fPageHeight,
fPageWidth*2, fPageHeight*2);
aUnitPolyPolygon =
basegfx::tools::clipPolyPolygonOnRange(aUnitPolyPolygon,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 33831] Media wiki export pictures as files
https://bugs.documentfoundation.org/show_bug.cgi?id=33831 Samuel Mehrbrodt changed: What|Removed |Added Keywords||skillJava CC||samuel.mehrbr...@cib.de -- 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 33831] Media wiki export pictures as files
https://bugs.documentfoundation.org/show_bug.cgi?id=33831 Michael Stahl changed: What|Removed |Added Keywords||difficultyEasy, skillScript Component|Writer |Extensions --- Comment #8 from Michael Stahl --- the Wiki Publisher is implemented in Java and XSLT, in swext/mediawiki -- 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: 14 commits - avmedia/source dtrans/source embedserv/source extensions/source fpicker/source include/drawinglayer sdext/source soltools/mkdepend vcl/source vcl/win winac
avmedia/source/framework/collada_headers.hxx |2 -
dtrans/source/win32/dtobj/FmtFilter.cxx |2 -
dtrans/source/win32/dtobj/XTDataObject.cxx|4 +-
embedserv/source/embed/esdll.cxx |8
-
embedserv/source/inc/embeddocaccess.hxx |1
embedserv/source/inc/stdafx.h |1
extensions/source/ole/ole2uno.hxx |2 -
extensions/source/ole/oledll.cxx |9
+-
extensions/source/ole/unoobjw.cxx |4 +-
extensions/source/ole/wincrap.hxx |1
extensions/source/ole/windata.hxx |1
fpicker/source/win32/filepicker/dibpreview.cxx|2 -
include/drawinglayer/primitive2d/baseprimitive2d.hxx |2 -
include/drawinglayer/primitive3d/baseprimitive3d.hxx |2 -
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |4 +-
soltools/mkdepend/include.c |2 +
vcl/source/font/fontselect.cxx|3 ++
vcl/win/gdi/salgdi.cxx|2 -
vcl/win/gdi/winlayout.cxx | 15
--
vcl/win/gdi/winlayout.hxx |3 --
winaccessibility/source/UAccCOM/MAccessible.cxx |4 ++
winaccessibility/source/UAccCOM/UAccCOM.cxx |8
-
winaccessibility/source/UAccCOM/stdafx.h |1
winaccessibility/source/service/AccComponentEventListener.cxx |6
++--
winaccessibility/source/service/AccContainerEventListener.cxx |4 +-
winaccessibility/source/service/AccListEventListener.cxx |2 -
winaccessibility/source/service/AccObject.cxx |4 +-
winaccessibility/source/service/AccParagraphEventListener.cxx |2 -
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |5
++-
29 files changed, 69 insertions(+), 37 deletions(-)
New commits:
commit 27feec6f91e464651ede25a955aac5bf75bcacf6
Author: Stephan Bergmann
Date: Tue Jan 26 17:05:19 2016 +0100
-Werror,-Wsign-compare (clang-cl)
Change-Id: Ib4ed6a89d8da6dd15c3931b0fb92a2ddf7576171
diff --git
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index b0193a5..f78eeaa 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
+#include
#include
#ifdef _MSC_VER
@@ -94,7 +97,7 @@ void traceTrustStatus(DWORD err)
{
if (err == 0)
SAL_INFO("xmlsecurity.xmlsec", " " << arErrStrings[0].name);
-for (int i = 1; i < SAL_N_ELEMENTS(arErrStrings); i++)
+for (std::size_t i = 1; i < SAL_N_ELEMENTS(arErrStrings); i++)
{
if (arErrStrings[i].error & err)
SAL_INFO("xmlsecurity.xmlsec", " " << arErrStrings[i].name);
commit 377fa55b49858d93c1644c6e003fc39c48867dbb
Author: Stephan Bergmann
Date: Tue Jan 26 17:05:02 2016 +0100
-Werror,-Wsign-compare (clang-cl)
Change-Id: I7a3f17e84bbf44a472838ab20b4490f1ef3654d6
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 74a6518..ce2a303 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -22,6 +22,8 @@
#include "MAccessible.h"
#include
+#include
+
#include "AccAction.h"
#include "AccRelation.h"
#include "AccComponent.h"
@@ -3063,7 +3065,7 @@ STDMETHODIMP CMAccessible:: get_states(AccessibleStates
__RPC_FAR *states )
*states = 0x0;
for( int i = 0; i < count; i++ )
{
-for( int j = 0; j < SAL_N_ELEMENTS(UNO_STATES); j++ )
+for( std::size_t j = 0; j < SAL_N_ELEMENTS(UNO_STATES); j++ )
{
if( pStates[i] == UNO_STATES[j] )
{
diff --git a/winaccessibility/source/service/AccObject.cxx
b/winaccessibility/source/service/AccObject.cxx
index 8b60ddf..47118d5 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -800,8 +800,8 @@ void AccObject::UpdateRole()
XAccessibleContext* pContext = m_xAccContextRef.get();
m_pIMAcc->Put_XAccRole( ROLE_SYSTEM_WINDOW );
-short iRoleIndex = pContext->getAccessibleRole();
-if ((0 <= iRoleIndex) && (iRole
[Bug 38814] Snappier rendering: paint at idle, not on timeout
https://bugs.documentfoundation.org/show_bug.cgi?id=38814 Michael Meeks changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from Michael Meeks --- Seems I inadvertently fixed this with the help of the Munich interns for 5.1. -- 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 30873] Field variables break with additional formats
https://bugs.documentfoundation.org/show_bug.cgi?id=30873 Michael Stahl changed: What|Removed |Added Keywords||difficultyEasy, skillCpp, ||topicDebug, topicUI -- 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 32364] Add a "filter" to Insert > Field > Other > Cross reference tab
https://bugs.documentfoundation.org/show_bug.cgi?id=32364 Michael Stahl changed: What|Removed |Added Keywords||skillCpp, topicUI -- 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 80196] standardize color palette using mathematically generated colors
https://bugs.documentfoundation.org/show_bug.cgi?id=80196 Björn Michaelsen changed: What|Removed |Added Keywords|difficultyBeginner, | |easyHack, topicUI | Status|NEW |UNCONFIRMED URL||http://www.evolutionarydesi ||gns.net/blog/2010/08/27/col ||or-palette-generators/ Component|LibreOffice |ux-advise Ever confirmed|1 |0 --- Comment #27 from Björn Michaelsen --- (In reply to Jan Holesovsky from comment #25) > This pre-dates the rework of the color picker, now it is much easier to add > external palettes. Right. Removing EasyHack status for now, as there is quite a bit of discussion, ambiguity and complexity in this (as witnessed by > 20 comments). Also moving this to UNCONFIRMED/ux-advise for now. And with that, just leaving: http://www.evolutionarydesigns.net/blog/2010/08/27/color-palette-generators/ here too, which links various online palette generators, that might either be used for inspiration or integration. -- 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 32500] [Metabug] GTK style doesn't draw some elements via GTK
https://bugs.documentfoundation.org/show_bug.cgi?id=32500 Michael Stahl changed: What|Removed |Added Keywords||difficultyEasy, skillCpp, ||skillLinux -- 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 32531] Incorrect cursor key movement between table cells of different directionality
https://bugs.documentfoundation.org/show_bug.cgi?id=32531 Michael Stahl changed: What|Removed |Added Keywords||difficultyEasy, topicDebug -- 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: 3 commits - desktop/source include/o3tl include/vcl vcl/headless vcl/inc vcl/opengl vcl/source
desktop/source/lib/init.cxx | 18 +
include/o3tl/make_shared.hxx | 33
include/vcl/virdev.hxx |8 +++
vcl/headless/svpvd.cxx |6 ++---
vcl/inc/headless/svpvd.hxx |2 -
vcl/inc/opengl/salbmp.hxx|4 +--
vcl/inc/salvd.hxx|5 ++--
vcl/opengl/salbmp.cxx| 44 ++-
vcl/opengl/scale.cxx |2 -
vcl/source/gdi/virdev.cxx| 11 --
10 files changed, 77 insertions(+), 56 deletions(-)
New commits:
commit bde86f8074842585e2964b3157e97672fb25e63d
Author: Michael Stahl
Date: Tue Jan 26 14:12:21 2016 +0100
vcl: replace boost::shared_array with std::shared_ptr
Add o3tl::make_shared_array() to create the shared_ptr with the right
deleter.
The main difference then is that shared_array has operator[], but this
code didn't even use it.
Change-Id: I500ffc2f92b99c2a3924c0cdcdaa101956b69add
diff --git a/include/o3tl/make_shared.hxx b/include/o3tl/make_shared.hxx
new file mode 100644
index 000..d42783c
--- /dev/null
+++ b/include/o3tl/make_shared.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_O3TL_MAKE_SHARED_HXX
+#define INCLUDED_O3TL_MAKE_SHARED_HXX
+
+#include
+#include
+
+namespace o3tl {
+
+/** Allocate an array stored in a shared_ptr, calling operator delete[].
+Note that this is only allowed for arithmetic types because shared_ptr
+implicitly converts to sub-types.
+ */
+template
+std::shared_ptr make_shared_array(size_t const size)
+{
+static_assert(std::is_arithmetic::value, "only arrays of arithmetic
types allowed");
+return std::shared_ptr(new T[size], std::default_delete());
+}
+
+} // namespace o3tl
+
+#endif // INCLUDED_O3TL_MAKE_SHARED_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index f5a618a..98e09b3 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -29,7 +29,7 @@
#include
#include
-#include
+#include
struct BitmapBuffer;
class BitmapPalette;
@@ -40,7 +40,7 @@ private:
OpenGLTexture maTexture;
boolmbDirtyTexture;
BitmapPalette maPalette;
-boost::shared_array maUserBuffer;
+std::shared_ptr mpUserBuffer;
sal_uInt16 mnBits;
sal_uInt16 mnBytesPerRow;
int mnWidth;
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index e8cbc31..703aedc 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -30,6 +30,8 @@
#include "vcleventlisteners.hxx"
#include "vcl/lazydelete.hxx"
+#include
+
#include "opengl/zone.hxx"
#include "opengl/program.hxx"
#include "opengl/salbmp.hxx"
@@ -202,12 +204,12 @@ bool OpenGLSalBitmap::Create( const SalBitmap& rSalBmp,
sal_uInt16 nNewBitCount
mbDirtyTexture = false;
// be careful here, we are share & reference-count the
-// maUserBuffer, BUT this Create() is called from
+// mpUserBuffer, BUT this Create() is called from
// Bitmap::ImplMakeUnique().
// Consequently, there might be cases when this needs to be made
// unique later (when we don't do that right away here), like when
// using the BitmapWriteAccess.
-maUserBuffer = rSourceBitmap.maUserBuffer;
+mpUserBuffer = rSourceBitmap.mpUserBuffer;
return true;
}
@@ -238,7 +240,7 @@ void OpenGLSalBitmap::Destroy()
VCL_GL_INFO("Destroy OpenGLSalBitmap texture:" << maTexture.Id());
maPendingOps.clear();
maTexture = OpenGLTexture();
-maUserBuffer.reset();
+mpUserBuffer.reset();
}
bool OpenGLSalBitmap::AllocateUserData()
@@ -256,7 +258,7 @@ bool OpenGLSalBitmap::AllocateUserData()
{
try
{
-maUserBuffer.reset( new
sal_uInt8[static_cast(mnBytesPerRow) * mnHeight] );
+mpUserBuffer =
o3tl::make_shared_array(static_cast(mnBytesPerRow) *
mnHeight);
alloc = true;
}
catch (const std::bad_alloc &) {}
@@ -264,18 +266,18 @@ bool OpenGLSalBitmap::AllocateUserData()
if (!alloc)
{
SAL_WARN("vcl.opengl", "bad alloc " << mnBytesPerRow << "x" <<
mnHeight);
-maUserBuffer.reset( static_cast(nullptr) );
+mpUserBuffer.reset();
mnBytesPerRow = 0;
}
#ifdef DBG_UTIL
else
{
for (size_t i = 0; i < size_t(mnBytesPerRow * mnHeight); i++)
-maUserBuffer.get()[i] = (
[Libreoffice-commits] core.git: framework/source
framework/source/accelerators/presethandler.cxx | 67 ++--
framework/source/inc/accelerators/presethandler.hxx | 35 --
2 files changed, 50 insertions(+), 52 deletions(-)
New commits:
commit ac95e905a12ee6ad49af3814a248d0ddb7700559
Author: Stephan Bergmann
Date: Tue Jan 26 18:16:37 2016 +0100
Replace salhelper::SingletonRef with rtl::Static
Change-Id: I2ff6462472292de7cdeb5c7ed748299e58399bdb
diff --git a/framework/source/accelerators/presethandler.cxx
b/framework/source/accelerators/presethandler.cxx
index 35a4173..f912147 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -46,10 +46,40 @@ static const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3;
namespace framework
{
+namespace {
+
+/** @short because a concurrent access to the same storage from different
implementations
+isn't supported, we have to share it with others.
+
+@descr This struct is allegedly shared and must be used within a
+synchronized section. But it isn't.
+ */
+struct TSharedStorages
+{
+public:
+
+StorageHolder m_lStoragesShare;
+StorageHolder m_lStoragesUser;
+
+TSharedStorages()
+: m_lStoragesShare()
+, m_lStoragesUser ()
+{};
+
+virtual ~TSharedStorages() {};
+};
+
+/** @short provides access to the:
+a) shared root storages
+b) shared "inbetween" storages
+of the share and user layer. */
+struct SharedStorages: public rtl::Static {};
+
+}
+
PresetHandler::PresetHandler(const css::uno::Reference<
css::uno::XComponentContext >& xContext)
: m_xContext(xContext)
, m_eConfigType(E_GLOBAL)
-, m_aSharedStorages()
, m_lDocumentStorages()
, m_aLanguageTag(LANGUAGE_USER_PRIV_NOTRANSLATE)
{
@@ -62,7 +92,6 @@ PresetHandler::PresetHandler(const PresetHandler& rCopy)
m_eConfigType = rCopy.m_eConfigType;
m_sResourceType = rCopy.m_sResourceType;
m_sModule = rCopy.m_sModule;
-m_aSharedStorages = rCopy.m_aSharedStorages;
m_xWorkingStorageShare = rCopy.m_xWorkingStorageShare;
m_xWorkingStorageNoLang = rCopy.m_xWorkingStorageNoLang;
m_xWorkingStorageUser = rCopy.m_xWorkingStorageUser;
@@ -90,8 +119,9 @@ PresetHandler::~PresetHandler()
Otherwise we will disconnect all other open configuration access
objects which base on these storages.
*/
-m_aSharedStorages->m_lStoragesShare.closePath(m_sRelPathShare);
-m_aSharedStorages->m_lStoragesUser.closePath (m_sRelPathUser );
+auto & sharedStorages = SharedStorages::get();
+sharedStorages.m_lStoragesShare.closePath(m_sRelPathShare);
+sharedStorages.m_lStoragesUser.closePath (m_sRelPathUser );
/* On the other side closePath() is not needed for our special handled
document storage. Because it's not shared with others ... so we can
@@ -155,7 +185,8 @@ void lcl_throwCorruptedUIConfigurationException(
css::uno::Reference< css::embed::XStorage >
PresetHandler::getOrCreateRootStorageShare()
{
-css::uno::Reference< css::embed::XStorage > xRoot =
m_aSharedStorages->m_lStoragesShare.getRootStorage();
+auto & sharedStorages = SharedStorages::get();
+css::uno::Reference< css::embed::XStorage > xRoot =
sharedStorages.m_lStoragesShare.getRootStorage();
if (xRoot.is())
return xRoot;
@@ -205,14 +236,15 @@ css::uno::Reference< css::embed::XStorage >
PresetHandler::getOrCreateRootStorag
ex, ID_CORRUPT_UICONFIG_SHARE);
}
-m_aSharedStorages->m_lStoragesShare.setRootStorage(xStorage);
+sharedStorages.m_lStoragesShare.setRootStorage(xStorage);
return xStorage;
}
css::uno::Reference< css::embed::XStorage >
PresetHandler::getOrCreateRootStorageUser()
{
-css::uno::Reference< css::embed::XStorage > xRoot =
m_aSharedStorages->m_lStoragesUser.getRootStorage();
+auto & sharedStorages = SharedStorages::get();
+css::uno::Reference< css::embed::XStorage > xRoot =
sharedStorages.m_lStoragesUser.getRootStorage();
if (xRoot.is())
return xRoot;
@@ -252,7 +284,7 @@ css::uno::Reference< css::embed::XStorage >
PresetHandler::getOrCreateRootStorag
ex, ID_CORRUPT_UICONFIG_USER);
}
-m_aSharedStorages->m_lStoragesUser.setRootStorage(xStorage);
+sharedStorages.m_lStoragesUser.setRootStorage(xStorage);
return xStorage;
}
@@ -277,7 +309,7 @@ css::uno::Reference< css::embed::XStorage >
PresetHandler::getParentStorageShare
xWorking = m_xWorkingStorageShare;
}
-return m_aSharedStorages->m_lStoragesShare.getParentStorage(xWorking);
+return SharedStorages::get().m_lStoragesShare.getParentStorage(xWorking);
}
css::uno::Reference< css::embed::XStorage >
PresetHandler::getParentStorageUser(const css::uno::Reference<
css::embed::XStorage >& /*xChild*/)
@@ -288,7 +320,7 @@ css::un
[Bug 32581] [EDITING] Add the possibility to retrieve the filename of a movie or sound inserted in a document
https://bugs.documentfoundation.org/show_bug.cgi?id=32581 Michael Stahl changed: What|Removed |Added Keywords||difficultyEasy, skillCpp, ||skillUI --- Comment #11 from Michael Stahl --- this easy-hack does not have code pointers... the embedded media objects are represented by: class SdrMediaObj (include/svx/svdomedia.hxx svx/source/svdraw/svdomedia.cxx) there is a avmedia::MediaItem which stores the URL. include/avmedia/mediaitem.hxx avmedia/source/framework/mediaitem.cxx the context menu of the media object is apparently defined at Media_POPUP in sd/source/ui/app/popup2_tmpl.src so i guess there a context menu "Edit Link" could be added. ... then ask somebody who knows how UI code works where the c++ code is for the menu :) -- 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: framework/source
framework/source/inc/accelerators/presethandler.hxx |4 1 file changed, 4 deletions(-) New commits: commit 235b9ec11ad78628bc220066b97dd7ff19f0b5ad Author: Stephan Bergmann Date: Tue Jan 26 18:17:26 2016 +0100 Remove nonsense comment Change-Id: Ib0570622ac2853c83d701c207ff3aa0a3781d689 diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 4f005d6..cf0e356 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -150,10 +150,6 @@ class PresetHandler /** @short does nothing real. -@descr Because this class should be useable in combination -with ::salhelper::SingletonRef template this ctor -can't have any special parameters! - @param xContext points to an uno service manager, which is used internally to create own needed uno resources. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/inc/accelerators/presethandler.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2e9a276e0f08291981ed678fb7433c503434d8b5 Author: Stephan Bergmann Date: Tue Jan 26 18:18:09 2016 +0100 No need for ~PresetHandler to be virtual Change-Id: Ia5a3a94ce03af23c44485aedc5ae1c088f1a2d85 diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index cf0e356..05fd107 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -160,7 +160,7 @@ class PresetHandler PresetHandler(const PresetHandler& rCopy); /** @short closes all open storages ... if user forgot that .-) */ -virtual ~PresetHandler(); +~PresetHandler(); /** @short free all currently cache(!) storages. */ void forgetCachedStorages(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 33467] Mac: Default printer should be taken from the OS when printing
https://bugs.documentfoundation.org/show_bug.cgi?id=33467 Michael Stahl changed: What|Removed |Added Keywords||difficultyEasy, skillCpp --- Comment #11 from Michael Stahl --- there really should be a code pointer for this easy hack -- 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 39632] Consolidate GetMsiProperty()
https://bugs.documentfoundation.org/show_bug.cgi?id=39632 Björn Michaelsen changed: What|Removed |Added Keywords|skillWindows| --- Comment #12 from Björn Michaelsen --- removing skillWindows keyword. There is no such thing at https://wiki.documentfoundation.org/Development/Easy_Hacks/lists/by_Required_Skill and having a "skill*" keyword makes the easyHack not even appear on that page even in "uncategorized". -- 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 94695] osl_createHostAddrByAddr uses non-threadsafe gethostbyaddr
https://bugs.documentfoundation.org/show_bug.cgi?id=94695 Björn Michaelsen changed: What|Removed |Added Keywords|skillLinux | --- Comment #2 from Björn Michaelsen --- removing skillLinux keyword. There is no such thing at https://wiki.documentfoundation.org/Development/Easy_Hacks/lists/by_Required_Skill and having a "skill*" keyword makes the easyHack not even appear on that page even in "uncategorized". -- 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 32500] [Metabug] GTK style doesn't draw some elements via GTK
https://bugs.documentfoundation.org/show_bug.cgi?id=32500 Björn Michaelsen changed: What|Removed |Added Keywords|skillLinux | --- Comment #25 from Björn Michaelsen --- removing skillLinux keyword. There is no such thing at https://wiki.documentfoundation.org/Development/Easy_Hacks/lists/by_Required_Skill and having a "skill*" keyword makes the easyHack not even appear on that page even in "uncategorized". -- 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 34965] Make Impress slides editable during presentation
https://bugs.documentfoundation.org/show_bug.cgi?id=34965 Michael Stahl changed: What|Removed |Added Keywords||topicUI -- 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 88157] HIG: Bold headings in dialogs are frequently misused
https://bugs.documentfoundation.org/show_bug.cgi?id=88157 Björn Michaelsen changed: What|Removed |Added Keywords|skillHIG| --- Comment #5 from Björn Michaelsen --- removing skillHIG keyword. There is no such thing at https://wiki.documentfoundation.org/Development/Easy_Hacks/lists/by_Required_Skill and having a "skill*" keyword makes the easyHack not even appear on that page even in "uncategorized". -- 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 91197] Integrate gbuild-to-ide and xcodeproj gem for Xcode project generation
https://bugs.documentfoundation.org/show_bug.cgi?id=91197 Björn Michaelsen changed: What|Removed |Added Keywords|skillRuby | --- Comment #4 from Björn Michaelsen --- removing skillRuby keyword. There is no such thing at https://wiki.documentfoundation.org/Development/Easy_Hacks/lists/by_Required_Skill and having a "skill*" keyword makes the easyHack not even appear on that page even in "uncategorized". -- 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 38812] PackageKit / Help integration
https://bugs.documentfoundation.org/show_bug.cgi?id=38812 Michael Stahl changed: What|Removed |Added Keywords||skillLinux -- 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 36466] Copying Visible Cells Only
https://bugs.documentfoundation.org/show_bug.cgi?id=36466 Eike Rathke changed: What|Removed |Added Keywords|easyHack| --- Comment #12 from Eike Rathke --- This is not an EasyHack, removing keyword. -- 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 38837] Reduce power consumption: timers must end eventually
https://bugs.documentfoundation.org/show_bug.cgi?id=38837 Michael Stahl changed: What|Removed |Added Keywords||topicDebug -- 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 38812] PackageKit / Help integration
https://bugs.documentfoundation.org/show_bug.cgi?id=38812 Michael Stahl changed: What|Removed |Added Keywords|skillLinux | --- Comment #6 from Michael Stahl --- oops, the skillLinux keyword isn't real, remove it 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 38844] Reduce XOR rendering
https://bugs.documentfoundation.org/show_bug.cgi?id=38844 Michael Stahl changed: What|Removed |Added Keywords||topicCleanup -- 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 38889] Make macro editing easier
https://bugs.documentfoundation.org/show_bug.cgi?id=38889 Michael Stahl changed: What|Removed |Added Keywords|skillVcl|topicUI Component|LibreOffice |BASIC --- Comment #18 from Michael Stahl --- skillVcl doesn't exist -- 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 38890] Remove hard-coded project URLs
https://bugs.documentfoundation.org/show_bug.cgi?id=38890 Michael Stahl changed: What|Removed |Added Keywords||topicCleanup -- 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 39593] copy/paste code detector / fixing
https://bugs.documentfoundation.org/show_bug.cgi?id=39593 Michael Stahl changed: What|Removed |Added Keywords||topicCleanup -- 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 38885] Remove CreateTextFromNode methods
https://bugs.documentfoundation.org/show_bug.cgi?id=38885 Michael Stahl changed: What|Removed |Added Keywords||topicCleanup -- 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 38804] Implement Simple export of (some) VBA streams
https://bugs.documentfoundation.org/show_bug.cgi?id=38804 Björn Michaelsen changed: What|Removed |Added Keywords||topicDebug --- Comment #5 from Björn Michaelsen --- topicDebug is a Topic. -- 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 45904] move java based api tests to c++
https://bugs.documentfoundation.org/show_bug.cgi?id=45904 Björn Michaelsen changed: What|Removed |Added Keywords||topicDebug --- Comment #25 from Björn Michaelsen --- topicDebug is a Topic. -- 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 46892] Provide stacktraces for crashes
https://bugs.documentfoundation.org/show_bug.cgi?id=46892 Björn Michaelsen changed: What|Removed |Added Keywords|skillDebug | --- Comment #9 from Björn Michaelsen --- Remove skillDebug, superceded by topicDebug. -- 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 38841] Fuzz XML file filters
https://bugs.documentfoundation.org/show_bug.cgi?id=38841 Björn Michaelsen changed: What|Removed |Added Keywords|skillDebug | --- Comment #8 from Björn Michaelsen --- Remove skillDebug, superceded by topicDebug. -- 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 45904] move java based api tests to c++
https://bugs.documentfoundation.org/show_bug.cgi?id=45904 Björn Michaelsen changed: What|Removed |Added Keywords|skillDebug | --- Comment #26 from Björn Michaelsen --- Remove skillDebug, superceded by topicDebug. -- 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 38804] Implement Simple export of (some) VBA streams
https://bugs.documentfoundation.org/show_bug.cgi?id=38804 Björn Michaelsen changed: What|Removed |Added Keywords|skillDebug | --- Comment #6 from Björn Michaelsen --- Remove skillDebug, superceded by topicDebug. -- 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 39674] find / fix all German spellings in internal APIs
https://bugs.documentfoundation.org/show_bug.cgi?id=39674 Michael Stahl changed: What|Removed |Added Keywords||topicCleanup -- 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] help.git: source/text
source/text/swriter/main0103.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bfc1c602d8fd1fc1df98ce8a5d061635f0b8b9ea Author: Stanislav Horacek Date: Mon Jan 25 19:33:41 2016 +0100 use "comments" term instead of confusing synonyms Change-Id: I63da920a2b221d79440268c757367fa397fd993b Reviewed-on: https://gerrit.libreoffice.org/21798 Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/source/text/swriter/main0103.xhp b/source/text/swriter/main0103.xhp index b9f06e0..1fc5237 100644 --- a/source/text/swriter/main0103.xhp +++ b/source/text/swriter/main0103.xhp @@ -60,7 +60,7 @@ Show or hide graphical objects like images and charts within a document. Comments -Show or hide a document's annotations and replies to the written remarks. +Show or hide a document's comments and replies to them. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 95e2ba744a0ec7b5877ded01eb66bec62e7388ac Author: Stanislav Horacek Date: Mon Jan 25 19:33:41 2016 +0100 Updated core Project: help bfc1c602d8fd1fc1df98ce8a5d061635f0b8b9ea use "comments" term instead of confusing synonyms Change-Id: I63da920a2b221d79440268c757367fa397fd993b Reviewed-on: https://gerrit.libreoffice.org/21798 Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/helpcontent2 b/helpcontent2 index 184121f..bfc1c60 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 184121fb7abffe19012e3a64187281f0332a4b20 +Subproject commit bfc1c602d8fd1fc1df98ce8a5d061635f0b8b9ea ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 38804] Implement Simple export of (some) VBA streams
https://bugs.documentfoundation.org/show_bug.cgi?id=38804 --- Comment #8 from Markus Mohrhard (retired) --- Actually 5.1 has it already in calc. -- 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 38804] Implement Simple export of (some) VBA streams
https://bugs.documentfoundation.org/show_bug.cgi?id=38804 Markus Mohrhard (retired) changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #7 from Markus Mohrhard (retired) --- Fixed by Rosemary in 5.2 and following. -- 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 'libreoffice-5-0' - xmloff/source
xmloff/source/core/xmlexp.cxx | 29 ++---
1 file changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 32a25a623347c038ec75c3c594d615419c4da7fc
Author: Michael Stahl
Date: Tue Jan 12 23:01:34 2016 +0100
xmloff: there is no reason why office:version should be omitted
... if a document contains foreign elements or attributes.
In fact since ODF 1.2 the office:version attribute is mandatory and any
document that omits it is therefore invalid, while "extended conforming"
documents are allowed to contain foreign elements and attributes.
This mysterious check was there since CVS initial import, but without
any justification.
(cherry picked from commit d277ac87455a599fbf4acd3c6401f09bc74d3dac)
Change-Id: Ifeafad2b7af41f06356461adb7ae65dbf7bae11d
Reviewed-on: https://gerrit.libreoffice.org/21475
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 72cc29f..7002fbe 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1422,24 +1422,23 @@ sal_uInt32 SvXMLExport::exportDoc( enum
::xmloff::token::XMLTokenEnum eClass )
}
// office:version = ...
-if( !mbExtended )
+const sal_Char* pVersion = nullptr;
+switch (getDefaultVersion())
{
-const sal_Char* pVersion = 0;
-switch( getDefaultVersion() )
-{
-case SvtSaveOptions::ODFVER_LATEST: pVersion = sXML_1_2; break;
-case SvtSaveOptions::ODFVER_012_EXT_COMPAT: pVersion = sXML_1_2; break;
-case SvtSaveOptions::ODFVER_012: pVersion = sXML_1_2; break;
-case SvtSaveOptions::ODFVER_011: pVersion = sXML_1_1; break;
-case SvtSaveOptions::ODFVER_010: break;
+case SvtSaveOptions::ODFVER_LATEST: pVersion = sXML_1_2; break;
+case SvtSaveOptions::ODFVER_012_EXT_COMPAT: pVersion = sXML_1_2; break;
+case SvtSaveOptions::ODFVER_012: pVersion = sXML_1_2; break;
+case SvtSaveOptions::ODFVER_011: pVersion = sXML_1_1; break;
+case SvtSaveOptions::ODFVER_010: break;
-default:
-SAL_WARN("xmloff.core", "xmloff::SvXMLExport::exportDoc(),
unexpected odf default version!");
-}
+default:
+SAL_WARN("xmloff.core", "xmloff::SvXMLExport::exportDoc(), unexpected
odf default version!");
+}
-if( pVersion )
-AddAttribute( XML_NAMESPACE_OFFICE, XML_VERSION,
- OUString::createFromAscii(pVersion) );
+if (pVersion)
+{
+AddAttribute( XML_NAMESPACE_OFFICE, XML_VERSION,
+ OUString::createFromAscii(pVersion) );
}
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 38804] Implement Simple export of (some) VBA streams
https://bugs.documentfoundation.org/show_bug.cgi?id=38804 --- Comment #9 from Cor Nouws --- (In reply to Markus Mohrhard (retired) from comment #8) > Actually 5.1 has it already in calc. see http://cgit.freedesktop.org/libreoffice/core/commit/?id=c5aeca430288057a721688975173ed764860d8b8 (and others) and https://wiki.documentfoundation.org/ReleaseNotes/5.1#Improvements_in_OpenXML_filter -- 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 'libreoffice-5-0' - oox/source
oox/source/drawingml/shape.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 436b1615b271bae46a43530c2dab3a80b4e46419 Author: Michael Stahl Date: Fri Jan 15 12:08:06 2016 +0100 oox: coverity#1348468 copy-paste error Change-Id: Ibea6944c4e61e9848aac936e399ed08192ec5812 (cherry picked from commit 99ab23d26010120e7e6344cb2b26e192890ec5c3) Reviewed-on: https://gerrit.libreoffice.org/21489 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 4a9223f..c749846 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -518,7 +518,7 @@ Reference< XShape > Shape::createAndInsert( const basegfx::B2DPoint& rPreviousPoint = aPoly.getB2DPoint(i - 1); if (aPoint.getX() - rPreviousPoint.getX() == 0) aPoint.setX(aPoint.getX() + 1); -if (aPoint.getY() - rPreviousPoint.getX() == 0) +if (aPoint.getY() - rPreviousPoint.getY() == 0) aPoint.setY(aPoint.getY() + 1); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: clang/README clang/rename.cxx
clang/README |4 ++--
clang/rename.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d9ebfc2c8a745de181df0682b3f653a9356fcb43
Author: Miklos Vajna
Date: Tue Jan 26 21:21:23 2016 +0100
clang: avoid confusing "prefix" in filename suffix
diff --git a/clang/README b/clang/README
index 7676418..052a14e 100644
--- a/clang/README
+++ b/clang/README
@@ -71,10 +71,10 @@ Then run:
make -sr -j8 COMPILER_EXTERNAL_TOOL=1 FORCE_COMPILE_ALL=1
CCACHE_PREFIX=rename-wrapper RENAME_ARGS="-csv=$HOME/rename.csv"
-Once the rewriting is done, you can overwrite the original files with the
.new-prefix ones with:
+Once the rewriting is done, you can overwrite the original files with the
.new-rename ones with:
-for i in $(find . -name "*.new-prefix"); do mv -f $i ${i%%.new-prefix}; done
+for i in $(find . -name "*.new-rename"); do mv -f $i ${i%%.new-rename}; done
// vim: ft=asciidoc
diff --git a/clang/rename.cxx b/clang/rename.cxx
index 8ce4c66..fa8f40d 100644
--- a/clang/rename.cxx
+++ b/clang/rename.cxx
@@ -347,7 +347,7 @@ class RenameASTConsumer : public clang::ASTConsumer
{
std::stringstream ss;
ss << rEntry.getName();
-ss << ".new-prefix";
+ss << ".new-rename";
return ss.str();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source
vcl/source/window/winproc.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 72c2f90a42dad97cf9bc1a20c15f9946348fe01b
Author: Caolán McNamara
Date: Tue Jan 26 14:46:49 2016 +
Resolves: tdf#97331 use VclPtr instead of pointers to avoid crash
(cherry picked from commit 5d29ed1801a07d4649e095c25935b50f5ad32eb4)
(cherry picked from commit 53e693ccfb19aa653ab2b5762c10ae87c9320954)
Change-Id: Ia653a67046cb2cfb7c96367a7483ddc0cb29819e
Reviewed-on: https://gerrit.libreoffice.org/21810
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 304753a..e708e18 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1354,7 +1354,7 @@ static bool ImplCallWheelCommand( vcl::Window* pWindow,
const Point& rPos,
static bool acceptableWheelScrollTarget(const vcl::Window *pMouseWindow)
{
-return (pMouseWindow && pMouseWindow->IsInputEnabled() &&
!pMouseWindow->IsInModalMode());
+return (pMouseWindow && !pMouseWindow->isDisposed() &&
pMouseWindow->IsInputEnabled() && !pMouseWindow->IsInModalMode());
}
//If the last event at the same absolute screen position was handled by a
@@ -1520,26 +1520,26 @@ public:
bool HandleWheelEvent::HandleEvent(const SalWheelMouseEvent& rEvt)
{
static SalWheelMouseEvent aPreviousEvent;
-static vcl::Window *pPreviousWindow;
+static VclPtr xPreviousWindow;
if (!Setup())
return false;
-vcl::Window *pMouseWindow = FindTarget();
+VclPtr xMouseWindow = FindTarget();
// avoid the problem that scrolling via wheel to this point brings a widget
// under the mouse that also accepts wheel commands, so stick with the old
// widget if the time gap is very small
-if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt) &&
acceptableWheelScrollTarget(pPreviousWindow))
+if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt) &&
acceptableWheelScrollTarget(xPreviousWindow))
{
-pMouseWindow = pPreviousWindow;
+xMouseWindow = xPreviousWindow.get();
}
aPreviousEvent = rEvt;
-pPreviousWindow = Dispatch(pMouseWindow);
+xPreviousWindow = Dispatch(xMouseWindow);
-return pPreviousWindow != NULL;
+return xPreviousWindow;
}
class HandleGestureEvent : public HandleGestureEventBase
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source
sc/source/ui/view/tabview3.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit c68b65ec5581bafc97155b9ac67f6b542044a171
Author: Takeshi Abe
Date: Wed Jan 20 22:13:12 2016 +0900
tdf#97247 Keep focus on merged cell at top-left corner
... when typing either UP or LEFT key.
Change-Id: I7bc0e7eb0cba322bcc26c35d0474ea558d3bdd6e
Reviewed-on: https://gerrit.libreoffice.org/21599
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
(cherry picked from commit c13226bcc5b298dacfe32340711bdfd4d15d8b3b)
Reviewed-on: https://gerrit.libreoffice.org/21652
Tested-by: Jenkins
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 8e6d143..7e18b88 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1067,6 +1067,17 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW
nMovY, ScFollowMode eMode,
nCurY = (nMovY != 0) ? nOldY+nMovY : (SCsROW) aViewData.GetOldCurY();
}
+if (nMovX < 0 && nOldX == 0)
+{ // trying to go left from 1st column
+if (nMovY == 0) // done, because no vertical move is requested
+return;
+}
+if (nMovY < 0 && nOldY == 0)
+{ // trying to go up from 1st row
+if (nMovX == 0) // done, because no horizontal move is requested
+return;
+}
+
aViewData.ResetOldCursor();
if (nMovX != 0 && ValidColRow(nCurX,nCurY))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - include/vcl vcl/inc vcl/osx vcl/source vcl/unx vcl/win
include/vcl/print.hxx |2 -
vcl/inc/osx/salprn.h|4 +-
vcl/inc/salprn.hxx |8 +++-
vcl/inc/salptype.hxx| 33 +---
vcl/inc/unx/genprn.h| 14
vcl/inc/unx/gtk/gtkprn.hxx |2 -
vcl/inc/win/salprn.h|4 +-
vcl/osx/salprn.cxx | 12 +++
vcl/source/gdi/print.cxx| 12 +++
vcl/source/gdi/print3.cxx | 11 ++
vcl/unx/generic/print/genprnpsp.cxx | 30 +-
vcl/unx/gtk/salprn-gtk.cxx |2 -
vcl/win/gdi/salprn.cxx | 58 +---
13 files changed, 99 insertions(+), 93 deletions(-)
New commits:
commit bddca7fbcc64814860f331b464b61727f5569709
Author: Matteo Casalin
Date: Sun Jan 10 16:09:41 2016 +0100
sal_uLong to DWORD/sal_Size in vcl/win/gdi/salprn.cxx
Change-Id: I11c5547966a3b97562ecbbc91f32724fc190e5a7
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index ef624c2..dbe8533 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -370,7 +370,6 @@ static bool ImplUpdateSalJobSetup( WinSalInfoPrinter*
pPrinter, ImplJobSetup* pS
LONGnRet;
HWNDhWnd = 0;
DWORD nMode = DM_OUT_BUFFER;
-sal_uLong nDriverDataLen = 0;
SalDriverData* pOutBuffer = NULL;
BYTE* pInBuffer = NULL;
@@ -384,7 +383,7 @@ static bool ImplUpdateSalJobSetup( WinSalInfoPrinter*
pPrinter, ImplJobSetup* pS
}
// make Outputbuffer
-nDriverDataLen = sizeof(SalDriverData) + nSysJobSize-1;
+const sal_Size nDriverDataLen = sizeof(SalDriverData) + nSysJobSize-1;
pOutBuffer = (SalDriverData*)rtl_allocateZeroMemory(
nDriverDataLen );
pOutBuffer->mnSysSignature = SAL_DRIVERDATA_SYSSIGN;
// calculate driver data offset including structure padding
@@ -476,7 +475,7 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter*
pPrinter, ImplJobSetup* pS
// PaperBin
if ( nFlags & JobSetFlags::PAPERBIN )
{
-sal_uLong nCount = ImplDeviceCaps( pPrinter, DC_BINS, NULL, pSetupData
);
+const DWORD nCount = ImplDeviceCaps( pPrinter, DC_BINS, NULL,
pSetupData );
if ( nCount && (nCount != GDI_ERROR) )
{
@@ -485,7 +484,7 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter*
pPrinter, ImplJobSetup* pS
pSetupData->mnPaperBin = 0;
// search the right bin and assign index to mnPaperBin
-for( sal_uLong i = 0; i < nCount; i++ )
+for( DWORD i = 0; i < nCount; ++i )
{
if( CHOOSE_DEVMODE(dmDefaultSource) == pBins[ i ] )
{
@@ -508,9 +507,9 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter*
pPrinter, ImplJobSetup* pS
}
else
{
-sal_uLong nPaperCount = ImplDeviceCaps( pPrinter, DC_PAPERS,
NULL, pSetupData );
+const DWORD nPaperCount = ImplDeviceCaps( pPrinter, DC_PAPERS,
NULL, pSetupData );
WORD* pPapers = NULL;
-sal_uLong nPaperSizeCount = ImplDeviceCaps( pPrinter,
DC_PAPERSIZE, NULL, pSetupData );
+const DWORD nPaperSizeCount = ImplDeviceCaps( pPrinter,
DC_PAPERSIZE, NULL, pSetupData );
POINT* pPaperSizes = NULL;
if ( nPaperCount && (nPaperCount != GDI_ERROR) )
{
@@ -524,7 +523,7 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter*
pPrinter, ImplJobSetup* pS
}
if( nPaperSizeCount == nPaperCount && pPaperSizes && pPapers )
{
-for( sal_uLong i = 0; i < nPaperCount; i++ )
+for( DWORD i = 0; i < nPaperCount; ++i )
{
if( pPapers[ i ] == CHOOSE_DEVMODE(dmPaperSize) )
{
@@ -743,7 +742,7 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter*
pPrinter, ImplJobSetup* pS
// PaperBin
if ( nFlags & JobSetFlags::PAPERBIN )
{
-sal_uLong nCount = ImplDeviceCaps( pPrinter, DC_BINS, NULL, pSetupData
);
+const DWORD nCount = ImplDeviceCaps( pPrinter, DC_BINS, NULL,
pSetupData );
if ( nCount && (nCount != GDI_ERROR) )
{
@@ -921,9 +920,9 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter*
pPrinter, ImplJobSetup* pS
default:
{
short nPaper = 0;
-sal_uLong nPaperCount = ImplDeviceCaps( pPrinter, DC_PAPERS,
NULL, pSetupData );
+const DWORD nPaperCount = ImplDeviceCaps( pPrinter, DC_PAPERS,
NULL, pSetupData );
WORD* pPapers = NULL;
-sal_uLong nPaperSizeCount = ImplDeviceCaps( pPrinter,
DC_PAPERSIZE, NULL, pSetupData );
+const DWORD nPaperSizeCount = ImplDeviceCaps( pPrinter,
DC_PAPERSIZE, NULL, pSetupData );
POINT* pPa
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - i18nlangtag/qa i18nlangtag/source i18npool/Library_localedata_euro.mk i18npool/source
i18nlangtag/qa/cppunit/test_languagetag.cxx |1
i18nlangtag/source/isolang/isolang.cxx |4
i18npool/Library_localedata_euro.mk |2
i18npool/source/localedata/data/eu.xml | 376
i18npool/source/localedata/data/eu_ES.xml | 376
i18npool/source/localedata/localedata.cxx |2
6 files changed, 381 insertions(+), 380 deletions(-)
New commits:
commit 2fa74e718363d4874920bb2f71653b386c9f99d0
Author: Eike Rathke
Date: Fri Jan 22 21:46:30 2016 +0100
tdf#97315 add Basque [eu-ES] and map [eu] to [eu-ES]
(cherry picked from commit 72c5e230f9cda8e18f63f7bbc6567487b4c5a5e0)
i18npool: fix build
Looks like 72c5e230f9cda8e18f63f7bbc6567487b4c5a5e0 missed the
makefile change.
(cherry picked from commit a6c8b41c4df79183c5d2c1450c010768ac7d82f6)
2d887ca6cb6c698fdb2d24029f38cce6050e0881
Change-Id: I89641fa82f0d0129aeff0d86a10be26cdc721dfc
Reviewed-on: https://gerrit.libreoffice.org/21726
Reviewed-by: David Tardon
Tested-by: David Tardon
Reviewed-by: Michael Stahl
Reviewed-by: Christian Lohmaier
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 76ef5a3..8696408 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -684,6 +684,7 @@ static bool checkMapping( const OUString& rStr1, const
OUString& rStr2 )
if (rStr1 == "ku-SY" ) return rStr2 == "kmr-Latn-SY";
if (rStr1 == "ku-IQ" ) return rStr2 == "ckb-IQ";
if (rStr1 == "ku-IR" ) return rStr2 == "ckb-IR";
+if (rStr1 == "eu" ) return rStr2 == "eu-ES";
return rStr1 == rStr2;
}
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 3b50dd5..196b9e1 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -239,7 +239,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_ARABIC_SOMALIA, "ar", "SO", 0 },
{ LANGUAGE_USER_ARABIC_SUDAN, "ar", "SD", 0 },
{ LANGUAGE_ARABIC_PRIMARY_ONLY, "ar", "" , 0 },
-{ LANGUAGE_BASQUE, "eu", "" , 0 },
+{ LANGUAGE_BASQUE, "eu", "ES", 0 },
+{ LANGUAGE_BASQUE, "eu", "" , kSAME },// our
earlier definition
{ LANGUAGE_BULGARIAN, "bg", "BG", 0 },
{ LANGUAGE_CZECH, "cs", "CZ", 0 },
{ LANGUAGE_CZECH, "cz", "" , kSAME },
@@ -1113,7 +1114,6 @@ css::lang::Locale
MsLangId::Conversion::lookupFallbackLocale(
switch (pEntry->mnLang)
{
// These are known to have no country assigned.
-case LANGUAGE_BASQUE:
case LANGUAGE_USER_ESPERANTO:
case LANGUAGE_USER_INTERLINGUA:
case LANGUAGE_USER_LOJBAN:
diff --git a/i18npool/Library_localedata_euro.mk
b/i18npool/Library_localedata_euro.mk
index 9b5aaae..caece13 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -36,7 +36,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,localedata_euro,\
CustomTarget/i18npool/localedata/localedata_dsb_DE \
CustomTarget/i18npool/localedata/localedata_el_GR \
CustomTarget/i18npool/localedata/localedata_et_EE \
- CustomTarget/i18npool/localedata/localedata_eu \
+ CustomTarget/i18npool/localedata/localedata_eu_ES \
CustomTarget/i18npool/localedata/localedata_fi_FI \
CustomTarget/i18npool/localedata/localedata_fo_FO \
CustomTarget/i18npool/localedata/localedata_fr_BE \
diff --git a/i18npool/source/localedata/data/eu.xml
b/i18npool/source/localedata/data/eu_ES.xml
similarity index 99%
rename from i18npool/source/localedata/data/eu.xml
rename to i18npool/source/localedata/data/eu_ES.xml
index 8de7c60..cc7c6d5 100644
--- a/i18npool/source/localedata/data/eu.xml
+++ b/i18npool/source/localedata/data/eu_ES.xml
@@ -24,8 +24,8 @@
Basque
-
-
+ ES
+ Spain
diff --git a/i18npool/source/localedata/localedata.cxx
b/i18npool/source/localedata/localedata.cxx
index e91ac3f3..d8f5ed0 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -152,7 +152,7 @@ static const struct {
{ "sr_CS", lcl_DATA_EURO },
{ "hr_HR", lcl_DATA_EURO },
{ "bs_BA", lcl_DATA_EURO },
-{ "eu", lcl_DATA_EURO },
+{ "eu_ES", lcl_DATA_EURO },
{ "fo_FO", lcl_DATA_EURO },
{ "ga_IE", lcl_DATA_EURO },
{ "gd_GB", lcl_DATA_EURO },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http:
[Bug 88205] Adapt uses of css::uno::Sequence to use initializer_list ctor
https://bugs.documentfoundation.org/show_bug.cgi?id=88205 --- Comment #4 from kerem --- I sent following patch for this bug; https://gerrit.libreoffice.org/#/c/21826/ -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/osx
vcl/inc/osx/salprn.h |2 +- vcl/osx/salprn.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit fc388c1ff4ba005bbf784a083825f2070e66325e Author: Matteo Casalin Date: Tue Jan 26 22:13:40 2016 +0100 Blind fix for OSX Change-Id: Ieafe8df5d67299615e279151b29744ddd180 diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index afb0cb7..94340f3 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -125,7 +125,7 @@ class AquaSalPrinter : public SalPrinter virtual boolStartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName, - sal_uLong i_nCopies, + sal_uInt32 i_nCopies, bool i_bCollate, bool i_bDirect, ImplJobSetup* i_pSetupData ) override; diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index ca9bec2..54e3e8f 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -590,7 +590,7 @@ bool AquaSalPrinter::StartJob( const OUString* i_pFileName, bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/, const OUString& /*i_rJobName*/, const OUString& /*i_rAppName*/, - sal_uLong /*i_nCopies*/, + sal_uInt32 /*i_nCopies*/, bool /*i_bCollate*/, bool /*i_bDirect*/, ImplJobSetup* ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/oox/condformatbuffer.cxx | 26 ++
1 file changed, 18 insertions(+), 8 deletions(-)
New commits:
commit b1ba84efc38821d5d272448cb34af7519306b8ce
Author: Markus Mohrhard
Date: Tue Jan 26 19:10:35 2016 +0100
handle entries with num type and formula during OOXML import, tdf#94626
Change-Id: I0d48120f2b128fb898c7cc55cc41ce52378851dc
Reviewed-on: https://gerrit.libreoffice.org/21820
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index 4ab87ed..4aeeaa9 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -104,18 +104,30 @@ const sal_uInt16 BIFF12_CFRULE_ABOVEAVERAGE =
0x0004;
const sal_uInt16 BIFF12_CFRULE_BOTTOM = 0x0008;
const sal_uInt16 BIFF12_CFRULE_PERCENT = 0x0010;
+bool isValue(const OUString& rStr, double& rVal)
+{
+sal_Int32 nEnd = -1;
+rVal = rtl::math::stringToDouble(rStr.trim(), '.', ',', nullptr, &nEnd);
+
+if (nEnd < rStr.getLength())
+return false;
+
+return true;
+}
+
void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList&
rAttribs )
{
OUString aType = rAttribs.getString( XML_type, OUString() );
+OUString aVal = rAttribs.getString(XML_val, OUString());
-if( aType == "formula" )
+double nVal = 0.0;
+bool bVal = isValue(aVal, nVal);
+if( !bVal || aType == "formula" )
{
-OUString aFormula = rAttribs.getString( XML_val, OUString() );
-pEntry->maFormula = aFormula;
+pEntry->maFormula = aVal;
}
else
{
-double nVal = rAttribs.getDouble( XML_val, 0.0 );
pEntry->mnVal = nVal;
}
@@ -357,11 +369,9 @@ void IconSetRule::importAttribs( const AttributeList&
rAttribs )
void IconSetRule::importFormula(const OUString& rFormula)
{
ColorScaleRuleModelEntry& rEntry = maEntries.back();
-if (rEntry.mbNum ||
-rEntry.mbPercent ||
-rEntry.mbPercentile)
+double nVal = 0.0;
+if ((rEntry.mbNum || rEntry.mbPercent || rEntry.mbPercentile) &&
isValue(rFormula, nVal))
{
-double nVal = rFormula.toDouble();
rEntry.mnVal = nVal;
}
else if (!rFormula.isEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
