date:20140311

 vcl/source/gdi/regband.cxx   |   16 
 vcl/source/window/window.cxx |4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 7ad8e33c0f00af96ae5ee35fb360901803c3863b
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Mar 11 08:16:33 2014 +0200

Spelling

Change-Id: I7e55e51f63c3d8b1c778593a08ece7bc122b2765

diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx
index 1184c0d..187d3a3 100644
--- a/vcl/source/gdi/regband.cxx
+++ b/vcl/source/gdi/regband.cxx
@@ -340,7 +340,7 @@ void ImplRegionBand::ScaleX( double fHorzScale )
 
 
 
-// combine overlaping sparations
+// combine overlapping sparations
 
 bool ImplRegionBand::OptimizeBand()
 {
@@ -361,7 +361,7 @@ bool ImplRegionBand::OptimizeBand()
 continue;
 }
 
-// overlaping separations? - combine!
+// overlapping separations? - combine!
 if ( pSep-mpNextSep )
 {
 if ( (pSep-mnXRight+1) = pSep-mpNextSep-mnXLeft )
@@ -426,11 +426,11 @@ void ImplRegionBand::Union( long nXLeft, long nXRight )
 break;
 }
 
-// new separation overlaping from left? - extend boundary
+// new separation overlapping from left? - extend boundary
 if ( (nXRight = pSep-mnXLeft)  (nXLeft = pSep-mnXLeft) )
 pSep-mnXLeft = nXLeft;
 
-// new separation overlaping from right? - extend boundary
+// new separation overlapping from right? - extend boundary
 if ( (nXLeft = pSep-mnXRight)  (nXRight  pSep-mnXRight) )
 {
 pSep-mnXRight = nXRight;
@@ -479,13 +479,13 @@ void ImplRegionBand::Intersect( long nXLeft, long nXRight 
)
 // will be removed from the optimizer
 pSep-mbRemoved = true;
 
-// new separation overlaping from left? - reduce right boundary
+// new separation overlapping from left? - reduce right boundary
 if ( (nXLeft = pSep-mnXLeft) 
  (nXRight = pSep-mnXRight) 
  (nXRight = pSep-mnXLeft) )
 pSep-mnXRight = nXRight;
 
-// new separation overlaping from right? - reduce right boundary
+// new separation overlapping from right? - reduce right boundary
 if ( (nXLeft = pSep-mnXLeft) 
  (nXLeft = pSep-mnXRight) 
  (nXRight = pSep-mnXRight) )
@@ -533,7 +533,7 @@ void ImplRegionBand::Exclude( long nXLeft, long nXRight )
 bSepProcessed = true;
 }
 
-// new separation overlaping from left? - reduce boundary
+// new separation overlapping from left? - reduce boundary
 if ( !bSepProcessed )
 {
 if ( (nXRight = pSep-mnXLeft)  (nXLeft = pSep-mnXLeft) )
@@ -543,7 +543,7 @@ void ImplRegionBand::Exclude( long nXLeft, long nXRight )
 }
 }
 
-// new separation overlaping from right? - reduce boundary
+// new separation overlapping from right? - reduce boundary
 if ( !bSepProcessed )
 {
 if ( (nXLeft = pSep-mnXRight)  (nXRight  pSep-mnXRight) )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index bb2e652..f5be436 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -235,8 +235,8 @@ WindowImpl::WindowImpl( WindowType nType )
 mbNoParentUpdate= false;// true: SetParentUpdateMode( 
sal_False ) called
 mbActive= false;// true: Window Active
 mbParentActive  = false;// true: OverlapActive from Parent
-mbReallyVisible = false;// true: this and all parents to an 
overlaped window are visible
-mbReallyShown   = false;// true: this and all parents to an 
overlaped window are shown
+mbReallyVisible = false;// true: this and all parents to an 
overlapped window are visible
+mbReallyShown   = false;// true: this and all parents to an 
overlapped window are shown
 mbInInitShow= false;// true: we are in InitShow
 mbChildNotify   = false;// true: ChildNotify
 mbChildPtrOverwrite = false;// true: PointerStyle overwrites 
Child-Pointer
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

2014-03-11 Thread Noel Grandin

 vcl/source/gdi/regband.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e8f00662a8dbeec61bed08aa6706af54b6d55f14
Author: Noel Grandin n...@peralex.com
Date:   Tue Mar 11 08:37:11 2014 +0200

Spelling

Change-Id: I49773d66a24afa5caee53125706894a2c689f284

diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx
index 187d3a3..c54d22c 100644
--- a/vcl/source/gdi/regband.cxx
+++ b/vcl/source/gdi/regband.cxx
@@ -340,7 +340,7 @@ void ImplRegionBand::ScaleX( double fHorzScale )
 
 
 
-// combine overlapping sparations
+// combine overlapping separations
 
 bool ImplRegionBand::OptimizeBand()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - xmloff/source

 xmloff/source/chart/PropertyMap.hxx |   27 +++
 1 file changed, 19 insertions(+), 8 deletions(-)

New commits:
commit d7cc3e7d8a093cfe300f52c0fe51aecd80a34fff
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Mon Mar 10 19:15:45 2014 +0100

fix odf validation errors around new chart regression curves

Change-Id: If67207abb204b5aca8365737088437b12ac6eaf1
Reviewed-on: https://gerrit.libreoffice.org/8523
Reviewed-by: TomaÅ¾ Vajngerl qui...@gmail.com
Tested-by: TomaÅ¾ Vajngerl qui...@gmail.com

diff --git a/xmloff/source/chart/PropertyMap.hxx 
b/xmloff/source/chart/PropertyMap.hxx
index 9d1f6fd..8e1a3ff 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -87,6 +87,7 @@
 #define MAP_ENTRY( a, ns, nm, t ){ a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, 
SvtSaveOptions::ODFVER_010, false }
 #define MAP_ENTRY_ODF12( a, ns, nm, t )  { a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, 
SvtSaveOptions::ODFVER_012, false }
 #define MAP_ENTRY_ODF_EXT( a, ns, nm, t ){ a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT, false }
+#define MAP_ENTRY_ODF_EXT_IMPORT( a, ns, nm, t ){ a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT, true }
 #define MAP_CONTEXT( a, ns, nm, t, c )   { a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, c, 
SvtSaveOptions::ODFVER_010, false }
 #define MAP_SPECIAL( a, ns, nm, t, c )   { a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | 
MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_010, false }
 #define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | 
MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_012, false }
@@ -185,14 +186,24 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
 // regression curve properties
 MAP_SPECIAL( RegressionType, CHART, XML_REGRESSION_TYPE, 
XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_REGRESSION_TYPE ),
 
-MAP_ENTRY_ODF_EXT( CurveName, CHART, XML_REGRESSION_CURVE_NAME, 
XML_TYPE_STRING ),
-MAP_ENTRY_ODF_EXT( PolynomialDegree, CHART, XML_REGRESSION_MAX_DEGREE, 
XML_TYPE_NUMBER ),
-MAP_ENTRY_ODF_EXT( MovingAveragePeriod, CHART, XML_REGRESSION_PERIOD, 
XML_TYPE_NUMBER ),
-MAP_ENTRY_ODF_EXT( MovingAverageType, CHART, XML_REGRESSION_MOVING_TYPE, 
XML_TYPE_STRING ),
-MAP_ENTRY_ODF_EXT( ExtrapolateForward, CHART, 
XML_REGRESSION_EXTRAPOLATE_FORWARD, XML_TYPE_DOUBLE ),
-MAP_ENTRY_ODF_EXT( ExtrapolateBackward, CHART, 
XML_REGRESSION_EXTRAPOLATE_BACKWARD, XML_TYPE_DOUBLE ),
-MAP_ENTRY_ODF_EXT( ForceIntercept, CHART, 
XML_REGRESSION_FORCE_INTERCEPT, XML_TYPE_BOOL ),
-MAP_ENTRY_ODF_EXT( InterceptValue, CHART, 
XML_REGRESSION_INTERCEPT_VALUE, XML_TYPE_DOUBLE ),
+MAP_ENTRY_ODF_EXT( CurveName, LO_EXT, XML_REGRESSION_CURVE_NAME, 
XML_TYPE_STRING ),
+MAP_ENTRY_ODF_EXT( PolynomialDegree, LO_EXT, XML_REGRESSION_MAX_DEGREE, 
XML_TYPE_NUMBER ),
+MAP_ENTRY_ODF_EXT( MovingAveragePeriod, LO_EXT, XML_REGRESSION_PERIOD, 
XML_TYPE_NUMBER ),
+MAP_ENTRY_ODF_EXT( MovingAverageType, LO_EXT, 
XML_REGRESSION_MOVING_TYPE, XML_TYPE_STRING ),
+MAP_ENTRY_ODF_EXT( ExtrapolateForward, LO_EXT, 
XML_REGRESSION_EXTRAPOLATE_FORWARD, XML_TYPE_DOUBLE ),
+MAP_ENTRY_ODF_EXT( ExtrapolateBackward, LO_EXT, 
XML_REGRESSION_EXTRAPOLATE_BACKWARD, XML_TYPE_DOUBLE ),
+MAP_ENTRY_ODF_EXT( ForceIntercept, LO_EXT, 
XML_REGRESSION_FORCE_INTERCEPT, XML_TYPE_BOOL ),
+MAP_ENTRY_ODF_EXT( InterceptValue, LO_EXT, 
XML_REGRESSION_INTERCEPT_VALUE, XML_TYPE_DOUBLE ),
+
+// import mapping for broken files
+MAP_ENTRY_ODF_EXT_IMPORT( CurveName, CHART, XML_REGRESSION_CURVE_NAME, 
XML_TYPE_STRING ),
+MAP_ENTRY_ODF_EXT_IMPORT( PolynomialDegree, CHART, 
XML_REGRESSION_MAX_DEGREE, XML_TYPE_NUMBER ),
+MAP_ENTRY_ODF_EXT_IMPORT( MovingAveragePeriod, CHART, 
XML_REGRESSION_PERIOD, XML_TYPE_NUMBER ),
+MAP_ENTRY_ODF_EXT_IMPORT( MovingAverageType, CHART, 
XML_REGRESSION_MOVING_TYPE, XML_TYPE_STRING ),
+MAP_ENTRY_ODF_EXT_IMPORT( ExtrapolateForward, CHART, 
XML_REGRESSION_EXTRAPOLATE_FORWARD, XML_TYPE_DOUBLE ),
+MAP_ENTRY_ODF_EXT_IMPORT( ExtrapolateBackward, CHART, 
XML_REGRESSION_EXTRAPOLATE_BACKWARD, XML_TYPE_DOUBLE ),
+MAP_ENTRY_ODF_EXT_IMPORT( ForceIntercept, CHART, 
XML_REGRESSION_FORCE_INTERCEPT, XML_TYPE_BOOL ),
+MAP_ENTRY_ODF_EXT_IMPORT( InterceptValue, CHART, 
XML_REGRESSION_INTERCEPT_VALUE, XML_TYPE_DOUBLE ),
 
 MAP_SPECIAL_ODF12( ErrorBarRangePositive, CHART, XML_ERROR_UPPER_RANGE, 
XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only
 MAP_SPECIAL_ODF12( ErrorBarRangeNegative, CHART, XML_ERROR_LOWER_RANGE, 
XML_TYPE_STRING,

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - configure.ac

2014-03-11 Thread Andras Timar

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6dd1e5a50863ab6c2a0376753dda5a74090ab253
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Mar 11 00:54:25 2014 -0700

Bump version to 4.1-6

Change-Id: I6ccfde95ad8032bee780604df648ab23a541032f

diff --git a/configure.ac b/configure.ac
index 53bae96..ce5060b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.1.10.5],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.10.6],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 save_CC=$CC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source

2014-03-11 Thread Herbert Dürr

 vcl/source/glyphs/graphite_adaptors.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit fbf086027e3595a2803a1489db80fb81c0b8f15a
Author: Herbert DÃ¼rr h...@apache.org
Date:   Tue Mar 11 07:49:24 2014 +

#i124394# fix inclusion of freetype's ftsynth.h header

the location of this header file changed with freetype 2.51 so we had to 
adapt.
On the other hand the header is not actually needed because we load the 
symbols
for synthetization of outlines dynamically to be compatible with freetype 
libs
that don't support them. So we can remove the header inclusion.

Found-by: Ariel Costenla-Haile ar...@apache.org
Patch-by: Herbert Duerr h...@apache.org

diff --git a/vcl/source/glyphs/graphite_adaptors.cxx 
b/vcl/source/glyphs/graphite_adaptors.cxx
index 279d8fb..dcdac7b 100644
--- a/vcl/source/glyphs/graphite_adaptors.cxx
+++ b/vcl/source/glyphs/graphite_adaptors.cxx
@@ -42,14 +42,10 @@
 // Platform
 #ifndef WNT
 #include unx/saldisp.hxx
-
 #include salgdi.hxx
 
-#include freetype2/ftsynth.h
-
 // Module
 #include gcach_ftyp.hxx
-
 #include graphite_features.hxx
 #include graphite_adaptors.hxx
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source

 svx/source/gallery2/galtheme.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 375ee984859a3c7b03faae6ec92c50be43a39988
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Mar 11 09:08:11 2014 +0100

-Werror=parentheses

Change-Id: Icceeae0581e3f639c3a9820eda4c1df291e78f2b

diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 900f935..1275a70 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -398,7 +398,7 @@ bool GalleryTheme::InsertObject( const SgaObject rObj, 
sal_uIntPtr nInsertPos )
 else
 ImplWriteSgaObject( rObj, nInsertPos, NULL );
 
-ImplSetModified( bRet = sal_True );
+ImplSetModified( (bRet = sal_True) );
 ImplBroadcast( pFoundEntry ? iFoundPos : nInsertPos );
 }
 
@@ -499,7 +499,7 @@ bool GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t 
nNewPos )
 ::std::advance( it, nOldPos );
 aObjectList.erase( it );
 
-ImplSetModified( bRet = sal_True );
+ImplSetModified( (bRet = sal_True) );
 ImplBroadcast( ( nNewPos  nOldPos ) ? nNewPos : ( nNewPos - 1 ) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Hi-DPI patches for 4.2

2014-03-11 Thread Stefan Knorr

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi all,

On 10/03/14 22:51, Keith Curtis wrote:
 Doubling bitmaps is a hack but since bigger bitmaps don't exist, it
 is better than doing nothing. I haven't looked into the low-level
 resource loading code, but there are very probably VCL changes
 required once those new bitmaps are created. Once that happens, then
 the doubling code can be removed, but only at the end, and it might be
 a while given how many bitmaps exist in all the icon packs out there.

Just fyi, that is https://bugs.freedesktop.org/show_bug.cgi?id=51733 .
Proposals by developers on how to add pixel-doubled bitmaps to existing
themes/create new pixel-doubled themes welcome.
Also, as long as we ship all those themes that nobody can really do much
about  without completely recreating them (Galaxy e.g.), the
pixel-doubling code would need to stay.


Astron.
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJTHthZAAoJEJCfzwJOvloORiIH/1/rDMdRZLfHFjdKuHy0tFVP
jIzHTkbTVz0XRaJnx5dS1VzE2Sc1ts3pAcCo1xbzGxl7R2Ywhgbuq/jIZf9gV9A+
f954AhL3VYdSuzKu4tr/qDwp7CIDreIDqhsb0nguV9pKMZyYIIRjLx0kXXCYUIh8
4IWw2RHymjvaOu22CvpHD4Ro6AJj2BvN2QnkOyXWxlqwPVCl64lnKr8RDQTpdl9L
8bhgA+xSDqmMPVE4RQYJdKsxTTZuwZu762j4SwWe2EY9VrQoHnfj/MGY84pIycnb
QQJkoseMPS/55xlnSfLKCT/a9/xJ1MKiGy3Q1Xa/zXwx4EPFt4dyYEu4Gh1nGxQ=
=sMWV
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Hi-DPI patches for 4.2

2014-03-11 Thread Khaled Hosny

On Tue, Mar 11, 2014 at 10:33:13AM +0100, Stefan Knorr wrote:
 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA1
 
 Hi all,
 
 On 10/03/14 22:51, Keith Curtis wrote:
  Doubling bitmaps is a hack but since bigger bitmaps don't exist, it
  is better than doing nothing. I haven't looked into the low-level
  resource loading code, but there are very probably VCL changes
  required once those new bitmaps are created. Once that happens, then
  the doubling code can be removed, but only at the end, and it might be
  a while given how many bitmaps exist in all the icon packs out there.
 
 Just fyi, that is https://bugs.freedesktop.org/show_bug.cgi?id=51733 .
 Proposals by developers on how to add pixel-doubled bitmaps to existing
 themes/create new pixel-doubled themes welcome.
 Also, as long as we ship all those themes that nobody can really do much
 about  without completely recreating them (Galaxy e.g.), the
 pixel-doubling code would need to stay.

If we are scaling anyway, we can just create faux hi-dpi themes by
scaling existing icons and simplify the code, they can later be replaced
with real hi-dpi icons if they are made available without any code
change (it might even be a good idea to do it now, if one is interested
in adding a code to automatically select hi-dpi icon themes and not wait
until one is available).

Regards,
Khaled
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Integration Libreoffice on Mac OS

Again, adding the LibreOffice developer list back to recipients.
Please don't remove it when replying. The point of having a mailing
list is that discusions are public and archived for the potential
benefit of others in the future.

 Exactly what I'm doing is similar this link
 http://herbertniemeyerblog.blogspot.com/2011/11/have-to-start-somewhere.html,

So you are using C# currently on Windows?

 Now I want to use
 OpenOffice / LibreOffice remotely through Objective-C,

There is no Objective-C binding, but as Objective-C is a pure superset
of C (or C++), you can use the C++ UNO API directly from Objective-C
code (which then technically is Objective-C++).

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/qa

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1dec3cfba804d1f1af17593306ea6742691b8f3b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 09:15:32 2014 +

vexing parse

Change-Id: Ie541a8b6384cec6e067e7f7b75f5c17ce1a4d4a5

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 632a73d..aba4d9f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2990,7 +2990,7 @@ DECLARE_OOXMLEXPORT_TEST(testComboBoxControl, 
combobox-control.docx)
 
 CPPUNIT_ASSERT_EQUAL(OUString(Manolo), 
getPropertyOUString(xControl-getControl(), Text));
 
-uno::SequenceOUString aItems = 
getPropertyuno::SequenceOUString(xControl-getControl(), StringItemList);
+uno::SequenceOUString aItems = getProperty uno::SequenceOUString 
(xControl-getControl(), StringItemList);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), sal_Int32(aItems.getLength()));
 CPPUNIT_ASSERT_EQUAL(OUString(manolo), aItems[0]);
 CPPUNIT_ASSERT_EQUAL(OUString(pepito), aItems[1]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svl svl/source unusedcode.easy

 include/svl/style.hxx  |1 -
 svl/source/items/style.cxx |5 -
 unusedcode.easy|   13 +
 3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 8c7d924643b3f4a29c098632d03706aa99779f4d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 09:18:51 2014 +

callcatcher: update unused code

Change-Id: Ie7acb237728af27df27d87c3f46a3eaa9cd14654

diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index cbe7d42..7a558e4 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -250,7 +250,6 @@ public:
 SfxStyleSheetBasePool  operator=( const SfxStyleSheetBasePool );
 SfxStyleSheetBasePool  operator+=( const SfxStyleSheetBasePool );
 
-const SfxStylesGetStyles();
 virtual SfxStyleSheetBase*  First();
 virtual SfxStyleSheetBase*  Next();
 virtual SfxStyleSheetBase*  Find( const OUString, SfxStyleFamily eFam, 
sal_uInt16 n=SFXSTYLEBIT_ALL );
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 4d65840..126cd81 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -699,11 +699,6 @@ SfxStyleSheetBase* SfxStyleSheetBasePool::Find(const 
OUString rName,
 return aIter.Find(rName);
 }
 
-const SfxStyles SfxStyleSheetBasePool::GetStyles()
-{
-return aStyles;
-}
-
 SfxStyleSheetBase* SfxStyleSheetBasePool::First()
 {
 return GetIterator_Impl().First();
diff --git a/unusedcode.easy b/unusedcode.easy
index d7b52c4..e62cbc8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -177,6 +177,19 @@ connectivity::file::OStatement_Base::reset()
 connectivity::firebird::release(int, 
cppu::OBroadcastHelperVarcppu::OMultiTypeInterfaceContainerHelper, 
com::sun::star::uno::Type, 
com::sun::star::uno::Referencecom::sun::star::uno::XInterface, 
com::sun::star::lang::XComponent*)
 connectivity::sdbcx::OGroup::OGroup(rtl::OUString const, unsigned char)
 connectivity::sdbcx::OGroup::OGroup(unsigned char)
+dbaccess::OCommandContainer::getUnoTunnelImplementationId()
+dbaccess::OCommandDefinition::getUnoTunnelImplementationId()
+dbaccess::OComponentDefinition::getUnoTunnelImplementationId()
+dbaccess::ODefinitionContainer::getUnoTunnelImplementationId()
+dbaccess::ODocumentContainer::getUnoTunnelImplementationId()
+dbaccess::ODocumentDefinition::getUnoTunnelImplementationId()
+dbaccess::OQuery::getUnoTunnelImplementationId()
+dbaccess::OQueryDescriptor::getUnoTunnelImplementationId()
+dbaccess::OSingleSelectQueryComposer::getUnoTunnelImplementationId()
+dbaui::ComposerDialog::getUnoTunnelImplementationId()
+dbaui::OColumnControlModel::getUnoTunnelImplementationId()
+dbaui::ODirectSQLDialog::getUnoTunnelImplementationId()
+dbaui::OTextConnectionSettingsDialog::getUnoTunnelImplementationId()
 oglcanvas::CanvasHelper::flush() const
 oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const, 
com::sun::star::rendering::RenderState const, 
com::sun::star::uno::Referencecom::sun::star::rendering::XGraphicDevice 
const) const
 
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper
 const)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fb/f086027e3595a2803a1489db80fb81c0b8f15a

 fb/f086027e3595a2803a1489db80fb81c0b8f15a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 21fb39bf25e0ffa7e4ae8ccc9a64ae1a35be17d9
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 09:20:23 2014 +

Notes added by 'git notes add'

diff --git a/fb/f086027e3595a2803a1489db80fb81c0b8f15a 
b/fb/f086027e3595a2803a1489db80fb81c0b8f15a
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/fb/f086027e3595a2803a1489db80fb81c0b8f15a
@@ -0,0 +1 @@
+ignore: fixed
___
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 6c571d53fc7e734c8f1a99beb31e420cdee9fe78
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Mon Mar 10 19:29:30 2014 +0100

Updated core
Project: help  6ad558ea943ecca88da88c0f9895042546182995

fdo#75924 update button labels of spellcheck dialog

Change-Id: I1009c08fbf32a49a54bea97551883dd140fc1515
Reviewed-on: https://gerrit.libreoffice.org/8522
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index c0f0683..6ad558e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c0f068348420e4ef59842aaa4a9786aefabb3a83
+Subproject commit 6ad558ea943ecca88da88c0f9895042546182995
___
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/shared/01/0601.xhp  |8 
 source/text/swriter/guide/spellcheck_dialog.xhp |6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 6ad558ea943ecca88da88c0f9895042546182995
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Mon Mar 10 19:29:30 2014 +0100

fdo#75924 update button labels of spellcheck dialog

Change-Id: I1009c08fbf32a49a54bea97551883dd140fc1515
Reviewed-on: https://gerrit.libreoffice.org/8522
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/source/text/shared/01/0601.xhp 
b/source/text/shared/01/0601.xhp
index 5aa295b..65122d5 100644
--- a/source/text/shared/01/0601.xhp
+++ b/source/text/shared/01/0601.xhp
@@ -55,7 +55,7 @@
 bookmark xml-lang=en-US 
branch=hid/cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION id=bm_id9300210 
localize=false/
 paragraph xml-lang=en-US id=hd_id3149885 role=heading level=2 l10n=U
  oldref=10Suggestions/paragraph
-  paragraph xml-lang=en-US id=par_id3155628 role=paragraph 
l10n=CHG oldref=11ahelp 
hid=SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORDLists suggested words to 
replace the misspelled word. Select the word that you want to use, and then 
click emphChange/emph or emphChange All/emph./ahelp/paragraph
+  paragraph xml-lang=en-US id=par_id3155628 role=paragraph 
l10n=CHG oldref=11ahelp 
hid=SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORDLists suggested words to 
replace the misspelled word. Select the word that you want to use, and then 
click emphCorrect/emph or emphCorrect All/emph./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE id=bm_id3150822 
localize=false/
 paragraph xml-lang=en-US id=hd_id3145087 role=heading level=2 
l10n=CHG
  oldref=12Text Languagecommentspec doc 
Spelling_and_Grammar.odt/comment/paragraph
@@ -76,7 +76,7 @@
 !-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADD --
 bookmark xml-lang=en-US 
branch=hid/cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT 
id=bm_id5068819 localize=false/
 paragraph xml-lang=en-US id=hd_id3153353 role=heading level=2 l10n=U
- oldref=24Add/paragraph
+ oldref=24Add to Dictionary/paragraph
   paragraph xml-lang=en-US id=par_id3144432 role=paragraph 
l10n=CHG oldref=25ahelp 
hid=SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADDAdds the unknown word to a 
user-defined dictionary./ahelp/paragraph
 !-- removed HID SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNORE --
 bookmark xml-lang=en-US branch=hid/CUI_HID_SPLDLG_BUTTON_IGNORE 
id=bm_id7157811 localize=false/
@@ -94,12 +94,12 @@
 !-- removed HID SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGE --
 bookmark xml-lang=en-US branch=hid/CUI_HID_SPLDLG_BUTTON_CHANGE 
id=bm_id2069765 localize=false/
 paragraph xml-lang=en-US id=hd_id3153056 role=heading level=2 
l10n=CHG
- oldref=18Change/paragraph
+ oldref=18Correct/paragraph
   paragraph xml-lang=en-US id=par_id3148559 role=paragraph 
l10n=CHG oldref=19ahelp 
hid=SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEReplaces the unknown word 
with the current suggestion. If you changed more than just the misspelled word, 
the entire sentence is replaced./ahelp/paragraph
 !-- removed HID SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALL --
 bookmark xml-lang=en-US branch=hid/CUI_HID_SPLDLG_BUTTON_CHANGEALL 
id=bm_id9187902 localize=false/
 paragraph xml-lang=en-US id=hd_id3145787 role=heading level=2 
l10n=CHG
- oldref=16Change All/paragraph
+ oldref=16Correct All/paragraph
   paragraph xml-lang=en-US id=par_id316 role=paragraph 
l10n=CHG oldref=17ahelp 
hid=SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALLReplaces all 
occurrences of the unknown word with the current suggestion./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO id=bm_id9617297 
localize=false/
 paragraph xml-lang=en-US id=par_idN10850 role=heading level=2 
