[Libreoffice-commits] .: binfilter/bf_basic

[Libreoffice Gerrit user]

 binfilter/bf_basic/source/inc/token.hxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit eaf6e2c4fc3f5c20bba56ab830577296278e85ff
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Sep 26 09:18:16 2012 +0200

Duplicate EXPLICIT fix for binfilter

cf. core eebc9748d2ea26a7b5af246dba115103d6bb15db Fix MSVC build: #undef
EXPLICIT (which gets defined as 'explicit' somewhere)

Change-Id: I501571d8eb42df97cddd99b1490a49d08b282243

diff --git a/binfilter/bf_basic/source/inc/token.hxx 
b/binfilter/bf_basic/source/inc/token.hxx
index bc2fc46..12313b7 100644
--- a/binfilter/bf_basic/source/inc/token.hxx
+++ b/binfilter/bf_basic/source/inc/token.hxx
@@ -28,6 +28,10 @@
 #undef SHARED
 #endif
 
+#if defined( EXPLICIT )
+#undef EXPLICIT
+#endif
+
 namespace binfilter {
 
 // Der Tokenizer ist stand-alone, d.h. er kann von ueberallher verwendet
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svx/source

[Libreoffice Gerrit user]

 svx/source/customshapes/EnhancedCustomShape2d.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit d9f21c90bd61d15fd78a8df9115bf2e9ededbd1b
Author: Lennard wassert...@nefkom.net
Date:   Sun Sep 23 20:56:39 2012 +0200

Fixes Circular arrow distortion, Bug #46272

Distortion occurred when angle mod 90° != 0

All of my past  future contributions to LibreOffice may be
   licensed under the MPL/LGPLv3+ dual license
- Lennard Wasserthal

Change-Id: I4af7e7f1dcbc4d1262592c362532df4957e52399
Signed-off-by: Lennard wassert...@nefkom.net
Reviewed-on: https://gerrit.libreoffice.org/679
Reviewed-by: Radek Doulík r...@novell.com
Tested-by: Radek Doulík r...@novell.com

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 08762bb..63421f8 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1725,10 +1725,9 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16 
rSrcPt, sal_uInt16 rSegm
 Point aCenter( aRect.Center() );
 Point aStart( GetPoint( seqCoordinates[ 
(sal_uInt16)( rSrcPt + nXor ) ], sal_True, sal_True ) );
 Point aEnd( GetPoint( seqCoordinates[ 
(sal_uInt16)( rSrcPt + ( nXor ^ 1 ) ) ], sal_True, sal_True ) );
-double fRatio = (double)aRect.GetHeight() / 
(double)aRect.GetWidth();
-aStart.X() = (sal_Int32)( ( (double)( aStart.X() - 
aCenter.X() ) ) * fRatio ) + aCenter.X();
+aStart.X() = (sal_Int32)( ( (double)( aStart.X() - 
aCenter.X() ) ) ) + aCenter.X();
 aStart.Y() = (sal_Int32)( ( (double)( aStart.Y() - 
aCenter.Y() ) ) ) + aCenter.Y();
-aEnd.X() = (sal_Int32)( ( (double)( aEnd.X() - 
aCenter.X() ) ) * fRatio ) + aCenter.X();
+aEnd.X() = (sal_Int32)( ( (double)( aEnd.X() - 
aCenter.X() ) ) ) + aCenter.X();
 aEnd.Y() = (sal_Int32)( ( (double)( aEnd.Y() - 
aCenter.Y() ) ) ) + aCenter.Y();
 aNewB2DPolygon.append(CreateArc( aRect, aStart, 
aEnd, bClockwise));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Fixes Circular arrow distortion, Bug #46272

[via Code Review]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/679

Approvals:
  Radek Doulík: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/679
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4af7e7f1dcbc4d1262592c362532df4957e52399
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Lennard Wasserthal wassert...@nefkom.net
Gerrit-Reviewer: Radek Doulík r...@novell.com

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

[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc

[Libreoffice Gerrit user]

 binfilter/bf_sc/source/core/inc/interpre.hxx |   16 
 binfilter/inc/bf_sc/subtotal.hxx |   14 +-
 2 files changed, 1 insertion(+), 29 deletions(-)

New commits:
commit cb7236fb473f91aaa6f414de1ba1e10bdfb93878
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Sep 26 09:49:33 2012 +0200

MSC can #include setjmp.h just fine

...the manual redefinition led to errors now, looks like some header always
drags in setjmp.h now (maybe core 5ae27819974e3492b6f4d33fa51ef2a9d77b5ce5 
use
intrinsict to inline InterlockCount() on Windows too)

Change-Id: I613cd35b1475a3ba1061bd8faafd36ac99a0d94b

diff --git a/binfilter/bf_sc/source/core/inc/interpre.hxx 
b/binfilter/bf_sc/source/core/inc/interpre.hxx
index 8c70e1b..12cbed9 100644
--- a/binfilter/bf_sc/source/core/inc/interpre.hxx
+++ b/binfilter/bf_sc/source/core/inc/interpre.hxx
@@ -49,22 +49,6 @@ class ScFormulaCell;
 // Maximum ca. 85 wird bei Invertierung
 // von 128 x 128 benoetigt!
 
-
-#ifndef MSC
-#include setjmp.h
-#else
-extern C
-{
-#define _JBLEN  9  /* bp, di, si, sp, ret addr, ds */
-typedef  int  jmp_buf[_JBLEN];
-#define _JMP_BUF_DEFINED
-#define setjmp  _setjmp
-int  __cdecl _setjmp(jmp_buf);
-void __cdecl longjmp(jmp_buf, int);
-};
-#endif
-
-
 struct ScCompare
 {
 double  nVal[2];
diff --git a/binfilter/inc/bf_sc/subtotal.hxx b/binfilter/inc/bf_sc/subtotal.hxx
index 14b8a8c..c810fa1 100644
--- a/binfilter/inc/bf_sc/subtotal.hxx
+++ b/binfilter/inc/bf_sc/subtotal.hxx
@@ -24,19 +24,7 @@
 
 #include global.hxx
 
-#ifndef MSC
-#include setjmp.h
-#else
-extern C
-{
-#define _JBLEN  9  /* bp, di, si, sp, ret addr, ds */
-typedef  int  jmp_buf[_JBLEN];
-#define _JMP_BUF_DEFINED
-#define setjmp  _setjmp
-int  __cdecl _setjmp(jmp_buf);
-void __cdecl longjmp(jmp_buf, int);
-};
-#endif
+#include setjmp.h
 
 namespace binfilter {
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: dbghelp.dll fails on rebase (on Windows)

[Tor Lillqvist]

Again, I wonder how essential / useful this whole rebasing thing is
any more in this day... But yeah, I know that suggesting we stop doing
it will bring up arguments that essentially say if it might be useful
for even one percent of our userbase, we should keep doing it.

Anyway, this issue is not simply one of only whether to rebase DLLs or
not (to be non-overlapping by default in the address space) after
building, before creating the installer. See
http://www.mail-archive.com/dev@openoffice.org/msg15650.html . We
still to that un-rebasing at installation time (on the more current
Windows versions), don't we?

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

Re: [PATCH]fdo#51304: Remove the author of some java source files

[Noel Power]

On 26/09/12 05:40, Marcos Paulo de Souza wrote:

This patch remove some '@author' for Java souce files, and removes some 
commented code founded
when removing the '@author'.


looks good to me, assuming not build problems I'll push it in a mo'

Noel


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

[Libreoffice-commits] .: cppunit/android.patch

[Libreoffice Gerrit user]

 cppunit/android.patch |   20 
 1 file changed, 20 deletions(-)

New commits:
commit f0eaba8c45f0db802268a3e3809292cd063c7544
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Sep 26 11:28:32 2012 +0300

config.sub doesn't need patching any more it seems

Change-Id: I87c779de583011d340cece39efa32e891d20852d

diff --git a/cppunit/android.patch b/cppunit/android.patch
index deabf3b..59ae451 100644
--- a/cppunit/android.patch
+++ b/cppunit/android.patch
@@ -1,23 +1,3 @@
 misc/cppunit-1.13.1/config/config.sub
-+++ misc/build/cppunit-1.13.1/config/config.sub
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | 
linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1250,7 +1250,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* 
| -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 --- misc/cppunit-1.13.1/config/ltmain.sh
 +++ misc/build/cppunit-1.13.1/config/ltmain.sh
 @@ -3228,6 +3228,12 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO 3.6.2 : about Manage dialog from Conditional Formatting

[Bjoern Michaelsen]

Hi Jean-Baptiste,

On Wed, Sep 26, 2012 at 06:35:57AM +0200, Jean-Baptiste Faure wrote:
 Nobody interested to test and answer?

I think it is rather that most in QA already have their share of critical bugs
to care about.

 Well, it is clear that QA peoples are not welcome in this area of the
 code. :-(

Please cut this passive aggressive tone. QA ia welcome and needed in all areas
of the code, however neither QA nor UX does mean make the developer do what I
wish. Our developers are sensible people and if you have a convincing argument
taking into account all aspects of the issue, I dont think they will shed such
input.

Best,

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

[Libreoffice-commits] .: desktop/scripts desktop/source desktop/unx vcl/inc

[Libreoffice Gerrit user]

 desktop/scripts/soffice.sh |   16 -
 desktop/source/app/app.cxx |   35 ++-
 desktop/source/app/cmdlineargs.cxx |   18 -
 desktop/source/app/cmdlineargs.hxx |6 
 desktop/source/app/cmdlinehelp.cxx |7 
 desktop/source/app/cmdlinehelp.hxx |2 
 desktop/source/app/officeipcthread.cxx |  329 -
 desktop/source/app/sofficemain.cxx |   15 -
 desktop/unx/source/args.c  |   39 ++-
 desktop/unx/source/args.h  |1 
 desktop/unx/source/start.c |   26 +-
 vcl/inc/vcl/svapp.hxx  |6 
 12 files changed, 256 insertions(+), 244 deletions(-)

New commits:
commit f4a4ba9ac1b58b4726825400e1edd1bf47d4080a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Sep 25 10:15:15 2012 +0200

Clean up option processing

* Support --version on non-UNX, too.

* Consistently show the first unknown option and the help blob in the 
presence
  of any unknown options.

* There is no need to tunnel --help/--version past oosplash in the soffice
  script, as oosplash is prepared to treat them adequately (esp. not pass 
them
  over any pipe); this only added unnecessary variance to what spellings 
exactly
  are supported and how mixtures of --help, --version, and unknown options 
are
  handled.

Change-Id: I617f2e727e2f0eafd34a2de3b85d441c6783ec4f

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index a259bf6..7727206 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -158,21 +158,5 @@ if [ -n $VALGRINDCHECK -a -z $VALGRIND ] ; then
 exec valgrind.log
 fi
 
-# do not pass the request for command line help to oosplash
-for arg in $@ ; do
-case $arg in
--h | --h | --he | --hel | --help)
-$sd_prog/soffice.bin --help
-exit 0
-;;
--V | --v | --ve | --ver | --vers | --versi | --versio | --version)
-$sd_prog/soffice.bin --version
-exit 0
-;;
-*)
-;;
-esac
-done
-
 # oosplash does the rest: forcing pages in, javaldx etc. are
 exec $VALGRINDCHECK $STRACECHECK $sd_prog/oosplash $@
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 0a13e56..0e6ec43 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -634,7 +634,8 @@ void Desktop::Init()
 // 2nd office startup should terminate after sending cmdlineargs 
through pipe
 SetBootstrapStatus(BS_TERMINATE);
 }
-else if ( rCmdLineArgs.IsHelp() )
+else if ( !rCmdLineArgs.GetUnknown().isEmpty()
+  || rCmdLineArgs.IsHelp() || rCmdLineArgs.IsVersion() )
 {
 // disable IPC thread in an instance that is just showing a help 
message
 OfficeIPCThread::DisableOfficeIPCThread();
@@ -1388,6 +1389,22 @@ int Desktop::Main()
 new DesktopContext( com::sun::star::uno::getCurrentContext() ) );
 
 CommandLineArgs rCmdLineArgs = GetCommandLineArgs();
+OUString aUnknown( rCmdLineArgs.GetUnknown() );
+if ( !aUnknown.isEmpty() )
+{
+displayCmdlineHelp( aUnknown );
+return EXIT_FAILURE;
+}
+if ( rCmdLineArgs.IsHelp() )
+{
+displayCmdlineHelp( OUString() );
+return EXIT_SUCCESS;
+}
+if ( rCmdLineArgs.IsVersion() )
+{
+displayVersion();
+return EXIT_SUCCESS;
+}
 
 // setup configuration error handling
 ConfigurationErrorHandler aConfigErrHandler;
@@ -1431,14 +1448,6 @@ int Desktop::Main()
 
 SetSplashScreenProgress(25);
 
-#ifndef UNX
-if ( rCmdLineArgs.IsHelp() )
-{
-displayCmdlineHelp();
-return EXIT_SUCCESS;
-}
-#endif
-
 // check user installation directory for lockfile so we can be sure
 // there is no other instance using our data files from a remote host
 RTL_LOGFILE_CONTEXT_TRACE( aLog, desktop (lo119109) Desktop::Main - 
Lockfile );
@@ -2696,10 +2705,10 @@ void Desktop::HandleAppEvent( const ApplicationEvent 
rAppEvent )
 }
 break;
 case ApplicationEvent::TYPE_HELP:
-#ifndef UNX
-// in non unix version allow showing of cmdline help window
-displayCmdlineHelp();
-#endif
+displayCmdlineHelp(rAppEvent.GetData());
+break;
+case ApplicationEvent::TYPE_VERSION:
+displayVersion();
 break;
 case ApplicationEvent::TYPE_OPEN:
 {
diff --git a/desktop/source/app/cmdlineargs.cxx 
b/desktop/source/app/cmdlineargs.cxx
index 83b728f..01e1f30 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -287,26 +287,25 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier 
supplier )
 {
 bConversionOutEvent = true;
 }
-#if defined UNX
 else

[Libreoffice-commits] .: writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/PropertyMap.cxx |   29 
 1 file changed, 29 insertions(+)

New commits:
commit 211916f86585cb4f6258eb30e0474e4c21cd37f1
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Sep 26 11:14:04 2012 +0200

n#780843 fix docx import of cont section's header/footer on title page

Change-Id: I129e154a3fea8a96607dc6350a99f4d6ca68196e

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 682a3d7..e1258cc 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1001,6 +1001,35 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl rDM_Impl )
 if ((m_bTitlePage  m_bIsFirstSection) || !m_bTitlePage)
 
xRangeProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_PAGE_DESC_NAME ),
 uno::makeAny( m_bTitlePage ? m_sFirstPageStyleName 
: m_sFollowPageStyleName ));
+else
+{
+// In this miserable situation (second or later section on 
a title page), make sure that the header / footer is not lost.
+uno::Reference container::XNameAccess  
xPageStyles(rDM_Impl.GetPageStyles(), uno::UNO_QUERY);
+if (xPageStyles-hasByName(m_sFollowPageStyleName))
+{
+uno::Referencebeans::XPropertySet 
xCurrent(xPageStyles-getByName(rPropNameSupplier.GetName(PROP_STANDARD)), 
uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet 
xFollow(xPageStyles-getByName(m_sFollowPageStyleName), uno::UNO_QUERY);
+
+if 
(xFollow-getPropertyValue(rPropNameSupplier.GetName(PROP_HEADER_IS_ON)).getsal_Bool())
+{
+
xCurrent-setPropertyValue(rPropNameSupplier.GetName(PROP_HEADER_IS_ON), 
uno::makeAny(sal_True));
+uno::Referencetext::XTextRange 
xCurrentRange(xCurrent-getPropertyValue(rPropNameSupplier.GetName(PROP_HEADER_TEXT)),
 uno::UNO_QUERY_THROW);
+xCurrentRange-setString();
+uno::Referencetext::XTextCopy 
xCurrentTxt(xCurrentRange, uno::UNO_QUERY_THROW);
+uno::Referencetext::XTextCopy 
xFollowTxt(xFollow-getPropertyValue(rPropNameSupplier.GetName(PROP_HEADER_TEXT)),
 uno::UNO_QUERY_THROW);
+xCurrentTxt-copyText(xFollowTxt);
+}
+if 
(xFollow-getPropertyValue(rPropNameSupplier.GetName(PROP_FOOTER_IS_ON)).getsal_Bool())
+{
+
xCurrent-setPropertyValue(rPropNameSupplier.GetName(PROP_FOOTER_IS_ON), 
uno::makeAny(sal_True));
+uno::Referencetext::XTextRange 
xCurrentRange(xCurrent-getPropertyValue(rPropNameSupplier.GetName(PROP_FOOTER_TEXT)),
 uno::UNO_QUERY_THROW);
+xCurrentRange-setString();
+uno::Referencetext::XTextCopy 
xCurrentTxt(xCurrentRange, uno::UNO_QUERY_THROW);
+uno::Referencetext::XTextCopy 
xFollowTxt(xFollow-getPropertyValue(rPropNameSupplier.GetName(PROP_FOOTER_TEXT)),
 uno::UNO_QUERY_THROW);
+xCurrentTxt-copyText(xFollowTxt);
+}
+}
+}
 // handle page breaks with odd/even page numbering
 style::PageStyleLayout 
nPageStyleLayout(style::PageStyleLayout_ALL);
 if (m_nBreakType == 3)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/qa sc/source

[Libreoffice Gerrit user]

 sc/qa/unit/data/xlsx/formats.xlsx|binary
 sc/qa/unit/subsequent_filters-test.cxx   |2 --
 sc/source/filter/inc/numberformatsbuffer.hxx |3 ++-
 sc/source/filter/inc/stylesbuffer.hxx|1 +
 sc/source/filter/oox/numberformatsbuffer.cxx |6 ++
 sc/source/filter/oox/stylesbuffer.cxx|   19 ++-
 6 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 4e0e0d4759cc0f1b2c5ea3c64d2421c1a0dbe87e
Author: Noel Power noel.po...@suse.com
Date:   Wed Sep 26 10:10:53 2012 +0100

don't let numforats in dxf entries clobber global number formats  update 
test

* Enabling the disabled test which checked a cell style attribute ( that was
getting clobbered by the dxf entries above )
* squash the 'escape' characters in dxf num formats ( probably should do 
this
in general
* regenerate the formats.xlsx file ( I had to manually tweak this as the 
conditional tests were failing with the excel created document )

diff --git a/sc/qa/unit/data/xlsx/formats.xlsx 
b/sc/qa/unit/data/xlsx/formats.xlsx
index 1c451be..e579fa5 100644
Binary files a/sc/qa/unit/data/xlsx/formats.xlsx and 
b/sc/qa/unit/data/xlsx/formats.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 3428582..fb286e8 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -656,9 +656,7 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest, 
ScDocument* pDoc, sal_Int32 n
 // check actual align applied to cell, should be the same as
 // the style
 eHorJustify = static_castSvxCellHorJustify(static_cast const 
SvxHorJustifyItem (pPattern-GetItem( ATTR_HOR_JUSTIFY ) ).GetValue() );
-#if ENABLE_WHEN_FIXED
 CPPUNIT_ASSERT_EQUAL_MESSAGE(cell with 'Excel Built-in Date' 
style should be aligned centre horizontally, SVX_HOR_JUSTIFY_CENTER, 
eHorJustify);
-#endif
 }
 }
 
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx 
b/sc/source/filter/inc/numberformatsbuffer.hxx
index e5b7eee..721ff8d 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -119,7 +119,7 @@ public:
 
 /** Writes the specified number format to the passed property map. */
 voidwriteToPropertyMap( PropertyMap rPropMap, sal_Int32 
nNumFmtId ) const;
-
+sal_Int32   nextFreeId(){ return ++mnHighestId; }
 private:
 /** Inserts built-in number formats for the current system language. */
 voidinsertBuiltinFormats();
@@ -129,6 +129,7 @@ private:
 
 NumberFormatMap maNumFmts;  /// List of number formats.
 ::rtl::OUString maLocaleStr;/// Current office locale.
+sal_Int32   mnHighestId;
 };
 
 // 
diff --git a/sc/source/filter/inc/stylesbuffer.hxx 
b/sc/source/filter/inc/stylesbuffer.hxx
index 43b22a9..d757c39 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -909,6 +909,7 @@ public:
 FontRef createFont( sal_Int32* opnFontId = 0 );
 /** Creates a number format. */
 NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const 
::rtl::OUString rFmtCode );
+sal_Int32   nextFreeNumFmtId();
 /** Creates a new empty border object.
 @param opnBorderId  (out-param) The identifier of the new border 
object. */
 BorderRef   createBorder( sal_Int32* opnBorderId = 0 );
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx 
b/sc/source/filter/oox/numberformatsbuffer.cxx
index 2c3c421..72bc935 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -1981,6 +1981,8 @@ NumberFormatRef NumberFormatsBuffer::createNumFmt( 
sal_Int32 nNumFmtId, const OU
 {
 xNumFmt.reset( new NumberFormat( *this ) );
 maNumFmts[ nNumFmtId ] = xNumFmt;
+if ( nNumFmtId  mnHighestId )
+mnHighestId = nNumFmtId;
 xNumFmt-setFormatCode( rFmtCode );
 }
 return xNumFmt;
@@ -2081,7 +2083,11 @@ void NumberFormatsBuffer::insertBuiltinFormats()
 
 // copy reused number formats
 for( ReuseMap::const_iterator aRIt = aReuseMap.begin(), aREnd = 
aReuseMap.end(); aRIt != aREnd; ++aRIt )
+{
 maNumFmts[ aRIt-first ] = maNumFmts[ aRIt-second ];
+if ( aRIt-first  mnHighestId )
+mnHighestId = aRIt-first;
+}
 }
 
 // 
