[Libreoffice-commits] .: toolkit/inc

2013-01-09 Thread Libreoffice Gerrit user 
 toolkit/inc/toolkit/controls/unocontrolmodel.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a280ba47ee434a46d7d29008534f5c662088abc5
Author: Noel Grandin n...@peralex.com
Date:   Wed Jan 9 09:34:34 2013 +0200

fix windows build

broken by my UNO changes

Change-Id: I40910d3c9e2fadb9288208689e71a5ec4f367fd4

diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx 
b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
index 19777a9..334a4ef 100644
--- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
@@ -106,7 +106,7 @@ protected:
 , MutexAndBroadcastHelper()
 , OPropertySetHelper( BrdcstHelper )
 , maDisposeListeners( *this )
-, maContext( ::com::sun::star::uno::Reference 
::com::sun::star::uno::XComponentContext () )
+, m_xContext( ::com::sun::star::uno::Reference 
::com::sun::star::uno::XComponentContext () )
 {
 assert(false);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-01-09 Thread Libreoffice Gerrit user 
 sc/qa/unit/subsequent_filters-test.cxx |   10 --
 sw/qa/core/swdoc-test.cxx  |1 -
 2 files changed, 11 deletions(-)

New commits:
commit 4d1a877dbf74b8e6e5908bb2c0eec570a5fb3184
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Jan 9 07:28:52 2013 +0100

Revert fix a few /tmp file leaks

This reverts commit 92045e69dab8be60a1c84774f04c437066c3c2bf. Broke a
unit test and made all tinderboxes red.

Requested-by: Stephan Bergmann sberg...@redhat.com

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index a7ec15b..f56bd66 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -926,8 +926,6 @@ void ScFiltersTest::testBordersOoo33()
 }
 }
 }
-
-xDocSh-DoClose();
 }
 
 void ScFiltersTest::testBugFixesODS()
@@ -1770,8 +1768,6 @@ void ScFiltersTest::testColorScaleODS()
 rtl::OUStringBuffer aBuffer(getSrcRootPath());
 
aBuffer.append(m_aBaseString).append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/reference/)));
 testColorScale_Impl(pDoc, aBuffer.makeStringAndClear());
-
-xDocSh-DoClose();
 }
 
 void ScFiltersTest::testColorScaleXLSX()
@@ -1796,8 +1792,6 @@ void ScFiltersTest::testColorScaleXLSX()
 rtl::OUStringBuffer aBuffer(getSrcRootPath());
 
aBuffer.append(m_aBaseString).append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/reference/)));
 testColorScale_Impl(pDoc, aBuffer.makeStringAndClear());
-
-xDocSh-DoClose();
 }
 
 void ScFiltersTest::testDataBarODS()
@@ -1827,8 +1821,6 @@ void ScFiltersTest::testNewCondFormat()
 rtl::OUString aCSVPath;
 createCSVPath( aCSVFile, aCSVPath );
 testCondFile(aCSVPath, pDoc, 0);
-
-xDocSh-DoClose();
 }
 
 void ScFiltersTest::testFormulaDependency()
@@ -1857,8 +1849,6 @@ void ScFiltersTest::testFormulaDependency()
 
 // check that the number format is implicity inherited
 // CPPUNIT_ASSERT_EQUAL(pDoc-GetString(0,4,0), pDoc-GetString(0,5,0));
-
-xDocSh-DoClose();
 }
 
 ScFiltersTest::ScFiltersTest()
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index f818cba..de9828e 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -886,7 +886,6 @@ void SwDocTest::setUp()
 
 void SwDocTest::tearDown()
 {
-m_xDocShRef-DoClose();
 m_xDocShRef.Clear();
 delete m_pDoc;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Kill the ancient StarOffice patch concept

2013-01-09 Thread Tor Lillqvist (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1605

To pull it, you can do:

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

Kill the ancient StarOffice patch concept

For Windows, superseded by Windows Installer patching (i.e., creating
.msp files), which is something completely different. (And quite hard
to get working... but still a saner approach, I think.)

For Linux, many distros use delta RPMs or similar, so no home-grown
LO-specific patching mechanism is needed.

Remove the -patch and -patchinc command-line options to
make_installer.pl and all code that was invoked only when using those.

Remove the PATCH and PATCH_ONLY flags in scp2.

Remove the patchmsi.dll Windows Installer custom action.

Change-Id: I09e949e601a969f88eff60067faa2352f4f89537
---
M android/experimental/DocumentLoader/Makefile
M android/experimental/LibreOffice4Android/Makefile
M android/qa/desktop/Makefile
M ios/CustomTarget_Viewer_app.mk
M scp2/inc/macros.inc
M scp2/source/activex/file_activex.scp
M scp2/source/calc/registryitem_calc.scp
M scp2/source/draw/registryitem_draw.scp
M scp2/source/impress/registryitem_impress.scp
M scp2/source/ooo/common_brand.scp
M scp2/source/ooo/directory_ooo_macosx.scp
M scp2/source/ooo/file_library_ooo.scp
M scp2/source/ooo/file_ooo.scp
M scp2/source/ooo/module_hidden_ooo.scp
M scp2/source/ooo/windowscustomaction_ooo.scp
M scp2/source/smoketest/smoketest.scp
M scp2/source/writer/registryitem_writer.scp
M setup_native/prj/build.lst
M setup_native/source/win32/customactions/languagepacks/respintest.cxx
D setup_native/source/win32/customactions/patch/exports.dxp
D setup_native/source/win32/customactions/patch/makefile.mk
D setup_native/source/win32/customactions/patch/swappatchfiles.cxx
M solenv/bin/modules/installer.pm
M solenv/bin/modules/installer/archivefiles.pm
M solenv/bin/modules/installer/control.pm
M solenv/bin/modules/installer/epmfile.pm
M solenv/bin/modules/installer/globals.pm
M solenv/bin/modules/installer/parameter.pm
M solenv/bin/modules/installer/scriptitems.pm
M solenv/bin/modules/installer/simplepackage.pm
M solenv/bin/modules/installer/systemactions.pm
M solenv/bin/modules/installer/windows/createfolder.pm
M solenv/bin/modules/installer/windows/directory.pm
M solenv/bin/modules/installer/windows/feature.pm
M solenv/bin/modules/installer/windows/idtglobal.pm
M solenv/bin/modules/installer/windows/inifile.pm
M solenv/bin/modules/installer/windows/mergemodule.pm
M solenv/bin/modules/installer/windows/msiglobal.pm
M solenv/bin/modules/installer/windows/property.pm
M solenv/bin/modules/installer/windows/upgrade.pm
M solenv/bin/modules/installer/worker.pm
M solenv/bin/modules/installer/ziplist.pm
D solenv/bin/oochkpatch
D solenv/bin/oochkpatch.pl
44 files changed, 65 insertions(+), 2,554 deletions(-)




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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09e949e601a969f88eff60067faa2352f4f89537
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Tor Lillqvist t...@iki.fi

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

Re: [PUSHED 4.0] LATE FEATURE: Personas in LibreOffice

2013-01-09 Thread Petr Mladek 
Pedro píše v Út 08. 01. 2013 v 17:16 -0800:
 Petr Mladek wrote
  I took the approval from Cor, Olivier, Adolfo, Michael, and pushed into
  4-0 branch for 4.0.0.1 build.
 
 That means it should be available in the 4.0 daily builds tomorrow?

Yup, it should be there.

 BTW if anyone is curious I played around with the Persona feature and
 created this
 http://www.getpersonas.com/en-US/persona/491370
 You can use it in your FF browser as well :)

Nice to see first persona created for LibreOffice :-)

Best Regards,
Petr

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

Re: LATE FEATURE: Personas in LibreOffice

2013-01-09 Thread Petr Mladek 
leif píše v Út 08. 01. 2013 v 20:14 +0100:
 Hi,
 I tried with the daily from 
 http://dev-builds.libreoffice.org/daily/libreoffice-4-0/Linux-x86_10-Release-Configuration/2013-01-07_14.50.57/

This is too old. Many fixes were added yesterday evening. You would need
to test a daily build from today if there is any.

 It doesn't work for me on Ubuntu 12.04 with parallel installation. The 
 settings isn't stored at all.

It works for me with the last build.

Best Regards,
Petr

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

[Libreoffice-commits] .: forms/source sc/source slideshow/source

2013-01-09 Thread Libreoffice Gerrit user 
 forms/source/component/errorbroadcaster.cxx |4 +--
 sc/source/filter/oox/stylesbuffer.cxx   |   32 
 slideshow/source/engine/transitions/fanwipe.cxx |2 -
 3 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit c26e2328ff09fecbf3fd74d41f089f118426
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Tue Jan 8 21:02:13 2013 +0100

turn some OSL_ENSURE into SAL_WARN_IF to avoid warnings about unused 
variables

And one OSL_ASSERT too.

Change-Id: I51f0083b9b9336e80c3b6a898c295173ad48f77c
Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/forms/source/component/errorbroadcaster.cxx 
b/forms/source/component/errorbroadcaster.cxx
index 8c8baac..a94efd6 100644
--- a/forms/source/component/errorbroadcaster.cxx
+++ b/forms/source/component/errorbroadcaster.cxx
@@ -45,11 +45,11 @@ namespace frm
 //-
 OErrorBroadcaster::~OErrorBroadcaster( )
 {
-OSL_ENSURE( m_rBHelper.bDisposed || m_rBHelper.bInDispose,
+SAL_WARN_IF( !m_rBHelper.bDisposed  !m_rBHelper.bInDispose, forms,
 OErrorBroadcaster::~OErrorBroadcaster: not disposed! );
 // herein, we don't have a chance to do the dispose ourself 
 
-OSL_ENSURE( 0 == m_aErrorListeners.getLength(),
+SAL_WARN_IF( m_aErrorListeners.getLength(), forms,
 OErrorBroadcaster::~OErrorBroadcaster: still have listeners! );
 // either we're not disposed, or the derived class did not call our 
dispose from within their dispose
 }
diff --git a/sc/source/filter/oox/stylesbuffer.cxx 
b/sc/source/filter/oox/stylesbuffer.cxx
index b7cc8db..58b9a7f 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -773,7 +773,7 @@ void Font::importAttribs( sal_Int32 nElement, const 
AttributeList rAttribs )
 
 void Font::importFont( SequenceInputStream rStrm )
 {
-OSL_ENSURE( !mbDxf, Font::importFont - unexpected conditional formatting 
flag );
+SAL_WARN_IF( mbDxf, sc, Font::importFont - unexpected conditional 
formatting flag );
 
 sal_uInt16 nHeight, nFlags, nWeight, nEscapement;
 sal_uInt8 nUnderline, nFamily, nCharSet, nScheme;
@@ -798,56 +798,56 @@ void Font::importFont( SequenceInputStream rStrm )
 
 void Font::importDxfName( SequenceInputStream rStrm )
 {
-OSL_ENSURE( mbDxf, Font::importDxfName - missing conditional formatting 
flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfName - missing conditional 
formatting flag );
 maModel.maName = BiffHelper::readString( rStrm, false );
 maUsedFlags.mbColorUsed = true;
 }
 
 void Font::importDxfColor( SequenceInputStream rStrm )
 {
-OSL_ENSURE( mbDxf, Font::importDxfColor - missing conditional formatting 
flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfColor - missing conditional 
formatting flag );
 rStrm  maModel.maColor;
 maUsedFlags.mbColorUsed = true;
 }
 
 void Font::importDxfScheme( SequenceInputStream rStrm )
 {
-OSL_ENSURE( mbDxf, Font::importDxfScheme - missing conditional formatting 
flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfScheme - missing conditional 
formatting flag );
 maModel.setBiff12Scheme( rStrm.readuInt8() );
 maUsedFlags.mbSchemeUsed = true;
 }
 
 void Font::importDxfHeight( SequenceInputStream rStrm )
 {
-OSL_ENSURE( mbDxf, Font::importDxfHeight - missing conditional formatting 
flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfHeight - missing conditional 
formatting flag );
 maModel.setBiffHeight( rStrm.readuInt16() );
 maUsedFlags.mbHeightUsed = true;
 }
 
 void Font::importDxfWeight( SequenceInputStream rStrm )
 {
-OSL_ENSURE( mbDxf, Font::importDxfWeight - missing conditional formatting 
flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfWeight - missing conditional 
formatting flag );
 maModel.setBiffWeight( rStrm.readuInt16() );
 maUsedFlags.mbWeightUsed = true;
 }
 
 void Font::importDxfUnderline( SequenceInputStream rStrm )
 {
-OSL_ENSURE( mbDxf, Font::importDxfUnderline - missing conditional 
formatting flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfUnderline - missing conditional 
formatting flag );
 maModel.setBiffUnderline( rStrm.readuInt16() );
 maUsedFlags.mbUnderlineUsed = true;
 }
 
 void Font::importDxfEscapement( SequenceInputStream rStrm )
 {
-OSL_ENSURE( mbDxf, Font::importDxfEscapement - missing conditional 
formatting flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfEscapement - missing 
conditional formatting flag );
 maModel.setBiffEscapement( rStrm.readuInt16() );
 maUsedFlags.mbEscapementUsed = true;
 }
 
 void Font::importDxfFlag( sal_Int32 nElement, SequenceInputStream rStrm )
 {
-OSL_ENSURE( mbDxf, Font::importDxfFlag - missing conditional formatting 
flag );
+SAL_WARN_IF( !mbDxf, sc, Font::importDxfFlag - missing conditional 
formatting flag );
 bool bFlag =

Re: [PUSHED 4.0] LATE FEATURE: Personas in LibreOffice

2013-01-09 Thread Petr Mladek 
Jean-Baptiste Faure píše v St 09. 01. 2013 v 06:22 +0100:
 Le 09/01/2013 02:16, Pedro a écrit :
  Petr Mladek wrote
  I took the approval from Cor, Olivier, Adolfo, Michael, and pushed into
  4-0 branch for 4.0.0.1 build.
  
  That means it should be available in the 4.0 daily builds tomorrow?
  
  BTW if anyone is curious I played around with the Persona feature and
  created this
  http://www.getpersonas.com/en-US/persona/491370
 
 I saw, but it does not work for me after a make dev-install on Ubuntu
 12.04 x86-64. Nothing changes when I choose an persona's url

It works for me with the last build from 4-0 branch.

  and LO does
 not remember of this url if I reopen options panel.

Hmm, it does not show the saved url in the options dialog. Instead, it
shows URL template (http://www.getpersonas.com). I wonder if it is a
feature. Kendy?

Anyway, the setting is saved. I see the chosen persona even after
restarting LO.

Best Regards,
Petr

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

[PUSHED] turn some OSL_ENSURE into SAL_WARN_IF to avoid warnings abou...

2013-01-09 Thread Stephan Bergmann (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/1600


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51f0083b9b9336e80c3b6a898c295173ad48f77c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com

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

Re: Knowledge acquired trying to fiz fdo#59106

2013-01-09 Thread Miklos Vajna 
Hi Marcos,

On Tue, Jan 08, 2013 at 09:25:26AM -0200, Marcos Souza 
marcos.souza@gmail.com wrote:
 Yesterday I was trying to undertand the dump generated by the mso-dumper.
 
 But, I believe the first issue is about the word Definição in a new page,
 instead of the same page as Trabalho 1 as it appears in the MS Word.

Yes, I see the problem, that's a good observation (compared to the
bugreport, just saying layout is corrupted, which is unhelpful).

 So, as said before, I need to understand how the page breaks works, and
 what are the opcodes for this, and learn how LO handles this!
 
 Do you have some tip for guide me? (Now I'm in my boring job, but when I
 get home I will take a look in this again! Let's fix this inheritance bug!)

The general approach is to find out what's worng with the result: I
guess some rows have either a break page before this row or don't
allow this row to split accross pages property enabled, which can cause
such issues. Once you know how to correct the result manually, you can
look into the code to make the importer do it by default.

HTH,

Miklos


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

Re: UI issue

2013-01-09 Thread Michael Meeks 
Hi Steve,

You mentioned you wanted code pointers for this lot (hopefully
C++ is not -so- different from C ;-) so:

On Mon, 2013-01-07 at 10:55 -0800, Steven Howe wrote:
 1) Insert-Section.
 When there is more then one section, they are listed in the order
 created, not linear order with respect to the document.
 Although in the Navigator view, the sections are ordered linearly.
 This should look the same I think; preferably linearly.

So to find this shouldn't be so hard; grab a uniqueish looking string
in the dialog for example 'New section' and git grep for it:

git --no-pager grep -5 'New section'
sw/source/ui/dialog/regionsw.src-FixedLine FL_NAME
sw/source/ui/dialog/regionsw.src-{
sw/source/ui/dialog/regionsw.src-OutputSize = TRUE ;
sw/source/ui/dialog/regionsw.src-Pos = MAP_APPFONT ( 6 , 3 ) ;
sw/source/ui/dialog/regionsw.src-Size = MAP_APPFONT ( 78 , 8 ) ;
sw/source/ui/dialog/regionsw.src:Text [ en-US ] = New section ;
sw/source/ui/dialog/regionsw.src-};
sw/source/ui/dialog/regionsw.src-ComboBox ED_RNAME

So - almost certainly - the code for this dialog is nearby in:

sw/source/ui/dialog/uiregionsw.cxx

:-) as you can find by git grepping for some of these TP_INSERT_SECTION
type stuff. I'd poke around in there to see how the list widgets are
populated.

 2) When you are inserting a new section, the naming box has 'Section1'
 in  it. Although I know, if I just accept at that point the name
 'Section1' will persist, who does that?
...
 Like in Nautilus or any desktop viewing program, a new folder or new
 document, the name is highlighted so it can be replace easily; typed
 over. Of course if you don't replace the 'untitled folder', that's the
 name you get.

Ok - so that is a matter of doing the insertion earlier (I guess) and
fiddling with the list view widget - presumably a widget from vcl (poke
vcl/inc/vcl/ for it's implementation). 

 The  point is, I think 'Section1' should be highlighted so it can be
 typed over. This should be the expected behavior.

So - have a poke in there; I'm happy to help with any questions :-)
almost everything in LibreOffice is in need of polish - thanks for
helping with that !

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

[Libreoffice-commits] .: sw/source

2013-01-09 Thread Libreoffice Gerrit user 
 sw/source/core/unocore/unotext.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 2f320afd978f15a8197f11614251b1e7014487c9
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Jan 9 09:41:57 2013 +

cleanup speedup patch pushed in error.

Change-Id: I24eb1c00d7e36cff85a9446ca024fd1d0652120f

diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 8060a1b..34572a1 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include stdio.h
-
 #include stdlib.h
 
 #include memory
@@ -1310,7 +1308,7 @@ throw (lang::IllegalArgumentException, 
uno::RuntimeException)
 {
 aPam.Move( fnMoveBackward, fnGoNode );
 }
-#if 1
+#if 1 // This section should be removed in favour of the one below when it 
works.
 if (rProperties.getLength())
 {
 // now set the properties
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: UI issue

2013-01-09 Thread Michael Meeks 

On Mon, 2013-01-07 at 22:55 -0800, Steven Howe wrote:
 Navigator. Sections. 
 The section highlighted is may not be the section my cursor is in. 
...
 Logic requires the Navigator follow where I am.
...
 Perhaps the highlighted section in the Navigator should also be the
 section I am editing?

The code for the navigator is here:

sw/source/ui/utlui/navipi.cxx

IIRC :-) I believe some of it is shared with sfx2 or similar.

It seems that the navigation generally navigates the document rather
than moving the cursor around; so perhaps worth checking this out with
the ux-advise list before getting too far I suspect (?)

As for following the cursor position; a quick poke (and I'm no writer
expert) suggests that:

sw/source/core/crsr/crsrsh.cxx

is prolly your friend; if you grok for
InvalidateAccessibleCursorPosition - it seems that a11y at least gets a
cleanish notification of changes there - although apparently everything
else got jammed into one big method there ;-) I guess you'd want some
sort of notification from there to the navigation dialog.

Hope that helps !

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

[Libreoffice-commits] .: filter/source rsc/source sc/source sd/source svl/source svx/source sw/inc sw/source

2013-01-09 Thread Libreoffice Gerrit user 
 filter/source/graphicfilter/ieps/ieps.cxx   |3 
 rsc/source/tools/rsctools.cxx   |2 
 sc/source/ui/vba/vbahelper.cxx  |   78 
 sc/source/ui/vba/vbaname.cxx|   90 +---
 sc/source/ui/vba/vbanames.cxx   |   26 +++-
 sd/source/filter/html/pubdlg.cxx|2 
 sd/source/ui/dlg/brkdlg.cxx |   18 ++---
 sd/source/ui/dlg/copydlg.cxx|   16 ++--
 sd/source/ui/dlg/custsdlg.cxx   |   32 -
 sd/source/ui/dlg/prltempl.cxx   |   16 ++--
 sd/source/ui/dlg/tpaction.cxx   |2 
 sd/source/ui/dlg/tpoption.cxx   |4 -
 sd/source/ui/func/fulinend.cxx  |2 
 sd/source/ui/func/fuprobjs.cxx  |2 
 sd/source/ui/func/fusldlg.cxx   |2 
 svl/source/items/ptitem.cxx |4 -
 svl/source/items/rectitem.cxx   |8 +-
 svl/source/items/szitem.cxx |4 -
 svx/source/dialog/compressgraphicdialog.cxx |   16 ++--
 svx/source/items/rotmodit.cxx   |2 
 svx/source/svdraw/svdattr.cxx   |   22 +++---
 svx/source/svdraw/svdview.cxx   |8 +-
 svx/source/xoutdev/xattr2.cxx   |6 -
 sw/inc/swtypes.hxx  |4 -
 sw/source/core/bastyp/swtypes.cxx   |4 -
 sw/source/ui/uno/unoatxt.cxx|6 -
 sw/source/ui/utlui/attrdesc.cxx |   10 +--
 27 files changed, 188 insertions(+), 201 deletions(-)

New commits:
commit a2296128ccc1c678f0a8a591c36b5546683f482d
Author: Jean-Noël Rouvignac jn.rouvig...@gmail.com
Date:   Wed Jan 9 10:53:05 2013 +0100

Some removal/replacement of the String/UniString with OUString

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx 
b/filter/source/graphicfilter/ieps/ieps.cxx
index ee146db..931f5b7 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -20,7 +20,6 @@
 
 #include stdio.h
 
-//
 #include tools/solar.h
 #include vcl/svapp.hxx
 #include vcl/bitmap.hxx
@@ -480,7 +479,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
 if ( nCount  ( (sal_uInt32)nNumber  10 ) )
 {
 aString.AppendAscii(  LanguageLevel: );
-aString.Append( UniString::CreateFromInt32( nNumber ) );
+aString.Append( OUString::valueOf( nNumber ) );
 }
 }
 aVDev.DrawText( aRect, aString, TEXT_DRAW_CLIP | TEXT_DRAW_MULTILINE );
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 63d787e..857f663 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -177,7 +177,7 @@ rtl::OString OutputFile(const rtl::OString rInput, const 
char * pExt)
 rtl::OUString aUniInput(rtl::OStringToOUString(rInput, 
RTL_TEXTENCODING_ASCII_US));
 DirEntry aFileName(aUniInput);
 
-UniString aExt( pExt, RTL_TEXTENCODING_ASCII_US );
+OUString aExt = OStringToOUString( pExt, RTL_TEXTENCODING_ASCII_US );
 aFileName.SetExtension( aExt );
 
 return rtl::OUStringToOString(aFileName.GetFull(), 
RTL_TEXTENCODING_ASCII_US);
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index 1452d42..d77fe907 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -117,20 +117,20 @@ private:
 comphelper::getProcessComponentContext() );
 static uno::Referencelang::XMultiComponentFactory  xServiceManager(
 xContext-getServiceManager() );
-static uno::Reference beans::XPropertySet  xProps( 
xServiceManager-createInstanceWithContext( rtl::OUString(  
com.sun.star.sheet.GlobalSheetSettings  ) ,xContext ), uno::UNO_QUERY_THROW );
+static uno::Reference beans::XPropertySet  xProps( 
xServiceManager-createInstanceWithContext( OUString(  
com.sun.star.sheet.GlobalSheetSettings  ) ,xContext ), uno::UNO_QUERY_THROW );
 return xProps;
 }
 
 bool getReplaceCellsWarning() throw ( uno::RuntimeException )
 {
 sal_Bool res = false;
-getGlobalSheetSettings()-getPropertyValue( 
rtl::OUString(REPLACE_CELLS_WARNING) ) = res;
+getGlobalSheetSettings()-getPropertyValue( 
OUString(REPLACE_CELLS_WARNING) ) = res;
 return ( res == sal_True );
 }
 
 void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
 {
-getGlobalSheetSettings()-setPropertyValue( 
rtl::OUString(REPLACE_CELLS_WARNING), uno::makeAny( bState ) );
+getGlobalSheetSettings()-setPropertyValue( 
OUString(REPLACE_CELLS_WARNING), uno::makeAny( bState ) );
 }
 public:
 PasteCellsWarningReseter() throw ( uno::RuntimeException )
@@ -260,7 +260,7 @@ getCurrentDocument() throw (uno::RuntimeException)
 
 
 uno::Any aModel;
-SbxVariable *pCompVar = basicChosen-Find(  UniString(ThisComponent), 
SbxCLASS_OBJECT );
+SbxVariable

Re: [PUSHED] Bug 38838 - Removal/Replacement of the String/UniString with OUString once and for all.

2013-01-09 Thread Miklos Vajna 
Hi Jean-Noël,

On Tue, Jan 08, 2013 at 10:57:22AM +0100, Jean-Noël Rouvignac 
jn.rouvig...@gmail.com wrote:
 Please find and review the attached patch.

Looks good, I just pushed it, thanks! :-)

 Please commit it If it suits.

Actually, it would be nice if *you* could commit it, then send it to
gerrit or to this mailing list:

https://wiki.documentfoundation.org/Development#Preparing_patches

Thanks,

Miklos


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

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.1'

2013-01-09 Thread Libreoffice Gerrit user 
Tag 'libreoffice-4.0.0.1' created by Petr Mladek pmla...@suse.cz at 
2013-01-09 09:56 -0800