l10n=NEWUndo/paragraph
diff --git a/source/text/swriter/guide/spellcheck_dialog.xhp 
b/source/text/swriter/guide/spellcheck_dialog.xhp
index 2748ec5..4cc31c9 100644
--- a/source/text/swriter/guide/spellcheck_dialog.xhp
+++ b/source/text/swriter/guide/spellcheck_dialog.xhp
@@ -50,9 +50,9 @@
  /listitem
  listitem
 paragraph xml-lang=en-US id=par_id3149861 role=listitem 
l10n=U oldref=46Do one of the following:/paragraph
-paragraph xml-lang=en-US id=par_id3145099 role=listitem 
l10n=CHG oldref=47To accept a correction, click the suggestion, and then 
click emphChange/emph./paragraph
-paragraph xml-lang=en-US id=par_id3156241 role=listitem 
l10n=CHG oldref=48Edit the sentence in the upper text box, and then click 
emphChange/emph./paragraph
-paragraph xml-lang=en-US id=par_id3155886 role=listitem 
l10n=CHG oldref=40To add

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3ca3d5cf27d0a2d48a9d50ca8da49f6b43383089
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 09:31:30 2014 +

Updated core
Project: help  3635fef59b1d3dfe275558b5922ed23cbf8958f2

diff --git a/helpcontent2 b/helpcontent2
index 6ad558e..3635fef 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6ad558ea943ecca88da88c0f9895042546182995
+Subproject commit 3635fef59b1d3dfe275558b5922ed23cbf8958f2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

 helpers/help_hid.lst   |   15 --
 source/text/shared/01/0601.xhp |   53 -
 2 files changed, 23 insertions(+), 45 deletions(-)

New commits:
commit 3635fef59b1d3dfe275558b5922ed23cbf8958f2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 09:31:30 2014 +

update helpds for spell check dialog .ui conversion

Change-Id: I35c7cc500e0637f843059a0c8c730f418ea4a1a1

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index fcfec62..b1b24ad 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6004,7 +6004,6 @@ 
svx_CheckBox_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE_CB_JSCPT_DISABLE,1241269470,
 svx_CheckBox_RID_SVXDLG_RUBY_CB_AUTO_DETECT,2315371521,
 svx_CheckBox_RID_SVXDLG_SEARCHFORM_CB_HALFFULLFORMS,1368769544,
 svx_CheckBox_RID_SVXDLG_SEARCHFORM_CB_SOUNDSLIKECJK,1368769545,
-svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR,2311849014,
 svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_EXPAND,703775795,
 svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_SNAP,703775782,
 svx_CheckBox_RID_SVXPAGE_BACKGROUND_BTN_LINK,700728342,
@@ -6183,8 +6182,6 @@ svx_ListBox_RID_SVXDLG_RUBY_LB_ADJUST,2315374103,
 svx_ListBox_RID_SVXDLG_RUBY_LB_CHAR_STYLE,2315374083,
 svx_ListBox_RID_SVXDLG_RUBY_LB_POSITION,2315374105,
 svx_ListBox_RID_SVXDLG_SEARCHFORM_LB_FORM,1368772097,
-svx_ListBox_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE,2311851556,
-svx_ListBox_RID_SVXDLG_SPELLCHECK_LB_SUGGESTION,2311851552,
 svx_ListBox_RID_SVXFLOAT_3D_LB_AMBIENTLIGHT,3388493390,
 svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_1,3388493380,
 svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_2,3388493381,
@@ -6232,7 +6229,6 @@ 
svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT,701009435,
 svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME,701009432,
 svx_ListBox_RID_SVX_MDLG_DOCRECOVERY_BROKEN_LB_BROKEN_FILELIST,1237782019,
 svx_ListBox_RID_SVX_MDLG_HANGULHANJA_EDIT_LB_BOOK,1237667329,
-svx_MenuButton_RID_SVXDLG_SPELLCHECK_MB_ADDTODICT,2311860263,
 svx_MetricField_OFA_TP_VIEW_MF_SELECTION,810523208,
 svx_MetricField_OFA_TP_VIEW_MF_WINDOWSIZE,810523158,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_1,3391953410,
@@ -6296,7 +6292,6 @@ svx_ModalDialog_RID_SVX_SPLITCELLDLG,1238286336,
 svx_ModelessDialog_RID_SVXDLG_IMAP,2318696448,
 svx_MultiLineEdit_MD_ICONCHANGE_EDT_ADDR,1080609701,
 svx_MultiLineEdit_MD_INSERT_OBJECT_APPLET_ED_APPLET_OPTIONS,1598179860,
-svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD,2311850530,
 svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719,
 
svx_MultiLineEdit_RID_SVX_MDLG_ERR_REP_PREVIEW_ML_ERRPREVIEW_CONTENT,1237813761,
 svx_MultiListBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_LBX_FOUND,706677761,
@@ -6336,16 +6331,6 @@ 
svx_PushButton_RID_SVXDLG_MULTIPATH_BTN_DEL_MULTIPATH,1240879631,
 svx_PushButton_RID_SVXDLG_RUBY_PB_CLOSE,2315375112,
 svx_PushButton_RID_SVXDLG_RUBY_PB_STYLIST,2315375108,
 svx_PushButton_RID_SVXDLG_SEARCHFORM_PB_SOUNDSLIKESETTINGS,1368773123,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_AUTOCORR,2311852586,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_CHANGE,2311852584,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_CHANGEALL,2311852585,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_CLOSE,2311852591,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_EXPLAIN,2311852599,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_IGNORE,2311852581,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_IGNOREALL,2311852582,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_IGNORERULE,2311852603,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_OPTIONS,2311852588,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_UNDO,2311852590,
 svx_PushButton_RID_SVXPAGE_BACKGROUND_BTN_BROWSE,700731924,
 svx_PushButton_RID_SVXPAGE_BITMAP_BTN_ADD,701665793,
 svx_PushButton_RID_SVXPAGE_BITMAP_BTN_DELETE,701665796,
diff --git a/source/text/shared/01/0601.xhp 
b/source/text/shared/01/0601.xhp
index 65122d5..d62b643 100644
--- a/source/text/shared/01/0601.xhp
+++ b/source/text/shared/01/0601.xhp
@@ -34,6 +34,7 @@
 /bookmarkcommentmw changes spellcheck;languages/comment
 bookmark xml-lang=en-US branch=hid/.uno:Spelling id=bm_id3150702 
localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:SpellingAndGrammarDialog 
id=bm_id1022200801253693 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/spellingdialog/SpellingDialog 
id=bm_id1022200801253694 localize=false/
 paragraph xml-lang=en-US id=hd_id3153882 role=heading level=1 
l10n=U oldref=1link href=text/shared/01/0601.xhp 
name=SpellcheckSpelling and Grammar/link/paragraph
  paragraph xml-lang=en-US id=par_id3154682 role=paragraph 
l10n=CHG oldref=2variable id=rechtahelp hid=.uno:SpellingChecks 
the document or the current selection for spelling errors. If a grammar 
checking extension is installed, the dialog also checks for grammar 
errors./ahelp
 /variable/paragraph
@@ -45,63 +46,55 @@
   paragraph xml-lang=en-US id=par_idN1064B role=paragraph 
l10n=NEWThe spellcheck starts at the current cursor position and advances to 
the end of the document or

[Libreoffice-commits] core.git: offapi/com

2014-03-11 Thread Ariel Constenla-Haile

 offapi/com/sun/star/ui/dialogs/Wizard.idl|2 ++
 offapi/com/sun/star/ui/dialogs/WizardButton.idl  |2 ++
 offapi/com/sun/star/ui/dialogs/WizardTravelType.idl  |2 ++
 offapi/com/sun/star/ui/dialogs/XWizard.idl   |2 ++
 offapi/com/sun/star/ui/dialogs/XWizardController.idl |2 ++
 offapi/com/sun/star/ui/dialogs/XWizardPage.idl   |2 ++
 6 files changed, 12 insertions(+)

New commits:
commit e94d87d3268624a41d4edcdb749035f94e7a7636
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon Mar 10 23:52:31 2014 +

Related: #i124397# - [API] Add since tag to Wizard API IDL files

(cherry picked from commit f72b30998429ded67cdea0d002b9d0227f4438f6)

Conflicts:
offapi/com/sun/star/ui/dialogs/WizardButton.idl
offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
offapi/com/sun/star/ui/dialogs/XWizardController.idl
offapi/com/sun/star/ui/dialogs/XWizardPage.idl

Change-Id: If651451b86829c7f066272e9362e3943f56cbf34