diff --git a/sc/source/filter/oox/stylesbuffer.cxx 
b/sc/source/filter/oox/stylesbuffer.cxx
index cb1ce6e..f9b9779 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2445,7 +2445,19 @@ FillRef Dxf::createFill( bool bAlwaysNew )
 
 void Dxf::importNumFmt( const AttributeList rAttribs 

[Libreoffice-commits] .: avmedia/inc avmedia/source

[Libreoffice Gerrit user]

 avmedia/inc/avmedia/mediaitem.hxx|8 
 avmedia/source/framework/mediaitem.cxx   |   12 ++--
 avmedia/source/gstreamer/gstframegrabber.cxx |   10 +-
 avmedia/source/gstreamer/gstframegrabber.hxx |   10 +-
 avmedia/source/win/player.hxx|4 ++--
 5 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 9b65ecc37f8e3cdd81bdb3399c5f72496394df9d
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Tue Sep 25 21:31:26 2012 -0300

sal_Bool to bool and some rtl::OUStrings in avmedia

Change-Id: Id58fd5d04f47302983782eb57736ff29d8f5303e
Reviewed-on: https://gerrit.libreoffice.org/697
Tested-by: Noel Power noel.po...@suse.com
Reviewed-by: Noel Power noel.po...@suse.com

diff --git a/avmedia/inc/avmedia/mediaitem.hxx 
b/avmedia/inc/avmedia/mediaitem.hxx
index 6cf0063..c6d0f5b 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -93,11 +93,11 @@ public:
 voidsetTime( double fTime );
 double  getTime() const;
 
-voidsetLoop( sal_Bool bLoop );
-sal_BoolisLoop() const;
+voidsetLoop( bool bLoop );
+boolisLoop() const;
 
-voidsetMute( sal_Bool bMute );
-sal_BoolisMute() const;
+voidsetMute( bool bMute );
+boolisMute() const;
 
 voidsetVolumeDB( sal_Int16 nDB );
 sal_Int16   getVolumeDB() const;
diff --git a/avmedia/source/framework/mediaitem.cxx 
b/avmedia/source/framework/mediaitem.cxx
index 15c3aba..2776809 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -58,8 +58,8 @@ struct MediaItem::Impl
 double  m_fTime;
 double  m_fDuration;
 sal_Int16   m_nVolumeDB;
-sal_Boolm_bLoop;
-sal_Boolm_bMute;
+boolm_bLoop;
+boolm_bMute;
 ::com::sun::star::media::ZoomLevel m_eZoom;
 
 Impl(sal_uInt32 const nMaskSet)
@@ -302,7 +302,7 @@ double MediaItem::getTime() const
 
 //
 
-void MediaItem::setLoop( sal_Bool bLoop )
+void MediaItem::setLoop( bool bLoop )
 {
 m_pImpl-m_bLoop = bLoop;
 m_pImpl-m_nMaskSet |= AVMEDIA_SETMASK_LOOP;
@@ -310,14 +310,14 @@ void MediaItem::setLoop( sal_Bool bLoop )
 
 //
 
-sal_Bool MediaItem::isLoop() const
+bool MediaItem::isLoop() const
 {
 return m_pImpl-m_bLoop;
 }
 
 //
 
-void MediaItem::setMute( sal_Bool bMute )
+void MediaItem::setMute( bool bMute )
 {
 m_pImpl-m_bMute = bMute;
 m_pImpl-m_nMaskSet |= AVMEDIA_SETMASK_MUTE;
@@ -325,7 +325,7 @@ void MediaItem::setMute( sal_Bool bMute )
 
 //
 
-sal_Bool MediaItem::isMute() const
+bool MediaItem::isMute() const
 {
 return m_pImpl-m_bMute;
 }
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx 
b/avmedia/source/gstreamer/gstframegrabber.cxx
index 05d4d87..d9a4ed1 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -201,22 +201,22 @@ uno::Reference graphic::XGraphic  SAL_CALL 
FrameGrabber::grabFrame( double fMe
 return xRet;
 }
 
-::rtl::OUString SAL_CALL FrameGrabber::getImplementationName(  )
+OUString SAL_CALL FrameGrabber::getImplementationName(  )
 throw (uno::RuntimeException)
 {
-return ::rtl::OUString( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME );
+return OUString( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME );
 }
 
-sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString 
ServiceName )
+sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString ServiceName )
 throw (uno::RuntimeException)
 {
 return ServiceName == AVMEDIA_GST_FRAMEGRABBER_SERVICENAME;
 }
 
-uno::Sequence ::rtl::OUString  SAL_CALL 
FrameGrabber::getSupportedServiceNames()
+uno::Sequence OUString  SAL_CALL FrameGrabber::getSupportedServiceNames()
 throw (uno::RuntimeException)
 {
-uno::Sequence ::rtl::OUString  aRet(1);
+uno::Sequence OUString  aRet(1);
 aRet[0] = AVMEDIA_GST_FRAMEGRABBER_SERVICENAME;
 
 return aRet;
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx 
b/avmedia/source/gstreamer/gstframegrabber.hxx
index af23cca..0b87c74 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -39,7 +39,7 @@ class FrameGrabber : public FrameGrabber_BASE
 void disposePipeline();
 public:
 // static create method instead of public Ctor
-static FrameGrabber* create( 

[PUSHED] sal_Bool to bool and some rtl::OUStrings in avmedia

[Noel Power (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/697

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/697
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id58fd5d04f47302983782eb57736ff29d8f5303e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[Libreoffice-commits] .: sw/qa

[Libreoffice Gerrit user]

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

New commits:
commit 601fd489995e9fd422d8c0fd47d8433413f95eaf
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Sep 26 11:51:47 2012 +0200

n#780843 testcase

Change-Id: I8a008b48dfd4b424fa95f8919fb52208ee45e6b6

diff --git a/sw/qa/extras/ooxmlimport/data/n780843.docx 
b/sw/qa/extras/ooxmlimport/data/n780843.docx
new file mode 100644
index 000..9b92f79
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n780843.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f7c75c5..f8f161f 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -94,6 +94,7 @@ public:
 void testFdo55187();
 void testN780563();
 void testN780853();
+void testN780843();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -134,6 +135,7 @@ public:
 CPPUNIT_TEST(testFdo55187);
 CPPUNIT_TEST(testN780563);
 CPPUNIT_TEST(testN780853);
+CPPUNIT_TEST(testN780843);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -922,6 +924,27 @@ void Test::testN780853()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess-getCount());
 }
 
+void Test::testN780843()
+{
+/*
+ * The problem was that wrong footer was picked.
+ *
+ * oParas = ThisComponent.Text.createEnumeration
+ * oPara = oParas.nextElement
+ * oPara = oParas.nextElement
+ * oPara = oParas.nextElement
+ * sStyle = oPara.PageStyleName
+ * oStyle = ThisComponent.StyleFamilies.PageStyles.getByName(sStyle)
+ * xray oStyle.FooterText.String ' was hidden footer
+ */
+load(n780843.docx);
+uno::Reference text::XTextRange  xPara = getParagraph(3);
+OUString aStyleName = getPropertyOUString(xPara, PageStyleName);
+uno::Referencebeans::XPropertySet 
xPageStyle(getStyles(PageStyles)-getByName(aStyleName), uno::UNO_QUERY);
+uno::Referencetext::XTextRange xFooter = getProperty 
uno::Referencetext::XTextRange (xPageStyle, FooterText);
+CPPUNIT_ASSERT_EQUAL(OUString(shown footer), xFooter-getString());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] sal_Bool to bool conversions

[Noel Power]

On 25/09/12 13:48, Noel Grandin wrote:

Hi

These patches do some sal_Bool to bool conversions.
One of the patches drops 2 unused sal_Bool fields.

They have passed a full make check.
the looked ok to me, will push all (waiting for build to complete) 
except 0004-sal_Bool-bool.patch which makes changes to idlc ( and in 
particular to the .y file and I have no idea about yacc ) most likely 
the change is fine but just in case there is some hidden gotcha, lets 
ask Stephan to look at this. I also will push an extra patch to adjust 
the  MasterPageEntity bUsed entry



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

Re: commit message cites wrong bug

[Michael Meeks]

Hi Terrence,

On Tue, 2012-09-25 at 07:59 -0700, Terrence Enger wrote:
 http://nabble.documentfoundation.org/commit-message-cites-wrong-bug-tp4009211.html

Oddly I didn't get the bulk of your mail.

Commit messages are a permanent part of our commit history and simply
cannot be modified after the fact. It is however possible to add a git
note to that a commit and push it with a correction.

HTH,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/AllLangZip.mk  |3 +++
 solenv/gbuild/CliAssembly.mk |9 +
 solenv/gbuild/CliLibrary.mk  |6 ++
 solenv/gbuild/CliNativeLibrary.mk|6 ++
 solenv/gbuild/CliUnoApi.mk   |6 ++
 solenv/gbuild/ComponentTarget.mk |4 
 solenv/gbuild/Configuration.mk   |   22 ++
 solenv/gbuild/CustomTarget.mk|4 
 solenv/gbuild/Dictionary.mk  |6 ++
 solenv/gbuild/ExtensionTarget.mk |3 +++
 solenv/gbuild/ExternalPackage.mk |6 ++
 solenv/gbuild/ExternalProject.mk |6 ++
 solenv/gbuild/InstallModule.mk   |3 +++
 solenv/gbuild/InstallModuleTarget.mk |   18 ++
 solenv/gbuild/InstallScript.mk   |6 ++
 solenv/gbuild/Package.mk |5 +
 solenv/gbuild/Rdb.mk |5 +
 solenv/gbuild/UnoApiTarget.mk|4 
 solenv/gbuild/UnpackedTarball.mk |6 ++
 solenv/gbuild/gbuild.mk  |7 ---
 20 files changed, 128 insertions(+), 7 deletions(-)

New commits:
commit 300621ff72be787c5413edf46139b8c45ba0ff45
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Sep 26 12:14:48 2012 +0200

Revert gbuild: use one pattern rule for creating directories

It does not work with make 3.82 which prefers pattern rules
with longest match, so wrong rules are chosen in workdir.

This reverts commit bc234b4e1103cf8f79a7526ad80dcd9d0b78b89b.

diff --git a/solenv/gbuild/AllLangZip.mk b/solenv/gbuild/AllLangZip.mk
index e3cbc6a..fa3b9de 100644
--- a/solenv/gbuild/AllLangZip.mk
+++ b/solenv/gbuild/AllLangZip.mk
@@ -14,6 +14,9 @@
 
 gb_AllLangZip_LANGS := $(if $(strip $(gb_WITH_LANG)),$(gb_WITH_LANG),en-US)
 
+$(dir $(call gb_AllLangZip_get_target,%)).dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_AllLangZip_get_target,%) :
$(call gb_Output_announce,$*,$(true),ALZ,4)
touch $@
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index f78fae5..e3a87bd 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -21,6 +21,9 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliConfigTarget_get_target,%))%/.dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CliConfigTarget_get_target,%) :
$(call gb_CliConfigTarget__command,$@,$*,$)
 
@@ -61,6 +64,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliAssemblyTarget_get_target,%)).dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_CliAssemblyTarget_get_target,%))%/.dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CliAssemblyTarget_get_target,%) :
$(if $(strip $(CLI_ASSEMBLY_VERSION)),,$(call gb_Output_error,assembly 
version not set))
$(if $(strip $(CLI_ASSEMBLY_CONFIGFILE)),,$(call 
gb_Output_error,assembly configuration file not set))
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index d22fc2e..9cf6bd5 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -47,6 +47,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliLibraryTarget_get_target,%)).dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_CliLibraryTarget_get_target,%))%/.dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CliLibraryTarget_get_target,%) :
$(call gb_CliLibraryTarget__command,$@,$*,$,$?,$^)
 
diff --git a/solenv/gbuild/CliNativeLibrary.mk 
b/solenv/gbuild/CliNativeLibrary.mk
index 6ced5e9..f5c1249 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -22,6 +22,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliNativeLibraryTarget_get_target,%)).dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_CliNativeLibraryTarget_get_target,%))%/.dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CliNativeLibraryTarget_get_target,%) :
$(call gb_CliNativeLibraryTarget__command,$@,$*,$)
 
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index fae0343..f0a2735 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -29,6 +29,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliUnoApiTarget_get_target,%)).dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_CliUnoApiTarget_get_target,%))%/.dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 # TODO depending on the whole URE might be overkill, but I do not have a
 # Windows machine to debug it...
 $(call gb_CliUnoApiTarget_get_target,%) : \
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index f01a687..e99ffab 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -55,6 +55,10 

[Libreoffice-commits] .: 7 commits - desktop/source i18npool/inc i18npool/source oox/inc oox/source padmin/source sax/source sdext/source vcl/inc vcl/source xmlhelp/source

[Libreoffice Gerrit user]

 desktop/source/app/app.cxx|2 -
 i18npool/inc/numberformatcode.hxx |2 -
 i18npool/source/numberformatcode/numberformatcode.cxx |6 ++---
 oox/inc/oox/drawingml/textspacing.hxx |6 ++---
 oox/source/drawingml/textspacingcontext.cxx   |2 -
 padmin/source/pamain.cxx  |2 -
 sax/source/expatwrap/sax_expat.cxx|   20 +-
 sdext/source/minimizer/pagecollector.cxx  |4 +--
 sdext/source/minimizer/pagecollector.hxx  |2 -
 vcl/inc/svdata.hxx|2 -
 vcl/inc/vcl/svapp.hxx |2 -
 vcl/source/app/svapp.cxx  |4 +--
 vcl/source/app/svdata.cxx |   12 +-
 xmlhelp/source/cxxhelp/provider/content.hxx   |5 
 14 files changed, 34 insertions(+), 37 deletions(-)

New commits:
commit 85b660a618780479a466e65a83ab844358631fa4
Author: Noel Power noel.po...@suse.com
Date:   Wed Sep 26 10:31:58 2012 +0100

followup patch to recent changes for sal_Bool - bool

Change-Id: I867934b4d0589d4e395fee471e1cfab236c0540f

diff --git a/sdext/source/minimizer/pagecollector.hxx 
b/sdext/source/minimizer/pagecollector.hxx
index e0b9e47..fe75486 100644
--- a/sdext/source/minimizer/pagecollector.hxx
+++ b/sdext/source/minimizer/pagecollector.hxx
@@ -31,7 +31,7 @@ class PageCollector
 struct MasterPageEntity
 {
 com::sun::star::uno::Reference com::sun::star::drawing::XDrawPage  
xMasterPage;
-sal_Bool bUsed;
+bool bUsed;
 };
 static void CollectCustomShowPages( const com::sun::star::uno::Reference 
com::sun::star::frame::XModel , const rtl::OUString rCustomShow, 
std::vector com::sun::star::uno::Reference com::sun::star::drawing::XDrawPage 
  );
 static void CollectNonCustomShowPages( const 
com::sun::star::uno::Reference com::sun::star::frame::XModel , const 
rtl::OUString rCustomShow, std::vector com::sun::star::uno::Reference 
com::sun::star::drawing::XDrawPage   );
commit 3bdc99fe19c1922d6683ad076a49f080d1a33b05
Author: Noel Grandin n...@peralex.com
Date:   Tue Sep 25 14:45:23 2012 +0200

remove unused fields

Change-Id: Ia2b2fd7623351377df9a0c76ad27cb6b738bc124

diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx 
b/xmlhelp/source/cxxhelp/provider/content.hxx
index cd6d113..4616a46 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -51,11 +51,8 @@ namespace chelp
 {
 OUString aTitle; // Title
 OUString aContentType;   // ContentType
-sal_BoolbIsDocument;// IsDocument
-sal_BoolbIsFolder;  // IsFolder
 
-ContentProperties()
-: bIsDocument( sal_True ), bIsFolder( sal_False ) {}
+ContentProperties() {}
 };
 
 //=
commit 4b415950b30fa063e669717cfce2591845f26c16
Author: Noel Grandin n...@peralex.com
Date:   Tue Sep 25 14:41:27 2012 +0200

sal_Bool - bool

Change-Id: I3a7cdd6fd488af20b15a205515fc6ee593371f0a

diff --git a/sdext/source/minimizer/pagecollector.cxx 
b/sdext/source/minimizer/pagecollector.cxx
index 668ce5f..3ca80c2 100644
--- a/sdext/source/minimizer/pagecollector.cxx
+++ b/sdext/source/minimizer/pagecollector.cxx
@@ -145,7 +145,7 @@ void PageCollector::CollectMasterPages( const Reference 
XModel  rxModel, std:
 {
 MasterPageEntity aMasterPageEntity;
 aMasterPageEntity.xMasterPage = xMasterPage;
-aMasterPageEntity.bUsed = sal_False;
+aMasterPageEntity.bUsed = false;
 rMasterPageList.push_back( aMasterPageEntity );
 }
 }