Tag libreoffice-4.0.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJQ7T7vAAoJEPQ0oe+v7q6jPywQAMjXh9WK++fL+SsCryUAkO5G
OsWqvA8BBiwNas9SnUNEV4Fk0hRL8LjCbW/2D0p+n7Ar1THDaMs4njZvdrTOjCRH
ZVJ36NtAy56rYktrBARhB6fdvzUdEyqm0r9hw6vJo63XGUOy5jY4qVHiL9xqkFbQ
vBVCxiBTsWykCOPaBBTUopE/pWOCqHBf06dqOW9KAmqU5ii2197JyeDboxuurwxH
BY5th2GjlCSXTPMlzlqdT73Dc845Vq3r9fisbCwLlavJvwEPKMSvdE6objvI9Yqv
aIlTRzGKLRv0fVWunAfUtCM8BxeIbJ/n3W65Fa5TCLzraOEx6CThzYCbzirnGDxO
dlZvIW2FNdbHzLPYA0FT1flIejqxdFdUHBsK8PXdG4I4iGOvcprkY08UDfFfsTPN
WT1brfB+S+x8sHy1vkEQAYixszJ4BZULtMN3dVQNeguFgDRA2ipB8MhY8hUxaFy7
5tYyi34+4Q63GXh/608UGKYVPYo3QxP/WuPn++/5I2kJ8A1KSUHdUA2pcdgHaJ3v
Ta+rf81dkwOP6azcBYV/CXEayOvIRZ8gqTU+l6u83wGQ/GehsrkbLkk1kIcLJ4l1
aNOp/rSK4ON+DWnL2U1sVGS4J286mQH+cdm1jlHqQ0VHuns6YzmZhLVbmNPr4YRK
0o3bNtgMkx3CYf6zenCR
=NqDu
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.1'

2013-01-09 Thread Libreoffice Gerrit user 
Tag 'libreoffice-4.0.0.1' created by Petr Mladek pmla...@suse.cz at 
2013-01-09 09:57 -0800

Tag libreoffice-4.0.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJQ7T7vAAoJEPQ0oe+v7q6jk+8QAIWL7iwa7gtwH6ltYmVR+acS
ZTuoqI/Fsobk/UP1B5ddJ5cU/bH9s+RtZYaOsNh5pEkSMlRzHEIx0Ck/O3VeNJ+y
24Cvc91t8X6Vn/bVDU52GPsWgoVDOm8PxmHqLTofjYMDF7qYERPZNIboXItIndLx
m3aOhm6PrUdrXA6Kl5vlD+k+5k+j2NvCG73sJJ/+/M3vjfqM8SE4OMQwnTExskFj
1pt/aBLlQ/0TNdTlU5elZR0YF4VViro90nrKVVq5Lnmzl9ncwLPsinqSeNuPH1Q/
iMjEUJkUjiYCDfh+ZcJMl0kK5KiwZoK3F5MdPO2ipe5OaF4Tg22MVgnwsiltqLtP
YvwKs9ln/EX7c/+Ei5sqMvtmP0X84FApn8rQXZ6OCgzcj7Wvj4vAj+DlcVtIT0Qu
KKIBWjPYqebZjR1LPRUQinWZoZqk8l12MSRMSRv5+wxAVHWb5C+iHWsbeNDVJO8R
lsKLI/k5y/9PzRSSTLYoxCJUSVBF0K/wGuiJSogjIfrFxckFyFFnP8HZbhEZtaZK
PYQxqQpC7RyVQd1TZla+2SIXriWmH4c9vo/GLP4tDiNSzeA7hAcPQi7fz4pxQdWL
5uUM/wGEQPaPvOa4pxOOKZSpu1m6GsJ2XeMteVEPCRB5a99qSvs4D357VTpXnGG2
256vfD/ZNI2QSsWXxc6l
=R71F
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.1'

2013-01-09 Thread Libreoffice Gerrit user 
Tag 'libreoffice-4.0.0.1' created by Petr Mladek pmla...@suse.cz at 
2013-01-09 09:57 -0800

Tag libreoffice-4.0.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJQ7T7vAAoJEPQ0oe+v7q6jdqMP/REDDC5o6owSHvxqS2VkS81m
IQdppNBzj2fOZBgEOvskOHKGlkHhyxxsgGvLuCJxwbN2mekDqSGiIML1WLNRQZJ4
HA0UfL/Lk0R9gnRrdrzgl38MAZbhUInAWCzjFv8jGo8vulsTlm+saC4QuGkoNG+R
HcwQwm+y3R4za/9Ia9s/S529tXX2cuAPOOIlFw7iqlo/vPy+0LWjK9v+1m/+UmJy
LLz1Y5kPv5fhATXMdifdLiI9U7WspEFr2NlQNod+sdTk4ZUeEOEiHxg4GG1NBx3f
B8c2LdmBBGy5e0PGHyyZTvdv3GDmyebdwUO40pxBW+1TUbENf1//2VwQI7NRBCaK
371+LLG7ThRYX66SvncMRgYjZxSABD/WqJhAOEdGCGIQWnMLkh5z+y1WCtbCfhX5
OQI0WMrMcawiYPwtgABoDhmaqkDJ+3oK1bPhY9Hb2FqBPtVV9IIqIqhBeROY7+5W
ZOFY7jRdpNZkmSrLfIuF1o32aiYImf2+oOhQB5qAPLNt3Y/FTP1vKNxm6hNtdQVH
7pQmZR/5ziJr1QbK9JGI492t1C2U1zLPXDaUV7JdQTvm1MZaY9mCHZVmW1DtfYJY
Qm0RYtCfCs0xU0CcSB3sBzincTc+d7OzItoF5h2tq6CzrfR0OAUOsueFeovGmxVH
vAFGrWAnEo5siauc35+z
=OQzK
-END PGP SIGNATURE-

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

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.1'

2013-01-09 Thread Libreoffice Gerrit user 
Tag 'libreoffice-4.0.0.1' created by Petr Mladek pmla...@suse.cz at 
2013-01-09 09:57 -0800

Tag libreoffice-4.0.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJQ7T7vAAoJEPQ0oe+v7q6jzPUQAISJv2sMa+yVbJEzob0IBhNL
zBckjKZUudL/i0L9/gCmdJ+wLw9Uym3xOB40i3eQP0r/8jAgOXnHvGIVjM0ugL/z
1fTjT0UIGstPPP683YdgaVuvW9JFkU7oZiKuU7sCWLnQt10jToFrI3+0fTf3qFXX
+8hbIvih8g9XJT2LkRMlwNBSPq3H166723rrAjjsHRpZmXPJcbBnvQqEZ5vRiZs6
9vMoWGVMZyK484rEW9KQcLLBZ4GSkto+DFAjoOjKP7OH1A9rzvQxw/yIDJTgWhMF
+XiCBZYoiaWeJLteMyN7oZA/32fMrCf2FqexzxxwlKAjQ+RrYpy4xaHydk+abkNE
8AVwVRLE1mq++lDRtOaFd8bhRMC/DWiDeiRcubEkXslWz1EBST3Lh35w2IavcE85
5z9CeovpExDrVxNB0n/wV7rWlKH6zTZ8qyv0TO5PprSDc1DmGNCO/RSOdC5Xbjcs
sW0NXH6RltarrXyag2aiWqM6F60R3JRwuxTd1NphPwUd+jOZ/RTE7bU+r+gZPwUR
LiL7tiRFLfFFrHvFsPWSELfQvfWC+jnVjoWeLoY4RPklIsUNGB2PORmw9m0RPlUG
J1BVQ6jJdzvVz6vgpPlA15VLQXRROCB1ryszGsyfHjqru97rqJt0UBPIIMSBSEj7
wWlBx4khNH8seyGJIi/Z
=i4Ei
-END PGP SIGNATURE-

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

[Libreoffice-commits] .: cui/source

2013-01-09 Thread Libreoffice Gerrit user 
 cui/source/tabpages/autocdlg.src |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f900c56a32c1b29ea6330a85dcfa38bb7fbe6ae3
Author: Christopher Copits chrisc...@live.com
Date:   Mon Jan 7 20:19:38 2013 -0500

fdo#45964 - Wrong behavior of words list in AutoCorrect  Word Completion

The MultiListBox control should be initialized with the SimpleMode 
attribute set to True.

Change-Id: I463f07530d5bbdc6d1f4a3789e039e4ce784aead
Reviewed-on: https://gerrit.libreoffice.org/1571
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 299dcf9..4cd3beb 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -797,6 +797,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
 Group = TRUE;
 Border = TRUE;
 Sort = TRUE;
+SimpleMode = TRUE;
 };
 PushButton PB_ENTRIES
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#45964 - Wrong behavior of words list in AutoCorrect Wo...