diff --git a/offapi/com/sun/star/ui/dialogs/Wizard.idl 
b/offapi/com/sun/star/ui/dialogs/Wizard.idl
index b1963a0..dba330a 100644
--- a/offapi/com/sun/star/ui/dialogs/Wizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/Wizard.idl
@@ -30,6 +30,8 @@ interface XWizardController;
 
 
 /** provides a framework for implementing a wizard dialog.
+
+@since OOo 3.3
  */
 service Wizard : XWizard
 {
diff --git a/offapi/com/sun/star/ui/dialogs/WizardButton.idl 
b/offapi/com/sun/star/ui/dialogs/WizardButton.idl
index 65fd834..757a7d3 100644
--- a/offapi/com/sun/star/ui/dialogs/WizardButton.idl
+++ b/offapi/com/sun/star/ui/dialogs/WizardButton.idl
@@ -25,6 +25,8 @@ module com { module sun { module star { module ui { module 
dialogs {
 
 
 /** denotes the buttons found in a Wizard
+
+@since OOo 3.3
  */
 constants WizardButton
 {
diff --git a/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl 
b/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
index 1b91a04..8df9865 100644
--- a/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
+++ b/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
@@ -25,6 +25,8 @@ module com { module sun { module star { module ui { module 
dialogs {
 
 
 /** denotes ways to leave a Wizard's page
+
+@since OOo 3.3
  */
 constants WizardTravelType
 {
diff --git a/offapi/com/sun/star/ui/dialogs/XWizard.idl 
b/offapi/com/sun/star/ui/dialogs/XWizard.idl
index 7d22899..59b8d61 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizard.idl
@@ -69,6 +69,8 @@ interface XWizardPage;
 
 @see XWizardController
 @see XWizardPage
+
+@since OOo 3.3
  */
 interface XWizard
 {
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardController.idl 
b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
index c25f8e6..b15286c 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardController.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
@@ -27,6 +27,8 @@ module com { module sun { module star { module ui { module 
dialogs {
 
 
 /** is the interface of a client-provided controller of a custom Wizard.
+
+@since OOo 3.3
  */
 interface XWizardController
 {
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl 
b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
index 6cfdbe4..c7c1be2 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
@@ -27,6 +27,8 @@ module com { module sun { module star { module ui { module 
dialogs {
 
 
 /** is a single page of a Wizard
+
+@since OOo 3.3
  */
 interface XWizardPage : ::com::sun::star::lang::XComponent
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f7/2b30998429ded67cdea0d002b9d0227f4438f6

 f7/2b30998429ded67cdea0d002b9d0227f4438f6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 49165a0e4b48a7931bd412afbfc97610ee083815
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 09:35:41 2014 +

Notes added by 'git notes add'

diff --git a/f7/2b30998429ded67cdea0d002b9d0227f4438f6 
b/f7/2b30998429ded67cdea0d002b9d0227f4438f6
new file mode 100644
index 000..7bccf5a
--- /dev/null
+++ b/f7/2b30998429ded67cdea0d002b9d0227f4438f6
@@ -0,0 +1 @@
+merged as: e94d87d3268624a41d4edcdb749035f94e7a7636
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 86/10e88b31869284f2804202fdfc09ba74e40251

 86/10e88b31869284f2804202fdfc09ba74e40251 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e82524a61af3ec388e9fe2ee252030624ce6d572
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 09:37:10 2014 +

Notes added by 'git notes add'

diff --git a/86/10e88b31869284f2804202fdfc09ba74e40251 
b/86/10e88b31869284f2804202fdfc09ba74e40251
new file mode 100644
index 000..70754ad
--- /dev/null
+++ b/86/10e88b31869284f2804202fdfc09ba74e40251
@@ -0,0 +1 @@
+prefer: 78cca63070ae6cf82b45ec3bc75fafa2db31a7f2
___
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/guide/move_dragdrop.xhp |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 2438ff53e1730c4af182568294b129de3ea0b28a
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Mon Mar 10 20:42:08 2014 +0100

fdo#75609 make Calc drag-and-drop help more detailed

Change-Id: I13c66772623c4749e48ae2d4746894a06e388ecb
Reviewed-on: https://gerrit.libreoffice.org/8524
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/source/text/scalc/guide/move_dragdrop.xhp 
b/source/text/scalc/guide/move_dragdrop.xhp
index 1dde41e..a311413 100644
--- a/source/text/scalc/guide/move_dragdrop.xhp
+++ b/source/text/scalc/guide/move_dragdrop.xhp
@@ -29,13 +29,15 @@
 body
 bookmark xml-lang=en-US branch=index 
id=bm_id3155686bookmark_valuedrag and drop; moving cells/bookmark_value
 bookmark_valuecells; moving by drag and drop /bookmark_value
+bookmark_valuerows;moving by drag and drop/bookmark_value
 bookmark_valuecolumns;moving by drag and drop/bookmark_value
-bookmark_valuemoving;cells by drag and drop/bookmark_value
+bookmark_valuemoving;cells, rows and columns by drag and 
drop/bookmark_value
 bookmark_valueinserting;cells, by drag and drop/bookmark_value
 /bookmarkcommentmw added columns;/comment
 paragraph role=heading id=hd_id986358 xml-lang=en-US level=1 
l10n=NEWvariable id=move_dragdroplink 
href=text/scalc/guide/move_dragdrop.xhpMoving Cells by Drag-and-Drop/link
 /variable/paragraph
-paragraph role=paragraph id=par_id2760093 xml-lang=en-US 
l10n=NEWWhen you drag-and-drop a selection of cells on a Calc sheet, the 
cells normally overwrite the existing cells in the area where you drop. This is 
the normal emphoverwrite mode/emph./paragraph
+paragraph role=paragraph id=par_id2760093 xml-lang=en-US 
l10n=NEWWhen you drag-and-drop a selection of cells, rows or columns on a 
Calc sheet, the cells (including the ones in selected rows or columns) normally 
overwrite the existing cells in the area where you drop. This is the normal 
emphoverwrite mode/emph./paragraph
+paragraph role=paragraph id=par_id2760101 xml-lang=en-US 
l10n=NEWNote that to drag-and-drop entire rows or columns, you must select 
the rows or columns you want to move (or copy) first, then start dragging from 
selected cells, not from the row or column headers (cells would be deselected 
by this)./paragraph
 paragraph role=paragraph id=par_id9527268 xml-lang=en-US 
l10n=NEWWhen you hold down the switchinline select=syscaseinline 
select=MACOption/caseinlinedefaultinlineAlt/defaultinline/switchinline
 key while releasing the mouse button, you enter the emphinsert 
mode/emph./paragraph
 list type=ordered
 listitem
___
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 14cf3f5eaa3dd6129dde37b5986c07111cf833bf
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Mon Mar 10 20:42:08 2014 +0100

Updated core
Project: help  2438ff53e1730c4af182568294b129de3ea0b28a

fdo#75609 make Calc drag-and-drop help more detailed

Change-Id: I13c66772623c4749e48ae2d4746894a06e388ecb
Reviewed-on: https://gerrit.libreoffice.org/8524
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index 3635fef..2438ff5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3635fef59b1d3dfe275558b5922ed23cbf8958f2
+Subproject commit 2438ff53e1730c4af182568294b129de3ea0b28a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 52/d2a1738ec34eac07de302520dd39f70ef1577e

 52/d2a1738ec34eac07de302520dd39f70ef1577e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit afdc064c95e40a0bf0788f02f781a91cf1c9bf72
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 09:44:28 2014 +

Notes added by 'git notes add'

diff --git a/52/d2a1738ec34eac07de302520dd39f70ef1577e 
b/52/d2a1738ec34eac07de302520dd39f70ef1577e
new file mode 100644
index 000..583daab
--- /dev/null
+++ b/52/d2a1738ec34eac07de302520dd39f70ef1577e
@@ -0,0 +1 @@
+prefer: fc2998738538a8e8abc4b8ab5b84a12aa7365dd0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b8/c4b4e281caaebbcec1cae960b233465ef92297

 b8/c4b4e281caaebbcec1cae960b233465ef92297 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 872d567ded5bcfa26ad4c7a4feb9ced7e7905ed4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 09:45:17 2014 +

Notes added by 'git notes add'

diff --git a/b8/c4b4e281caaebbcec1cae960b233465ef92297 
b/b8/c4b4e281caaebbcec1cae960b233465ef92297
new file mode 100644
index 000..70754ad
--- /dev/null
+++ b/b8/c4b4e281caaebbcec1cae960b233465ef92297
@@ -0,0 +1 @@
+prefer: 78cca63070ae6cf82b45ec3bc75fafa2db31a7f2
___
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/helper/statusindicator.cxx |   19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

New commits:
commit e895da0420253c7d3e1b9bff3abb339bb9dc1218
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Mar 11 11:46:41 2014 +0200

Don't do anything in status indicators on non-desktop for now

Probably it should depend on whether doing tiled rendering or
not. Unclear whether that then can be a compile-time constant, or a
run-time global state, or need to be even more fine-grained.

Change-Id: I8b2f8889e82ecc647ddce915e35eceec121613bd

diff --git a/framework/source/helper/statusindicator.cxx 
b/framework/source/helper/statusindicator.cxx
index 2a94ebe..eb11ce6 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include config_features.h
 
 
-// include files of own module
 #include helper/statusindicator.hxx
 #include threadhelp/readguard.hxx
 #include threadhelp/writeguard.hxx
@@ -45,6 +45,10 @@ void SAL_CALL StatusIndicator::start(const OUString sText ,
sal_Int32nRange)
 throw(css::uno::RuntimeException, std::exception)
 {
+#if !HAVE_FEATURE_DESKTOP
+(void) sText;
+(void) nRange;
+#else
 // SAFE -
 ReadGuard aReadLock(m_aLock);
 css::uno::Reference css::task::XStatusIndicatorFactory  
xFactory(m_xFactory.get(), css::uno::UNO_QUERY);
@@ -55,12 +59,14 @@ void SAL_CALL StatusIndicator::start(const OUString sText ,
 StatusIndicatorFactory* pFactory = 
(StatusIndicatorFactory*)xFactory.get();
 pFactory-start(this, sText, nRange);
 }
+#endif
 }
 
 
 void SAL_CALL StatusIndicator::end()
 throw(css::uno::RuntimeException, std::exception)
 {
+#if HAVE_FEATURE_DESKTOP
 // SAFE -
 ReadGuard aReadLock(m_aLock);
 css::uno::Reference css::task::XStatusIndicatorFactory  
xFactory(m_xFactory.get(), css::uno::UNO_QUERY);
@@ -71,12 +77,14 @@ void SAL_CALL StatusIndicator::end()
 StatusIndicatorFactory* pFactory = 
(StatusIndicatorFactory*)xFactory.get();
 pFactory-end(this);
 }
+#endif
 }
 
 
 void SAL_CALL StatusIndicator::reset()
 throw(css::uno::RuntimeException, std::exception)
 {
+#if HAVE_FEATURE_DESKTOP
 // SAFE -
 ReadGuard aReadLock(m_aLock);
 css::uno::Reference css::task::XStatusIndicatorFactory  
xFactory(m_xFactory.get(), css::uno::UNO_QUERY);
@@ -87,12 +95,16 @@ void SAL_CALL StatusIndicator::reset()
 StatusIndicatorFactory* pFactory = 
(StatusIndicatorFactory*)xFactory.get();
 pFactory-reset(this);
 }
+#endif
 }
 
 
 void SAL_CALL StatusIndicator::setText(const OUString sText)
 throw(css::uno::RuntimeException, std::exception)
 {
+#if !HAVE_FEATURE_DESKTOP
+(void) sText;
+#else
 // SAFE -
 ReadGuard aReadLock(m_aLock);
 css::uno::Reference css::task::XStatusIndicatorFactory  
xFactory(m_xFactory.get(), css::uno::UNO_QUERY);
@@ -103,12 +115,16 @@ void SAL_CALL StatusIndicator::setText(const OUString 
sText)
 StatusIndicatorFactory* pFactory = 
(StatusIndicatorFactory*)xFactory.get();
 pFactory-setText(this, sText);
 }
+#endif
 }
 
 
 void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue)
 throw(css::uno::RuntimeException, std::exception)
 {
+#if !HAVE_FEATURE_DESKTOP
+(void) nValue;
+#else
 // SAFE -
 ReadGuard aReadLock(m_aLock);
 css::uno::Reference css::task::XStatusIndicatorFactory  
xFactory(m_xFactory.get(), css::uno::UNO_QUERY);
@@ -119,6 +135,7 @@ void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue)
 StatusIndicatorFactory* pFactory = 
(StatusIndicatorFactory*)xFactory.get();
 pFactory-setValue(this, nValue);
 }
+#endif
 }
 
 } // namespace framework
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Hi-DPI patches for 4.2

On Tue, Mar 11, 2014 at 3:53 AM, Keith Curtis keit...@gmail.com wrote:

 That picture is bizarre in that the gridlines drawn by Calc are not being
 doubled. Have you fiddled with the OS DPI stuff?


The grid lines are not bitmap, they are vector drawing...
 but more importantly... _WITH_ the #ifdef to prevent the meddling with
bitmap everything looks 'fine'.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/oox oox/source sw/qa sw/source

2014-03-11 Thread Ravindra Vidhate

 include/oox/export/vmlexport.hxx|2 
 oox/source/export/vmlexport.cxx |   27 -
 sw/qa/extras/ooxmlexport/data/pictureWatermark.docx |binary
 sw/qa/extras/ooxmlexport/data/textWatermark.docx|binary
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |   26 
 sw/source/filter/ww8/wrtw8nds.cxx   |   58 +++-
 sw/source/filter/ww8/wrtww8.hxx |2 
 7 files changed, 111 insertions(+), 4 deletions(-)

New commits:
commit ff2f55d6f0a515c8c6e4186e124db28cc4056f5b
Author: Ravindra Vidhate ravindra.vidh...@synerzip.com
Date:   Wed Mar 5 11:38:22 2014 +0530

fdo#35324: Text and picture water are not imported  and not preserved in RT.

Problem : Open docx file which has Text/Picture as water mark.
1. The text is not imported properly also picture water mark is also 
considered as shape.
2. It writes the watermarks in Document.xml, while it should write in only 
Header.xml.

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx

Reviewed on:
https://gerrit.libreoffice.org/8457

Change-Id: Ic988858da25a4cba3ae16e614d920e2e16053a5f

diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 2b414c0..744dbbd 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -90,7 +90,7 @@ public:
 sal_Int16 eVOri = -1, sal_Int16 eHRel = -1,
 sal_Int16 eVRel = -1, const Point* pNdTopLeft = 0, const sal_Bool 
bOOxmlExport = false );
 virtual void  AddSdrObjectVMLObject( const SdrObject rObj);
-
+static bool IsWaterMarkShape(const OUString rStr);
 protected:
 /// Add an attribute to the generated v:shape/ element.
 ///
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 35eeae7..fe82ea0 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -175,7 +175,28 @@ void VMLExport::AddShape( sal_uInt32 nShapeType, 
sal_uInt32 nShapeFlags, sal_uIn
 {
 m_nShapeType = nShapeType;
 m_nShapeFlags = nShapeFlags;
-m_pShapeAttrList-add( XML_id, ShapeIdString( nShapeId ) );
+// If shape is a watermark object - should keep the original shape's name
+// because Microsoft detects if it is a watermark by the actual name
+if (!IsWaterMarkShape(m_pSdrObject-GetName()))
+{
+// Not a watermark object
+m_pShapeAttrList-add( XML_id, ShapeIdString( nShapeId ) );
+}
+else
+{
+// A watermark object - store the optional shape ID also ('o:spid')
+m_pShapeAttrList-add( XML_id, 
OUStringToOString(m_pSdrObject-GetName(), RTL_TEXTENCODING_UTF8) );
+}
+}
+
+bool VMLExport::IsWaterMarkShape(const OUString rStr)
+{
+ if (rStr.isEmpty() )  return false;
+
+ if (rStr.match(OUString(PowerPlusWaterMarkObject)) || 
rStr.match(OUString(WordPictureWatermark)))
+return true;
+ else
+return false;
 }
 
 static void impl_AddArrowHead( sax_fastparser::FastAttributeList *pAttrList, 
sal_Int32 nElement, sal_uInt32 nValue )
@@ -787,7 +808,9 @@ void VMLExport::Commit( EscherPropertyContainer rProps, 
const Rectangle rRect
 aStream.Seek(0);
 OUString idStr = 
SvxMSDffManager::MSDFFReadZString(aStream, it-nPropSize, true);
 aStream.Seek(0);
-m_pShapeAttrList-add(XML_ID, OUStringToOString(idStr, 
RTL_TEXTENCODING_UTF8));
+if (!IsWaterMarkShape(m_pSdrObject-GetName()))
+ m_pShapeAttrList-add(XML_ID, 
OUStringToOString(idStr, RTL_TEXTENCODING_UTF8));
+
 bAlreadyWritten[ESCHER_Prop_wzName] = true;
 }
 break;
diff --git a/sw/qa/extras/ooxmlexport/data/pictureWatermark.docx 
b/sw/qa/extras/ooxmlexport/data/pictureWatermark.docx
new file mode 100644
index 000..b526ecf
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/pictureWatermark.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/textWatermark.docx 
b/sw/qa/extras/ooxmlexport/data/textWatermark.docx
new file mode 100644
index 000..c8bff75
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/textWatermark.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 8842cdd..d46f583 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -911,6 +911,32 @@ DECLARE_OOXMLEXPORT_TEST(testDkVert, dkvert.docx)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(25), getPropertydrawing::Hatch(xShape, 
FillHatch).Distance);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTextWatermark, textWatermark.docx)
+{
+//The problem was that the watermark ID was not preserved,
+//and Word uses the object ID to identify if it is a watermark.
+//It has to have the 'PowerPlusWaterMarkObject' string in it
+xmlDocPtr pXmlHeader1 =

[Libreoffice-commits] core.git: sc/source

2014-03-11 Thread Steve Yin

 sc/source/ui/Accessibility/AccessibleDocument.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a96ac994f0fc4fc52dab7a496a8485d3eba10913
Author: Steve Yin stev...@apache.org
Date:   Tue Mar 11 05:53:58 2014 +

Resolves: #i123622# [ia2] Calc: No focus event fired on cell...

when new spreadsheet is created

(cherry picked from commit 572001d5865e4d11523e72a506e9a6eca7f23786)

Change-Id: I10212bf9ddeb9eb06c1d9105951a5eb9d8578029

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 40b0f77..9f2db91 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1648,6 +1648,8 @@ void ScAccessibleDocument::Notify( SfxBroadcaster rBC, 
const SfxHint rHint )
 
 if (mpAccessibleSpreadsheet)
 mpAccessibleSpreadsheet-BoundingBoxChanged();
+if (mpAccessibleSpreadsheet  mpViewShell-IsActive())
+mpAccessibleSpreadsheet-FireFirstCellFocus();
 }
 else if (mpAccessibleSpreadsheet)
 {
@@ -2260,7 +2262,6 @@ uno::Reference  XAccessible 
 mpAccessibleSpreadsheet-acquire();
 mpAccessibleSpreadsheet-Init();
 mbCompleteSheetSelected = IsTableSelected();
-mpAccessibleSpreadsheet-FireFirstCellFocus(); // i123622
 }
 return mpAccessibleSpreadsheet;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 57/2001d5865e4d11523e72a506e9a6eca7f23786

 57/2001d5865e4d11523e72a506e9a6eca7f23786 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e53987a22cb0496a3075b17b629bb49ed3470b76
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 10:04:41 2014 +

Notes added by 'git notes add'

diff --git a/57/2001d5865e4d11523e72a506e9a6eca7f23786 
b/57/2001d5865e4d11523e72a506e9a6eca7f23786
new file mode 100644
index 000..f9b985f
--- /dev/null
+++ b/57/2001d5865e4d11523e72a506e9a6eca7f23786
@@ -0,0 +1 @@
+merged as: a96ac994f0fc4fc52dab7a496a8485d3eba10913
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - toolkit/source

 toolkit/source/helper/accessibilityclient.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0ceeab004f3e448322bf5a0119f779443bb42b91
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Mar 10 12:33:53 2014 +

coverity#708535 Uninitialized scalar field

Change-Id: Ife2acd5dd5193edd0ca34d85370885ee6865fadd
(cherry picked from commit ecc6239f5b7decfc61b68e745175982fdeee931e)
Reviewed-on: https://gerrit.libreoffice.org/8512
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com

diff --git a/toolkit/source/helper/accessibilityclient.cxx 
b/toolkit/source/helper/accessibilityclient.cxx
index 9ab29d0..43912aa 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -145,6 +145,7 @@ namespace toolkit
 
 //
 AccessibleDummyFactory::AccessibleDummyFactory()
+: m_refCount(0)
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Hi-DPI patches for 4.2

2014-03-11 Thread Keith Curtis

On Tue, Mar 11, 2014 at 4:57 AM, Norbert Thiebaud nthieb...@gmail.com wrote:


 On Tue, Mar 11, 2014 at 3:53 AM, Keith Curtis keit...@gmail.com wrote:

 That picture is bizarre in that the gridlines drawn by Calc are not being
 doubled. Have you fiddled with the OS DPI stuff?


 The grid lines are not bitmap, they are vector drawing...
  but more importantly... _WITH_ the #ifdef to prevent the meddling with
 bitmap everything looks 'fine'.



Yes, but according to the docs, in compatibility mode, Any
vector-based drawing performed by an app is scaled for high
resolution

https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/Explained/Explained.html#//apple_ref/doc/uid/TP40012302-CH4-SW5

The Mac LibreOffice screenshots in bug reports I have seen have
doubled vector drawing. I think there is something wrong with your
build. In any case, if you feel something should be done for the Mac,
the simplest thing is to add two #ifdefs to force the DPIScaleFactor
to 1 for the Mac:

https://gerrit.libreoffice.org/#/c/8516/1/vcl/source/window/window.cxx,cm

That would turn off all bitmap doubling in a very localized place.
What do you think about that?

-Keith
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/oox oox/CustomTarget_generated.mk oox/source sc/source writerfilter/source

 include/oox/core/contexthandler.hxx |1 
 include/oox/core/filterbase.hxx |5 -
 include/oox/core/relations.hxx  |   11 ++-
 include/oox/core/xmlfilterbase.hxx  |2 
 include/oox/token/namespacemap.hxx  |   11 ++-
 oox/CustomTarget_generated.mk   |5 -
 oox/source/core/contexthandler.cxx  |5 +
 oox/source/core/fastparser.cxx  |   19 -
 oox/source/core/filterdetect.cxx|3 
 oox/source/core/relations.cxx   |   37 ++
 oox/source/core/xmlfilterbase.cxx   |   36 +-
 oox/source/docprop/ooxmldocpropimport.cxx   |9 ++
 oox/source/drawingml/graphicshapecontext.cxx|   14 ++--
 oox/source/ppt/dgmimport.cxx|2 
 oox/source/ppt/pptimport.cxx|4 -
 oox/source/ppt/presentationfragmenthandler.cxx  |   10 +-
 oox/source/ppt/slidefragmenthandler.cxx |4 -
 oox/source/shape/ShapeContextHandler.cxx|2 
 oox/source/token/namespacemap.cxx   |   12 +++
 oox/source/token/namespaces-strict.txt  |   82 
 oox/source/token/namespaces.pl  |   31 -
 sc/source/filter/inc/sheetdatabuffer.hxx|2 
 sc/source/filter/oox/excelfilter.cxx|2 
 sc/source/filter/oox/externallinkbuffer.cxx |8 --
 sc/source/filter/oox/sheetdatabuffer.cxx|   13 +++
 sc/source/filter/oox/sheetdatacontext.cxx   |3 
 sc/source/filter/oox/workbookfragment.cxx   |   17 ++--
 sc/source/filter/oox/worksheetfragment.cxx  |8 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |   12 ++-
 writerfilter/source/ooxml/OOXMLStreamImpl.cxx   |   32 +
 30 files changed, 348 insertions(+), 54 deletions(-)

New commits:
commit 585bd120327508ad68816c8005cb36e1d3116351
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Fri Feb 28 10:39:56 2014 +0100

handle OOXML strict namespaces

Change-Id: I198862388426161e3f054a5f128639c59f3c9d24

support OOXML strict documents in Calc

Conflicts:
oox/source/core/relations.cxx

Change-Id: I277d76aeec28e173d913ccc1506464afe4d09c6d

import date cells from OOXML

Change-Id: Id0b9ec034d559d489ca4ee2d1d6aca1bdf1beb9d

no need to add another layer of macros

Change-Id: I49992559a7d10127d55dbf0c7e257c86619fd8d6

fix one more relation type for OOXML strict

Change-Id: Ia63309271ac225883540ca0453fc5da21844d3ad

make more places aware of OOXML strict relations

Change-Id: I292217537eb592cbad9af11f87402baa9f4cc442

fix strict namespace list generation

The two perl scripts were apparently only generating the same order by
luck. It did not work on all systems.

Change-Id: Ib83ee5c6572d3bae2e2ac1846850bd65303e7d43

allow OOXML strict relationships in writer

Conflicts:
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
writerfilter/source/ooxml/OOXMLStreamImpl.cxx

Change-Id: I1c09280f68467748faedee19c4a66be3bc7d7aa3

make sure the two namespace lists are sorted the same way

Change-Id: I90b3182e10dbbfc8993010dd885509537d2fe537

fix OOXML strict chart import

Change-Id: I84a2fd575ced64d4774147063f13ebb8605c100f

add the xml strict namespaces to misc/namespaces.txt

Change-Id: Ie83b5c94f1f002851bff3b39b1d9b676a3e44aa1
Reviewed-on: https://gerrit.libreoffice.org/8515
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/include/oox/core/contexthandler.hxx 
b/include/oox/core/contexthandler.hxx
index 6111f98..468c8ce 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -71,6 +71,7 @@ public:
 OUString getFragmentPathFromRelId( const OUString rRelId ) const;
 /** Returns the full fragment path for the first relation of the passed 
type. */
 OUString getFragmentPathFromFirstType( const OUString rType ) const;
+OUString getFragmentPathFromFirstTypeFromOfficeDoc( const OUString 
rType ) const;
 
 // com.sun.star.xml.sax.XFastContextHandler interface -
 
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index 6280f9d..03881fc 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_OOX_CORE_FILTERBASE_HXX
 #define INCLUDED_OOX_CORE_FILTERBASE_HXX
 
-#include memory
 #include com/sun/star/beans/NamedValue.hpp
 #include com/sun/star/document/XExporter.hpp
 #include com/sun/star/document/XFilter.hpp
@@ -37,6 +36,8 @@
 #include oox/helper/storagebase.hxx
 #include oox/dllapi.h
 
+#include boost/scoped_ptr.hpp
+
 namespace com { namespace sun { namespace star {
 namespace awt { struct

[Libreoffice-commits] core.git: 11 commits - configure.ac connectivity/Library_postgresql-sdbc-impl.mk connectivity/Module_connectivity.mk external/curl external/hsqldb external/icu external/libxml2 e

 Makefile.in   |2 
 Repository.mk |4 -
 RepositoryModule_build.mk |2 
 configure.ac  |   70 ++
 connectivity/Library_postgresql-sdbc-impl.mk  |4 -
 connectivity/Module_connectivity.mk   |4 -
 external/Module_external.mk   |2 
 external/curl/ExternalProject_curl.mk |4 -
 external/hsqldb/UnpackedTarball_hsqldb.mk |2 
 external/icu/ExternalProject_icu.mk   |4 -
 external/libxml2/ExternalProject_xml2.mk  |4 -
 external/libxmlsec/ExternalProject_xmlsec.mk  |4 -
 external/libxslt/ExternalProject_xslt.mk  |4 -
 external/lpsolve/ExternalProject_lpsolve.mk   |4 -
 external/mingw-externals/Package_mingw_gccdlls.mk |4 -
 external/moz/Module_moz.mk|2 
 external/msc-externals/Module_msc-externals.mk|2 
 external/nss/ExternalProject_nss.mk   |6 -
 external/openssl/opensslmingw.patch   |4 -
 external/postgresql/ExternalProject_postgresql.mk |4 -
 external/python3/ExternalProject_python3.mk   |2 
 external/redland/ExternalProject_raptor.mk|2 
 external/redland/ExternalProject_rasqal.mk|2 
 external/redland/ExternalProject_redland.mk   |2 
 extras/Module_extras.mk   |2 
 mysqlc/Extension_mysql-connector-ooo.mk   |2 
 mysqlc/Library_mysqlc.mk  |3 
 odk/Module_odk.mk |2 
 odk/Package_unowinreg.mk  |4 -
 postprocess/CustomTarget_registry.mk  |4 -
 postprocess/Rdb_services.mk   |2 
 solenv/gbuild/Tempfile.mk |2 
 solenv/gbuild/UnpackedTarball.mk  |2 
 33 files changed, 81 insertions(+), 86 deletions(-)

New commits:
commit 16986df5610e062e0b5e09ea10441b2647d4ae6b
Author: Michael Stahl mst...@redhat.com
Date:   Tue Mar 11 11:09:57 2014 +0100

normalize values of WITH_MOZAB4WIN

Change-Id: Iad5aa66635a34a4dfceb0bd6145f2d9bd197cc17

diff --git a/Repository.mk b/Repository.mk
index 204a16b..a97f652 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -375,11 +375,11 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(DISABLE_ATL),,oleautobridge) \
smplmail \
wininetbe1 \
-   $(if $(filter YES,$(WITH_MOZAB4WIN)), \
+   $(if $(WITH_MOZAB4WIN), \
mozab2 \
mozabdrv \
) \
-   $(if $(filter NO,$(WITH_MOZAB4WIN)),mozbootstrap) \
+   $(if $(WITH_MOZAB4WIN),,mozbootstrap) \
) \
$(if $(filter $(OS),WNT),, \
mork \
diff --git a/configure.ac b/configure.ac
index c5a3d8a..6c453e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8679,7 +8679,7 @@ dnl 
===
 if test $_os = WINNT; then
 AC_MSG_CHECKING([whether to enable build of Mozilla addressbook 
connectivity driver for Windows])
 if test $enable_win_mozab_driver = yes -a $WITH_MINGW != YES ; then
-WITH_MOZAB4WIN=YES
+WITH_MOZAB4WIN=TRUE
 AC_MSG_RESULT([yes, internal (old windows mozab driver)])
 BUILD_TYPE=$BUILD_TYPE MOZ
 MSVC80_DLLS=msvcp80.dll msvcr80.dll Microsoft.VC80.CRT.manifest
@@ -8691,7 +8691,7 @@ if test $_os = WINNT; then
 done
 else
 AC_MSG_RESULT([no])
-WITH_MOZAB4WIN=NO
+WITH_MOZAB4WIN=
 fi
 fi
 AC_SUBST(WITH_MOZAB4WIN)
diff --git a/connectivity/Module_connectivity.mk 
b/connectivity/Module_connectivity.mk
index 8d2253c..210a477 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -104,7 +104,7 @@ endif
 
 ifeq ($(OS),WNT)
 
-ifeq ($(WITH_MOZAB4WIN),YES)
+ifneq ($(WITH_MOZAB4WIN),)
 $(eval $(call gb_Module_add_targets,connectivity,\
Configuration_mozab \
Library_mozab \
diff --git a/external/moz/Module_moz.mk b/external/moz/Module_moz.mk
index 9c4a245..3f4b6ef 100644
--- a/external/moz/Module_moz.mk
+++ b/external/moz/Module_moz.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,moz))
 
-ifeq ($(WITH_MOZAB4WIN),YES)
+ifneq ($(WITH_MOZAB4WIN),)
 
 $(eval $(call gb_Module_add_targets,moz,\
ExternalPackage_runtime \
diff --git a/external/msc-externals/Module_msc-externals.mk 
b/external/msc-externals/Module_msc-externals.mk
index 8790e4f..58a2195 100644
--- a/external/msc-externals/Module_msc-externals.mk
+++ b/external/msc-externals/Module_msc-externals.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,msc-externals))
 $(eval $(call gb_Module_add_targets,msc-externals,\
$(if

[Libreoffice-commits] core.git: Changes to 'private/jmux/libreoffice-4-1+kde4+mitigate'

2014-03-11 Thread Jan-Marek Glogowski

New branch 'private/jmux/libreoffice-4-1+kde4+mitigate' available with the 
following commits:
commit 833aa0de53c5a57d6817604fb05843e5f77f510c
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Mar 11 12:28:09 2014 +0100

KDE4: sleep in yield for native file picker

As it seems to be the only way to poll the clipboard, reintroduce

 m_pApplication-clipboard()-setProperty(
useEventLoopWhenWaiting, true );

To prevent crashes, disable event processing in the Qt thread while
the dialog is open.

Instead this applies the same workaround as the Windows backend to
sleep a ms, which keeps the FP dialogs more usable, but feels like
a horrible workaround.

This is still slower then running processEvent in Yield but still
much better then the current situation.

(cherry picked from commit 380f3b4b6cbbe8e82b58ddf55e95c5005307b51f)

Conflicts:

vcl/unx/kde4/KDE4FilePicker.cxx
vcl/unx/kde4/KDE4FilePicker.hxx
vcl/unx/kde4/KDEXLib.cxx
vcl/unx/kde4/KDEXLib.hxx

Change-Id: I10c422f1c0d7448d4a7ad28e57a32ed2cb42f48f

commit 235d823e08c824b306bc448293b62b1c7c450d2d
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Thu Nov 21 12:40:57 2013 +0100

fdo#67011: Run Display::Yield through KDEXLib::Yield.

Drag'n'Drop is handled in a second thread, which tries to yield
the display while the main Qt thread probably is already
yielding. Both need the YieldMutex, which freezes the application
until the D'n'D thread times out.

Trying to yield the display throught the application yield
results in a recursive loop.

So this catches and breaks the recursion, but just inside the Qt
thread, so other processes can yield on the display, instead
of simply disabling the Display::Yield.

Change-Id: Ifba91aa89fe5b0a89cc94820935dc996a065112f
Reviewed-on: https://gerrit.libreoffice.org/6750
Tested-by: Jan-Marek Glogowski glo...@fbihome.de
Reviewed-by: Jan-Marek Glogowski glo...@fbihome.de
(cherry picked from commit 95f60222e75486336b6569afa8f34d60b51c94ad)

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC] On ODF Formulas in Writer

Hi Matteo,

On Sun, Mar 09, 2014 at 01:21:37AM -0500, Matteo Campanelli
matteo.campane...@gmail.com wrote:
I am planning to apply to GSoC '14 and a few weeks ago I started hacking
LibreOffice (I've been working on this Easy
Hackhttps://bugs.freedesktop.org/show_bug.cgi?id=53472
).

Great! :-) Please don't forget to push your patch for review once you're
happy with it.

I'm writing to start a discussion and ask some questions on the idea
project in the subject of this email
([1https://wiki.documentfoundation.org/Development/GSoC/Ideas#ODF_Formulas_in_Writer
]).

Also - most important question (!!) - would there be anyone interested in
mentoring this project?

AFAIK the project idea is from Cédric, but he's not mentoring Writer
projects this year. This doesn't mean you can't propose to work on this
project, but it's not the best Writer project you could pick up. ;-)

My understanding of the issue:
- Currently Writer uses its own, non-standard syntax for formulas. At the
moment this syntax is both what is used/typed by the user and the one used
for internal computations. (At a first glance, the class
SwCalchttp://opengrok.libreoffice.org/search?q=project=coredefs=SwCalcrefs=path=hist=seems
to be responsible for both parsing and interpreting these formulas,
is that right?)

Yes, that sounds correct.

- The goal of the project would be to enable users to write formulas in the
ODF Format
[2]http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part2.html
and use this same format for the internal computations.

Correct, what's currently written is like this:

table:table-cell table:style-name=Table1.B1
table:formula=ooow:lt;A1gt;+lt;A2gt; office:value-type=float
office:value=3

The ooow part clearly indicates that it's something LO inherited from
OOo.

- As far as I have understood, we may use the ixion library
[3]https://gitorious.org/ixion to
interpret ODF-style formulas. This library is already used by Writer for
interpreting formulas in doc/docx files (which, I suppose, are first
converted to the actual ODF format). [is this point of my interpretation
correct? Could anyone provide code pointers for the computation of formula
for .doc files?]

The ixion library is currently not part of LibreOffice in any way.
Regarding, .doc files, this is not handled in the filter (AFACS), just
the result of the formula is written to the file as a plain string.

- Part of the project will have to deal with import/export filters and
backward compatibility: first, files with formulas in the old-syntax should
still be parsed correctly; second, users should have the option of saving
in the old syntax or in the default new ODF syntax.

We have a general mechanism for that, in ODF 1.2 extended, probably you
could just write the new syntax, and you only need to make sure that the
old syntax can be read.

Also, I have two additional questions:
- the project idea page mentions changes in the code for the formula input
bar. What should these changes to the UI consist of specifically? Are they
mostly related to the strings produced by using the Formula dropdown menu
in the bar?
- Can anyone who is into the code roughly assess the relative hardness of
the three subparts of this project (i.e. refactoring to use ODF and
delegation to ixion, changes in the UI, adapting import/export filters)? In
other words, which of these parts (if any) is likely to take longer
compared to the others?

Probably the largest part is to make Writer core use the ODF formulas
(with the help of ixion), after that the ODF import/export is just
filter work, much easier. Regarding UI, it's about to change it, so that
it generates the ODF-syntax formulas, that's probably something you can
do incrementally once core support is there.

Additionally here, is a starter patch:

http://cgit.freedesktop.org/libreoffice/build/tree/patches/dev300/fields-table-formula.diff?h=master-backup

If you're interested in this project, you probably want to start with
porting that to current master. :-)

However, for now, I would suggest focusing getting your easy hack ready
accepted; that's required even in case at the end you're interested in
some other LibreOffice idea.

Best,

Miklos

signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'private/jmux/libreoffice-4-1+kde4' - config_host/config_kde4.h.in config_host.mk.in configure.ac vcl/Library_vclplug_kde4.mk vcl/unx

2014-03-11 Thread Jan-Marek Glogowski

 config_host.mk.in   |3 +-
 config_host/config_kde4.h.in|4 ++-
 configure.ac|   23 +++---
 vcl/Library_vclplug_kde4.mk |9 +--
 vcl/unx/kde4/KDE4FilePicker.cxx |8 --
 vcl/unx/kde4/KDEData.cxx|2 +
 vcl/unx/kde4/KDESalInstance.cxx |2 +
 vcl/unx/kde4/KDESalInstance.hxx |4 +++
 vcl/unx/kde4/KDEXLib.cxx|   50 
 9 files changed, 56 insertions(+), 49 deletions(-)

New commits:
commit b9dec0ff964002432deb6ec49a5bfb3e7cdb8dec
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Mon Mar 10 15:05:22 2014 +

KDE4: Don't use native file pickers per default.

Add a configure option to build with native KDE4 file pickers and
disable them. Even with all the workarounds applied it's impossible
to work around the bug in the Qt4 glib event loop, which doesn't
ignore socket events when polling the clipboard through QClipboard.

See https://bugreports.qt-project.org/browse/QTBUG-37380.

Change-Id: I5cad30ead74571e49a075c084cca7a19acff7523

diff --git a/config_host.mk.in b/config_host.mk.in
index 175bab3..6dacd73 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -222,10 +222,12 @@ export 
HAVE_GCC_VISIBILITY_BROKEN=@HAVE_GCC_VISIBILITY_BROKEN@
 export HAVE_GCC_VISIBILITY_FEATURE=@HAVE_GCC_VISIBILITY_FEATURE@
 export HAVE_GETOPT=@HAVE_GETOPT@
 export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
+export HAVE_KDE4_NATIVE_FILE_PICKER=@HAVE_KDE4_NATIVE_FILE_PICKER@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
 export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
 export 
HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@
 export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
+export HAVE_QT4_GLIB=@HAVE_QT4_GLIB@
 export HAVE_READDIR_R=@HAVE_READDIR_R@
 export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@
 export HOST_PLATFORM=@host@
@@ -272,7 +274,6 @@ export KDE4_LIBS=$(gb_SPACE)@KDE4_LIBS@
 export KDE_CFLAGS=$(gb_SPACE)@KDE_CFLAGS@
 export KDE_GLIB_CFLAGS=$(gb_SPACE)@KDE_GLIB_CFLAGS@
 export KDE_GLIB_LIBS=$(gb_SPACE)@KDE_GLIB_LIBS@
-export KDE_HAVE_GLIB=@KDE_HAVE_GLIB@
 export KDE_LIBS=$(gb_SPACE)@KDE_LIBS@
 export KRB5_LIBS=@KRB5_LIBS@
 export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@
diff --git a/config_host/config_kde4.h.in b/config_host/config_kde4.h.in
index 6e91b38..2c7af8e 100644
--- a/config_host/config_kde4.h.in
+++ b/config_host/config_kde4.h.in
@@ -5,6 +5,8 @@ Settings for KDE4 integration.
 #ifndef CONFIG_KDE4_H
 #define CONFIG_KDE4_H
 
-#define KDE_HAVE_GLIB 0
+#define HAVE_QT4_GLIB 0
+
+#define HAVE_KDE4_NATIVE_FILE_PICKER 0
 
 #endif
diff --git a/configure.ac b/configure.ac
index 1662258..7eba7c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -978,6 +978,15 @@ AC_ARG_ENABLE(kde4,
  both KDE3 and KDE4.]),
 ,)
 
+AC_ARG_ENABLE(kde4-native-file-picker,
+AS_HELP_STRING([--enable-kde4-native-file-picker],
+[Just enable the native KDE4 file picker, if you have a Qt4 version,
+ which includes the patch from
+ https://bugreports.qt-project.org/browse/QTBUG-37380. Otherwise
+ Libre Office will quite often crash with native file picker
+ dialogs!]),
+,)
+
 AC_ARG_ENABLE(headless,
 AS_HELP_STRING([--enable-headless],
 [Disable building of GUIs to reduce dependencies. Useful for
@@ -10376,7 +10385,8 @@ QMAKE4=qmake
 MOC4=moc
 KDE_GLIB_CFLAGS=
 KDE_GLIB_LIBS=
-KDE_HAVE_GLIB=
+HAVE_QT4_GLIB=
+HAVE_KDE4_NATIVE_FILE_PICKER=
 if test $test_kde4 = yes -a $ENABLE_KDE4 = TRUE; then
 qt_incdirs=$QT4INC /usr/include/qt4 /usr/include $x_includes
 qt_libdirs=$QT4LIB /usr/lib/qt4 /usr/lib $x_libraries
@@ -10533,8 +10543,12 @@ int main(int argc, char **argv) {
 # Sets also KDE_GLIB_CFLAGS/KDE_GLIB_LIBS if successful.
 PKG_CHECK_MODULES(KDE_GLIB,[glib-2.0 = 2.4],
 [
-KDE_HAVE_GLIB=1
-AC_DEFINE(KDE_HAVE_GLIB,1)
+HAVE_QT4_GLIB=1
+AC_DEFINE(HAVE_QT4_GLIB)
+if test x$enable_kde4_native_file_picker = xyes; then
+HAVE_KDE4_NATIVE_FILE_PICKER=1
+AC_DEFINE(HAVE_KDE4_NATIVE_FILE_PICKER)
+fi
 ],
 AC_MSG_WARN([[No Glib found, KDE4 support will not integrate with Qt's 
Glib event loop support]]))
 fi
@@ -10543,7 +10557,8 @@ AC_SUBST(KDE4_LIBS)
 AC_SUBST(MOC4)
 AC_SUBST(KDE_GLIB_CFLAGS)
 AC_SUBST(KDE_GLIB_LIBS)
-AC_SUBST(KDE_HAVE_GLIB)
+AC_SUBST(HAVE_QT4_GLIB)
+AC_SUBST(HAVE_KDE4_NATIVE_FILE_PICKER)
 
 dnl ===
 dnl Test for the enabling the lockdown pieces
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 45e1042..f40f26b 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -64,7 +64,7 @@ $(eval $(call gb_Library_add_libs,vclplug_kde4,\
-lICE \
 ))
 
-ifneq ($(KDE_HAVE_GLIB),)
+ifneq ($(HAVE_QT4_GLIB),)
 $(eval $(call

Re: [GSoC] On ODF Formulas in Writer

On 11/03/14 12:29, Miklos Vajna wrote:
 Hi Matteo,
 
 On Sun, Mar 09, 2014 at 01:21:37AM -0500, Matteo Campanelli 
 matteo.campane...@gmail.com wrote:

 I'm writing to start a discussion and ask some questions on the idea
 project in the subject of this email
 ([1https://wiki.documentfoundation.org/Development/GSoC/Ideas#ODF_Formulas_in_Writer
 ]).

 Also - most important question (!!) - would there be anyone interested in
 mentoring this project?
 
 AFAIK the project idea is from Cédric, but he's not mentoring Writer
 projects this year. This doesn't mean you can't propose to work on this
 project, but it's not the best Writer project you could pick up. ;-)

right, and i dont' know much anything about formulas either.

 - The goal of the project would be to enable users to write formulas in the
 ODF Format 
 [2]http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part2.html
 and use this same format for the internal computations.
 
 Correct, what's currently written is like this:
 
 table:table-cell table:style-name=Table1.B1 
 table:formula=ooow:lt;A1gt;+lt;A2gt; office:value-type=float 
 office:value=3
 
 The ooow part clearly indicates that it's something LO inherited from
 OOo.

it also indicates it's not standard ODF.

 - As far as I have understood, we may use the ixion library
 [3]https://gitorious.org/ixion to
 interpret ODF-style formulas. This library is already used by Writer for
 interpreting formulas in doc/docx files (which, I suppose, are first
 converted to the actual ODF format). [is this point of my interpretation
 correct? Could anyone provide code pointers for the computation of formula
 for .doc files?]
 
 The ixion library is currently not part of LibreOffice in any way.
 Regarding, .doc files, this is not handled in the filter (AFACS), just
 the result of the formula is written to the file as a plain string.

that is the part of the idea proposal that i'm not sure about currently:

just using this ixion library for Writer formulas would put us in a
similar situation like what we currently are with text edition
components, where Writer has its own core and everything else uses
EditEngine instead; this duplication creates additional maintenance burden.

of course there are a lot of formulas (ODF part 2 is hundreds of pages),
and to me it appears quite sub-optimal to have multiple implementations
of all that.

there is already a formula module which Eike claims is not just used
by Calc but also by some Report(Builder/Designer/whatever) application,
which means it would probably be possible to use this from Writer too.

the problem is that apparently formula only contains the code to parse
and tokenize formulas; the actual evaluation is still in Calc's core and
tied to Calc's internals.

so i would welcome some input on what the architecture should look like
here:

1) is it possible to somehow abstract the formula evaluation
   implementations from Calc internals (suppose it's mostly about
   addressing/accessing the cells?) such that it could be used from
   Writer too?

2) would it be a good long-term plan to migrate Calc to ixion too so we
   eventually end up with just one formula evaluation engine?

3) or is it unrealistic to ever share the formula evaluation part?

 - Part of the project will have to deal with import/export filters and
 backward compatibility: first, files with formulas in the old-syntax should
 still be parsed correctly; second, users should have the option of saving
 in the old syntax or in the default new ODF syntax.
 
 We have a general mechanism for that, in ODF 1.2 extended, probably you
 could just write the new syntax, and you only need to make sure that the
 old syntax can be read.

yep, that is just a simple matter of programming.

 Also, I have two additional questions:
 - the project idea page mentions changes in the code for the formula input
 bar. What should these changes to the UI consist of specifically? Are they
 mostly related to the strings produced by using the Formula dropdown menu
 in the bar?

i think we shouldn't even start thinking about any UI changes until the
core work is mostly done, since the amount of time required there is
very difficult to predict.

 However, for now, I would suggest focusing getting your easy hack ready
  accepted; that's required even in case at the end you're interested in
 some other LibreOffice idea.

absolutely - here are usually more GSoC applicants than available
mentors, and the most important thing to get accepted is to show that
you can get useful work done.  if we find that this one won't work out,
it's always possible to choose a different GSoC project.

regards,
 michael

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - comphelper/source dbaccess/source include/comphelper

 comphelper/source/property/propstate.cxx|2 +-
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx  |9 -
 dbaccess/source/core/api/query.cxx  |7 ++-
 dbaccess/source/core/api/query.hxx  |6 --
 dbaccess/source/core/api/querydescriptor.cxx|8 +++-
 dbaccess/source/core/api/querydescriptor.hxx|6 --
 dbaccess/source/core/dataaccess/ComponentDefinition.cxx |7 ++-
 dbaccess/source/core/dataaccess/ComponentDefinition.hxx |6 --
 dbaccess/source/core/dataaccess/commandcontainer.cxx|8 +++-
 dbaccess/source/core/dataaccess/commandcontainer.hxx|6 +-
 dbaccess/source/core/dataaccess/commanddefinition.cxx   |7 ++-
 dbaccess/source/core/dataaccess/commanddefinition.hxx   |6 --
 dbaccess/source/core/dataaccess/definitioncontainer.cxx |9 -
 dbaccess/source/core/dataaccess/documentcontainer.cxx   |9 -
 dbaccess/source/core/dataaccess/documentcontainer.hxx   |8 ++--
 dbaccess/source/core/dataaccess/documentdefinition.cxx  |8 +++-
 dbaccess/source/core/dataaccess/documentdefinition.hxx  |6 --
 dbaccess/source/core/inc/SingleSelectQueryComposer.hxx  |7 +--
 dbaccess/source/core/inc/definitioncontainer.hxx|7 +--
 dbaccess/source/ui/uno/ColumnModel.cxx  |8 +++-
 dbaccess/source/ui/uno/ColumnModel.hxx  |6 --
 dbaccess/source/ui/uno/composerdialogs.cxx  |6 +-
 dbaccess/source/ui/uno/composerdialogs.hxx  |3 ++-
 dbaccess/source/ui/uno/textconnectionsettings_uno.cxx   |   11 +--
 dbaccess/source/ui/uno/unoDirectSql.cxx |6 +-
 dbaccess/source/ui/uno/unoDirectSql.hxx |3 ++-
 include/comphelper/propstate.hxx|3 +--
 27 files changed, 140 insertions(+), 38 deletions(-)

New commits:
commit cfedbdea58e01bb93ab30316f7cac7dc31fba3dd
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Mar 11 13:02:59 2014 +0100

Remove newly unused getUnoTunnelImplementationId functions

...after recent clean-up of getImplementationId implementations.

Change-Id: I2a11f6ddf03dc7852b7e8e50dc6284a7215a0113

diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx 
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 2bfb62b..3b028ef 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -297,7 +297,14 @@ void SAL_CALL OSingleSelectQueryComposer::disposing(void)
 
 
IMPLEMENT_FORWARD_XINTERFACE3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
 
IMPLEMENT_SERVICE_INFO1(OSingleSelectQueryComposer,org.openoffice.comp.dba.OSingleSelectQueryComposer,SERVICE_NAME_SINGLESELECTQUERYCOMPOSER)
-IMPLEMENT_TYPEPROVIDER3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
+
+css::uno::Sequencesal_Int8 OSingleSelectQueryComposer::getImplementationId()
+throw (css::uno::RuntimeException, std::exception)
+{
+return css::uno::Sequencesal_Int8();
+}
+
+IMPLEMENT_GETTYPES3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
 IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OSingleSelectQueryComposer)
 
 // XSingleSelectQueryAnalyzer
diff --git a/dbaccess/source/core/api/query.cxx 
b/dbaccess/source/core/api/query.cxx
index 218a049..43ce3a2 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -108,7 +108,12 @@ OQuery::~OQuery()
 {
 }
 
-IMPLEMENT_IMPLEMENTATION_ID(OQuery);
+css::uno::Sequencesal_Int8 OQuery::getImplementationId()
+throw (css::uno::RuntimeException, std::exception)
+{
+return css::uno::Sequencesal_Int8();
+}
+
 IMPLEMENT_GETTYPES3(OQuery,OQueryDescriptor_Base,ODataSettings,OContentHelper);
 IMPLEMENT_FORWARD_XINTERFACE3( 
OQuery,OContentHelper,OQueryDescriptor_Base,ODataSettings)
 
diff --git a/dbaccess/source/core/api/query.hxx 
b/dbaccess/source/core/api/query.hxx
index c34c57a..9ded24f 100644
--- a/dbaccess/source/core/api/query.hxx
+++ b/dbaccess/source/core/api/query.hxx
@@ -97,8 +97,10 @@ public:
 const ::com::sun::star::uno::Reference 
::com::sun::star::uno::XComponentContext  _xORB
 );
 
-// com::sun::star::lang::XTypeProvider
-DECLARE_TYPEPROVIDER( );
+virtual css::uno::Sequencecss::uno::Type SAL_CALL getTypes()
+throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+virtual css::uno::Sequencesal_Int8 SAL_CALL getImplementationId()
+throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 // ::com::sun::star::uno::XInterface
 DECLARE_XINTERFACE( )
diff --git a/dbaccess/source/core/api/querydescriptor.cxx 
b/dbaccess/source/core/api/querydescriptor.cxx
index c9137a0..6231224 100644

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/source

2014-03-11 Thread Herbert Dürr

 dbaccess/source/ui/dlg/adminpages.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 37c323d4bb5a6ead8c456dc3c75053b847a39436
Author: Herbert DÃ¼rr h...@apache.org
Date:   Tue Mar 11 10:43:15 2014 +

#i124401# add a virtual destructor to dbaui::ISaveValueWrapper

because dbaui::TDeleteWrapperFunctor needs it to delete its derived classes

diff --git a/dbaccess/source/ui/dlg/adminpages.hxx 
b/dbaccess/source/ui/dlg/adminpages.hxx
index 43e4ba4..1ee532d 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -54,6 +54,7 @@ namespace dbaui
 class SAL_NO_VTABLE ISaveValueWrapper
 {
 public:
+virtual ~ISaveValueWrapper() {}
 virtual bool SaveValue() = 0;
 virtual bool Disable() = 0;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source

2014-03-11 Thread Jan Holesovsky

 svx/source/gallery2/galtheme.cxx |   95 ++-
 1 file changed, 46 insertions(+), 49 deletions(-)

New commits:
commit 3f4e77298eece02adb26d3aee2413dc94d318d84
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue Mar 11 11:47:23 2014 +0100

Return early, and kill 1 indentation level by that.

Change-Id: Ia67669e45b78c5fe5059f76b940e85a02781c4c2

diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 1275a70..20959e8 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -359,50 +359,48 @@ void GalleryTheme::UnlockBroadcaster( sal_uIntPtr 
nUpdatePos )
 
 bool GalleryTheme::InsertObject( const SgaObject rObj, sal_uIntPtr nInsertPos 
)
 {
-sal_Bool bRet = sal_False;
+if (!rObj.IsValid())
+return false;
 
-if( rObj.IsValid() )
+GalleryObject* pFoundEntry = NULL;
+size_t iFoundPos = 0;
+for (size_t n = aObjectList.size(); iFoundPos  n; ++iFoundPos)
 {
-GalleryObject*  pFoundEntry = NULL;
-size_t iFoundPos = 0;
-for ( size_t n = aObjectList.size(); iFoundPos  n; ++iFoundPos )
+if (aObjectList[ iFoundPos ]-aURL == rObj.GetURL())
 {
-if ( aObjectList[ iFoundPos ]-aURL == rObj.GetURL() )
-{
-pFoundEntry = aObjectList[ iFoundPos ];
-break;
-}
+pFoundEntry = aObjectList[ iFoundPos ];
+break;
 }
+}
+
+if (pFoundEntry)
+{
+GalleryObject aNewEntry;
 
-if( pFoundEntry )
+// update title of new object if necessary
+if (rObj.GetTitle().isEmpty())
 {
-GalleryObject aNewEntry;
+SgaObject* pOldObj = ImplReadSgaObject(pFoundEntry);
 
-// update title of new object if necessary
-if( rObj.GetTitle().isEmpty() )
+if (pOldObj)
 {
-SgaObject* pOldObj = ImplReadSgaObject( pFoundEntry );
-
-if( pOldObj )
-{
-( (SgaObject) rObj ).SetTitle( pOldObj-GetTitle() );
-delete pOldObj;
-}
+((SgaObject) rObj).SetTitle( pOldObj-GetTitle() );
+delete pOldObj;
 }
-else if( rObj.GetTitle() == __empty__ )
-( (SgaObject) rObj ).SetTitle(  );
-
-ImplWriteSgaObject( rObj, nInsertPos, aNewEntry );
-pFoundEntry-nOffset = aNewEntry.nOffset;
 }
-else
-ImplWriteSgaObject( rObj, nInsertPos, NULL );
+else if (rObj.GetTitle() == __empty__)
+((SgaObject) rObj).SetTitle();
 
-ImplSetModified( (bRet = sal_True) );
-ImplBroadcast( pFoundEntry ? iFoundPos : nInsertPos );
+ImplWriteSgaObject(rObj, nInsertPos, aNewEntry);
+pFoundEntry-nOffset = aNewEntry.nOffset;
 }
+else
+ImplWriteSgaObject(rObj, nInsertPos, NULL);
 
-return bRet;
+ImplSetModified(true);
+ImplBroadcast(pFoundEntry? iFoundPos: nInsertPos);
+
+return true;
 }
 
 SgaObject* GalleryTheme::AcquireObject( size_t nPos )
@@ -481,29 +479,26 @@ bool GalleryTheme::RemoveObject( size_t nPos )
 
 bool GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos )
 {
-sal_Bool bRet = sal_False;
+if (nOldPos == nNewPos || nOldPos = aObjectList.size())
+return false;
 
-if(  nOldPos != nNewPos
-   nOldPos  aObjectList.size()
-  )
-{
-GalleryObject* pEntry = aObjectList[ nOldPos ];
+GalleryObject* pEntry = aObjectList[nOldPos];
 
-GalleryObjectList::iterator it = aObjectList.begin();
-::std::advance( it, nNewPos );
-aObjectList.insert( it, pEntry );
+GalleryObjectList::iterator it = aObjectList.begin();
+::std::advance(it, nNewPos);
+aObjectList.insert(it, pEntry);
 
-if( nNewPos  nOldPos ) nOldPos++;
+if (nNewPos  nOldPos)
+nOldPos++;
 
-it = aObjectList.begin();
-::std::advance( it, nOldPos );
-aObjectList.erase( it );
+it = aObjectList.begin();
+::std::advance(it, nOldPos);
+aObjectList.erase(it);
 
-ImplSetModified( (bRet = sal_True) );
-ImplBroadcast( ( nNewPos  nOldPos ) ? nNewPos : ( nNewPos - 1 ) );
-}
+ImplSetModified(true);
+ImplBroadcast((nNewPos  nOldPos)? nNewPos: (nNewPos - 1));
 
-return bRet;
+return true;
 }
 
 void GalleryTheme::Actualize( const Link rActualizeLink, GalleryProgress* 
pProgress )
@@ -1525,7 +1520,9 @@ SvStream ReadGalleryTheme( SvStream rIn, GalleryTheme 
rTheme )
 }
 
 void GalleryTheme::ImplSetModified( bool bModified )
-{ pThm-SetModified( bModified ); }
+{
+pThm-SetModified(bModified);
+}
 
 const OUString GalleryTheme::GetRealName() const { return 
pThm-GetThemeName(); }
 const INetURLObject GalleryTheme::GetThmURL() const { return 
pThm-GetThmURL(); }

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

 helpers/help_hid.lst |   14 
 source/text/simpress/01/05120100.xhp |   33 ++---
 source/text/swriter/01/0517.xhp  |   39 +++
 3 files changed, 24 insertions(+), 62 deletions(-)

New commits:
commit 968185360c4b6b71289c6ea9ad6fbddf06ed
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 12:17:42 2014 +

update help ids for load templates dialog .ui conversion

Change-Id: I25e745cccbf997f47d73e4661716beb87ec8a293

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b1b24ad..ac2508e 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5882,34 +5882,20 @@ sd_TimeField_DLG_ASS_TMF_PAGE3_BREAK,1088495668,
 sd_TimeField_DLG_ASS_TMF_PAGE3_TIME,1088495666,
 sd_TimeField_DLG_PUBLISHING_PAGE2_DURATION_TMF,1085857829,
 sd_TimeField_FLT_WIN_ANIMATION_TIME_FIELD,3231375361,
-sfx2_CheckBox_DLG_NEW_FILE_BTN_PREVIEW,1107379251,
-sfx2_CheckBox_DLG_NEW_FILE_CB_FRAME_STYLE,1107379234,
-sfx2_CheckBox_DLG_NEW_FILE_CB_MERGE_STYLE,1107379237,
-sfx2_CheckBox_DLG_NEW_FILE_CB_NUM_STYLE,1107379236,
-sfx2_CheckBox_DLG_NEW_FILE_CB_PAGE_STYLE,1107379235,
-sfx2_CheckBox_DLG_NEW_FILE_CB_TEXT_STYLE,1107379233,
 sfx2_CheckBox_RID_WARN_PRINTTRANSPARENCY_CBX_NOPRINTTRANSWARN,1113048129,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO1,1078102021,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO2,1078102023,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO3,1078102025,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO4,1078102027,
-sfx2_Edit_DLG_NEW_FILE_ED_KEYWORDS,1107380285,
-sfx2_Edit_DLG_NEW_FILE_ED_THEMA,1107380279,
-sfx2_Edit_DLG_NEW_FILE_ED_TITLE,1107380280,
 sfx2_Edit_MD_DDE_LINKEDIT_ED_DDE_APP,1082214450,
 sfx2_Edit_MD_DDE_LINKEDIT_ED_DDE_ITEM,1082214452,
 sfx2_Edit_MD_DDE_LINKEDIT_ED_DDE_TOPIC,1082214451,
 sfx2_Edit_RID_URLOPEN_RID_URLOPEN_URL,1112573955,
 sfx2_FT_DOCNAME_DLG_PRINTMONITOR,2218852352,
 sfx2_FloatingWindow_SID_RECORDING_FLOATWINDOW,1705639936,
-sfx2_ListBox_DLG_NEW_FILE_LB_REGION,1107381781,
-sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812,
 sfx2_ModalDialog_MD_DDE_LINKEDIT,1082212352,
 sfx2_ModalDialog_RID_URLOPEN,1112571904,
 sfx2_ModalDialog_RID_WARN_PRINTTRANSPARENCY,1113047040,
-sfx2_MoreButton_DLG_NEW_FILE_BT_MORE,1107391008,
-sfx2_MultiLineEdit_DLG_NEW_FILE_ED_DESC,1107380807,
-sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822,
 sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711,
 sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_1,1401573377,
diff --git a/source/text/simpress/01/05120100.xhp 
b/source/text/simpress/01/05120100.xhp
index 3fe3c8c..75e809a 100644
--- a/source/text/simpress/01/05120100.xhp
+++ b/source/text/simpress/01/05120100.xhp
@@ -31,38 +31,19 @@
 /history
 /meta
 body
+bookmark xml-lang=en-US 
branch=hid/sfx/ui/loadtemplatedialog/LoadTemplateDialog id=bm_id3154756 
localize=false/
 paragraph role=heading id=hd_id3153728 xml-lang=en-US level=1 
l10n=U oldref=1Load Slide Design/paragraph
 paragraph role=paragraph id=par_id3150717 xml-lang=en-US l10n=U 
oldref=2Load additional slide designs for your presentation./paragraph
 paragraph role=paragraph id=par_id3154016 xml-lang=en-US l10n=U 
oldref=4Select a design category, and then a template you want to 
apply./paragraph
-bookmark xml-lang=en-US branch=hid/sfx2:ListBox:DLG_NEW_FILE:LB_REGION 
id=bm_id3154756 localize=false/
+bookmark xml-lang=en-US branch=hid/sfx/ui/loadtemplatedialog/categories 
id=bm_id3154756 localize=false/
 paragraph role=heading id=hd_id3150327 xml-lang=en-US level=2 
l10n=U oldref=27Categories/paragraph
-paragraph role=paragraph id=par_id3147338 xml-lang=en-US l10n=U 
oldref=28ahelp hid=SFX2_LISTBOX_DLG_NEW_FILE_LB_REGIONDisplays the 
available slide design categories./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/sfx2:ListBox:DLG_NEW_FILE:LB_TEMPLATE 
id=bm_id3154703 localize=false/
+paragraph role=paragraph id=par_id3147338 xml-lang=en-US l10n=U 
oldref=28ahelp hid=sfx/ui/loadtemplatedialog/categoriesDisplays the 
available slide design categories./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/sfx/ui/loadtemplatedialog/templates 
id=bm_id3154703 localize=false/
 paragraph role=heading id=hd_id3155962 xml-lang=en-US level=2 
l10n=U oldref=5Templates/paragraph
-paragraph role=paragraph id=par_id3155337 xml-lang=en-US l10n=U 
oldref=6ahelp hid=SFX2_LISTBOX_DLG_NEW_FILE_LB_TEMPLATEDisplays the 
templates for the selected design category./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/sfx2:MoreButton:DLG_NEW_FILE:BT_MORE 
id=bm_id3159237 localize=false/
+paragraph role=paragraph id=par_id3155337 xml-lang=en-US l10n=U 
oldref=6ahelp hid=sfx/ui/loadtemplatedialog/templatesDisplays the 
templates for the selected design category./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/sfx/ui/loadtemplatedialog/expander 
id=bm_id3159237 localize=false/
 paragraph role=heading id=hd_id3145791 xml-lang=en-US level=2 
l10n=U oldref=7Moregt;gt;/paragraph
-paragraph

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 89a838c193fb428c794e9d2760535ff6bfdcaf4d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 12:17:42 2014 +

Updated core
Project: help  968185360c4b6b71289c6ea9ad6fbddf06ed

diff --git a/helpcontent2 b/helpcontent2
index 2438ff5..968 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2438ff53e1730c4af182568294b129de3ea0b28a
+Subproject commit 968185360c4b6b71289c6ea9ad6fbddf06ed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source sfx2/AllLangResTarget_sfx2.mk sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk

 extras/source/glade/libreoffice-catalog.xml.in |3 
 sfx2/AllLangResTarget_sfx2.mk  |1 
 sfx2/UIConfig_sfx.mk   |1 
 sfx2/source/doc/doc.hrc|1 
 sfx2/source/doc/new.cxx|  321 +++---
 sfx2/source/doc/new.hrc|   48 ---
 sfx2/source/doc/new.src|  236 
 sfx2/source/inc/preview.hxx|   14 
 sfx2/uiconfig/ui/loadtemplatedialog.ui |  358 +
 9 files changed, 472 insertions(+), 511 deletions(-)

New commits:
commit f3609ac092bc520825bfd6b71ed20ecaba293317
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 10:27:41 2014 +

convert load template dialog to .ui

and merge the expander and the show preview checkbox
to be the same thing, i.e. expanded is showing, and
not expanded is not showing

Change-Id: I10e43bc36a0e2e5d1286a4dbad793ee3a700c97c

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index c48fb9d..9439041 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -245,6 +245,9 @@
 glade-widget-class title=Token Window name=swuilo-SwTokenWindow
 generic-name=Token Window parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
+glade-widget-class title=Template Preview Window 
name=sfxlo-SfxPreviewWin
+generic-name=Template Preview Window 
parent=GtkDrawingArea
+icon-name=widget-gtk-drawingarea/
 glade-widget-class title=Mark Preview name=swuilo-SwMarkPreview
 generic-name=Mark Preview Window 
parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index 290c814..42e1661 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
 sfx2/source/dialog/versdlg.src \
 sfx2/source/doc/doc.src \
 sfx2/source/doc/doctempl.src \
-sfx2/source/doc/new.src \
 sfx2/source/doc/templatelocnames.src \
 sfx2/source/menu/menu.src \
 sfx2/source/sidebar/Sidebar.src \
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index a39c171..489d9b0 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/helpsearchpage \
sfx2/uiconfig/ui/inputdialog \
sfx2/uiconfig/ui/licensedialog \
+   sfx2/uiconfig/ui/loadtemplatedialog \
sfx2/uiconfig/ui/managestylepage \
sfx2/uiconfig/ui/newstyle \
sfx2/uiconfig/ui/optprintpage \
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 2aa21e7..afd9c1d 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -36,7 +36,6 @@
 #define STR_DELETE_TEMPLATE (RID_SFX_DOC_START+15)
 #define MSG_REGION_NOTEMPTY (RID_SFX_DOC_START+17)
 
-#define DLG_NEW_FILE(RID_SFX_DOC_START+1)
 #define DLG_DOC_TEMPLATE(RID_SFX_DOC_START+2)
 
 #define DLG_TEMPLATE_MANAGER(RID_SFX_DOC_START+4)
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 1d12e6e..7f8afa8 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -19,8 +19,9 @@
 
 #include comphelper/string.hxx
 #include sfx2/new.hxx
+#include vcl/builder.hxx
+#include vcl/layout.hxx
 #include vcl/msgbox.hxx
-#include vcl/morebtn.hxx
 #include svtools/svmedit.hxx
 #include svl/itemset.hxx
 #include svl/eitem.hxx
@@ -29,7 +30,6 @@
 #include tools/urlobj.hxx
 #include unotools/localfilehelper.hxx
 
-#include new.hrc
 #include doc.hrc
 #include sfx2/app.hxx
 #include sfx2/objsh.hxx
@@ -39,12 +39,6 @@
 #include sfx2/printer.hxx
 #include vcl/waitobj.hxx
 
-
-
-#define MORE_BTN(x) pMoreBt-x
-
-
-
 void SfxPreviewBase_Impl::SetObjectShell( SfxObjectShell* pObj )
 {
 ::boost::shared_ptrGDIMetaFile pFile = pObj
@@ -55,18 +49,20 @@ void SfxPreviewBase_Impl::SetObjectShell( SfxObjectShell* 
pObj )
 }
 
 SfxPreviewBase_Impl::SfxPreviewBase_Impl(
-Window* pParent, const ResId rResId )
-: Window(pParent, rResId), pMetaFile()
+Window* pParent, WinBits nStyle)
+: Window(pParent, nStyle)
+, pMetaFile()
 {
 }
 
-SfxPreviewBase_Impl::~SfxPreviewBase_Impl()
+void SfxPreviewBase_Impl::Resize()
 {
+Invalidate();
 }
 
-void SfxPreviewBase_Impl::Resize()
+Size SfxPreviewBase_Impl::GetOptimalSize() const
 {
-Invalidate();
+return LogicToPixel(Size(127, 129), MAP_APPFONT);
 }
 
 void SfxPreviewWin_Impl::ImpPaint(
@@ -119,37 +115,26 @@ void SfxPreviewWin_Impl::Paint( const Rectangle rRect )
 ImpPaint( rRect, pMetaFile.get(), this );
 }
 
+extern

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 37/c323d4bb5a6ead8c456dc3c75053b847a39436

 37/c323d4bb5a6ead8c456dc3c75053b847a39436 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 67691d2f959095656f793bc3d636123063a36cc4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 12:20:11 2014 +

Notes added by 'git notes add'

diff --git a/37/c323d4bb5a6ead8c456dc3c75053b847a39436 
b/37/c323d4bb5a6ead8c456dc3c75053b847a39436
new file mode 100644
index 000..55ab549
--- /dev/null
+++ b/37/c323d4bb5a6ead8c456dc3c75053b847a39436
@@ -0,0 +1 @@
+prefer: 5f166e1d7f17619fd8790da31eff558b816df397
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/CppunitTest_sw_ooxmlimport.mk sw/qa writerfilter/source

 sw/CppunitTest_sw_ooxmlimport.mk   |1 
 sw/qa/extras/inc/swmodeltestbase.hxx   |4 +
 sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx |binary
 sw/qa/extras/ooxmlimport/data/strict.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |   38 +
 writerfilter/source/ooxml/OOXMLFactory.cxx |   12 +
 writerfilter/source/ooxml/OOXMLFactory.hxx |3 -
 writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx |   34 +++
 writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx |   15 ++
 writerfilter/source/ooxml/factoryimpl.xsl  |4 +
 writerfilter/source/ooxml/model.xml|   15 +-
 writerfilter/source/ooxml/namespaceids.xsl |3 -
 12 files changed, 122 insertions(+), 7 deletions(-)

New commits:
commit 65909e07763e80031bfeb7bb3170e6c3b0029065
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Mar 7 11:45:39 2014 +0100

writerfilter: initial strict DOCX support

The generate-id() code is just necessary avoid duplicated elements in
the for-each loop. http://mahahegde.com/xslt-distinct-values/ has a
detailed description of the technique used here.
(cherry picked from commit f9bf15e19ec823a58ee32bf94da81f3bb1a147bc)

writerfilter: introduce ooxml::OOXMLUniversalMeasureValue

In transitional DOCX, ST_UniversalMeasure is in practice a simple integer,
which means twips. But in case of strict, ST_UniversalMeasure is in points
in practice -- which is perfectly valid, but we didn't handle it so far.

Add a separate Value class that is used only for handling
ST_UniversalMeasure, then there we can handle the various additional
suffixes.
(cherry picked from commit d5d7c7d3b281e1a9060d60bc4ac7738ae616f167)

DOCX import: handle points in ST_TwipsMeasure and ST_SignedTwipsMeasure

This fixes page size and margins in case of strict DOCX.
(cherry picked from commit 37cc7e7471ba3b11cefcb0218c27e2c745886a6d)

DOCX strict import: fix headers

Now that the document has a header, better to just test the bottom
margin, as in case there is a header, the top margin has different
semantics in Word and Writer.
(cherry picked from commit 195b8491d0299038fb64d19463e3ce90905bf346)

DOCX strict import: fix pictures as well
(cherry picked from commit aaef39de32442203d631a65aecf23eeb27dfbb12)

DOCX strict import: handle charts
(cherry picked from commit 49c3aff8d8d3030b2acbffb6ff000b5d5cc9)

DOCX strict import: handle SmartArt
(cherry picked from commit f5985685ddc519f760a7324fa60fd662f25404c1)

DOCX strict import: handle lockedCanvas
(cherry picked from commit d795fb224e52c66c4585ed1e079a2b7601a07eda)

DOCX strict import: handle math
(cherry picked from commit c98d649117dc776ac51807be3376924d1fce2035)

Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I647efe9d4a0834d3756fe9fa6d706ba6ba4e00f1
Reviewed-on: https://gerrit.libreoffice.org/8532
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index fe1cefe..ad6155e 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
 sw/util/swd \
 sw/util/msword \
 sfx2/util/sfx \
+   starmath/util/sm \
 svl/source/fsstor/fsstorage \
 svl/util/svl \
 svtools/util/svt \
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 8a2b8c4..316cb9c 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -351,9 +351,11 @@ protected:
 return xParagraph;
 }
 
-uno::Referencetext::XTextRange getParagraphOfText(int number, 
uno::Referencetext::XText xText) const
+uno::Referencetext::XTextRange getParagraphOfText(int number, 
uno::Referencetext::XText xText, OUString content = OUString()) const
 {
 uno::Referencetext::XTextRange const 
xParagraph(getParagraphOrTable(number, xText), uno::UNO_QUERY_THROW);
+if (!content.isEmpty())
+CPPUNIT_ASSERT_EQUAL(content, xParagraph-getString());
 return xParagraph;
 }
 
diff --git a/sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx 
b/sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx
new file mode 100644
index 000..d31be7e
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/strict.docx 
b/sw/qa/extras/ooxmlimport/data/strict.docx
new file mode 100644
index 000..b46ce94
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/strict.docx differ

[Libreoffice-commits] core.git: include/comphelper

 include/comphelper/propagg.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c7b09e0ed626fad4c4d70ed1a6e431bfff8451b8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Mar 11 14:12:33 2014 +0100

No need for fillAggregatePropertyInfoByHandle to be virtual

Change-Id: If002dede857ecff300f57b73b26234d737ba98c9

diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index 64bb205..7765b6c 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -149,7 +149,7 @@ public:
 
 @return sal_True, if _nHandle marks an aggregate property, otherwise 
sal_False
 */
-virtual bool SAL_CALL fillAggregatePropertyInfoByHandle(OUString* 
_pPropName, sal_Int32* _pOriginalHandle,
+bool fillAggregatePropertyInfoByHandle(OUString* _pPropName, sal_Int32* 
_pOriginalHandle,
sal_Int32 _nHandle) const;
 
 /** returns information about a property given by handle
___
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/window.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2c18f34e422418a18e2fe6608372f0ba0c61c0b7
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Mar 11 15:06:33 2014 +0200

We do seem to need the resize timer after all in tiled rendering

Otherwise even a trivial test document renders extremely badly, just
the top row of text in tiles here and there. Go figure. Maybe the code
thinks the document window is of some ridiculous 1x1 size or
something if the resize timer isn't used? Also, the resize timer
handler calls paint functionality.

I wonder how we can be sure that the resize timer happens to fire
during the rendering a tile, though? Surely if the tile rendering call
returns before the timer fires, whatever essential thing it is that
the timer needs to do, doesn't happen. Maybe this then explains the
blank tiles I occasionally see? On the other hand, when I see them,
they don't appear randomly, but it's always the same tile that shows
up blank.

Change-Id: If5e6854d8846fb0b7bea15547a326bd77f23987b

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index f5be436..691a17d 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -924,9 +924,9 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, 
SystemParentData* pSyste
 {
 mpWindowImpl-mpFrameData-maPaintTimer.SetTimeout( 30 );
 mpWindowImpl-mpFrameData-maPaintTimer.SetTimeoutHdl( LINK( this, 
Window, ImplHandlePaintHdl ) );
-mpWindowImpl-mpFrameData-maResizeTimer.SetTimeout( 50 );
-mpWindowImpl-mpFrameData-maResizeTimer.SetTimeoutHdl( LINK( 
this, Window, ImplHandleResizeTimerHdl ) );
 }
+mpWindowImpl-mpFrameData-maResizeTimer.SetTimeout( 50 );
+mpWindowImpl-mpFrameData-maResizeTimer.SetTimeoutHdl( LINK( this, 
Window, ImplHandleResizeTimerHdl ) );
 mpWindowImpl-mpFrameData-mbInternalDragGestureRecognizer = false;
 
 if ( pRealParent  IsTopWindow() )
@@ -2628,7 +2628,11 @@ IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl)
 if( mpWindowImpl-mbReallyVisible )
 {
 ImplCallResize();
-if( mpWindowImpl-mpFrameData-maPaintTimer.IsActive() )
+if( ImplDoTiledRendering() )
+{
+ImplHandlePaintHdl(NULL);
+}
+else if( mpWindowImpl-mpFrameData-maPaintTimer.IsActive() )
 {
 mpWindowImpl-mpFrameData-maPaintTimer.Stop();
 mpWindowImpl-mpFrameData-maPaintTimer.GetTimeoutHdl().Call( NULL 
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

 sfx2/source/doc/new.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 5b8fd39d3bd319ed760ebdcbb0cbef868ec5a2b1
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Mar 11 14:26:18 2014 +0100

-Werror,-Wunused-variable

Change-Id: I3b499a17985b55fbfb62a441afb9d137f7bd8593

diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 7f8afa8..f5e570c 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -144,7 +144,6 @@ class SfxNewFileDialog_Impl
 SfxObjectShellLock xDocShell;
 SfxNewFileDialog* pAntiImpl;
 
-void ClearInfo();
 DECL_LINK( Update, void * );
 
 DECL_LINK( RegionSelect, ListBox * );
@@ -170,11 +169,6 @@ public:
 voidSetTemplateFlags(sal_uInt16 nSet);
 };
 
-void SfxNewFileDialog_Impl::ClearInfo()
-{
-const OUString aNo;
-}
-
 IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update)
 {
 if ( xDocShell.Is() )
@@ -187,7 +181,6 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update)
 const sal_uInt16 nEntry = GetSelectedTemplatePos();
 if(!nEntry)
 {
-ClearInfo();
 m_pPreviewWin-Invalidate();
 m_pPreviewWin-SetObjectShell( 0);
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/filter sw/source

 include/filter/msfilter/sprmids.hxx |2 +-
 sw/source/filter/ww8/ww8atr.cxx |6 +++---
 sw/source/filter/ww8/ww8par6.cxx|2 +-
 sw/source/filter/ww8/ww8scan.cxx|2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 47ab3749bf096e577fc9568cb404c7e1bc08aca3
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Mar 11 14:30:17 2014 +0100

hardcoded sprmCFELayout

Change-Id: I911c1cdf503c46ace38afc80ec63bb0696d1c84b

diff --git a/include/filter/msfilter/sprmids.hxx 
b/include/filter/msfilter/sprmids.hxx
index d632ab9..a760a64 100644
--- a/include/filter/msfilter/sprmids.hxx
+++ b/include/filter/msfilter/sprmids.hxx
@@ -280,7 +280,7 @@ namespace NS_sprm {
 const sal_uInt16 LN_PBorderBetween = 0xc652;
 const sal_uInt16 LN_CBorder = 0xca72;
 const sal_uInt16 LN_TTPreferredWidth = 0xf614;
-const sal_uInt16 LN_CEastAsianLayout = 0xca78;
+const sal_uInt16 LN_CFELayout = 0xca78;
 const sal_uInt16 LN_TWidthBefore = 0xf617;
 const sal_uInt16 LN_TWidthAfter = 0xf618;
 const sal_uInt16 LN_PDxaLeft1 = 0x8460;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 70e0fe9..8094d9d 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1507,10 +1507,10 @@ void WW8AttributeOutput::CharRotate( const 
SvxCharRotateItem rRotate )
 if ( m_rWW8Export.bWrtWW8  !m_rWW8Export.IsInTable() )
 {
 // #i36867 In word the text in a table is rotated via the TC or 
NS_sprm::LN_TTextFlow
-// This means you can only rotate all or none of the text adding 
NS_sprm::LN_CEastAsianLayout
+// This means you can only rotate all or none of the text adding 
NS_sprm::LN_CFELayout
 // here corrupts the table, hence !m_rWW8Export.bIsInTable
 
-m_rWW8Export.InsUInt16( NS_sprm::LN_CEastAsianLayout );
+m_rWW8Export.InsUInt16( NS_sprm::LN_CFELayout );
 m_rWW8Export.pO-push_back( (sal_uInt8)0x06 ); //len 6
 m_rWW8Export.pO-push_back( (sal_uInt8)0x01 );
 
@@ -3351,7 +3351,7 @@ void WW8AttributeOutput::CharTwoLines( const 
SvxTwoLinesItem rTwoLines )
 if( !m_rWW8Export.bWrtWW8 )
 return;
 
-m_rWW8Export.InsUInt16( NS_sprm::LN_CEastAsianLayout );
+m_rWW8Export.InsUInt16( NS_sprm::LN_CFELayout );
 m_rWW8Export.pO-push_back( (sal_uInt8)0x06 ); //len 6
 m_rWW8Export.pO-push_back( (sal_uInt8)0x02 );
 
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 1a12a17..339c319 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -6054,7 +6054,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
  
//tap.rgtc[].vertAlign;complex
  //variable length always
  //recorded as 3 byte;
-{0xCA78, SwWW8ImplReader::Read_DoubleLine_Rotate},
+{NS_sprm::LN_CFELayout, SwWW8ImplReader::Read_DoubleLine_Rotate},
 {0x6649, 0}, //undocumented
 {0xF614, 0}, //sprmTTableWidth
  //recorded as 3 bytes;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index e703639..9f7800e 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -727,7 +727,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
 {0xD62A, 1, L_FIX}, // sprmTDiagLine ;;;
 {0xD62B, 0, L_VAR}, // sprmTVertMerge tap.rgtc[].vertMerge
 {0xD62C, 0, L_VAR}, // sprmTVertAlign tap.rgtc[].vertAlign
-{0xCA78, 0, L_VAR}, // undocumented sprmCDoubleLine ?
+{NS_sprm::LN_CFELayout, 0, L_VAR},
 {0x6649, 4, L_FIX}, // undocumented
 {0xF614, 3, L_FIX}, // undocumented
 {0xD612, 0, L_VAR}, // undocumented, new background colours.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/comphelper

 include/comphelper/accessiblecontexthelper.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a850bed771e02ddda50dbb859dd0d9ae870d2751
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Mar 11 14:47:48 2014 +0100

Typos in comment

Change-Id: I6204090cb95213e31c11d33c5e822f8abee10963

diff --git a/include/comphelper/accessiblecontexthelper.hxx 
b/include/comphelper/accessiblecontexthelper.hxx
index b49070f..18890be 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
@@ -201,9 +201,9 @@ namespace comphelper
 // helper
 /** notifies all AccessibleEventListeners of a certain event
 
-@precondnot too be called with our mutex locked
+@precondnot to be called with our mutex locked
 @param  _nEventId
-the id of the even. See AccessibleEventType
+the id of the event. See AccessibleEventType
 @param  _rOldValue
 the old value to be notified
 @param  _rNewValue
commit 33320eceb0b9207aca86b1cdc73c4755cff86f15
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Mar 11 14:47:08 2014 +0100

No need for NotifyAccessibleEvent to be virtual

Change-Id: Id21324f756b835fd501868175a5a2a77cb2997a7

diff --git a/include/comphelper/accessiblecontexthelper.hxx 
b/include/comphelper/accessiblecontexthelper.hxx
index 19f34c2..b49070f 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
@@ -209,7 +209,7 @@ namespace comphelper
 @param  _rNewValue
 the new value to be notified
 */
-virtual void SAL_CALL   NotifyAccessibleEvent(
+void NotifyAccessibleEvent(
 const sal_Int16 _nEventId,
 const ::com::sun::star::uno::Any _rOldValue,
 const ::com::sun::star::uno::Any _rNewValue
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 6 commits - forms/source i18npool/source sfx2/source vcl/unx

 forms/source/richtext/richtextcontrol.cxx   |7 -
 i18npool/source/breakiterator/breakiteratorImpl.cxx |7 -
 sfx2/source/appl/workwin.cxx|  115 +++-
 sfx2/source/view/sfxbasecontroller.cxx  |2 
 vcl/unx/generic/dtrans/X11_selection.cxx|6 -
 5 files changed, 50 insertions(+), 87 deletions(-)

New commits:
commit c67cc960ce344f4cb7a0be785ee69e08e72e6fbb
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 13:47:43 2014 +

coverity#704236 Logically dead code

the nStartPos  0 check is inside a nStartPos == 0 block
so it can't happen so we'll return immediately, and so
there's no point changing numberOfChange in that case
either there

Change-Id: Id6d7fc31033de5c6f3bb0a9ed03234b58c0d509e

diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx 
b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index e56256b..db36852 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -329,12 +329,7 @@ sal_Int32  SAL_CALL BreakIteratorImpl::previousScript( 
const OUString Text,
 if numberOfChange % 2) == 0) != (ScriptType != 
getScriptClass(ch
 numberOfChange--;
 else if (nStartPos == 0) {
-if (numberOfChange  0)
-numberOfChange--;
-if (nStartPos  0)
-Text.iterateCodePoints(nStartPos, -1);
-else
-return -1;
+return -1;
 }
 }
 return numberOfChange == 0 ? iterateCodePoints(Text, nStartPos, 1, ch) : 
-1;
commit 39831d90d9c3d0f714e39ef11799fabe8cc13563
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 13:43:05 2014 +

coverity#704232 Logically dead code

these conditions are already handled in the switch above

Change-Id: I1a2bfe4cc536f2d1292fd39b86afc53ac5463308

diff --git a/forms/source/richtext/richtextcontrol.cxx 
b/forms/source/richtext/richtextcontrol.cxx
index bbb5403..44829c6 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -579,13 +579,6 @@ namespace frm
 {
 bNeedParametrizedDispatcher = true;
 }
-else if (  ( _nSlotId == SID_ATTR_PARA_HANGPUNCTUATION )
-|| ( _nSlotId == SID_ATTR_PARA_FORBIDDEN_RULES )
-|| ( _nSlotId == SID_ATTR_PARA_SCRIPTSPACE )
-)
-{
-bNeedParametrizedDispatcher = false;
-}
 else
 {
 SfxSlotPool rSlotPool = SfxSlotPool::GetSlotPool( NULL );
commit 25b7ed03d8b0fda45f5e9e2d0190e418ec366016
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 13:35:53 2014 +

coverity#441225 Dereference null return value

Change-Id: I9ff48e869cd03847d5338c5f8fb6acceee522e34

diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx 
b/vcl/unx/generic/dtrans/X11_selection.cxx
index 0e5a3ce..396f496 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -3490,7 +3490,11 @@ void SelectionManager::dragDoDispatch()
 
 // cleanup after drag
 if( m_bWaitingForPrimaryConversion )
-getAdaptor( XA_PRIMARY )-clearTransferable();
+{
+SelectionAdaptor* pAdaptor = getAdaptor( XA_PRIMARY );
+if (pAdaptor)
+pAdaptor-clearTransferable();
+}
 
 m_bDropSent = false;
 m_bDropSuccess  = false;
commit 266cbbdfc975ac058ca989b87d372898f49578db
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 13:34:17 2014 +

coverity#441017 Dereference before null check

Change-Id: I3df33251d72266afb43532bee07058e691a6cf66

diff --git a/sfx2/source/view/sfxbasecontroller.cxx 
b/sfx2/source/view/sfxbasecontroller.cxx
index 259250e..4ddb958 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -358,7 +358,7 @@ void SAL_CALL 
IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const la
 {
 SolarMutexGuard aGuard;
 SfxViewShell* pShell = m_pController-GetViewShell_Impl();
-if  ( m_pController !=  NULL   pShell )
+if  (pShell)
 {
 bool bCanClose = pShell-PrepareClose( sal_False );
 if ( !bCanClose )
commit 7f8b1b58f48e5593441b29d723eac8dc396c55ed
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 13:30:22 2014 +

coverity#440865 Logically dead code

seeing as we return early if eChild == SFX_CHILDWIN_OBJECTBAR
then the reset of the code that depends on that cannot happen

Change-Id: I1566ad9d5ef428e3c9e248df08b65d56bb83553e

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index

[Libreoffice-commits] core.git: 2 commits - comphelper/source include/svl sc/source sd/source svl/CppunitTest_svl_items.mk svl/Library_svl.mk svl/Module_svl.mk svl/qa svl/source

2014-03-11 Thread Tobias Lippert

 comphelper/source/misc/accessiblecontexthelper.cxx |2 
 include/svl/IndexedStyleSheets.hxx |  180 ++
 include/svl/style.hxx  |   39 ++-
 sc/source/core/data/stlpool.cxx|   51 +++
 sd/source/core/drawdoc4.cxx|1 
 sd/source/core/stlpool.cxx |   99 +--
 svl/CppunitTest_svl_items.mk   |   42 +++
 svl/Library_svl.mk |1 
 svl/Module_svl.mk  |1 
 svl/qa/unit/items/test_IndexedStyleSheets.cxx  |  160 
 svl/source/items/IndexedStyleSheets.cxx|  210 
 svl/source/items/style.cxx |  268 -
 12 files changed, 895 insertions(+), 159 deletions(-)

New commits:
commit 0c17ccc493d0c7a80f37600dae76a09a119bef78
Author: Tobias Lippert d...@fastmail.fm
Date:   Wed Mar 5 20:06:39 2014 +0100

fdo#30770 - Speed up xslx import

Conflicts:
include/svl/style.hxx

Change-Id: Ie3d855923c651b6e05c0054c8e30155218279045
Reviewed-on: https://gerrit.libreoffice.org/8485
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/include/svl/IndexedStyleSheets.hxx 
b/include/svl/IndexedStyleSheets.hxx
new file mode 100644
index 000..6980a97
--- /dev/null
+++ b/include/svl/IndexedStyleSheets.hxx
@@ -0,0 +1,180 @@
+/* -*- 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 SVL_INDEXEDSTYLESHEETS_HXX_
+#define SVL_INDEXEDSTYLESHEETS_HXX_
+
+#include sal/types.h
+
+#include rtl/ustring.hxx
+#include rtl/ref.hxx
+
+#include boost/unordered_map.hpp
+#include vector
+
+class SfxStyleSheetBase;
+
+namespace svl {
+
+/** Function object to check whether a style sheet a fulfills specific 
criteria.
+ * Derive from this class and override the Check() method.
+ */
+struct StyleSheetPredicate {
+virtual bool Check(const SfxStyleSheetBase styleSheet) = 0;
+virtual ~StyleSheetPredicate() {;}
+};
+
+/** Function object for cleanup-Strategy for IndexedSfxStyleSheets::Clear().
+ * Derive from it and do what is necessary to dispose of a style sheet in 
Dispose().
+ */
+struct StyleSheetDisposer {
+virtual void Dispose(rtl::ReferenceSfxStyleSheetBase styleSheet) = 0;
+virtual ~StyleSheetDisposer() {;}
+};
+
+/** Function object to apply a method on all style sheets.
+ * Derive from it and do whatever you want to with the style sheet in the 
DoIt() method.
+ */
+struct StyleSheetCallback {
+virtual void DoIt(const SfxStyleSheetBase styleSheet) = 0;
+virtual ~StyleSheetCallback() {;}
+};
+
+/** This class holds SfxStyleSheets and allows for access via an id and a name.
+ *
+ * @warning
+ * The identification of style sheets happens by their name. If the name of a 
sheet changes,
+ * it will not be found again! Please call Reindex() after changing a style 
sheet's name.
+ *
+ * @internal
+ * This class was implemented to mitigate solve #fdo 30770.
+ * The issue describes an Excel file which takes several hours to open.
+ * An analysis revealed that the time is spent searching for style sheets with 
linear scans in an array.
+ * This class implements access to the style sheets via their name in 
(usually) constant time.
+ *
+ * The return type for most methods is a vector of unsigned integers which 
denote the position
+ * of the style sheets in the vector, and not of pointers to style sheets.
+ * You will need a non-const StyleSheetPool to obtain the actual style sheets.
+ *
+ *
+ * Index-based access is required in several code portions. Hence we have to 
store the style sheets
+ * in a vector as well as in a map.
+ */
+class SAL_DLLPUBLIC IndexedStyleSheets SAL_FINAL {
+public:
+IndexedStyleSheets();
+
+/** Destructor.
+ *
+ * @internal
+ * Is explicit because it has to know how to dispose of SfxStyleSheetBase 
objects.
+ */
+~IndexedStyleSheets();
+
+/** Adds a style sheet.
+ *
+ * If the style sheet is already contained, this call has no effect.
+ */
+void
+AddStyleSheet(rtl::Reference SfxStyleSheetBase  style);
+
+/** Removes a style sheet. */
+bool
+RemoveStyleSheet(rtl::Reference SfxStyleSheetBase  style);
+
+/** Check whether a specified style sheet is stored. */
+bool
+HasStyleSheet(rtl::Reference SfxStyleSheetBase  style) const;
+
+/** Obtain the number of style sheets which are held */
+unsigned
+GetNumberOfStyleSheets() const;
+
+/** Obtain the number of style sheets for which a certain condition holds 
*/
+unsigned
+

[Bug 39468] translate German comments, removing redundant ones

https://bugs.freedesktop.org/show_bug.cgi?id=39468

--- Comment #111 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Tobias Lippert committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=6ae226820a3ab9596ceb59e29ebcae843a48d14c

fdo#39468 Translate German comments



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/svl svl/source

2014-03-11 Thread Tobias Lippert

 include/svl/style.hxx  |   24 
 svl/source/items/style.cxx |2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

New commits:
commit 6ae226820a3ab9596ceb59e29ebcae843a48d14c
Author: Tobias Lippert d...@fastmail.fm
Date:   Wed Mar 5 20:12:12 2014 +0100

fdo#39468 Translate German comments

Change-Id: I051092f2ffb76a6ef400acd51514189ff20dad7d
Reviewed-on: https://gerrit.libreoffice.org/8486
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index da6931b..72bfaed 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -145,14 +145,8 @@ public:
 virtual sal_uInt16 GetVersion() const;
 };
 
+/* Class to iterate and search on a SfxStyleSheetBasePool */
 class SVL_DLLPUBLIC SfxStyleSheetIterator
-
-/*  [Beschreibung]
-
-Klasse zum Iterieren und Suchen auf einem SfxStyleSheetBasePool.
-
-*/
-
 {
 public:
 /** Constructor.
@@ -328,16 +322,14 @@ public:
 
 
 
-#define SFX_STYLESHEET_CREATED   1  // neu
-#define SFX_STYLESHEET_MODIFIED  2  // verandert
-#define SFX_STYLESHEET_CHANGED   3  // geloscht und neu (ausgetauscht)
-#define SFX_STYLESHEET_ERASED4  // geloscht
-#define SFX_STYLESHEET_INDESTRUCTION 5  // wird gerade entfernt
+#define SFX_STYLESHEET_CREATED   1  // new
+#define SFX_STYLESHEET_MODIFIED  2  // changed
+#define SFX_STYLESHEET_CHANGED   3  // erased and re-created (replaced)
+#define SFX_STYLESHEET_ERASED4  // erased
+#define SFX_STYLESHEET_INDESTRUCTION 5  // in the process of being destructed
 
-#define SFX_STYLESHEETPOOL_CHANGES  1  // Aenderungen, die den Zustand
-   // des Pools anedern, aber nicht
-   // ueber die STYLESHEET Hints
-   // verschickt werden sollen.
+#define SFX_STYLESHEETPOOL_CHANGES  1  // Changes which change the state of 
the pool, but should not be
+   // broadcasted by STYLESHEET hits.
 
 
 
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index ab9800e..406e5c2 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -734,7 +734,7 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p )
 bool bWasRemoved = mIndexedStyleSheets-RemoveStyleSheet(xP);
 if( bWasRemoved )
 {
-// Alle Styles umsetzen, deren Parent dieser hier ist
+// Adapt all styles which have this style as parant
 ChangeParent( p-GetName(), p-GetParent() );
 
 // #120015# Do not dispose, the removed StyleSheet may still be 
used in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.1-6'

2014-03-11 Thread Andras Timar

Tag 'cp-4.1-6' created by Andras Timar andras.ti...@collabora.com at 
2014-03-11 15:09 -0700

cp-4.1-6

Changes since cp-4.1-5-52:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.1-6'

2014-03-11 Thread Lionel Elie Mamane

Tag 'cp-4.1-6' created by Andras Timar andras.ti...@collabora.com at 
2014-03-11 15:09 -0700

cp-4.1-6

Changes since cp-4.1-1-6:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.1-6'

2014-03-11 Thread Andras Timar

Tag 'cp-4.1-6' created by Andras Timar andras.ti...@collabora.com at 
2014-03-11 15:09 -0700

cp-4.1-6

Changes since cp-4.1-4-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus

https://bugs.freedesktop.org/show_bug.cgi?id=32664

--- Comment #41 from Jan Holesovsky ke...@collabora.com ---
Alex: This is apparently waiting for someone who has the keyboard with keys you
mention, and will turn the information that is in this bug into a patch that
can be applied in LibreOffice :-)  Any chance you can provide the patch,
please?

All you need is to build LibreOffice yourself, do the change, and create the
patch.  Information how to do that is here:

https://wiki.documentfoundation.org/Development/Patch_Handling_Guidelines#How_to_submit_a_patch

Thank you in advance!

-- 
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] dictionaries.git: Changes to 'refs/tags/cp-4.1-6'

2014-03-11 Thread Olivier R

Tag 'cp-4.1-6' created by Andras Timar andras.ti...@collabora.com at 
2014-03-11 15:09 -0700

cp-4.1-6

Changes since cp-4.1-4-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus

https://bugs.freedesktop.org/show_bug.cgi?id=32664

--- Comment #42 from mene...@yahoo.de ---
Thank you Bram, that helped a lot.

-- 
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 32664] Keyboard volume keys don't work when LibreOffice is in focus

https://bugs.freedesktop.org/show_bug.cgi?id=32664

--- Comment #43 from mene...@yahoo.de ---
I meant Jan ;)

-- 
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: accessibility/inc accessibility/source basctl/source include/comphelper include/svtools include/toolkit svx/source toolkit/source

 accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx 
|2 +-
 accessibility/inc/accessibility/extended/accessibletabbar.hxx  
|2 +-
 accessibility/inc/accessibility/extended/accessibletabbarpage.hxx  
|2 +-
 accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx  
|2 +-
 accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx   
|2 +-
 accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx   
|2 +-
 accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
|2 +-
 accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx   
|2 +-
 accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx 
|2 +-
 accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx   
|2 +-
 accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx 
|2 +-
 accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
|2 +-
 accessibility/source/standard/vclxaccessibletoolboxitem.cxx
|2 +-
 basctl/source/inc/accessibledialogcontrolshape.hxx 
|2 +-
 basctl/source/inc/accessibledialogwindow.hxx   
|2 +-
 include/comphelper/accessiblecomponenthelper.hxx   
|2 +-
 include/svtools/vclxaccessibleheaderbaritem.hxx
|2 +-
 include/toolkit/awt/vclxaccessiblecomponent.hxx
|2 +-
 include/toolkit/controls/accessiblecontrolcontext.hxx  
|2 +-
 svx/source/accessibility/charmapacc.cxx
|6 +++---
 svx/source/inc/charmapacc.hxx  
|6 +++---
 toolkit/source/controls/accessiblecontrolcontext.cxx   
|2 +-
 22 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit d47ca30f1c9add3969e12ec7b855e68a848a679e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Mar 11 15:35:52 2014 +0100

No need for implGetBounds to be SAL_CALL

Change-Id: I4eb1f998de57a4ceeb7990c6e4a964ce0d07ea88

diff --git 
a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
 
b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
index ccc2874..455045a 100644
--- 
a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
+++ 
b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
@@ -81,7 +81,7 @@ namespace accessibility
 
 protected:
 // OCommonAccessibleComponent
-virtual ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds(  ) 
throw (::com::sun::star::uno::RuntimeException);
+virtual ::com::sun::star::awt::Rectangle implGetBounds(  ) throw 
(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 
 // OComponentHelper
 virtual void SAL_CALL disposing();
diff --git a/accessibility/inc/accessibility/extended/accessibletabbar.hxx 
b/accessibility/inc/accessibility/extended/accessibletabbar.hxx
index fbcf88f..5fb06b8 100644
--- a/accessibility/inc/accessibility/extended/accessibletabbar.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletabbar.hxx
@@ -57,7 +57,7 @@ namespace accessibility
 virtual voidFillAccessibleStateSet( 
utl::AccessibleStateSetHelper rStateSet );
 
 // OCommonAccessibleComponent
-virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) 
throw (::com::sun::star::uno::RuntimeException);
+virtual ::com::sun::star::awt::Rectangle implGetBounds(  ) throw 
(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 
 // XComponent
 virtual void SAL_CALL   disposing();
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx 
b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
index 0f0a289..6fd7b15 100644
--- a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
@@ -73,7 +73,7 @@ namespace accessibility
 virtual voidFillAccessibleStateSet( 
utl::AccessibleStateSetHelper rStateSet );
 
 // OCommonAccessibleComponent
-virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) 
throw (::com::sun::star::uno::RuntimeException);
+virtual ::com::sun::star::awt::Rectangle implGetBounds(  ) throw 
(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 
 // XComponent
 virtual void SAL_CALL   disposing();
diff --git 
a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx 
b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
index 08ef9a7..5347bc4 100644
---

[Libreoffice-commits] core.git: sw/source

2014-03-11 Thread Kohei Yoshida

 sw/source/core/layout/paintfrm.cxx |   21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 2b9e7a0cb2492f19745f61a4829ff3802b25291f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Mar 11 10:36:15 2014 -0400

fdo#76030: Use the table boundaries view option to toggle border drawing.

Unless I'm missing something, fixing the problem reported in fdo#75118 this
way is more reliable, and certainly avoids the problem reported in 
fdo#76030.

Change-Id: Ife524d9db12e9fa4528c2232e619bfacde367659

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 1793307..120634e 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2641,12 +2641,6 @@ void SwTabFrmPainter::PaintLines(OutputDevice rDev, 
const SwRect rRect) const
 aPaintStart.Y() -= nTwipYCorr;
 aPaintEnd.Y()   -= nTwipYCorr;
 
-if (::rtl::math::approxEqual(aStyles[0].Prim(), 0.0) 
-::rtl::math::approxEqual(aStyles[0].Secn(), 0.0))
-{
-continue; // fdo#75118 do not paint zero-width lines
-}
-
 // Here comes the painting stuff: Thank you, DR, great job!!!
 if (bHori)
 {
@@ -4252,7 +4246,8 @@ void SwFlyFrm::Paint(SwRect const rRect, SwPrintData 
const*const) const
 
 void SwTabFrm::Paint(SwRect const rRect, SwPrintData const*const) const
 {
-if ( pGlobalShell-GetViewOptions()-IsTable() )
+const SwViewOption* pViewOption = pGlobalShell-GetViewOptions();
+if (pViewOption-IsTable())
 {
 // #i29550#
 if ( IsCollapsingBorders() )
@@ -4268,9 +4263,12 @@ void SwTabFrm::Paint(SwRect const rRect, SwPrintData 
const*const) const
 PaintShadow( rRect, aRect, rAttrs );
 }
 
-// paint lines
-SwTabFrmPainter aHelper( *this );
-aHelper.PaintLines( *pGlobalShell-GetOut(), rRect );
+if (pViewOption-IsTableBoundaries())
+{
+// fdo#75118 Paint border lines only when it's enabled.
+SwTabFrmPainter aHelper(*this);
+aHelper.PaintLines(*pGlobalShell-GetOut(), rRect);
+}
 }
 
 SwLayoutFrm::Paint( rRect );
@@ -4283,8 +4281,7 @@ void SwTabFrm::Paint(SwRect const rRect, SwPrintData 
const*const) const
 aTabRect.Pos() += Frm().Pos();
 SwRect aTabOutRect( rRect );
 aTabOutRect.Intersection( aTabRect );
-pGlobalShell-GetViewOptions()-
-DrawRect( pGlobalShell-GetOut(), aTabOutRect, COL_LIGHTGRAY );
+pViewOption-DrawRect( pGlobalShell-GetOut(), aTabOutRect, 
COL_LIGHTGRAY );
 }
 ((SwTabFrm*)this)-ResetComplete();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - writerfilter/source

2014-03-11 Thread Oliver-Rainer Wittmann

 writerfilter/source/dmapper/DomainMapper.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5d534ad732a8500466f495a527ab63322361f47a
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Feb 25 13:16:12 2014 +

Related: #i124106# correct handling of page break attributes

i.e. those which are providing the default value explicitly

(cherry picked from commit 5a15ef3da683566d7bd443f96eeec3a9a3f70aeb)

Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/PropertyMap.cxx

(cherry picked from commit c30fb7d7269b5bdd1853ac22120f57aa2bfd13a5)

Change-Id: Ib8721f2fce060d26ee75b0515b3bf62a603fd40c
Signed-off-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index dfcf3a7..a9474a6 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1517,7 +1517,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 bool bExchangeLeftRight = false;
 Value::Pointer_t pValue = rSprm.getValue();
 sal_Int32 nIntValue = pValue-getInt();
-OUString sStringValue = pValue-getString();
+const OUString sStringValue = pValue-getString();
 PropertyNameSupplier rPropNameSupplier = 
PropertyNameSupplier::GetPropertyNameSupplier();
 
 switch(nSprmId)
@@ -1544,7 +1544,10 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 rContext-Insert(PROP_PARA_KEEP_TOGETHER, true, uno::makeAny( 
nIntValue ? true : false) );
 break;
 case NS_sprm::LN_PFPageBreakBefore:
-rContext-Insert(PROP_BREAK_TYPE, true, uno::makeAny( 
com::sun::star::style::BreakType_PAGE_BEFORE ) );
+if ( nIntValue == 1 )
+{
+rContext-Insert(PROP_BREAK_TYPE, true, uno::makeAny( 
com::sun::star::style::BreakType_PAGE_BEFORE ) );
+}
 break;  // sprmPFPageBreakBefore
 case NS_sprm::LN_PBrcl:
 break;  // sprmPBrcl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - writerfilter/source

2014-03-11 Thread Oliver-Rainer Wittmann

 writerfilter/source/dmapper/DomainMapper.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 04f8c446c14a4a2b358fc48d9cdb7dd0af19ce7a
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Feb 25 13:16:12 2014 +

Related: #i124106# correct handling of page break attributes

i.e. those which are providing the default value explicitly

(cherry picked from commit 5a15ef3da683566d7bd443f96eeec3a9a3f70aeb)

Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/PropertyMap.cxx

(cherry picked from commit c30fb7d7269b5bdd1853ac22120f57aa2bfd13a5)

Change-Id: Ib8721f2fce060d26ee75b0515b3bf62a603fd40c
Signed-off-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index dfbc4a7..f51a026 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1520,7 +1520,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 bool bExchangeLeftRight = false;
 Value::Pointer_t pValue = rSprm.getValue();
 sal_Int32 nIntValue = pValue-getInt();
-OUString sStringValue = pValue-getString();
+const OUString sStringValue = pValue-getString();
 PropertyNameSupplier rPropNameSupplier = 
PropertyNameSupplier::GetPropertyNameSupplier();
 
 switch(nSprmId)
@@ -1547,7 +1547,10 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 rContext-Insert(PROP_PARA_KEEP_TOGETHER, true, uno::makeAny( 
nIntValue ? true : false) );
 break;
 case NS_sprm::LN_PFPageBreakBefore:
-rContext-Insert(PROP_BREAK_TYPE, true, uno::makeAny( 
com::sun::star::style::BreakType_PAGE_BEFORE ) );
+if ( nIntValue == 1 )
+{
+rContext-Insert(PROP_BREAK_TYPE, true, uno::makeAny( 
com::sun::star::style::BreakType_PAGE_BEFORE ) );
+}
 break;  // sprmPFPageBreakBefore
 case NS_sprm::LN_PBrcl:
 break;  // sprmPBrcl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svl

 include/svl/IndexedStyleSheets.hxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit b6086338247ae8ad9d56a1717a84c317b6e2b51e
Author: Michael Stahl mst...@redhat.com
Date:   Tue Mar 11 16:13:26 2014 +0100

svl: fix bogus visibility annotation on IndexedStyleSheets

Change-Id: I01cd75d01cb28a3bcef330ebabdd02e2c4458275

diff --git a/include/svl/IndexedStyleSheets.hxx 
b/include/svl/IndexedStyleSheets.hxx
index 6980a97..dde46f3 100644
--- a/include/svl/IndexedStyleSheets.hxx
+++ b/include/svl/IndexedStyleSheets.hxx
@@ -15,6 +15,8 @@
 #include rtl/ustring.hxx
 #include rtl/ref.hxx
 
+#include svl/svldllapi.h
+
 #include boost/unordered_map.hpp
 #include vector
 
@@ -66,7 +68,8 @@ struct StyleSheetCallback {
  * Index-based access is required in several code portions. Hence we have to 
store the style sheets
  * in a vector as well as in a map.
  */
-class SAL_DLLPUBLIC IndexedStyleSheets SAL_FINAL {
+class SVL_DLLPUBLIC IndexedStyleSheets SAL_FINAL
+{
 public:
 IndexedStyleSheets();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 sfx2/source

 include/sfx2/XmlIdRegistry.hxx  |2 +-
 sfx2/source/doc/Metadatable.cxx |7 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit aeba9c26898ae7b6da814cf012a7c348e64393d7
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Mar 11 16:29:34 2014 +0100

No need for GetElementByMetadataReference to be SAL_CALL

Change-Id: I34615c87238d4e96b6c1e81e57fb0822c876b929

diff --git a/include/sfx2/XmlIdRegistry.hxx b/include/sfx2/XmlIdRegistry.hxx
index 3b1dff4..68d6199 100644
--- a/include/sfx2/XmlIdRegistry.hxx
+++ b/include/sfx2/XmlIdRegistry.hxx
@@ -53,7 +53,7 @@ public:
 virtual ~IXmlIdRegistry() { }
 
 virtual ::com::sun::star::uno::Reference
-::com::sun::star::rdf::XMetadatable  SAL_CALL
+::com::sun::star::rdf::XMetadatable 
 GetElementByMetadataReference(
 const ::com::sun::star::beans::StringPair  i_rXmlId) const = 0;
 
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 3f44618..f2ae8f4 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -150,9 +150,10 @@ public:
 
 /** get the ODF element with the given metadata reference. */
 virtual ::com::sun::star::uno::Reference
-::com::sun::star::rdf::XMetadatable  SAL_CALL
+::com::sun::star::rdf::XMetadatable 
 GetElementByMetadataReference(
-const ::com::sun::star::beans::StringPair  i_rReference) const;
+const ::com::sun::star::beans::StringPair  i_rReference) const
+SAL_OVERRIDE;
 
 /** register an ODF element at a newly generated, unique metadata 
reference.
 
@@ -364,7 +365,7 @@ XmlIdRegistry::~XmlIdRegistry()
 {
 }
 
-::com::sun::star::uno::Reference ::com::sun::star::rdf::XMetadatable  
SAL_CALL
+::com::sun::star::uno::Reference ::com::sun::star::rdf::XMetadatable 
 XmlIdRegistry::GetElementByMetadataReference(
 const beans::StringPair  i_rReference) const
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa

 sw/qa/extras/ooxmlimport/data/i124106.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |6 ++
 2 files changed, 6 insertions(+)

New commits:
commit 30d94b0c40a12619d77aba5525d71538787813dc
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Mar 11 16:23:24 2014 +0100

i#124106 testcase

Change-Id: I732b4f8d758aac30e039d30e059aad0597307081

diff --git a/sw/qa/extras/ooxmlimport/data/i124106.docx 
b/sw/qa/extras/ooxmlimport/data/i124106.docx
new file mode 100644
index 000..de1d542
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/i124106.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f788f92..bfc8af0 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1941,6 +1941,12 @@ DECLARE_OOXMLIMPORT_TEST(testStrictLockedcanvas, 
strict-lockedcanvas.docx)
 getShape(1);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testI124106, i124106.docx)
+{
+// This was 2.
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/canvas

 include/canvas/base/canvasbase.hxx |   38 ++---
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 736420454a7ff46ffc298221e176443f06775634
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Mar 11 17:00:51 2014 +0100

Mark overriding CanvasBase class template member functions as SAL_OVERRIDE

Change-Id: I70ebad88d126d3aaa1c2023f98f6be71dc281287

diff --git a/include/canvas/base/canvasbase.hxx 
b/include/canvas/base/canvasbase.hxx
index c40e5c5..64681eb 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -122,7 +122,7 @@ namespace canvas
 }
 
 // XCanvas
-virtual void SAL_CALL clear() throw 
(::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL clear() throw 
(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
 {
 MutexType aGuard( BaseType::m_aMutex );
 
@@ -135,7 +135,7 @@ namespace canvas
 virtual void SAL_CALL drawPoint( const 
::com::sun::star::geometry::RealPoint2D aPoint,
  const 
::com::sun::star::rendering::ViewState  viewState,
  const 
::com::sun::star::rendering::RenderStaterenderState ) throw 
(::com::sun::star::lang::IllegalArgumentException,
-   
  ::com::sun::star::uno::RuntimeException)
+   
  ::com::sun::star::uno::RuntimeException) 
SAL_OVERRIDE
 {
 tools::verifyArgs(aPoint, viewState, renderState,
   BOOST_CURRENT_FUNCTION,
@@ -153,7 +153,7 @@ namespace canvas
 const 
::com::sun::star::geometry::RealPoint2D  aEndPoint,
 const 
::com::sun::star::rendering::ViewState   viewState,
 const 
::com::sun::star::rendering::RenderState renderState ) throw 
(::com::sun::star::lang::IllegalArgumentException,
-   
  ::com::sun::star::uno::RuntimeException)
+   
  ::com::sun::star::uno::RuntimeException) 
SAL_OVERRIDE
 {
 tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState,
   BOOST_CURRENT_FUNCTION,
@@ -171,7 +171,7 @@ namespace canvas
   const 
::com::sun::star::geometry::RealPoint2DaEndPoint,
   const 
::com::sun::star::rendering::ViewState viewState,
   const 
::com::sun::star::rendering::RenderState   renderState ) throw 
(::com::sun::star::lang::IllegalArgumentException,
-   
  
::com::sun::star::uno::RuntimeException)
+   
  
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
 {
 tools::verifyArgs(aBezierSegment, aEndPoint, viewState, 
renderState,
   BOOST_CURRENT_FUNCTION,
@@ -189,7 +189,7 @@ namespace canvas
 drawPolyPolygon( const ::com::sun::star::uno::Reference 
::com::sun::star::rendering::XPolyPolygon2D  xPolyPolygon,
  const ::com::sun::star::rendering::ViewState 
 viewState,
  const ::com::sun::star::rendering::RenderState   
 renderState ) throw 
(::com::sun::star::lang::IllegalArgumentException,
-   
  
::com::sun::star::uno::RuntimeException)
+   
  
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
 {
 tools::verifyArgs(xPolyPolygon, viewState, renderState,
   BOOST_CURRENT_FUNCTION,
@@ -208,7 +208,7 @@ namespace canvas
const ::com::sun::star::rendering::ViewState   
 viewState,
const ::com::sun::star::rendering::RenderState 
 renderState,
const 
::com::sun::star::rendering::StrokeAttributes

[Libreoffice-commits] core.git: include/vcl vcl/source

2014-03-11 Thread Chris Sherlock

 include/vcl/outdev.hxx   |2 
 include/vcl/print.hxx|1 
 include/vcl/virdev.hxx   |8 +-
 include/vcl/window.hxx   |1 
 vcl/source/gdi/outdev.cxx|  149 ---
 vcl/source/gdi/print.cxx |   71 
 vcl/source/gdi/virdev.cxx|   44 
 vcl/source/window/window.cxx |   68 +++
 8 files changed, 192 insertions(+), 152 deletions(-)

New commits:
commit e69615ccb016de1c64864bbc9cf1bbef9f50c1da
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Mon Mar 10 23:42:13 2014 +1100

fdo#74702 Moved ImplInitGraphics into correct classes

Currently we check to see what type of class is being used. This
really violates the Single Responsibility Principle, and tightly
couples the code to OutputDevice. The responsibility for initializing
graphics should be done by Printer, VirtualDevice and Window.

Please note: to get this working, I've had to make Printer a friend
class of VirtualDevice. I'm not entirely happy about this, I'll
need to revisit this later when I look at Printer in more detail.
For now, this is a hack to allow me to seperate out this function.

Change-Id: I9d5946c22fa70670a4f85bf338b4209499d0aa54
Reviewed-on: https://gerrit.libreoffice.org/8528
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 8595400..125948f 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -385,7 +385,7 @@ public:
 
  @returns true if was able to initialize the graphics device, false 
otherwise.
  */
-SAL_DLLPRIVATE bool ImplInitGraphics() const;
+virtual boolImplInitGraphics() const = 0;
 
 /** Release the graphics device, and remove it from the graphics device
  list.
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 4c25444..bc53bd6 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -247,6 +247,7 @@ private:
 boolmbUserSetupResult;
 LinkmaErrorHdl;
 
+boolImplInitGraphics() const;
 SAL_DLLPRIVATE void ImplInitData();
 SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo );
 SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow );
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 3450509..25ef11c 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -31,15 +31,16 @@ class VCL_DLLPUBLIC VirtualDevice : public OutputDevice
 {
 friend class Application;
 friend class OutputDevice;
+friend class Printer;
 
 private:
 SalVirtualDevice*   mpVirDev;
 VirtualDevice*  mpPrev;
 VirtualDevice*  mpNext;
-sal_uInt16  mnBitCount;
+sal_uInt16  mnBitCount;
 boolmbScreenComp;
 sal_Int8mnAlphaDepth;
-sal_uInt8   meRefDevMode;
+sal_uInt8   meRefDevMode;
 
 SAL_DLLPRIVATE void ImplInitVirDev( const OutputDevice* pOutDev, long nDX, 
long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL );
 SAL_DLLPRIVATE bool InnerImplSetOutputSizePixel( const Size rNewSize, 
bool bErase, const basebmp::RawMemorySharedArray pBuffer );
@@ -60,6 +61,9 @@ private:
 SAL_DLLPRIVATE bool ForceZeroExtleadBug() const
 { return ((meRefDevMode  REFDEV_FORCE_ZERO_EXTLEAD) != 0); }
 public:
+bool ImplInitGraphics() const;
+
+public:
 /** Create a virtual device of size 1x1
 
 @param nBitCount
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 7e226a6..62aa5c8 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -374,6 +374,7 @@ private:
 friend Window* ImplFindWindow( const SalFrame* pFrame, Point rSalFramePos 
);
 public:
 SAL_DLLPRIVATE voidImplInit( Window* pParent, WinBits 
nStyle, SystemParentData* pSystemParentData );
+bool   ImplInitGraphics() const;
 SAL_DLLPRIVATE WinBits ImplInitRes( const ResId rResId );
 SAL_DLLPRIVATE WindowResHeader ImplLoadResHeader( const ResId rResId 
);
 SAL_DLLPRIVATE voidImplLoadRes( const ResId rResId );
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index c1f42d7..1b797a1 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -550,155 +550,6 @@ SalGraphics const *OutputDevice::ImplGetGraphics() const
 return mpGraphics;
 }
 
-bool OutputDevice::ImplInitGraphics() const
-{
-DBG_TESTSOLARMUTEX();
-
-mbInitLineColor = true;
-mbInitFillColor = true;
-mbInitFont  = true;
-mbInitTextColor = true;
-mbInitClipRegion= true;
-
-ImplSVData* pSVData = ImplGetSVData();
-
-// TODO: move this out of

[Libreoffice-commits] core.git: sd/source

 sd/source/core/stlfamily.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit cecd77cb94d423bb2b7053f7e1a176267eb302d4
Author: Michael Stahl mst...@redhat.com
Date:   Tue Mar 11 17:25:24 2014 +0100

warning C4702: unreachable code

Change-Id: Ie5fe1348ed325b9de4af9e17846470fdc31067d7

diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 376b202..e75c9f1 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -343,10 +343,9 @@ sal_Bool SAL_CALL SdStyleFamily::hasElements() 
throw(RuntimeException, std::exce
 else
 {
 SfxStyleSheetIteratorPtr aSSSIterator = 
boost::make_sharedSfxStyleSheetIterator(mxPool.get(), mnFamily);
-for ( SfxStyleSheetBase* pStyle = aSSSIterator-First(); pStyle;
- pStyle = aSSSIterator-Next() )
+if (aSSSIterator-First())
 {
-return sal_True;
+return sal_True;
 }
 }
 
___
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 6c8bace16604af1deda831d29aef8400f4275bc3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 16:32:35 2014 +

Updated core
Project: help  d985ce5cab0ac92aeb08d7754de089baeb6b97f5

diff --git a/helpcontent2 b/helpcontent2
index 968..d985ce5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 968185360c4b6b71289c6ea9ad6fbddf06ed
+Subproject commit d985ce5cab0ac92aeb08d7754de089baeb6b97f5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

 helpers/help_hid.lst   |3 ---
 source/text/shared/00/0105.xhp |5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit d985ce5cab0ac92aeb08d7754de089baeb6b97f5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 16:32:35 2014 +

update help ids for gallery general page .ui conversion

Change-Id: Iaf7b6d030c9fc2e53ce3ae4e0e49d054afab4a3b

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ac2508e..2f11212 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2011,7 +2011,6 @@ HID_FUNC_ZZR,57951,
 HID_GALLERY_ACTUALIZE,33774,
 HID_GALLERY_APPLY,33773,
 HID_GALLERY_BROWSER,33768,
-HID_GALLERY_EDIT_MSNAME,39989,
 HID_GALLERY_ICONVIEW,34193,
 HID_GALLERY_LISTVIEW,34194,
 HID_GALLERY_MN_ADD,33956,
@@ -2027,7 +2026,6 @@ HID_GALLERY_NEWTHEME_ADDFILES,39878,
 HID_GALLERY_NEWTHEME_FINDFILES,39877,
 HID_GALLERY_PREVIEW,34192,
 HID_GALLERY_PROPERTIES,33777,
-HID_GALLERY_PROPERTIES_GENERAL,33826,
 HID_GALLERY_RENAME,33776,
 HID_GALLERY_SEARCH,33772,
 HID_GALLERY_THEMELIST,34179,
@@ -6074,7 +6072,6 @@ svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_POSTFIX,703334447,
 svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_SEARCH_NAME,703334441,
 svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_SEPARATOR,703334448,
 svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_URL,703334446,
-svx_Edit_RID_SVXTABPAGE_GALLERY_GENERAL_EDT_MS_NAME,706627585,
 svx_Edit_RID_SVX_MDLG_DOCRECOVERY_BROKEN_ED_BROKEN_SAVEDIR,1237780485,
 svx_Edit_RID_SVX_MDLG_ERR_REP_OPTIONS_ED_ERROPT_PROXYPORT,1237796872,
 svx_Edit_RID_SVX_MDLG_ERR_REP_OPTIONS_ED_ERROPT_PROXYSERVER,1237796870,
diff --git a/source/text/shared/00/0105.xhp 
b/source/text/shared/00/0105.xhp
index 68aee9b..0f0e36d 100644
--- a/source/text/shared/00/0105.xhp
+++ b/source/text/shared/00/0105.xhp
@@ -28,13 +28,12 @@
 /meta
 body
 section id=allgemein
-!-- removed HID SVX_TABPAGE_RID_SVXTABPAGE_GALLERY_GENERAL --
 paragraph role=heading id=hd_id3158397 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/00/0105.xhp 
name=GeneralGeneral/linkcommentUFI: this is a tab page of the Gallery. 
Deleted everything else/comment/paragraph
 paragraph role=paragraph id=par_id3159242 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=.Theemph General /emphtab page lists the general 
properties of the current theme./ahelp/paragraph
 /section
-bookmark xml-lang=en-US branch=hid/CUI_HID_GALLERY_PROPERTIES_GENERAL 
id=bm_id3152895 localize=false/
+bookmark xml-lang=en-US 
branch=hid/cui/ui/gallerygeneralpage/GalleryGeneralPage id=bm_id3152895 
localize=false/
 paragraph role=heading id=hd_id3150264 xml-lang=en-US level=2 
l10n=U oldref=3Name/paragraph
-paragraph role=paragraph id=par_id3154094 xml-lang=en-US l10n=CHG 
oldref=4ahelp 
hid=SVX_EDIT_RID_SVXTABPAGE_GALLERY_GENERAL_EDT_MS_NAMEDisplays the name of 
the theme./ahelp If no name has been assigned, you can type a new name in the 
text box./paragraph
+paragraph role=paragraph id=par_id3154094 xml-lang=en-US l10n=CHG 
oldref=4ahelp hid=cui/ui/gallerygeneralpage/nameDisplays the name of the 
theme./ahelp If no name has been assigned, you can type a new name in the 
text box./paragraph
 paragraph role=heading id=hd_id3147089 xml-lang=en-US level=3 
l10n=U oldref=5Type/paragraph
 paragraph role=paragraph id=par_id3145071 xml-lang=en-US l10n=CHG 
oldref=6Specifies the object type. /paragraph
 paragraph role=heading id=hd_id3147576 xml-lang=en-US level=3 
l10n=U oldref=7Location/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/uiconfig

 cui/uiconfig/ui/hyphenate.ui |  191 ---
 1 file changed, 107 insertions(+), 84 deletions(-)

New commits:
commit 7d68f0fa201ce1b29f62ecbaea25890148591da7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 15:46:26 2014 +

Resolves: fdo#74985 forward/back buttons too large

Change-Id: Ibed2216d2ca0a6dce48c0a6ef276f4a4f4d53219

diff --git a/cui/uiconfig/ui/hyphenate.ui b/cui/uiconfig/ui/hyphenate.ui
index 26818c6..0216092 100644
--- a/cui/uiconfig/ui/hyphenate.ui
+++ b/cui/uiconfig/ui/hyphenate.ui
@@ -1,6 +1,7 @@
 ?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.16.1 --
 interface
-  !-- interface-requires gtk+ 3.0 --
+  requires lib=gtk+ version=3.0/
   !-- interface-requires LibreOffice 1.0 --
   object class=GtkDialog id=HyphenateDialog
 property name=can_focusFalse/property
@@ -69,45 +70,58 @@
   object class=GtkGrid id=grid1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=valignstart/property
 property name=hexpandTrue/property
 property name=row_spacing6/property
 property name=column_spacing6/property
 child
-  object class=GtkLabel id=label1
+  object class=GtkButtonBox id=buttonbox1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=xalign0/property
-property name=label translatable=yesWord/property
-property name=use_underlineTrue/property
-property name=mnemonic_widgetworded/property
-  /object
-  packing
-property name=left_attach0/property
-property name=top_attach0/property
-property name=width2/property
-property name=height1/property
-  /packing
-/child
-child
-  object class=cuilo-HyphenEdit id=worded
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=hexpandTrue/property
-  /object
-  packing
-property name=left_attach0/property
-property name=top_attach1/property
-property name=width2/property
-property name=height1/property
-  /packing
-/child
-child
-  object class=GtkButton id=ok
-property name=label translatable=yesHyphenate/property
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=has_defaultTrue/property
-property name=receives_defaultTrue/property
+property name=orientationvertical/property
+property name=spacing6/property
+property name=layout_stylestart/property
+child
+  object class=GtkButton id=ok
+property name=label 
translatable=yesHyphenate/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=has_defaultTrue/property
+property name=receives_defaultTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=continue
+property name=label translatable=yesSkip/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=delete
+property name=labelgtk-remove/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+  /packing
+/child
   /object
   packing
 property

[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk include/svx svx/source

 cui/UIConfig_cui.mk   |1 
 cui/source/dialogs/cuigaldlg.cxx  |   59 +++--
 cui/source/dialogs/gallery.src|   80 -
 cui/source/inc/cuigaldlg.hxx  |   18 --
 cui/source/inc/gallery.hrc|   14 --
 cui/source/inc/helpid.hrc |2 
 cui/uiconfig/ui/gallerygeneralpage.ui |  207 ++
 include/svx/dialogs.hrc   |2 
 svx/source/dialog/sdstring.src|5 
 9 files changed, 235 insertions(+), 153 deletions(-)

New commits:
commit 7c8bdd561c0b6474201f821e5341b8669d577827
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 14:44:27 2014 +

convert gallery general page to .ui

Change-Id: I329f8bdea6206f48cd3834126869584b9057253f

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 1ca257a..bc0f070 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/eventsconfigpage \
cui/uiconfig/ui/formatcellsdialog \
+   cui/uiconfig/ui/gallerygeneralpage \
cui/uiconfig/ui/gallerysearchprogress \
cui/uiconfig/ui/gallerythemedialog \
cui/uiconfig/ui/gallerythemeiddialog \
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index b176f40..d7f09cd 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -614,8 +614,6 @@ GalleryThemeProperties::GalleryThemeProperties(Window* 
pParent,
 SetText( aText );
 }
 
-
-
 void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage rPage )
 {
 if (nId == m_nGeneralPageId)
@@ -624,36 +622,20 @@ void GalleryThemeProperties::PageCreated( sal_uInt16 nId, 
SfxTabPage rPage )
 ( (TPGalleryThemeProperties) rPage ).SetXChgData( pData );
 }
 
-
 // - TPGalleryThemeGeneral -
-
-
-TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const 
SfxItemSet rSet ) :
-SfxTabPage  ( pParent, CUI_RES( 
RID_SVXTABPAGE_GALLERY_GENERAL ), rSet ),
-aFiMSImage  ( this, CUI_RES( FI_MS_IMAGE ) ),
-aEdtMSName  ( this, CUI_RES( EDT_MS_NAME ) ),
-aFlMSGeneralFirst   ( this, CUI_RES( FL_MS_GENERAL_FIRST ) ),
-aFtMSType   ( this, CUI_RES( FT_MS_TYPE ) ),
-aFtMSShowType   ( this, CUI_RES( FT_MS_SHOW_TYPE ) ),
-aFtMSPath   ( this, CUI_RES( FT_MS_PATH ) ),
-aFtMSShowPath   ( this, CUI_RES( FT_MS_SHOW_PATH ) ),
-aFtMSContent( this, CUI_RES( FT_MS_CONTENT ) ),
-aFtMSShowContent( this, CUI_RES( FT_MS_SHOW_CONTENT ) ),
-aFlMSGeneralSecond  ( this, CUI_RES( FL_MS_GENERAL_SECOND ) ),
-aFtMSChangeDate ( this, CUI_RES( FT_MS_CHANGEDATE ) ),
-aFtMSShowChangeDate ( this, CUI_RES( FT_MS_SHOW_CHANGEDATE ) ),
-pData(NULL)
+TPGalleryThemeGeneral::TPGalleryThemeGeneral(Window* pParent, const 
SfxItemSet rSet)
+: SfxTabPage(pParent, GalleryGeneralPage,
+cui/ui/gallerygeneralpage.ui, rSet)
+, pData(NULL)
 {
-FreeResource();
-
-OUString aAccName(SVX_RES(RID_SVXSTR_GALLERY_THEMENAME));
-aEdtMSName.SetAccessibleName(aAccName);
-aFiMSImage.SetAccessibleName(aAccName);
-aEdtMSName.SetAccessibleRelationLabeledBy( aFiMSImage );
+get(m_pFiMSImage, image);
+get(m_pEdtMSName, name);
+get(m_pFtMSShowType, type);
+get(m_pFtMSShowPath, location);
+get(m_pFtMSShowContent, contents);
+get(m_pFtMSShowChangeDate, modified);
 }
 
-
-
 void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
 {
 pData = _pData;
@@ -665,20 +647,19 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* 
_pData )
 OUStringaType( SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
 sal_BoolbReadOnly = pThm-IsReadOnly();
 
-aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME );
-aEdtMSName.SetText( pThm-GetName() );
-aEdtMSName.SetReadOnly( bReadOnly );
+m_pEdtMSName-SetText( pThm-GetName() );
+m_pEdtMSName-SetReadOnly( bReadOnly );
 
 if( bReadOnly )
-aEdtMSName.Disable();
+m_pEdtMSName-Disable();
 else
-aEdtMSName.Enable();
+m_pEdtMSName-Enable();
 
 if( pThm-IsReadOnly() )
 aType += CUI_RES( RID_SVXSTR_GALLERY_READONLY );
 
-aFtMSShowType.SetText( aType );
-aFtMSShowPath.SetText( pThm-GetSdgURL().GetMainURL( 
INetURLObject::DECODE_UNAMBIGUOUS ) );
+m_pFtMSShowType-SetText( aType );
+m_pFtMSShowPath-SetText( pThm-GetSdgURL().GetMainURL( 
INetURLObject::DECODE_UNAMBIGUOUS ) );
 
 // singular or plural?
 if ( 1 == pThm-GetObjectCount() )
@@ -688,7 +669,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* 
_pData )
 
 aOutStr +=   + aObjStr;
 
-aFtMSShowContent.SetText( aOutStr );
+

[Libreoffice-commits] core.git: writerfilter/source

 writerfilter/source/dmapper/SdtHelper.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit df6e7e9dd4ac1d3a4088a68cad3b98c5b511019a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Mar 11 17:58:00 2014 +0100

SdtHelper: fix indentation

Change-Id: I21793d7d5a3edb68aa652336c3c7fe819520c23f

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index 164712f..df9a26e 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -112,7 +112,7 @@ void SdtHelper::createDateControl(OUString rContentText)
 
 util::Date aDate;
 util::DateTime aDateTime;
-if(utl::ISO8601parseDateTime(m_sDate.makeStringAndClear(), aDateTime))
+if (utl::ISO8601parseDateTime(m_sDate.makeStringAndClear(), aDateTime))
 {
 utl::extractDate(aDateTime, aDate);
 xPropertySet-setPropertyValue(Date, uno::makeAny(aDate));
@@ -150,7 +150,7 @@ void SdtHelper::createControlShape(awt::Size aSize, 
uno::Referenceawt::XControl
 uno::Referencebeans::XPropertySet xPropertySet(xControlShape, 
uno::UNO_QUERY);
 xPropertySet-setPropertyValue(VertOrient, 
uno::makeAny(text::VertOrientation::CENTER));
 
-if(rGrabBag.hasElements())
+if (rGrabBag.hasElements())
 xPropertySet-setPropertyValue(UNO_NAME_MISC_OBJ_INTEROPGRABBAG, 
uno::makeAny(rGrabBag));
 
 uno::Referencetext::XTextContent xTextContent(xControlShape, 
uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source

 oox/source/drawingml/texteffectscontext.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b710952a3a28c915b8e45a6cc8186b0ea9407c26
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Mar 11 18:09:52 2014 +0100

-Werror,-Wunused-variable

Change-Id: I87354690ac880ffb78bc8a6c20efe02f3eaa0779

diff --git a/oox/source/drawingml/texteffectscontext.cxx 
b/oox/source/drawingml/texteffectscontext.cxx
index dc5859f..6107896 100644
--- a/oox/source/drawingml/texteffectscontext.cxx
+++ b/oox/source/drawingml/texteffectscontext.cxx
@@ -295,7 +295,6 @@ void TextEffectsContext::onStartElement(const 
oox::AttributeList rAttribs)
 void TextEffectsContext::onEndElement()
 {
 mpGrabBagStack-pop();
-OUString aCurrentElementName = mpGrabBagStack-getCurrentName();
 
 if (mpGrabBagStack-isStackEmpty())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ucb/source

2014-03-11 Thread Matúš Kukan

 ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 36f143d59492be24d0b275d728f2c151e9123075
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Tue Mar 11 16:00:03 2014 +0100

webdav: Use plain OStringBuffer here, otherwise wrong string is created.

..with true instead of thePropName.name and thePropName.nspace
which obviously breaks things.

Change-Id: I6568e6a98c1793ebbe8ab1864bd8ad3995eee09c

diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx 
b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
index 557a0e7..ef9e16d 100644
--- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
@@ -23,7 +23,7 @@
 
 #include webdavresponseparser.hxx
 #include comphelper/seqstream.hxx
-#include rtl/ustrbuf.hxx
+#include rtl/strbuf.hxx
 
 
 using namespace com::sun::star;
@@ -95,7 +95,7 @@ serf_bucket_t * 
SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
 {
 // TODO is it really needed a Unicode string buffer?
 // All properties and property names aren't supposed to be ASCII?
-rtl::OUStringBuffer aBuffer;
+OStringBuffer aBuffer;
 aBuffer.append( PROPFIND_HEADER );
 
 // create and fill body bucket with requested properties
@@ -135,7 +135,7 @@ serf_bucket_t * 
SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
 }
 
 aBuffer.append( PROPFIND_TRAILER );
-aBodyText = rtl::OUStringToOString( aBuffer.makeStringAndClear(), 
RTL_TEXTENCODING_UTF8 );
+aBodyText = aBuffer.makeStringAndClear();
 body_bkt = serf_bucket_simple_copy_create( aBodyText.getStr(),
aBodyText.getLength(),
pSerfBucketAlloc );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ucb/source

2014-03-11 Thread Matúš Kukan

 ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a4f35131b1b2cd64feaa12f436888bb3ce836d68
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Tue Mar 11 19:19:32 2014 +0100

remove obsolete TODO comment; ASCII string is used here

since 36f143d59492be24d0b275d728f2c151e9123075

Change-Id: I71f0a0f6c2ce91086286a2fc0b6736be42d02198

diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx 
b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
index ef9e16d..bcbc54b 100644
--- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
@@ -93,8 +93,6 @@ serf_bucket_t * 
SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
 serf_bucket_t* body_bkt = 0;
 OString aBodyText;
 {
-// TODO is it really needed a Unicode string buffer?
-// All properties and property names aren't supposed to be ASCII?
 OStringBuffer aBuffer;
 aBuffer.append( PROPFIND_HEADER );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Hi-DPI patches for 4.2

2014-03-11 Thread Keith Curtis

Well, the rabbit hole gets deeper. Norbert, it now seems to me that there
isn't something wrong with your build, but with your OS!?!

Here is a screenshot of the current released build on Retina for comparison: 
http://nabble.documentfoundation.org/file/n4101006/Screen_Shot_2014-03-11_at_17.49.30.png
 

It generally looks fine, and doesn't need improvements. In it, you can see
that the Calc gridlines are two pixels wide as expected because of the app
scaling. (For comparison, on Linux, they are always one pixel wide which is
perhaps not ideal but looks okay.) 

However, the gridlines are effectively the same width as yours. But look at
the close buttons. I've zoomed in both to make it clearer. The one on the
left is from the screenshot above, and the one on the right is from your
screenshot last night. 

http://nabble.documentfoundation.org/file/n4101006/CloseButtons.png 

It seems as if all of Norbert's pixels are doubled. How does this relate to
the compatibility mode and DPI scale factor? I don't know WTF is going on
and it is time-consuming without any hardware to try things. It seems there
are possibly two problems on Norbert's machine.

If the OS really gives the wrong DPI even in compatibility mode, which
doesn't seem correct but is of course possible, then the simplest way
disable these patches on the Mac is to just force mnDPIScaleFactor to 1. In
that case, these patches would behave as it does on 4.2.1. This can be done
with 2 #ifndefs in window.cxx and should achieve a similar result as
disabling the bitmap doubling all over the place. Norbert, can you try that?

Mac doesn't need this code as much as Win / Linux so there needs a simple
way to decouple them. I was quite certain when Norbert had sent out his
first mail to this thread saying there were problems with these patches that
he had forgotten about what happens in compatibility mode is on -- because
he'd been spending all of his time working with the off case. But I never
imagined it would be this complicated. It would be nice to have these
patches not held up by the Mac as they are right now.

-Keith



--
View this message in context: 
http://nabble.documentfoundation.org/Hi-DPI-patches-for-4-2-tp4100852p4101006.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d5b8f5b662cdede27942c231bd6a2922f6237ee
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 17:11:15 2014 +

Updated core
Project: help  04811c484e936a03c27385492ca8baaa1498ed5d

diff --git a/helpcontent2 b/helpcontent2
index d985ce5..04811c4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d985ce5cab0ac92aeb08d7754de089baeb6b97f5
+Subproject commit 04811c484e936a03c27385492ca8baaa1498ed5d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

 helpers/help_hid.lst   |1 -
 source/text/shared/00/0010.xhp |4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 04811c484e936a03c27385492ca8baaa1498ed5d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 17:11:15 2014 +

update help ids for gallery update progress .ui conversion

Change-Id: I7e1bd7a56a2ac93712b41c415382dd640169eb7e

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2f11212..a0fb3dd 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2008,7 +2008,6 @@ HID_FUNC_ZINSZ,57954,
 HID_FUNC_ZUFALLSZAHL,58229,
 HID_FUNC_ZW,57950,
 HID_FUNC_ZZR,57951,
-HID_GALLERY_ACTUALIZE,33774,
 HID_GALLERY_APPLY,33773,
 HID_GALLERY_BROWSER,33768,
 HID_GALLERY_ICONVIEW,34193,
diff --git a/source/text/shared/00/0010.xhp 
b/source/text/shared/00/0010.xhp
index 2d193d0..b5b847a 100644
--- a/source/text/shared/00/0010.xhp
+++ b/source/text/shared/00/0010.xhp
@@ -69,8 +69,8 @@
   paragraph l10n=U xml-lang=en-US role=paragraph id=par_id3149797 
oldref=166ahelp hid=SID_EXPLORERCONTENT_RENAME 
visibility=visibleEnables a selected object to be renamed./ahelp After 
selecting emphRename/emph the name is selected and a new one can be entered 
directly. Use the arrow keys to set the cursor at the beginning or end of the 
name to delete or add to part of the name or to reposition the 
cursor./paragraph
   /section
   section id=aktualisieren
-  bookmark branch=hid/SVX_HID_GALLERY_ACTUALIZE xml-lang=en-US 
id=bm_id3150275 localize=false/paragraph role=heading level=2 
id=hd_id3155434 l10n=U xml-lang=en-US oldref=317Update/paragraph
-  paragraph l10n=U role=paragraph id=par_id3154898 xml-lang=en-US 
oldref=318ahelp hid=HID_GALLERY_ACTUALIZE visibility=visibleUpdates 
the view in the window or in the selected object./ahelp/paragraph
+  bookmark branch=hid/cui/ui/galleryupdateprogress/GalleryUpdateProgress 
xml-lang=en-US id=bm_id3150275 localize=false/paragraph role=heading 
level=2 id=hd_id3155434 l10n=U xml-lang=en-US 
oldref=317Update/paragraph
+  paragraph l10n=U role=paragraph id=par_id3154898 xml-lang=en-US 
oldref=318ahelp hid=cui/ui/galleryupdateprogress/GalleryUpdateProgress 
visibility=visibleUpdates the view in the window or in the selected 
object./ahelp/paragraph
   /section
   section id=vorschau
   paragraph role=heading level=2 id=hd_id3147573 l10n=U 
xml-lang=en-US oldref=172Preview/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk include/svx

 cui/UIConfig_cui.mk  |1 
 cui/source/dialogs/cuigaldlg.cxx |   27 +++-
 cui/source/dialogs/gallery.src   |   28 
 cui/source/inc/cuigaldlg.hxx |6 -
 cui/source/inc/gallery.hrc   |4 -
 cui/uiconfig/ui/galleryupdateprogress.ui |  100 +++
 include/svx/exthelpid.hrc|1 
 7 files changed, 114 insertions(+), 53 deletions(-)

New commits:
commit c971c1fa66570bc6cbf658aa5c9cee15fc470bd2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Mar 11 17:08:18 2014 +

convert gallery update progress dialog to .ui

Change-Id: If1bcd040fabef1d352f04898f4bb583d9f4fc8c7

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index bc0f070..bd3097b 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/gallerythemedialog \
cui/uiconfig/ui/gallerythemeiddialog \
cui/uiconfig/ui/gallerytitledialog \
+   cui/uiconfig/ui/galleryupdateprogress \
cui/uiconfig/ui/hangulhanjaadddialog \
cui/uiconfig/ui/hangulhanjaoptdialog \
cui/uiconfig/ui/hatchpage \
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index d7f09cd..32d52e4 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -443,22 +443,17 @@ void TakeProgress::StartExecuteModal( const Link 
rEndDialogHdl )
 
 
 // - ActualizeProgress -
-
-
-ActualizeProgress::ActualizeProgress( Window* pWindow, GalleryTheme* pThm ) :
-ModalDialog ( pWindow, CUI_RES( 
RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ),
-aFtActualizeFile( this, CUI_RES( FT_ACTUALIZE_FILE ) ),
-aFLActualizeProgress   ( this, CUI_RES( FL_ACTUALIZE_PROGRESS ) ),
-aBtnCancel  ( this, CUI_RES( BTN_CANCEL ) ),
-pTimer(NULL),
-pTheme  ( pThm )
+ActualizeProgress::ActualizeProgress(Window* pWindow, GalleryTheme* pThm)
+: ModalDialog(pWindow, GalleryUpdateProgress,
+cui/ui/galleryupdateprogress.ui)
+, pTimer(NULL)
+, pTheme(pThm)
 {
-FreeResource();
-aBtnCancel.SetClickHdl( LINK( this, ActualizeProgress, ClickCancelBtn ) );
+get(m_pFtActualizeFile, file);
+get(m_pBtnCancel, cancel);
+m_pBtnCancel-SetClickHdl( LINK( this, ActualizeProgress, ClickCancelBtn ) 
);
 }
 
-
-
 short ActualizeProgress::Execute()
 {
 short nRet;
@@ -515,9 +510,9 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, 
pURL )
 
 if( pURL )
 {
-aFtActualizeFile.SetText( GetReducedString( *pURL, 30 ) );
-aFtActualizeFile.Flush();
-aFtActualizeFile.Sync();
+m_pFtActualizeFile-SetText( GetReducedString( *pURL, 30 ) );
+m_pFtActualizeFile-Flush();
+m_pFtActualizeFile-Sync();
 }
 
 return 0;
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index b7cc83c..21b7ed8 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -145,34 +145,6 @@ ModalDialog RID_SVXDLG_GALLERY_TAKE_PROGRESS
 
 
/**/
 
-ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS
-{
-HelpId = HID_GALLERY_ACTUALIZE;
-OutputSize = TRUE ;
-Border = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 124 , 56 ) ;
-Text [ en-US ] = Update ;
-Moveable = TRUE ;
-FixedLine FL_ACTUALIZE_PROGRESS
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 112 , 8 ) ;
-Text [ en-US ] = File ;
-};
-FixedText FT_ACTUALIZE_FILE
-{
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 100 , 10 ) ;
-};
-CancelButton BTN_CANCEL
-{
-Pos = MAP_APPFONT ( 37 , 36 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-};
-
 String RID_SVXSTR_GALLERY_NOFILES
 {
 Text [ en-US ] = No Files ;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 969ce2b..1026503 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -151,10 +151,8 @@ public:
 class ActualizeProgress : public ModalDialog
 {
 private:
-
-FixedText   aFtActualizeFile;
-FixedLine   aFLActualizeProgress;
-CancelButtonaBtnCancel;
+FixedText*  m_pFtActualizeFile;
+CancelButton*   m_pBtnCancel;
 Timer*  pTimer;
 GalleryTheme*   pTheme;
 GalleryProgress aStatusProgress;
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
index 74cf43c..5487b25 100644
--- a/cui/source/inc/gallery.hrc
+++ b/cui/source/inc/gallery.hrc
@@ -24,7 +24,6 @@
 
 // Dialogs
 #define RID_SVXDLG_GALLERY_TAKE_PROGRESS(RID_CUI_GALLERY_START + 7)
-#define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS   (RID_CUI_GALLERY_START + 8)
 
 // Gallery-Strings
 #define

[Libreoffice-commits] core.git: 2 commits - svx/source sw/source vcl/source

 svx/source/sidebar/tools/ValueSetWithTextControl.cxx |7 +++
 svx/source/stbctrls/modctrl.cxx  |4 ++--
 svx/source/stbctrls/pszctrl.cxx  |3 +--
 svx/source/stbctrls/selctrl.cxx  |4 ++--
 svx/source/stbctrls/xmlsecctrl.cxx   |2 --
 svx/source/stbctrls/zoomsliderctrl.cxx   |4 ++--
 svx/source/tbxctrls/tbcontrl.cxx |4 ++--
 sw/source/core/uibase/utlui/content.cxx  |2 --
 sw/source/core/uibase/utlui/viewlayoutctrl.cxx   |3 +--
 vcl/source/window/toolbox2.cxx   |3 +--
 vcl/source/window/window.cxx |   10 --
 11 files changed, 22 insertions(+), 24 deletions(-)

New commits:
commit 58fae0f715433a72d814584d97a1368f8a1b62d2
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Tue Mar 11 15:43:48 2014 -0500

remove osolete ifdef

now that the ScaleDPI is forced to 1 on mac there is no need
for these ifdef

Change-Id: I0ca3bc301b63f5f4c7d1eb36f27bc9b6ab41af29

diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx 
b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 51c157f..5dd6e99 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -101,7 +101,6 @@ void ValueSetWithTextControl::AddItem(
 ? *pSelectedItemImage
 : rItemImage;
 
-#ifndef MACOSX
 if ( GetDPIScaleFactor()  1 )
 {
 BitmapEx b = aItem.maItemImage.GetBitmapEx();
@@ -115,7 +114,7 @@ void ValueSetWithTextControl::AddItem(
 aItem.maSelectedItemImage = Image(b);
 }
 }
-#endif
+
 aItem.maItemText = rItemText;
 
 maItems.push_back( aItem );
@@ -169,7 +168,7 @@ void ValueSetWithTextControl::ReplaceItemImages(
  ? *pSelectedItemImage
  : rItemImage;
 
-#ifndef MACOSX
+//#ifndef MACOSX
 if ( GetDPIScaleFactor()  1 )
 {
 BitmapEx b = maItems[nItemId-1].maItemImage.GetBitmapEx();
@@ -183,7 +182,7 @@ void ValueSetWithTextControl::ReplaceItemImages(
 maItems[nItemId-1].maSelectedItemImage = Image(b);
 }
 }
-#endif
+//#endif
 }
 
 
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 3d7c577..15bc693 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -73,7 +73,7 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, 
sal_uInt16 _nId, Status
 SfxStatusBarControl( _nSlotId, _nId, rStb ),
 mpImpl(new ImplData)
 {
-#ifndef MACOSX
+//#ifndef MACOSX
 if ( rStb.GetDPIScaleFactor()  1 )
 {
 for (int i = 0; i  mpImpl-MODIFICATION_STATE_SIZE; i++)
@@ -83,7 +83,7 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, 
sal_uInt16 _nId, Status
 mpImpl-maImages[i] = Image(b);
 }
 }
-#endif
+//#endif
 mpImpl-maTimer.SetTimeoutHdl( LINK(this, SvxModifyControl, OnTimer) );
 }
 
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 634badf..a3383fe 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -178,7 +178,6 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( 
sal_uInt16 _nSlotId,
 pImp-aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
 pImp-aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
 
-#ifndef MACOSX
 if ( rStb.GetDPIScaleFactor()  1)
 {
 BitmapEx b = pImp-aPosImage.GetBitmapEx();
@@ -189,7 +188,7 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( 
sal_uInt16 _nSlotId,
 b.Scale(rStb.GetDPIScaleFactor(), rStb.GetDPIScaleFactor(), 
BMP_SCALE_FAST);
 pImp-aSizeImage = Image(b);
 }
-#endif
+
 addStatusListener( OUString( STR_POSITION )); // SID_ATTR_POSITION
 addStatusListener( OUString( STR_TABLECELL ));   // SID_TABLE_CELL
 addStatusListener( OUString( STR_FUNC ));// SID_PSZ_FUNCTION
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index a56cd0a..acfb2da 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -80,14 +80,14 @@ SvxSelectionModeControl::SvxSelectionModeControl( 
sal_uInt16 _nSlotId,
 mnState( 0 ),
 maImage( SVX_RES( RID_SVXBMP_SELECTION ) )
 {
-#ifndef MACOSX
+//#ifndef MACOSX
 if ( GetStatusBar().GetDPIScaleFactor()  1 )
 {
 BitmapEx b = maImage.GetBitmapEx();
 b.Scale(GetStatusBar().GetDPIScaleFactor(), 
GetStatusBar().GetDPIScaleFactor(), BMP_SCALE_FAST);
 maImage = Image(b);
 }
-#endif
+//#endif
 GetStatusBar().SetItemText( GetId(),  );
 }
 
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx 
b/svx/source/stbctrls/xmlsecctrl.cxx
index 1ecfd52..46ea35b 100644
---

gerlowskija License Agreement

2014-03-11 Thread Jason Gerlowski

   All of my past  future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - chart2/qa chart2/source

 chart2/qa/extras/chart2export.cxx   |   33 
 chart2/qa/extras/data/ods/ErrorBarRange.ods |binary
 chart2/source/tools/ErrorBar.cxx|2 -
 3 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit 5da51525fab4d424b76b681ee70f76b54d99f73d
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Tue Mar 11 22:36:01 2014 +0100

add test for fdo#75510

Change-Id: I76cb1008138f7b79223330d4a24d45a026d1118f

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index e3554e5..0dd8d63 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -49,6 +49,7 @@ public:
 void testShapeFollowedByChart();
 void testPieChartDataLabels();
 void testSeriesIdxOrder();
+void testErrorBarDataRangeODS();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(test);
@@ -70,6 +71,7 @@ public:
 CPPUNIT_TEST(testShapeFollowedByChart);
 CPPUNIT_TEST(testPieChartDataLabels);
 CPPUNIT_TEST(testSeriesIdxOrder);
+CPPUNIT_TEST(testErrorBarDataRangeODS);
 CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -620,6 +622,37 @@ void Chart2ExportTest::testSeriesIdxOrder()
 assertXPath(pXmlDoc, 
/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:idx[1], 
val, 1);
 assertXPath(pXmlDoc, 
/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:order[1], 
val, 1);
 }
+
+void Chart2ExportTest::testErrorBarDataRangeODS()
+{
+load(/chart2/qa/extras/data/ods/, ErrorBarRange.ods);
+reload(calc8);
+
+uno::Reference chart2::XChartDocument  xChartDoc = getChartDocFromSheet( 
0, mxComponent );
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference chart2::XDataSeries  xDataSeries = getDataSeriesFromDoc( 
xChartDoc, 0 );
+CPPUNIT_ASSERT( xDataSeries.is() );
+
+Reference beans::XPropertySet  xPropSet( xDataSeries, UNO_QUERY_THROW );
+CPPUNIT_ASSERT( xPropSet.is() );
+
+// test that y error bars are there
+Reference beans::XPropertySet  xErrorBarYProps;
+xPropSet-getPropertyValue(ErrorBarY) = xErrorBarYProps;
+uno::Any aAny = xErrorBarYProps-getPropertyValue(ErrorBarRangePositive);
+CPPUNIT_ASSERT(aAny.hasValue());
+OUString aPosRange;
+aAny = aPosRange;
+CPPUNIT_ASSERT_EQUAL(OUString($Sheet1.$B$1:$B$3), aPosRange);
+
+aAny = xErrorBarYProps-getPropertyValue(ErrorBarRangeNegative);
+CPPUNIT_ASSERT(aAny.hasValue());
+OUString aNegRange;
+aAny = aNegRange;
+CPPUNIT_ASSERT_EQUAL(OUString($Sheet1.$C$1:$C$3), aNegRange);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/ods/ErrorBarRange.ods 
b/chart2/qa/extras/data/ods/ErrorBarRange.ods
new file mode 100644
index 000..28e6aee
Binary files /dev/null and b/chart2/qa/extras/data/ods/ErrorBarRange.ods differ
commit 7470b3ef17570581fe590a4853de59cac1be6ea5
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Tue Mar 11 22:10:30 2014 +0100

fix negative error bar range export, fdo#75510

Change-Id: Icca2f9fc26b15b968a940e5c73f7ad3781f75e94

diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 1469e8e..c500ddd 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -256,7 +256,7 @@ uno::Any ErrorBar::getPropertyValue(const OUString 
rPropName)
 uno::Sequence uno::Reference chart2::data::XLabeledDataSequence 
  aSequences =
 getDataSequences();
 
-aRange = getSourceRangeStrFromLabeledSequences( aSequences, true );
+aRange = getSourceRangeStrFromLabeledSequences( aSequences, false 
);
 }
 
 aRet = aRange;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 75510, which changed state.

Bug 75510 Summary: FILESAVE: Asymmetric error bars properties in charts are not 
properly saved
https://bugs.freedesktop.org/show_bug.cgi?id=75510

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

2014-03-11 Thread Takeshi Abe

 vcl/source/filter/GraphicNativeMetadata.cxx |8 
 vcl/source/filter/graphicfilter.cxx |   11 +--
 vcl/source/filter/igif/gifread.cxx  |   15 ++-
 vcl/source/filter/jpeg/Exif.cxx |   12 +---
 vcl/source/filter/jpeg/JpegReader.cxx   |5 ++---
 vcl/source/filter/jpeg/jpegc.cxx|   16 +++-
 6 files changed, 29 insertions(+), 38 deletions(-)

New commits:
commit de660901e1805f33467d425018d6bf5d5326e376
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Wed Mar 12 06:53:08 2014 +0900

Avoid possible resource leaks by boost::scoped_array

Change-Id: I5a73d3410262c830795c8b132227fcff5f5127e3

diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx 
b/vcl/source/filter/GraphicNativeMetadata.cxx
index 785f89c..08b698a 100644
--- a/vcl/source/filter/GraphicNativeMetadata.cxx
+++ b/vcl/source/filter/GraphicNativeMetadata.cxx
@@ -22,6 +22,7 @@
 #include vcl/gfxlink.hxx
 
 #include jpeg/Exif.hxx
+#include boost/scoped_array.hpp
 
 GraphicNativeMetadata::GraphicNativeMetadata() :
 mRotation(0)
@@ -41,16 +42,15 @@ bool GraphicNativeMetadata::read(Graphic rGraphic)
 if ( aLink.GetType() != GFX_LINK_TYPE_NATIVE_JPG )
 return false;
 sal_uInt32 aDataSize = aLink.GetDataSize();
-sal_uInt8* aBuffer = new sal_uInt8[aDataSize];
+boost::scoped_arraysal_uInt8 aBuffer(new sal_uInt8[aDataSize]);
 
-memcpy(aBuffer, aLink.GetData(), aDataSize);
-SvMemoryStream aMemoryStream(aBuffer, aDataSize, STREAM_READ);
+memcpy(aBuffer.get(), aLink.GetData(), aDataSize);
+SvMemoryStream aMemoryStream(aBuffer.get(), aDataSize, STREAM_READ);
 
 Exif aExif;
 aExif.read(aMemoryStream);
 mRotation = aExif.getRotation();
 
-delete[] aBuffer;
 return true;
 }
 
diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 7840d61..a033e9b 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -63,6 +63,7 @@
 #include rtl/instance.hxx
 #include vcl/metaact.hxx
 #include vector
+#include boost/scoped_array.hpp
 #include boost/scoped_ptr.hpp
 
 #include FilterConfigCache.hxx
@@ -621,22 +622,20 @@ static bool ImpPeekGraphicFormat( SvStream rStream, 
OUString rFormatExtension,
 if( !bTest )
 {
 sal_uLong nSize = ( nStreamLen  2048 ) ? 2048 : nStreamLen;
-sal_uInt8* pBuf = new sal_uInt8 [ nSize ];
+boost::scoped_arraysal_uInt8 pBuf(new sal_uInt8 [ nSize ]);
 
 rStream.Seek( nStreamPos );
-rStream.Read( pBuf, nSize );
-sal_uInt8* pPtr = ImplSearchEntry( pBuf, (sal_uInt8*)#define, nSize, 
7 );
+rStream.Read( pBuf.get(), nSize );
+sal_uInt8* pPtr = ImplSearchEntry( pBuf.get(), (sal_uInt8*)#define, 
nSize, 7 );
 
 if( pPtr )
 {
-if( ImplSearchEntry( pPtr, (sal_uInt8*)_width, pBuf + nSize - 
pPtr, 6 ) )
+if( ImplSearchEntry( pPtr, (sal_uInt8*)_width, pBuf.get() + 
nSize - pPtr, 6 ) )
 {
 rFormatExtension = XBM;
-delete[] pBuf;
 return true;
 }
 }
-delete[] pBuf;
 }
 else if( rFormatExtension.startsWith( XBM ) )
 {
diff --git a/vcl/source/filter/igif/gifread.cxx 
b/vcl/source/filter/igif/gifread.cxx
index 26ceb86..b3168a0 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -22,6 +22,7 @@
 
 #include decode.hxx
 #include gifread.hxx
+#include boost/scoped_array.hpp
 
 #define NO_PENDING( rStm ) ( ( rStm ).GetError() != ERRCODE_IO_PENDING )
 
@@ -172,12 +173,12 @@ bool GIFReader::ReadGlobalHeader()
 void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount )
 {
 const sal_uLong nLen = 3UL * nCount;
-sal_uInt8*  pBuf = new sal_uInt8[ nLen ];
+boost::scoped_arraysal_uInt8 pBuf(new sal_uInt8[ nLen ]);
 
-rIStm.Read( pBuf, nLen );
+rIStm.Read( pBuf.get(), nLen );
 if( NO_PENDING( rIStm ) )
 {
-sal_uInt8* pTmp = pBuf;
+sal_uInt8* pTmp = pBuf.get();
 
 for( sal_uLong i = 0UL; i  nCount; )
 {
@@ -197,8 +198,6 @@ void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, 
sal_uLong nCount )
 (*pPal)[ 254UL ] = Color( COL_BLACK );
 }
 }
-
-delete[] pBuf;
 }
 
 bool GIFReader::ReadExtension()
@@ -315,10 +314,10 @@ bool GIFReader::ReadExtension()
 while( cSize  bStatus  !rIStm.IsEof() )
 {
 sal_uInt16  nCount = (sal_uInt16) cSize + 1;
-char*   pBuffer = new char[ nCount ];
+boost::scoped_arraychar pBuffer(new char[ nCount ]);
 
 bRet = false;
-rIStm.Read( pBuffer, nCount );
+rIStm.Read( pBuffer.get(), nCount );
 if( NO_PENDING( rIStm ) )
 {
 cSize = (sal_uInt8) pBuffer[ cSize ];
@@ -326,8 +325,6 @@ bool

[Libreoffice-commits] core.git: sw/qa writerfilter/source

 sw/qa/extras/ooxmlimport/data/rhbz1075124.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   16 ++
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   24 +++
 writerfilter/source/dmapper/TablePropertiesHandler.cxx   |4 +-
 4 files changed, 30 insertions(+), 14 deletions(-)

New commits:
commit 76aa23c59b4c81ea7b9d974a1a0a9e39c6bf8741
Author: Michael Stahl mst...@redhat.com
Date:   Tue Mar 11 22:36:35 2014 +0100

rhbz#1075124: writerfilter: fix tables with negative left margin

SvxBoxItem::nLeftDist is unsigned; the bugdoc sets a very large value
due to wrap-around which causes the table content not to be displayed.

DomainMapperTableHandler::endTableGetTableStyle() tweaks the
rInfo.nLeftBorderDistance by adding half the border line width to it,
which makes it positive; at that point the value has already been used
to init table::TableBorderDistances, so move that downward so it gets
the positive value too.

Change-Id: Ied2331b93f2e95845d7e8b2cc06e89e1ab24296e

diff --git a/sw/qa/extras/ooxmlimport/data/rhbz1075124.docx 
b/sw/qa/extras/ooxmlimport/data/rhbz1075124.docx
new file mode 100644
index 000..3b31701
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/rhbz1075124.docx 
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index bfc8af0..e67796e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -47,6 +47,7 @@
 #include com/sun/star/view/XFormLayerAccess.hpp
 #include com/sun/star/table/BorderLine2.hpp
 #include com/sun/star/table/TableBorder2.hpp
+#include com/sun/star/table/TableBorderDistances.hpp
 #include com/sun/star/text/SizeType.hpp
 #include com/sun/star/xml/dom/XDocument.hpp
 #include com/sun/star/text/XDocumentIndex.hpp
@@ -210,6 +211,21 @@ DECLARE_OOXMLIMPORT_TEST(testRhbz988516, rhbz988516.docx)
 getPropertyOUString(getParagraph(3), NumberingStyleName));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testRhbz1075124, rhbz1075124.docx)
+{
+// negative left margin on table wrapped around to 64k unsigned
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
+uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess xTables(
+xTablesSupplier-getTextTables(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-243),
+getPropertysal_Int32(xTables-getByIndex(0), LeftMargin));
+table::TableBorderDistances dists(
+getPropertytable::TableBorderDistances(xTables-getByIndex(0),
+TableBorderDistances));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(26), dists.LeftDistance);
+}
+
 DECLARE_OOXMLIMPORT_TEST(testFdo49940, fdo49940.docx)
 {
 uno::Referencetext::XTextDocument xTextDocument(mxComponent, 
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index a9a4221..a6ade15 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -406,18 +406,6 @@ TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 m_aTableProperties-getValue( TablePropertyMap::CELL_MAR_BOTTOM,
  rInfo.nBottomBorderDistance );
 
-table::TableBorderDistances aDistances;
-aDistances.IsTopDistanceValid =
-aDistances.IsBottomDistanceValid =
-aDistances.IsLeftDistanceValid =
-aDistances.IsRightDistanceValid = sal_True;
-aDistances.TopDistance = static_castsal_Int16( 
rInfo.nTopBorderDistance );
-aDistances.BottomDistance = static_castsal_Int16( 
rInfo.nBottomBorderDistance );
-aDistances.LeftDistance = static_castsal_Int16( 
rInfo.nLeftBorderDistance );
-aDistances.RightDistance = static_castsal_Int16( 
rInfo.nRightBorderDistance );
-
-m_aTableProperties-Insert( PROP_TABLE_BORDER_DISTANCES, uno::makeAny( 
aDistances ) );
-
 if (rFrameProperties.hasElements())
 lcl_DecrementHoriOrientPosition(rFrameProperties, 
rInfo.nLeftBorderDistance);
 
@@ -477,6 +465,18 @@ TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 lcl_debug_TableBorder(aTableBorder);
 #endif
 
+table::TableBorderDistances aDistances;
+aDistances.IsTopDistanceValid =
+aDistances.IsBottomDistanceValid =
+aDistances.IsLeftDistanceValid =
+aDistances.IsRightDistanceValid = sal_True;
+aDistances.TopDistance = static_castsal_Int16( 
rInfo.nTopBorderDistance );
+aDistances.BottomDistance = static_castsal_Int16( 
rInfo.nBottomBorderDistance );
+aDistances.LeftDistance = static_castsal_Int16( 
rInfo.nLeftBorderDistance );
+aDistances.RightDistance = static_castsal_Int16( 
rInfo.nRightBorderDistance );
+
+

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - chart2/source

 chart2/source/tools/ErrorBar.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 787a663d8579921af4176feeb265dea8aac4d50c
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Tue Mar 11 22:10:30 2014 +0100

fix negative error bar range export, fdo#75510

Change-Id: Icca2f9fc26b15b968a940e5c73f7ad3781f75e94
(cherry picked from commit 7470b3ef17570581fe590a4853de59cac1be6ea5)
Reviewed-on: https://gerrit.libreoffice.org/8535
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 3e305b9..cd55836 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -254,7 +254,7 @@ uno::Any ErrorBar::getPropertyValue(const OUString 
rPropName)
 uno::Sequence uno::Reference chart2::data::XLabeledDataSequence 
  aSequences =
 getDataSequences();
 
-aRange = getSourceRangeStrFromLabeledSequences( aSequences, true );
+aRange = getSourceRangeStrFromLabeledSequences( aSequences, false 
);
 }
 
 aRet = aRange;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - chart2/source

 chart2/source/tools/ErrorBar.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e687941b2b5af347a99707783302c0d03b6a5c55
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Tue Mar 11 22:10:30 2014 +0100

fix negative error bar range export, fdo#75510

Change-Id: Icca2f9fc26b15b968a940e5c73f7ad3781f75e94
(cherry picked from commit 7470b3ef17570581fe590a4853de59cac1be6ea5)
Reviewed-on: https://gerrit.libreoffice.org/8536
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 932efbc..805b4e6 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -254,7 +254,7 @@ uno::Any ErrorBar::getPropertyValue(const OUString 
rPropName)
 uno::Sequence uno::Reference chart2::data::XLabeledDataSequence 
  aSequences =
 getDataSequences();
 
-aRange = getSourceRangeStrFromLabeledSequences( aSequences, true );
+aRange = getSourceRangeStrFromLabeledSequences( aSequences, false 
);
 }
 
 aRet = aRange;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/qa oox/source

2014-03-11 Thread Ravindra Vidhate

 chart2/qa/extras/chart2export.cxx|9 +
 chart2/qa/extras/data/docx/FDO75975.docx |binary
 oox/source/export/chartexport.cxx|2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit ede99e0daa0701e2d8568d7ed00e2221a4f6a9f6
Author: Ravindra Vidhate ravindra.vidh...@synerzip.com
Date:   Mon Mar 10 17:36:05 2014 +0530

fdo#75975 crash while saving the DOCX file containing charts

1. Open DOCX file containing Charts
2. Save this file into DOCX format.
3. LO crashed while saving/exporting to DOCX format.

Conflicts:
chart2/qa/extras/chart2export.cxx

Change-Id: I14d4f2c214ce3513b4bd14831771d72498e4486d

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 0dd8d63..e328f90 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -50,6 +50,7 @@ public:
 void testPieChartDataLabels();
 void testSeriesIdxOrder();
 void testErrorBarDataRangeODS();
+void testChartCrash();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(test);
@@ -72,6 +73,7 @@ public:
 CPPUNIT_TEST(testPieChartDataLabels);
 CPPUNIT_TEST(testSeriesIdxOrder);
 CPPUNIT_TEST(testErrorBarDataRangeODS);
+CPPUNIT_TEST(testChartCrash);
 CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -653,6 +655,13 @@ void Chart2ExportTest::testErrorBarDataRangeODS()
 CPPUNIT_ASSERT_EQUAL(OUString($Sheet1.$C$1:$C$3), aNegRange);
 }
 
+void Chart2ExportTest::testChartCrash()
+{
+load(/chart2/qa/extras/data/docx/, FDO75975.docx);
+xmlDocPtr pXmlDoc = parseExport(word/charts/chart, Office Open XML 
Text);
+CPPUNIT_ASSERT(pXmlDoc);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/FDO75975.docx 
b/chart2/qa/extras/data/docx/FDO75975.docx
new file mode 100644
index 000..30f2510
Binary files /dev/null and b/chart2/qa/extras/data/docx/FDO75975.docx differ
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index b912bcf..201d988 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2307,7 +2307,7 @@ void ChartExport::_exportAxis(
 {
 pFS-startElement( FSNS( XML_c, XML_minorGridlines ),
 FSEND );
-exportShapeProps( xMajorGrid );
+exportShapeProps( xMinorGrid );
 pFS-endElement( FSNS( XML_c, XML_minorGridlines ) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/qa oox/source

2014-03-11 Thread PriyankaGaikwad

 chart2/qa/extras/chart2export.cxx|   11 +
 chart2/qa/extras/data/docx/pieChartRotation.docx |binary
 oox/source/export/chartexport.cxx|   43 ++-
 3 files changed, 45 insertions(+), 9 deletions(-)

New commits:
commit 2b6e395152b48e412d3addde7d8b3808b28d32c6
Author: PriyankaGaikwad priyanka.gaik...@synerzip.com
Date:   Tue Jan 28 18:28:39 2014 +0530

fdo#74111 3D Rotation is wrong after Round trip for pie chart

3D Rotation is lost after Round trip for pie chart.
XML Difference:

Original:
c:rotX val=40/
c:rotY val=30/

Round Trip:
c:rotX val=310/
c:rotY val=0/

Conflicts:
chart2/qa/extras/chart2export.cxx

Change-Id: I60132fef071e0573b17c35f509f3a74bd4ffcc66

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index e328f90..3189a22 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -51,6 +51,7 @@ public:
 void testSeriesIdxOrder();
 void testErrorBarDataRangeODS();
 void testChartCrash();
+void testPieChartRotation();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(test);
@@ -74,6 +75,7 @@ public:
 CPPUNIT_TEST(testSeriesIdxOrder);
 CPPUNIT_TEST(testErrorBarDataRangeODS);
 CPPUNIT_TEST(testChartCrash);
+CPPUNIT_TEST(testPieChartRotation);
 CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -662,6 +664,15 @@ void Chart2ExportTest::testChartCrash()
 CPPUNIT_ASSERT(pXmlDoc);
 }
 
+void Chart2ExportTest::testPieChartRotation()
+{
+load (/chart2/qa/extras/data/docx/, pieChartRotation.docx);
+xmlDocPtr pXmlDoc = parseExport(word/charts/chart,Office Open XML 
Text);
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc, /c:chartSpace/c:chart/c:view3D/c:rotX, val, 40);
+assertXPath(pXmlDoc, /c:chartSpace/c:chart/c:view3D/c:rotY, val, 30);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/pieChartRotation.docx 
b/chart2/qa/extras/data/docx/pieChartRotation.docx
new file mode 100644
index 000..f76f602
Binary files /dev/null and b/chart2/qa/extras/data/docx/pieChartRotation.docx 
differ
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 201d988..91d761f 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3191,14 +3191,24 @@ void ChartExport::exportView3D()
 FSHelperPtr pFS = GetFS();
 pFS-startElement( FSNS( XML_c, XML_view3D ),
 FSEND );
+sal_Int32 eChartType = getChartType( );
 // rotX
 if( GetProperty( xPropSet, RotationHorizontal ) )
 {
 sal_Int32 nRotationX = 0;
 mAny = nRotationX;
-// X rotation (map Chart2 [-179,180] to OOXML [0..359])
 if( nRotationX  0 )
-nRotationX += 360;
+{
+if(eChartType == chart::TYPEID_PIE)
+{
+/* In OOXML we get value in 0..90 range for pie chart X rotation , 
whereas we expect it to be in -90..90 range,
+   so we conver that during import. It  is modified in 
View3DConverter::convertFromModel()
+   here we convert it back to 0..90 as we received in import */
+   nRotationX += 90;  // X rotation (map Chart2 [-179,180] to 
OOXML [0..90])
+}
+else
+nRotationX += 360; // X rotation (map Chart2 [-179,180] to 
OOXML [-90..90])
+}
 pFS-singleElement( FSNS( XML_c, XML_rotX ),
 XML_val, I32S( nRotationX ),
 FSEND );
@@ -3206,14 +3216,29 @@ void ChartExport::exportView3D()
 // rotY
 if( GetProperty( xPropSet, RotationVertical ) )
 {
-sal_Int32 nRotationY = 0;
-mAny = nRotationY;
 // Y rotation (map Chart2 [-179,180] to OOXML [0..359])
-if( nRotationY  0 )
-nRotationY += 360;
-pFS-singleElement( FSNS( XML_c, XML_rotY ),
-XML_val, I32S( nRotationY ),
-FSEND );
+if( eChartType == chart::TYPEID_PIE  GetProperty( xPropSet, 
StartingAngle ) )
+{
+ // Y rotation used as 'first pie slice angle' in 3D pie charts
+sal_Int32 nStartingAngle=0;
+mAny = nStartingAngle;
+// convert to ooxml angle
+nStartingAngle = (450 - nStartingAngle ) % 360;
+pFS-singleElement( FSNS( XML_c, XML_rotY ),
+   XML_val, I32S( nStartingAngle ),
+   FSEND );
+}
+else
+{
+sal_Int32 nRotationY = 0;
+mAny = nRotationY;
+// Y rotation (map Chart2 [-179,180] to OOXML [0..359])
+if( nRotationY  0 )
+nRotationY += 360;
+pFS-singleElement( FSNS( XML_c, XML_rotY ),
+XML_val, I32S( nRotationY ),
+FSEND );
+}

[Libreoffice-commits] core.git: oox/source

 oox/source/drawingml/chart/plotareaconverter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 372ca2ce06cc940b5da0b4653776cfebc2733d40
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed Mar 12 02:59:48 2014 +0100

MSO writes broken files, fdo#74929

Change-Id: Iec545fc2a7ec61f6d4678398f22878c9f31a450d

diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx 
b/oox/source/drawingml/chart/plotareaconverter.cxx
index 54519d7..b405a9c 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -355,7 +355,7 @@ void PlotAreaConverter::convertFromModel( View3DModel 
rView3DModel )
 PlotAreaModel::AxisVector::value_type xAxis = *aAIt;
 OSL_ENSURE( xAxis-mnAxisId = 0, PlotAreaConverter::convertFromModel 
- invalid axis identifier );
 OSL_ENSURE( !aAxisMap.has( xAxis-mnAxisId ), 
PlotAreaConverter::convertFromModel - axis identifiers not unique );
-if( xAxis-mnAxisId = 0 )
+if( xAxis-mnAxisId != -1 )
 aAxisMap[ xAxis-mnAxisId ] = xAxis;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 75815, which changed state.

Bug 75815 Summary: EDITING: References of links to external files are changed, 
inserting or deleting rows above them.
https://bugs.freedesktop.org/show_bug.cgi?id=75815

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Hi-DPI patches for 4.2

On Tue, Mar 11, 2014 at 2:32 PM, Keith Curtis keit...@gmail.com wrote:
 then the simplest way
 disable these patches on the Mac is to just force mnDPIScaleFactor to 1. In
 that case, these patches would behave as it does on 4.2.1.

yep, that does that indeed.
pushed
http://cgit.freedesktop.org/libreoffice/core/commit/?id=4dbb04e5701efe084fbfd3f06128dd33a7d8965b

which need to be picked-up on 4-2 if your going to backport these
HiDPI patches..

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Hi-DPI patches for 4.2