@@ -163,7 +163,7 @@ void PageCollector::CollectMasterPages( const Reference 
XModel  rxModel, std:
 {
 if ( aIter-xMasterPage == xMasterPage )
 {
-aIter-bUsed = sal_True;
+aIter-bUsed = true;
 break;
 }
 ++aIter;
commit 1cb0443ccd3d8d0281bf7b00d3efdbf5cd550bd4
Author: Noel Grandin n...@peralex.com
Date:   Tue Sep 25 14:39:01 2012 +0200

sal_Bool - bool

Change-Id: I92e5f4f52ab19b607b5ed0314ee0d6c2334998c6

diff --git a/sax/source/expatwrap/sax_expat.cxx 
b/sax/source/expatwrap/sax_expat.cxx
index 33707c4..db17402 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -122,8 +122,8 @@ OUString XmlChar2OUString( const XML_Char *p )
  ) );\
 }\
 catch( const com::sun::star::uno::RuntimeException e ) {\
-pThis-bExceptionWasThrown = sal_True; \
-pThis-bRTExceptionWasThrown = sal_True; \
+

Re: [PARTIALLY-PUSHED][PATCH] sal_Bool to bool conversions

[Noel Power]

On 26/09/12 11:11, Noel Power wrote:

On 25/09/12 13:48, Noel Grandin wrote:

Hi

These patches do some sal_Bool to bool conversions.
One of the patches drops 2 unused sal_Bool fields.

They have passed a full make check.
the looked ok to me, will push all (waiting for build to complete) 
except 0004-sal_Bool-bool.patch which makes changes to idlc ( and in 
particular to the .y file and I have no idea about yacc ) most likely 
the change is fine but just in case there is some hidden gotcha, lets 
ask Stephan to look at this. I also will push an extra patch to adjust 
the  MasterPageEntity bUsed entry
all pushed with the exception of 0004-sal_Bool-bool.patch and the 
addition of 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=85b660a618780479a466e65a83ab844358631fa4


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

License Statement!

[Lennard Wasserthal]

I HAD put such a blanket statement in the commit message of my bug fix 
(gerrit) submission.

But, since I did it wrongly before, here again:

All of my past  future contributions to LibreOffice may be
licensed under the MPL/LGPLv3+ dual license
   - Lennard Wasserthal

Greetings

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

[Libreoffice-commits] .: vcl/aqua

[Libreoffice Gerrit user]

 vcl/aqua/source/a11y/aqua11yfocustracker.cxx |   15 ++-
 vcl/aqua/source/a11y/aqua11ywrapper.mm   |7 ++-
 2 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 5f373a002df2f083109bb7b2e0987258b6e2f9c4
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Sep 26 13:42:54 2012 +0300

Fix crash on Mac when a11y in use, and avoid infinite loop, fdo#47275

The code used static_cast blindly even if the object not necessarily
was of the assumed subclass. Crash followed. Use dynamic_cast instead
to be able to check, like the corresponding code for GTK a11y. After
that fix we then got a nice infinite loop whn an object apparently is
its own parent. Detect that and break out.

Whether accessibility for the affected parts of the GUI actually works
now for its real use cases, no idea. But anything is better than a
crash...

Change-Id: I862234e168db0bd19d185b0f1f73b733b570cac4

diff --git a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx 
b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
index 65eaef1..b38af80 100644
--- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
@@ -72,7 +72,20 @@ long 
AquaA11yFocusTracker::WindowEventHandler(AquaA11yFocusTracker *pFocusTracke
 pFocusTracker-tabpage_activated( getWindow(pEvent) );
 break;
 case VCLEVENT_MENU_HIGHLIGHT:
-pFocusTracker-menu_highlighted( static_cast  const VclMenuEvent *  
(pEvent) );
+// Inspired by code in WindowEventHandler in
+// vcl/unx/gtk/a11y/atkutil.cxx, find out what kind of event
+// it is to avoid blindly using a static_cast and crash,
+// fdo#47275.
+if( const VclMenuEvent* pMenuEvent = dynamic_cast  const 
VclMenuEvent*  (pEvent) )
+{
+pFocusTracker-menu_highlighted( pMenuEvent );
+}
+else if( const VclAccessibleEvent* pAccEvent = dynamic_cast  const 
VclAccessibleEvent*  (pEvent) )
+{
+Reference XAccessible  xAccessible = pAccEvent-GetAccessible();
+if( xAccessible.is() )
+pFocusTracker-setFocusedObject( xAccessible );
+}
 break;
 default:
 break;
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm 
b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index a7bad3c..8acb5f4 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -370,7 +370,12 @@ static BOOL isPopupMenuOpen = NO;
 // go upstairs until reaching the broken connection
 AquaA11yWrapper * aWrapper = self;
 while ( [ aWrapper accessibleContext ] - getAccessibleParent().is() ) {
-aWrapper = [ AquaA11yFactory wrapperForAccessibleContext: [ aWrapper 
accessibleContext ] - getAccessibleParent() - getAccessibleContext() ];
+AquaA11yWrapper *aTentativeParentWrapper = [ AquaA11yFactory 
wrapperForAccessibleContext: [ aWrapper accessibleContext ] - 
getAccessibleParent() - getAccessibleContext() ];
+// Quick-and-dirty fix for infinite loop after fixing crash in
+// fdo#47275
+if ( aTentativeParentWrapper == aWrapper )
+break;
+aWrapper = aTentativeParentWrapper;
 [ aWrapper autorelease ];
 }
 // get associated NSWindow
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - chart2/source

[Libreoffice Gerrit user]

 chart2/source/view/axes/VCartesianAxis.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 0a01bd496037bb34f90b7baf9d7bd8a46eea762f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Mon Sep 24 15:29:01 2012 -0400

fdo#55297: Fix regression in chart complex category placements.

This is effectively a revert of a769fd1ec076b61c1ce2f84da87283cc637dd5d5
and a1be31fd8bf830a4f5961e690bcffd050782e210 which unfortunately caused
regression in complex category placements.

This unfortunately re-introduces fdo#44832. We need to re-think how to
fix that one without breaking the multi-level category feature.

Change-Id: I1ed8364a46174ac6c29aa0b027a33f84bcca51fa
Signed-off-by: Noel Power noel.po...@suse.com

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index 9ffd923..b75e12d 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -473,11 +473,11 @@ void 
VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector ::s
 rAllTickInfos.clear();
 sal_Int32 nLevel=0;
 sal_Int32 nLevelCount = 
m_aAxisProperties.m_pExplicitCategoriesProvider-getCategoryLevelCount();
-sal_Int32 nCatIndex = 0;
 for( ; nLevelnLevelCount; nLevel++ )
 {
 ::std::vector TickInfo  aTickInfoVector;
 std::vector ComplexCategory  aComplexCategories( 
m_aAxisProperties.m_pExplicitCategoriesProvider-getCategoriesByLevel( nLevel ) 
);
+sal_Int32 nCatIndex = 0;
 std::vector ComplexCategory ::const_iterator 
aIt(aComplexCategories.begin());
 std::vector ComplexCategory ::const_iterator 
aEnd(aComplexCategories.end());
 for(;aIt!=aEnd;++aIt)
@@ -1328,13 +1328,18 @@ void VCartesianAxis::doStaggeringOfLabels( const 
AxisLabelProperties rAxisLabel
 B2DVector aCummulatedLabelsDistance(0,0);
 for( sal_Int32 nTextLevel=0; nTextLevelnTextLevelCount; nTextLevel++ )
 {
-boost::scoped_ptr TickIter  apTickIter(createLabelTickIterator( 
nTextLevel ));
-if(apTickIter)
+boost::scoped_ptrTickIter 
apTickIter(createLabelTickIterator(nTextLevel));
+if (apTickIter)
 {
 double fRotationAngleDegree = 
m_aAxisLabelProperties.fRotationAngleDegree;
+if( nTextLevel0 )
+{
+lcl_shiftLables( *apTickIter.get(), 
aCummulatedLabelsDistance );
+fRotationAngleDegree = 0.0;
+}
 aCummulatedLabelsDistance += lcl_getLabelsDistance( 
*apTickIter.get()
-, pTickFactory2D-getDistanceAxisTickToText( 
m_aAxisProperties )
-, fRotationAngleDegree );
+, pTickFactory2D-getDistanceAxisTickToText( 
m_aAxisProperties )
+, fRotationAngleDegree );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - chart2/source

[Libreoffice Gerrit user]

 chart2/source/tools/ExplicitCategoriesProvider.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit f665c41f2dfeedeee34f2a7024432083ed809a18
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Mon Sep 24 16:09:10 2012 -0400

fdo#55298: We should only treat empty values as continuation of previous 
ones.

For better Excel compatibility.

Change-Id: I3bc44f65127d3f020894dc29e5c6549bb257f218
Signed-off-by: Noel Power noel.po...@suse.com

diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx 
b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 73f5801..bc938e6 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -293,7 +293,7 @@ std::vector ComplexCategory  
lcl_DataSequenceToComplexCategoryVector(
 sal_Int32 nCurrentCount=0;
 for( sal_Int32 nN=0; nNnMaxCount; nN++ )
 {
-OUString aCurrent = rStrings[nN];
+const OUString aCurrent = rStrings[nN];
 if( bCreateSingleCategories || ::std::find( rLimitingBorders.begin(), 
rLimitingBorders.end(), nN ) != rLimitingBorders.end() )
 {
 aResult.push_back( ComplexCategory(aPrevious,nCurrentCount) );
@@ -302,14 +302,18 @@ std::vector ComplexCategory  
lcl_DataSequenceToComplexCategoryVector(
 }
 else
 {
-if( !aCurrent.isEmpty()  aPrevious != aCurrent )
+// Empty value is interpreted as a continuation of the previous
+// category. Note that having the same value as the previous one
+// does not equate to a continuation of the category.
+
+if (aCurrent.isEmpty())
+++nCurrentCount;
+else
 {
 aResult.push_back( ComplexCategory(aPrevious,nCurrentCount) );
 nCurrentCount=1;
 aPrevious = aCurrent;
 }
-else
-nCurrentCount++;
 }
 }
 if( nCurrentCount )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED][REVIEW 3-6] Proper placements of complex categories (fdo#55298)

[Noel Power]

On 25/09/12 01:59, Kohei Yoshida wrote:

Hi there,

Here is another request for backport related to chart.

I'd like

http://cgit.freedesktop.org/libreoffice/core/commit/?id=8baaff5c798984b0fa7fe7a764491ca27765623e 



backported to 3-6 to fix

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

Our chart code currently treats both empty cell values as well as 
repeated values equally and interpret them as continuation of the 
previous categories.  But this creates an interoperability issue with 
Excel's chart engine which treats the latter case differently.  This 
commit improves the situation there.


Review and backport would be appreciated.

works for me, pushed

thanks,

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

[PATCH] Change in core[libreoffice-3-6]: rhbz#827695: sw: prevent crashes after incomplete print:

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/699

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/699/1

rhbz#827695: sw: prevent crashes after incomplete print:

If the last page is not printed for whatever reason, then
SwXTextDocument's destructor will delete a SwViewOptionAdjust_Impl,
which accesses the document's ViewShell, which has already been
deleted at that point.  Add a horrible kludge to not crash for now.

Change-Id: I67fe37970d60782030b84f2ba1e66ef3f9c6
(cherry picked from commit d53e12c7a9c2d0a3b487303673c1fafd09f6593c)
---
M sw/inc/printdata.hxx
M sw/inc/unotxdoc.hxx
M sw/source/core/view/printdata.cxx
M sw/source/ui/uno/unotxdoc.cxx
4 files changed, 27 insertions(+), 11 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/699
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67fe37970d60782030b84f2ba1e66ef3f9c6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl mst...@redhat.com

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

Re: License Statement!

[Michael Meeks]

Hi Lennard,

On Wed, 2012-09-26 at 12:52 +0200, Lennard Wasserthal wrote:
 I HAD put such a blanket statement in the commit message of my bug fix 
 (gerrit) submission.

My mistake. Thanks for the blanket statement - it makes my life easier
not to have to correlate and check one statement per commit - and
(hopefully) is easier wrt. not having to write it constantly :-)

Thanks !

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

[PATCH] Change in core[libreoffice-3-6]: Clean up option processing

[Stephan Bergmann (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/700

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/700/1

Clean up option processing

* Support --version on non-UNX, too.

* Consistently show the first unknown option and the help blob in the presence
  of any unknown options.

* There is no need to tunnel --help/--version past oosplash in the soffice
  script, as oosplash is prepared to treat them adequately (esp. not pass them
  over any pipe); this only added unnecessary variance to what spellings exactly
  are supported and how mixtures of --help, --version, and unknown options are
  handled.

(cherry picked from commit f4a4ba9ac1b58b4726825400e1edd1bf47d4080a)

Change-Id: I617f2e727e2f0eafd34a2de3b85d441c6783ec4f
---
M desktop/scripts/soffice.sh
M desktop/source/app/app.cxx
M desktop/source/app/cmdlineargs.cxx
M desktop/source/app/cmdlineargs.hxx
M desktop/source/app/cmdlinehelp.cxx
M desktop/source/app/cmdlinehelp.hxx
M desktop/source/app/officeipcthread.cxx
M desktop/source/app/sofficemain.cxx
M desktop/unx/source/args.c
M desktop/unx/source/args.h
M desktop/unx/source/start.c
M vcl/inc/vcl/svapp.hxx
12 files changed, 272 insertions(+), 260 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/700
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I617f2e727e2f0eafd34a2de3b85d441c6783ec4f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com

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

[Libreoffice-commits] .: 3 commits - afms/Zip_fontunxafm.mk cairo/prj configure.in gdk-pixbuf/prj solenv/gbuild

[Libreoffice Gerrit user]

 afms/Zip_fontunxafm.mk  |4 
 cairo/prj/build.lst |2 +-
 configure.in|1 +
 gdk-pixbuf/prj/build.lst|2 +-
 solenv/gbuild/LinkTarget.mk |4 ++--
 5 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 4f07689050ffdffb473daa7217728ac79f1785d3
Author: David Tardon dtar...@redhat.com
Date:   Wed Sep 26 13:28:30 2012 +0200

add missing dep on unpacked tarball

Change-Id: Ibacf45072be2ec143e8cc2207d9ce14409a8c812

diff --git a/afms/Zip_fontunxafm.mk b/afms/Zip_fontunxafm.mk
index 699c149..406024f 100644
--- a/afms/Zip_fontunxafm.mk
+++ b/afms/Zip_fontunxafm.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Zip_Zip,fontunxafm,$(call gb_UnpackedTarball_get_dir,afms)))
 
+$(eval $(call gb_Zip_add_dependencies,fontunxafm,\
+   $(call gb_UnpackedTarball_get_target,afms) \
+))
+
 $(eval $(call gb_Zip_add_files,fontunxafm,\
Courier-Bold.afm \
Courier-BoldOblique.afm \
commit 6066151aa185d4df053185ff59efc1c8e869d34c
Author: David Tardon dtar...@redhat.com
Date:   Wed Sep 26 07:23:24 2012 +0200

return build conditional for libpng

Change-Id: I0ff1f219db136f3cc763d6af61df177831b1e93f

diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index 5827e76..b107635 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,4 @@
-lcairo cairo   : ZLIB:zlib libpng soltools NULL
+lcairo cairo   : ZLIB:zlib LIBPNG:libpng soltools NULL
 lcairo cairo   usr1-   all lcairo_mkout 
NULL
 lcairo cairo\pixmannmake   -   all lcairo_pixman 
NULL
 lcairo cairo\cairo nmake   -   all lcairo_cairo 
lcairo_pixman NULL
diff --git a/configure.in b/configure.in
index 3434f74..66746a4 100644
--- a/configure.in
+++ b/configure.in
@@ -11595,6 +11595,7 @@ if test $with_system_libpng = yes; then
 AC_MSG_RESULT([yes])
 else
 SYSTEM_LIBPNG=NO
+BUILD_TYPE=$BUILD_TYPE LIBPNG
 PNG_TARBALL=9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
 AC_MSG_RESULT([no])
 fi
diff --git a/gdk-pixbuf/prj/build.lst b/gdk-pixbuf/prj/build.lst
index 550466a..db76c49 100644
--- a/gdk-pixbuf/prj/build.lst
+++ b/gdk-pixbuf/prj/build.lst
@@ -1,3 +1,3 @@
-gp gdk-pixbuf  : glib gettext jpeg libpng soltools NULL
+gp gdk-pixbuf  : glib gettext jpeg LIBPNG:libpng soltools NULL
 gp gdk-pixbuf  usr1-   all 
gp_mkout NULL
 gp gdk-pixbuf  nmake   -   all 
gp_gdk-pixbuf NULL
commit f8574c4da1a7ea24ee65d5b94ccc56a02a27a038
Author: David Tardon dtar...@redhat.com
Date:   Wed Sep 26 06:20:40 2012 +0200

do not need to escape $ here

Change-Id: I987597aef3265df08407a869d57b575778174184

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 6d371fa..8dddeb3 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -754,9 +754,9 @@ endif
 
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $$(if 
$$(filter-out StaticLibrary,$$(TARGETTYPE)),$(2))
 
-$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call 
gb_StaticLibrary_get_target,$$(lib)))
+$(call gb_LinkTarget_get_target,$(1)) : $(foreach lib,$(2),$(call 
gb_StaticLibrary_get_target,$(lib)))
 $(call gb_LinkTarget_get_external_headers_target,$(1)) : \
-$$(foreach lib,$(2),$$(call gb_StaticLibrary_get_headers_target,$$(lib)))
+   $(foreach lib,$(2),$(call gb_StaticLibrary_get_headers_target,$(lib)))
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - configure.in idlc/inc idlc/source

[Libreoffice Gerrit user]

 configure.in|   28 
 idlc/inc/idlc/astexpression.hxx |2 +-
 idlc/source/astexpression.cxx   |   24 
 idlc/source/parser.y|2 +-
 4 files changed, 14 insertions(+), 42 deletions(-)

New commits:
commit a8bb6d52f31e5aa12be828af0b36533216083ed4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Sep 26 13:31:22 2012 +0200

No need to check for Mozilla sources in configure

...is automatically done by ./download if necessary.

Change-Id: Ia51d33e6f589c9bc54570d62ab6704a751c0e5c1

diff --git a/configure.in b/configure.in
index 66746a4..a1e6529 100644
--- a/configure.in
+++ b/configure.in
@@ -8073,34 +8073,6 @@ else
 fi
 fi
 
-if test -z $MOZILLA_VERSION; then
-MOZILLA_VERSION=1.1.14
-fi
-MOZILLA_SOURCE_VERSION=seamonkey-${MOZILLA_VERSION}.source
-MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst.in`
-AC_MSG_CHECKING([for Mozilla sources])
-if test -z $MOZILLA_FETCH_FILE; then
-AC_MSG_RESULT([not found])
-HAVE_MOZILLA_TARBALL=n
-else
-AC_MSG_CHECKING([for $MOZILLA_FETCH_FILE])
-if test ! -e $TARFILE_LOCATION/$MOZILLA_FETCH_FILE; then
-if test -z $DO_FETCH; then
-AC_MSG_RESULT([will be fetched])
-HAVE_MOZILLA_TARBALL=y
-else
-AC_MSG_RESULT([not found])
-HAVE_MOZILLA_TARBALL=n
-fi
-else
-AC_MSG_RESULT([found])
-HAVE_MOZILLA_TARBALL=y
-fi
-fi
-if test $HAVE_MOZILLA_TARBALL != y; then
-AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
-Use ./download to download.])
-fi
 if test $_os = WINNT; then
 AC_MSG_CHECKING([for moztools binaries])
 if test ! -e $TARFILE_LOCATION/vc8-moztools.zip; then
commit 6189ffc7ed709912a2439cdbd45d5e4af15d23e8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Sep 26 12:30:20 2012 +0200

Fix bool - byte coercion logic

Change-Id: Iab6dba9484fb5ddb8a8d4efcd46d7b9c8d1acca8

diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index 783ee66..b28cfed 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -667,7 +667,7 @@ coerce_value(AstExprValue *ev, ExprType t)
 ev-et = ET_byte;
 return ev;
 case ET_boolean:
-ev-u.byval = (ev-u.bval == false) ? 1 : 0;
+ev-u.byval = ev-u.bval ? 1 : 0;
 ev-et = ET_byte;
 return ev;
 case ET_float:
commit 20b77f616a6f38b078901bc404feea600d7d4975
Author: Noel Grandin n...@peralex.com
Date:   Tue Sep 25 14:37:06 2012 +0200

sal_Bool - bool

Change-Id: I4fd6d247fdc0333ccdace4ebfa947c8d02e559bc

diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx
index 865eeb2..80b4ea0 100644
--- a/idlc/inc/idlc/astexpression.hxx
+++ b/idlc/inc/idlc/astexpression.hxx
@@ -81,7 +81,7 @@ struct AstExprValue
 sal_uInt32  ulval;  // Contains unsigned long expr value
 sal_Int64   hval;   // Contains hyper expression value
 sal_uInt64  uhval;  // Contains unsigned hyper expr value
-sal_Boolbval;   // Contains boolean expression value
+boolbval;   // Contains boolean expression value
 float   fval;   // Contains 32-bit float expr value
 double  dval;   // Contains 64-bit float expr value
 sal_uInt32  eval;   // Contains enumeration value
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index 6b9e010..783ee66 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -490,41 +490,41 @@ coerce_value(AstExprValue *ev, ExprType t)
 switch (ev-et)
 {
 case ET_short:
-ev-u.bval = (ev-u.sval == 0) ? sal_False : sal_True;
+ev-u.bval = ev-u.sval != 0;
 ev-et = ET_boolean;
 return ev;
 case ET_ushort:
-ev-u.bval = (ev-u.usval == 0) ? sal_False : sal_True;
+ev-u.bval = ev-u.usval != 0;
 ev-et = ET_boolean;
 return ev;
 case ET_long:
-ev-u.bval = (ev-u.lval == 0) ? sal_False : sal_True;
+ev-u.bval = ev-u.lval != 0;
 ev-et = ET_boolean;
 return ev;
 case ET_ulong:
-ev-u.bval = (ev-u.ulval == 0) ? sal_False : sal_True;
+ev-u.bval = ev-u.ulval != 0;
 ev-et = 

[Libreoffice-commits] .: configure.in

[Libreoffice Gerrit user]

 configure.in |   16 +---
 1 file changed, 1 insertion(+), 15 deletions(-)

New commits:
commit bacc9ed75e4e290ed0909445dfd8ec1e659fde97
Author: Michael Stahl mst...@redhat.com
Date:   Wed Sep 26 13:29:24 2012 +0200

configure.in: remove obsolete --with-mozilla-version...

...and bitrotted code to check for checking downloaded file names that
has been broken by e24c2e106e76d9b50a923ed27f8f8fdd2db9b93a.

Change-Id: I5acda4246b46f1d5d4a54fe64a77ceae69b45a05

diff --git a/configure.in b/configure.in
index a1e6529..75f9c88 100644
--- a/configure.in
+++ b/configure.in
@@ -1276,12 +1276,6 @@ AC_ARG_WITH(system-nss,
 [Use NSS/nspr libraries already on system.]),,
 [with_system_nss=$with_system_libs])
 
-AC_ARG_WITH(mozilla-version,
-AS_HELP_STRING([--with-mozilla-version],
-[Choose which version of Mozilla to use while building Mozilla.
- (default=1.7.5) Note that not all versions are supported.]),
-,)
-
 AC_ARG_WITH(mozilla-toolkit,
 AS_HELP_STRING([--with-mozilla-toolkit],
 [Choose which GUI toolkit to use while building Mozilla components. 
(default=gtk2)]),
@@ -8014,15 +8008,7 @@ else
 SYSTEM_MOZILLA=NO
 BUILD_TYPE=$BUILD_TYPE MOZ
 MOZ_TARBALL=a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
-if test -z $with_mozilla_version; then
-MOZILLA_VERSION=
-else
-AC_MSG_CHECKING([which Mozilla version to build])
-MOZILLA_VERSION=$with_mozilla_version
-enable_build_mozilla=1
-AC_MSG_RESULT([$MOZILLA_VERSION])
-fi
-
+MOZILLA_VERSION=1.1.14
 AC_SUBST(MOZILLA_VERSION)
 
 AC_MSG_CHECKING([for toolkit Mozilla should use])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] sal_Bool to bool conversions

[Stephan Bergmann]

On 09/26/2012 12:21 PM, Noel Power wrote:

On 26/09/12 11:11, Noel Power wrote:

On 25/09/12 13:48, Noel Grandin wrote:

These patches do some sal_Bool to bool conversions.
One of the patches drops 2 unused sal_Bool fields.

They have passed a full make check.

the looked ok to me, will push all (waiting for build to complete)
except 0004-sal_Bool-bool.patch which makes changes to idlc ( and in
particular to the .y file and I have no idea about yacc ) most likely
the change is fine but just in case there is some hidden gotcha, lets
ask Stephan to look at this. I also will push an extra patch to adjust
the  MasterPageEntity bUsed entry

all pushed with the exception of 0004-sal_Bool-bool.patch and the
addition of
http://cgit.freedesktop.org/libreoffice/core/commit/?id=85b660a618780479a466e65a83ab844358631fa4


0004-sal_Bool-bool.patch looked just fine, so pushed that now, too.

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

Re: [PUSHED-3-6] adjustment of Calc default options dialog

[Michael Meeks]

On Sat, 2012-08-25 at 14:49 +0200, Jean-Baptiste Faure wrote:
 Le 25/08/2012 12:44, Arnaud Versini a écrit :
  Pushed in master, thanks for the patch.
 Thank you Arnaud.
 
 Is this patch a good candidate for a backport to 3.6 ?

Just for the record, I see Kohei committed it some while ago :-)

Thanks for the nice fix !

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] .: vcl/aqua

[Libreoffice Gerrit user]

 vcl/aqua/source/a11y/aqua11ywrapper.mm |4 
 1 file changed, 4 insertions(+)

New commits:
commit 3376f682a77c16f4da63dc14c45d294425e5ba8a
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Sep 26 16:01:09 2012 +0300

Silly workaround for fdo#55156

I feel dirty now.

Change-Id: I1cafb0c0494d56bc9c81594c2145b2cc4a1ee389

diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm 
b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index 8acb5f4..1491a04 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -369,12 +369,16 @@ static BOOL isPopupMenuOpen = NO;
 -(id)windowAttribute {
 // go upstairs until reaching the broken connection
 AquaA11yWrapper * aWrapper = self;
+int loops = 0;
 while ( [ aWrapper accessibleContext ] - getAccessibleParent().is() ) {
 AquaA11yWrapper *aTentativeParentWrapper = [ AquaA11yFactory 
wrapperForAccessibleContext: [ aWrapper accessibleContext ] - 
getAccessibleParent() - getAccessibleContext() ];
 // Quick-and-dirty fix for infinite loop after fixing crash in
 // fdo#47275
 if ( aTentativeParentWrapper == aWrapper )
 break;
+// Even dirtier fix for infinite loop in fdo#55156
+if ( loops++ == 100 )
+break;
 aWrapper = aTentativeParentWrapper;
 [ aWrapper autorelease ];
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: dbghelp.dll fails on rebase (on Windows)

[Kohei Yoshida]

Hi Tor,

On Wed, Sep 26, 2012 at 4:00 AM, Tor Lillqvist t...@iki.fi wrote:
 Again, I wonder how essential / useful this whole rebasing thing is
 any more in this day... But yeah, I know that suggesting we stop doing
 it will bring up arguments that essentially say if it might be useful
 for even one percent of our userbase, we should keep doing it.

 Anyway, this issue is not simply one of only whether to rebase DLLs or
 not (to be non-overlapping by default in the address space) after
 building, before creating the installer. See
 http://www.mail-archive.com/dev@openoffice.org/msg15650.html . We
 still to that un-rebasing at installation time (on the more current
 Windows versions), don't we?

Ah, thanks for this info. It's good to know the why behind this rebasing.

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

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - 2 commits - cui/source vcl/source

[Libreoffice Gerrit user]

 cui/source/dialogs/cuicharmap.cxx |  126 +-
 cui/source/inc/cuicharmap.hxx |   20 +-
 vcl/source/window/window.cxx  |3 
 3 files changed, 66 insertions(+), 83 deletions(-)

New commits:
commit d88f5cda87f15803630052fdf07516a16eb88051
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Sep 26 14:11:53 2012 +0100

reduce size requests if new text is same as old

Change-Id: I6e9b03c4baf05d096aa780b4f6d8635bb1e254ac

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6901d79..47ea865 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -7871,6 +7871,9 @@ void Window::SetCursor( Cursor* pCursor )
 
 void Window::SetText( const XubString rStr )
 {
+if (rStr == mpWindowImpl-maText)
+return;
+
 DBG_CHKTHIS( Window, ImplDbgCheckWindow );
 
 String oldTitle( mpWindowImpl-maText );
commit c4929d3a92387225051ae399c8174aec53c6b0f2
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Sep 26 11:08:54 2012 +0100

merge SvxCharacterMap and SvxCharMapData together

Change-Id: I417ce219924987f584cabf9ed8098607d6e5973c

diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
index 676ef53..f3ee121 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -55,15 +55,29 @@
 
 // class SvxCharacterMap =
 
-SvxCharacterMap::SvxCharacterMap( Window* pParent, sal_Bool bOne, const 
SfxItemSet* pSet ) :
-SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_CHARMAP ) ),
-mpCharMapData( 0 )
+SvxCharacterMap::SvxCharacterMap( Window* pParent, sal_Bool bOne_, const 
SfxItemSet* pSet )
+: SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_CHARMAP ) ),
+aShowSet( this, CUI_RES( CT_SHOWSET ) ),
+aShowText   ( this, CUI_RES( CT_SHOWTEXT ) ),
+aOKBtn  ( this, CUI_RES( BTN_CHAR_OK ) ),
+aCancelBtn  ( this, CUI_RES( BTN_CHAR_CANCEL ) ),
+aHelpBtn( this, CUI_RES( BTN_CHAR_HELP ) ),
+aDeleteBtn  ( this, CUI_RES( BTN_DELETE ) ),
+aFontText   ( this, CUI_RES( FT_FONT ) ),
+aFontLB ( this, CUI_RES( LB_FONT ) ),
+aSubsetText ( this, CUI_RES( FT_SUBSET ) ),
+aSubsetLB   ( this, CUI_RES( LB_SUBSET ) ),
+aSymbolText ( this, CUI_RES( FT_SYMBOLE ) ),
+aShowChar   ( this, CUI_RES( CT_SHOWCHAR ), sal_True ),
+aCharCodeText   ( this, CUI_RES( FT_CHARCODE ) ),
+bOne( bOne_ ),
+pSubsetMap( NULL )
 {
 SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, sal_False );
 if ( pItem )
 bOne = pItem-GetValue();
 
-mpCharMapData =  new SvxCharMapData( this, bOne, CUI_MGR() );
+init();
 
 SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, sal_False );
 if ( pCharItem )
@@ -77,16 +91,16 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, sal_Bool 
bOne, const SfxItemS
 SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, 
sal_False );
 if ( pFontItem )
 {
-Font aFont( pFontItem-GetFamilyName(), pFontItem-GetStyleName(), 
GetCharFont().GetSize() );
-aFont.SetCharSet( pFontItem-GetCharSet() );
-aFont.SetPitch( pFontItem-GetPitch() );
-SetCharFont( aFont );
+Font aTmpFont( pFontItem-GetFamilyName(), pFontItem-GetStyleName(), 
GetCharFont().GetSize() );
+aTmpFont.SetCharSet( pFontItem-GetCharSet() );
+aTmpFont.SetPitch( pFontItem-GetPitch() );
+SetCharFont( aTmpFont );
 }
 else if ( pFontNameItem )
 {
-Font aFont( GetCharFont() );
-aFont.SetName( pFontNameItem-GetValue() );
-SetCharFont( aFont );
+Font aTmpFont( GetCharFont() );
+aTmpFont.SetName( pFontNameItem-GetValue() );
+SetCharFont( aTmpFont );
 }
 
 FreeResource();
@@ -97,35 +111,34 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, 
sal_Bool bOne, const SfxItemS
 
 SvxCharacterMap::~SvxCharacterMap()
 {
-delete mpCharMapData;
 }
 
 // ---
 
 const Font SvxCharacterMap::GetCharFont() const
 {
-return mpCharMapData-aFont;
+return aFont;
 }
 
 // ---
 
 void SvxCharacterMap::SetChar( sal_UCS4 c )
 {
-mpCharMapData-aShowSet.SelectCharacter( c );
+aShowSet.SelectCharacter( c );
 }
 
 // ---
 
 sal_UCS4 SvxCharacterMap::GetChar() const
 {
-return mpCharMapData-aShowSet.GetSelectCharacter();
+return aShowSet.GetSelectCharacter();
 }
 
 // ---
 
 String SvxCharacterMap::GetCharacters() const
 {
-return mpCharMapData-aShowText.GetText();
+return aShowText.GetText();
 }
 
 
@@ -133,13 +146,8 @@ String SvxCharacterMap::GetCharacters() 

Re: uninitialized member warnings ?

[Michael Meeks]

On Tue, 2012-09-25 at 14:26 +0200, Stephan Bergmann wrote:
  Neato :-) the deeper question - as to why no warnings are popping out
  of the compiler for this when (surely) it's a trivial thing to check /
  warn for - is more concerning.

 Such a warning option has never been there AFAIK.

Oh - must be me mis-remembering it, or remembering valgrind output that
catches that, silly me.

 There is no way for the compiler to decide this in general (unlike Java, 
 C++ does not have restricting rules to allow the compiler to do so).

no way ? surely there is - add a warning for un-initialized POD members
on the exit of the constructor. It seems that fools seldom differ, and
there is such a patch here:

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=2972

Doesn't seem to be going anywhere in the last month, but - you can but
hope :-)

ATB,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

Windows installer fails (on master)

[Kohei Yoshida]

Hi there,

This is just FYI that the Windows installer from the latest master (as
of yesterday) currently fails. Here is what I get:

http://people.freedesktop.org/~kohei/win7-master-installer-fail.png

I'm not very familiar with the Windows installer implementation, so
I'm hoping someone who is more familiar with it will find this useful.

Best,

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

Re: Windows installer fails (on master)

[Andras Timar]

2012/9/26 Kohei Yoshida kohei.yosh...@gmail.com:
 Hi there,

 This is just FYI that the Windows installer from the latest master (as
 of yesterday) currently fails. Here is what I get:

 http://people.freedesktop.org/~kohei/win7-master-installer-fail.png

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

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

Re: [PUSHED] Easyhack 50089

[Miklos Vajna]

Hi Douglas,

On Mon, Sep 17, 2012 at 08:10:04AM +, Miklos Vajna (via Code Review) 
ger...@gerrit.libreoffice.org wrote:
 Thank you for your patch! :-)  It has been merged to LibreOffice.

It turns out we have no license statement from you, could you send a
mail, containing

All my current and past contributions made to the LibreOffice project
are done under MPL1.1+ / GPLv3+ / LGPLv3+.

to this list, please?

Thanks,

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

[Libreoffice-commits] .: 2 commits - solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/Helper.mk  |6 ++
 solenv/gbuild/Library.mk |1 +
 solenv/gbuild/StaticLibrary.mk   |1 +
 solenv/gbuild/TargetLocations.mk |8 
 solenv/gbuild/gbuild.mk  |4 ++--
 5 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit f5a2c610b11d4c5d073fa33aaa53d55e3c0b879d
Author: Michael Stahl mst...@redhat.com
Date:   Wed Sep 26 15:23:48 2012 +0200

Revert gbuild: remove gb_Library_TARGETS and ...

This reverts commit 599a94827e2b3957db3abf758d48ff7b3977e2f2.

The special handling of PLAINLIBS_NONE breaks the build on MacOSX.
Needs further cleanup of PLAINLIBS_NONE abuse first.

Conflicts:
solenv/gbuild/gbuild.mk

Change-Id: I834b623405e7745568ee2422647746631167524b

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 3771605..a75a6e0 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -108,6 +108,12 @@ $$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(eval 
gb_Jar_$$(group) :=))
 
 endef
 
+define gb_Helper_collect_libtargets
+gb_Library_TARGETS := $$(foreach 
group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
+gb_StaticLibrary_TARGETS := $$(foreach 
group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
+
+endef
+
 define gb_Helper_collect_knownlibs
 gb_Library_KNOWNLIBS := $$(foreach 
group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
 gb_StaticLibrary_KNOWNLIBS := $$(foreach 
group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 5d49d6a..01ee922 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -37,6 +37,7 @@
 #  gb_Library_DLLFILENAMES
 #  gb_Library_FILENAMES
 #  gb_Library_Library_platform
+#  gb_Library_TARGETS
 
 # doesn't do anything, just used for hooking up component target
 .PHONY: $(call gb_Library__get_final_target,%)
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index a09f720..124b009 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -33,6 +33,7 @@
 #  gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib
 # defined by platform
 #  gb_StaticLibrary_FILENAMES
+#  gb_StaticLibrary_TARGETS
 
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because 
they are indistinguishable on windows
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b217fd3..fb35d9c 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -67,11 +67,11 @@ gb_XcuModuleTarget_get_outdir_target = 
$(gb_Configuration_registry)/spool/$(1)
 
 
 define gb_Library_get_target
-$(if $(filter $(1),$(gb_Library_PLAINLIBS_NONE)),,$(patsubst 
$(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_Library_FILENAMES
+$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter 
$(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES)))
 endef
 
 define gb_StaticLibrary_get_target
-$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter 
$(1):%,$(gb_StaticLibrary_FILENAMES)))
+$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(filter 
$(1),$(gb_StaticLibrary_TARGETS)):%,$(gb_StaticLibrary_FILENAMES)))
 endef
 
 
@@ -194,11 +194,11 @@ gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
 gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1)
 
 define gb_Library_get_external_headers_target
-$(if $(filter $(1),$(gb_Library_PLAINLIBS_NONE)),,$(patsubst 
$(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter 
$(1):%,$(gb_Library_FILENAMES
+$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter 
$(1):%,$(gb_Library_FILENAMES)))
 endef
 
 define gb_Library_get_headers_target
-$(if $(filter $(1),$(gb_Library_PLAINLIBS_NONE)),,$(patsubst 
$(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES
+$(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter 
$(1):%,$(gb_Library_FILENAMES)))
 endef
 
 define gb_StaticLibrary_get_external_headers_target
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index bb4a3bd..aeb59a8 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -152,6 +152,7 @@ include $(GBUILDDIR)/TargetLocations.mk
 $(eval $(call gb_Helper_init_registries))
 include $(SRCDIR)/Repository.mk
 include $(SRCDIR)/RepositoryExternal.mk
+$(eval $(call gb_Helper_collect_libtargets))
 
 gb_Library_DLLPOSTFIX := lo
 
commit 2b5ef98ab48799788aa7d26325524ec41ed53fe6
Author: Michael Stahl mst...@redhat.com
Date:   Wed Sep 26 15:13:33 2012 +0200

gbuild: without multi-repository support ...

... RepositoryExternal.mk is not optional.

Change-Id: I8678a2196a037dba1c3be350c8b989f5ba242381

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 9f78a08..bb4a3bd 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -150,9 +150,8 @@ include $(GBUILDDIR)/Helper.mk
 include 

Re: uninitialized member warnings ?

[Lubos Lunak]

On Wednesday 26 of September 2012, Michael Meeks wrote:
 On Tue, 2012-09-25 at 14:26 +0200, Stephan Bergmann wrote:
 Neato :-) the deeper question - as to why no warnings are popping out
   of the compiler for this when (surely) it's a trivial thing to check /
   warn for - is more concerning.
 
  Such a warning option has never been there AFAIK.

   Oh - must be me mis-remembering it, or remembering valgrind output that
 catches that, silly me.

  There is no way for the compiler to decide this in general (unlike Java,
  C++ does not have restricting rules to allow the compiler to do so).

   no way ? surely there is - add a warning for un-initialized POD members
 on the exit of the constructor. It seems that fools seldom differ, and
 there is such a patch here:

   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=2972

   Doesn't seem to be going anywhere in the last month, but - you can but
 hope :-)

 I don't think it can go anywhere practical:

class A
{
bool foo;
void init();
public:
A() { init(); }
};

 How should the compiler know?

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fdo#43497 Editing the first or last name clears initials.

[Noel Power]

Hi Chris
On 22/09/12 17:47, Christopher Copits (via Code Review) wrote:

Hi,

I have submitted a patch for review:

 https://gerrit.libreoffice.org/673

To pull it, you can do:

 git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/673/1

fdo#43497 Editing the first or last name clears initials.

forgot to ask but if you haven't already could you please send a licence 
statement to the list, usually a blanket statement is handiest,

something like All of my past  future contributions to LibreOffice may be
licensed under the MPL/LGPLv3+ dual license

we would really appreciate than and thanks again for the patch,

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

[Libreoffice-commits] .: sw/qa

[Libreoffice Gerrit user]

 sw/qa/extras/inc/bordertest.hxx  |8 +++-
 sw/qa/extras/odfexport/odfexport.cxx |2 --
 sw/qa/extras/odfimport/odfimport.cxx |8 +++-
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 --
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 --
 sw/qa/extras/rtfexport/rtfexport.cxx |4 
 sw/qa/extras/rtfimport/rtfimport.cxx |8 ++--
 sw/qa/extras/swmodeltestbase.hxx |   16 
 sw/qa/extras/ww8export/ww8export.cxx |2 --
 sw/qa/extras/ww8import/ww8import.cxx |4 
 10 files changed, 16 insertions(+), 40 deletions(-)

New commits:
commit 1f75e264390c14bb6762f600756e7d0af78d7cf0
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Sep 26 15:37:15 2012 +0200

sw: remove unneeded using statements in qa/extras

Change-Id: I23b77b9c8d245d84a045bdedda1584419f4fddda

diff --git a/sw/qa/extras/inc/bordertest.hxx b/sw/qa/extras/inc/bordertest.hxx
index 3ac7c6e..bf97e72 100644
--- a/sw/qa/extras/inc/bordertest.hxx
+++ b/sw/qa/extras/inc/bordertest.hxx
@@ -30,13 +30,11 @@
 #include com/sun/star/table/BorderLine.hpp
 #include com/sun/star/text/XTextTable.hpp
 
-using rtl::OUString;
-
 #ifndef bordertest_hxx
 #define bordertest_hxx
 
-typedef std::maprtl::OUString, com::sun::star::table::BorderLine 
BorderLineMap;
-typedef std::pairrtl::OUString, com::sun::star::table::BorderLine 
StringBorderPair;
+typedef std::mapOUString, com::sun::star::table::BorderLine BorderLineMap;
+typedef std::pairOUString, com::sun::star::table::BorderLine 
StringBorderPair;
 
 using namespace com::sun::star;
 
@@ -135,7 +133,7 @@ public:
 if (xServiceInfo-supportsService(com.sun.star.text.TextTable))
 {
 uno::Referencetext::XTextTable const 
xTextTable(xServiceInfo, uno::UNO_QUERY_THROW);
-uno::Sequencertl::OUString const cells = 
xTextTable-getCellNames();
+uno::SequenceOUString const cells = 
xTextTable-getCellNames();
 uno::Sequence uno::Sequence sal_Int32   
borderWidthSequence;
 sal_Int32 nLength = cells.getLength();
 
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 4792508..1a30dd5 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -29,8 +29,6 @@
 
 #include unotools/tempfile.hxx
 
-using rtl::OUString;
-
 class Test : public SwModelTestBase
 {
 public:
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index daf82cc..d7a6c0e 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -30,10 +30,8 @@
 #include com/sun/star/table/BorderLine.hpp
 #include com/sun/star/text/XTextTable.hpp
 
-typedef std::maprtl::OUString, com::sun::star::uno::Sequence 
com::sun::star::table::BorderLine  AllBordersMap;
-typedef std::pairrtl::OUString, com::sun::star::uno::Sequence 
com::sun::star::table::BorderLine  StringSequencePair;
-
-using rtl::OUString;
+typedef std::mapOUString, com::sun::star::uno::Sequence 
com::sun::star::table::BorderLine  AllBordersMap;
+typedef std::pairOUString, com::sun::star::uno::Sequence 
com::sun::star::table::BorderLine  StringSequencePair;
 
 class Test : public SwModelTestBase
 {
@@ -183,7 +181,7 @@ void Test::testOdtBorders()
 if (xServiceInfo-supportsService(com.sun.star.text.TextTable))
 {
 uno::Referencetext::XTextTable const 
xTextTable(xServiceInfo, uno::UNO_QUERY_THROW);
-uno::Sequencertl::OUString const cells = 
xTextTable-getCellNames();
+uno::SequenceOUString const cells = 
xTextTable-getCellNames();
 uno::Sequence uno::Sequence sal_Int32   
borderWidthSequence;
 sal_Int32 nLength = cells.getLength();
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 47246f8..c3d7fc4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -33,8 +33,6 @@
 
 #include unotools/tempfile.hxx
 
-using rtl::OUString;
-
 class Test : public SwModelTestBase
 {
 public:
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f8f161f..fa388f3 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -52,8 +52,6 @@
 
 #define TWIP_TO_MM100(TWIP) ((TWIP) = 0 ? (((TWIP)*127L+36L)/72L) : 
(((TWIP)*127L-36L)/72L))
 
-using rtl::OUStringBuffer;
-
 class Test : public SwModelTestBase
 {
 public:
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 67b6242..af4b50c 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -37,10 +37,6 @@
 #include unotools/tempfile.hxx
 #include vcl/svapp.hxx
 
-using rtl::OString;
-using rtl::OUString;
-using rtl::OUStringBuffer;
-
 class Test : public SwModelTestBase
 {
 

[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/platform/ANDROID_ARM_GCC.mk|   71 
 solenv/gbuild/platform/ANDROID_GODSON_GCC.mk |   71 
 solenv/gbuild/platform/ANDROID_INTEL_GCC.mk  |   71 
 solenv/gbuild/platform/android.mk|   79 +++
 4 files changed, 85 insertions(+), 207 deletions(-)

New commits:
commit 7372bbced8d99d6fd479a464095e4f827c39422e
Author: Michael Stahl mst...@redhat.com
Date:   Wed Sep 26 15:42:02 2012 +0200

gbuild: split out a common android.mk

Change-Id: Ie0858cb137aeaeb18815e3085de4d4000c62218b

diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk 
b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index a52a28c..f603e10 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -25,80 +25,13 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-#please make generic modifications to unxgcc.mk or linux.mk
+# please make generic modifications to unxgcc.mk or android.mk
 gb_CPUDEFS += -DARM32
 gb_COMPILERDEFAULTOPTFLAGS := -Os
 gb_CXXFLAGS += -fno-omit-frame-pointer
 gb_CFLAGS += -fno-omit-frame-pointer
 
 include $(GBUILDDIR)/platform/unxgcc.mk
-
-# Link almost everything with -lgnustl_shared
-gb_STDLIBS := \
-   gnustl_shared
-
-gb_Library_PLAINLIBS_NONE := \
-   android \
-   gnustl_shared \
-
-# No unit testing can be run
-gb_CppunitTest_CPPTESTPRECOMMAND := :
-
-# Re-define this from unxgcc.mk with some small but important
-# changes. Just temporarily done this way, shm_get promised to
-# eventually enable this to be done this in some more elegant and less
-# redundant fashion.
-
-gb_LinkTarget_LDFLAGS += \
--Wl,-z,defs \
-   -Wl,--as-needed \
-   -Wl,--no-add-needed
-
-define gb_LinkTarget__command_dynamiclink
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(1))  \
-   $(gb_CXX) \
-   -shared \
-   $(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-   $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
-   $(subst \d,$$,$(RPATH)) \
-   $(T_LDFLAGS) \
-   $(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
-   $(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
-   $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
-   $(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
-   $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
-   $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
-   -Wl$(COMMA)--start-group $(foreach 
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) 
-Wl$(COMMA)--end-group \
-   $(LIBS) \
-   $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach 
lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib) \
-   -o $(1))
-endef
-
-# Prefix UNO library filenames with lib
-gb_Library_FILENAMES := \
-   $(foreach 
lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT))
 \
-   $(foreach 
lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
-   $(foreach 
lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
-   $(foreach 
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
-   $(foreach 
lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-   $(foreach 
lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT))
 \
-   $(foreach 
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT))
 \
-   $(foreach 
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT))
 \
-   $(foreach 
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
 \
-
-
-# No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker so
-# don't bother generating such.
-
-define gb_Library_get_rpath
-endef
-
-define gb_Executable_get_rpath
-endef
-
-gb_LinkTarget_LDFLAGS := $(subst 
-Wl$(COMMA)-rpath-link$(COMMA)$(SYSBASE)/lib:$(SYSBASE)/usr/lib,,$(gb_LinkTarget_LDFLAGS))
-
-gb_Library__set_soversion_script_platform = 
+include $(GBUILDDIR)/platform/android.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk 
b/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk
index bb2a90b..f5d195a 100644
--- a/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk
@@ -25,78 +25,11 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-#please make generic 

Re: Windows installer fails (on master)

[Kohei Yoshida]

On 09/26/2012 09:21 AM, Andras Timar wrote:

2012/9/26 Kohei Yoshida kohei.yosh...@gmail.com:

Hi there,

This is just FYI that the Windows installer from the latest master (as
of yesterday) currently fails. Here is what I get:

http://people.freedesktop.org/~kohei/win7-master-installer-fail.png


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


thx


--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: bridges/source

[Libreoffice Gerrit user]

 bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dccddcc20b0b873ca182983506d97b500edfe4f1
Author: Luboš Luňák l.lu...@suse.cz
Date:   Wed Sep 26 16:55:37 2012 +0200

make gcc-uno bridge work with both gcc-4.7 and clang

It seems b0515ea5fa6c29faebed616ae3e0213c72d24904 and 
e2b7e28c12bb836fd7ab1dcbfc2460f807dd27f6
conflict, clang requires the extra call, gcc-4.7 crashes with it.

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx 
b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
index 34f261a..56612d2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
@@ -67,7 +67,9 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
 // unexpected size of int
 assert(nStackLongs  pStackLongs); // no stack
 
+#ifdef __clang__
 if (! pAdjustedThisPtr) 
CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything(xxx); // address something
+#endif
 
 volatile long edx = 0, eax = 0; // for register returns
 void * stackptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW 3-6] Fix autofilter crasher on OS X

[Kohei Yoshida]

Hi,

I'd like to have

http://cgit.freedesktop.org/libreoffice/core/commit/?id=5f373a002df2f083109bb7b2e0987258b6e2f9c4

backported to 3-6, and I would be willing to sign off.  The problem is 
that this is a Mac specific code, and I can't verify this.  Could 
someone with OS X please verify and cherry-pick to 3-6?


It fixes

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

Thanks,

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - 3 commits - cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UI_cui.mk svx/inc svx/source vcl/inc vcl/source

[Libreoffice Gerrit user]

 cui/AllLangResTarget_cui.mk  |1 
 cui/UI_cui.mk|1 
 cui/source/dialogs/charmap.hrc   |   41 -
 cui/source/dialogs/charmap.src   |  131 
 cui/source/dialogs/cuicharmap.cxx|  199 
 cui/source/factory/dlgfact.cxx   |   17 --
 cui/source/inc/cuicharmap.hxx|   29 +--
 cui/source/tabpages/chardlg.cxx  |   28 +--
 cui/uiconfig/ui/specialcharacters.ui |  284 +++
 svx/inc/svx/charmap.hxx  |5 
 svx/source/dialog/charmap.cxx|   39 
 vcl/inc/vcl/dialog.hxx   |1 
 vcl/source/window/builder.cxx|   24 ++
 vcl/source/window/dialog.cxx |   16 +
 vcl/source/window/window2.cxx|4 
 15 files changed, 492 insertions(+), 328 deletions(-)

New commits:
commit 3275011339165067468e8dc5a665ed5ab119b878
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Sep 26 16:14:28 2012 +0100

defer initializing dialog until sizeable/unsizeable is known

we have to defer initializing the dialog until we have determined the
sizeable/unsizable info as we can't change it after the fact

Change-Id: I27c90f8f92953d919b36cddc6a99fae9d7db47eb

diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index aa3c9cd..28fb81e 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -81,6 +81,7 @@ protected:
 public:
 SAL_DLLPRIVATE sal_BoolIsInClose() const { return mbInClose; }
 SAL_DLLPRIVATE bool hasPendingLayout() const { return 
maLayoutTimer.IsActive(); }
+SAL_DLLPRIVATE void doDeferredInit(bool bResizable);
 
 protected:
 Dialog( WindowType nType );
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 3e9ed91..31e72ce 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -203,6 +203,18 @@ namespace
 return sPattern;
 }
 
+bool extractResizable(VclBuilder::stringmap rMap)
+{
+bool bResizable = true;
+VclBuilder::stringmap::iterator aFind = 
rMap.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM(resizable)));
+if (aFind != rMap.end())
+{
+bResizable = toBool(aFind-second);
+rMap.erase(aFind);
+}
+return bResizable;
+}
+
 bool extractOrientation(VclBuilder::stringmap rMap)
 {
 bool bVertical = false;
@@ -432,7 +444,12 @@ Window *VclBuilder::makeObject(Window *pParent, const 
rtl::OString name, const
 
 Window *pWindow = NULL;
 if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkDialog)))
-pWindow = new Dialog(pParent, WB_SIZEMOVE|WB_3DLOOK|WB_CLOSEABLE);
+{
+WinBits nBits = WB_MOVEABLE|WB_3DLOOK|WB_CLOSEABLE;
+if (extractResizable(rMap))
+nBits |= WB_SIZEABLE;
+pWindow = new Dialog(pParent, nBits);
+}
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkBox)))
 {
 if (extractOrientation(rMap))
@@ -601,7 +618,10 @@ Window *VclBuilder::insertObject(Window *pParent, const 
rtl::OString rClass, co
 pCurrentChild = m_pParent;
 //toplevels default to resizable
 if (pCurrentChild-IsDialog())
-pCurrentChild-SetStyle(pCurrentChild-GetStyle() | WB_SIZEMOVE | 
WB_3DLOOK);
+{
+Dialog *pDialog = (Dialog*)pCurrentChild;
+pDialog-doDeferredInit(extractResizable(rMap));
+}
 if (pCurrentChild-GetHelpId().isEmpty())
 {
 pCurrentChild-SetHelpId(m_sHelpRoot + m_sID);
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 78a426d..64907b2 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -504,19 +504,31 @@ rtl::OUString VclBuilderContainer::getUIRootDir()
 return sShareLayer;
 }
 
+//we can't change sizeable after the fact, so need to defer until we know and 
then
+//do the init. Find the real parent stashed in mpDialogParent.
+void Dialog::doDeferredInit(bool bResizable)
+{
+WinBits nBits = WB_3DLOOK|WB_CLOSEABLE|WB_MOVEABLE;
+if (bResizable)
+nBits |= WB_SIZEABLE;
+Window *pParent = mpDialogParent;
+mpDialogParent = NULL;
+ImplInit(pParent, nBits);
+}
+
 Dialog::Dialog(Window* pParent, const rtl::OString rID, const rtl::OUString 
rUIXMLDescription)
 : SystemWindow( WINDOW_DIALOG )
+, mpDialogParent(pParent) //will be unset in doDeferredInit
 {
 ImplInitDialogData();
-ImplInit(pParent, WB_SIZEMOVE|WB_3DLOOK|WB_CLOSEABLE);
 m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, 
rID);
 }
 
 Dialog::Dialog(Window* pParent, const rtl::OString rID, const rtl::OUString 
rUIXMLDescription, WindowType nType)
 : SystemWindow( nType )
+, mpDialogParent(pParent) //will be unset in doDeferredInit
 {
 ImplInitDialogData();
-ImplInit(pParent, WB_SIZEMOVE|WB_3DLOOK|WB_CLOSEABLE);
 m_pUIBuilder = new VclBuilder(this, 

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - helpcontent2/helpers helpcontent2/source

[Libreoffice Gerrit user]

 helpcontent2/helpers/help_hid.lst   |3 ---
 helpcontent2/source/text/shared/01/0410.xhp |   15 +++
 2 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 96a77e33c6352323801c073c0af2402f1e3601b6
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Sep 26 16:22:58 2012 +0100

adapt insert character dialog helpids to .ui names

Change-Id: Iec3a62c9636e0797ca3a5ecf67b135d0f99dd66a

diff --git a/helpcontent2/helpers/help_hid.lst 
b/helpcontent2/helpers/help_hid.lst
index 07eb0ba..e0968c4 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -8518,8 +8518,6 @@ svx_ListBox_RID_SVXDLG_BMPMASK_LB_2,3391950338,
 svx_ListBox_RID_SVXDLG_BMPMASK_LB_3,3391950339,
 svx_ListBox_RID_SVXDLG_BMPMASK_LB_4,3391950340,
 svx_ListBox_RID_SVXDLG_BMPMASK_LB_TRANS,3391950341,
-svx_ListBox_RID_SVXDLG_CHARMAP_LB_FONT,1237749260,
-svx_ListBox_RID_SVXDLG_CHARMAP_LB_SUBSET,1237749279,
 svx_ListBox_RID_SVXDLG_EDIT_MODULES_LB_EDIT_MODULES_LANGUAGE,1251200831,
 svx_ListBox_RID_SVXDLG_FONTWORK_CLB_SHADOW_COLOR,3386592769,
 svx_ListBox_RID_SVXDLG_GALLERY_THEMEID_LB_RESNAME,1243631105,
@@ -8960,7 +8958,6 @@ 
svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_REQUIRED,1368855060,
 svx_PushButton_RID_SVXDLG_ADD_INSTANCE_PB_FILEPICKER,1368953359,
 svx_PushButton_RID_SVXDLG_ADD_SUBMISSION_PB_SUBMIT_REF,1368920595,
 svx_PushButton_RID_SVXDLG_BMPMASK_BTN_EXEC,3391951361,
-svx_PushButton_RID_SVXDLG_CHARMAP_BTN_DELETE,1237750292,
 svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_BACK,1251201847,
 svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_DOWN,1251201846,
 svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_UP,1251201845,
diff --git a/helpcontent2/source/text/shared/01/0410.xhp 
b/helpcontent2/source/text/shared/01/0410.xhp
index 6de6f6a..077ac84 100644
--- a/helpcontent2/source/text/shared/01/0410.xhp
+++ b/helpcontent2/source/text/shared/01/0410.xhp
@@ -43,9 +43,8 @@
 /meta
 body
 bookmark xml-lang=en-US branch=hid/.uno:InsertSymbol id=bm_id1495830 
localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:InsertSymbol id=bm_id3153391 
localize=false/
-!-- removed HID SID_BULLET --
 bookmark xml-lang=en-US branch=hid/.uno:Bullet id=bm_id3146902 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/cui/ui/specialcharacters/SpecialCharactersDialog id=bm_id3146903 
localize=false/
 paragraph role=heading id=hd_id3152937 xml-lang=en-US level=1 
l10n=U oldref=1Special Character/paragraph
 paragraph role=paragraph id=par_id3150838 xml-lang=en-US l10n=CHG 
oldref=2variable id=sonderahelp hid=.uno:BulletInserts special 
characters from the installed fonts./ahelp
 /variable/paragraph
@@ -53,20 +52,20 @@
   embed href=text/shared/00/0404.xhp#sonder/
 /section
 paragraph role=paragraph id=par_id3152372 xml-lang=en-US l10n=U 
oldref=11When you click a character in the emphSpecial Characters 
/emphdialog, a preview and the corresponding numerical code for the character 
is displayed./paragraph
-bookmark xml-lang=en-US branch=hid/cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT 
id=bm_id3153910 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/specialcharacters/fontlb 
id=bm_id3153910 localize=false/
 paragraph role=heading id=hd_id3151315 xml-lang=en-US level=2 
l10n=U oldref=3Font/paragraph
-paragraph role=paragraph id=par_id3152924 xml-lang=en-US l10n=U 
oldref=4ahelp hid=SVX:LISTBOX:RID_SVXDLG_CHARMAP:LB_FONTSelect a font to 
display the special characters that are associated with it./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET id=bm_id3147292 
localize=false/
+paragraph role=paragraph id=par_id3152924 xml-lang=en-US l10n=U 
oldref=4ahelp hid=cui/ui/specialcharacters/fontlbSelect a font to 
display the special characters that are associated with it./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/specialcharacters/subsetlb 
id=bm_id3147292 localize=false/
 paragraph role=heading id=hd_id315 xml-lang=en-US level=2 
l10n=U oldref=19Subset/paragraph
-paragraph role=paragraph id=par_id3145090 xml-lang=en-US l10n=U 
oldref=20ahelp hid=SVX_LISTBOX_RID_SVXDLG_CHARMAP_LB_SUBSETSelect a 
Unicode category for the current font./ahelp The special characters for the 
selected Unicode category are displayed in the character table./paragraph
+paragraph role=paragraph id=par_id3145090 xml-lang=en-US l10n=U 
oldref=20ahelp hid=cui/ui/specialcharacters/subsetlbSelect a Unicode 
category for the current font./ahelp The special characters for the selected 
Unicode category are displayed in the character table./paragraph
 bookmark xml-lang=en-US branch=hid/CUI_HID_CHARMAP_CTL_SHOWSET 
id=bm_id3147576 localize=false/
 paragraph role=heading id=hd_id3145071 xml-lang=en-US level=2 
l10n=U oldref=5Character Table/paragraph
 paragraph role=paragraph id=par_id3154288 xml-lang=en-US l10n=U 
oldref=6ahelp hid=HID_CHARMAP_CTL_SHOWSETClick the special character(s) 
that you want 

Re: ww8export tinderbox failure ?

[Lubos Lunak]

On Wednesday 26 of September 2012, Miklos Vajna wrote:
 On Tue, Sep 25, 2012 at 12:16:25PM +0100, Caolán McNamara 
caol...@redhat.com wrote:
  The continual crash on the ww8 export on two of the Linux tinderboxes,
  what's up with that ? I think llunak mentioned he was able to reproduce
  it sometimes ?
 
  I guess reproducing the Gentoo env locally is probably impossible, but
  is there e.g. a virtualbox image available of the right OpenSUSE version
  that the failure can be seen on ?

 I'm almost sure it's a problem with a highly-paralellized build (i.e.
 some library or component files are always there when I build with -j4,
 but with more threads some missing dependency problem can be triggered).

 No. 
Plain 'make 
/local/home/tinderbox/master/workdir/unxlngx6.pro/CppunitTest/sw_subsequent_ww8export.test'
 
in sw/ randomly does or does not trigger the problem. The race condition is 
very likely in the execution.

 One thing that is special about those two tinderboxes is that they both have 
a relatively old gcc version, so I'd expect using any system with similarly 
old components might be useful for reproducing it.

 Getting a backtrace with symbols would indeed help, I guess.

 Didn't help me. IIRC the crash is because a component somewhere is not 
loaded, leading to a NULL pointer dereference later. And the component is not 
loaded, because the GUID read for it from some OLE stream is rubbish. I got 
rather lost at that point and gave up in the hope somebody else would fix it.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

widget layout status

[Caolán McNamara]

I've been fixing up the remaining pesky problems. e.g. re-doing the
printer dialog and sorting out the painfully opaque tab-through-controls
logic in the light of intermediate layout widgets and I'm fairly happy
with how things are shaping up.

So, here's a little documentation and some screenshots
https://wiki.documentfoundation.org/Development/WidgetLayout

I hope to merge into master either late this week or early next all
going well and incrementally extend/improve on master from then onwards.

C.

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

Re: ww8export tinderbox failure ?

[Caolán McNamara]

On Wed, 2012-09-26 at 17:30 +0200, Lubos Lunak wrote:
 On Wednesday 26 of September 2012, Miklos Vajna wrote:
  Getting a backtrace with symbols would indeed help, I guess.
 
  Didn't help me. IIRC the crash is because a component somewhere is not 
 loaded, leading to a NULL pointer dereference later. And the component is not 
 loaded, because the GUID read for it from some OLE stream is rubbish. I got 
 rather lost at that point and gave up in the hope somebody else would fix it.

And I presume 
VALGRIND=memcheck
make 
/local/home/tinderbox/master/workdir/unxlngx6.pro/CppunitTest/sw_subsequent_ww8export.test
didn't give any hints either ?

C.


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

Re: widget layout status

[Tomaž Vajngerl]

On Wed, Sep 26, 2012 at 5:42 PM, Caolán McNamara caol...@redhat.com wrote:
 I've been fixing up the remaining pesky problems. e.g. re-doing the
 printer dialog and sorting out the painfully opaque tab-through-controls
 logic in the light of intermediate layout widgets and I'm fairly happy
 with how things are shaping up.

 So, here's a little documentation and some screenshots
 https://wiki.documentfoundation.org/Development/WidgetLayout

 I hope to merge into master either late this week or early next all
 going well and incrementally extend/improve on master from then onwards.

 C.

Wow great! I am looking forward to try this out. Building dialogs now
is really not fun at all.

Re, Tomaž
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Regarding PDF Export

[Michael Meeks]

Hi Sagar,

On Wed, 2012-09-26 at 13:19 +0300, Sagar Srivastava wrote:
 Greetings of the day !!!

Greetings. It would really help to have a 'git diff' / patch to show
where you're at.

 mpaParent(  What value should be passed here, in order to access the
 following, as It crashes with 0  )
 {
mbIsPresentation = mpaParent-mbIsPresentation;

If you de-reference a null pointer (ie. 0) you'll get a segmentation
fault; that is as expected :-)

 Waiting for an immediate response.

It would prolly help if there was someone locally you could
pair-program with on this to get quicker turnarounds on questions; is
that possible ?

All the best,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

Re: widget layout status

[Michael Meeks]

Hi Caolan,

On Wed, 2012-09-26 at 16:42 +0100, Caolán McNamara wrote:
 I've been fixing up the remaining pesky problems. e.g. re-doing the
 printer dialog and sorting out the painfully opaque tab-through-controls
 logic in the light of intermediate layout widgets and I'm fairly happy
 with how things are shaping up.

Wow - looks like a beautiful solution :-)

 So, here's a little documentation and some screenshots
 https://wiki.documentfoundation.org/Development/WidgetLayout

I appreciate the goodness underneath; having said that - I think the UI
guys will prolly want to add a little more aesthetic padding in places
to the 'after' screenshots. Luckily they can do that themselves in
glade :-) 

 I hope to merge into master either late this week or early next all
 going well and incrementally extend/improve on master from then onwards.

Really great news ! and great to have some documentation on that.
Hopefully this provides a nice big source of easy-hacks to replace the
remove unused code task, which seems to be ~done ;-)

Nice work,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] .: 2 commits - i18npool/source instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_u

[Libreoffice Gerrit user]

 i18npool/source/isolang/langid.pl   |2 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt |2 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt  |2 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Error.idt|2 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/LaunchCo.idt |2 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |2 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/RadioBut.idt |2 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/UIText.idt   |2 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt |2 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt  |2 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Error.idt|2 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt |2 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt |2 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/RadioBut.idt |2 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/UIText.idt   |2 
 instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf   |   12 
 instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk   |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt  |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt   |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt  |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt  |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/UIText.idt|2 
 instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt   |2 
 instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt|2 
 instsetoo_native/inc_sdkoo/windows/msi_templates/Error.idt  |2 
 instsetoo_native/inc_sdkoo/windows/msi_templates/LaunchCo.idt   |2 
 instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt   |2 
 instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt   |2 
 instsetoo_native/inc_sdkoo/windows/msi_templates/UIText.idt |2 
 instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt |2 
 instsetoo_native/inc_ure/windows/msi_templates/Control.idt  |2 
 instsetoo_native/inc_ure/windows/msi_templates/Error.idt|2 
 instsetoo_native/inc_ure/windows/msi_templates/LaunchCo.idt |2 
 instsetoo_native/inc_ure/windows/msi_templates/Property.idt |2 
 instsetoo_native/inc_ure/windows/msi_templates/RadioBut.idt |2 
 instsetoo_native/inc_ure/windows/msi_templates/UIText.idt   |2 
 l10ntools/source/ulfconv/msi-encodinglist.txt   |  136 
+-
 setup_native/source/win32/customactions/sellang/sellang.cxx |2 
 solenv/bin/modules/installer.pm |   13 
 solenv/bin/modules/installer/control.pm |   32 --
 solenv/bin/modules/installer/globals.pm |3 
 solenv/bin/modules/installer/windows/idtglobal.pm   |   33 --
 solenv/bin/modules/installer/windows/language.pm|   23 -
 solenv/bin/modules/installer/windows/msiglobal.pm   |   98 
---
 46 files changed, 127 insertions(+), 298 deletions(-)

New commits:
commit 0475a7904978566dfb9f6e83497392b3841c0efc
Author: Andras Timar ati...@suse.com
Date:   Wed Sep 26 18:53:30 2012 +0200

use utf-8 instead of legacy code pages in all msi tables (related: 
fdo#39595)

Change-Id: Ib2dc00c024762800fdb74ffb376d92a8583d44ad

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt
index ec6ecdd..becf9cc 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt
@@ -1,6 +1,6 @@
 Action Description Template
 s72L0  L0
-WINDOWSENCODINGTEMPLATEActionText  Action
+65001  ActionText  Action
 Advertise  OOO_ACTIONTEXT_1
 AllocateRegistrySpace  OOO_ACTIONTEXT_2OOO_ACTIONTEXT_3
 AppSearch  OOO_ACTIONTEXT_4OOO_ACTIONTEXT_5
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index 495325e..55f1fcf 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -1,6 +1,6 @@
 Dialog_Control TypeX   Y   Width   Height  Attributes  
PropertyText  

[PATCH] Import shadow effect properties for shapes in docx.

[Eilidh McAdam (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/702

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/702/1

Import shadow effect properties for shapes in docx.

Change-Id: I0cfd6b45be268d688b7389c79c5e9ad7f48eb12d
---
M oox/Library_oox.mk
M oox/inc/oox/drawingml/drawingmltypes.hxx
A oox/inc/oox/drawingml/effectproperties.hxx
A oox/inc/oox/drawingml/effectpropertiescontext.hxx
M oox/inc/oox/drawingml/shape.hxx
M oox/inc/oox/drawingml/shapepropertymap.hxx
A oox/source/drawingml/effectproperties.cxx
A oox/source/drawingml/effectpropertiescontext.cxx
M oox/source/drawingml/shape.cxx
M oox/source/drawingml/shapepropertiescontext.cxx
M oox/source/token/properties.txt
11 files changed, 274 insertions(+), 0 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/702
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cfd6b45be268d688b7389c79c5e9ad7f48eb12d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eilidh McAdam eilidh.mca...@gmail.com

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

[PATCH] DOCX image drop shadow testcase.

[Eilidh McAdam (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/704

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/704/1

DOCX image drop shadow testcase.

Change-Id: I27fdf0abff997d31ae8814812f7af1ec15af
---
A sw/qa/extras/ooxmlimport/data/imgshadow.docx
M sw/qa/extras/ooxmlimport/ooxmlimport.cxx
2 files changed, 19 insertions(+), 1 deletion(-)


--
To view, visit https://gerrit.libreoffice.org/704
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27fdf0abff997d31ae8814812f7af1ec15af
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eilidh McAdam eilidh.mca...@gmail.com

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

[PATCH] Apply shadow effect to graphics when importing from docx.

[Eilidh McAdam (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/703

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/703/1

Apply shadow effect to graphics when importing from docx.

Graphical objects imported into a text document do not seem to support
differing X and Y distances for shadows, so the distance has been
approximated by using the average of the two components.

Change-Id: Ifd0c6d73b618cb2836837348d6f48c0efc0a9dc3
---
M writerfilter/source/dmapper/GraphicImport.cxx
M writerfilter/source/dmapper/PropertyIds.cxx
M writerfilter/source/dmapper/PropertyIds.hxx
3 files changed, 48 insertions(+), 0 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/703
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd0c6d73b618cb2836837348d6f48c0efc0a9dc3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eilidh McAdam eilidh.mca...@gmail.com

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

[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83fc0c59037fa743c3ebc58e784eef3d120ffc2e
Author: Michael Stahl mst...@redhat.com
Date:   Wed Sep 26 19:34:14 2012 +0200

solenv: revert more of 599a94827e2b3957db3abf758d48ff7b3977e2f2

... should hopefully un-break msvc build.

Change-Id: Iee6cc54dd488d124948d7a033811e25e2fc4044c

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index f23c478..3e375ba 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -461,7 +461,7 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
 gb_Library_FILENAMES :=\
-   $(foreach 
lib,$(gb_Library_KNOWNLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
+   $(foreach 
lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
 
 gb_Library_DLLEXT := .dll
 gb_Library_MAJORVER := 3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] LibreOffice 3.6.2 RC2 test builds available

[Fridrich Strba]

Hi *,

for the upcoming new version 3.6.2, the RC2 builds now start to be
available on pre-releases. This build is slated to be second release
candidate build on the way towards 3.6.2, please refer to our release
plan timings here:

 http://wiki.documentfoundation.org/ReleasePlan#3.6_release

Builds are now being uploaded to a public (but non-mirrored - so don't
spread news too widely!) place, as soon as they're available. Grab
them here:

 http://dev-builds.libreoffice.org/pre-releases/

If you've a bit of time, please give them a try  report *critical*
bugs not yet in bugzilla here, so we can incorporate them into the
release notes. Please note that it takes approximately 24 hours to
populate the mirrors, so that's about the time we have to collect
feedback.

The list of fixed bugs relative to 3.6.2 RC1 is here:

 
http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-6-2-release-3.6.2.2.log

So playing with the areas touched there also greatly appreciated - and
validation that those bugs are really fixed.

Thanks a lot for your help,

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

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/dociter.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 70412d0f3f7979d3d069be8121d49dbb96775cce
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Sep 26 20:01:20 2012 +0200

don't access out of bound array index, fdo#55022

Change-Id: Ica088822055b2fb5bbd6dabe6482b7cb6c472c48

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index d6d59ce..2d8808e 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -565,7 +565,11 @@ bool 
ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value rValue)
 
 SCROW nThisRow = ScDBQueryDataIterator::GetRowByColEntryIndex(*mpDoc, 
nTab, nCol, nColRow);
 while ( (nColRow  nCellCount)  (nThisRow  nRow) )
-nThisRow = ScDBQueryDataIterator::GetRowByColEntryIndex(*mpDoc, 
nTab, nCol, ++nColRow);
+{
+++nColRow;
+if(nColRow  nCellCount)
+nThisRow = 
ScDBQueryDataIterator::GetRowByColEntryIndex(*mpDoc, nTab, nCol, nColRow);
+}
 
 if ( nColRow  nCellCount  nThisRow = mpParam-nRow2 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[SOLVED] Re: Master failed to compile on scp2 module

[julien2412]

Just to say that after a git pull -r, it's compiling right now.
I don't know which commit fixed the problem but it's ok.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Master-failed-to-compile-on-scp2-module-tp4009273p4009440.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

Re: another version of the patches

[Kohei Yoshida]

On 09/26/2012 01:06 PM, Markus Mohrhard wrote:

Hey Kohei,

ok, so the patches this time a bit better. I cleaned all the
whitespace errors. There are no tabs anymore and the last patch
converts all line endings to unix line endings. Sadly it is only
possible to apply them with --ignore-whitespace because of the line
ending issues. I hope this is not a problem. The last patch finally
makes it all work but I tried to resolve all problems manually but it
seems to be nearly impossible because very change to the patches
creates another set of merge conflicts with the next patches.


So, this was meant to be send to me privately, but what the heck. ;-)

I've pushed all your patches to the gnumeric-import branch (on orcus).

Thanks a lot!

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: cui/source svx/inc svx/source

[Libreoffice Gerrit user]

 cui/source/inc/transfrm.hxx   |   10 ++
 cui/source/tabpages/transfrm.cxx  |   61 ++
 cui/source/tabpages/transfrm.hrc  |2 -
 cui/source/tabpages/transfrm.src  |   21 +
 svx/inc/svx/dialcontrol.hxx   |6 +++
 svx/source/dialog/dialcontrol.cxx |   12 +++
 6 files changed, 42 insertions(+), 70 deletions(-)

New commits:
commit 0cd97e8c33c49a6c44d26ba309493dbfec00eb8d
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Wed Sep 26 21:20:27 2012 +0200

Change the image rotation widget to better looking DialControl

Change-Id: Ie11827a924a5b22d86bad24aa7f14a66b870e90c

diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 0081d58..35196b1 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -29,6 +29,7 @@
 #define _SVX_TRANSFRM_HXX
 
 #include svx/dlgctrl.hxx
+#include svx/dialcontrol.hxx
 
 #include vcl/fixed.hxx
 
@@ -205,9 +206,9 @@ private:
 
 FixedLine   aFlAngle;
 FixedText   aFtAngle;
-MetricField aMtrAngle;
+NumericFieldmaNfAngle;
 FixedText   aFtAnglePresets;
-SvxRectCtl  aCtlAngle;
+svx::DialControlaCtlAngle;
 
 const SfxItemSet   rOutAttrs;
 const SdrView*  pView;
@@ -218,10 +219,7 @@ private:
 
 SfxMapUnit  ePoolUnit;
 FieldUnit   eDlgUnit;
-//
-#if _SOLAR__PRIVATE
-DECL_LINK( ModifiedHdl, void * );
-#endif
+
 public:
  SvxAngleTabPage( Window* pParent, const SfxItemSet rInAttrs  );
 
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 57daf10..54d32d8 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -228,10 +228,9 @@ SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const 
SfxItemSet rInAttrs  )
 
 aFlAngle( this, CUI_RES( FL_ANGLE ) ),
 aFtAngle( this, CUI_RES( FT_ANGLE ) ),
-aMtrAngle   ( this, CUI_RES( MTR_FLD_ANGLE ) ),
+maNfAngle   ( this, CUI_RES( NF_ANGLE ) ),
 aFtAnglePresets ( this, CUI_RES(FT_ANGLEPRESETS) ),
-aCtlAngle   ( this, CUI_RES( CTL_ANGLE ),
-RP_RB, 200, 80, CS_ANGLE ),
+aCtlAngle   ( this, CUI_RES( CTL_ANGLE ) ),
 rOutAttrs   ( rInAttrs )
 {
 FreeResource();
@@ -241,12 +240,11 @@ SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const 
SfxItemSet rInAttrs  )
 DBG_ASSERT( pPool, no pool (!) );
 ePoolUnit = pPool-GetMetric(SID_ATTR_TRANSFORM_POS_X);
 
-aMtrAngle.SetModifyHdl(LINK( this, SvxAngleTabPage, ModifiedHdl));
-
 aCtlRect.SetAccessibleRelationLabeledBy(aFtPosPresets);
 aCtlRect.SetAccessibleRelationMemberOf(aFlPosition);
 aCtlAngle.SetAccessibleRelationLabeledBy(aFtAnglePresets);
 aCtlAngle.SetAccessibleRelationMemberOf(aFlAngle);
+aCtlAngle.SetLinkedField( maNfAngle );
 }
 
 // ---
@@ -303,29 +301,27 @@ void SvxAngleTabPage::Construct()
 aCtlRect.Disable();
 aFlAngle.Disable();
 aFtAngle.Disable();
-aMtrAngle.Disable();
+maNfAngle.Disable();
 aFtAnglePresets.Disable();
 aCtlAngle.Disable();
 }
 }
 
-// ---
-
 sal_Bool SvxAngleTabPage::FillItemSet(SfxItemSet rSet)
 {
 sal_Bool bModified = sal_False;
 
-if(aMtrAngle.IsValueModified() || aMtrPosX.IsValueModified() || 
aMtrPosY.IsValueModified())
+if(aCtlAngle.IsValueModified() || aMtrPosX.IsValueModified() || 
aMtrPosY.IsValueModified())
 {
 const double fUIScale(double(pView-GetModel()-GetUIScale()));
 const double fTmpX((GetCoreValue(aMtrPosX, ePoolUnit) + 
maAnchor.getX()) * fUIScale);
 const double fTmpY((GetCoreValue(aMtrPosY, ePoolUnit) + 
maAnchor.getY()) * fUIScale);
 
-rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ANGLE), 
static_castsal_Int32(aMtrAngle.GetValue(;
+rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ANGLE), 
aCtlAngle.GetRotation()));
 rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_X), 
basegfx::fround(fTmpX)));
 rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_Y), 
basegfx::fround(fTmpY)));
 
-bModified |= sal_True;
+bModified = sal_True;
 }
 
 return bModified;
@@ -362,15 +358,13 @@ void SvxAngleTabPage::Reset(const SfxItemSet rAttrs)
 pItem = GetItem( rAttrs, SID_ATTR_TRANSFORM_ANGLE );
 if(pItem)
 {
-aMtrAngle.SetValue(((const SfxInt32Item*)pItem)-GetValue());
+aCtlAngle.SetRotation(((const SfxInt32Item*)pItem)-GetValue());
 }
 else
 {
-aMtrAngle.SetText( String() );
+aCtlAngle.SetRotation(0);
 }
-
-aMtrAngle.SaveValue();
-ModifiedHdl(this);
+

[Libreoffice-commits] .: oox/inc oox/Library_oox.mk oox/source

[Libreoffice Gerrit user]

 oox/Library_oox.mk|2 
 oox/inc/oox/drawingml/drawingmltypes.hxx  |3 +
 oox/inc/oox/drawingml/effectproperties.hxx|   53 +++
 oox/inc/oox/drawingml/effectpropertiescontext.hxx |   41 +++
 oox/inc/oox/drawingml/shape.hxx   |3 +
 oox/inc/oox/drawingml/shapepropertymap.hxx|1 
 oox/source/drawingml/effectproperties.cxx |   59 ++
 oox/source/drawingml/effectpropertiescontext.cxx  |   56 
 oox/source/drawingml/shape.cxx|9 +++
 oox/source/drawingml/shapepropertiescontext.cxx   |2 
 oox/source/token/properties.txt   |5 +
 11 files changed, 234 insertions(+)

New commits:
commit f0efecfb69b336e064e7c8dd2597655eff07944f
Author: Eilidh McAdam eil...@lanedo.com
Date:   Wed Sep 26 12:22:17 2012 +0100

Import shadow effect properties for shapes in docx.

Change-Id: I0cfd6b45be268d688b7389c79c5e9ad7f48eb12d
Reviewed-on: https://gerrit.libreoffice.org/702
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index dee336a..7c70c18 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -147,6 +147,8 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
 oox/source/drawingml/diagram/diagramlayoutatoms \
 oox/source/drawingml/diagram/layoutnodecontext \
 oox/source/drawingml/drawingmltypes \
+oox/source/drawingml/effectproperties \
+oox/source/drawingml/effectpropertiescontext \
 oox/source/drawingml/embeddedwavaudiofile \
 oox/source/drawingml/fillproperties \
 oox/source/drawingml/fillpropertiesgroupcontext \
diff --git a/oox/inc/oox/drawingml/drawingmltypes.hxx 
b/oox/inc/oox/drawingml/drawingmltypes.hxx
index c257e9f..d7e0ac6 100644
--- a/oox/inc/oox/drawingml/drawingmltypes.hxx
+++ b/oox/inc/oox/drawingml/drawingmltypes.hxx
@@ -60,6 +60,9 @@ typedef ::boost::shared_ptr TextCharacterProperties  
TextCharacterPropertiesPt
 struct TextBodyProperties;
 typedef ::boost::shared_ptr TextBodyProperties  TextBodyPropertiesPtr;
 
+struct EffectProperties;
+typedef ::boost::shared_ptr EffectProperties  EffectPropertiesPtr;
+
 class TextBody;
 typedef ::boost::shared_ptr TextBody  TextBodyPtr;
 
diff --git a/oox/inc/oox/drawingml/effectproperties.hxx 
b/oox/inc/oox/drawingml/effectproperties.hxx
new file mode 100644
index 000..55c5ec3
--- /dev/null
+++ b/oox/inc/oox/drawingml/effectproperties.hxx
@@ -0,0 +1,53 @@
+/* -*- 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 OOX_DRAWINGML_EFFECTPROPERTIES_HXX
+#define OOX_DRAWINGML_EFFECTPROPERTIES_HXX
+
+#include oox/drawingml/fillproperties.hxx
+
+namespace oox {
+namespace drawingml {
+
+// 
+
+struct EffectShadowProperties
+{
+OptValue sal_Int64  moShadowDist;
+OptValue sal_Int64  moShadowDir;
+OptValue sal_Int64  moShadowAlpha;
+Color moShadowColor;
+
+/** Overwrites all members that are explicitly set in rSourceProps. */
+voidassignUsed( const EffectShadowProperties rSourceProps 
);
+};
+
+// 
+
+struct OOX_DLLPUBLIC EffectProperties
+{
+EffectShadowProperties maShadow;
+
+/** Overwrites all members that are explicitly set in rSourceProps. */
+voidassignUsed( const EffectProperties rSourceProps );
+
+/** Writes the properties to the passed property map. */
+voidpushToPropMap(
+PropertyMap rPropMap,
+const GraphicHelper rGraphicHelper ) const;
+};
+
+// 
+
+} // namespace drawingml
+} // namespace oox
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/inc/oox/drawingml/effectpropertiescontext.hxx 
b/oox/inc/oox/drawingml/effectpropertiescontext.hxx
new file mode 100644
index 000..cd5e2eb
--- /dev/null
+++ b/oox/inc/oox/drawingml/effectpropertiescontext.hxx
@@ -0,0 +1,41 @@
+/* -*- 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 OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
+#define OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
+

[Libreoffice-commits] .: writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/GraphicImport.cxx |   46 ++
 writerfilter/source/dmapper/PropertyIds.cxx   |1 
 writerfilter/source/dmapper/PropertyIds.hxx   |1 
 3 files changed, 48 insertions(+)

New commits:
commit e1a509f4a362d21248b439c99e3b55f4fa9ba1bd
Author: Eilidh McAdam eil...@lanedo.com
Date:   Wed Sep 26 12:36:08 2012 +0100

Apply shadow effect to graphics when importing from docx.

Graphical objects imported into a text document do not seem to support
differing X and Y distances for shadows, so the distance has been
approximated by using the average of the two components.

Change-Id: Ifd0c6d73b618cb2836837348d6f48c0efc0a9dc3
Reviewed-on: https://gerrit.libreoffice.org/703
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 48cdf6c..cbd59f9 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -38,6 +38,7 @@
 #include com/sun/star/text/WrapTextMode.hpp
 #include com/sun/star/text/XTextContent.hpp
 #include com/sun/star/uno/XComponentContext.hpp
+#include com/sun/star/table/ShadowFormat.hpp
 
 #include cppuhelper/implbase1.hxx
 #include rtl/ustrbuf.hxx
@@ -220,6 +221,12 @@ public:
 sal_Int32 nTopMargin;
 sal_Int32 nBottomMargin;
 
+bool bShadow;
+sal_Int32 nShadowXDistance;
+sal_Int32 nShadowYDistance;
+sal_Int32 nShadowColor;
+sal_Int32 nShadowTransparence;
+
 sal_Int32 nContrast;
 sal_Int32 nBrightness;
 doublefGamma;
@@ -892,6 +899,15 @@ void GraphicImport::lcl_attribute(Id nName, Value  val)
 aMediaProperties[0].Name = URL;
 aMediaProperties[0].Value = sUrl;
 
+xShapeProps-getPropertyValue(Shadow) = 
m_pImpl-bShadow;
+if (m_pImpl-bShadow)
+{
+xShapeProps-getPropertyValue(ShadowXDistance) 
= m_pImpl-nShadowXDistance;
+xShapeProps-getPropertyValue(ShadowYDistance) 
= m_pImpl-nShadowYDistance;
+xShapeProps-getPropertyValue(ShadowColor) = 
m_pImpl-nShadowColor;
+
xShapeProps-getPropertyValue(ShadowTransparence) = 
m_pImpl-nShadowTransparence;
+}
+
 m_xGraphicObject = createGraphicObject( 
aMediaProperties );
 
 bUseShape = !m_xGraphicObject.is( );
@@ -1310,6 +1326,36 @@ uno::Reference text::XTextContent  
GraphicImport::createGraphicObject( const b
 
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
aBorderProps[nBorder]), uno::makeAny(aBorderLine));
 }
 
+// setting graphic object shadow proerties
+if (m_pImpl-bShadow)
+{
+// Shadow width is approximated by average of X and Y
+table::ShadowFormat aShadow;
+sal_Int32 nShadowColor = m_pImpl-nShadowColor;
+sal_Int32 nShadowWidth = (abs(m_pImpl-nShadowXDistance)
+  + abs(m_pImpl-nShadowYDistance)) / 
2;
+
+aShadow.ShadowWidth = nShadowWidth;
+aShadow.Color = nShadowColor;
+// Distances -ve for top and right, +ve for bottom and left
+if (m_pImpl-nShadowXDistance  0)
+{
+if (m_pImpl-nShadowYDistance  0)
+aShadow.Location = 
com::sun::star::table::ShadowLocation_BOTTOM_RIGHT;
+else
+aShadow.Location = 
com::sun::star::table::ShadowLocation_TOP_RIGHT;
+}
+else
+{
+if (m_pImpl-nShadowYDistance  0)
+aShadow.Location = 
com::sun::star::table::ShadowLocation_BOTTOM_LEFT;
+else
+aShadow.Location = 
com::sun::star::table::ShadowLocation_TOP_LEFT;
+}
+
+
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName(PROP_SHADOW_FORMAT),
 uno::makeAny(aShadow));
+}
+
 // setting properties for all types
 
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_DESCRIPTION ),
 uno::makeAny( m_pImpl-sAlternativeText ));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index f6e6f69..1fbf3d1 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -319,6 +319,7 @@ const OUString PropertyNameSupplier::GetName( PropertyIds 
eId ) const
 case PROP_Z_ORDER: sName = ZOrder; break;
 case PROP_EMBED_FONTS: sName = EmbedFonts; break;
 

[Libreoffice-commits] .: sw/qa

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlimport/data/imgshadow.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   20 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 63a7550931c88ce06e4ab6f258121061c1f2dcf2
Author: Eilidh McAdam eil...@lanedo.com
Date:   Wed Sep 26 18:07:31 2012 +0100

DOCX image drop shadow testcase.

Change-Id: I27fdf0abff997d31ae8814812f7af1ec15af
Reviewed-on: https://gerrit.libreoffice.org/704
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/sw/qa/extras/ooxmlimport/data/imgshadow.docx 
b/sw/qa/extras/ooxmlimport/data/imgshadow.docx
new file mode 100644
index 000..efe0e95
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/imgshadow.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index fa388f3..92452dd 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -46,7 +46,7 @@
 #include com/sun/star/text/XTextFramesSupplier.hpp
 #include com/sun/star/text/XTextViewCursorSupplier.hpp
 #include com/sun/star/style/ParagraphAdjust.hpp
-
+#include com/sun/star/table/ShadowFormat.hpp
 
 #include vcl/svapp.hxx
 
@@ -93,6 +93,7 @@ public:
 void testN780563();
 void testN780853();
 void testN780843();
+void testShadow();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -134,6 +135,7 @@ public:
 CPPUNIT_TEST(testN780563);
 CPPUNIT_TEST(testN780853);
 CPPUNIT_TEST(testN780843);
+CPPUNIT_TEST(testShadow);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -943,6 +945,22 @@ void Test::testN780843()
 CPPUNIT_ASSERT_EQUAL(OUString(shown footer), xFooter-getString());
 }
 
+void Test::testShadow()
+{
+/*
+ * The problem was that drop shadows on inline images were not being
+ * imported and applied.
+ */
+load(imgshadow.docx);
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xPropertySet(xDraws-getByIndex(1), 
uno::UNO_QUERY);
+
+table::ShadowFormat aShadow;
+xPropertySet-getPropertyValue(ShadowFormat) = aShadow;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(273), sal_Int32(aShadow.ShadowWidth));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: widget layout status

[Caolán McNamara]

On Wed, 2012-09-26 at 17:47 +0100, Michael Meeks wrote:
 Hi Caolan,
   I appreciate the goodness underneath; having said that - I think the UI
 guys will prolly want to add a little more aesthetic padding in places
 to the 'after' screenshots. Luckily they can do that themselves in
 glade :-) 

Yeah, they're a little un-beautiful. But all can be mended with glade.
Hopefully ux can come up with a few guidelines and windows/macosx/kde
folk can fill in suitable themeable bits that set default padding, stock
button ordering, yadda yadda.

 Hopefully this provides a nice big source of easy-hacks to replace the
 remove unused code task, which seems to be ~done ;-)

And a small pile of glade easy-hacks too.

C.

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

[PUSHED] Apply shadow effect to graphics when importing from docx.

[Noel Power (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/703

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/703
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd0c6d73b618cb2836837348d6f48c0efc0a9dc3
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eilidh McAdam eilidh.mca...@gmail.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[PUSHED] DOCX image drop shadow testcase.

[Noel Power (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/704

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/704
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I27fdf0abff997d31ae8814812f7af1ec15af
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eilidh McAdam eilidh.mca...@gmail.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[PUSHED] Import shadow effect properties for shapes in docx.

[Noel Power (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/702

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/702
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0cfd6b45be268d688b7389c79c5e9ad7f48eb12d
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eilidh McAdam eilidh.mca...@gmail.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[Libreoffice-commits] .: accessibility/inc accessibility/source

[Libreoffice Gerrit user]

 accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx |   22 -
 accessibility/inc/accessibility/helper/listboxhelper.hxx   |   24 
+-
 accessibility/source/standard/vclxaccessiblelist.cxx   |4 -
 3 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit 106a1b4eba1303e1d989eb67eff63ed864500578
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Wed Sep 26 13:21:38 2012 -0300

sal_Bool to bool conversion in accessibility

Change-Id: I79967eea535dc4bd11e725dc854ae8a8f97a2905
Reviewed-on: https://gerrit.libreoffice.org/701
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx 
b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
index ce2338d..c4d3219 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -51,21 +51,21 @@ namespace accessibility
 virtual Rectangle   GetDropDownPosSizePixel( ) const = 0;
 virtual Rectangle   GetBoundingRectangle( sal_uInt16 nItem ) const 
= 0;
 virtual Rectangle   GetWindowExtentsRelative( Window* 
pRelativeWindow ) = 0;
-virtual sal_BoolIsActive() const = 0;
-virtual sal_BoolIsEntryVisible( sal_uInt16 nPos ) const = 
0;
-virtual sal_uInt16  GetDisplayLineCount() const = 0;
+virtual boolIsActive() const = 0;
+virtual boolIsEntryVisible( sal_uInt16 nPos ) const = 0;
+virtual sal_uInt16  GetDisplayLineCount() const = 0;
 virtual voidGetMaxVisColumnsAndLines( sal_uInt16 rnCols, 
sal_uInt16 rnLines ) const = 0;
 virtual WinBits GetStyle() const = 0;
-virtual sal_BoolIsMultiSelectionEnabled() const = 0;
-virtual sal_uInt16  GetTopEntry() const = 0;
-virtual sal_BoolIsEntryPosSelected( sal_uInt16 nPos ) 
const = 0;
-virtual sal_uInt16  GetEntryCount() const = 0;
+virtual boolIsMultiSelectionEnabled() const = 0;
+virtual sal_uInt16  GetTopEntry() const = 0;
+virtual boolIsEntryPosSelected( sal_uInt16 nPos ) const = 
0;
+virtual sal_uInt16  GetEntryCount() const = 0;
 virtual voidSelect() = 0;
-virtual voidSelectEntryPos( sal_uInt16 nPos, sal_Bool 
bSelect = sal_True ) = 0;
-virtual sal_uInt16  GetSelectEntryCount() const = 0;
+virtual voidSelectEntryPos( sal_uInt16 nPos, bool bSelect 
= sal_True ) = 0;
+virtual sal_uInt16  GetSelectEntryCount() const = 0;
 virtual voidSetNoSelection() = 0;
-virtual sal_uInt16  GetSelectEntryPos( sal_uInt16 nSelIndex = 
0 ) const = 0;
-virtual sal_BoolIsInDropDown() const = 0;
+virtual sal_uInt16  GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) 
const = 0;
+virtual boolIsInDropDown() const = 0;
 virtual Rectangle   GetEntryCharacterBounds( const sal_Int32 
_nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
 virtual longGetIndexForPoint( const Point rPoint, 
sal_uInt16 nPos ) const = 0;
 virtual ::com::sun::star::uno::Reference 
::com::sun::star::datatransfer::clipboard::XClipboard 
diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx 
b/accessibility/inc/accessibility/helper/listboxhelper.hxx
index c807883..2c45f96 100644
--- a/accessibility/inc/accessibility/helper/listboxhelper.hxx
+++ b/accessibility/inc/accessibility/helper/listboxhelper.hxx
@@ -81,19 +81,19 @@ public:
 return m_aComboListBox.GetWindowExtentsRelative( pRelativeWindow );
 }
 // 
-
-virtual sal_BoolIsActive() const
+virtual boolIsActive() const
 {
 return m_aComboListBox.IsActive();
 }
 // 
-
-virtual sal_BoolIsEntryVisible( sal_uInt16 nPos ) const
+virtual boolIsEntryVisible( sal_uInt16 nPos ) const
 {
 sal_uInt16 nTopEntry = m_aComboListBox.GetTopEntry();
 sal_uInt16 nLines = m_aComboListBox.GetDisplayLineCount();
 return ( nPos = nTopEntry  nPos  ( nTopEntry + nLines ) );
 }
 // 
-
-virtual sal_uInt16  GetDisplayLineCount() const
+virtual sal_uInt16  GetDisplayLineCount() const
 {
 return m_aComboListBox.GetDisplayLineCount();
 }
@@ -108,37 +108,37 @@ public:
 return m_aComboListBox.GetStyle();
 }
 // 

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/scripts desktop/source desktop/unx vcl/inc

[Libreoffice Gerrit user]

 desktop/scripts/soffice.sh |   16 -
 desktop/source/app/app.cxx |   35 ++-
 desktop/source/app/cmdlineargs.cxx |   18 -
 desktop/source/app/cmdlineargs.hxx |6 
 desktop/source/app/cmdlinehelp.cxx |7 
 desktop/source/app/cmdlinehelp.hxx |2 
 desktop/source/app/officeipcthread.cxx |  329 -
 desktop/source/app/sofficemain.cxx |   15 -
 desktop/unx/source/args.c  |   39 ++-
 desktop/unx/source/args.h  |1 
 desktop/unx/source/start.c |   26 +-
 vcl/inc/vcl/svapp.hxx  |6 
 12 files changed, 256 insertions(+), 244 deletions(-)

New commits:
commit 81a441c695f01bb67fcf41120d5843660d7531fc
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Sep 25 10:15:15 2012 +0200

Clean up option processing

* Support --version on non-UNX, too.

* Consistently show the first unknown option and the help blob in the 
presence
  of any unknown options.

* There is no need to tunnel --help/--version past oosplash in the soffice
  script, as oosplash is prepared to treat them adequately (esp. not pass 
them
  over any pipe); this only added unnecessary variance to what spellings 
exactly
  are supported and how mixtures of --help, --version, and unknown options 
are
  handled.

(cherry picked from commit f4a4ba9ac1b58b4726825400e1edd1bf47d4080a)

Change-Id: I617f2e727e2f0eafd34a2de3b85d441c6783ec4f
Reviewed-on: https://gerrit.libreoffice.org/700
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 97a2be9..f35bebb 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -158,21 +158,5 @@ if [ -n $VALGRINDCHECK -a -z $VALGRIND ] ; then
 exec valgrind.log
 fi
 
-# do not pass the request for command line help to oosplash
-for arg in $@ ; do
-case $arg in
--h | --h | --he | --hel | --help)
-$sd_prog/soffice.bin --help
-exit 0
-;;
--V | --v | --ve | --ver | --vers | --versi | --versio | --version)
-$sd_prog/soffice.bin --version
-exit 0
-;;
-*)
-;;
-esac
-done
-
 # oosplash does the rest: forcing pages in, javaldx etc. are
 exec $VALGRINDCHECK $STRACECHECK $sd_prog/oosplash $@
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a5177dd..001eac7 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -626,7 +626,8 @@ void Desktop::Init()
 // 2nd office startup should terminate after sending cmdlineargs 
through pipe
 SetBootstrapStatus(BS_TERMINATE);
 }
-else if ( rCmdLineArgs.IsHelp() )
+else if ( !rCmdLineArgs.GetUnknown().isEmpty()
+  || rCmdLineArgs.IsHelp() || rCmdLineArgs.IsVersion() )
 {
 // disable IPC thread in an instance that is just showing a help 
message
 OfficeIPCThread::DisableOfficeIPCThread();
@@ -1396,6 +1397,22 @@ int Desktop::Main()
 new DesktopContext( com::sun::star::uno::getCurrentContext() ) );
 
 CommandLineArgs rCmdLineArgs = GetCommandLineArgs();
+OUString aUnknown( rCmdLineArgs.GetUnknown() );
+if ( !aUnknown.isEmpty() )
+{
+displayCmdlineHelp( aUnknown );
+return EXIT_FAILURE;
+}
+if ( rCmdLineArgs.IsHelp() )
+{
+displayCmdlineHelp( OUString() );
+return EXIT_SUCCESS;
+}
+if ( rCmdLineArgs.IsVersion() )
+{
+displayVersion();
+return EXIT_SUCCESS;
+}
 
 // setup configuration error handling
 ConfigurationErrorHandler aConfigErrHandler;
@@ -1439,14 +1456,6 @@ int Desktop::Main()
 
 SetSplashScreenProgress(25);
 
-#ifndef UNX
-if ( rCmdLineArgs.IsHelp() )
-{
-displayCmdlineHelp();
-return EXIT_SUCCESS;
-}
-#endif
-
 // check user installation directory for lockfile so we can be sure
 // there is no other instance using our data files from a remote host
 RTL_LOGFILE_CONTEXT_TRACE( aLog, desktop (lo119109) Desktop::Main - 
Lockfile );
@@ -2709,10 +2718,10 @@ void Desktop::HandleAppEvent( const ApplicationEvent 
rAppEvent )
 }
 break;
 case ApplicationEvent::TYPE_HELP:
-#ifndef UNX
-// in non unix version allow showing of cmdline help window
-displayCmdlineHelp();
-#endif
+displayCmdlineHelp(rAppEvent.GetData());
+break;
+case ApplicationEvent::TYPE_VERSION:
+displayVersion();
 break;
 case ApplicationEvent::TYPE_OPEN:
 {
diff --git a/desktop/source/app/cmdlineargs.cxx 
b/desktop/source/app/cmdlineargs.cxx
index 473dfd6..51bdad0 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -287,26 +287,25 @@ 

[PUSHED] sal_Bool to bool conversion in accessibility

[Noel Power (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/701

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/701
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I79967eea535dc4bd11e725dc854ae8a8f97a2905
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[PUSHED] Change in core[libreoffice-3-6]: Clean up option processing

[Noel Power (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/700

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/700
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I617f2e727e2f0eafd34a2de3b85d441c6783ec4f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/printdata.hxx  |2 +-
 sw/inc/unotxdoc.hxx   |5 +++--
 sw/source/core/view/printdata.cxx |5 +
 sw/source/ui/uno/unotxdoc.cxx |   26 ++
 4 files changed, 27 insertions(+), 11 deletions(-)

New commits:
commit 47014647eced4864e149b923b7eb024418e71782
Author: Michael Stahl mst...@redhat.com
Date:   Wed Sep 26 12:43:29 2012 +0200

rhbz#827695: sw: prevent crashes after incomplete print:

If the last page is not printed for whatever reason, then
SwXTextDocument's destructor will delete a SwViewOptionAdjust_Impl,
which accesses the document's ViewShell, which has already been
deleted at that point.  Add a horrible kludge to not crash for now.

Change-Id: I67fe37970d60782030b84f2ba1e66ef3f9c6
(cherry picked from commit d53e12c7a9c2d0a3b487303673c1fafd09f6593c)
Reviewed-on: https://gerrit.libreoffice.org/699
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 02d56b8..a64ece9 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -42,7 +42,6 @@
 
 class SwDoc;
 class SwDocShell;
-class ViewShell;
 class _SetGetExpFlds;
 class SwViewOption;
 class OutputDevice;
@@ -278,6 +277,7 @@ public:
 void ViewOptionAdjustStart( ViewShell rSh, const SwViewOption 
rViewOptions);
 void ViewOptionAdjust( SwPrintData const* const pPrtOptions );
 void ViewOptionAdjustStop();
+void ViewOptionAdjustCrashPreventionKludge();
 
 bool HasSwPrtOptions() const{ return m_pPrtOptions != 0; }
 SwPrintData const*  GetSwPrtOptions() const { return m_pPrtOptions.get(); }
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 9d94f18..63004fb 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -586,7 +586,7 @@ public:
   ---*/
 class SwViewOptionAdjust_Impl
 {
-ViewShell m_rShell;
+ViewShell * m_pShell;
 SwViewOptionm_aOldViewOptions;
 
 public:
@@ -594,7 +594,8 @@ public:
 ~SwViewOptionAdjust_Impl();
 void AdjustViewOptions( SwPrintData const* const pPrtOptions );
 bool checkShell( const ViewShell rCompare ) const
-{ return rCompare == m_rShell; }
+{ return rCompare == m_pShell; }
+void DontTouchThatViewShellItSmellsFunny() { m_pShell = 0; }
 };
 
 
diff --git a/sw/source/core/view/printdata.cxx 
b/sw/source/core/view/printdata.cxx
index 4e6d37f..9988855 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -131,6 +131,11 @@ void SwRenderData::ViewOptionAdjustStop()
 m_pViewOptionAdjust.reset();
 }
 
+void SwRenderData::ViewOptionAdjustCrashPreventionKludge()
+{
+m_pViewOptionAdjust-DontTouchThatViewShellItSmellsFunny();
+}
+
 
 void SwRenderData::MakeSwPrtOptions(
 SwDocShell const*const pDocShell,
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 43c1672..69e524d 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -404,6 +404,13 @@ SwXTextDocument::~SwXTextDocument()
 xNumFmtAgg = 0;
 }
 delete m_pPrintUIOptions;
+if (m_pRenderData  m_pRenderData-IsViewOptionAdjust())
+{   // rhbz#827695: this can happen if the last page is not printed
+// the ViewShell has been deleted already by SwView::~SwView
+// FIXME: replace this awful implementation of XRenderable with
+// something less insane that has its own view
+m_pRenderData-ViewOptionAdjustCrashPreventionKludge();
+}
 delete m_pRenderData;
 }
 
@@ -3856,14 +3863,17 @@ void SwXDocumentPropertyHelper::onChange()
 
 SwViewOptionAdjust_Impl::SwViewOptionAdjust_Impl(
 ViewShell rSh, const SwViewOption rViewOptions)
-: m_rShell( rSh )
+: m_pShell(rSh)
 , m_aOldViewOptions( rViewOptions )
 {
 }
 
 SwViewOptionAdjust_Impl::~SwViewOptionAdjust_Impl()
 {
-m_rShell.ApplyViewOptions( m_aOldViewOptions );
+if (m_pShell)
+{
+m_pShell-ApplyViewOptions( m_aOldViewOptions );
+}
 }
 
 void
@@ -3871,14 +3881,14 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData 
const*const pPrtOptions)
 {
 // to avoid unnecessary reformatting the view options related to the 
content
 // below should only change if necessary, that is if respective content is 
present
-const bool bContainsHiddenChars = 
m_rShell.GetDoc()-ContainsHiddenChars();
-const SwFieldType* pFldType = m_rShell.GetDoc()-GetSysFldType( 
RES_HIDDENTXTFLD );
+const bool bContainsHiddenChars = 
m_pShell-GetDoc()-ContainsHiddenChars();
+const SwFieldType* pFldType = m_pShell-GetDoc()-GetSysFldType( 
RES_HIDDENTXTFLD );
 const bool bContainsHiddenFields= pFldType  
pFldType-GetDepends();
-pFldType = m_rShell.GetDoc()-GetSysFldType( RES_HIDDENPARAFLD );
+pFldType = m_pShell-GetDoc()-GetSysFldType( 

[PUSHED] Change in core[libreoffice-3-6]: rhbz#827695: sw: prevent crashes after incomplete print:

[Noel Power (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/699

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/699
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I67fe37970d60782030b84f2ba1e66ef3f9c6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - 2 commits - configure.in officecfg/registry sc/inc sc/sdi sc/source sc/uiconfig svx/inc svx/sdi

[Libreoffice Gerrit user]

 configure.in  |2 
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |5 
 sc/inc/sc.hrc |   10 
 sc/inc/sccommands.h   |1 
 sc/sdi/cellsh.sdi |1 
 sc/sdi/scalc.sdi  |  145 
+-
 sc/source/ui/view/cellsh2.cxx |3 
 sc/uiconfig/scalc/menubar/menubar.xml |2 
 svx/inc/svx/svxids.hrc|   16 -
 svx/sdi/svx.sdi   |  125 

 10 files changed, 167 insertions(+), 143 deletions(-)

New commits:
commit 961b3988ee1249f76f0eebfa6222f44bf1ec8beb
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Sep 26 16:11:52 2012 -0400

Add new slot ID for 'Manage XML Source' menu entry.

Plus unwind the mess of slot ID collision between sc and svx.

Change-Id: Iad236e50f58160d85c997d6f8f6dfce405fd82bb

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index e6767b7..a9fbf92 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1194,6 +1194,11 @@
 value xml:lang=en-USSelect ~Range.../value
 /prop
 /node
+node oor:name=.uno:ManageXMLSource oor:op=replace
+prop oor:name=Label oor:type=xs:string
+value xml:lang=en-USManage ~XML Source.../value
+/prop
+/node
 node oor:name=.uno:DataSort oor:op=replace
 prop oor:name=Label oor:type=xs:string
 value xml:lang=en-US~Sort.../value
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index b5e6b8a..0dcb1fe 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -238,6 +238,7 @@
 #define SC_HINT_SHOWRANGEFINDER (SC_MESSAGE_START + 34)
 #define SC_HINT_DOC_SAVED   (SC_MESSAGE_START + 35)
 #define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36)
+#define SID_ENTER_STRING(SC_MESSAGE_START + 37)
 
 // messages for opening dialogs:
 #define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50)
@@ -360,6 +361,7 @@
 #define SID_AUTO_FILTER (DATA_MENU_START + 5)
 #define SID_UNFILTER(DATA_MENU_START + 6)
 #define SID_QUERY   (DATA_MENU_START + 7)
+#define SID_MANAGE_XML_SOURCE   (DATA_MENU_START + 8)
 #define SID_SUBTOTALS   (DATA_MENU_START + 13)
 #define SID_AUTO_OUTLINE(DATA_MENU_START + 14)
 #define SID_IMPORT_DATA (DATA_MENU_START + 15)
@@ -369,13 +371,15 @@
 #define SID_TEXT_TO_COLUMNS (DATA_MENU_START + 19)
 #define SID_CONSOLIDATE (DATA_MENU_START + 20)
 #define SID_AUTOFILTER_HIDE (DATA_MENU_START + 21)
-
 #define SID_SBA_IMPORT  (DATA_MENU_START + 22)
-
 #define SID_SORT_DESCENDING (DATA_MENU_START + 23)
 #define SID_SORT_ASCENDING  (DATA_MENU_START + 24)
+#define SID_OUTLINE_HIDE(DATA_MENU_START + 25)
+#define SID_OUTLINE_SHOW(DATA_MENU_START + 26)
+#define SID_OUTLINE_MAKE(DATA_MENU_START + 27)
+#define SID_OUTLINE_REMOVE  (DATA_MENU_START + 28)
 
-#define DATA_MENU_END   (DATA_MENU_START + 25)
+#define DATA_MENU_END   (DATA_MENU_START + 29)
 
 #define TAB_POPUP_START (DATA_MENU_END)
 #define RID_POPUP_TAB   (TAB_POPUP_START)
diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h
index 1350c0c..783f757 100644
--- a/sc/inc/sccommands.h
+++ b/sc/inc/sccommands.h
@@ -101,6 +101,7 @@
 #define CMD_FID_TAB_EVENTS  .uno:TableEvents
 #define CMD_FID_TAB_MENU_SET_TAB_BG_COLOR   .uno:SetTabBgColor
 #define CMD_FID_TAB_SET_TAB_BG_COLOR.uno:TabBgColor
+#define CMD_SID_MANAGE_XML_SOURCE   .uno:ManageXMLSource
 
 #endif
 
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 77eea5c..0256ea0 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -60,6 +60,7 @@ interface CellSelection
 SID_REFRESH_DBAREA  [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 SID_SBA_BRW_INSERT  [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 SID_SELECT_DB   [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
+SID_MANAGE_XML_SOURCE   [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 SID_SORT[ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 SID_DATA_FORM   [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 FID_FILTER_OK   [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 451ffca..2cdf7cd 100644
--- a/sc/sdi/scalc.sdi

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/inc vcl/source

[Libreoffice Gerrit user]

 vcl/inc/vcl/layout.hxx|6 ++
 vcl/source/window/dialog.cxx  |4 ++--
 vcl/source/window/dlgctrl.cxx |   18 +-
 vcl/source/window/layout.cxx  |   26 ++
 4 files changed, 43 insertions(+), 11 deletions(-)

New commits:
commit 8372d258ad499162a4ba9888c8792454ad4d8f8e
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Sep 26 21:35:55 2012 +0100

truly skip unshown widgets in tab traversal

make tab traversal of dialog widgets hidden because their containers are 
hidden
and/or disabled

Change-Id: I1947584717030f3703c018cbf05235811df7835e

diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 34c5696..4735528 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -483,6 +483,12 @@ Window* getNonLayoutParent(Window *pParent);
 //Get first real parent which is not a layout widget
 Window* getNonLayoutRealParent(Window *pParent);
 
+//return true if this window and its stack of containers are all shown
+bool isVisibleInLayout(const Window *pWindow);
+
+//return true if this window and its stack of containers are all enabled
+bool isEnabledInLayout(const Window *pWindow);
+
 //Get next window after pChild of a pTopLevel window as
 //if any intermediate layout widgets didn't exist
 //i.e. acts like pChild = pChild-GetWindow(WINDOW_NEXT);
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 64907b2..03624ee 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1134,8 +1134,8 @@ void Dialog::GrabFocusToFirstControl()
 // Control in der TabSteuerung den Focus geben
 if ( !pFocusControl ||
  !(pFocusControl-GetStyle()  WB_TABSTOP) ||
- !pFocusControl-IsVisible() ||
- !pFocusControl-IsEnabled() || !pFocusControl-IsInputEnabled() )
+ !isVisibleInLayout(pFocusControl) ||
+ !isEnabledInLayout(pFocusControl) || !pFocusControl-IsInputEnabled() 
)
 {
 sal_uInt16 n = 0;
 pFocusControl = ImplGetDlgWindow( n, DLGWINDOW_FIRST );
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 7f419c4..7598ea1 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -94,7 +94,7 @@ static Window* ImplGetSubChildWindow( Window* pParent, 
sal_uInt16 n, sal_uInt16
 pWindow = pWindow-ImplGetWindow();
 
 // Unsichtbare und disablte Fenster werden uebersprungen
-if ( pTabPage || pWindow-IsVisible() )
+if ( pTabPage || isVisibleInLayout(pWindow) )
 {
 // Wenn das letzte Control ein TabControl war, wird von
 // diesem die TabPage genommen
@@ -167,7 +167,7 @@ static Window* ImplGetChildWindow( Window* pParent, 
sal_uInt16 n, sal_uInt16 nI
 if ( bTestEnable )
 {
 sal_uInt16 n2 = nIndex;
-while ( pWindow  (!pWindow-IsEnabled() || 
!pWindow-IsInputEnabled()) )
+while ( pWindow  (!isEnabledInLayout(pWindow) || 
!pWindow-IsInputEnabled()) )
 {
 n2 = nIndex+1;
 nIndex = 0;
@@ -184,7 +184,7 @@ static Window* ImplGetChildWindow( Window* pParent, 
sal_uInt16 n, sal_uInt16 nI
 nIndex = 0;
 pWindow = ImplGetSubChildWindow( pParent, n, nIndex );
 }
-while ( pWindow  n  (!pWindow-IsEnabled() || 
!pWindow-IsInputEnabled()) );
+while ( pWindow  n  (!isEnabledInLayout(pWindow) || 
!pWindow-IsInputEnabled()) );
 }
 }
 return pWindow;
@@ -278,7 +278,7 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, 
sal_uInt16 nType,
 while ( (i != nStartIndex)  (i != nStartIndex2) );
 
 if ( (i == nStartIndex2) 
- (!(pWindow-GetStyle()  WB_TABSTOP) || 
!pWindow-IsEnabled()) )
+ (!(pWindow-GetStyle()  WB_TABSTOP) || 
!isEnabledInLayout(pWindow)) )
 i = nStartIndex;
 }
 }
@@ -816,7 +816,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent rKEvt, 
sal_Bool bKeyInput )
 
 nStyle = pWindow-GetStyle();
 
-if ( pWindow-IsVisible()  pWindow-IsEnabled()  
pWindow-IsInputEnabled() )
+if ( isVisibleInLayout(pWindow)  
isEnabledInLayout(pWindow)  pWindow-IsInputEnabled() )
 {
 if ( pWindow != pSWindow )
 pWindow-ImplControlFocus( GETFOCUS_CURSOR | 
GETFOCUS_BACKWARD );
@@ -842,7 +842,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent rKEvt, 
sal_Bool bKeyInput )
 if ( nStyle  WB_GROUP )
 break;
 
-if ( pWindow-IsVisible()  pWindow-IsEnabled()  
pWindow-IsInputEnabled() )
+if ( isVisibleInLayout(pWindow)  isEnabledInLayout(pWindow) 
 pWindow-IsInputEnabled() )
 {
 pWindow-ImplControlFocus( GETFOCUS_CURSOR | 
GETFOCUS_BACKWARD );
 return 

[Libreoffice-commits] .: 6 commits - solenv/bin

[Libreoffice Gerrit user]

 solenv/bin/modules/installer.pm |   41 +++
 solenv/bin/modules/installer/epmfile.pm |  200 +-
 solenv/bin/modules/installer/exiter.pm  |   72 --
 solenv/bin/modules/installer/scriptitems.pm |   28 ++
 solenv/bin/modules/installer/worker.pm  |  307 
 5 files changed, 266 insertions(+), 382 deletions(-)

New commits:
commit 43ac04763d60ae651dc8f1a592cc2f0d41387a7d
Author: Tim Retout t...@retout.co.uk
Date:   Wed Sep 26 22:06:11 2012 +0100

installer: Add extra failure warning.

Change-Id: I387ee22ce59606b9680e1df70b8076ec474427a6

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 2c2ef22..2c1f855 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -98,6 +98,7 @@ sub main {
 if ($@) {
 my $message = ERROR: $@;
 
+warn ERROR: Failure in installer.pm\n;
 warn $message\n;
 $exit_code = -1;
 
commit 247d1899e3fb69af30094d388c97ce074a2da26c
Author: Tim Retout t...@retout.co.uk
Date:   Wed Sep 26 21:58:45 2012 +0100

installer::worker: Remove unused tar_package

Change-Id: I58e9efdda8fac5b65e259b63a5150c44fa00feb6

diff --git a/solenv/bin/modules/installer/worker.pm 
b/solenv/bin/modules/installer/worker.pm
index 017f2ab..cb205b4 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -1387,43 +1387,6 @@ sub put_license_into_setup
 }
 
 #
-# Create a tar file from the binary package
-#
-
-sub tar_package
-{
-my ( $installdir, $packagename, $tarfilename, $getuidlibrary) = @_;
-
-my $ldpreloadstring = ;
-if ( $getuidlibrary ne  ) { $ldpreloadstring = LD_PRELOAD= . 
$getuidlibrary; }
-
-my $systemcall = cd $installdir; $ldpreloadstring tar -cf - $packagename 
 $tarfilename;
-
-my $returnvalue = system($systemcall);
-
-my $infoline = Systemcall: $systemcall\n;
-push( @installer::globals::logfileinfo, $infoline);
-
-if ($returnvalue)
-{
-$infoline = ERROR: Could not execute \$systemcall\!\n;
-push( @installer::globals::logfileinfo, $infoline);
-}
-else
-{
-$infoline = Success: Executed \$systemcall\ successfully!\n;
-push( @installer::globals::logfileinfo, $infoline);
-}
-
-chmod 0775, $tarfilename;
-
-my $fulltarfile = $installdir . $installer::globals::separator . 
$tarfilename;
-my $filesize = ( -s $fulltarfile );
-
-return $filesize;
-}
-
-#
 # Collecting all pkgmap files from an installation set
 #
 
commit acaaf6c72162566e896421e03ee4c966936c7917
Author: Tim Retout t...@retout.co.uk
Date:   Wed Sep 26 21:56:28 2012 +0100

installer: Move key_in_a_is_also_key_in_b into scriptfiles.pm

Change-Id: I466b285ddc9f3ac53978acefe76c27fa212d812c

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index 42ee98d..9ce5bd6 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -2146,7 +2146,7 @@ sub get_string_of_modulegids_for_itemgid
 # Check: All modules or no module must have flag LANGUAGEMODULE
 if ( $haslanguagemodule )
 {
-my $isreallylanguagemodule = 
installer::worker::key_in_a_is_also_key_in_b(\%foundmodules, 
\%installer::globals::alllangmodules);
+my $isreallylanguagemodule = 
_key_in_a_is_also_key_in_b(\%foundmodules, 
\%installer::globals::alllangmodules);
 if ( ! $isreallylanguagemodule ) { 
installer::exiter::exit_program(ERROR: \$itemgid\ is assigned to modules 
with flag \LANGUAGEMODULE\ and also to modules without this flag! Modules: 
$allmodules, get_string_of_modulegids_for_itemgid);  }
 }
 
@@ -2498,4 +2498,30 @@ sub select_required_language_strings
 }
 }
 
+
+# Controlling that all keys in hash A are
+# also key in hash B.
+
+
+sub _key_in_a_is_also_key_in_b
+{
+my ( $hashref_a, $hashref_b) = @_;
+
+my $returnvalue = 1;
+
+my $key;
+foreach $key ( keys %{$hashref_a} )
+{
+if ( ! exists($hashref_b-{$key}) )
+{
+print *\n;
+foreach $keyb ( keys %{$hashref_b} ) { print $keyb : 
$hashref_b-{$keyb}\n; }
+print *\n;
+$returnvalue = 0;
+}
+}
+
+return $returnvalue;
+}
+
 1;
diff --git a/solenv/bin/modules/installer/worker.pm 
b/solenv/bin/modules/installer/worker.pm
index e895f54..017f2ab 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -1252,32 +1252,6 @@ sub resolving_hidden_flag
 push( @installer::globals::logfileinfo, $infoline);
 }
 

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/source

[Libreoffice Gerrit user]

 sc/source/ui/inc/cellsh.hxx   |1 +
 sc/source/ui/view/cellsh1.cxx |5 +
 sc/source/ui/view/cellsh2.cxx |2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit dc94f80727fe18f5e00417b0f23ba09e80d14d6b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Sep 26 17:41:01 2012 -0400

Separate method to launch xml source dialog.

Change-Id: Iac7898d695cd7659f44944d6615a91d4e2b6a52e

diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 88043ce..c2f7f01 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -67,6 +67,7 @@ private:
 const String _rSource, sal_uLong _nRefresh, SfxRequest 
_rRequest );
 
 void ExecuteDataPilotDialog();
+void ExecuteXMLSourceDialog();
 void ExecuteSubtotals(SfxRequest rReq);
 
 DECL_LINK( ClipboardChanged, TransferableDataHelper* );
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index a1cdc8c..220896e 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2439,6 +2439,11 @@ void ScCellShell::ExecuteDataPilotDialog()
 }
 }
 
+void ScCellShell::ExecuteXMLSourceDialog()
+{
+fprintf(stdout, ScCellShell::ExecuteXMLSourceDialog:   launch xml 
dialog\n);
+}
+
 void ScCellShell::ExecuteSubtotals(SfxRequest rReq)
 {
 ScTabViewShell* pTabViewShell = GetViewData()-GetViewShell();
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index f1d6395..0370dc4 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -746,7 +746,7 @@ void ScCellShell::ExecuteDB( SfxRequest rReq )
 break;
 
 case SID_MANAGE_XML_SOURCE:
-fprintf(stdout, ScCellShell::ExecuteDB:   
SID_MANAGE_XML_SOURCE\n);
+ExecuteXMLSourceDialog();
 break;
 case FID_VALIDATION:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/Library_scui.mk sc/source

[Libreoffice Gerrit user]

 sc/Library_scui.mk  |1 +
 sc/source/ui/inc/xmlsourcedlg.hrc   |   14 ++
 sc/source/ui/inc/xmlsourcedlg.hxx   |   19 +++
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |   13 +
 4 files changed, 47 insertions(+)

New commits:
commit 4fa6c56039d624fcb1544d3e97cfa1f5d859f12d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Sep 26 17:53:12 2012 -0400

Add new skeleton files for the new xml source dialog.

Change-Id: I2ac196ea74185fd7f10919ad64434855c5c8b5fa

diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 6d67de0..102affb 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -116,6 +116,7 @@ $(eval $(call gb_Library_add_exception_objects,scui,\
 sc/source/ui/pagedlg/tphf \
 sc/source/ui/pagedlg/tptable \
 sc/source/ui/styleui/styledlg \
+sc/source/ui/xmlsource/xmlsourcedlg \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/sc/source/ui/inc/xmlsourcedlg.hrc 
b/sc/source/ui/inc/xmlsourcedlg.hrc
new file mode 100644
index 000..323ef7c
--- /dev/null
+++ b/sc/source/ui/inc/xmlsourcedlg.hrc
@@ -0,0 +1,14 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include sc.hrc
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx 
b/sc/source/ui/inc/xmlsourcedlg.hxx
new file mode 100644
index 000..6177cf3
--- /dev/null
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -0,0 +1,19 @@
+/* -*- 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 __SC_XMLSOURCEDLG_HXX__
+#define __SC_XMLSOURCEDLG_HXX__
+
+class XMLSourceDlg
+{
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
new file mode 100644
index 000..59a133c
--- /dev/null
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -0,0 +1,13 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include xmlsourcedlg.hxx
+#include xmlsourcedlg.hrc
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW-3-6] fix for fdo#55022, crash when opening the test file in ScDBQueryDataIterator

[Markus Mohrhard]

Hey,

[1] fixes a crash when opening the test file. The problem is that we
dereference a past the end element. The code was always wrong but we
fixed another bug in this part of the code for 3-6 so that it now
crashes.

Regards,
Markus

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=70412d0f3f7979d3d069be8121d49dbb96775cce
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - 2 commits - sc/inc sc/source

[Libreoffice Gerrit user]

 sc/inc/sc.hrc   |1 +
 sc/inc/scabstdlg.hxx|8 
 sc/source/ui/attrdlg/scdlgfact.cxx  |   12 ++--
 sc/source/ui/attrdlg/scdlgfact.hxx  |   10 ++
 sc/source/ui/inc/xmlsourcedlg.hrc   |3 ++-
 sc/source/ui/inc/xmlsourcedlg.hxx   |7 ++-
 sc/source/ui/view/cellsh1.cxx   |   17 -
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |9 +
 8 files changed, 62 insertions(+), 5 deletions(-)

New commits:
commit bf9f5d803cf1ed2db723be76fd7ab80c64e9e74e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Sep 26 20:21:03 2012 -0400

Launch the dialog for real.

Change-Id: I974599f3bd30f5a70bad69d9fde727fef965933c

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 220896e..c75a000 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2441,7 +2441,22 @@ void ScCellShell::ExecuteDataPilotDialog()
 
 void ScCellShell::ExecuteXMLSourceDialog()
 {
-fprintf(stdout, ScCellShell::ExecuteXMLSourceDialog:   launch xml 
dialog\n);
+ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
+if (!pFact)
+return;
+
+ScTabViewShell* pTabViewShell = GetViewData()-GetViewShell();
+if (!pTabViewShell)
+return;
+
+boost::scoped_ptrAbstractScXMLSourceDlg pDlg(
+pFact-CreateScXMLSourceDlg(
+pTabViewShell-GetDialogParent(), RID_SCDLG_XML_SOURCE));
+
+if (!pDlg)
+return;
+
+pDlg-Execute();
 }
 
 void ScCellShell::ExecuteSubtotals(SfxRequest rReq)
commit 10e83f59bf63e9fb6da7857bc9b21d3342b06775
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Sep 26 20:13:42 2012 -0400

Abstract dialog instantiation code.

Change-Id: I28e7b354928d349d9f6c90092ead2010cfe3c29b

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0dcb1fe..5e5fad0 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1088,6 +1088,7 @@
 #define RID_SCDLG_FORMULA_CALCOPTIONS   (SC_DIALOGS_START + 157)
 
 #define RID_SCDLG_COND_FORMAT_MANAGER   (SC_DIALOGS_START + 158)
+#define RID_SCDLG_XML_SOURCE(SC_DIALOGS_START + 159)
 
 #define SC_DIALOGS_END  (SC_DIALOGS_START + 160)
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 7081ddb..9623615 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -334,6 +334,11 @@ public:
 virtual bool IsDateConversionSet() const = 0;
 };
 
+class AbstractScXMLSourceDlg : public VclAbstractDialog
+{
+public:
+};
+
 //---Scabstract fractory ---
 class ScAbstractDialogFactory
 {
@@ -531,6 +536,9 @@ public:
 const SfxItemSet* 
pArgSet,int nId, ScTabViewShell *pTabVwSh  ) = 0;
 virtual SfxAbstractTabDialog * CreateScSortDlg( Window*  pParent, 
//add for ScSortDlg
 const SfxItemSet* 
pArgSet,int nId ) = 0;
+
+virtual AbstractScXMLSourceDlg* CreateScXMLSourceDlg(Window* pParent, int 
nId) = 0;
+
 // for tabpage
 virtual CreateTabPage   GetTabPageCreatorFunc( sal_uInt16 nId 
) = 0;
 virtual GetTabPageRangesGetTabPageRangesFunc( sal_uInt16 nId ) 
= 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 4dd4bc3..9257a9e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -82,6 +82,7 @@
 #include colorformat.hxx
 #include condformatdlg.hxx
 #include condformatmgr.hxx
+#include xmlsourcedlg.hxx
 
 // ause
 #include editutil.hxx
@@ -123,6 +124,7 @@ IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScXMLSourceDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
 
 // AbstractTabDialog_Impl begin
@@ -685,8 +687,6 @@ AbstractScTextImportOptionsDlg * 
ScAbstractDialogFactory_Impl::CreateScTextImpor
 return pDlg ? new AbstractScTextImportOptionsDlg_Impl(pDlg) : NULL;
 }
 
-
-
 AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( 
Window*  pParent,
 ScAutoFormat*  
 pAutoFormat,
 const 
ScAutoFormatData*pSelFormatData,
@@ -1595,6 +1595,14 @@ SfxAbstractTabDialog * 
ScAbstractDialogFactory_Impl::CreateScSortDlg( Window*
 return new AbstractTabDialog_Impl( pDlg );
 return 0;
 }
+
+AbstractScXMLSourceDlg* 
ScAbstractDialogFactory_Impl::CreateScXMLSourceDlg(Window* pParent, int nId)
+{
+ScXMLSourceDlg* pDlg = (nId == RID_SCDLG_XML_SOURCE) ? new 
ScXMLSourceDlg(pParent) : NULL;
+
+return pDlg ? new AbstractScXMLSourceDlg_Impl(pDlg) : NULL;
+}
+
 #undef SfxTabDialog
 

[PATCH] ::rtl::OUString cleanup in basctl

[Ricardo Montania (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/705

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/705/1

::rtl::OUString cleanup in basctl

Change-Id: Icb6f04d6ad22f1652abbb399beb08645daf8b9c9
---
M avmedia/source/gstreamer/gstframegrabber.cxx
M basctl/source/inc/accessibledialogwindow.hxx
M basctl/source/inc/basidesh.hxx
M basctl/source/inc/dlged.hxx
4 files changed, 25 insertions(+), 25 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/705
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb6f04d6ad22f1652abbb399beb08645daf8b9c9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br

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

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/source

[Libreoffice Gerrit user]

 sc/source/ui/src/xmlsourcedlg.src |   19 +++
 1 file changed, 19 insertions(+)

New commits:
commit 558e9b49d0e7bdbf90524a7d72326325a46d849a
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Sep 26 21:06:00 2012 -0400

I forgot to add this.

Change-Id: Idf3600f0194326365e90fbf683cd2133656d3d91

diff --git a/sc/source/ui/src/xmlsourcedlg.src 
b/sc/source/ui/src/xmlsourcedlg.src
new file mode 100644
index 000..7d67abe
--- /dev/null
+++ b/sc/source/ui/src/xmlsourcedlg.src
@@ -0,0 +1,19 @@
+
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include xmlsourcedlg.hrc
+
+ModalDialog RID_SCDLG_XML_SOURCE
+{
+HelpID = sc:ModalDialog:RID_SCDLG_XML_SOURCE;
+Text [ en-US ] = XML Source ;
+Size = MAP_APPFONT ( 250 , 135 ) ;
+Moveable = TRUE ;
+Closeable = TRUE ;
+};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/AllLangResTarget_sc.mk sc/source

[Libreoffice Gerrit user]

 sc/AllLangResTarget_sc.mk   |1 +
 sc/source/ui/src/xmlsourcedlg.src   |2 +-
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |5 -
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 75b006b9cb7828ed628efcae759405b3daf4ab05
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Sep 26 21:12:11 2012 -0400

Use the resource file correctly.

Change-Id: I40af0beaf0de25347e8241c08e3be5f92ac16f93

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 2d3c64c..9ff824f 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
 sc/source/ui/src/colorformat.src \
 sc/source/ui/src/condformatdlg.src \
 sc/source/ui/src/condformatmgr.src \
+sc/source/ui/src/xmlsourcedlg.src \
 sc/source/ui/cctrl/checklistmenu.src \
 sc/source/ui/navipi/navipi.src \
 sc/source/ui/docshell/tpstat.src \
diff --git a/sc/source/ui/src/xmlsourcedlg.src 
b/sc/source/ui/src/xmlsourcedlg.src
index 7d67abe..ba80a99 100644
--- a/sc/source/ui/src/xmlsourcedlg.src
+++ b/sc/source/ui/src/xmlsourcedlg.src
@@ -1,4 +1,3 @@
-
 /*
  * This file is part of the LibreOffice project.
  *
@@ -17,3 +16,4 @@ ModalDialog RID_SCDLG_XML_SOURCE
 Moveable = TRUE ;
 Closeable = TRUE ;
 };
+
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx 
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 01a09dd..58f764e 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -10,9 +10,12 @@
 #include xmlsourcedlg.hxx
 #include xmlsourcedlg.hrc
 
+#include scresid.hxx
+
 ScXMLSourceDlg::ScXMLSourceDlg(Window* pParent) :
-ModalDialog(pParent, RID_SCDLG_XML_SOURCE)
+ModalDialog(pParent, ScResId(RID_SCDLG_XML_SOURCE))
 {
+FreeResource();
 }
 
 ScXMLSourceDlg::~ScXMLSourceDlg()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] String to OUString in basctl

[Ricardo Montania (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/706

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/706/1

String to OUString in basctl

Change-Id: I52ce4fcf4b02746df898c7fbbf57a58b274dd0b2
---
M basctl/source/basicide/baside2b.cxx
1 file changed, 29 insertions(+), 29 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/706
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52ce4fcf4b02746df898c7fbbf57a58b274dd0b2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br

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

Re: Adding Extension for Experimental Thai Spelling

[Nathan Wells]

Hello Again,

Thank you all for your input!

This is a deeper problem than I first thought...sorry for the delayed
response, but I hope a solution can be found, even though the current ICU
breakiterator is not at 100% for Khmer.

Here are some new ideas, ordered by desirability, with number one being the
most desired, to number three being the least.

1) When a zero-width space is detected (U+200B), shut off ICU breakiterator
for Khmer spell checking for characters following the zero-width space
until encounters real space (U+0020) or end of sentence (detect end of
sentence using ICU Sentence Boundary).

2) Disable use of ICU breakiterator for Khmer spell checking by default,
but allow users to enable it by adding a check-box to enable ICU
breakiterator in the Tools  Options  Language Settings  Writing Aids 
Options dialogue when a Khmer Hunspell dictionary is present (
http://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version
 ).

3) Disable use of ICU breakiterator for Khmer spell checking until the ICU
breakiterator for Khmer is more accurate.

Currently, with the ICU breakiterator for Khmer enabled in LibreOffice 3.6
it causes a lot of spelling errors to go unnoticed since the ICU
breakiterator breaks words up incorrectly. So hopfully we can find a
solution that will work with the current ICU breakiterator - though with
ICU 50.1 the breakiterator for Khmer will have some improvements. But I do
feel if solution 1 or 2 (or if someone else has better ideas) cannot
be implemented the breakiterator for spelling with Khmer should be turned
off in LibreOffice until the ICU breakiterator for Khmer is more accurate.


Thanks again for your help and time, your input is greatly appreciated!

Sincerely,

Nathan



On Thu, Jul 26, 2012 at 4:33 PM, Martin Hosken martin_hos...@sil.orgwrote:

 Dear All,

   An automatic word and line breaker is very necessary for Khmer and
   Thai because traditionally they have no spaces between words, and so
   line-breaking and spell checking require the use of a zero-width space
   between words which is counterintuitive for most native speakers, and
   so spell checking goes widely unused.

 I agree that automatic word breaking is a good thing and I am relieved to
 see that libreoffice does it based on language selection and not on
 automatic language guessing based on scripts. There are more languages that
 use Thai script and Khmer script than just Thai and Khmer. So one of my
 fears is already alleviated :)

   But now with the ICU code you implemented, Thai and Khmer can be
   automatically broken, and the results are quite good. But with its
   implementation in the real world, I have found some issues that I
   wanted to raise and also suggest possible solutions. I write this as
   an end-user, not so much as a programmer, nor do I claim to fully
   understand the inner-workings of ICU and LibreOffice (because I don't!
   ).
  
   First, I will do my best to explain the current results of the ICU
   break iterator with Khmer:
  
   Input sentence: មានប្រាជ្ញាឈ្លាសវៃឈ្មោះសិវកឥវលិយៈ
  
   Current ICU line-breaking: មាន|ប្រាជ្ញាឈ្លាស|វៃ|ឈ្មោះ|សិវ|កឥ|វលិ|យៈ
  
   Compared with the sentence manually broken: មាន|ប្រាជ្ញា|ឈ្លាសវៃ|
   ឈ្មោះ|សិវកឥវលិយៈ
  
   The differences should be clear – the ICU break iterator does not
   break the words with 100% accuracy.
  
   One possible solution to this issue is by how the ICU Break Iterator
   interacts with zero-width spaces (U+200B) in LibreOffice. Before ICU
   code was enabled to automatically break Khmer, if an end-user wanted
   to spell check Khmer, they had to manually place U+200B characters to
   separate words. This solution worked quite well, but was
   counterintuitive to most native speakers, because Khmer has no spaces
   (as stated before). But with this solution, an end-user could be sure
   that their document was broken with 100% accuracy, if there was no
   human error (something automatic solutions cannot do – it is more
   along the lines of 80% accurate). What I propose, is that the break
   iterator code in LibreOffice looks for U+200B characters in a given
   string and considers them as a sign to NOT automatically break, but to
   allow the end-user full control to manually break words. Let me
   explain:
  
1. The code starts processing the text and automatically breaking
   it until it comes across a U+200B character. If one is found,
   it searches to see if there are any additional U+200B or U
   +0020 characters in the following 20 characters (or so), and
   if there are, the break iterator skips over those characters
   and starts again from the second U+200B character (or U+0020,
   but a U+0020 character would only signify the “close” of the
   manual break because sometimes a phrase will end and there
   will be an actual space – so if the word that the user wants
   to manually break has a 

[Libreoffice-commits] .: sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/crsrsh.hxx|   16 +++---
 sw/inc/node.hxx  |2 -
 sw/source/core/crsr/crsrsh.cxx   |   44 +++
 sw/source/core/crsr/crstrvl.cxx  |2 -
 sw/source/core/crsr/trvltbl.cxx  |   14 ++--
 sw/source/core/docnode/node.cxx  |2 -
 sw/source/core/edit/editsh.cxx   |2 -
 sw/source/core/edit/edlingu.cxx  |   14 ++--
 sw/source/core/edit/ednumber.cxx |2 -
 sw/source/core/frmedt/fetab.cxx  |   25 ++
 sw/source/ui/dochdl/swdtflvr.cxx |2 -
 sw/source/ui/inc/wrtsh.hxx   |4 +--
 sw/source/ui/uiview/viewling.cxx |4 +--
 sw/source/ui/wrtsh/wrtsh1.cxx|2 -
 14 files changed, 67 insertions(+), 68 deletions(-)

New commits:
commit 30d33b126f47021a99fb8ca63d6c6be29407e9cc
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Sep 27 13:21:50 2012 +0900

sal_Bool to bool

Change-Id: Ic05d9f062e7419d192b8cf6e56c91b3f9d97bfe0

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 632b021..4c7e48c 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -137,7 +137,7 @@ struct SwContentAtPos
 nDist = 0; // #i23726#
 }
 
-sal_Bool IsInProtectSect() const;
+bool IsInProtectSect() const;
 bool IsInRTLText()const;
 };
 
@@ -295,9 +295,9 @@ protected:
 void PaMCorrAbs(const SwNodeIndex rOldNode, const SwPosition rNewPos,
 const xub_StrLen nOffset = 0 );
 
-sal_Bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
+bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
 
-bool SetInFrontOfLabel( sal_Bool bNew );
+bool SetInFrontOfLabel( bool bNew );
 
 void RefreshBlockCursor();
 
@@ -321,7 +321,7 @@ public:
 
 SwPaM * CreateCrsr();
 /// delete the current cursor and make the following into the current
-sal_Bool DestroyCrsr();
+bool DestroyCrsr();
 /// transform TableCursor to normal cursor, nullify Tablemode
 void TblCrsrToCursor();
 /// enter block mode, change normal cursor into block cursor
@@ -525,7 +525,7 @@ public:
 // Check if selection is within one paragraph.
 
 //Should WaitPtr be activated for Clipboard.
-sal_Bool ShouldWait() const;
+bool ShouldWait() const;
 
 // Check if selection is within one paragraph.
 inline sal_Bool IsSelOnePara() const;
@@ -728,11 +728,11 @@ public:
 sal_Bool IsInWord( sal_Int16 nWordType = 
com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
 sal_Bool IsStartSentence() const;
 sal_Bool IsEndSentence() const;
-sal_Bool IsSttPara() const;
-sal_Bool IsEndPara() const;
+bool IsSttPara() const;
+bool IsEndPara() const;
 sal_Bool IsStartOfDoc() const;
 sal_Bool IsEndOfDoc() const;
-sal_Bool IsInFrontOfLabel() const;
+bool IsInFrontOfLabel() const;
 sal_Bool IsAtLeftMargin()   const   { return IsAtLRMargin( sal_True ); 
}
 sal_Bool IsAtRightMargin(sal_Bool bAPI = sal_False) const   { return 
IsAtLRMargin( sal_False, bAPI ); }
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index a0fed72..9ac3045 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -268,7 +268,7 @@ public:
 /// Is node in the visible area of the Shell?
 sal_Bool IsInVisibleArea( ViewShell* pSh = 0 ) const;
 /// Is node in an protected area?
-sal_Bool IsInProtectSect() const;
+bool IsInProtectSect() const;
 /**  Is node in something that is protected (range, frame,
 table cells ... including anchor in case of frames or footnotes)? */
 sal_Bool IsProtect() const;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 8a6a5bf..e026f9b 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -150,23 +150,23 @@ SwPaM * SwCrsrShell::CreateCrsr()
 /**
  * Delete current Cursor, making the following one the current.
  * Note, this function does not delete anything if there is no other cursor.
- * @return - returns sal_True if there was another cursor and we deleted one.
+ * @return - returns true if there was another cursor and we deleted one.
  */
-sal_Bool SwCrsrShell::DestroyCrsr()
+bool SwCrsrShell::DestroyCrsr()
 {
 // don't delete Crsr within table selection
 OSL_ENSURE( !IsTableMode(), in table Selection );
 
 // Is there a next one? Don't do anything if not.
 if(pCurCrsr-GetNext() == pCurCrsr)
-return sal_False;
+return false;
 
 SwCallLink aLk( *this ); // watch Crsr-Moves
 SwCursor* pNextCrsr = (SwCursor*)pCurCrsr-GetNext();
 delete pCurCrsr;
 pCurCrsr = dynamic_castSwShellCrsr*(pNextCrsr);
 UpdateCrsr();
-return sal_True;
+return true;
 }
 
 
@@ -365,7 +365,7 @@ sal_Bool SwCrsrShell::LeftRight( sal_Bool bLeft, sal_uInt16 
nCnt, sal_uInt16 nMo
 SwShellCrsr* pShellCrsr = getShellCrsr( true );
 if ( !bLeft  pShellCrsr-IsInFrontOfLabel() )
 {
-SetInFrontOfLabel( sal_False );
+SetInFrontOfLabel( 

Re: Adding Extension for Experimental Thai Spelling

[Nathan Wells]

Thanks Martin,


1. If you are shutting off the ICU breakiterator for text following, we
 should probably also do it for text preceding. Thus if there is a ZWSP or
 ZWNBSP (U+2060 WJ) anywhere in a text then ICU break iteration is disabled
 for the whole sentence.


Yes, I think you are right. If a ZWSP of ZWNBSP is detected then ICU break
iteration should be disabled for the whole sentence.


2. Why limit this to Khmer? I suspect as a model it should work for any
 non-space broken text.


I am only limiting it to Khmer because that is my expertise and I didn't
want to cause problems for other languages - but it is possible these
changes would be beneficial for other languages that are not broken by
spaces (like Thai).


Thanks,
Nathan

On Thu, Sep 27, 2012 at 11:45 AM, Martin Hosken martin_hos...@sil.orgwrote:

 Dear Nathan,

  Here are some new ideas, ordered by desirability, with number one being
 the
  most desired, to number three being the least.
 
  1) When a zero-width space is detected (U+200B), shut off ICU
 breakiterator
  for Khmer spell checking for characters following the zero-width space
  until encounters real space (U+0020) or end of sentence (detect end of
  sentence using ICU Sentence Boundary).

 I think this is a good direction to head. I have to follow on comments:

 * 1. If you are shutting off the ICU breakiterator for text following, we
 should probably also do it for text preceding. Thus if there is a ZWSP or
 ZWNBSP (U+2060 WJ) anywhere in a text then ICU break iteration is disabled
 for the whole sentence.

 2. Why limit this to Khmer? I suspect as a model it should work for any
 non-space broken text.*

 Yours,
 Martin



 
  2) Disable use of ICU breakiterator for Khmer spell checking by default,
  but allow users to enable it by adding a check-box to enable ICU
  breakiterator in the Tools  Options  Language Settings  Writing Aids 
  Options dialogue when a Khmer Hunspell dictionary is present (
 
 http://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version
   ).
 
  3) Disable use of ICU breakiterator for Khmer spell checking until the
 ICU
  breakiterator for Khmer is more accurate.
 
  Currently, with the ICU breakiterator for Khmer enabled in LibreOffice
 3.6
  it causes a lot of spelling errors to go unnoticed since the ICU
  breakiterator breaks words up incorrectly. So hopfully we can find a
  solution that will work with the current ICU breakiterator - though with
  ICU 50.1 the breakiterator for Khmer will have some improvements. But I
 do
  feel if solution 1 or 2 (or if someone else has better ideas) cannot
  be implemented the breakiterator for spelling with Khmer should be turned
  off in LibreOffice until the ICU breakiterator for Khmer is more
 accurate.
 
 
  Thanks again for your help and time, your input is greatly appreciated!
 
  Sincerely,
 
  Nathan
 
 
 
  On Thu, Jul 26, 2012 at 4:33 PM, Martin Hosken martin_hos...@sil.org
 wrote:
 
   Dear All,
  
 An automatic word and line breaker is very necessary for Khmer and
 Thai because traditionally they have no spaces between words, and
 so
 line-breaking and spell checking require the use of a zero-width
 space
 between words which is counterintuitive for most native speakers,
 and
 so spell checking goes widely unused.
  
   I agree that automatic word breaking is a good thing and I am relieved
 to
   see that libreoffice does it based on language selection and not on
   automatic language guessing based on scripts. There are more languages
 that
   use Thai script and Khmer script than just Thai and Khmer. So one of my
   fears is already alleviated :)
  
 But now with the ICU code you implemented, Thai and Khmer can be
 automatically broken, and the results are quite good. But with its
 implementation in the real world, I have found some issues that I
 wanted to raise and also suggest possible solutions. I write this
 as
 an end-user, not so much as a programmer, nor do I claim to fully
 understand the inner-workings of ICU and LibreOffice (because I
 don't!
 ).

 First, I will do my best to explain the current results of the ICU
 break iterator with Khmer:

 Input sentence: មានប្រាជ្ញាឈ្លាសវៃឈ្មោះសិវកឥវលិយៈ

 Current ICU line-breaking: មាន|ប្រាជ្ញាឈ្លាស|វៃ|ឈ្មោះ|សិវ|កឥ|វលិ|យៈ

 Compared with the sentence manually broken: មាន|ប្រាជ្ញា|ឈ្លាសវៃ|
 ឈ្មោះ|សិវកឥវលិយៈ

 The differences should be clear – the ICU break iterator does not
 break the words with 100% accuracy.

 One possible solution to this issue is by how the ICU Break
 Iterator
 interacts with zero-width spaces (U+200B) in LibreOffice. Before
 ICU
 code was enabled to automatically break Khmer, if an end-user
 wanted
 to spell check Khmer, they had to manually place U+200B characters
 to
 separate words. This solution worked quite well, but was
 counterintuitive to most native speakers, 

Re: [SOLVED] Re: Master failed to compile on scp2 module

[David Tardon]

Hi,

On Wed, Sep 26, 2012 at 11:06:13AM -0700, julien2412 wrote:
 Just to say that after a git pull -r, it's compiling right now.
 I don't know which commit fixed the problem but it's ok.

Commit 8d08ebb6c639cb419c97ae745ce626eee1bd4601. I am sorry for that--I
was not avare that the 'private' modifier has been added in 3.82.

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

Re: [Libreoffice-qa] LO 3.6.2 : about Manage dialog from Conditional Formatting

[Michael Meeks]

Hi there,

On Wed, 2012-09-26 at 06:35 +0200, Jean-Baptiste Faure wrote:
 Nobody interested to test and answer?

Sigh - people are busy; in particular Markus - whose baby this is has
just put in a great chunk of bug-fixing work for 3.6.2 / 3.6.3 to
improve lots of conditional formatting corner-cases.

I expect that high-priority bug work chews time he could spend on
discussing changes to features.

 Well, it is clear that QA peoples are not welcome in this area of the
 code. :-(

Please don't feel unwelcome if you don't get a quick response. It is
-far- easier to ask questions and find problems than it is to consider
and fix them; and some problems are more urgent than others.

  The problem has been described in fdo#54774, fdo#54940, and on QA and
  UX-advise mailing-list. We had very few answers and only one developer
  (Markus) point of view. So I decided to ask on developers ML as it is a
  developer problem.

So - Markus is the authority there, since he's the one doing the
hacking :-) last I checked he implemented it based on advice from the
UX-advise list [ if it is a UI issue, please follow up only on that list
instead of cross-posting ].

  This Manage dialog is very important as it gives a summary of all CF
  defined in the current sheet. It is a long waited function for all
  peoples who are using CF in their spreadsheets. So a big thank you to
  Markus for that.

Agreed, it's some great work.

  If nothing is possible, I think the better thing to do is to remove the
  button Edit from the Manage dialog.

So - I imagine the discussion is just slow going; I havn't followed it
in detail, perhaps there is some UX input needed, please be patient :-)

All the best,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] LO 3.6.2 : about Manage dialog from Conditional Formatting

[Tomaž Vajngerl]

On Tue, Sep 25, 2012 at 6:58 AM, Jean-Baptiste Faure
jbf.fa...@sud-ouest.org wrote:
 If nothing is possible, I think the better thing to do is to remove the
 button Edit from the Manage dialog.

I think this is the best thing to do in this case - there is even a
bug because of this edit button. If you click edit - remove one
conditional formatting entry  - Ok - Crash!
What I would also do is leave first condition empty (or say
something like current selection not in range) if current selection
is not in range and it includes a formula. Additional I would put up a
warning and explain to the user what he sees (something like Caution!
Cells references in formula condition are relative to the current
selected cell (cell number)). This is at least what I would do.

Regards, Tomaž
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] [ANN] LibreOffice 3.6.2 RC2 test builds available

[Fridrich Strba]

Hi *,

for the upcoming new version 3.6.2, the RC2 builds now start to be
available on pre-releases. This build is slated to be second release
candidate build on the way towards 3.6.2, please refer to our release
plan timings here:

 http://wiki.documentfoundation.org/ReleasePlan#3.6_release

Builds are now being uploaded to a public (but non-mirrored - so don't
spread news too widely!) place, as soon as they're available. Grab
them here:

 http://dev-builds.libreoffice.org/pre-releases/

If you've a bit of time, please give them a try  report *critical*
bugs not yet in bugzilla here, so we can incorporate them into the
release notes. Please note that it takes approximately 24 hours to
populate the mirrors, so that's about the time we have to collect
feedback.

The list of fixed bugs relative to 3.6.2 RC1 is here:

 
http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-6-2-release-3.6.2.2.log

So playing with the areas touched there also greatly appreciated - and
validation that those bugs are really fixed.

Thanks a lot for your help,

Fridrich
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] CorelDRAW trial version

[Rainer Bielefeld]

Hi all,

currently A free trial version of CorelDRAW is available from
http://www.corel.com/corel/product/index.jsp?pid=prod4260069cid=catalog20038segid=576storeKey=uslanguageCode=en

You will have to decide whether Testing LibO CDR import filter is in 
accordance with  end-user license agreement.


Best regards

Rainer
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] minutes of the LibreOffice QA call 2012-09-26 1300UTC

[Bjoern Michaelsen]

Hi,

here are the minutes of the QA call. additions and corrections welcome.

Best,

Bjoern

pending action items:
   - merge 3.5 and 3.6 in one big bibisect repo (Bjoern)
   - recheck and tweak bibisect details (Bjoern)
   - Ping cloph if we can make that switchable to say Bug instead of
 EasyHack when explcitly requested (Bjoern)
   - new Bug Hunting Sessions (Cor)

structured manual testing (Yifan/Petr):
   - no news

bug wrangling:
   - postmortem for previous hardhacks - postponed
   - new hardhacks selection
 https://bugs.freedesktop.org/show_bug.cgi?id=47283
 https://bugs.freedesktop.org/show_bug.cgi?id=46100
 https://bugs.freedesktop.org/attachment.cgi?id=37580
   - better collect hardhack candidates on a wikipage
 - best with a proposed and accepted section, to prevent pet bug flooding
AI:  - setup hard hack wiki page (Joel)
   - triaging project (Joel)
 - 5 new contributors
 - triaging party next week
   - bugzilla contract updates - postponed
   - bug prioritization, can we start for real (continue)?
 
http://nabble.documentfoundation.org/Libreoffice-qa-Bugs-prioritization-missing-pieces-td4002450.html
 - yes, for new bugs
 - not worth it for explicitly wading trough old bugs/backlog

community building/communication (Joel/Florian?)
   - QA Wochenende in Essen next weekend
 - who will join?
   - Florian R., Thorsten, Florian Effenberger among others
   - Joel, Bjoern will try to attend remotely
 - better mission statement for QA: proposals? - postponed

next call:
 Friday, October 5th 2012 1300UTC (moved by http://doodle.com/ng83xh2bc4kz2ns8 
to the earlier time)
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-bugs] [Bug 55345] New: Export to pdf does not incorporate the scale settings of pictures imbedded in odt/odg-files

[bugzilla-daemon]

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

  Priority: high
Bug ID: 55345
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: Export to pdf does not incorporate the scale settings
of pictures imbedded in odt/odg-files
  Severity: major
Classification: Unclassified
OS: All
  Reporter: dreamqua...@live.ca
  Hardware: x86 (IA32)
Status: UNCONFIRMED
   Version: 3.6.2.2 release
 Component: Printing and PDF export
   Product: LibreOffice

Created attachment 67704
  -- https://bugs.freedesktop.org/attachment.cgi?id=67704action=edit
embedded pictures in odt document

Windows 7 PRO  Ubuntu 12.04.1

Trying to export an odt  odg-file to pdf causes the embedded pictures not
convert with scale settings included.

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

[Libreoffice-bugs] [Bug 55347] New: Auto update option to search only for major updates

[bugzilla-daemon]

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

  Priority: medium
Bug ID: 55347
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: Auto update option to search only for major updates
  Severity: enhancement
Classification: Unclassified
OS: All
  Reporter: tbertels+bugzi...@gmail.com
  Hardware: All
Status: UNCONFIRMED
   Version: unspecified
 Component: UI
   Product: LibreOffice

Currently, the automatic search for updates will warn the user even for a small
version change (i.e. from 3.5.3 to 3.5.4).

As most users won't feel it's worth to download the 200 MB install for it, they
will be continually bugged by that auto update check feature.
Eventually, they may disable it to avoid the annoyance.

An option to search only for major updates would allow these users to stay
aware of major version which they're willing to install.

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