2013-01-09 Thread Miklos Vajna (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/1571

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I463f07530d5bbdc6d1f4a3789e039e4ce784aead
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christopher Copits chrisc...@live.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

Re: [PATCH] Bug 38838 - Removal/Replacement of the String/UniString with OUString once and for all.

2013-01-09 Thread julien2412 
Hi Jean-Noël,

First thank you for this big patch!
Perhaps I missed it but I didn't find a license statement from you.
Could you send a post with it? (you can take example from
http://nabble.documentfoundation.org/License-Statement-td4027832.html)

Thank you in advance.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/PATCH-Bug-38838-Removal-Replacement-of-the-String-UniString-with-OUString-once-and-for-all-tp4027737p4027922.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sfx2/doc

2013-01-09 Thread Libreoffice Gerrit user 
 sfx2/doc/sfx2doc.odg |binary
 1 file changed

New commits:
commit 0d91792ae34ca6531fbd6244d7717a2738f6a607
Author: Lennard Wasserthal wassert...@nefkom.net
Date:   Tue Jan 8 19:58:39 2013 +0100

Documentation for sfx2

Change-Id: Id0df71664891ad2ced5336a7eea65c03353bbd92
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
Reviewed-on: https://gerrit.libreoffice.org/1599
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sfx2/doc/sfx2doc.odg b/sfx2/doc/sfx2doc.odg
new file mode 100644
index 000..01d13bb
Binary files /dev/null and b/sfx2/doc/sfx2doc.odg differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Documentation for sfx2

2013-01-09 Thread Miklos Vajna (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/1599

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0df71664891ad2ced5336a7eea65c03353bbd92
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Lennard Wasserthal wassert...@nefkom.net
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

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

2013-01-09 Thread Libreoffice Gerrit user 
 vcl/inc/vcl/settings.hxx  |   10 +-
 vcl/source/app/settings.cxx   |   38 +++---
 vcl/source/window/dockingarea.cxx |8 
 vcl/source/window/menu.cxx|   12 ++--
 4 files changed, 30 insertions(+), 38 deletions(-)

New commits:
commit 0721b5b83e34de1e2fcb320d6a7deae1ad109d61
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Jan 9 11:16:47 2013 +0100

Personas: As Michael suggested, use BitmapEx instead of BitmapEx*.

Change-Id: Ib1d84b37d452785d12502095c0eedaac4a25fb6b

diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index d4d4438..8e49b2c 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -23,13 +23,13 @@
 #include tools/solar.h
 #include vcl/dllapi.h
 #include tools/color.hxx
+#include vcl/bitmapex.hxx
 #include vcl/font.hxx
 #include vcl/accel.hxx
 #include vcl/wall.hxx
 #include i18npool/languagetag.hxx
 #include unotools/syslocale.hxx
 
-class BitmapEx;
 class CollatorWrapper;
 class LocaleDataWrapper;
 
@@ -351,8 +351,8 @@ private:
 
 OUStringmaPersonaHeaderFooter; /// Cache the 
settings to detect changes.
 
-BitmapEx*   mpPersonaHeaderBitmap; /// Cache the 
header bitmap.
-BitmapEx*   mpPersonaFooterBitmap; /// Cache the 
footer bitmap.
+BitmapExmpPersonaHeaderBitmap; /// Cache the 
header bitmap.
+BitmapExmpPersonaFooterBitmap; /// Cache the 
footer bitmap.
 };
 
 #define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 )
@@ -866,8 +866,8 @@ public:
 voidSetFrameStyle( const FrameStyle rStyle )
 { CopyData(); mpData-maFrameStyle = 
rStyle; }
 
-const BitmapEx* GetPersonaHeader() const;
-const BitmapEx* GetPersonaFooter() const;
+const BitmapEx  GetPersonaHeader() const;
+const BitmapEx  GetPersonaFooter() const;
 
 voidSetStandardStyles();
 
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 17d523d..32366fa 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -34,7 +34,6 @@
 #include vcl/i18nhelp.hxx
 #include vcl/configsettings.hxx
 #include vcl/gradient.hxx
-#include vcl/bitmapex.hxx
 
 #include unotools/fontcfg.hxx
 #include unotools/localedatawrapper.hxx
@@ -204,8 +203,8 @@ sal_Bool MouseSettings::operator ==( const MouseSettings 
rSet ) const
 
 ImplStyleData::ImplStyleData() :
 maPersonaHeaderFooter(),
-mpPersonaHeaderBitmap( NULL ),
-mpPersonaFooterBitmap( NULL )
+mpPersonaHeaderBitmap(),
+mpPersonaFooterBitmap()
 {
 mnRefCount  = 1;
 mnScrollBarSize = 16;
@@ -305,8 +304,8 @@ ImplStyleData::ImplStyleData( const ImplStyleData rData ) :
 maDialogStyle( rData.maDialogStyle ),
 maFrameStyle( rData.maFrameStyle ),
 maPersonaHeaderFooter( rData.maPersonaHeaderFooter ),
-mpPersonaHeaderBitmap( rData.mpPersonaHeaderBitmap? new BitmapEx( 
*rData.mpPersonaHeaderBitmap ): NULL ),
-mpPersonaFooterBitmap( rData.mpPersonaFooterBitmap? new BitmapEx( 
*rData.mpPersonaFooterBitmap ): NULL )
+mpPersonaHeaderBitmap( rData.mpPersonaHeaderBitmap ),
+mpPersonaFooterBitmap( rData.mpPersonaFooterBitmap )
 {
 mnRefCount  = 1;
 mnBorderSize= rData.mnBorderSize;
@@ -687,7 +686,7 @@ sal_Bool StyleSettings::GetUseImagesInMenus() const
 
 // ---
 
-static BitmapEx* readBitmapEx( const OUString rPath )
+static BitmapEx readBitmapEx( const OUString rPath )
 {
 OUString aPath( rPath );
 rtl::Bootstrap::expandMacros( aPath );
@@ -695,19 +694,15 @@ static BitmapEx* readBitmapEx( const OUString rPath )
 // import the image
 Graphic aGraphic;
 if ( GraphicFilter::LoadGraphic( aPath, String(), aGraphic ) != 
GRFILTER_OK )
-return NULL;
+return BitmapEx();
 
-const BitmapEx rBitmap( aGraphic.GetBitmapEx() );
-if ( rBitmap.IsEmpty() )
-return NULL;
-
-return new BitmapEx( rBitmap );
+return aGraphic.GetBitmapEx();
 }
 
 enum WhichPersona { PERSONA_HEADER, PERSONA_FOOTER };
 
 /** Update the setting of the Persona header / footer in ImplStyleData */
-static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString 
rHeaderFooter, BitmapEx* pHeaderFooterBitmap )
+static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString 
rHeaderFooter, BitmapEx rHeaderFooterBitmap )
 {
 uno::Reference uno::XComponentContext  xContext( 
comphelper::getProcessComponentContext() );
 if ( !xContext.is() )
@@ -745,9 +740,6 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, 
OUString rHeaderFoot
 case PERSONA_FOOTER: aName = aFooter; break;
 }
 
-delete

fix Writer table functions printed wrongly

2013-01-09 Thread Tim Hardeck (via Code Review) 
Tim Hardeck has abandoned this change.

Change subject: fix Writer table functions printed wrongly
..


Patch Set 1: Abandoned

Like I have mentioned in the bug report I wasn't sure if it is the right fix 
and I didn't had much time to look into it.

Thanks for the review and the correct fix.

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Idd3a634f1e8a1f97e4ee8359a11da9793f9ac307
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Tim Hardeck thard...@suse.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

Re: [libreoffice-dev] - building difficulties with C++ extension, addIn

2013-01-09 Thread Stephan Bergmann 

Hi Neeraj,

Thank you for taking the trouble of making your Calc addin example work. 
 The SDK is indeed an area that could benefit from more maintenance 
help, lots of the documentation goes stale over time etc.


That said, I'm not sure we'll improve the overall situation by adding 
more examples directly to the SDK.  The content of the SDK is backed by 
module odk in the core LO git repo, so the example code ends up in the 
core repo, where greps and wholesale code-cleaning activities (like some 
EasyHacks) stumble upon it, modify it, etc.  But due to the awkward way 
the SDK needs to be set up for use (another area that would benefit from 
additional help), those examples do not routinely get tested (e.g., are 
not compiled and run during a build, not even a make check one).


Therefore, I wonder whether it would not make more sense to have some 
place of its own for such additional examples to reside in, like in a 
wiki or some repository similar to LO's extensions and templates sites. 
 I'll see to get that issue addressed and come back here.


Thanks again for your work and for your patience,
Stephan

On 01/08/2013 08:45 PM, Rai, Neeraj wrote:

Hi Michael,

I was able to work around the problem below by removing the platform tag.
For now, I am happy with legacy active registration.
I now have a working example of Calc extension in C++ (on lines of 
example/java/SpreadSheet/CalcAddins)
Thanks for your help.


I noticed that you are listed as one of the developers for soffice. Would you 
be able to take this code and introduce it as part of package ?
Same might be done for myRNG.tar.gz.
I think calc is an important part of soffice and having a c++ extension readily 
available would attract more users to it.
It took me days to get this working, but for anyone henceforth it should be 15 
min.

Unfortunately, I am behind firewall and can't access gerrit. I am attaching the 
file with this email.
If there is a better way to get it as part of installation, I'll be happy to 
contribute.

Thanks
Neeraj
-Original Message-
From: Rai, Neeraj [ICG-MKTS]
Sent: Monday, January 07, 2013 7:30 PM
To: Michael Stahl
Cc: 'libreoffice@lists.freedesktop.org'
Subject: [libreoffice-dev] - building difficulties with C++ extension,addIn

Hi Michael,

I tried your extension suggestion to convert 
examples/java/SpreadSheet/CalcAddins.java to C++.
I am having problem installing my extension using unpkg.
Error : The extension my simple extension does not work on this computer.
I tried various values in META-INF/manifest.xml : platform=linux_x86_64 and 
platform=all but I get the same error.

I probably did something wrong transporting the xml files or oxt files from the 
example.
The original example in java works for me.
Would you happen to have expertise in this area and time to help me out ?

I also came across the following link which states that regmerge is legacy. 
However, the CalcAddIn was using it, so I went with it too.
http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Deployment_Options_for_Components
If that is the not the right way forward, please point me in the right 
direction.

Thanks
Neeraj

-Original Message-
From: Michael Stahl [mailto:mst...@redhat.com]
Sent: Thursday, January 03, 2013 3:44 PM
To: Rai, Neeraj [ICG-MKTS]
Cc: 'libreoffice@lists.freedesktop.org'
Subject: Re: [libreoffice-dev] - architecture question about 
interproces,extension,addIn

hi Neeraj,

On 03/01/13 16:54, Rai, Neeraj wrote:


Based on above text, I looked at addIns but it doesn't seem like what I
need.  I don't want to be restricted to a function call. I need a
component running in scalc.

_http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet_Add-Ins_

Can someone please advise what is the fastest code as a C++ UNO
component  mean and where can I find more docs related to it.


C++ UNO components that are instantiated in-process currently do not go
through a bridge when interacting with the LO API (although there have
been varying opinions about changing that, since it makes maintaining
backward compatibility more difficult): for such components, calling a
LO API method (or being called from LO itself) is just a C++ virtual
function call.

the best documented way to get this performance benefit is to implement
your client code as an extension.

http://wiki.openoffice.org/wiki/Documentation/DevGuide/Extensions/Extensions

there may also be a way to get there with less efforts, there are some
variables to add additional service rdbs to the soffice process
(URE_MORE_SERVICES/URE_MORE_TYPES) but i don't have any experience with
them; probably there is some way to implement what you want to do as a
service and then start it from inside soffice, if all else fails via a
trivial BASIC macro :)

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

minor String to OUString in svx

2013-01-09 Thread Miklos Vajna (via Code Review) 
Miklos Vajna has abandoned this change.

Change subject: minor String to OUString in svx
..


Patch Set 2: Abandoned

Sorry, this is ugly. Please convert TakeSdrDragComment() first.

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I36c83605c0bb4180e879cab6cd39baa2aa441c12
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com

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

Crash on Right-click on misspelled word

2013-01-09 Thread Samuel Mehrbrodt 
In my build (Jan 7th, I755ea5b2ec7b6357a7fd2c86ec8479737696042b) I have 
a crash in Writer when I right-click on a misspelled word.

Do I need to update or is this a bug that is still there?

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

[Libreoffice-commits] .: Branch 'feature/rb1' - 0 commits -

2013-01-09 Thread Libreoffice Gerrit user 
Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: src/docrecord.py src/docstream.py test/doc

2013-01-09 Thread Miklos Vajna 
 src/docrecord.py   |   61 +
 src/docstream.py   |5 +++-
 test/doc/field.doc |binary
 test/doc/field.rtf |8 ++
 test/doc/test.py   |9 +++
 5 files changed, 82 insertions(+), 1 deletion(-)

New commits:
commit 134ed95ebe314473ad094f0ee0cf1dbad49e
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Jan 9 11:38:36 2013 +0100

dump PlcFld

diff --git a/src/docrecord.py b/src/docrecord.py
index 0aa271d..9e30066 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -142,6 +142,67 @@ class PlcfBkf(DOCDirStream, PLC):
 print '/aCP'
 print '/plcfBkf'
 
+class Fldch(DOCDirStream):
+The fldch structure determines the type of the field character.
+def __init__(self, parent):
+DOCDirStream.__init__(self, parent.bytes)
+self.pos = parent.pos
+self.parent = parent
+
+def dump(self):
+print 'fldch type=fldch offset=%d size=1 byte' % self.pos
+buf = self.readuInt8()
+self.printAndSet(ch, buf  0x1f) # 1..5th bits
+self.printAndSet(reserved, (buf  0xe0)  5) # 6..8th bits
+print '/fldch'
+self.parent.pos = self.pos
+
+class Fld(DOCDirStream):
+The Fld structure specifies a field character.
+def __init__(self, parent, offset):
+DOCDirStream.__init__(self, parent.bytes)
+self.pos = offset
+
+def dump(self):
+print 'fld type=FLD offset=%d size=2 bytes' % self.pos
+self.fldch = Fldch(self)
+self.fldch.dump()
+self.printAndSet(grffld, self.readuInt8()) # TODO parse flt and 
grffldEnd
+print '/fld'
+
+class PlcFld(DOCDirStream, PLC):
+The Plcfld structure specifies the location of fields in the 
document.
+def __init__(self, mainStream):
+DOCDirStream.__init__(self, 
mainStream.doc.getDirectoryStreamByName(1Table).bytes, mainStream = 
mainStream)
+PLC.__init__(self, mainStream.lcbPlcfFldMom, 2) # 2 is defined by 
2.8.25
+self.pos = mainStream.fcPlcfFldMom
+self.size = mainStream.lcbPlcfFldMom
+
+def dump(self):
+print 'plcFld type=PlcFld offset=%d size=%d bytes' % 
(self.pos, self.size)
+offset = self.mainStream.fcMin # 2.8.25: CPs relative to the start of 
that document part.
+pos = self.pos
+aFlds = []
+for i in range(self.getElements()):
+# aCp
+value = self.getuInt32(pos = pos)
+print 'aCP index=%d value=%d' % (i, value)
+pos += 4
+
+# aFld
+aFld = Fld(self, self.getOffset(self.pos, i))
+aFld.dump()
+
+# This is a separator and the previous was a start: display the 
field instructions.
+if aFld.fldch.ch == 0x14 and aFlds[-1][1].fldch.ch == 0x13:
+print 'transformed value=%s/' % 
self.quoteAttr(self.mainStream.retrieveText(offset + aFlds[-1][0] + 1, offset + 
value))
+# This is an end and the previous was a separator: display the 
field result.
+elif aFld.fldch.ch == 0x15 and aFlds[-1][1].fldch.ch == 0x14:
+print 'transformed value=%s/' % 
self.quoteAttr(self.mainStream.retrieveText(offset + aFlds[-1][0] + 1, offset + 
value))
+aFlds.append((value, aFld))
+print '/aCP'
+print '/plcFld'
+
 class PlcfBkl(DOCDirStream, PLC):
 The Plcfbkl structure is a PLC that contains only CPs and no additional 
data.
 def __init__(self, mainStream, offset, size):
diff --git a/src/docstream.py b/src/docstream.py
index 167fb9c..a0aba5e 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -236,7 +236,7 @@ class WordDocumentStream(DOCDirStream):
 [fcSttbfFfn],
 [lcbSttbfFfn, self.handleLcbSttbfFfn],
 [fcPlcfFldMom],
-[lcbPlcfFldMom],
+[lcbPlcfFldMom, self.handleLcbPlcfFldMom],
 [fcPlcfFldHdr],
 [lcbPlcfFldHdr],
 [fcPlcfFldFtn],
@@ -509,6 +509,9 @@ class WordDocumentStream(DOCDirStream):
 def handleLcbDggInfo(self):
 docrecord.OfficeArtContent(self).dump()
 
+def handleLcbPlcfFldMom(self):
+docrecord.PlcFld(self).dump()
+
 def dumpFibRgFcLcb97(self, name):
 print '%s type=FibRgFcLcb97 size=744 bytes' % name
 self.__dumpFibRgFcLcb97()
diff --git a/test/doc/field.doc b/test/doc/field.doc
new file mode 100644
index 000..247f024
Binary files /dev/null and b/test/doc/field.doc differ
diff --git a/test/doc/field.rtf b/test/doc/field.rtf
new file mode 100644
index 000..48e39d1
--- /dev/null
+++ b/test/doc/field.rtf
@@ -0,0 +1,8 @@
+{\rtf1
+Page number:
+{\field
+{\*\fldinst  PAGE }
+{\fldrslt 1}
+}
+\par
+}
diff --git a/test/doc/test.py b/test/doc/test.py
index a97d0f5..c2b955c 100755
--- a/test/doc/test.py
+++ b/test/doc/test.py
@@ -137,6 +137,15 @@ class Test(unittest.TestCase):
 # This first caused unhandled exceptions, then later invalid XML 
output.

fix problem with missing .po files

2013-01-09 Thread via Code Review 
Matúš Kukan has abandoned this change.

Change subject: fix problem with missing .po files
..


Patch Set 1: Abandoned

This was done in 
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=2e8fb5803f2c9caed25e7a0a1c4cd1dba69f8cb0

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ieaeee17edd16cf58ac72b74810d1932769bb60a9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com
Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com

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

[ANNOUNCE] libreoffice-4.0.0.1 tag created

2013-01-09 Thread Petr Mladek 
Hi,

there have been created the libreoffice-4.0.0.1 tag (aka rc1). The
corresponding official builds will be available within next few days.

IMPORTANT: We are in rc phase, so all commits into the 3-6 branch need
a single reviewer approval from now on!

See the attached list of changes against 4.0.0.0.beta2.
See also http://wiki.documentfoundation.org/ReleaseNotes/4.0


Now, you might switch your current 4-0 source tree to it using:

./g fetch --tags
./g checkout -b tag-libreoffice-4.0.0.1 libreoffice-4.0.0.1

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will be available from the official page together with the builds.


See also the schedule at 
http://wiki.documentfoundation.org/ReleasePlan#4.0_release
and release criteria at http://wiki.documentfoundation.org/Release_Criteria


Best Regards,
Petr
bnc#793262 fix DOCX import of last empty header/footer para char props [Miklos Vajna]
bnc#793998 sw: add TabOverMargin compat mode [Miklos Vajna]
fdo#33090 Thai text in some UI elements will be displayed overlapped on Windows Vista / Windows 7 [Michael Stahl]
fdo#38090 Incorrect Viewing of Thai characters after certain characters [Michael Stahl]
fdo#40465 changing zoom in Writer makes the display jump to wrong page [Winfried Donkers]
fdo#42978 Basic IDE UI: Changed language of strings not immediately displayed in dialog form [Noel Power]
fdo#45183 FILEOPEN - broken layout of rtf document [Miklos Vajna]
fdo#45266 postition of imported chart/shapes from xlsx is bad [Kohei Yoshida]
fdo#47466 FORMATTING: Autoformat empty rows causes app to crash [Julien Nabet]
fdo#47553 FILEOPEN document with Punjabi Font will CRASH [Michael Stahl]
fdo#49277 PPT EXPORT: Tabulators are displaced after exporting to PPT format [David Tardon]
fdo#50284 FILEOPEN .doc/.docx (MSO2007) Bullet lists show wrong bullet symbols MacOS X [Caolán McNamara]
fdo#50415 Shortcut names are not localized on Linux [Jesús Corrius]
fdo#53521 crash when running shell() with a non-existent program [Christopher Copits]
fdo#53604 error in saving empty footnote in RTF format [Miklos Vajna]
fdo#54165 Unable to localize key names [Jesús]
fdo#54336 EDITING: Input in a timestamp-field only with completed date-input possible [Eike Rathke]
fdo#54344 TABLE: Date Number Formatting ISO 8601 with wrong number recognition result, Day becomes Year, Day always 1 [Eike Rathke]
fdo#54612 Pictures not rendered and text missing when rendering RTF document [Miklos Vajna]
fdo#55044 VIEWING of particular DRAW OLE object incomplete, pixel picture in it is missing [Michael Stahl]
fdo#55174 Calc IMPORT: crash during opening of xlsx document [backtrace with symbols attached [Kohei Yoshida]
fdo#56267 Resuming after (OS) crash wil not allow new document while a document titled Untitled 1 is open. [David Tardon]
fdo#56278 EDITING: Calculate formula: DEl or BS to empty a cell with a formula, does not result in updating a formula referencing that cell [Kohei Yoshida]
fdo#56937 EDITING: freeze when drag-and-drop from Calc input line to anywhere on OSX when BetterTouchTool option window snapping is active [Michael Meeks]
fdo#56970 switching between sheets with different directionality hides the + button for new sheet [Issa Alkurtass]
fdo#56980 EDITING: Custom shape becomes text field or disappears when editing text or color from saved file [David Tardon]
fdo#57203 Launching .vbs before LibO causes error Unknown option: -Embedding and command line help appears [Aurimas Fišeras]
fdo#57530 FILEOPEN XLS: Severe performance regressions in LO compared to Open Office [Markus Mohrhard]
fdo#57678 FILEOPEN: TABLES from particular RTF file imported as plain text [Miklos Vajna]
fdo#57881 FORMATTING Page style Default has Page layout 'Mirrored' as default - also for existing documents [Miklos Vajna]
fdo#57886 formula mangled when FILEOPEN particular .RTF [Miklos Vajna]
fdo#57896 EDITING: duration for copy or deletion of 1 sheet depends on number of sheets with CONDITIONAL FORMATTING in document. [Markus Mohrhard]
fdo#58004 PIVOTTABLE does not keep date format and crash while grouping [Kohei Yoshida]
fdo#58074 Writer table functions are not calculated before printing [Michael Stahl]
fdo#58076 RTF FILEOPEN import result 2 pages (1 page in LO 3.4) [Miklos Vajna]
fdo#58129 FILESAVE as ppt and pps (MSO97): rejected by MSO with warning message [David Tardon]
fdo#58179 FORMATTING: Cell rendering differs from version 3.6.4.3 [Eike Rathke]
fdo#58222 BASIC's HEX Command since V3.6.1 (when bug 42492 fix was applied) now returns lower case a to f characters [Christopher Copits]
fdo#58267 weakref / lifecycle nightmare on calc draw shape load [David Tardon]
fdo#58269 Macros: OnPrint Event [Noel Power]
fdo#58306 Extension CT2N crashes on function Input (from File) [Noel Power, Luboš Luňák]
fdo#58331 Fatal error during startup (migration of legacy .zip extension fails) [Stephan Bergmann]
fdo#58340 FORMATTING: Conditional formatting 'Date is Next...'

[PATCH] Change in core[libreoffice-4-0]: Resolves: fdo#58589 recovery dialog title area text is missi...

2013-01-09 Thread via Code Review 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1606

To pull it, you can do:

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

Resolves: fdo#58589 recovery dialog title area text is missing

regression since efc6b840a0423099d6c3e0d33c14d34637fbba4c
as that changes the order in which windows are drawn

Change-Id: I37388229533127ab915bec351f094fcd4786b2a3
(cherry picked from commit f8a4ce67987e5cb47f07dc61eeb450e1d5b9c541)
---
M svx/source/dialog/docrecovery.cxx
M svx/source/inc/docrecovery.hxx
2 files changed, 2 insertions(+), 2 deletions(-)



diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index 3f9d4de..277d9ec 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -987,8 +987,8 @@
 RecoveryDialog::RecoveryDialog(Window*   pParent,
RecoveryCore* pCore  )
 : IExtendedTabPage( pParent  , SVX_RES( 
RID_SVXPAGE_DOCRECOVERY_RECOVER ) )
-, m_aTitleWin   ( this   , SVX_RES  ( WIN_RECOV_TITLE  
  ) )
 , m_aTitleFT( this   , SVX_RES  ( FT_RECOV_TITLE   
  ) )
+, m_aTitleWin   ( this   , SVX_RES  ( WIN_RECOV_TITLE  
  ) )
 , m_aTitleFL( this   , SVX_RES  ( FL_RECOV_TITLE   
  ) )
 , m_aDescrFT( this   , SVX_RES  ( FT_RECOV_DESCR   
  ) )
 , m_aProgressFT ( this   , SVX_RES  ( FT_RECOV_PROGR   
  ) )
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index f3e47e0..171c34d 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -606,8 +606,8 @@
 //---
 // member
 private:
-Window  m_aTitleWin;
 FixedText   m_aTitleFT;
+Window  m_aTitleWin;
 FixedLine   m_aTitleFL;
 FixedText   m_aDescrFT;
 FixedText   m_aProgressFT;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37388229533127ab915bec351f094fcd4786b2a3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com

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

Re: [PUSHED 4.0] LATE FEATURE: Personas in LibreOffice

2013-01-09 Thread Stefan Knorr (Astron) 
Hi all,

so, some of you know, I have soem reservations about this feature...
be that as it may, I have a small number of comments still:

* there are some spelling/grammar errors:
** the button for selecting the background image has the word Backround on it
** the window for Select a persona has the sentence Find persona you
like on it – lacks an a before persona
** also in that window: Then copy the URL of page [...] – lacking a
the before page

* I fear that enough people don't know what URL means, may I propose
web address as a more accessible replacement?

* What is the difference between default persona and no persona
(currently, at least)? I would remove this option until we decide we
want to ship a persona by default.

* Downloading personas appears to be synchronous, leading to visible
UI lag and Windows adding (doesn't respond) to the titlebar of the
LibO window with my (admittedly somewhat slow (1000 Mb/s)) connection
speed – it would be much better to make this ascynchronous.

On 9 January 2013 09:54, Petr Mladek pmla...@suse.cz wrote:
 Hmm, it does not show the saved url in the options dialog. Instead, it
 shows URL template (http://www.getpersonas.com). I wonder if it is a
 feature.

I agree that it would be nice to see the name and URL of the current
persona somewhere, though not necessarily in the Persona Selection
dialogue itself. I guess the name could be on the preferences page,
e.g. directly after the use own persona option. Not sure about where
to put the URL...


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

[PATCH] Change in core[libreoffice-3-6]: Resolves: fdo#58589 recovery dialog title area text is missi...

2013-01-09 Thread via Code Review 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1607

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/1607/1

Resolves: fdo#58589 recovery dialog title area text is missing

regression since efc6b840a0423099d6c3e0d33c14d34637fbba4c
as that changes the order in which windows are drawn

Change-Id: I37388229533127ab915bec351f094fcd4786b2a3
(cherry picked from commit f8a4ce67987e5cb47f07dc61eeb450e1d5b9c541)
---
M svx/source/dialog/docrecovery.cxx
M svx/source/inc/docrecovery.hxx
2 files changed, 2 insertions(+), 2 deletions(-)



diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index 4c0c96a..412c938 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -998,8 +998,8 @@
 RecoveryDialog::RecoveryDialog(Window*   pParent,
RecoveryCore* pCore  )
 : IExtendedTabPage( pParent  , SVX_RES( 
RID_SVXPAGE_DOCRECOVERY_RECOVER ) )
-, m_aTitleWin   ( this   , SVX_RES  ( WIN_RECOV_TITLE  
  ) )
 , m_aTitleFT( this   , SVX_RES  ( FT_RECOV_TITLE   
  ) )
+, m_aTitleWin   ( this   , SVX_RES  ( WIN_RECOV_TITLE  
  ) )
 , m_aTitleFL( this   , SVX_RES  ( FL_RECOV_TITLE   
  ) )
 , m_aDescrFT( this   , SVX_RES  ( FT_RECOV_DESCR   
  ) )
 , m_aProgressFT ( this   , SVX_RES  ( FT_RECOV_PROGR   
  ) )
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 1159f01..9eeb3c3 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -631,8 +631,8 @@
 //---
 // member
 private:
-Window  m_aTitleWin;
 FixedText   m_aTitleFT;
+Window  m_aTitleWin;
 FixedLine   m_aTitleFL;
 FixedText   m_aDescrFT;
 FixedText   m_aProgressFT;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37388229533127ab915bec351f094fcd4786b2a3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Caolán McNamara caol...@redhat.com

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

[Libreoffice-commits] .: connectivity/Library_mozabdrv.mk

2013-01-09 Thread Libreoffice Gerrit user 
 connectivity/Library_mozabdrv.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 06bdea2aa9d6b7e2f47f2012a1d8aaa701ad5932
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Jan 9 12:59:03 2013 +0100

Library_mozabdrv: use nss3 for prtypes.h header

Change-Id: Id7c030410db0a67c22f2cbaaed417c4371bca361

diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk
index b73efc2..99944b3 100644
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\
 
 $(eval $(call gb_Library_use_externals,mozabdrv,\
mozilla \
+   nss3 \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,mozabdrv,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] xmlsecurity: remove obsolete tools directory

2013-01-09 Thread via Code Review 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1608

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/1608/1

xmlsecurity: remove obsolete tools directory

Change-Id: I5a1df11c18eb5932651ee381fae29f2ac0697b6a
---
D xmlsecurity/tools/examples/demo-sample.gif
D xmlsecurity/tools/examples/demo-sample.sxw
D xmlsecurity/tools/examples/demo-sample.xml
D xmlsecurity/tools/examples/enc-1.xml
D xmlsecurity/tools/examples/enc-2.xml
D xmlsecurity/tools/examples/eval_export.txt
D xmlsecurity/tools/examples/eval_import.txt
D xmlsecurity/tools/examples/evaluate_win.bat
D xmlsecurity/tools/examples/readme.txt
D xmlsecurity/tools/examples/s-in-e-1.xml
D xmlsecurity/tools/examples/s-in-e-2.xml
D xmlsecurity/tools/examples/sign-0.xml
D xmlsecurity/tools/examples/sign-1.xml
D xmlsecurity/tools/examples/sign-2.xml
D xmlsecurity/tools/examples/sign-3.xml
D xmlsecurity/tools/examples/sign-4.xml
D xmlsecurity/tools/examples/sign-5.xml
D xmlsecurity/tools/examples/uno_win.bat
D xmlsecurity/tools/examples/warmup.xml
D xmlsecurity/tools/standalone/csfit/certmngr.cxx
D xmlsecurity/tools/standalone/csfit/decrypter.cxx
D xmlsecurity/tools/standalone/csfit/encrypter.cxx
D xmlsecurity/tools/standalone/csfit/helper.cxx
D xmlsecurity/tools/standalone/csfit/helper.hxx
D xmlsecurity/tools/standalone/csfit/makefile.mk
D xmlsecurity/tools/standalone/csfit/signer.cxx
D xmlsecurity/tools/standalone/csfit/util/makefile.mk
D xmlsecurity/tools/standalone/csfit/verifier.cxx
D xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
D xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
D xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
D xmlsecurity/tools/standalone/mscsfit/helper.cxx
D xmlsecurity/tools/standalone/mscsfit/helper.hxx
D xmlsecurity/tools/standalone/mscsfit/makefile.mk
D xmlsecurity/tools/standalone/mscsfit/signer.cxx
D xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
D xmlsecurity/tools/standalone/mscsfit/verifier.cxx
D xmlsecurity/tools/standalone/readme.txt
D xmlsecurity/tools/uno/AdapterNode.java
D xmlsecurity/tools/uno/AttributeListHelper.java
D xmlsecurity/tools/uno/DomToTreeModelAdapter.java
D xmlsecurity/tools/uno/EncryptionEntity.java
D xmlsecurity/tools/uno/ParsingThread.java
D xmlsecurity/tools/uno/SAXEventCollector.java
D xmlsecurity/tools/uno/SAXEventPrinter.java
D xmlsecurity/tools/uno/SecurityEntity.java
D xmlsecurity/tools/uno/SignatureEntity.java
D xmlsecurity/tools/uno/TestTool.java
D xmlsecurity/tools/uno/UnsolvedReferenceTableModel.java
D xmlsecurity/tools/uno/XMLFileFilter.java
D xmlsecurity/tools/uno/XMLSecurityFrameworkController.java
D xmlsecurity/tools/uno/XMLTreeCellRanderer.java
D xmlsecurity/tools/uno/current.gif
D xmlsecurity/tools/uno/makefile.mk
54 files changed, 0 insertions(+), 9,917 deletions(-)




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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a1df11c18eb5932651ee381fae29f2ac0697b6a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com

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

[Libreoffice-commits] .: cui/uiconfig

2013-01-09 Thread Libreoffice Gerrit user 
 cui/uiconfig/ui/personalization_tab.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad4c7b5130767008c55b5711ddbdbe7b08bd6f4f
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Jan 9 13:23:20 2013 +0100

Personas: Fix typo (Backround - Background).

Change-Id: Ib12a0726883ee1aaac87d4d02c7bae595f7f9e39

diff --git a/cui/uiconfig/ui/personalization_tab.ui 
b/cui/uiconfig/ui/personalization_tab.ui
index f6f11be..fe58ddb 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -78,7 +78,7 @@
 /child
 child
   object class=GtkButton id=select_background
-property name=label translatable=yesSelect 
Backround Image/property
+property name=label translatable=yesSelect 
Background Image/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svx/source

2013-01-09 Thread Libreoffice Gerrit user 
 svx/source/dialog/compressgraphicdialog.cxx |6 +++---
 svx/source/svdraw/svdattr.cxx   |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e070b852074dd6f90128832ac0da3ef96e868d77
Author: Luboš Luňák l.lu...@suse.cz
Date:   Wed Jan 9 13:36:39 2013 +0100

lame_OUString_valueOf_sal_Int32_casts += 6;

diff --git a/svx/source/dialog/compressgraphicdialog.cxx 
b/svx/source/dialog/compressgraphicdialog.cxx
index 6a8b466..74a5435 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -123,7 +123,7 @@ void CompressGraphicsDialog::Update()
 aViewSizeString += String(  x  ) ;
 aViewSizeString += GetUnitString( m_aViewSize100mm.Height(), eFieldUnit, 
cSeparator );
 aViewSizeString += (  at  ) ;
-aViewSizeString += OUString::valueOf(aValX);
+aViewSizeString += OUString::valueOf( static_cast sal_Int32 (aValX));
 aViewSizeString += (  DPI ) ;
 m_pFixedText3-SetText(aViewSizeString);
 
@@ -144,13 +144,13 @@ void CompressGraphicsDialog::Update()
 void CompressGraphicsDialog::UpdateNewWidthMF()
 {
 int nPixelX = (sal_Int32)( GetViewWidthInch() * m_dResolution );
-m_pMFNewWidth-SetText( OUString::valueOf( nPixelX ) );
+m_pMFNewWidth-SetText( OUString::valueOf( static_cast sal_Int32 ( 
nPixelX ) ));
 }
 
 void CompressGraphicsDialog::UpdateNewHeightMF()
 {
 int nPixelY = (sal_Int32)( GetViewHeightInch() * m_dResolution );
-m_pMFNewHeight-SetText( OUString::valueOf( nPixelY ) );
+m_pMFNewHeight-SetText( OUString::valueOf( static_cast sal_Int32 ( 
nPixelY ) ));
 }
 
 void CompressGraphicsDialog::UpdateResolutionLB()
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 6146515..45042dd 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -817,7 +817,7 @@ SfxItemPresentation SdrPercentItem::GetPresentation(
 SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/,
 SfxMapUnit /*ePresMetric*/, XubString rText, const IntlWrapper *) const
 {
-rText = OUString::valueOf(GetValue());
+rText = OUString::valueOf( static_cast sal_Int32 (GetValue()));
 rText += sal_Unicode('%');
 
 if(ePres == SFX_ITEM_PRESENTATION_COMPLETE)
@@ -1301,7 +1301,7 @@ SfxItemPresentation SdrTextAniDelayItem::GetPresentation(
 SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit 
/*ePresMetric*/,
 XubString rText, const IntlWrapper *) const
 {
-rText = OUString::valueOf(GetValue());
+rText = OUString::valueOf( static_cast sal_Int32 ( GetValue()));
 rText += sal_Unicode('m');
 rText += sal_Unicode('s');
 
@@ -2058,7 +2058,7 @@ SfxItemPresentation SdrSignedPercentItem::GetPresentation(
 SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit 
/*ePresMetric*/,
 XubString rText, const IntlWrapper *) const
 {
-rText = OUString::valueOf(GetValue());
+rText = OUString::valueOf( static_cast sal_Int32 ( GetValue()));
 rText += sal_Unicode('%');
 
 if(ePres == SFX_ITEM_PRESENTATION_COMPLETE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] Documentation for sfx2

2013-01-09 Thread Stephan Bergmann 

On 01/09/2013 11:14 AM, Miklos Vajna (via Code Review) wrote:

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

If you are interested in details, please visit

 https://gerrit.libreoffice.org/1599

Approvals:
   Miklos Vajna: Verified; Looks good to me, approved


Do people generally consider it a good idea to include binary 
documentation files (rather than some helpful ASCII art in the existing 
*/README files, say) in the core repo?  I personally consider it not 
very practical.


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

[Libreoffice-commits] .: vcl/generic vcl/inc vcl/unx

2013-01-09 Thread Libreoffice Gerrit user 
 vcl/generic/print/genprnpsp.cxx |1 +
 vcl/inc/vcl/jobdata.hxx |3 ++-
 vcl/unx/generic/printer/jobdata.cxx |8 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 9c4d77f22d58f5b500c95f65a431628a8d8d6e6e
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jan 9 12:44:09 2013 +

Resolves: fdo#59131 resolve default backend on printer-setup

For setting permanent defaults via spadmin we don't want to resolve the
default backend on saving default, this happens during the print
initialization stuff.

But when we tweak the printer settings for a single print job and reset 
back to
default, we need to resolve that to what backend we want

Change-Id: Iac2370624b6d248c9658fb0fbc2f2d449849d81a

diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 9949eae..6800e01 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -584,6 +584,7 @@ sal_Bool PspSalInfoPrinter::Setup( SalFrame* pFrame, 
ImplJobSetup* pJobSetup )
 
 if( pSetupFunction( aInfo ) )
 {
+aInfo.resolveDefaultBackend();
 rtl_freeMemory( pJobSetup-mpDriverData );
 pJobSetup-mpDriverData = NULL;
 
diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx
index 577e0fa..3f81877 100644
--- a/vcl/inc/vcl/jobdata.hxx
+++ b/vcl/inc/vcl/jobdata.hxx
@@ -68,7 +68,8 @@ struct VCL_DLLPUBLIC JobData
 void setCollate( bool bCollate );
 bool setPaper( int nWidth, int nHeight ); // dimensions in pt
 bool setPaperBin( int nPaperBin ); // dimensions in pt
-void setDefaultBackend( bool bUsePDF );
+void resolveDefaultBackend();
+void setDefaultBackend(bool bUsePDF);
 
 // creates a new buffer using new
 // it is up to the user to delete it again
diff --git a/vcl/unx/generic/printer/jobdata.cxx 
b/vcl/unx/generic/printer/jobdata.cxx
index 385ed02..c55f64a 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -18,9 +18,9 @@
  */
 
 
+#include officecfg/Office/Common.hxx
 #include vcl/jobdata.hxx
 #include vcl/printerinfomanager.hxx
-
 #include tools/stream.hxx
 
 #include sal/alloca.h
@@ -269,6 +269,12 @@ bool JobData::constructFromStreamBuffer( void* pData, int 
bytes, JobData rJobDa
 return bVersion  bPrinter  bOrientation  bCopies  bContext  
bMargin  bPSLevel  bPDFDevice  bColorDevice  bColorDepth;
 }
 
+void JobData::resolveDefaultBackend()
+{
+if (m_nPSLevel == 0  m_nPDFDevice == 0)
+
setDefaultBackend(officecfg::Office::Common::Print::Option::Printer::PDFAsStandardPrintJobFormat::get());
+}
+
 void JobData::setDefaultBackend(bool bUsePDF)
 {
 if (bUsePDF  m_nPSLevel == 0  m_nPDFDevice == 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/uiconfig

2013-01-09 Thread Libreoffice Gerrit user 
 cui/uiconfig/ui/select_persona_dialog.ui |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1c04ef068cf56568e5077cf9ed565481e7708901
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Jan 9 13:50:34 2013 +0100

Personas: Improved wording (URL - address, and related changes).

Change-Id: Iaa2841b245ccd3de513296a10e33a93bc1cb68a2

diff --git a/cui/uiconfig/ui/select_persona_dialog.ui 
b/cui/uiconfig/ui/select_persona_dialog.ui
index 1e7d333..9ac7351 100644
--- a/cui/uiconfig/ui/select_persona_dialog.ui
+++ b/cui/uiconfig/ui/select_persona_dialog.ui
@@ -85,7 +85,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=xalign0/property
-property name=label translatable=yesFirst visit Firefox 
Personas (http://www.getpersonas.com). Find Persona you like, and want to 
choose for LibreOffice./property
+property name=label translatable=yesFirst visit Firefox 
Personas (http://www.getpersonas.com). Find a Persona you like, and want to 
choose for LibreOffice./property
 property name=wrapTrue/property
 property name=max_width_chars54/property
   /object
@@ -133,7 +133,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=xalign0/property
-property name=label translatable=yesThen copy the URL of 
page that contains the Persona to clipboard, paste it to the input field below, 
and confirm with OK./property
+property name=label translatable=yesThen, in your web 
browser's location bar, copy the address of the page that contains the Persona 
to clipboard, and paste it to the input field below./property
 property name=wrapTrue/property
 property name=max_width_chars54/property
   /object
@@ -148,7 +148,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=xalign0/property
-property name=label translatable=yesPersona 
URL:/property
+property name=label translatable=yesPersona 
address:/property
   /object
   packing
 property name=expandFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GTK theming: oxygen-gtk support broken

2013-01-09 Thread Michael Meeks 
Hi Ruslan,

On Sat, 2013-01-05 at 22:59 +0300, Ruslan Kabatsayev wrote:
 What about such a simple change, which will let us set LibO version
 once and for all GTK theme calls:

I guess we could do; we'd want to produce a real version string for a
patch though :-)

The reason why I put it on the top-level windows was so that it can be
avoided for native widgets (eg. the gtk+ file selector) - but if that's
not an issue then fine :-)

  // init gtk/gdk
  gtk_init_check( nParams, pCmdLineAry );
 +g_setenv(LibreOffice_Version,4.0.0.0,true);
  gdk_error_trap_push();
  aOrigXIOErrorHandler = XSetIOErrorHandler(XIOErrorHdl);

 
 Of course, 4.0.0.0 should be replaced by some variable, name of
 which I currently don't know. But how do you like this idea? It seems
 the easiest and most efficient compared to any g_object_set_data()
 way.

The g_object_set_data stuff is already in:

+static char pVersion[16] = ;
+if( pVersion[0] == '\0' )
+g_sprintf( pVersion, %d, SUPD );
+g_object_set_data( G_OBJECT( m_pWindow ), libo-version, pVersion );
+

should be in 4.0 and master.

I wonder if we get problems from the (un-parented) fake widgets that
are used in the salnativewidgets-gtk pile [ could that be why it doesn't
work for you ? ].

If that's the issue (and most likely it is) - then we'd want to add a
similar chunk of version code to the above to:

static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen )

Where we construct and realize the cache window (I guess).

Using SUPD is reasonably easy - it is a 4.0.0 - 400 thing: not
terribly robust over big versions, but easy enough to parse I guess.

If you propose a patch, we can get it into 4.0.1rc2 !

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-4-0]: Resolves: fdo#59131 resolve default backend on printer-setu...

2013-01-09 Thread via Code Review 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1609

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/1609/1

Resolves: fdo#59131 resolve default backend on printer-setup

For setting permanent defaults via spadmin we don't want to resolve the
default backend on saving default, this happens during the print
initialization stuff.

But when we tweak the printer settings for a single print job and reset back to
default, we need to resolve that to what backend we want

Change-Id: Iac2370624b6d248c9658fb0fbc2f2d449849d81a
(cherry picked from commit 9c4d77f22d58f5b500c95f65a431628a8d8d6e6e)
---
M vcl/generic/print/genprnpsp.cxx
M vcl/inc/vcl/jobdata.hxx
M vcl/unx/generic/printer/jobdata.cxx
3 files changed, 10 insertions(+), 2 deletions(-)



diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 9949eae..6800e01 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -584,6 +584,7 @@
 
 if( pSetupFunction( aInfo ) )
 {
+aInfo.resolveDefaultBackend();
 rtl_freeMemory( pJobSetup-mpDriverData );
 pJobSetup-mpDriverData = NULL;
 
diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx
index 577e0fa..3f81877 100644
--- a/vcl/inc/vcl/jobdata.hxx
+++ b/vcl/inc/vcl/jobdata.hxx
@@ -68,7 +68,8 @@
 void setCollate( bool bCollate );
 bool setPaper( int nWidth, int nHeight ); // dimensions in pt
 bool setPaperBin( int nPaperBin ); // dimensions in pt
-void setDefaultBackend( bool bUsePDF );
+void resolveDefaultBackend();
+void setDefaultBackend(bool bUsePDF);
 
 // creates a new buffer using new
 // it is up to the user to delete it again
diff --git a/vcl/unx/generic/printer/jobdata.cxx 
b/vcl/unx/generic/printer/jobdata.cxx
index 385ed02..c55f64a 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -18,9 +18,9 @@
  */
 
 
+#include officecfg/Office/Common.hxx
 #include vcl/jobdata.hxx
 #include vcl/printerinfomanager.hxx
-
 #include tools/stream.hxx
 
 #include sal/alloca.h
@@ -269,6 +269,12 @@
 return bVersion  bPrinter  bOrientation  bCopies  bContext  
bMargin  bPSLevel  bPDFDevice  bColorDevice  bColorDepth;
 }
 
+void JobData::resolveDefaultBackend()
+{
+if (m_nPSLevel == 0  m_nPDFDevice == 0)
+
setDefaultBackend(officecfg::Office::Common::Print::Option::Printer::PDFAsStandardPrintJobFormat::get());
+}
+
 void JobData::setDefaultBackend(bool bUsePDF)
 {
 if (bUsePDF  m_nPSLevel == 0  m_nPDFDevice == 0)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac2370624b6d248c9658fb0fbc2f2d449849d81a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com

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

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

2013-01-09 Thread Libreoffice Gerrit user 
 sc/qa/unit/subsequent_filters-test.cxx |   10 ++
 sd/source/ui/dlg/prltempl.cxx  |3 ++-
 sd/source/ui/func/fuprobjs.cxx |2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 004c72330a132bbff09267459b35decdea3d8cf6
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Jan 9 13:02:42 2013 +

lame_OUString_valueOf_sal_Int32_casts += 2;

diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 787d717..625c191 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -213,7 +213,8 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( 
SfxObjectShell* pDocSh,
 case PO_OUTLINE_7:
 case PO_OUTLINE_8:
 case PO_OUTLINE_9:
-aTitle = OUString(SdResId( STR_PSEUDOSHEET_OUTLINE )) +   + 
OUString::valueOf( ePO - PO_OUTLINE_1 + 1 );
+aTitle = OUString(SdResId( STR_PSEUDOSHEET_OUTLINE )) +   +
+OUString::valueOf( static_castsal_Int32( ePO - PO_OUTLINE_1 
+ 1 ) );
 break;
 
 case PO_NOTES:
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 0f46566..5ce8eb5 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -138,7 +138,7 @@ void FuPresentationObjects::DoExecute( SfxRequest )
 String aStr(SdResId( STR_LAYOUT_OUTLINE ));
 aStyleName.Append( aStr );
 aStyleName.Append( sal_Unicode(' ') );
-aStyleName.Append( OUString::valueOf( nDepth ) );
+aStyleName.Append( OUString::valueOf( static_castsal_Int32( 
nDepth ) ) );
 }
 
 SfxStyleSheetBasePool* pStyleSheetPool = mpDocSh-GetStyleSheetPool();
commit 2be3423657ddb067d17b4af0869b2300a0f0bc3e
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Jan 9 12:44:25 2013 +

re-apply calc /tmp unit test file leakage.

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index f56bd66..a7ec15b 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -926,6 +926,8 @@ void ScFiltersTest::testBordersOoo33()
 }
 }
 }
+
+xDocSh-DoClose();
 }
 
 void ScFiltersTest::testBugFixesODS()
@@ -1768,6 +1770,8 @@ void ScFiltersTest::testColorScaleODS()
 rtl::OUStringBuffer aBuffer(getSrcRootPath());
 
aBuffer.append(m_aBaseString).append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/reference/)));
 testColorScale_Impl(pDoc, aBuffer.makeStringAndClear());
+
+xDocSh-DoClose();
 }
 
 void ScFiltersTest::testColorScaleXLSX()
@@ -1792,6 +1796,8 @@ void ScFiltersTest::testColorScaleXLSX()
 rtl::OUStringBuffer aBuffer(getSrcRootPath());
 
aBuffer.append(m_aBaseString).append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/reference/)));
 testColorScale_Impl(pDoc, aBuffer.makeStringAndClear());
+
+xDocSh-DoClose();
 }
 
 void ScFiltersTest::testDataBarODS()
@@ -1821,6 +1827,8 @@ void ScFiltersTest::testNewCondFormat()
 rtl::OUString aCSVPath;
 createCSVPath( aCSVFile, aCSVPath );
 testCondFile(aCSVPath, pDoc, 0);
+
+xDocSh-DoClose();
 }
 
 void ScFiltersTest::testFormulaDependency()
@@ -1849,6 +1857,8 @@ void ScFiltersTest::testFormulaDependency()
 
 // check that the number format is implicity inherited
 // CPPUNIT_ASSERT_EQUAL(pDoc-GetString(0,4,0), pDoc-GetString(0,5,0));
+
+xDocSh-DoClose();
 }
 
 ScFiltersTest::ScFiltersTest()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GTK theming: oxygen-gtk support broken

2013-01-09 Thread Tor Lillqvist 
 Using SUPD is reasonably easy - it is a 4.0.0 - 400 thing: not
 terribly robust over big versions, but easy enough to parse I guess.

Hmm, I have wanted us to eventually get rid of this mysterious SUPD
symbol, and SOURCEVERSION == WORK_STAMP, who have their historical
roots in the MWS names of the old Sun OOo, and thus are meaningless to
us.

Why not just use some more normal, verbose and explicitly named macros
like LIBO_MAJOR_VERSION, LIBO_MINOR_VERSION, LIBO_MICRO_VERSION,
LIBO_PATCHLEVEL, or something similar?

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

[Libreoffice-commits] .: sw/source

2013-01-09 Thread Libreoffice Gerrit user 
 sw/source/ui/uno/unoatxt.cxx|4 ++--
 sw/source/ui/utlui/attrdesc.cxx |   10 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 8948b137acc954778b6198b3e333945eb8c63d31
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Jan 9 13:08:53 2013 +

lame_OUString_valueOf_sal_Int32_casts += 6;

diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 527a6ce..8c102ec 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -194,7 +194,7 @@ uno::Reference text::XAutoTextGroup   
SwXAutoTextContainer::insertNewByName(
 if(STRING_NOTFOUND == sGroup.Search(GLOS_DELIM))
 {
 sGroup += GLOS_DELIM;
-sGroup += OUString::valueOf(0);
+sGroup += OUString::valueOf(sal_Int32(0));
 }
 pGlossaries-NewGroupDoc(sGroup, sGroup.GetToken(0, GLOS_DELIM));
 
@@ -494,7 +494,7 @@ void SwXAutoTextGroup::setName(const OUString rName) 
throw( uno::RuntimeExcepti
 if(STRING_NOTFOUND == sNewGroup.Search(GLOS_DELIM))
 {
 sNewGroup += GLOS_DELIM;
-sNewGroup += OUString::valueOf(0);
+sNewGroup += OUString::valueOf(sal_Int32(0));
 }
 
 //the name must be saved, the group may be invalidated while in 
RenameGroupDoc()
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index ee63cd7..5b6a4c9 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -1095,7 +1095,7 @@ SfxItemPresentation SwRotationGrf::GetPresentation(
 rText = SW_RESSTR( STR_ROTATION );
 else if( rText.Len() )
 rText.Erase();
-( rText += OUString::valueOf( GetValue() )) += '\xB0';
+( rText += OUString::valueOf( static_castsal_Int32( GetValue() ) )) 
+= '\xB0';
 break;
 
 default:
@@ -1118,7 +1118,7 @@ SfxItemPresentation SwLuminanceGrf::GetPresentation(
 rText = SW_RESSTR( STR_LUMINANCE );
 else if( rText.Len() )
 rText.Erase();
-( rText += OUString::valueOf( GetValue() )) += '%';
+( rText += OUString::valueOf( static_castsal_Int32( GetValue() ) )) 
+= '%';
 break;
 
 default:
@@ -1141,7 +1141,7 @@ SfxItemPresentation SwContrastGrf::GetPresentation(
 rText = SW_RESSTR( STR_CONTRAST );
 else if( rText.Len() )
 rText.Erase();
-( rText += OUString::valueOf( GetValue() )) += '%';
+( rText += OUString::valueOf( static_castsal_Int32( GetValue() ) )) 
+= '%';
 break;
 
 default:
@@ -1177,7 +1177,7 @@ SfxItemPresentation SwChannelGrf::GetPresentation(
 }
 else if( rText.Len() )
 rText.Erase();
-( rText += OUString::valueOf( GetValue() )) += '%';
+( rText += OUString::valueOf( static_castsal_Int32( GetValue() ) )) 
+= '%';
 break;
 
 default:
@@ -1245,7 +1245,7 @@ SfxItemPresentation SwTransparencyGrf::GetPresentation(
 rText = SW_RESSTR( STR_TRANSPARENCY );
 else if( rText.Len() )
 rText.Erase();
-( rText += OUString::valueOf( GetValue() )) += '%';
+( rText += OUString::valueOf( static_castsal_Int32( GetValue() ) )) 
+= '%';
 break;
 
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-4-0]: Template Manager: don't deselect item after setting default ...

2013-01-09 Thread Bosdonnat Cedric (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1611

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/1611/1

Template Manager: don't deselect item after setting default template

Change-Id: I860fb2c91d6843a1d5345ab2cf9270473f73f5bc
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 8 insertions(+), 10 deletions(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 282372d..bff2dc1 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1069,19 +1069,17 @@
 
 void SfxTemplateManagerDlg::OnTemplateAsDefault ()
 {
-assert(!maSelTemplates.empty());
-
-const TemplateViewItem *pItem = static_castconst 
TemplateViewItem*(*(maSelTemplates.begin()));
-
-OUString aServiceName;
-if (lcl_getServiceName(pItem-getPath(),aServiceName))
+if (!maSelTemplates.empty())
 {
-SfxObjectFactory::SetStandardTemplate(aServiceName,pItem-getPath());
+const TemplateViewItem *pItem = static_castconst 
TemplateViewItem*(*(maSelTemplates.begin()));
 
-createDefaultTemplateMenu();
+OUString aServiceName;
+if (lcl_getServiceName(pItem-getPath(),aServiceName))
+{
+
SfxObjectFactory::SetStandardTemplate(aServiceName,pItem-getPath());
 
-// clear selection and display view/action toolbars
-maView-deselectOverlayItem(pItem-mnId);
+createDefaultTemplateMenu();
+}
 }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I860fb2c91d6843a1d5345ab2cf9270473f73f5bc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr

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

[PATCH] Change in core[libreoffice-4-0]: Template Manager: double click on the whole item instead of ...

2013-01-09 Thread Bosdonnat Cedric (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1610

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/1610/1

Template Manager: double click on the whole item instead of only thumbnail

Change-Id: Ie07d41e5dcb09977d89752e724fcbabd6c5d7df1
---
M sfx2/source/control/thumbnailview.cxx
1 file changed, 0 insertions(+), 1 deletion(-)



diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index c3957f0..62324a7 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -517,7 +517,6 @@
 maItemStateHdl.Call(pItem);
 
 Rectangle aRect(pItem-getDrawArea());
-aRect.SetSize(Size(mnItemWidth,mnThumbnailHeight));
 
 if (aRect.IsInside(rMEvt.GetPosPixel()))
 OnItemDblClicked(pItem);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie07d41e5dcb09977d89752e724fcbabd6c5d7df1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr

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

Re: [PUSHED] Documentation for sfx2

2013-01-09 Thread Miklos Vajna 
On Wed, Jan 09, 2013 at 01:45:37PM +0100, Stephan Bergmann 
sberg...@redhat.com wrote:
  https://gerrit.libreoffice.org/1599
 
 Do people generally consider it a good idea to include binary
 documentation files (rather than some helpful ASCII art in the
 existing */README files, say) in the core repo?  I personally
 consider it not very practical.

Let me quote my comment from gerrit I posted before approving this
change:

 Nice, thanks! :-)
 
 Two ideas for a possibly follow-up patch:
 
 1) Wouldn't it make more sense to store this as fodg, so git diff is
 more meaningful when later this is extended?
 
 2) sfx2/README should mention this file, I think, so it's easier to find
 it.

An ASCII-art is even easier to read, but I think an (f)odg is far
better, than nothing as well.

Miklos


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

[Libreoffice-commits] .: cui/uiconfig

2013-01-09 Thread Libreoffice Gerrit user 
 cui/uiconfig/ui/personalization_tab.ui |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a4a3fcb906c552a869ec15e9d1afad5cf658e6a4
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Jan 9 14:11:41 2013 +0100

Personas: Improve wording of the choices.

Change-Id: I4d914de5ec1d614e30825ad6bd231545896dc130

diff --git a/cui/uiconfig/ui/personalization_tab.ui 
b/cui/uiconfig/ui/personalization_tab.ui
index fe58ddb..a537c8f 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -22,7 +22,7 @@
 property name=can_focusFalse/property
 child
   object class=GtkRadioButton id=no_background
-property name=label translatable=yesNo background 
image/property
+property name=label translatable=yesPlain look, do 
not use background images/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -39,7 +39,7 @@
 /child
 child
   object class=GtkRadioButton id=default_background
-property name=label translatable=yesDefault 
background image/property
+property name=label translatable=yesPre-installed 
background image (if available)/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -136,7 +136,7 @@
 property name=can_focusFalse/property
 child
   object class=GtkRadioButton id=no_persona
-property name=label translatable=yesDo not use 
Persona/property
+property name=label translatable=yesPlain look, do 
not use Personas/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -153,7 +153,7 @@
 /child
 child
   object class=GtkRadioButton id=default_persona
-property name=label translatable=yesUse default 
Persona/property
+property name=label translatable=yesPre-installed 
Persona (if available)/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -175,7 +175,7 @@
 property name=homogeneousTrue/property
 child
   object class=GtkRadioButton id=own_persona
-property name=label translatable=yesUse own 
Persona/property
+property name=label translatable=yesOwn 
Persona/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 3 commits - cui/uiconfig

2013-01-09 Thread Libreoffice Gerrit user 
 cui/uiconfig/ui/personalization_tab.ui   |   12 ++--
 cui/uiconfig/ui/select_persona_dialog.ui |6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 9b9d4a9472228a647d61edc428d542fd20bcb034
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Jan 9 14:11:41 2013 +0100

Personas: Improve wording of the choices.

Change-Id: I4d914de5ec1d614e30825ad6bd231545896dc130

diff --git a/cui/uiconfig/ui/personalization_tab.ui 
b/cui/uiconfig/ui/personalization_tab.ui
index 0744608..216aa07 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -22,7 +22,7 @@
 property name=can_focusFalse/property
 child
   object class=GtkRadioButton id=no_background
-property name=label translatable=yesNo background 
image/property
+property name=label translatable=yesPlain look, do 
not use background images/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -39,7 +39,7 @@
 /child
 child
   object class=GtkRadioButton id=default_background
-property name=label translatable=yesDefault 
background image/property
+property name=label translatable=yesPre-installed 
background image (if available)/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -136,7 +136,7 @@
 property name=can_focusFalse/property
 child
   object class=GtkRadioButton id=no_persona
-property name=label translatable=yesDo not use 
Persona/property
+property name=label translatable=yesPlain look, do 
not use Personas/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -153,7 +153,7 @@
 /child
 child
   object class=GtkRadioButton id=default_persona
-property name=label translatable=yesUse default 
Persona/property
+property name=label translatable=yesPre-installed 
Persona (if available)/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -175,7 +175,7 @@
 property name=homogeneousTrue/property
 child
   object class=GtkRadioButton id=own_persona
-property name=label translatable=yesUse own 
Persona/property
+property name=label translatable=yesOwn 
Persona/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
commit c821a8ab11ff615737d98858a27ebf24803d7f61
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Jan 9 13:50:34 2013 +0100

Personas: Improved wording (URL - address, and related changes).

Change-Id: Iaa2841b245ccd3de513296a10e33a93bc1cb68a2

diff --git a/cui/uiconfig/ui/select_persona_dialog.ui 
b/cui/uiconfig/ui/select_persona_dialog.ui
index 1e7d333..9ac7351 100644
--- a/cui/uiconfig/ui/select_persona_dialog.ui
+++ b/cui/uiconfig/ui/select_persona_dialog.ui
@@ -85,7 +85,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=xalign0/property
-property name=label translatable=yesFirst visit Firefox 
Personas (http://www.getpersonas.com). Find Persona you like, and want to 
choose for LibreOffice./property
+property name=label translatable=yesFirst visit Firefox 
Personas (http://www.getpersonas.com). Find a Persona you like, and want to 
choose for LibreOffice./property
 property name=wrapTrue/property
 property name=max_width_chars54/property
   /object
@@ -133,7 +133,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=xalign0/property
-property name=label translatable=yesThen copy the URL of 
page that contains the Persona to clipboard, paste it to the input field below, 
and confirm with OK./property
+property name=label translatable=yesThen, in your web 
browser's location bar, copy the address of the page that contains the Persona 
to clipboard, and paste it to the input field below./property

[Libreoffice-commits] .: 2 commits - sfx2/source

2013-01-09 Thread Libreoffice Gerrit user 
 sfx2/source/control/thumbnailview.cxx |1 -
 sfx2/source/doc/templatedlg.cxx   |   18 --
 2 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit 0c6d58df4c3994d485c174909d4317cb8616c067
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Jan 9 11:58:39 2013 +0100

Template Manager: don't deselect item after setting default template

Change-Id: I860fb2c91d6843a1d5345ab2cf9270473f73f5bc

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 80f180a..6b9a2c4 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1070,19 +1070,17 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
 
 void SfxTemplateManagerDlg::OnTemplateAsDefault ()
 {
-assert(!maSelTemplates.empty());
-
-const TemplateViewItem *pItem = static_castconst 
TemplateViewItem*(*(maSelTemplates.begin()));
-
-OUString aServiceName;
-if (lcl_getServiceName(pItem-getPath(),aServiceName))
+if (!maSelTemplates.empty())
 {
-SfxObjectFactory::SetStandardTemplate(aServiceName,pItem-getPath());
+const TemplateViewItem *pItem = static_castconst 
TemplateViewItem*(*(maSelTemplates.begin()));
 
-createDefaultTemplateMenu();
+OUString aServiceName;
+if (lcl_getServiceName(pItem-getPath(),aServiceName))
+{
+
SfxObjectFactory::SetStandardTemplate(aServiceName,pItem-getPath());
 
-// clear selection and display view/action toolbars
-maView-deselectOverlayItem(pItem-mnId);
+createDefaultTemplateMenu();
+}
 }
 }
 
commit 4419f2438d2d63387d6aab5dfe60b4aa3f251eb5
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Jan 9 10:57:44 2013 +0100

Template Manager: double click on the whole item instead of only thumbnail

Change-Id: Ie07d41e5dcb09977d89752e724fcbabd6c5d7df1

diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 0e47fb7..d2196eb 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -517,7 +517,6 @@ void ThumbnailView::MouseButtonDown( const MouseEvent 
rMEvt )
 maItemStateHdl.Call(pItem);
 
 Rectangle aRect(pItem-getDrawArea());
-aRect.SetSize(Size(mnItemWidth,mnThumbnailHeight));
 
 if (aRect.IsInside(rMEvt.GetPosPixel()))
 OnItemDblClicked(pItem);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 4.0] LATE FEATURE: Personas in LibreOffice

2013-01-09 Thread Jan Holesovsky 
Hi Astron,

Stefan Knorr (Astron) píše v St 09. 01. 2013 v 12:52 +0100:

 so, some of you know, I have soem reservations about this feature...

:-)

 be that as it may, I have a small number of comments still:

Thanks for that, very good points!

 * there are some spelling/grammar errors:
 ** the button for selecting the background image has the word Backround on 
 it

Fixed now:

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0id=b020075fd33e0ad20571980d6e72bd86a05bcd2e

 ** the window for Select a persona has the sentence Find persona you
 like on it – lacks an a before persona
 ** also in that window: Then copy the URL of page [...] – lacking a
 the before page
 
 * I fear that enough people don't know what URL means, may I propose
 web address as a more accessible replacement?

Reworded, I hope better now:

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0id=c821a8ab11ff615737d98858a27ebf24803d7f61

 * What is the difference between default persona and no persona
 (currently, at least)? I would remove this option until we decide we
 want to ship a persona by default.

Reworded too:

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0id=9b9d4a9472228a647d61edc428d542fd20bcb034

The aim is to be able to install a Persona using an extension even if we
do not ship with a Persona by default; and while at that, provide the
user with the possibility to switch that off (originally 'no persona').
Is it better now?

 * Downloading personas appears to be synchronous, leading to visible
 UI lag and Windows adding (doesn't respond) to the titlebar of the
 LibO window with my (admittedly somewhat slow (1000 Mb/s)) connection
 speed – it would be much better to make this ascynchronous.

Actually - I am not sure why it is that slow; it shouldn't be.  Either
way, I'll try to do something about that  make it async.

I'd be able to do a progress bar too, though probably only with 3 steps
(nothing, having loaded the page, having loaded the header, having
loaded the footer).  Is that worth that?

 On 9 January 2013 09:54, Petr Mladek pmla...@suse.cz wrote:
  Hmm, it does not show the saved url in the options dialog. Instead, it
  shows URL template (http://www.getpersonas.com). I wonder if it is a
  feature.
 
 I agree that it would be nice to see the name and URL of the current
 persona somewhere, though not necessarily in the Persona Selection
 dialogue itself. I guess the name could be on the preferences page,
 e.g. directly after the use own persona option. Not sure about where
 to put the URL...

Yes - I plan to do a preview in the lower part of the Personalization
dialog where you'd see (part of) the Persona bitmap.

Not sure if I manage to do the async loading + preview for 4.0,
though :-(  But showing the URL at least should be doable - is that
enough?

Thank you,
Kendy

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

[Libreoffice-commits] .: sfx2/source

2013-01-09 Thread Libreoffice Gerrit user 
 sfx2/source/doc/templatedlg.cxx |3 ---
 sfx2/source/doc/templatedlg.hrc |1 -
 sfx2/source/doc/templatedlg.src |5 -
 3 files changed, 9 deletions(-)

New commits:
commit 52006aa4050a07fcc238f3cc9e1faa1ac95d08ec
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Jan 9 14:22:23 2013 +0100

Template Manager: removed All category

Change-Id: I073b9601c82a464f705df30cfd7e760c212eb7ca

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 6b9a2c4..4c12338 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -254,9 +254,6 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg,ActivatePageHdl)
 case FILTER_DRAWS:
 eFilter = FILTER_APP_DRAW;
 break;
-default:
-case FILTER_ALL:
-;
 }
 mpCurView-filterTemplatesByApp(eFilter);
 return 0;
diff --git a/sfx2/source/doc/templatedlg.hrc b/sfx2/source/doc/templatedlg.hrc
index 02c6702..672575c 100644
--- a/sfx2/source/doc/templatedlg.hrc
+++ b/sfx2/source/doc/templatedlg.hrc
@@ -7,7 +7,6 @@
  */
 
 #define TAB_CONTROL 1
-#define FILTER_ALL  2
 #define FILTER_DOCS 3
 #define FILTER_PRESENTATIONS4
 #define FILTER_SHEETS   5
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 2480862..a351431 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -121,11 +121,6 @@ ModelessDialog DLG_TEMPLATE_MANAGER
 {
 PageItem
 {
-Identifier = FILTER_ALL;
-Text [ en-US ] = All;
-};
-PageItem
-{
 Identifier = FILTER_DOCS;
 Text [ en-US ] = Documents;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 4.0] LATE FEATURE: Personas in LibreOffice

2013-01-09 Thread Stefan Knorr (Astron) 
Hi again,

minor correction to my own post only
 LibO window with my (admittedly somewhat slow (1000 Mb/s)) connection

Make that 1 MBit/s...

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

Re: [PATCH] Bug 38838 - Removal/Replacement of the String/UniString with OUString once and for all.

2013-01-09 Thread Jean-Noël Rouvignac 
 2013/1/9 julien2412 serval2...@yahoo.fr

 Perhaps I missed it but I didn't find a license statement from you.
 Could you send a post with it? (you can take example from
 http://nabble.documentfoundation.org/License-Statement-td4027832.html)




Hi Julien,

I hereby declare that:

All my contributions, past and future, to LibreOffice are licensed under
the terms of the MPL / LGPLv3+.

Thank you,
Jean-Noel Rouvignac
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: GTK theming: oxygen-gtk support broken

2013-01-09 Thread Michael Meeks 
Hi Tor,

On Wed, 2013-01-09 at 15:06 +0200, Tor Lillqvist wrote:
 Hmm, I have wanted us to eventually get rid of this mysterious SUPD
 symbol, and SOURCEVERSION == WORK_STAMP, who have their historical
 roots in the MWS names of the old Sun OOo, and thus are meaningless to
 us.

:-)

 Why not just use some more normal, verbose and explicitly named macros
 like LIBO_MAJOR_VERSION, LIBO_MINOR_VERSION, LIBO_MICRO_VERSION,
 LIBO_PATCHLEVEL, or something similar?

Go for it - it sounds like the libo-version thing is not currently
used; and if there is a nicer macro (I couldn't find it for some reason
- prolly I was looking on the compile line for a -D ;-), then we should
clearly use it.

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]: Resolves: fdo#45911 rhbz#846775 Clipboard must be disposed b...

2013-01-09 Thread via Code Review 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1612

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/1612/1

Resolves: fdo#45911 rhbz#846775 Clipboard must be disposed before Selection

(cherry picked from commit 7887a4e0adb0d60e6b013808dc27eccddd1c0324)

Change-Id: I968bc6da85cd444d504b08f85300a1fe251cdeee
---
M sd/source/ui/slidesorter/controller/SlideSorterController.cxx
M sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
2 files changed, 4 insertions(+), 3 deletions(-)



diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx 
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 2932e20..7ab51b4 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -110,10 +110,10 @@
   mpPageSelector(),
   mpFocusManager(),
   mpSlotManager(),
-  mpClipboard(),
   mpScrollBarManager(),
   mpCurrentSlideManager(),
   mpSelectionManager(),
+  mpClipboard(),
   mpInsertionIndicatorHandler(new InsertionIndicatorHandler(rSlideSorter)),
   mpAnimator(new Animator(rSlideSorter)),
   mpVisibleAreaManager(new VisibleAreaManager(rSlideSorter)),
@@ -156,9 +156,9 @@
 mpPageSelector.reset(new PageSelector(mrSlideSorter));
 mpFocusManager.reset(new FocusManager(mrSlideSorter));
 mpSlotManager.reset(new SlotManager(mrSlideSorter));
-mpClipboard.reset(new Clipboard(mrSlideSorter));
 mpScrollBarManager.reset(new ScrollBarManager(mrSlideSorter));
 mpSelectionManager.reset(new SelectionManager(mrSlideSorter));
+mpClipboard.reset(new Clipboard(mrSlideSorter));
 
 mpScrollBarManager-LateInitialization();
 
@@ -202,6 +202,7 @@
 void SlideSorterController::Dispose (void)
 {
 mpInsertionIndicatorHandler-End(Animator::AM_Immediate);
+mpClipboard.reset();
 mpSelectionManager.reset();
 mpAnimator-Dispose();
 }
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx 
b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index e962623..c515480 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -245,10 +245,10 @@
 ::boost::scoped_ptrPageSelector mpPageSelector;
 ::boost::scoped_ptrFocusManager mpFocusManager;
 ::boost::shared_ptrSlotManager mpSlotManager;
-::boost::scoped_ptrcontroller::Clipboard mpClipboard;
 ::boost::scoped_ptrScrollBarManager mpScrollBarManager;
 mutable ::boost::shared_ptrCurrentSlideManager mpCurrentSlideManager;
 ::boost::shared_ptrSelectionManager mpSelectionManager;
+::boost::scoped_ptrcontroller::Clipboard mpClipboard;
 ::boost::shared_ptrInsertionIndicatorHandler mpInsertionIndicatorHandler;
 ::boost::shared_ptrAnimator mpAnimator;
 ::boost::scoped_ptrVisibleAreaManager mpVisibleAreaManager;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I968bc6da85cd444d504b08f85300a1fe251cdeee
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Caolán McNamara caol...@redhat.com

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

replacing OUString::valueOf(static_castsal_Int32) ??

2013-01-09 Thread Noel Grandin 

maybe we need
   OUString::valueOfInt32(sal_Int32)
that does the cast for us?

At least it'll be less noisy, and we can document in one place why it's 
necessary.





 Original Message 
Subject:[Libreoffice-commits] .: 2 commits - sc/qa sd/source
Date:   Wed, 9 Jan 2013 05:02:08 -0800 (PST)
From:   loger...@kemper.freedesktop.org (Libreoffice Gerrit user)
Reply-To:   libreoffice@lists.freedesktop.org
To: libreoffice-comm...@lists.freedesktop.org



  sc/qa/unit/subsequent_filters-test.cxx |   10 ++
  sd/source/ui/dlg/prltempl.cxx  |3 ++-
  sd/source/ui/func/fuprobjs.cxx |2 +-
  3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 004c72330a132bbff09267459b35decdea3d8cf6
Author: Michael Meeksmichael.me...@suse.com
Date:   Wed Jan 9 13:02:42 2013 +

 lame_OUString_valueOf_sal_Int32_casts += 2;

diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 787d717..625c191 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -213,7 +213,8 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( 
SfxObjectShell* pDocSh,
  case PO_OUTLINE_7:
  case PO_OUTLINE_8:
  case PO_OUTLINE_9:
-aTitle = OUString(SdResId( STR_PSEUDOSHEET_OUTLINE )) +   + 
OUString::valueOf( ePO - PO_OUTLINE_1 + 1 );
+aTitle = OUString(SdResId( STR_PSEUDOSHEET_OUTLINE )) +   +
+OUString::valueOf( static_castsal_Int32( ePO - PO_OUTLINE_1 
+ 1 ) );
  break;
  
  case PO_NOTES:

diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 0f46566..5ce8eb5 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -138,7 +138,7 @@ void FuPresentationObjects::DoExecute( SfxRequest )
  String aStr(SdResId( STR_LAYOUT_OUTLINE ));
  aStyleName.Append( aStr );
  aStyleName.Append( sal_Unicode(' ') );
-aStyleName.Append( OUString::valueOf( nDepth ) );
+aStyleName.Append( OUString::valueOf( static_castsal_Int32( 
nDepth ) ) );
  }
  
  SfxStyleSheetBasePool* pStyleSheetPool = mpDocSh-GetStyleSheetPool();

commit 2be3423657ddb067d17b4af0869b2300a0f0bc3e
Author: Michael Meeksmichael.me...@suse.com
Date:   Wed Jan 9 12:44:25 2013 +

 re-apply calc /tmp unit test file leakage.

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index f56bd66..a7ec15b 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -926,6 +926,8 @@ void ScFiltersTest::testBordersOoo33()
  }
  }
  }
+
+xDocSh-DoClose();
  }
  
  void ScFiltersTest::testBugFixesODS()

@@ -1768,6 +1770,8 @@ void ScFiltersTest::testColorScaleODS()
  rtl::OUStringBuffer aBuffer(getSrcRootPath());
  
aBuffer.append(m_aBaseString).append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/reference/)));
  testColorScale_Impl(pDoc, aBuffer.makeStringAndClear());
+
+xDocSh-DoClose();
  }
  
  void ScFiltersTest::testColorScaleXLSX()

@@ -1792,6 +1796,8 @@ void ScFiltersTest::testColorScaleXLSX()
  rtl::OUStringBuffer aBuffer(getSrcRootPath());
  
aBuffer.append(m_aBaseString).append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/reference/)));
  testColorScale_Impl(pDoc, aBuffer.makeStringAndClear());
+
+xDocSh-DoClose();
  }
  
  void ScFiltersTest::testDataBarODS()

@@ -1821,6 +1827,8 @@ void ScFiltersTest::testNewCondFormat()
  rtl::OUString aCSVPath;
  createCSVPath( aCSVFile, aCSVPath );
  testCondFile(aCSVPath, pDoc, 0);
+
+xDocSh-DoClose();
  }
  
  void ScFiltersTest::testFormulaDependency()

@@ -1849,6 +1857,8 @@ void ScFiltersTest::testFormulaDependency()
  
  // check that the number format is implicity inherited

  // CPPUNIT_ASSERT_EQUAL(pDoc-GetString(0,4,0), pDoc-GetString(0,5,0));
+
+xDocSh-DoClose();
  }
  
  ScFiltersTest::ScFiltersTest()

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







Disclaimer: http://www.peralex.com/disclaimer.html


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

[Libreoffice-commits] .: setup_native/source

2013-01-09 Thread Libreoffice Gerrit user 
 setup_native/source/packinfo/spellchecker_selection.pl |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d8385c2cfc63b25414f37699faf0143ee9f5ded9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jan 9 15:09:58 2013 +0100

Always default-select English dictionary

It was discovered that on a Russian Windows, by default only Russian and
German dictionaries would be installed, but no English dictionary.  This is
because since e2fac98819c00b4fb50f9de9d0f32d20092f3191 fdo#53009: For msi
installer, only default-select a subset of dictionaries only those 
dictionaries
mentioned in setup_native/source/packinfo/spellchecker_selection.txt were
default-selected, but it apparently was a misunderstanding that
spellcheker_selection.txt for many locales does not list en even though an
English dictionary should always be default-installed.

Quoting Andras Timar ati...@suse.com:  AFAIK en-US localization with 
English
dictionaries is always installed in all 3 supported platforms by default.  
On
Windows default install should always select en-US and English 
dictionaries.  If
it does not do so under certain circumstances, then it is a bug in my 
opinion.
We removed en-US entry from the spellchecker selection file for this very
reason.  It would have only bloated Mac and Linux langpacks.

So this fix simply makes sure that en is included in every line of the
generated spellchecker_selection.hxx that is used by
setup_native/source/win32/customactions/sellang/sellang.cxx to determine 
which
dictionaries to select by default.

Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8

diff --git a/setup_native/source/packinfo/spellchecker_selection.pl 
b/setup_native/source/packinfo/spellchecker_selection.pl
index b30a843..87f7cc2 100644
--- a/setup_native/source/packinfo/spellchecker_selection.pl
+++ b/setup_native/source/packinfo/spellchecker_selection.pl
@@ -27,8 +27,9 @@ while () {
 @{$map{$lang}} = ();
 } else {
 @{$map{$lang}} = split(/,/, $dicts);
-$max = max($max, scalar(@{$map{$lang}}));
 }
+push(@{$map{$lang}}, ('en')) unless grep($_ eq 'en', @{$map{$lang}});
+$max = max($max, scalar(@{$map{$lang}}));
 }
 
 ++$max;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

2013-01-09 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=54157

vitriol vitriol_vitr...@katamail.com changed:

   What|Removed |Added

 Depends on||58171

--- Comment #74 from vitriol vitriol_vitr...@katamail.com ---
Adding Bug 58171 - VIEWING: Pages do not have a drop shadow. UI regression, no
document shadow and bad visual glitch.

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

[PATCH] Change in core[libreoffice-4-0]: Always default-select English dictionary

2013-01-09 Thread Stephan Bergmann (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1614

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/1614/1

Always default-select English dictionary

It was discovered that on a Russian Windows, by default only Russian and
German dictionaries would be installed, but no English dictionary.  This is
because since e2fac98819c00b4fb50f9de9d0f32d20092f3191 fdo#53009: For msi
installer, only default-select a subset of dictionaries only those dictionaries
mentioned in setup_native/source/packinfo/spellchecker_selection.txt were
default-selected, but it apparently was a misunderstanding that
spellcheker_selection.txt for many locales does not list en even though an
English dictionary should always be default-installed.

Quoting Andras Timar ati...@suse.com:  AFAIK en-US localization with English
dictionaries is always installed in all 3 supported platforms by default.  On
Windows default install should always select en-US and English dictionaries.  If
it does not do so under certain circumstances, then it is a bug in my opinion.
We removed en-US entry from the spellchecker selection file for this very
reason.  It would have only bloated Mac and Linux langpacks.

So this fix simply makes sure that en is included in every line of the
generated spellchecker_selection.hxx that is used by
setup_native/source/win32/customactions/sellang/sellang.cxx to determine which
dictionaries to select by default.

Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8
(cherry picked from commit d8385c2cfc63b25414f37699faf0143ee9f5ded9)
---
M setup_native/source/packinfo/spellchecker_selection.pl
1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/setup_native/source/packinfo/spellchecker_selection.pl 
b/setup_native/source/packinfo/spellchecker_selection.pl
index b30a843..87f7cc2 100644
--- a/setup_native/source/packinfo/spellchecker_selection.pl
+++ b/setup_native/source/packinfo/spellchecker_selection.pl
@@ -27,8 +27,9 @@
 @{$map{$lang}} = ();
 } else {
 @{$map{$lang}} = split(/,/, $dicts);
-$max = max($max, scalar(@{$map{$lang}}));
 }
+push(@{$map{$lang}}, ('en')) unless grep($_ eq 'en', @{$map{$lang}});
+$max = max($max, scalar(@{$map{$lang}}));
 }
 
 ++$max;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com

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

[PATCH] Change in core[libreoffice-3-6]: Always default-select English dictionary

2013-01-09 Thread Stephan Bergmann (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1613

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/1613/1

Always default-select English dictionary

It was discovered that on a Russian Windows, by default only Russian and
German dictionaries would be installed, but no English dictionary.  This is
because since e2fac98819c00b4fb50f9de9d0f32d20092f3191 fdo#53009: For msi
installer, only default-select a subset of dictionaries only those dictionaries
mentioned in setup_native/source/packinfo/spellchecker_selection.txt were
default-selected, but it apparently was a misunderstanding that
spellcheker_selection.txt for many locales does not list en even though an
English dictionary should always be default-installed.

Quoting Andras Timar ati...@suse.com:  AFAIK en-US localization with English
dictionaries is always installed in all 3 supported platforms by default.  On
Windows default install should always select en-US and English dictionaries.  If
it does not do so under certain circumstances, then it is a bug in my opinion.
We removed en-US entry from the spellchecker selection file for this very
reason.  It would have only bloated Mac and Linux langpacks.

So this fix simply makes sure that en is included in every line of the
generated spellchecker_selection.hxx that is used by
setup_native/source/win32/customactions/sellang/sellang.cxx to determine which
dictionaries to select by default.

Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8
(cherry picked from commit d8385c2cfc63b25414f37699faf0143ee9f5ded9)
---
M setup_native/source/packinfo/spellchecker_selection.pl
1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/setup_native/source/packinfo/spellchecker_selection.pl 
b/setup_native/source/packinfo/spellchecker_selection.pl
index b30a843..87f7cc2 100644
--- a/setup_native/source/packinfo/spellchecker_selection.pl
+++ b/setup_native/source/packinfo/spellchecker_selection.pl
@@ -27,8 +27,9 @@
 @{$map{$lang}} = ();
 } else {
 @{$map{$lang}} = split(/,/, $dicts);
-$max = max($max, scalar(@{$map{$lang}}));
 }
+push(@{$map{$lang}}, ('en')) unless grep($_ eq 'en', @{$map{$lang}});
+$max = max($max, scalar(@{$map{$lang}}));
 }
 
 ++$max;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8
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

gmake: CXXFLAGS override gb_Library_add_cxxflags

2013-01-09 Thread Petr Mladek 
Hi,

CXXFLAGS are used after gb_Library_add_cxxflags in gbuild.
This causes problems because gb_Library_add_cxxflags usually enforce
some setting that is strictly needed.

For example, my LO-4.0 build for openSUSE crashes in bridge test. It is
related to omit-frame-pointer gcc feature.

+ openSUSE uses:

CXXFLAGS=-fomit-frame-pointer ...

bridges/Library_gcc3_linux_intel.mk includes:

--- cut ---
# In case someone enabled the non-standard -fomit-frame-pointer which
does not
# work with the .cxx sources of this library.
$(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
-fno-omit-frame-pointer \
-fno-strict-aliasing \
$(if $(filter TRUE,$(HAVE_GCC_AVX)),\
-mno-avx \
) \
))
--- cut ---

Unfortunately, CXXFLAGS is listed later on the commandline, so 
the bridge is compiled with the global -f-omit-frame-pointer and is
miscompiled.

IMHO, it would make sense to use CXXFLAGS after the default global flags
but before the source file specific flags.

Another possibility would be to introduce another macro, for example
gb_Library_add_post_cxxflags or gb_Library_add_enforcing_cxxflags.
But then we would need to convert most (if not all)
gb_Library_add_cxxflags calls to the new macro :-)

What do you think?
Could you give me some hints how to do it?

Best Regards,
Petr

PS: I have troubles to understand the related gbuild code. It seems that
both CXXFLAGS and gb_Library_add_cxxflags are added to the T_CXXFLAGS
variable, see:

--- cut solenv/gbuild/LinkTarget.mk ---
$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS :=
$$(gb_LinkTarget_CXXFLAGS)
[...]
define gb_LinkTarget_add_cxxflags
$(call gb_LinkTarget_get_headers_target,$(1)) \ 
$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS += $(2)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS += $(2)
endif
endef
--- cut ---

It looks like T_CXXFLAGS is initialized with CXXFLAGS and
gb_LinkTarget_add_cxxflags is added at the end. Though, in reality, they
are listed in the opposite order. So, I am lost :-)

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

[Libreoffice-commits] .: sfx2/source

2013-01-09 Thread Libreoffice Gerrit user 
 sfx2/source/control/templateabstractview.cxx |7 ++-
 sfx2/source/doc/templatedlg.cxx  |2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 1ce372eec4dd0e4e807baa7bbf568245b955f99f
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Jan 9 15:18:17 2013 +0100

Template Manager: filter the results when opening the dialog

Change-Id: If6cc5f6d5e502c1fc5da210179263be63fc8c8a6

diff --git a/sfx2/source/control/templateabstractview.cxx 
b/sfx2/source/control/templateabstractview.cxx
index c9ea989..27d37a8 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -103,7 +103,7 @@ TemplateAbstractView::TemplateAbstractView (Window 
*pParent, WinBits nWinStyle,
 : ThumbnailView(pParent,nWinStyle,bDisableTransientChildren),
   mpItemView(new TemplateView(this)),
   mbFilteredResults(false),
-  meFilterOption(FILTER_APP_NONE)
+  meFilterOption(FILTER_APP_WRITER)
 {
 
mpItemView-setItemStateHdl(LINK(this,TemplateAbstractView,OverlayItemStateHdl));
 }
@@ -112,7 +112,7 @@ TemplateAbstractView::TemplateAbstractView(Window *pParent, 
const ResId rResId,
 : ThumbnailView(pParent,rResId,bDisableTransientChildren),
   mpItemView(new TemplateView(this)),
   mbFilteredResults(false),
-  meFilterOption(FILTER_APP_NONE)
+  meFilterOption(FILTER_APP_WRITER)
 {
 
mpItemView-setItemStateHdl(LINK(this,TemplateAbstractView,OverlayItemStateHdl));
 }
@@ -186,9 +186,6 @@ void TemplateAbstractView::showOverlay (bool bVisible)
 if (mbFilteredResults)
 {
 filterItems(ViewFilter_Application(meFilterOption));
-
-mbFilteredResults = false;
-meFilterOption = FILTER_APP_NONE;
 }
 
 mpItemView-Clear();
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 4c12338..9a50ba9 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -191,6 +191,8 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window 
*parent)
 maView-Populate();
 maView-Show();
 
+mpCurView-filterTemplatesByApp(FILTER_APP_WRITER);
+
 FreeResource();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-01-09 Thread Libreoffice Gerrit user 
 sw/qa/extras/rtfimport/data/fdo58933.rtf   |   28 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |   12 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 +++---
 3 files changed, 44 insertions(+), 3 deletions(-)

New commits:
commit 555bc780c83114220012e198b5471a0d7452fb32
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Jan 9 15:29:29 2013 +0100

fdo#58933 RTF import: avoid fake pars / cells when having graphic inside 
cells

Regression from 8063e36115a11ddf3db05928db9287947beee74d.

diff --git a/sw/qa/extras/rtfimport/data/fdo58933.rtf 
b/sw/qa/extras/rtfimport/data/fdo58933.rtf
new file mode 100644
index 000..7568e27
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo58933.rtf
@@ -0,0 +1,28 @@
+{\rtf1
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;
+\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;
+\red192\green192\blue192;\red255\green255\blue255;}
+\ltrrow\trowd \cellx3415\cellx9652
+\pard\plain \ltrpar
+\intbl 
+{\*\shppict
+{\pict
+{\*\picprop\shplid1025
+{\sp
+{\sn shapeType}
+{\sv 75}
+}
+}
+\picscalex100\picscaley100\piccropl0\piccropr0\piccropt0\piccropb0\picw2646\pich1138\picwgoal1500\pichgoal645\pngblip\bliptag583511825
+{\*\blipuid 22c7af11751b66cef5cb11d41959e206}
+47494638396110001000d5ffffc0c0c0555f00aafcfcfcf6f6f6eaeaeae6e6e6e4e4e4e3e3e3c2c2c2c1c1c1bcbcbcb5b5b5b3b3b3b0b0b0adadada5a5a5a2a2a2a1a1a19f9f9f9494948a8a8a888686867b7b7b6c6c6c5c5c5c4e4e4e4b4b4b4747474646463d3d3d3c3c3c2e2e2e2525251b1b1b1818181010100909090606060303030021f9040102002c1000100684408170482c0a06c8a4728924389f506833b281302a8e6b164b18103024c52111504cca67332102e0042e9a40d9319f8300a343c1200f54e47f7e2a1e0b0a7d0d728a010d838400261a7c0d94947784252700127e9d159f6c8411140019080ea7a9a85f842122281612b1b3b25d6b1f29291d0fbbbdbc5d5e51c34e4cc64a46c94341003b}
+}
+\cell
+\pard \intbl foo\cell
+\pard \intbl 
+\trowd \cellx3415 \cellx9652\row
+\trowd \cellx9652\pard \intbl bar\cell
+\pard \intbl
+\trowd \cellx9652\row
+\pard \par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 88e6797..296a89e 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -134,6 +134,7 @@ public:
 void testFdo57678();
 void testFdo45183();
 void testFdo54612();
+void testFdo58933();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -218,6 +219,7 @@ void Test::run()
 {fdo57678.rtf, Test::testFdo57678},
 {fdo45183.rtf, Test::testFdo45183},
 {fdo54612.rtf, Test::testFdo54612},
+{fdo58933.rtf, Test::testFdo58933},
 };
 header();
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
@@ -1014,6 +1016,16 @@ void Test::testFdo54612()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(8), xDraws-getCount());
 }
 
+void Test::testFdo58933()
+{
+// The problem was that the table had an additional cell in its first line.
+uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xTables(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTable(xTables-getByIndex(0), 
uno::UNO_QUERY);
+// This was 4.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable-getCellNames().getLength());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d7422a0..4964791 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -817,15 +817,16 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 writerfilter::ReferenceProperties::Pointer_t const pProperties(new 
RTFReferenceProperties(aAttributes, aSprms));
 checkFirstRun();
 if (!m_pCurrentBuffer)
+{
 Mapper().props(pProperties);
+// Make sure we don't loose these properties with a too early reset.
+m_bHadPicture = true;
+}
 else
 {
 RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
 m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue));
 }
-
-// Make sure we don't loose these properties with a too early reset.
-m_bHadPicture = true;
 return 0;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Funding Wishlist

2013-01-09 Thread Lubos Lunak 
On Wednesday 21 of November 2012, Thorsten Behrens wrote:
 Marc Paré wrote:
  We are seriously looking at different teams' wishlists. Please do
  take a little time out of your busy schedule and speak to your teams
  about any funding for items that you think may be of importance to
  your team or the enhance the functioning of your team's work on the
  project.

 Hi Marc,

 thanks a lot for running this - and yes, I think the dev team would
 benefit from some more tinderboxes. Unless there's other support
 coming up, I'd like to suggest buying another Mac box for
 gerrit/tinderboxing. I have an offer for a used Mac Mini as follows:

 Mac Mini, last year's version, 2,7 GHz DualCore i7, 4 GB RAM, AMD
 Radeon HD 6630M, OS X Lion, Samsung SSD 128 GB 470 Series MLC, HDMI,
 DVI.
...

 Hello, I'd like to ask, is there any plan to have such a mac machine? Or 
preferably a shared mac build host where developers could test their changes 
or find out more about tinderboxes breakages (which are sometimes rather hard 
to debug from just the log)? Thanks.

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

[Libreoffice-commits] .: 2 commits - sw/qa sw/source

2013-01-09 Thread Libreoffice Gerrit user 
 sw/qa/complex/writer/CheckTable.java |   32 +
 sw/source/core/unocore/unocrsrhelper.cxx |   39 +--
 sw/source/core/unocore/unoobj.cxx|4 +++
 sw/source/core/unocore/unoobj2.cxx   |7 +++--
 4 files changed, 67 insertions(+), 15 deletions(-)

New commits:
commit 68d40d2cae3700f4134375fcaf9649ac626ada7d
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jan 9 15:45:32 2013 +0100

fdo#58242: sw: fix more crashes when not on SwTxtNode

In getCrsrPropertyValue etc.; also add a unit test for the problem.

Change-Id: Ibd459a43393c39b4fed9fb89aae4a5f7bacff007

diff --git a/sw/qa/complex/writer/CheckTable.java 
b/sw/qa/complex/writer/CheckTable.java
index 449dc1a..6fe9b28 100644
--- a/sw/qa/complex/writer/CheckTable.java
+++ b/sw/qa/complex/writer/CheckTable.java
@@ -10,12 +10,16 @@
 package complex.writer;
 
 import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.RuntimeException;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.beans.XPropertySet;
+import com.sun.star.beans.XPropertySetInfo;
+import com.sun.star.beans.Property;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextRange;
 import com.sun.star.text.XTextTable;
 import com.sun.star.table.TableBorder;
 import com.sun.star.table.TableBorder2;
@@ -258,6 +262,34 @@ public class CheckTable
 assertTrue(border2.IsDistanceValid);
 assertEquals(97, border2.Distance);
 }
+
+@Test
+public void test_fdo58242() throws Exception
+{
+// insert table
+XMultiServiceFactory xDocF =
+UnoRuntime.queryInterface(XMultiServiceFactory.class, m_xDoc);
+XTextTable xTable = UnoRuntime.queryInterface(XTextTable.class,
+xDocF.createInstance(com.sun.star.text.TextTable));
+xTable.initialize(3, 3);
+XText xText = m_xDoc.getText();
+XTextCursor xCursor = xText.createTextCursor();
+xText.insertTextContent(xCursor, xTable, false);
+// get anchor
+XTextRange xAnchor = xTable.getAnchor();
+// check all properties on the anchor - shouldn't crash despite
+// pointing to a non-SwTxtNode
+XPropertySet xProps = (XPropertySet)
+UnoRuntime.queryInterface(XPropertySet.class, xAnchor);
+XPropertySetInfo xPropsInfo = xProps.getPropertySetInfo();
+Property[] props = xPropsInfo.getProperties();
+for (int i = 0; i  props.length; ++i)
+{
+try {
+xProps.getPropertyValue(props[i].Name);
+} catch (RuntimeException e) { }
+}
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx 
b/sw/source/core/unocore/unocrsrhelper.cxx
index 21f553a..a1d068d 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -487,9 +487,9 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry 
rEntry
 case FN_UNO_CHARFMT_SEQUENCE:
 {
 
-SwTxtNode* pTxtNode;
-if((pTxtNode = (SwTxtNode*)rPam.GetNode( sal_True )) == 
rPam.GetNode(sal_False) 
-pTxtNode-GetpSwpHints())
+SwTxtNode *const pTxtNode = rPam.GetNode()-GetTxtNode();
+if (rPam.GetNode(sal_True) == rPam.GetNode(sal_False)
+ pTxtNode  pTxtNode-GetpSwpHints())
 {
 sal_uInt16 nPaMStart = rPam.GetPoint()-nContent.GetIndex();
 sal_uInt16 nPaMEnd = rPam.GetMark() ? 
rPam.GetMark()-nContent.GetIndex() : nPaMStart;
@@ -940,6 +940,11 @@ bool DocInsertStringSplitCR(
 xub_StrLen nStartIdx = 0;
 SwTxtNode* const pTxtNd =
 rNewCursor.GetPoint()-nNode.GetNode().GetTxtNode();
+if (!pTxtNd)
+{
+SAL_INFO(sw.uno, DocInsertStringSplitCR: need a text node);
+return false;
+}
 const xub_StrLen nMaxLength = ( pTxtNd )
 ? STRING_LEN - pTxtNd-GetTxt().Len()
 : STRING_LEN;
diff --git a/sw/source/core/unocore/unoobj.cxx 
b/sw/source/core/unocore/unoobj.cxx
index f5736b8..3162e5a 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -529,6 +529,10 @@ throw (lang::IllegalArgumentException)
 {
 // multi selection is not considered
 SwTxtNode *const pTxtNd = rPam.GetNode()-GetTxtNode();
+if (!pTxtNd)
+{
+throw lang::IllegalArgumentException();
+}
 if (FN_UNO_NUM_LEVEL == rEntry.nWID)
 {
 sal_Int16 nLevel = 0;
diff --git a/sw/source/core/unocore/unoobj2.cxx 
b/sw/source/core/unocore/unoobj2.cxx
index 043f0cf..62f73db 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1839,9 +1839,10 @@

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - sw/qa sw/source

2013-01-09 Thread Libreoffice Gerrit user 
 sw/qa/complex/writer/CheckTable.java |   32 +
 sw/source/core/unocore/unocrsrhelper.cxx |   39 +--
 sw/source/core/unocore/unoobj.cxx|4 +++
 sw/source/core/unocore/unoobj2.cxx   |7 +++--
 4 files changed, 67 insertions(+), 15 deletions(-)

New commits:
commit 23e5bce572ebb65b302c139e89890e23a27a994d
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jan 9 15:45:32 2013 +0100

fdo#58242: sw: fix more crashes when not on SwTxtNode

In getCrsrPropertyValue etc.; also add a unit test for the problem.

Change-Id: Ibd459a43393c39b4fed9fb89aae4a5f7bacff007
(cherry picked from commit 68d40d2cae3700f4134375fcaf9649ac626ada7d)

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/sw/qa/complex/writer/CheckTable.java 
b/sw/qa/complex/writer/CheckTable.java
index 449dc1a..6fe9b28 100644
--- a/sw/qa/complex/writer/CheckTable.java
+++ b/sw/qa/complex/writer/CheckTable.java
@@ -10,12 +10,16 @@
 package complex.writer;
 
 import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.RuntimeException;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.beans.XPropertySet;
+import com.sun.star.beans.XPropertySetInfo;
+import com.sun.star.beans.Property;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextRange;
 import com.sun.star.text.XTextTable;
 import com.sun.star.table.TableBorder;
 import com.sun.star.table.TableBorder2;
@@ -258,6 +262,34 @@ public class CheckTable
 assertTrue(border2.IsDistanceValid);
 assertEquals(97, border2.Distance);
 }
+
+@Test
+public void test_fdo58242() throws Exception
+{
+// insert table
+XMultiServiceFactory xDocF =
+UnoRuntime.queryInterface(XMultiServiceFactory.class, m_xDoc);
+XTextTable xTable = UnoRuntime.queryInterface(XTextTable.class,
+xDocF.createInstance(com.sun.star.text.TextTable));
+xTable.initialize(3, 3);
+XText xText = m_xDoc.getText();
+XTextCursor xCursor = xText.createTextCursor();
+xText.insertTextContent(xCursor, xTable, false);
+// get anchor
+XTextRange xAnchor = xTable.getAnchor();
+// check all properties on the anchor - shouldn't crash despite
+// pointing to a non-SwTxtNode
+XPropertySet xProps = (XPropertySet)
+UnoRuntime.queryInterface(XPropertySet.class, xAnchor);
+XPropertySetInfo xPropsInfo = xProps.getPropertySetInfo();
+Property[] props = xPropsInfo.getProperties();
+for (int i = 0; i  props.length; ++i)
+{
+try {
+xProps.getPropertyValue(props[i].Name);
+} catch (RuntimeException e) { }
+}
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx 
b/sw/source/core/unocore/unocrsrhelper.cxx
index fbe46b9..4f13e25 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -487,9 +487,9 @@ sal_Bool getCrsrPropertyValue(const 
SfxItemPropertySimpleEntry rEntry
 case FN_UNO_CHARFMT_SEQUENCE:
 {
 
-SwTxtNode* pTxtNode;
-if((pTxtNode = (SwTxtNode*)rPam.GetNode( sal_True )) == 
rPam.GetNode(sal_False) 
-pTxtNode-GetpSwpHints())
+SwTxtNode *const pTxtNode = rPam.GetNode()-GetTxtNode();
+if (rPam.GetNode(sal_True) == rPam.GetNode(sal_False)
+ pTxtNode  pTxtNode-GetpSwpHints())
 {
 sal_uInt16 nPaMStart = rPam.GetPoint()-nContent.GetIndex();
 sal_uInt16 nPaMEnd = rPam.GetMark() ? 
rPam.GetMark()-nContent.GetIndex() : nPaMStart;
@@ -940,6 +940,11 @@ sal_Bool DocInsertStringSplitCR(
 xub_StrLen nStartIdx = 0;
 SwTxtNode* const pTxtNd =
 rNewCursor.GetPoint()-nNode.GetNode().GetTxtNode();
+if (!pTxtNd)
+{
+SAL_INFO(sw.uno, DocInsertStringSplitCR: need a text node);
+return false;
+}
 const xub_StrLen nMaxLength = ( pTxtNd )
 ? STRING_LEN - pTxtNd-GetTxt().Len()
 : STRING_LEN;
diff --git a/sw/source/core/unocore/unoobj.cxx 
b/sw/source/core/unocore/unoobj.cxx
index a91286a..62fca05 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -529,6 +529,10 @@ throw (lang::IllegalArgumentException)
 {
 // multi selection is not considered
 SwTxtNode *const pTxtNd = rPam.GetNode()-GetTxtNode();
+if (!pTxtNd)
+{
+throw lang::IllegalArgumentException();
+}
 if (FN_UNO_NUM_LEVEL == rEntry.nWID)
 {
 sal_Int16 nLevel = 0;
diff --git a/sw/source/core/unocore/unoobj2.cxx 
b/sw/source/core/unocore/unoobj2.cxx
index

Re: Funding Wishlist

2013-01-09 Thread Michael Meeks 

On Wed, 2013-01-09 at 15:59 +0100, Lubos Lunak wrote:
  Hello, I'd like to ask, is there any plan to have such a mac machine? Or 
 preferably a shared mac build host where developers could test their changes 
 or find out more about tinderboxes breakages (which are sometimes rather hard 
 to debug from just the log)? Thanks.

Agreed - I'd love to have a couple of fast Mac machines co-located with
a couple of good developers who can tend them and help isolate /
reproduce nasty Mac bugs :-)

We should certainly add that to the formal list of wishes from
development: anything else ? some more focused hack-fests (for each
component ?).

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

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

2013-01-09 Thread Libreoffice Gerrit user 
 sw/inc/viewopt.hxx  |8 
 sw/source/ui/config/caption.cxx |2 +-
 sw/source/ui/config/fontcfg.cxx |8 
 sw/source/ui/config/modcfg.cxx  |   12 ++--
 sw/source/ui/config/optpage.cxx |   22 +++---
 sw/source/ui/config/viewopt.cxx |2 +-
 sw/source/ui/dbui/dbinsdlg.cxx  |   26 +-
 sw/source/ui/dbui/dbmgr.cxx |   16 
 sw/source/ui/inc/caption.hxx|4 ++--
 sw/source/ui/inc/fontcfg.hxx|2 +-
 10 files changed, 51 insertions(+), 51 deletions(-)

New commits:
commit 3fa2c6da4a912856f4a0572fafe7b32fc7d57e88
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Jan 10 00:02:56 2013 +0900

sal_Bool to bool

Change-Id: Ib83c02d53fbae6a70781d9d9d7ab015b016c72a8

diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 6c21e73..8efc3d4 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -431,9 +431,9 @@ public:
 SwViewOption operator=( const SwViewOption rOpt );
 
 // Compare methods.
-sal_Bool IsEqualFlags ( const SwViewOption rOpt ) const;
-inline sal_Bool operator == ( const SwViewOption rOpt ) const;
-inline sal_Bool operator != ( const SwViewOption rOpt ) const  { return 
!(*this == rOpt); }
+bool IsEqualFlags ( const SwViewOption rOpt ) const;
+inline bool operator == ( const SwViewOption rOpt ) const;
+inline bool operator != ( const SwViewOption rOpt ) const  { return 
!(*this == rOpt); }
 
 
 /*---
@@ -572,7 +572,7 @@ public:
 };
 
 
-inline sal_Bool SwViewOption::operator==( const SwViewOption rOpt ) const
+inline bool SwViewOption::operator==( const SwViewOption rOpt ) const
 {
 return IsEqualFlags( rOpt )  nZoom == rOpt.GetZoom();
 }
diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx
index 82136c3..9fb8b63 100644
--- a/sw/source/ui/config/caption.cxx
+++ b/sw/source/ui/config/caption.cxx
@@ -66,7 +66,7 @@ InsCaptionOpt InsCaptionOpt::operator=( const InsCaptionOpt 
rOpt )
 return *this;
 }
 
-sal_Bool InsCaptionOpt::operator==( const InsCaptionOpt rOpt ) const
+bool InsCaptionOpt::operator==( const InsCaptionOpt rOpt ) const
 {
 return (eObjType == rOpt.eObjType 
 aOleId == rOpt.aOleId); // So that identical Ole-IDs can't be 
added multiple
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx
index c9cdcf5..d951355 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/sw/source/ui/config/fontcfg.cxx
@@ -168,9 +168,9 @@ SwStdFontConfig::~SwStdFontConfig()
 {
 }
 
-sal_Bool SwStdFontConfig::IsFontDefault(sal_uInt16 nFontType) const
+bool SwStdFontConfig::IsFontDefault(sal_uInt16 nFontType) const
 {
-sal_Bool bSame = sal_False;
+bool bSame = false;
 SvtLinguOptions aLinguOpt;
 
 SvtLinguConfig().GetOptions( aLinguOpt );
@@ -210,7 +210,7 @@ sal_Bool SwStdFontConfig::IsFontDefault(sal_uInt16 
nFontType) const
 case FONT_CAPTION_CJK :
 case FONT_INDEX_CJK   :
 {
-sal_Bool b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCJK;
+bool b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCJK;
 bSame = b1  sDefaultFonts[nFontType] == sDefFontCJK;
 }
 break;
@@ -218,7 +218,7 @@ sal_Bool SwStdFontConfig::IsFontDefault(sal_uInt16 
nFontType) const
 case FONT_CAPTION_CTL :
 case FONT_INDEX_CTL   :
 {
-sal_Bool b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCTL;
+bool b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCTL;
 bSame = b1  sDefaultFonts[nFontType] == sDefFontCTL;
 }
 break;
diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx
index f95b87b..765e4e1 100644
--- a/sw/source/ui/config/modcfg.cxx
+++ b/sw/source/ui/config/modcfg.cxx
@@ -74,7 +74,7 @@ const InsCaptionOpt* SwModuleOptions::GetCapOption(
 }
 else
 {
-sal_Bool bFound = sal_False;
+bool bFound = false;
 if(eType == OLE_CAP  pOleId)
 {
 for( sal_uInt16 nId = 0; nId = GLOB_NAME_CHART  !bFound; nId++)
@@ -96,7 +96,7 @@ sal_Bool SwModuleOptions::SetCapOption(sal_Bool bHTML, const 
InsCaptionOpt* pOpt
 }
 else if (pOpt)
 {
-sal_Bool bFound = sal_False;
+bool bFound = false;
 if(pOpt-GetObjType() == OLE_CAP  pOpt-GetOleId())
 {
 for( sal_uInt16 nId = 0; nId = GLOB_NAME_CHART; nId++)
@@ -161,7 +161,7 @@ String SwModuleOptions::ConvertWordDelimiter(const String 
rDelim, sal_Bool bFro
 case 'x':
 {
 sal_Unicode nVal, nChar;
-sal_Bool bValidData = sal_True;
+bool bValidData = true;
 xub_StrLen n;
 for( n = 0, nChar = 0; n  2  i  rDelim.Len(); ++n, 
++i )
 {
@@ -174,7 +174,7

[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig

2013-01-09 Thread Libreoffice Gerrit user 
 sw/AllLangResTarget_sw.mk|1 
 sw/inc/helpid.h  |1 
 sw/source/ui/inc/glosbib.hxx |   46 +++--
 sw/source/ui/inc/misc.hrc|3 
 sw/source/ui/misc/glosbib.cxx|  180 ++--
 sw/source/ui/misc/glosbib.hrc|   32 ---
 sw/source/ui/misc/glosbib.src|  137 ---
 sw/uiconfig/swriter/ui/editcategories.ui |  269 ++-
 8 files changed, 248 insertions(+), 421 deletions(-)

New commits:
commit 1a162570d0050a7526a442f90f09c4bb0eb95d97
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jan 9 15:11:32 2013 +

adapt code to edit categories dialog .ui

Change-Id: Ib03ec188ba30d122ff687937209b989d418fe7ac

diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index f554549..033d7c8 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -139,7 +139,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
 sw/source/ui/lingu/olmenu.src \
 sw/source/ui/misc/autocorr.src \
 sw/source/ui/misc/docfnote.src \
-sw/source/ui/misc/glosbib.src \
 sw/source/ui/misc/glossary.src \
 sw/source/ui/misc/numberingtypelistbox.src \
 sw/source/ui/misc/outline.src \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 145e6c4..8cef3ce 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -20,7 +20,6 @@
 #include svx/svxcommands.h
 #include sfx2/sfxcommands.h
 
-#define HID_BIB_BASE
SW_HID_BIB_BASE
 #define HID_MERGE_PRINTMONITOR  
SW_HID_MERGE_PRINTMONITOR
 #define HID_FLD_INPUT   
SW_HID_FLD_INPUT
 #define HID_DOCINFO_EDT 
SW_HID_DOCINFO_EDT
diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx
index 7d722b4..99673dc 100644
--- a/sw/source/ui/inc/glosbib.hxx
+++ b/sw/source/ui/inc/glosbib.hxx
@@ -35,9 +35,16 @@ class SwGlossaryHdl;
 
 class FEdit : public Edit
 {
-public:
-FEdit(Window * pParent, const ResId rResId) :
-Edit(pParent, rResId){}
+public:
+FEdit(Window* pParent, const ResId rResId)
+: Edit(pParent, rResId)
+{
+}
+
+FEdit(Window* pParent)
+: Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK)
+{
+}
 
 virtual void KeyInput( const KeyEvent rKEvent );
 };
@@ -52,27 +59,28 @@ struct GlosBibUserData
 class SwGlossaryGroupTLB : public SvTabListBox
 {
 public:
-SwGlossaryGroupTLB(Window* pParent, const ResId rResId) :
-SvTabListBox(pParent, rResId) {}
+SwGlossaryGroupTLB(Window* pParent, const ResId rResId)
+: SvTabListBox(pParent, rResId)
+{
+}
 
-virtual voidRequestHelp( const HelpEvent rHEvt );
+SwGlossaryGroupTLB(Window* pParent)
+: SvTabListBox(pParent, WB_BORDER|WB_HSCROLL|WB_CLIPCHILDREN|WB_SORT)
+{
+}
+
+virtual void RequestHelp( const HelpEvent rHEvt );
 };
 
 class SwGlossaryGroupDlg : public SvxStandardDialog
 {
-FixedText   aBibFT;
-FEdit   aNameED;
-FixedText   aPathFT;
-ListBox aPathLB;
-FixedText   aSelectFT;
-SwGlossaryGroupTLB  aGroupTLB;
-
-OKButtonaOkPB;
-CancelButtonaCancelPB;
-HelpButton  aHelpPB;
-PushButton  aNewPB;
-PushButton  aDelPB;
-PushButton  aRenamePB;
+FEdit*  m_pNameED;
+ListBox*m_pPathLB;
+SwGlossaryGroupTLB* m_pGroupTLB;
+
+PushButton* m_pNewPB;
+PushButton* m_pDelPB;
+PushButton* m_pRenamePB;
 
 typedef std::vector ::rtl::OUString OUVector_t;
 OUVector_t m_RemovedArr;
diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc
index dad483d..0944840 100644
--- a/sw/source/ui/inc/misc.hrc
+++ b/sw/source/ui/inc/misc.hrc
@@ -21,10 +21,7 @@
 
 #include rcid.hrc
 
-#define STR_GLOSSARY_BIB_DLG(RC_MISC_BEGIN + 5)
-
 #define DLG_DOC_FOOTNOTE(RC_MISC_BEGIN + 13)
-#define DLG_BIB_BASE(RC_MISC_BEGIN + 16)
 #define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17)
 #define DLG_NUM_NAMES   (RC_MISC_BEGIN + 18)
 #define DLG_SORTING (RC_MISC_BEGIN + 19)
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 5e824dc..e0b4756 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -35,10 +35,7 @@
 #include glosdoc.hxx
 #include swunohelper.hxx
 
-#include glosbib.hrc
 #include misc.hrc
-#include helpid.h
-
 
 #define PATH_CASE_SENSITIVE 0x01
 #define PATH_READONLY   0x02
@@ -46,49 +43,44 @@
 #define RENAME_TOKEN_DELIM  (sal_Unicode)1
 
 SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
-std::vectorString const rPathArr,
-SwGlossaryHdl *pHdl) :
-SvxStandardDialog(pParent, SW_RES(DLG_BIB_BASE)),
-

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

2013-01-09 Thread Libreoffice Gerrit user 
 sw/source/core/unocore/unocrsrhelper.cxx |   28 +++-
 1 file changed, 19 insertions(+), 9 deletions(-)

New commits:
commit e5add879def40a7695fb506b42c024ef9f776062
Author: Noel Power noel.po...@suse.com
Date:   Wed Jan 9 14:40:10 2013 +0100

fdo#58242: getCrsrPropertyValue: fix crashes when PaM not on SwTxtNode

Change-Id: I67042b5d689457921a928454c9051f0402be17e6
(cherry picked from commit 11b380874a36869452246cc77c392d1767e60e95)

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/core/unocore/unocrsrhelper.cxx 
b/sw/source/core/unocore/unocrsrhelper.cxx
index 0993721..e41d237 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -302,9 +302,12 @@ sal_Bool getCrsrPropertyValue(const 
SfxItemPropertySimpleEntry rEntry
 break;
 case FN_UNO_DOCUMENT_INDEX_MARK:
 {
-::std::vectorSwTxtAttr * const marks(
-rPam.GetNode()-GetTxtNode()-GetTxtAttrsAt(
-rPam.GetPoint()-nContent.GetIndex(), RES_TXTATR_TOXMARK));
+::std::vectorSwTxtAttr * marks;
+if (rPam.GetNode()-IsTxtNode())
+{
+marks = rPam.GetNode()-GetTxtNode()-GetTxtAttrsAt(
+rPam.GetPoint()-nContent.GetIndex(), RES_TXTATR_TOXMARK);
+}
 if (marks.size())
 {
 if( pAny )
@@ -428,9 +431,9 @@ sal_Bool getCrsrPropertyValue(const 
SfxItemPropertySimpleEntry rEntry
 case FN_UNO_ENDNOTE:
 case FN_UNO_FOOTNOTE:
 {
-SwTxtAttr *const pTxtAttr =
+SwTxtAttr *const pTxtAttr = rPam.GetNode()-IsTxtNode() ?
 rPam.GetNode()-GetTxtNode()-GetTxtAttrForCharAt(
-rPam.GetPoint()-nContent.GetIndex(), RES_TXTATR_FTN);
+rPam.GetPoint()-nContent.GetIndex(), RES_TXTATR_FTN) : 0;
 if(pTxtAttr)
 {
 const SwFmtFtn rFtn = pTxtAttr-GetFtn();
@@ -452,9 +455,13 @@ sal_Bool getCrsrPropertyValue(const 
SfxItemPropertySimpleEntry rEntry
 break;
 case FN_UNO_REFERENCE_MARK:
 {
-::std::vectorSwTxtAttr * const marks(
+::std::vectorSwTxtAttr * marks;
+if (rPam.GetNode()-IsTxtNode())
+{
+marks = (
 rPam.GetNode()-GetTxtNode()-GetTxtAttrsAt(
 rPam.GetPoint()-nContent.GetIndex(), RES_TXTATR_REFMARK));
+}
 if (marks.size())
 {
 if( pAny )
@@ -470,9 +477,10 @@ sal_Bool getCrsrPropertyValue(const 
SfxItemPropertySimpleEntry rEntry
 break;
 case FN_UNO_NESTED_TEXT_CONTENT:
 {
-uno::ReferenceXTextContent const xRet(
-GetNestedTextContent(*rPam.GetNode()-GetTxtNode(),
-rPam.GetPoint()-nContent.GetIndex(), false));
+uno::ReferenceXTextContent const xRet(rPam.GetNode()-IsTxtNode()
+? GetNestedTextContent(*rPam.GetNode()-GetTxtNode(),
+rPam.GetPoint()-nContent.GetIndex(), false)
+: 0);
 if (xRet.is())
 {
 if (pAny)
@@ -721,6 +729,8 @@ void  getNumberingProperty(SwPaM rPam, PropertyState 
eState, Any * pAny )
 
 void GetCurPageStyle(SwPaM rPaM, String rString)
 {
+if (!rPaM.GetCntntNode())
+return; // TODO: is there an easy way to get it for tables/sections?
 const SwPageFrm* pPage = 
rPaM.GetCntntNode()-getLayoutFrm(rPaM.GetDoc()-GetCurrentLayout())-FindPageFrm();
 if(pPage)
 SwStyleNameMapper::FillProgName( pPage-GetPageDesc()-GetName(), 
rString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: replacing OUString::valueOf(static_castsal_Int32) ??

2013-01-09 Thread Michael Meeks 

On Wed, 2013-01-09 at 16:10 +0200, Noel Grandin wrote:
 maybe we need 
OUString::valueOfInt32(sal_Int32)
 that does the cast for us?
 
 At least it'll be less noisy, and we can document in one place why
 it's necessary.

Looks less error prone to me; doesn't suffer from odd side-effects of
un-related type changes as badly either; hopefully fixes the perennial
64bit vs. 32bit issues. Can be in-lined to produce ~identical code, we
could deprecated the old valueOf() methods just to beef up the idea that
we're continuing to evolve the sal API ;-)

Any profound objections ? [ not that I've time to do it myself  of
course ].

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]: fdo#58242: sw: fix more crashes when not on SwTxtNode

2013-01-09 Thread Michael Stahl (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1615

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/1615/1

fdo#58242: sw: fix more crashes when not on SwTxtNode

In getCrsrPropertyValue etc.; also add a unit test for the problem.

(cherry picked from commit 68d40d2cae3700f4134375fcaf9649ac626ada7d)

Conflicts:
sw/qa/complex/writer/CheckTable.java

Change-Id: Ibd459a43393c39b4fed9fb89aae4a5f7bacff007
---
M sw/source/core/unocore/unocrsrhelper.cxx
M sw/source/core/unocore/unoobj.cxx
M sw/source/core/unocore/unoobj2.cxx
3 files changed, 16 insertions(+), 6 deletions(-)



diff --git a/sw/source/core/unocore/unocrsrhelper.cxx 
b/sw/source/core/unocore/unocrsrhelper.cxx
index e41d237..aa9cc45 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -497,9 +497,9 @@
 case FN_UNO_CHARFMT_SEQUENCE:
 {
 
-SwTxtNode* pTxtNode;
-if((pTxtNode = (SwTxtNode*)rPam.GetNode( sal_True )) == 
rPam.GetNode(sal_False) 
-pTxtNode-GetpSwpHints())
+SwTxtNode *const pTxtNode = rPam.GetNode()-GetTxtNode();
+if (rPam.GetNode(sal_True) == rPam.GetNode(sal_False)
+ pTxtNode  pTxtNode-GetpSwpHints())
 {
 sal_uInt16 nPaMStart = rPam.GetPoint()-nContent.GetIndex();
 sal_uInt16 nPaMEnd = rPam.GetMark() ? 
rPam.GetMark()-nContent.GetIndex() : nPaMStart;
@@ -951,6 +951,11 @@
 xub_StrLen nStartIdx = 0;
 SwTxtNode* const pTxtNd =
 rNewCursor.GetPoint()-nNode.GetNode().GetTxtNode();
+if (!pTxtNd)
+{
+SAL_INFO(sw.uno, DocInsertStringSplitCR: need a text node);
+return false;
+}
 const xub_StrLen nMaxLength = ( pTxtNd )
 ? STRING_LEN - pTxtNd-GetTxt().Len()
 : STRING_LEN;
diff --git a/sw/source/core/unocore/unoobj.cxx 
b/sw/source/core/unocore/unoobj.cxx
index 3bba084..d400286 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -556,6 +556,10 @@
 {
 // multi selection is not considered
 SwTxtNode *const pTxtNd = rPam.GetNode()-GetTxtNode();
+if (!pTxtNd)
+{
+throw lang::IllegalArgumentException();
+}
 if (FN_UNO_NUM_LEVEL == rEntry.nWID)
 {
 sal_Int16 nLevel = 0;
diff --git a/sw/source/core/unocore/unoobj2.cxx 
b/sw/source/core/unocore/unoobj2.cxx
index ea121c1..6e0bf2f 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1851,9 +1851,10 @@
 FrameDependList_t  rFrames)
 {
 // search for objects at the cursor - anchored at/as char
-SwTxtAttr const*const pTxtAttr =
-rUnoCrsr.GetNode()-GetTxtNode()-GetTxtAttrForCharAt(
-rUnoCrsr.GetPoint()-nContent.GetIndex(), RES_TXTATR_FLYCNT);
+SwTxtAttr const*const pTxtAttr = (rUnoCrsr.GetNode()-IsTxtNode())
+? rUnoCrsr.GetNode()-GetTxtNode()-GetTxtAttrForCharAt(
+rUnoCrsr.GetPoint()-nContent.GetIndex(), RES_TXTATR_FLYCNT)
+: 0;
 if (pTxtAttr)
 {
 const SwFmtFlyCnt rFlyCnt = pTxtAttr-GetFlyCnt();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd459a43393c39b4fed9fb89aae4a5f7bacff007
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: GTK theming: oxygen-gtk support broken

2013-01-09 Thread Michael Meeks 

On Wed, 2013-01-09 at 15:47 +0100, Stephan Bergmann wrote:
 Regarding version information, there is solver/*/inc/*minor.mk 
 (make-level variables VERSIONMAJOR, VERSIONMINOR, etc.) and there is
 solenv/inc/version.hrc including versionlist.hrc (#defines for VERSION, 
 SUBVERSION, etc.).

Wow - sounds like Tor is right - we have a proliferation of duplicated
macros here that need cleaning :-)

 C++ code like desktop/source/deployment/misc/dp_dependencies.cxx uses 
 utl::ConfigManager::getAboutBoxProductVersion, which in turn reads the 
 /org.openoffice.Setup/Product/ configuration data.

I considered using that; but I didn't really want to fetch a configmgr
instance, and go through all that rats nest for each VCL window creation
- particularly when we know the version at compile time :-)

 (In case anything of that is useful or relevant for the current thread, 
 which I didn't quite get.)

:-) all about allowing complex gtk+ 2.0 themes to adapt to our version.

HTH,

Michael.

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

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

Re: Funding Wishlist

2013-01-09 Thread Jonathan Aquilina 
Hey guys I have a zippy imac atm which is just sitting on my desk not being
used with ample space and ram. I would be more then willing to help set
that up as a necessary tinderbox but its running osx 10.7 on it. Let me
know if you guys would benefit from having that as a tinderbox at all.

Regards

On Wed, Jan 9, 2013 at 4:11 PM, Michael Meeks michael.me...@suse.comwrote:


 On Wed, 2013-01-09 at 15:59 +0100, Lubos Lunak wrote:
   Hello, I'd like to ask, is there any plan to have such a mac machine? Or
  preferably a shared mac build host where developers could test their
 changes
  or find out more about tinderboxes breakages (which are sometimes rather
 hard
  to debug from just the log)? Thanks.

 Agreed - I'd love to have a couple of fast Mac machines co-located
 with
 a couple of good developers who can tend them and help isolate /
 reproduce nasty Mac bugs :-)

 We should certainly add that to the formal list of wishes from
 development: anything else ? some more focused hack-fests (for each
 component ?).

 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




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

[Libreoffice-commits] .: sfx2/source

2013-01-09 Thread Libreoffice Gerrit user 
 sfx2/source/doc/templatedlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3c08052394409a9c8aac07557a343070235672e7
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Jan 9 16:41:58 2013 +0100

Template Manager: delete popup menus in the proper order

Change-Id: Iafccfaa572b945d8d75d926ccc1935320b9d70d9

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 9a50ba9..11fddc2 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -210,9 +210,9 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg ()
 delete mpSearchView;
 delete maView;
 delete mpOnlineView;
+delete mpTemplateDefaultMenu;
 delete mpActionMenu;
 delete mpRepositoryMenu;
-delete mpTemplateDefaultMenu;
 delete mpToolbars;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW 4.0] Template manager fixes

2013-01-09 Thread Cedric Bosdonnat 
Hi all,

I have some patches fixes various tiny bugs in the new template manager
pending review for integration in 4.0. Could someone review them?

I first tried to push them to gerrit:
  https://gerrit.libreoffice.org/1610
  https://gerrit.libreoffice.org/1611

And then some more arrived, and I will simply list them here:
  Removing the All tab page as requested by UX people

http://cgit.freedesktop.org/libreoffice/core/commit/?id=52006aa4050a07fcc238f3cc9e1faa1ac95d08ec

http://cgit.freedesktop.org/libreoffice/core/commit/?id=1ce372eec4dd0e4e807baa7bbf568245b955f99f
  Fixing a crash when closing the dialog after resetting the default template

http://cgit.freedesktop.org/libreoffice/core/commit/?id=3c08052394409a9c8aac07557a343070235672e7

Thanks for your reviews.

--
Cedric

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

[Libreoffice-commits] .: sw/uiconfig

2013-01-09 Thread Libreoffice Gerrit user 
 sw/uiconfig/swriter/ui/exchangedatabases.ui |  286 
 1 file changed, 286 insertions(+)

New commits:
commit a0bf71323741c5c58b77651fe656c73419dbf09f
Author: Abdulelah Alarifi asalar...@kacst.edu.sa
Date:   Tue Jan 8 14:02:49 2013 +0300

Converted Exchange Databases widgets .ui

Change-Id: I67301dbd5b77cc5439f80b6bf4c241ca953216fd
Reviewed-on: https://gerrit.libreoffice.org/1595
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui 
b/sw/uiconfig/swriter/ui/exchangedatabases.ui
new file mode 100644
index 000..0337480
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui
@@ -0,0 +1,286 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkAction id=action1/
+  object class=GtkDialog id=Exchange Databases
+property name=can_focusFalse/property
+property name=border_width5/property
+property name=title translatable=yesExchange Databases/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox1
+property name=can_focusFalse/property
+property name=spacing2/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area1
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=layout_stylestart/property
+child
+  object class=GtkButton id=button1
+property name=label translatable=yesDefine/property
+property name=use_action_appearanceFalse/property
+property name=related_actionaction1/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=close
+property name=labelgtk-close/property
+property name=use_action_appearanceFalse/property
+property name=related_actionaction1/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=help
+property name=labelgtk-help/property
+property name=use_action_appearanceFalse/property
+property name=related_actionaction1/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkBox id=box1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing6/property
+child
+  object class=GtkFrame id=frame1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+  object class=GtkAlignment id=alignment1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=left_padding12/property
+child
+  object class=GtkBox id=box3
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+

[PUSHED] Converted Exchange Databases widgets .ui

2013-01-09 Thread 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/1595

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I67301dbd5b77cc5439f80b6bf4c241ca953216fd
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Abdulelah Alarifi asalar...@kacst.edu.sa
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

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

[Libreoffice-commits] .: lingucomponent/source linguistic/inc linguistic/source linguistic/workben

2013-01-09 Thread Libreoffice Gerrit user 
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx |8 +-
 lingucomponent/source/lingutil/lingutil.cxx|2 
 lingucomponent/source/spellcheck/macosxspell/macspellimp.mm|4 -
 lingucomponent/source/spellcheck/spell/sspellimp.cxx   |4 -
 lingucomponent/source/thesaurus/libnth/nthesimp.cxx|4 -
 linguistic/inc/linguistic/misc.hxx |   18 
 linguistic/source/convdic.cxx  |2 
 linguistic/source/convdiclist.cxx  |2 
 linguistic/source/dicimp.cxx   |7 +
 linguistic/source/dlistimp.cxx |6 -
 linguistic/source/gciterator.cxx   |6 -
 linguistic/source/hyphdsp.cxx  |   18 ++--
 linguistic/source/lngsvcmgr.cxx|   10 +-
 linguistic/source/misc.cxx |   38 
--
 linguistic/source/spelldsp.cxx |   14 +--
 linguistic/source/spelldta.cxx |4 -
 linguistic/source/thesdsp.cxx  |   10 +-
 linguistic/workben/sspellimp.cxx   |4 -
 18 files changed, 106 insertions(+), 55 deletions(-)

New commits:
commit 241ccc2568dd685d224f8a2b051c3e3a018d9400
Author: Eike Rathke er...@redhat.com
Date:   Wed Jan 9 16:48:52 2013 +0100

resolved fdo#58503 restore awkward handling of empty locale for legacy

Partly reverts d7a5ec62e91ce3dc5b784815254218f16181f676

An empty locale was treated as LANGUAGE_NONE, effectively being
interpreted as absence or undetermined or multiple or all depending on
context. Restore this behavior as it was an undocumented feature of the
API.

Change-Id: If4b1641e776d10dea0d3037f7a62725c2b8d612c

diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx 
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 9bbddae..749c615 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -479,13 +479,13 @@ Reference XHyphenatedWord  SAL_CALL 
Hyphenator::hyphenate( const ::rtl::OUStri
 sal_Int16 nPos = (sal_Int16) ((nHyphenationPosAltHyph  
nHyphenationPos) ?
 nHyphenationPosAltHyph : nHyphenationPos);
 // dicretionary hyphenation
-xRes = HyphenatedWord::CreateHyphenatedWord( aWord, 
LanguageTag( aLocale ).getLanguageType(), nPos,
+xRes = HyphenatedWord::CreateHyphenatedWord( aWord, 
LinguLocaleToLanguage( aLocale ), nPos,
 aWord.replaceAt(nHyphenationPosAlt + 1, 
cut[nHyphenationPos], repHyph),
 (sal_Int16) nHyphenationPosAltHyph);
 }
 else
 {
-xRes = HyphenatedWord::CreateHyphenatedWord( aWord, 
LanguageTag( aLocale ).getLanguageType(),
+xRes = HyphenatedWord::CreateHyphenatedWord( aWord, 
LinguLocaleToLanguage( aLocale ),
 (sal_Int16)nHyphenationPos, aWord, (sal_Int16) 
nHyphenationPos);
 }
 }
@@ -536,7 +536,7 @@ Reference XPossibleHyphens  SAL_CALL 
Hyphenator::createPossibleHyphens( const
 //well as hyphenate
 if (aWord.getLength()  minLen)
 {
-return PossibleHyphens::CreatePossibleHyphens( aWord, LanguageTag( 
aLocale ).getLanguageType(),
+return PossibleHyphens::CreatePossibleHyphens( aWord, 
LinguLocaleToLanguage( aLocale ),
   aWord, Sequence sal_Int16 () );
 }
 
@@ -683,7 +683,7 @@ Reference XPossibleHyphens  SAL_CALL 
Hyphenator::createPossibleHyphens( const
 OUString hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear();
 
 Reference XPossibleHyphens  xRes = 
PossibleHyphens::CreatePossibleHyphens(
-aWord, LanguageTag( aLocale ).getLanguageType(), hyphenatedWord, 
aHyphPos);
+aWord, LinguLocaleToLanguage( aLocale ), hyphenatedWord, aHyphPos);
 
 delete[] hyphens;
 delete[] lcword;
diff --git a/lingucomponent/source/lingutil/lingutil.cxx 
b/lingucomponent/source/lingutil/lingutil.cxx
index 194f0b7..8754442 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -216,7 +216,7 @@ void MergeNewStyleDicsAndOldStyleDics(
 {
 LanguageType nLang = LanguageTag( aIt2-aLocaleNames[0] 
).getLanguageType();
 
-if (nLang == LANGUAGE_DONTKNOW || nLang == LANGUAGE_NONE)
+if (nLang == LANGUAGE_DONTKNOW || linguistic::LinguIsUnspecified( 
nLang))
 {
 OSL_FAIL( old style dictionary with invalid language found! 
);

Re: replacing OUString::valueOf(static_castsal_Int32) ??

2013-01-09 Thread Lubos Lunak 
On Wednesday 09 of January 2013, Michael Meeks wrote:
 On Wed, 2013-01-09 at 16:10 +0200, Noel Grandin wrote:
  maybe we need
 OUString::valueOfInt32(sal_Int32)
  that does the cast for us?
 
  At least it'll be less noisy,

 Is there really such a big difference between
 OUString::valueOf( sal_Int32( 0 ))
and
 OUString::valueOfInt32( 0 )
?

 Yes, I know I used static_cast, but that's because of my undying love for 
all these integer problems, so I wanted to have a little fun as a 
compensation :). And I'd like to get rid of all this one day.

  and we can document in one place why it's necessary.

 So that other people don't have to search: According to my reading of the 
standard (mainly 13.3.3.1.1 and 13.3.3.2 [*]), this is because when choosing 
which conversion for overloaded functions is better, the standard treats all 
integer conversions[**] the same. I'm a bit confused by the rank of S1 is 
better than the rank of S2, in 13.3.3.2, since reading also 4.13 I would say 
that long and long long have different rank, therefore int-long should be 
prefered to int-long long, but a test with all GCC, Clang and MSVC shows 
that having f( long ) and f( long long ) makes f( 0 ) ambiguous :(. Makes me 
wonder if there is some obscure reason for this or if just the person coming 
up with this was having a bad day.

[*] The draft at 
http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3035.pdf .
[**] With the exception of promotion of types smaller than int to (unsigned) 
int.

   Looks less error prone to me; doesn't suffer from odd side-effects of 
 un-related type changes as badly either;

 What makes you think so? Having the type directly in the function name is 
almost the same like the explicit cast. If you cast incorrectly, you'll just 
as well get incorrect implicit cast when calling the function renamed 
function.

 hopefully fixes the perennial 
 64bit vs. 32bit issues. Can be in-lined to produce ~identical code, we
 could deprecated the old valueOf() methods just to beef up the idea that
 we're continuing to evolve the sal API ;-)

   Any profound objections ? [ not that I've time to do it myself  of
 course ].

 Uhm, but we already have more than enough Hungarian notation all over the 
place. If the API is to evolve, it should not do so by going backwards :(.

 What I think would work better would be having overloads for each 
integer[***]/float type (or a template), all of them still named valueOf(). 
That means one wouldn't need to bother with what the type actually is and the 
functions would just do the right thing (well, as long as the type is not 
sal_uInt8 or sal_uInt16, since, SAL types madness striking again, those are 
actually sal_Bool resp. sal_Unicode).

[***] That meaning language integer types, not the SAL stuff. Overloading on 
the latter would not change anything.

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

[PATCH] Change in core[libreoffice-4-0]: resolved fdo#58503 restore awkward handling of empty locale ...

2013-01-09 Thread Eike Rathke (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1616

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/1616/1

resolved fdo#58503 restore awkward handling of empty locale for legacy

Partly reverts d7a5ec62e91ce3dc5b784815254218f16181f676

An empty locale was treated as LANGUAGE_NONE, effectively being
interpreted as absence or undetermined or multiple or all depending on
context. Restore this behavior as it was an undocumented feature of the
API.

Change-Id: I256b352961f09e41cadb3e44c9ef01ee7677fd31
---
M lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
M lingucomponent/source/lingutil/lingutil.cxx
M lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
M lingucomponent/source/spellcheck/spell/sspellimp.cxx
M lingucomponent/source/thesaurus/libnth/nthesimp.cxx
M linguistic/inc/linguistic/misc.hxx
M linguistic/source/convdic.cxx
M linguistic/source/convdiclist.cxx
M linguistic/source/dicimp.cxx
M linguistic/source/dlistimp.cxx
M linguistic/source/gciterator.cxx
M linguistic/source/hyphdsp.cxx
M linguistic/source/lngsvcmgr.cxx
M linguistic/source/misc.cxx
M linguistic/source/spelldsp.cxx
M linguistic/source/spelldta.cxx
M linguistic/source/thesdsp.cxx
M linguistic/workben/sspellimp.cxx
18 files changed, 106 insertions(+), 55 deletions(-)



diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx 
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index e7fe7a4..990b45b 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -485,13 +485,13 @@
 sal_Int16 nPos = (sal_Int16) ((nHyphenationPosAltHyph  
nHyphenationPos) ?
 nHyphenationPosAltHyph : nHyphenationPos);
 // dicretionary hyphenation
-xRes = HyphenatedWord::CreateHyphenatedWord( aWord, 
LanguageTag( aLocale ).getLanguageType(), nPos,
+xRes = HyphenatedWord::CreateHyphenatedWord( aWord, 
LinguLocaleToLanguage( aLocale ), nPos,
 aWord.replaceAt(nHyphenationPosAlt + 1, 
cut[nHyphenationPos], repHyph),
 (sal_Int16) nHyphenationPosAltHyph);
 }
 else
 {
-xRes = HyphenatedWord::CreateHyphenatedWord( aWord, 
LanguageTag( aLocale ).getLanguageType(),
+xRes = HyphenatedWord::CreateHyphenatedWord( aWord, 
LinguLocaleToLanguage( aLocale ),
 (sal_Int16)nHyphenationPos, aWord, (sal_Int16) 
nHyphenationPos);
 }
 }
@@ -542,7 +542,7 @@
 //well as hyphenate
 if (aWord.getLength()  minLen)
 {
-return PossibleHyphens::CreatePossibleHyphens( aWord, LanguageTag( 
aLocale ).getLanguageType(),
+return PossibleHyphens::CreatePossibleHyphens( aWord, 
LinguLocaleToLanguage( aLocale ),
   aWord, Sequence sal_Int16 () );
 }
 
@@ -689,7 +689,7 @@
 OUString hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear();
 
 Reference XPossibleHyphens  xRes = 
PossibleHyphens::CreatePossibleHyphens(
-aWord, LanguageTag( aLocale ).getLanguageType(), hyphenatedWord, 
aHyphPos);
+aWord, LinguLocaleToLanguage( aLocale ), hyphenatedWord, aHyphPos);
 
 delete[] hyphens;
 delete[] lcword;
diff --git a/lingucomponent/source/lingutil/lingutil.cxx 
b/lingucomponent/source/lingutil/lingutil.cxx
index 194f0b7..8754442 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -216,7 +216,7 @@
 {
 LanguageType nLang = LanguageTag( aIt2-aLocaleNames[0] 
).getLanguageType();
 
-if (nLang == LANGUAGE_DONTKNOW || nLang == LANGUAGE_NONE)
+if (nLang == LANGUAGE_DONTKNOW || linguistic::LinguIsUnspecified( 
nLang))
 {
 OSL_FAIL( old style dictionary with invalid language found! 
);
 continue;
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm 
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index d021fc0..3149c02 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -296,7 +296,7 @@
 sal_Int16 nFailure = GetSpellFailure( rWord, rLocale );
 if (nFailure != -1)
 {
-sal_Int16 nLang = LanguageTag( rLocale ).getLanguageType();
+sal_Int16 nLang = LinguLocaleToLanguage( rLocale );
 // postprocess result for errors that should be ignored
 if (   (!rHelper.IsSpellUpperCase()   IsUpper( rWord, nLang ))
 || (!rHelper.IsSpellWithDigits()  HasDigits( rWord ))
@@ -320,7 +320,7 @@
 Reference XSpellAlternatives  xRes;
 // note: mutex is held by higher up by spell which covers both
 
-sal_Int16 nLang = LanguageTag( rLocale

Availability of the SDK?

2013-01-09 Thread Stephan Bergmann 
Availability of the SDK product appears not to be on par with the main 
LibreOffice product:


* https://www.libreoffice.org/download/ allows to download the 
Software development kit (SDK) for the browser's platform only 
(linking directly to 
http://download.documentfoundation.org/libreoffice/stable/3.6.4/rpm/x86_64/LibO-SDK_3.6.4_Linux_x86-64_install-rpm_en-US.tar.gz 
in my case).  Not the version you wanted? Change System, Version or 
Language does not lead to any options for downloading different SDK 
flavors, just different LO flavors.


* https://www.libreoffice.org/download/pre-releases/ (currently 
offering LibreOffice 4.0.0 Beta2 (2012-12-22)) does not lead to any 
options for downloading any pre-release version of the SDK. 
https://bugs.freedesktop.org/show_bug.cgi?id=58465#c2, comment 2 of 
officebean does not work has a user stumbling upon that.


* http://dev-builds.libreoffice.org/daily/ appears to offer SDK in 
some cases (like 
http://dev-builds.libreoffice.org/daily/master/MacOSX-Intel@1-built_no-moz_on_10.6.8/2013-01-09_08.08.08/master~2013-01-09_08.08.08_LibO-Dev_4.1.0.0.alpha0_MacOS_x86_sdk.dmg) 
but not in others (like 
http://dev-builds.libreoffice.org/daily/master/Win-x86@6/2013-01-09_08.31.35/).


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

[Libreoffice-commits] .: dbaccess/source

2013-01-09 Thread Libreoffice Gerrit user 
 dbaccess/source/ui/querydesign/querycontroller.cxx |  170 +
 dbaccess/source/ui/uno/copytablewizard.cxx |  139 +++--
 dbaccess/source/ui/uno/unosqlmessage.cxx   |8 
 3 files changed, 143 insertions(+), 174 deletions(-)

New commits:
commit b7d0dd5252bdec31fcc925037aa7916b9fffeca7
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Tue Jan 8 00:30:44 2013 -0200

Remove some RTL_* macros, rtl:: prefixes and simplification in dbaccess

Change-Id: I2a4381cbe1e716cd2de1fb596053646d1a74d4b0
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmai.com
Reviewed-on: https://gerrit.libreoffice.org/1572
Reviewed-by: Luboš Luňák l.lu...@suse.cz
Tested-by: Luboš Luňák l.lu...@suse.cz

diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx 
b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 22109df..d56b51b 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -100,12 +100,12 @@ namespace dbaui
 class OViewController : public OQueryController
 {
 
//--
-virtual ::rtl::OUString SAL_CALL getImplementationName() throw( 
RuntimeException )
+virtual OUString SAL_CALL getImplementationName() throw( 
RuntimeException )
 {
 return getImplementationName_Static();
 }
 
//-
-virtual Sequence ::rtl::OUString SAL_CALL getSupportedServiceNames() 
throw(RuntimeException)
+virtual Sequence OUString SAL_CALL getSupportedServiceNames() 
throw(RuntimeException)
 {
 return getSupportedServiceNames_Static();
 }
@@ -113,14 +113,14 @@ namespace dbaui
 OViewController(const Reference XMultiServiceFactory  _rM) : 
OQueryController(_rM){}
 
 // need by registration
-static ::rtl::OUString getImplementationName_Static() throw( 
RuntimeException )
+static OUString getImplementationName_Static() throw( RuntimeException 
)
 {
-return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(org.openoffice.comp.dbu.OViewDesign));
+return OUString(org.openoffice.comp.dbu.OViewDesign);
 }
-static Sequence ::rtl::OUString  
getSupportedServiceNames_Static(void) throw( RuntimeException )
+static Sequence OUString  getSupportedServiceNames_Static(void) 
throw( RuntimeException )
 {
-Sequence ::rtl::OUString aSupported(1);
-aSupported.getArray()[0] = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sdb.ViewDesign));
+Sequence OUString aSupported(1);
+aSupported.getArray()[0] = com.sun.star.sdb.ViewDesign;
 return aSupported;
 }
 static Reference XInterface  SAL_CALL Create(const Reference 
XMultiServiceFactory  _rM)
@@ -143,15 +143,12 @@ namespace dbaui
 // 
-
 void insertParseTree(SvTreeListBox* 
_pBox,::connectivity::OSQLParseNode* _pNode,SvTreeListEntry* _pParent = NULL)
 {
-::rtl::OUString rString;
+OUString rString;
 if (!_pNode-isToken())
 {
 // Regelnamen als rule: ...
-rString = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(RULE_ID: ));
-rString += ::rtl::OUString::valueOf( 
(sal_Int32)_pNode-getRuleID());
-rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(());
-rString += OSQLParser::RuleIDToStr(_pNode-getRuleID());
-rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM()));
+rString = RULE_ID:  + OUString::valueOf( 
(sal_Int32)_pNode-getRuleID() ) +
+  ( + OSQLParser::RuleIDToStr(_pNode-getRuleID()) + 
);
 
 
 _pParent = _pBox-InsertEntry(rString,_pParent);
@@ -172,54 +169,45 @@ namespace dbaui
 
 case SQL_NODE_KEYWORD:
 {
-rString += 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SQL_KEYWORD:));
-::rtl::OString sT = 
OSQLParser::TokenIDToStr(_pNode-getTokenID());
-rString += ::rtl::OStringToOUString(sT, 
RTL_TEXTENCODING_UTF8);
+rString += SQL_KEYWORD:;
+OString sT = 
OSQLParser::TokenIDToStr(_pNode-getTokenID());
+rString += OStringToOUString(sT, 
RTL_TEXTENCODING_UTF8);
  break;}
 
 case SQL_NODE_COMPARISON:
 {
-rString+= 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SQL_COMPARISON:));
-rString += _pNode-getTokenValue(); // haenge 
Nodevalue an
+

[PUSHED] Remove some RTL_* macros, rtl:: prefixes and simplification ...

2013-01-09 Thread 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/1572

Approvals:
  Luboš Luňák: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a4381cbe1e716cd2de1fb596053646d1a74d4b0
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz

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

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - .gitreview

2013-01-09 Thread Libreoffice Gerrit user 
 .gitreview |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 58035222f58b1049d16dea1860fee696818de70e
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Jan 9 17:24:56 2013 +0100

.gitreview: set defaultbranch for this branch correctly

Change-Id: I839b5b500136f426edeb4573be31f213e9363642

diff --git a/.gitreview b/.gitreview
index 094c974..77d45ee 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=master
+defaultbranch=libreoffice-4-0
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: formula/inc formula/source sc/inc sc/source

2013-01-09 Thread Libreoffice Gerrit user 
 formula/inc/formula/FormulaCompiler.hxx |3 +-
 formula/source/core/api/FormulaCompiler.cxx |2 -
 sc/inc/cell.hxx |5 
 sc/inc/compiler.hxx |4 +--
 sc/inc/formularesult.hxx|2 +
 sc/inc/token.hxx|4 +++
 sc/source/core/tool/compiler.cxx|2 -
 sc/source/core/tool/formularesult.cxx   |   10 +
 sc/source/core/tool/interpr1.cxx|3 ++
 sc/source/filter/xml/xmlcelli.cxx   |   30 
 sc/source/filter/xml/xmlimprt.cxx   |   11 ++
 sc/source/filter/xml/xmlimprt.hxx   |8 ++-
 12 files changed, 70 insertions(+), 14 deletions(-)

New commits:
commit b6fbc8642928893ca608a35b802032cfe42e40bb
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jan 9 11:17:09 2013 -0500

fdo#58539: Correctly set cached matrix formula result.

During the import, a cached matrix value only has an empty matrix
of correct geometry, plus the token type of the top-left cell.  The
rest of the elements are imported as hybrid values.  For now, this
seems to do the trick.

In the future we may want to change it to fully populate the matrix
cache value during the import, and skip setting the hybrid values for
the non-top-left elements.

This commit also make several other trivial changes:

* Mark pRawToken mutable so that we can mark those IsFoo() methods
  const.

* Move the ScCompiler instance from static instance to member of
  ScXMLImport. Since we don't need the instance to persist once the
  import is over, this is more appropriate.

Change-Id: I1abde03c0fcd91b02ef4dbf8b5526f7965eaf19c

diff --git a/formula/inc/formula/FormulaCompiler.hxx 
b/formula/inc/formula/FormulaCompiler.hxx
index ce4157d..85295b2 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -212,6 +212,8 @@ public:
  */
 OpCode GetEnglishOpCode( const String rName ) const;
 
+sal_uInt16 GetErrorConstant( const String rName ) const;
+
 voidSetCompileForFAP( bool bVal )
 { bCompileForFAP = bVal; bIgnoreErrors = bVal; }
 
@@ -265,7 +267,6 @@ protected:
 virtual void CreateStringFromIndex(rtl::OUStringBuffer 
rBuffer,FormulaToken* pTokenP);
 virtual void LocalizeString( String rName );   // modify rName - input: 
exact name
 
-sal_uInt16 GetErrorConstant( const String rName );
 void AppendErrorConstant( rtl::OUStringBuffer rBuffer, sal_uInt16 nError 
);
 
 bool   GetToken();
diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 29b6694..f79201b 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -816,7 +816,7 @@ void FormulaCompiler::OpCodeMap::copyFrom( const OpCodeMap 
r )
 }
 // 
-
 
-sal_uInt16 FormulaCompiler::GetErrorConstant( const String rName )
+sal_uInt16 FormulaCompiler::GetErrorConstant( const String rName ) const
 {
 sal_uInt16 nError = 0;
 OpCodeHashMap::const_iterator iLook( mxSymbols-getHashMap()-find( 
rName));
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index ee040a2..716b76f 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -493,6 +493,11 @@ public:
 const formula::FormulaGrammar::Grammar 
eGrammar )
 { aResult.SetHybridFormula( r); eTempGrammar = 
eGrammar; }
 
+void SetResultMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef 
pMat, formula::FormulaToken* pUL )
+{
+aResult.SetMatrix(nCols, nRows, pMat, pUL);
+}
+
 /** For import only: set a double result.
 Use this instead of SetHybridDouble() if there is no (temporary)
 formula string because the formula is present as a token array, as it
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 4aa393d..d40d261 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -320,7 +320,7 @@ private:
 sal_Unicode cSymbol[MAXSTRLEN]; // current Symbol
 String  aFormula;   // formula source code
 xub_StrLen  nSrcPos;// tokenizer position 
(source code)
-ScRawTokenRef   pRawToken;
+mutable ScRawTokenRef pRawToken;
 
 const CharClass*pCharClass; // which character classification 
is used for parseAnyToken
 sal_uInt16  mnPredetectedReference; // reference when reading ODF, 
0 (none), 1 (single) or 2 (double)
@@ -386,7 +386,7 @@ public:
 
 // Check if it is a valid english function name
 bool IsEnglishSymbol( const String rName );
-bool IsErrorConstant( const String );
+bool IsErrorConstant( const String ) const;
 
 //! _either_

[PATCH] Change in core[libreoffice-4-0]: fdo#58933 RTF import: avoid fake pars / cells when having gr...

2013-01-09 Thread Miklos Vajna (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1617

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/1617/1

fdo#58933 RTF import: avoid fake pars / cells when having graphic inside cells

Regression from 8063e36115a11ddf3db05928db9287947beee74d.
(cherry picked from commit 555bc780c83114220012e198b5471a0d7452fb32)

Change-Id: I9974368cfd9c38bbcce68f3b36e0eedfcbef5672
---
A sw/qa/extras/rtfimport/data/fdo58933.rtf
M sw/qa/extras/rtfimport/rtfimport.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
3 files changed, 44 insertions(+), 3 deletions(-)



diff --git a/sw/qa/extras/rtfimport/data/fdo58933.rtf 
b/sw/qa/extras/rtfimport/data/fdo58933.rtf
new file mode 100644
index 000..7568e27
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo58933.rtf
@@ -0,0 +1,28 @@
+{\rtf1
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;
+\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;
+\red192\green192\blue192;\red255\green255\blue255;}
+\ltrrow\trowd \cellx3415\cellx9652
+\pard\plain \ltrpar
+\intbl 
+{\*\shppict
+{\pict
+{\*\picprop\shplid1025
+{\sp
+{\sn shapeType}
+{\sv 75}
+}
+}
+\picscalex100\picscaley100\piccropl0\piccropr0\piccropt0\piccropb0\picw2646\pich1138\picwgoal1500\pichgoal645\pngblip\bliptag583511825
+{\*\blipuid 22c7af11751b66cef5cb11d41959e206}
+47494638396110001000d5ffffc0c0c0555f00aafcfcfcf6f6f6eaeaeae6e6e6e4e4e4e3e3e3c2c2c2c1c1c1bcbcbcb5b5b5b3b3b3b0b0b0adadada5a5a5a2a2a2a1a1a19f9f9f9494948a8a8a888686867b7b7b6c6c6c5c5c5c4e4e4e4b4b4b4747474646463d3d3d3c3c3c2e2e2e2525251b1b1b1818181010100909090606060303030021f9040102002c1000100684408170482c0a06c8a4728924389f506833b281302a8e6b164b18103024c52111504cca67332102e0042e9a40d9319f8300a343c1200f54e47f7e2a1e0b0a7d0d728a010d838400261a7c0d94947784252700127e9d159f6c8411140019080ea7a9a85f842122281612b1b3b25d6b1f29291d0fbbbdbc5d5e51c34e4cc64a46c94341003b}
+}
+\cell
+\pard \intbl foo\cell
+\pard \intbl 
+\trowd \cellx3415 \cellx9652\row
+\trowd \cellx9652\pard \intbl bar\cell
+\pard \intbl
+\trowd \cellx9652\row
+\pard \par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 367df3e..68b7aa5 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -134,6 +134,7 @@
 void testFdo57678();
 void testFdo45183();
 void testFdo54612();
+void testFdo58933();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -218,6 +219,7 @@
 {fdo57678.rtf, Test::testFdo57678},
 {fdo45183.rtf, Test::testFdo45183},
 {fdo54612.rtf, Test::testFdo54612},
+{fdo58933.rtf, Test::testFdo58933},
 };
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -1013,6 +1015,16 @@
 CPPUNIT_ASSERT_EQUAL(sal_Int32(8), xDraws-getCount());
 }
 
+void Test::testFdo58933()
+{
+// The problem was that the table had an additional cell in its first line.
+uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xTables(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTable(xTables-getByIndex(0), 
uno::UNO_QUERY);
+// This was 4.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable-getCellNames().getLength());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ffb583f..c961c7d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -816,15 +816,16 @@
 writerfilter::ReferenceProperties::Pointer_t const pProperties(new 
RTFReferenceProperties(aAttributes, aSprms));
 checkFirstRun();
 if (!m_pCurrentBuffer)
+{
 Mapper().props(pProperties);
+// Make sure we don't loose these properties with a too early reset.
+m_bHadPicture = true;
+}
 else
 {
 RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
 m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue));
 }
-
-// Make sure we don't loose these properties with a too early reset.
-m_bHadPicture = true;
 return 0;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9974368cfd9c38bbcce68f3b36e0eedfcbef5672
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0

RE: [libreoffice-dev] - building difficulties with C++ extension,addIn

2013-01-09 Thread Rai, Neeraj 
Hi Stephan,

Thanks for taking this up. I wasn't aware that examples didn't get built with 
make or make check.
Time is not a big issue as long as it gets to the right place, and it seems 
like you are pushing it in right direction.
I noticed that you are listed UNO,sal,config contact. Hope it is ok if I 
address future issues to you. I'll try to limit my spam to once a day.

After my last email, I noticed some issues with the cxx file I attached. 
attaching an updated version. Also Makefile uses more standard env vars.

This is not a complete Calc add and I'm still working to incorporate other 
functionality from Scalc.java.
But as a standalone calc extension took me 8 days, I thought this might be 
worth sharing already.
If I am ready with the richer functionality by the time right place is decided, 
I'll share that too.

I think myRNG.tar is also very good example, as it works out of the box, as 
long as sdk is installed and env is set.
The extension docs looked overwhelming when Michael 1st mentioned it, but 
thanks to myRNG examples, I was able to get past that.
Hope that also finds a place in your new scheme of things.

Not sure if this is related to any restructuring you guys are planning, but as 
of this moment, the wiki I used is down.
http://wiki.openoffice.org
This may be legacy and the info may belong elsewhere, or maybe Oracle owns it 
and finally decided to take openoffice closed source:-)

Thanks
Neeraj

-Original Message-
From: Stephan Bergmann [mailto:sberg...@redhat.com]
Sent: Wednesday, January 09, 2013 5:28 AM
To: 'libreoffice@lists.freedesktop.org'
Cc: Rai, Neeraj [ICG-MKTS]
Subject: Re: [libreoffice-dev] - building difficulties with C++ extension,addIn

Hi Neeraj,

Thank you for taking the trouble of making your Calc addin example work.
  The SDK is indeed an area that could benefit from more maintenance
help, lots of the documentation goes stale over time etc.

That said, I'm not sure we'll improve the overall situation by adding
more examples directly to the SDK.  The content of the SDK is backed by
module odk in the core LO git repo, so the example code ends up in the
core repo, where greps and wholesale code-cleaning activities (like some
EasyHacks) stumble upon it, modify it, etc.  But due to the awkward way
the SDK needs to be set up for use (another area that would benefit from
additional help), those examples do not routinely get tested (e.g., are
not compiled and run during a build, not even a make check one).

Therefore, I wonder whether it would not make more sense to have some
place of its own for such additional examples to reside in, like in a
wiki or some repository similar to LO's extensions and templates sites.
  I'll see to get that issue addressed and come back here.

Thanks again for your work and for your patience,
Stephan

On 01/08/2013 08:45 PM, Rai, Neeraj wrote:
 Hi Michael,

 I was able to work around the problem below by removing the platform tag.
 For now, I am happy with legacy active registration.
 I now have a working example of Calc extension in C++ (on lines of 
 example/java/SpreadSheet/CalcAddins)
 Thanks for your help.


 I noticed that you are listed as one of the developers for soffice. Would you 
 be able to take this code and introduce it as part of package ?
 Same might be done for myRNG.tar.gz.
 I think calc is an important part of soffice and having a c++ extension 
 readily available would attract more users to it.
 It took me days to get this working, but for anyone henceforth it should be 
 15 min.

 Unfortunately, I am behind firewall and can't access gerrit. I am attaching 
 the file with this email.
 If there is a better way to get it as part of installation, I'll be happy to 
 contribute.

 Thanks
 Neeraj
 -Original Message-
 From: Rai, Neeraj [ICG-MKTS]
 Sent: Monday, January 07, 2013 7:30 PM
 To: Michael Stahl
 Cc: 'libreoffice@lists.freedesktop.org'
 Subject: [libreoffice-dev] - building difficulties with C++ extension,addIn

 Hi Michael,

 I tried your extension suggestion to convert 
 examples/java/SpreadSheet/CalcAddins.java to C++.
 I am having problem installing my extension using unpkg.
 Error : The extension my simple extension does not work on this computer.
 I tried various values in META-INF/manifest.xml : platform=linux_x86_64 and 
 platform=all but I get the same error.

 I probably did something wrong transporting the xml files or oxt files from 
 the example.
 The original example in java works for me.
 Would you happen to have expertise in this area and time to help me out ?

 I also came across the following link which states that regmerge is legacy. 
 However, the CalcAddIn was using it, so I went with it too.
 http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Deployment_Options_for_Components
 If that is the not the right way forward, please point me in the right 
 direction.

 Thanks
 Neeraj

 -Original Message-
 From: Michael Stahl [mailto:mst...@redhat.com]
 Sent:

[PATCH] Change in core[libreoffice-3-6]: fdo#58933 RTF import: avoid fake pars / cells when having gr...

2013-01-09 Thread Miklos Vajna (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1618

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/1618/1

fdo#58933 RTF import: avoid fake pars / cells when having graphic inside cells

Regression from 8063e36115a11ddf3db05928db9287947beee74d.
(cherry picked from commit 555bc780c83114220012e198b5471a0d7452fb32)

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

Change-Id: Ied422751783a00983bd137d6151e0d58217ef76d
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
1 file changed, 4 insertions(+), 3 deletions(-)



diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 5529703..a7677d1 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -785,15 +785,16 @@
 writerfilter::ReferenceProperties::Pointer_t const pProperties(new 
RTFReferenceProperties(aAttributes, aSprms));
 checkFirstRun();
 if (!m_pCurrentBuffer)
+{
 Mapper().props(pProperties);
+// Make sure we don't loose these properties with a too early reset.
+m_bHadPicture = true;
+}
 else
 {
 RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
 m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue));
 }
-
-// Make sure we don't loose these properties with a too early reset.
-m_bHadPicture = true;
 return 0;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied422751783a00983bd137d6151e0d58217ef76d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Miklos Vajna vmik...@suse.cz

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

Re: [PUSHED 4.0] LATE FEATURE: Personas in LibreOffice

2013-01-09 Thread khagaroth 
It's useless without support for font color settings. Black text on black
persona isn't exactly great UX experience. Though to be fair, even with
support for this, some of the personas have rather weird color combinations
when checked in Firefox.


On Wed, Jan 9, 2013 at 2:38 PM, Stefan Knorr (Astron) 
heinzless...@gmail.com wrote:

 Hi again,

 minor correction to my own post only
  LibO window with my (admittedly somewhat slow (1000 Mb/s)) connection

 Make that 1 MBit/s...

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

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

Re: replacing OUString::valueOf(static_castsal_Int32) ??

2013-01-09 Thread Michael Stahl 
On 09/01/13 17:02, Lubos Lunak wrote:
 On Wednesday 09 of January 2013, Michael Meeks wrote:
 On Wed, 2013-01-09 at 16:10 +0200, Noel Grandin wrote:
 maybe we need
OUString::valueOfInt32(sal_Int32)
 that does the cast for us?

 At least it'll be less noisy,
 
  Is there really such a big difference between
  OUString::valueOf( sal_Int32( 0 ))
 and
  OUString::valueOfInt32( 0 )

it has the advantage of being explicit in what type it expects; however
i actually think that is quite irrelevant for a Integer-to-String
conversion (as opposed to a -to-binary conversion); are there any use
cases where converting to a too big integer type would mess up the result?

so it would probably be an improvement, but a small one.

  Looks less error prone to me; doesn't suffer from odd side-effects of 
 un-related type changes as badly either;
 
  What makes you think so? Having the type directly in the function name is 
 almost the same like the explicit cast. If you cast incorrectly, you'll just 
 as well get incorrect implicit cast when calling the function renamed 
 function.

but you'll at least implicitly cast the same way on all platforms (since
the sal types don't map to arbitrary types, but to types of a particular
size).

 hopefully fixes the perennial 
 64bit vs. 32bit issues. Can be in-lined to produce ~identical code, we
 could deprecated the old valueOf() methods just to beef up the idea that
 we're continuing to evolve the sal API ;-)

  Any profound objections ? [ not that I've time to do it myself  of
 course ].
 
  Uhm, but we already have more than enough Hungarian notation all over the 
 place. If the API is to evolve, it should not do so by going backwards :(.
 
  What I think would work better would be having overloads for each 
 integer[***]/float type (or a template), all of them still named valueOf(). 
 That means one wouldn't need to bother with what the type actually is and the 
 functions would just do the right thing (well, as long as the type is not 
 sal_uInt8 or sal_uInt16, since, SAL types madness striking again, those are 
 actually sal_Bool resp. sal_Unicode).

i don't like that idea, actually because there are already valueOf
overloads for integral types sal_Bool and sal_Unicode that do something
other than produce a string representation of an integer value, which
seems wrong to me to begin with.

better to add a new overloaded function, say valueOfInt, and have
overloads for all possible C++ integral types, all of which produce
strings with numbers.  using that consistently would also solve the
problem of accidentally calling valueOf(a_sal_uInt16) and getting
surprising results.

only question is what to do about the radix parameter which is
supported by sal_Int32 and sal_Int64 parameters currently... likely it's
not needed often?


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

[Libreoffice-commits] bin/push_nightlies.sh

2013-01-09 Thread Libreoffice Gerrit user 
 bin/push_nightlies.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 76e258540aed3cc1b1ae7e92599e07ab3dd1bea1
Author: Luboš Luňák l.lu...@suse.cz
Date:   Wed Jan 9 17:47:42 2013 +0100

push also dev .msi

Presumably the -path is there to filter out those .msi files
in /idt_files/ , which I think are not(?) final installation files.

diff --git a/bin/push_nightlies.sh b/bin/push_nightlies.sh
index 2c32443..e98a532 100755
--- a/bin/push_nightlies.sh
+++ b/bin/push_nightlies.sh
@@ -84,7 +84,7 @@ else
 fi
 
 echo find packages
-for file in $(find . -name *.dmg -o -name '*.apk' -o -name LibO*.tar.gz -o 
-name LibO*.exe -o -name LibO*.zip -o -path 
'*/LibreOffice_Dev/native/install/*.msi' | grep -v /push/)
+for file in $(find . -name *.dmg -o -name '*.apk' -o -name LibO*.tar.gz -o 
-name LibO*.exe -o -name LibO*.zip -o -path '*/native/install/*.msi' | grep 
-v /push/)
 do
target=$(basename $file)
target=${tag}_${target}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Availability of the SDK?

2013-01-09 Thread Lubos Lunak 
On Wednesday 09 of January 2013, Stephan Bergmann wrote:
 * http://dev-builds.libreoffice.org/daily/ appears to offer SDK in
 some cases (like
 http://dev-builds.libreoffice.org/daily/master/MacOSX-Intel@1-built_no-moz
_on_10.6.8/2013-01-09_08.08.08/master~2013-01-09_08.08.08_LibO-Dev_4.1.0.0.a
lpha0_MacOS_x86_sdk.dmg) but not in others (like
 http://dev-builds.libreoffice.org/daily/master/Win-x86@6/2013-01-09_08.31.
35/).

 I think I have fixed this one in tinbuild.

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

[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk

2013-01-09 Thread Libreoffice Gerrit user 
 sw/AllLangResTarget_sw.mk   |1 
 sw/UI_swriter.mk|1 
 sw/inc/fldui.hrc|1 
 sw/inc/swabstdlg.hxx|2 
 sw/source/ui/dbui/dbtree.cxx|   26 +++
 sw/source/ui/dialog/swdlgfact.cxx   |   19 --
 sw/source/ui/dialog/swdlgfact.hxx   |2 
 sw/source/ui/fldui/changedb.cxx |  112 ++
 sw/source/ui/fldui/changedb.hrc |   48 --
 sw/source/ui/fldui/changedb.src |  119 --
 sw/source/ui/inc/changedb.hxx   |   17 --
 sw/source/ui/inc/dbtree.hxx |4 
 sw/source/ui/inc/titlepage.hxx  |4 
 sw/source/ui/misc/titlepage.cxx |4 
 sw/source/ui/shells/basesh.cxx  |2 
 sw/uiconfig/swriter/ui/exchangedatabases.ui |  224 
 16 files changed, 201 insertions(+), 385 deletions(-)

New commits:
commit f5a8fa8b54e0a4a70d7439a054868d5bbdfd593b
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jan 9 16:06:30 2013 +

adapt code to Exchange Databases dialog

Change-Id: Ife2d92131f7cd758628ae686cde734dab56e4499

diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 033d7c8..7ba3c46 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -118,7 +118,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
 sw/source/ui/envelp/labprt.src \
 sw/source/ui/envelp/mailmrge.src \
 sw/source/ui/fldui/DropDownFieldDialog.src \
-sw/source/ui/fldui/changedb.src \
 sw/source/ui/fldui/flddb.src \
 sw/source/ui/fldui/flddinf.src \
 sw/source/ui/fldui/flddok.src \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index d24053c..2caf62f 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/converttexttable \
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/editcategories \
+   sw/uiconfig/swriter/ui/exchangedatabases \
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/insertbookmark \
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index c500a1d..1a7b078 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -21,7 +21,6 @@
 #include rcid.hrc
 
 #define DLG_FLD_INPUT   (RC_FLDDLG_BEGIN + 5)
-#define DLG_CHANGE_DB   (RC_FLDDLG_BEGIN + 9)
 
 #define DLG_FLD_INSERT  (RC_FLDDLG_BEGIN + 11)
 #define DLG_FLD_DROPDOWN(RC_FLDDLG_BEGIN + 12)
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index a6f8ab5..553dcc0 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -354,7 +354,7 @@ public:
 virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, 
SwWrtShell rSh, SfxRequest rReq, int nResId ) = 0;// add for 
SwInsertBookmarkDlg
 
 virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell 
rSh) = 0; // add for SwBreakDlg
-virtual VclAbstractDialog   * CreateSwChangeDBDlg( SwView rVw, int nResId 
) = 0; //add for SwChangeDBDlg
+virtual VclAbstractDialog   * CreateSwChangeDBDlg(SwView rVw) = 0; //add 
for SwChangeDBDlg
 virtual SfxAbstractTabDialog *  CreateSwCharDlg( Window* pParent, SwView 
pVw, const SfxItemSet rCoreSet, int nResId, // add for SwCharDlg
 const String* pFmtStr = 0, 
sal_Bool bIsDrwTxtDlg = sal_False) = 0;
 virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView rView, 
bool bToTable) = 0; //add for SwConvertTableDlg
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index 34803ac..fe695aa 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -42,6 +42,7 @@
 #include wrtsh.hxx
 #include dbtree.hxx
 #include osl/mutex.hxx
+#include vcl/builder.hxx
 #include vcl/svapp.hxx
 #include svtools/treelistentry.hxx
 
@@ -189,6 +190,31 @@ SwDBTreeList::SwDBTreeList(Window *pParent, const ResId 
rResId,
 InitTreeList();
 }
 
+SwDBTreeList::SwDBTreeList(Window *pParent)
+: SvTreeListBox(pParent, WB_TABSTOP)
+, aImageList(SW_RES(ILIST_DB_DLG))
+, bInitialized(false)
+, bShowColumns(false)
+, pImpl(new SwDBTreeList_Impl(NULL))
+{
+SetHelpId(HID_DB_SELECTION_TLB);
+
+if (IsVisible())
+InitTreeList();
+}
+
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwDBTreeList(Window 
*pParent, VclBuilder::stringmap )
+{
+return new SwDBTreeList(pParent);
+}
+
+Size SwDBTreeList::GetOptimalSize(WindowSizeType eType) const
+{
+if (eType == WINDOWSIZE_PREFERRED)
+return LogicToPixel(Size(100, 62), MapMode(MAP_APPFONT));
+return SvTreeListBox::GetOptimalSize(eType);
+}
+
 SwDBTreeList::~SwDBTreeList()
 {
 delete pImpl;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index 437c2bb..5f833a3 100644
---

[Libreoffice-commits] .: odk/cfgWin.js

2013-01-09 Thread Libreoffice Gerrit user 
 odk/cfgWin.js |   50 +-
 1 file changed, 1 insertion(+), 49 deletions(-)

New commits:
commit 0c22641b4c44938924187ddfb945f494a183ba47
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jan 9 17:45:09 2013 +0100

Fix oo_sdk_ure_home calculation in SDK's cfgWin.js

This appears to be broken at least since
bde5b815873450dc9520c4dd300829eb5bd72daa INTEGRATION: CWS jsc21 (1.11.2); 
FILE
MERGED: 2008/05/27 16:59:34 jsc 1.11.2.1: #i88797# adapt for new structure?

Change-Id: I6385ca10cdded13e6d1aaf08d353f5029843d38d

diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index b6dd4e7..fa1c081 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -53,7 +53,7 @@ var oo_user_sdk_dir=WshSysEnv(APPDATA) + \\ + oo_sdk_name;
 var oo_user_sdk_env_script=oo_user_sdk_dir + \\setsdkenv_windows.bat;
 
 var office_home=getOfficeHome();
-var oo_sdk_ure_home=getUreHome();
+var oo_sdk_ure_home=office_home + \\URE;
 
 var oo_sdk_make_home=getMakeHome();
 var oo_sdk_zip_home=getZipHome();
@@ -140,23 +140,6 @@ function getSdkHome()
 }   
 }
 
-function getOfficeOrUre()
-{
-var suggestion = Office;
-var choice;
-while (choice != office  choice != ure) {
-stdout.Write(
-\n Use an installed Office or an installed UNO Runtime
-+  Environment (Office/URE) [ + suggestion + ]:);
-choice = stdin.ReadLine();
-if (choice == ) {
-choice = suggestion;
-}
-choice = choice.toLowerCase();
-}
-return choice;
-}
-
 function getOfficeHome()
 {
 var sSuggestedHome = WshSysEnv(OFFICE_HOME);
@@ -239,37 +222,6 @@ function searchOffice()
return ;
 }
 
-
-function getUreHome()
-{
-   var tmpure = oo_sdk_home;
-   var ure = ;
-
-if (aFileSystemObject.FileExists(tmpure + \\URE\\bin\\uno.exe)) {
-  ure = tmpure + \URE;
-   }
-
-   return ure;
-
-/*
-var suggestion = WshSysEnv(OO_SDK_URE_HOME);
-var choice;
-for (;;) {
-stdout.Write(
-\n Enter the URE installation directory [ + suggestion + ]:);
-choice = stdin.ReadLine();
-if (choice == ) {
-choice = suggestion;
-}
-if (aFileSystemObject.FileExists(choice + \\bin\\uno.exe)) {
-break;
-}
-stdout.WriteLine(\n Error: A valid URE installation is required.);
-}
-return choice;
-*/
-}
-
 function getMakeHome()
 {
 var sSuggestedHome = WshSysEnv(OO_SDK_MAKE_HOME);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/uiconfig sw/UI_swriter.mk

2013-01-09 Thread Libreoffice Gerrit user 
 sw/UI_swriter.mk |1 
 sw/uiconfig/swriter/ui/asianphoneticguide.ui |  286 +++
 2 files changed, 287 insertions(+)

New commits:
commit 21be5156d45139d27a1ec18367ed271fdc9373a3
Author: Gokul gswaminat...@kacst.edu.sa
Date:   Mon Dec 17 13:43:38 2012 +0300

Added asianphoneticguide.ui

Change-Id: Ia49f0c8982e901fdb869d451cc3f272f629afc81
Reviewed-on: https://gerrit.libreoffice.org/1384
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index 2caf62f..e89575f 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UI_UI,modules/swriter))
 $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/autoformattable \
sw/uiconfig/swriter/ui/autotext \
+   sw/uiconfig/swriter/ui/asianphoneticguide \
sw/uiconfig/swriter/ui/bibliographyentry \
sw/uiconfig/swriter/ui/bulletsandnumbering \
sw/uiconfig/swriter/ui/captionoptions \
diff --git a/sw/uiconfig/swriter/ui/asianphoneticguide.ui 
b/sw/uiconfig/swriter/ui/asianphoneticguide.ui
new file mode 100644
index 000..92bc10d
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/asianphoneticguide.ui
@@ -0,0 +1,286 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkDialog id=Asian Phonetic Guide
+property name=can_focusFalse/property
+property name=border_width5/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox1
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing2/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area1
+property name=can_focusFalse/property
+property name=layout_styleend/property
+child
+  object class=GtkButton id=apply
+property name=labelgtk-apply/property
+property name=use_action_appearanceFalse/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=close
+property name=labelgtk-close/property
+property name=use_action_appearanceFalse/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=help
+property name=labelgtk-help/property
+property name=use_action_appearanceFalse/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkBox id=box1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing15/property
+child
+  object class=GtkGrid id=grid3
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=column_spacing80/property
+child
+  object class=GtkLabel id=label2
+

  1   2   3   4   >