Re: Help Locating Base Code

2012-08-30 Thread Lionel Elie Mamane 
On Wed, Aug 22, 2012 at 09:21:24AM +0100, Mark Stanton wrote:

>> Oh - database expert, that's Lionel :-)  But of course, having more
>> database experts would be great!

> I intended that to be me.  Having spent more than twenty years
> writing them I thought I might qualify.

Cool! I'm already rejoicing at the idea of having you around. Welcome.

Do you intend to be mainly in

1) "pure database" stuff (drivers, SQL parsing and generation, ...)

or also dig into

2) stuff more around it, like e.g. the report builder and the forms
   system?

There is certainly a need for more manpower in number 1 (there is
always a need for more...), but number 2 has IMHO some of the most
urgent / important matters open. And maybe more importantly, I'm
better at number 1 than number 2, so the need is more desperate.

> I'm reading the lists (here, dev & qa) regularly, but unfortunately
> at the moment I'm bogged down (...).

> I hope to be "here" in a month or two.

We'll be waiting. See you soon.

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

[PUSHED] rename ImplCoreTextFontData in CoreTextPhysicalFontFace

2012-08-30 Thread Gerrit 
>From Norbert Thiebaud :

Norbert Thiebaud has submitted this change and it was merged.

Change subject: rename ImplCoreTextFontData in CoreTextPhysicalFontFace
..


rename ImplCoreTextFontData in CoreTextPhysicalFontFace

Change-Id: Idcf9c21ab1a16b8d83f925aa742f1a5aa7089bc3
---
M vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx
M vcl/aqua/source/gdi/coretext/salcoretextstyle.cxx
M vcl/aqua/source/gdi/coretext/salgdi.cxx
M vcl/inc/aqua/coretext/salcoretextfontutils.hxx
M vcl/inc/aqua/coretext/salcoretextstyle.hxx
M vcl/inc/aqua/coretext/salgdi.h
6 files changed, 36 insertions(+), 37 deletions(-)

Approvals:
  Norbert Thiebaud: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idcf9c21ab1a16b8d83f925aa742f1a5aa7089bc3
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud 
Gerrit-Reviewer: Eike Rathke 
Gerrit-Reviewer: Norbert Thiebaud 

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

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

2012-08-30 Thread Libreoffice Gerrit user 
 vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx |   26 +-
 vcl/aqua/source/gdi/coretext/salcoretextstyle.cxx |   13 -
 vcl/aqua/source/gdi/coretext/salgdi.cxx   |   16 +--
 vcl/inc/aqua/coretext/salcoretextfontutils.hxx|   12 
 vcl/inc/aqua/coretext/salcoretextstyle.hxx|4 +-
 vcl/inc/aqua/coretext/salgdi.h|2 -
 6 files changed, 36 insertions(+), 37 deletions(-)

New commits:
commit e1b61b2dafd8e84c60f5ae0eebf04165ea55d353
Author: Norbert Thiebaud 
Date:   Mon Jul 2 11:37:15 2012 -0500

rename ImplCoreTextFontData in CoreTextPhysicalFontFace

Change-Id: Idcf9c21ab1a16b8d83f925aa742f1a5aa7089bc3
Reviewed-on: https://gerrit.libreoffice.org/305
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx 
b/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx
index faaf11b..a54cfb9 100644
--- a/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx
+++ b/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx
@@ -203,7 +203,7 @@ SystemFontList::SystemFontList()
 ImplDevFontAttributes devfont_attr;
 if(GetDevFontAttributes( font_descriptor, devfont_attr ) )
 {
-ImplCoreTextFontData* font_data = new 
ImplCoreTextFontData(devfont_attr, font);
+CoreTextPhysicalFontFace* font_data = new 
CoreTextPhysicalFontFace(devfont_attr, font);
 if(font_data && font_data->GetCTFont())
 {
 m_aFontContainer [ font_data->GetCTFont() ] = font_data;
@@ -224,7 +224,7 @@ SystemFontList::~SystemFontList()
 m_aFontContainer.clear();
 }
 
-ImplCoreTextFontData* SystemFontList::GetFontDataFromRef( CTFontRef font ) 
const
+CoreTextPhysicalFontFace* SystemFontList::GetFontDataFromRef( CTFontRef font ) 
const
 {
 CoreTextFontContainer::const_iterator it = m_aFontContainer.find( font );
 return it == m_aFontContainer.end() ? NULL : (*it).second;
@@ -240,7 +240,7 @@ void SystemFontList::AnnounceFonts( ImplDevFontList& 
rFontList ) const
 }
 }
 
-ImplCoreTextFontData::ImplCoreTextFontData( const ImplDevFontAttributes& rDFA, 
CTFontRef font )
+CoreTextPhysicalFontFace::CoreTextPhysicalFontFace( const 
ImplDevFontAttributes& rDFA, CTFontRef font )
 :   PhysicalFontFace( rDFA, 0 )
 ,   m_CTFontRef((CTFontRef)CFRetain(font))
 ,   m_pCharMap( NULL )
@@ -252,7 +252,7 @@ ImplCoreTextFontData::ImplCoreTextFontData( const 
ImplDevFontAttributes& rDFA, C
 {
 }
 
-ImplCoreTextFontData::~ImplCoreTextFontData()
+CoreTextPhysicalFontFace::~CoreTextPhysicalFontFace()
 {
 if( m_pCharMap )
 {
@@ -264,9 +264,9 @@ ImplCoreTextFontData::~ImplCoreTextFontData()
 }
 }
 
-PhysicalFontFace* ImplCoreTextFontData::Clone() const
+PhysicalFontFace* CoreTextPhysicalFontFace::Clone() const
 {
-ImplCoreTextFontData* pClone = new ImplCoreTextFontData(*this);
+CoreTextPhysicalFontFace* pClone = new CoreTextPhysicalFontFace(*this);
 if( m_pCharMap )
 {
 m_pCharMap->AddReference();
@@ -278,12 +278,12 @@ PhysicalFontFace* ImplCoreTextFontData::Clone() const
 return pClone;
 }
 
-ImplFontEntry* ImplCoreTextFontData::CreateFontInstance(FontSelectPattern& 
rFSD) const
+ImplFontEntry* CoreTextPhysicalFontFace::CreateFontInstance(FontSelectPattern& 
rFSD) const
 {
 return new ImplFontEntry(rFSD);
 }
 
-const ImplFontCharMap* ImplCoreTextFontData::GetImplFontCharMap()
+const ImplFontCharMap* CoreTextPhysicalFontFace::GetImplFontCharMap()
 {
 // return the cached charmap
 if( m_pCharMap )
@@ -316,7 +316,7 @@ const ImplFontCharMap* 
ImplCoreTextFontData::GetImplFontCharMap()
 return m_pCharMap;
 }
 
-bool ImplCoreTextFontData::GetImplFontCapabilities(vcl::FontCapabilities 
&rFontCapabilities)
+bool CoreTextPhysicalFontFace::GetImplFontCapabilities(vcl::FontCapabilities 
&rFontCapabilities)
 {
 // read this only once per font
 if( m_bFontCapabilitiesRead )
@@ -380,7 +380,7 @@ void addTable(struct font_table* table, CTFontTableTag tag, 
CFDataRef data)
 }
 }
 
-bool ImplCoreTextFontData::GetRawFontData( std::vector& 
rBuffer, bool* pJustCFF ) const
+bool CoreTextPhysicalFontFace::GetRawFontData( std::vector& 
rBuffer, bool* pJustCFF ) const
 {
 bool rc;
 int table_count = 0;
@@ -528,7 +528,7 @@ bool ImplCoreTextFontData::GetRawFontData( 
std::vector& rBuffer,
 return rc;
 }
 
-void ImplCoreTextFontData::DetermineCJKSupport_OS2(CFDataRef rOS2Table)
+void CoreTextPhysicalFontFace::DetermineCJKSupport_OS2(CFDataRef rOS2Table)
 {
 if(CFDataGetLength(rOS2Table) >= 48)
 {
@@ -545,7 +545,7 @@ void 
ImplCoreTextFontData::DetermineCJKSupport_OS2(CFDataRef rOS2Table)
 }
 }
 
-void ImplCoreTextFontData::DetermineCJKSupport_cmap(CFDataRef rCmapTable)
+void CoreTextPhysicalFontFace::DetermineCJKSupport_cmap(CFDataRef rCmapTable)
 {
 int table_len = CFDataGetLength(rCmapTabl

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

2012-08-30 Thread Libreoffice Gerrit user 
 svx/inc/svx/svdmodel.hxx   |8 ++--
 svx/source/dialog/imapdlg.cxx  |4 ++--
 svx/source/svdraw/svdfmtf.cxx  |   22 +++---
 svx/source/svdraw/svdfmtf.hxx  |   32 ++--
 svx/source/svdraw/svdmodel.cxx |   16 +---
 5 files changed, 30 insertions(+), 52 deletions(-)

New commits:
commit 4deb9d4e0f29dd6947322aea665ee65ea8ef9ec4
Author: Ivan Timofeev 
Date:   Thu Aug 30 23:21:49 2012 +0400

SdrModel: make sure undo/redo stacks are not empty

most probably Undo() does not get called if there is no undo actions,
just to be on the safe side.

Change-Id: I3597698dbe8208916be94ebddd7260fbd7eadc74

diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index dd2919c..77a4e02 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -575,13 +575,9 @@ public:
 void  SetMaxUndoActionCount(sal_uIntPtr nAnz);
 sal_uIntPtr GetMaxUndoActionCount() const { return nMaxUndoCount; }
 void  ClearUndoBuffer();
-// UndoAction(0) ist die aktuelle (also die zuletzt eingegangene)
-sal_uIntPtr GetUndoActionCount() const  { return 
pUndoStack!=NULL ? pUndoStack->size() : 0; }
-const SfxUndoAction* GetUndoAction(sal_uIntPtr nNum) const  { return 
(SfxUndoAction*)(pUndoStack!=NULL ? (*pUndoStack)[nNum] : NULL); }
-// RedoAction(0) ist die aktuelle (also die des letzten Undo)
-sal_uIntPtr GetRedoActionCount() const  { return 
pRedoStack!=NULL ? pRedoStack->size() : 0; }
-const SfxUndoAction* GetRedoAction(sal_uIntPtr nNum) const  { return 
(SfxUndoAction*)(pRedoStack!=NULL ? (*pRedoStack)[nNum] : NULL); }
 
+bool HasUndoActions() const;
+bool HasRedoActions() const;
 bool Undo();
 bool Redo();
 bool Repeat(SfxRepeatTarget&);
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 3fa0cb5..b70dc32 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -791,8 +791,8 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
 aTbxIMapDlg1.EnableItem( TBI_POLYDELETE, !bDrawEnabled && 
pView->IsDeleteMarkedPointsPossible() );
 
 // Undo/Redo
-aTbxIMapDlg1.EnableItem( TBI_UNDO, pModel->GetUndoActionCount() > 0 );
-aTbxIMapDlg1.EnableItem( TBI_REDO, pModel->GetRedoActionCount() > 0 );
+aTbxIMapDlg1.EnableItem( TBI_UNDO, pModel->HasUndoActions() );
+aTbxIMapDlg1.EnableItem( TBI_REDO, pModel->HasRedoActions() );
 
 if ( bPolyEdit )
 {
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 14d45d6..9938a1f 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -431,6 +431,16 @@ void SdrModel::ClearUndoBuffer()
 }
 }
 
+bool SdrModel::HasUndoActions() const
+{
+return pUndoStack && !pUndoStack->empty();
+}
+
+bool SdrModel::HasRedoActions() const
+{
+return pRedoStack && !pRedoStack->empty();
+}
+
 bool SdrModel::Undo()
 {
 bool bRet = false;
@@ -440,7 +450,7 @@ bool SdrModel::Undo()
 }
 else
 {
-SfxUndoAction* pDo=(SfxUndoAction*)GetUndoAction(0);
+SfxUndoAction* pDo = HasUndoActions() ? pUndoStack->front() : NULL;
 if(pDo!=NULL)
 {
 const bool bWasUndoEnabled = mbUndoEnabled;
@@ -466,7 +476,7 @@ bool SdrModel::Redo()
 }
 else
 {
-SfxUndoAction* pDo=(SfxUndoAction*)GetRedoAction(0);
+SfxUndoAction* pDo = HasRedoActions() ? pRedoStack->front() : NULL;
 if(pDo!=NULL)
 {
 const bool bWasUndoEnabled = mbUndoEnabled;
@@ -492,7 +502,7 @@ bool SdrModel::Repeat(SfxRepeatTarget& rView)
 }
 else
 {
-SfxUndoAction* pDo=(SfxUndoAction*)GetUndoAction(0);
+SfxUndoAction* pDo = HasUndoActions() ? pUndoStack->front() : NULL;
 if(pDo!=NULL)
 {
 if(pDo->CanRepeat(rView))
commit c050300a72f80ab838bd10f0cedd355048a2aaa5
Author: Ivan Timofeev 
Date:   Thu Aug 30 23:19:17 2012 +0400

remove SdrObjRefList, use vector directly

also prevent using operator[] on empty vector

Change-Id: I0582ab1c7fd04a0bc6d717d8ca51670c3e5ef1c9

diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 7287db0..b8c007e 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -219,7 +219,7 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const 
GDIMetaFile& rMtf,
 // MapMode scaling
 MapScaling();
 // scale objects to predetermined rectangle
-sal_uIntPtr nAnz=aTmpList.GetObjCount();
+size_t nAnz=aTmpList.size();
 
 // To calculate the progress meter, we use GetActionSize()*3.
 // However, aTmpList has a lower entry count limit than GetActionSize(),
@@ -238,9 +238,9 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const 
GDIMetaFile& rMtf,
 // insert all objects cached in aTmpList now into rOL from nInsPos
 if (nInsPos>rOL.GetObjCount()) nInsPos=rOL.GetObjCount();

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-08-30 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=6

Lionel Elie Mamane  changed:

   What|Removed |Added

 Depends on||53872

--- Comment #100 from Lionel Elie Mamane  2012-08-31 04:30:49 
UTC ---
Add "Bug 53872 - CRASH - opening database report" - Regression

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: officecfg/registry

2012-08-30 Thread Libreoffice Gerrit user 
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   15 
++
 1 file changed, 15 insertions(+)

New commits:
commit 9bb30a4a0ef0d032ccf79b6d3c2b64f86bdbaa22
Author: Andras Timar 
Date:   Fri Aug 31 00:29:22 2012 +0200

Shortcuts in menu in Basic IDE for Undo/Redo

Change-Id: I964c1fd8a4414af91ab30ca7a6daab63c494399c

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 87ecf92..00ec38f 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -166,6 +166,21 @@
  .uno:Repeat
 

+
+ I10N SHORTCUTS 
- NO TRANSLATE
+  .uno:Redo
+ 
+
+
+ I10N SHORTCUTS 
- NO TRANSLATE
+  .uno:Undo
+ 
+
+
+ I10N SHORTCUTS 
- NO TRANSLATE
+  .uno:Redo
+ 
+
   
   

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

[Libreoffice-commits] .: configure.in

2012-08-30 Thread Libreoffice Gerrit user 
 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 97606f3af75c883a711f8fca2fe5c1e8e13e77a4
Author: Norbert Thiebaud 
Date:   Thu Aug 30 16:50:27 2012 -0500

configure: fix missing "" around potentially empty variable

Change-Id: Ieeb9f829c754b7bcc2f5fbe82a360e5625539803

diff --git a/configure.in b/configure.in
index 764fdac..e14fb66 100644
--- a/configure.in
+++ b/configure.in
@@ -12108,7 +12108,7 @@ fi
 # ===
 AC_MSG_CHECKING([whether to create huge library])
 MERGELIBS=
-if test $enable_mergelibs = yes; then
+if test "$enable_mergelibs" = "yes" ; then
 if test $WITH_BINFILTER = YES; then
 add_warning "--enable-mergelibs conflicts with --enable-binfilter. 
Disabling mergelibs."
 AC_MSG_RESULT([no])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

2012-08-30 Thread Libreoffice Gerrit user 
 solenv/bin/modules/installer/globals.pm  |1 
 solenv/bin/modules/installer/windows/file.pm |   26 ---
 solenv/bin/modules/installer/windows/property.pm |8 ---
 3 files changed, 35 deletions(-)

New commits:
commit 743e51000adbf6cf0f50d96189511fe1649e47c8
Author: Andras Timar 
Date:   Thu Aug 30 22:16:26 2012 +0200

remove obsoleted IS properties and conditions based on them

Change-Id: I75efbc3815551a9cff43f0c1501e94db7c834afd

diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index 7473b31..d8d5273 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -347,7 +347,6 @@ BEGIN
 %componentcondition = ();
 %componentid = ();
 %comparecomponentname = ();
-%languageproperties = ();
 %allcabinets = ();
 %allcabinetassigns = ();
 %cabfilecounter = ();
diff --git a/solenv/bin/modules/installer/windows/file.pm 
b/solenv/bin/modules/installer/windows/file.pm
index 2279129..f5449ce 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -992,32 +992,6 @@ sub create_files_table
 }
 }
 
-# Collecting all language specific conditions
-if ( $onefile->{'ismultilingual'} )
-{
-if ( $onefile->{'ComponentCondition'} ) { 
installer::exiter::exit_program("ERROR: Cannot set language condition. There is 
already another component condition for file $onefile->{'gid'}: 
\"$onefile->{'ComponentCondition'}\" !", "create_files_table"); }
-
-if ( $onefile->{'specificlanguage'} eq "" ) { 
installer::exiter::exit_program("ERROR: There is no specific language for file 
at language module: $onefile->{'gid'} !", "create_files_table"); }
-my $locallanguage = $onefile->{'specificlanguage'};
-my $property = "IS" . $file{'Language'};
-my $value = 1;
-my $condition = $property . "=" . $value;
-
-$onefile->{'ComponentCondition'} = $condition;
-
-if ( 
exists($installer::globals::componentcondition{$file{'Component_'}}))
-{
-if ( 
$installer::globals::componentcondition{$file{'Component_'}} ne $condition ) { 
installer::exiter::exit_program("ERROR: There is already another component 
condition for file $onefile->{'gid'}: 
\"$installer::globals::componentcondition{$file{'Component_'}}\" and 
\"$condition\" !", "create_files_table"); }
-}
-else
-{
-$installer::globals::componentcondition{$file{'Component_'}} = 
$condition;
-}
-
-# collecting all properties for table Property
-if ( ! exists($installer::globals::languageproperties{$property}) 
) { $installer::globals::languageproperties{$property} = $value; }
-}
-
 unless ( $file{'Version'} )
 {
 my $path = $onefile->{'sourcepath'};
diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index 7d4ba0d..6e70a1c 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -523,7 +523,6 @@ sub update_property_table
 

 # Setting language specific Properties in file Property.idt dynamically
 # Adding:
-# is1033 = 1
 # isMulti = 1
 

 
@@ -534,13 +533,6 @@ sub set_languages_in_property_table
 my $properyfilename = $basedir . $installer::globals::separator . 
"Property.idt";
 my $propertyfile = installer::files::read_file($properyfilename);
 
-# Setting the component properties saved in 
%installer::globals::languageproperties
-foreach my $localproperty ( keys %installer::globals::languageproperties )
-{
-$onepropertyline =  $localproperty . "\t" . 
$installer::globals::languageproperties{$localproperty} . "\n";
-push(@{$propertyfile}, $onepropertyline);
-}
-
 # Setting the info about multilingual installation in property "isMulti"
 
 my $propertyname = "isMulti";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/InstallModule_ooo.mk scp2/source

2012-08-30 Thread Libreoffice Gerrit user 
 scp2/InstallModule_ooo.mk |2 -
 scp2/source/ooo/directory_ooo.ulf |   45 --
 2 files changed, 1 insertion(+), 46 deletions(-)

New commits:
commit 8175dd0a461f9a8ab3b6d277d70a9ef0eecd53ef
Author: Andras Timar 
Date:   Thu Aug 30 21:28:21 2012 +0200

remove unused localizable file

Change-Id: I332e0553166620a6a90a7858ac33286caa5a4ed3

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 7fe17a0..efff291 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -219,6 +219,7 @@ $(eval $(call gb_InstallModule_add_templates,scp2/ooo,\
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
 scp2/source/ooo/common_brand \
 scp2/source/ooo/common_brand_readme \
+scp2/source/ooo/directory_ooo \
 scp2/source/ooo/directory_ooo_macosx \
 scp2/source/ooo/file_extra_ooo \
 scp2/source/ooo/file_font_ooo \
@@ -241,7 +242,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
 ))
 
 $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/ooo,\
-scp2/source/ooo/directory_ooo \
 scp2/source/ooo/module_helppack \
 scp2/source/ooo/module_langpack \
 scp2/source/ooo/module_ooo \
diff --git a/scp2/source/ooo/directory_ooo.ulf 
b/scp2/source/ooo/directory_ooo.ulf
deleted file mode 100644
index 4a0f92c..000
--- a/scp2/source/ooo/directory_ooo.ulf
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-[STR_DIR_INFO]
-en-US = "Information"
-
-[STR_DIR_INTERNET]
-en-US = "Internet"
-
-[STR_DIR_JAVA]
-en-US = "Java"
-
-[STR_DIR_FREIZEIT]
-en-US = "Fun&More"
-
-[STR_DIR_STARONE]
-en-US = "%PRODUCTNAME API"
-
-[STR_DIR_TOURISMUS]
-en-US = "Travel"
-
-[STR_DIR_KAPITEL]
-en-US = "Chapters"
-
-[STR_DIR_DATEIEN]
-en-US = "Files"
-
-
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

2012-08-30 Thread Libreoffice Gerrit user 
 scp2/source/ooo/directory_ooo.scp |  413 --
 1 file changed, 10 insertions(+), 403 deletions(-)

New commits:
commit 12d1fa0eae63051f3749fc162bccbb3b0adf8677
Author: Andras Timar 
Date:   Thu Aug 30 21:08:50 2012 +0200

remove unused dirs from scp2

Change-Id: I4c520ecd7b0d29818b130dd5657ed7616c84496a

diff --git a/scp2/source/ooo/directory_ooo.scp 
b/scp2/source/ooo/directory_ooo.scp
index 4e733b5..657cb34 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -85,11 +85,6 @@ Directory gid_Dir_Addin
 DosName = "addin";
 End
 
-Directory gid_Dir_Addin_Source
-ParentID = gid_Dir_Addin;
-DosName = "source";
-End
-
 Directory gid_Dir_Wizards
 Styles = (CREATE);
 ParentID = gid_Brand_Dir_Program;
@@ -147,22 +142,12 @@ Directory gid_Dir_User
 DosName = "presets";
 End
 
-Directory gid_Dir_User_Xslt
-ParentID = gid_Dir_User;
-DosName = "xslt";
-End
-
 Directory gid_Dir_User_Autotext
 ParentID = gid_Dir_User;
 DosName = "autotext";
 Styles = (WORKSTATION, CREATE);
 End
 
-Directory gid_Dir_User_Autotext_Language
-ParentID = gid_Dir_User_Autotext;
-DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
 Directory gid_Dir_User_Uno_Packages
 ParentID = gid_Dir_User;
 DosName = "uno_packages";
@@ -193,11 +178,6 @@ Directory gid_Dir_User_Bookmark
 Styles = (WORKSTATION);
 End
 
-Directory gid_Dir_User_Cache
-ParentID = gid_Dir_User;
-DosName = "cache";
-End
-
 Directory gid_Dir_User_Scripts
 ParentID = gid_Dir_User;
 DosName = "Scripts";
@@ -233,18 +213,6 @@ Directory gid_Dir_User_Config_Sofficecfg
 Styles = (WORKSTATION);
 End
 
-Directory gid_Dir_User_Config_Sofficecfg_Metainf
-ParentID = gid_Dir_User_Config_Sofficecfg;
-DosName = "META-INF";
-Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Config_Sofficecfg_Bitmaps
-ParentID = gid_Dir_User_Config_Sofficecfg;
-DosName = "Bitmaps";
-Styles = (WORKSTATION);
-End
-
 Directory gid_Dir_User_Template
 ParentID = gid_Dir_User;
 DosName = "template";
@@ -263,18 +231,6 @@ Directory gid_Dir_Database_Biblio
 Styles = (WORKSTATION, CREATE);
 End
 
-Directory gid_Dir_Desktop
-ParentID = gid_Dir_User;
-DosName = "desktop";
-Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Explorer
-ParentID = gid_Dir_User;
-DosName = "explorer";
-Styles = (WORKSTATION);
-End
-
 Directory gid_Dir_User_Gallery
 ParentID = gid_Dir_User;
 DosName = "gallery";
@@ -293,35 +249,12 @@ Directory gid_Dir_Store
 Styles = (WORKSTATION, CREATE);
 End
 
-Directory gid_Dir_Store_Trash
-ParentID = gid_Dir_Store;
-DosName = "trash";
-Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_Download
-ParentID = gid_Dir_User;
-DosName = "download";
-Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_Work
-ParentID = gid_Dir_User;
-DosName = "work";
-Styles = (WORKSTATION);
-End
-
 Directory gid_Dir_Plugin
 ParentID = gid_Brand_Dir_Program;
 DosName = "plugin";
 Styles = (WORKSTATION, CREATE);
 End
 
-Directory gid_Dir_Share_Migration
-ParentID = gid_Brand_Dir_Share;
-DosName = "migration";
-End
-
 Directory gid_Dir_Fonts
 ParentID = gid_Brand_Dir_Share;
 DosName = "fonts";
@@ -361,11 +294,6 @@ Directory gid_Dir_Share_Xslt_Export_Common
 DosName = "common";
 End
 
-Directory gid_Dir_Share_Xslt_Export_Common_Body
-ParentID = gid_Dir_Share_Xslt_Export_Common;
-DosName = "body";
-End
-
 Directory gid_Dir_Share_Xslt_Export_Common_Styles
 ParentID = gid_Dir_Share_Xslt_Export_Common;
 DosName = "styles";
@@ -443,11 +371,6 @@ Directory gid_Dir_Share_Dtd_Math_1_01
 DosName = "1_01";
 End
 
-Directory gid_Dir_Share_Pqa
-ParentID = gid_Brand_Dir_Share;
-DosName = "pqa";
-End
-
 Directory gid_Dir_Share_Config_Wizard
 ParentID = gid_Brand_Dir_Share_Config;
 DosName = "wizard";
@@ -677,11 +600,6 @@ Directory gid_Dir_Basic_Depot
 DosName = "Depot";
 End
 
-Directory gid_Dir_Basic_Schedule
-ParentID = gid_Dir_Basic;
-DosName = "Schedule";
-End
-
 Directory gid_Dir_Basic_Template
 ParentID = gid_Dir_Basic;
 DosName = "Template";
@@ -702,11 +620,6 @@ Directory gid_Dir_Basic_Formwiz
 DosName = "FormWizard";
 End
 
-Directory gid_Dir_Basic_Webwiz
-ParentID = gid_Dir_Basic;
-DosName = "WebWizard";
-End
-
 Directory gid_Dir_Basic_Tutorials
 ParentID = gid_Dir_Basic;
 DosName = "Tutorials";
@@ -722,46 +635,6 @@ Directory gid_Dir_Share_Scripts
 DosName = "Scripts";
 End
 
-Directory gid_Dir_Share_Dict
-ParentID = gid_Brand_Dir_Share;
-DosName = "dict";
-End
-
-Directory gid_Dir_Config_Language
-ParentID = gid_Brand_Dir_Share_Config;
-DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
-Directory gid_Dir_Share_Config_Help
-ParentID = gid_Brand_Dir_Share_Config;
-DosName = "help";
-End
-
-Directory gid_Dir_Config_More
-ParentID = gid_Brand_Dir_Share_Config;
-D

[Libreoffice-commits] .: configure.in

2012-08-30 Thread Libreoffice Gerrit user 
 configure.in |   13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 69ae3fdde36606df21de594193dcd4776d329a07
Author: Riccardo Magliocchetti 
Date:   Thu Aug 30 19:30:14 2012 +0200

configure: remove unneeded branch in bogus pkk-config check

The check for pkg-config is done only in mac os x and without
mozilla. So a branch that checks for mozilla enable is never
reached.

While at it fix a couple of typos

Change-Id: I910b2784426eba8978076ea5d1587a58e693a8b8

diff --git a/configure.in b/configure.in
index 619a6ce..764fdac 100644
--- a/configure.in
+++ b/configure.in
@@ -1093,7 +1093,7 @@ AC_ARG_ENABLE(liblangtag,
 )
 
 AC_ARG_ENABLE(bogus-pkg-config,
-AS_HELP_STRING([--enable-bogis-pkg-config],
+AS_HELP_STRING([--enable-bogus-pkg-config],
 [MACOSX only: on MacOSX pkg-config can cause trouble. by default if 
one is found in the PATH, an error is issued. This flag turn that error into a 
warning.]),
 )
 
@@ -4434,15 +4434,10 @@ if test $_os = Darwin -a "$enable_mozilla" = no; then
 if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l 
/usr/bin/pkg-config | $GREP -q Mono.framework; then
 AC_MSG_ERROR([yes, from Mono. This *will* break the build. Please 
remove or hide $PKG_CONFIG])
 else
-if test "$enable_mozilla" = "yes"; then
-AC_MSG_RESULT([yes, from unkown origin])
-add_warning "Having a $PKG_CONFIG might have unexpected 
consequences, please consider hiding it"
+if test "$enable_bogus_pkg_config" = "yes"; then
+AC_MSG_RESULT([yes, user-approved from unknown origin.])
 else
-if test "$enable_bogus_pkg_config" = "yes"; then
-AC_MSG_RESULT([yes, user-approved from unkown origin.])
-else
-   AC_MSG_ERROR([yes, from unknown origin. This *will* break 
the build. Please remove or hide $PKG_CONFIG])
-fi
+AC_MSG_ERROR([yes, from unknown origin. This *will* break the 
build. Please remove or hide $PKG_CONFIG])
 fi
 fi
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

2012-08-30 Thread Libreoffice Gerrit user 
 solenv/bin/modules/installer.pm   |   21 ---
 solenv/bin/modules/installer/control.pm   |   20 ---
 solenv/bin/modules/installer/epmfile.pm   |   76 
 solenv/bin/modules/installer/globals.pm   |1 
 solenv/bin/modules/installer/windows/directory.pm |3 
 solenv/bin/modules/installer/windows/idtglobal.pm |  134 --
 solenv/bin/modules/installer/windows/msiglobal.pm |   21 ---
 7 files changed, 1 insertion(+), 275 deletions(-)

New commits:
commit d9d7c85b591baed37e5b670081cc08bef422de81
Author: Andras Timar 
Date:   Thu Aug 30 17:29:00 2012 +0200

LibreOffice installer does not use child projects

Change-Id: Iee968a748406228c116bef26793d74d5712d1f13

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index ebfae1a..1e69b4a 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -240,7 +240,6 @@ sub main {
 # setting global variables
 
 
-installer::control::set_addchildprojects($allvariableshashref);
 installer::control::set_addsystemintegration($allvariableshashref);
 
 
@@ -514,7 +513,6 @@ sub main {
 
 if ( $installer::globals::languagepack )
 {
-$installer::globals::addchildprojects = 0;
 $installer::globals::addsystemintegration = 0;
 $installer::globals::addlicensefile = 0;
 $installer::globals::makedownload = 1;
@@ -522,7 +520,6 @@ sub main {
 
 if ( $installer::globals::helppack )
 {
-$installer::globals::addchildprojects = 0;
 $installer::globals::addsystemintegration = 0;
 $installer::globals::addlicensefile = 0;
 $installer::globals::makedownload = 1;
@@ -1359,9 +1356,6 @@ sub main {
 # Adding license and readme into installation set
 if ($installer::globals::addlicensefile) { 
installer::worker::put_scpactions_into_installset("."); }
 
-# Adding child projects to installation dynamically
-if ($installer::globals::addchildprojects) { 
installer::epmfile::put_childprojects_into_installset($installer::globals::epmoutpath,
 $allvariableshashref, $modulesinproductarrayref, $includepatharrayref); }
-
 # Adding license file into setup
 if ( $allvariableshashref->{'PUT_LICENSE_INTO_SETUP'} ) { 
installer::worker::put_license_into_setup(".", $includepatharrayref); }
 
@@ -1683,14 +1677,6 @@ sub main {
 
 
installer::windows::idtglobal::addcustomactions($languageidtdir, 
$windowscustomactionsarrayref, $filesinproductlanguageresolvedarrayref);
 
-# Adding child projects if specified
-
-if ($installer::globals::addchildprojects)
-{
-# Adding child projects to installation dynamically (also 
in feature table)
-
installer::windows::idtglobal::add_childprojects($languageidtdir, 
$filesinproductlanguageresolvedarrayref, $allvariableshashref);
-}
-
 # Then the language specific msi database can be created
 
 if ( $installer::globals::iswin || 
$installer::globals::packageformat eq 'msi' )
@@ -1746,13 +1732,6 @@ sub main {
 
 if ( ! $installer::globals::fix_number_of_cab_files ) { 
installer::windows::msiglobal::copy_merge_modules_into_installset($installdir); 
}
 
-# ... copying the child projects
-
-if ($installer::globals::addchildprojects)
-{
-
installer::windows::msiglobal::copy_child_projects_into_installset($installdir, 
$allvariableshashref);
-}
-
 installer::logger::print_message( "... creating ddf files ...\n" );
 
 # Creating all needed ddf files and generating a list
diff --git a/solenv/bin/modules/installer/control.pm 
b/solenv/bin/modules/installer/control.pm
index 45994b1..bbb613a 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -478,26 +478,6 @@ sub check_oxtfiles
 }
 }
 
-
-# Setting global variable "$installer::globals::addchildprojects"
-
-
-sub set_addchildprojects
-{
-my ($allvariables) = @_;
-
-if (( $allvariables->{'UREPRODUCT'} ) ||
-( $allvariables->{'ADDREQUIREDPACKAGES'} )) { 
$installer::globals::addchildprojects = 1; }
-
-if ( $installer::globals::patch )
-{
-$installer::globals::addchildprojects = 0;  # no child projects for 
patches
-}
-
-my $infoline = "Value of \$installer::globals::addchildprojects: 
$installer::globals::addchildprojects\n";
-push( @installer::globals::globallogfileinfo, $infol

Re: [Libreoffice-qa] HardHacks

2012-08-30 Thread Bjoern Michaelsen 
Hi,

On Sat, Aug 25, 2012 at 08:31:21AM +0200, Rainer Bielefeld wrote:
> ID  OS  Component - Summary
> 
> 38913   Linux   Libreoffice - CRASH when loading Danish dictionary at
> startup citing msvcr90.dll after upgrade
> 

Discussed on ESC and found unsuitable to be picked up by development as-is.

The current bugstate has been summarized in:

 https://bugs.freedesktop.org/show_bug.cgi?id=38913#c41

and explains what is missing for this to be picked up by development. This
hopefully answers the (justified) question from comment 8 in that bug.

Affected reporters are asked to complete the bug, so development can pick it
up.

Also note that during the discussion on the ESC it became clear that such a
summary of the bug history is essential for HardHacks that are longrunning (>10
comments). Thus QA volunteers can help out to provide such summaries for
HardHack candidates.

Best,

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

Re: Shift 3.7.0 or 3.7.X releases - was: ANNOUNCE: Release plan updated - two weeks between RCs

2012-08-30 Thread Bjoern Michaelsen 
On Thu, Aug 30, 2012 at 05:14:02PM +0200, Petr Mladek wrote:
> As mentioned, the 3.7.0 release and 3.7.1-rc1 are planed for the same
> week now. It is bad because there is no time to proceed feedback from
> 3.7.0 users.

Comparing:

 https://wiki.ubuntu.com/PrecisePangolin/ReleaseSchedule
 http://wiki.documentfoundation.org/ReleasePlan/3.7

I find currently:

- the 3.7.0 is already too late for a Alpha1/FeatureFreeze
- the 3.7.1 is already currently is ok for the BetaFreeze (LibreOffice is 
seeded)
- the 3.7.2 release is fitting in just before Final Freeze
- the 3.7.3 release is already a SRU (stable release update)

> Possible solutions:
> 
> 1. Make 3.7.0 two weeks earlier. I am not happy to change this so close
>to the feature freeze.

understood.

> 2. Make 3.7.X bugfix releases 1 or 2 weeks later. It might cause
>troubles for Ubuntu, Fedora, and other distros who planed to use .3
>bugfix release in their distro releases.
> 
>Well, they might use 3.7.3-rc1 or 3.7.2. They should be pretty good
>as well. The number of weeks for bugfixing stays the same.

3.x.3 is already too late for us currently -- however, pushing back two weeks
would make 3.7.2 miss final freeze. In that case I would have to seriously
consider to not ship that series at all -- shipping with a 3.7.1 is very likely
too early.

> 3. Remove 3.7.0-rc3 or some beta. It would mean to do the hard code
>freeze 1 or two weeks earlier => less time for testing and fixing

Personally, that sounds like the best option for me for 3.7.

> 4. Do 3.7.0-RCs every week (use the original schedule). There is not
>enough time for feedback => demotivating for QA.

Yep.

> I think that the 2nd solution is the best compromise for 3.7.0. The 1st
> variant would be best for the further releases (3.8.0, 3.9.0).

I would prefer to go with 3) for 3.7 and 1) for later releases (shifting at
least two weeks).

Best,

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

Re: [REVIEW 3-6][REVIEWED] fdo#53938 Prevent crash on pivot table refresh on non-existent data source

2012-08-30 Thread Kohei Yoshida 

On 08/30/2012 11:11 AM, Markus Mohrhard wrote:

Hey Kohei,

2012/8/30 Kohei Yoshida :

I'd like the following two:

https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=286ce144981aaa426622624302e296588abab1c2
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=6ad86f8cc036d01702e9d491874b2b3bde23fe77

backported to 3-6 in order to fix

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

It's a simple null pointer check, plus additional error checks.  Should be a
safe change.



Looks good and correct to me. Approved for 3-6.


Thanks.  Squashed the two and cherry-picked to 3-6 with your sign-off.

Kohei

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

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

2012-08-30 Thread Libreoffice Gerrit user 
 sc/inc/dpobject.hxx|2 +-
 sc/source/core/data/dpobject.cxx   |   12 +---
 sc/source/ui/docshell/dbdocfun.cxx |3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit c3148ae81b8458624b7ee829d34629dea29f8cdf
Author: Kohei Yoshida 
Date:   Thu Aug 30 10:36:57 2012 -0400

fdo#53938: Check for null pointer, and don't proceed when error occurs.

This prevents the crash, the same error dialog from appearing 3 times in
a row, and also prevents the pivot table outout from becoming empty on
error condition.

Change-Id: I09a72f78561f3f0446a95732fb9c242c1144878a
Signed-off-by: Markus Mohrhard 

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 86aa8aa..272b459 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -245,7 +245,7 @@ public:
  * Remove in the save data entries for members that don't exist anymore.
  * This is called during pivot table refresh.
  */
-void SyncAllDimensionMembers();
+bool SyncAllDimensionMembers();
 
 static bool HasRegisteredSources();
 static com::sun::star::uno::Sequence GetRegisteredSources();
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index c21dfb6..f4b39ff 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -705,21 +705,27 @@ void ScDPObject::BuildAllDimensionMembers()
 pSaveData->BuildAllDimensionMembers(GetTableData());
 }
 
-void ScDPObject::SyncAllDimensionMembers()
+bool ScDPObject::SyncAllDimensionMembers()
 {
 if (!pSaveData)
-return;
+return false;
 
 // #i111857# don't always create empty mpTableData for external service.
 // Ideally, xSource should be used instead of mpTableData.
 if (pServDesc)
-return;
+return false;
 
 ScDPTableData* pData = GetTableData();
+if (!pData)
+// No table data exists.  This can happen when refreshing from an
+// external source which doesn't exist.
+return false;
+
 // Refresh the cache wrapper since the cache may have changed.
 pData->SetEmptyFlags(pSaveData->GetIgnoreEmptyRows(), 
pSaveData->GetRepeatIfEmpty());
 pData->ReloadCacheTable();
 pSaveData->SyncAllDimensionMembers(pData);
+return true;
 }
 
 bool ScDPObject::GetMemberNames( sal_Int32 nDim, Sequence& rNames )
diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index 4cb5620..e424763 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1472,7 +1472,8 @@ sal_uLong ScDBDocFunc::RefreshPivotTables(ScDPObject* 
pDPObj, bool bApi)
 for (; it != itEnd; ++it)
 {
 ScDPObject* pObj = *it;
-pObj->SyncAllDimensionMembers();
+if (!pObj->SyncAllDimensionMembers())
+continue;
 
 // This action is intentionally not undoable since it modifies cache.
 DataPilotUpdate(pObj, pObj, false, bApi);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-08-30 Thread Libreoffice Gerrit user 
 sw/inc/fesh.hxx|2 ++
 sw/source/core/frmedt/feshview.cxx |   17 +
 sw/source/ui/docvw/edtwin.cxx  |5 -
 3 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 1223dd3bc84899d8f77c46340c46565ca74cbe1b
Author: Miklos Vajna 
Date:   Thu Aug 30 16:44:56 2012 +0200

n#777337 SwEditWin::UpdatePointer: fix mouse pointer wrt. background images

When the image is in the background, just show the normal text cursor,
since we're able to select text as well in that situation.

Change-Id: I4b4303834245e402d40567cff4a2bf53a0a13e5e

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index c5c7543..058f912 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -262,6 +262,8 @@ public:
 // The following two methods return enum SdrHdlKind.
 // Declared as int in order to spare including SVDRAW.HXX.
 bool IsObjSelectable( const Point& rPt );
+/// Same as IsObjSelectable(), but return the object as well.
+SdrObject* GetObjAt(const Point& rPt);
 int IsInsideSelectedObj( const Point& rPt );//!! returns enum values
 
 // Test if there is a draw object at that position and if it should be 
selected.
diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index be852a9..ccd1d00 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1113,6 +1113,23 @@ bool SwFEShell::IsObjSelectable( const Point& rPt )
 return bRet;
 }
 
+SdrObject* SwFEShell::GetObjAt( const Point& rPt )
+{
+SdrObject* pRet = 0;
+SET_CURR_SHELL(this);
+SwDrawView *pDView = Imp()->GetDrawView();
+if( pDView )
+{
+SdrPageView* pPV;
+sal_uInt16 nOld = pDView->GetHitTolerancePixel();
+pDView->SetHitTolerancePixel( pDView->GetMarkHdlSizePixel()/2 );
+
+pDView->PickObj( rPt, pDView->getHitTolLog(), pRet, pPV, 
SDRSEARCH_PICKMARKABLE );
+pDView->SetHitTolerancePixel( nOld );
+}
+return pRet;
+}
+
 // Test if there is a object at that position and if it should be selected.
 sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
 {
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 3fbc8c0..c496f0a 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -521,7 +521,10 @@ void SwEditWin::UpdatePointer(const Point &rLPt, 
sal_uInt16 nModifier )
 (rSh.IsObjSelected() || rSh.IsFrmSelected()) &&
 (!rSh.IsSelObjProtected(FLYPROTECT_POS));
 
-eStyle = bMovable ? POINTER_MOVE : POINTER_ARROW;
+SdrObject* pSelectableObj = rSh.GetObjAt(rLPt);
+// Don't update pointer if this is a background 
image only.
+if (pSelectableObj->GetLayer() != 
rSh.GetDoc()->GetHellId())
+eStyle = bMovable ? POINTER_MOVE : 
POINTER_ARROW;
 aActHitType = SDRHIT_OBJECT;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Shift 3.7.0 or 3.7.X releases - was: ANNOUNCE: Release plan updated - two weeks between RCs

2012-08-30 Thread Petr Mladek 
Petr Mladek píše v Čt 30. 08. 2012 v 16:53 +0200:
> Hi,
> 
> on the recent ESC call, we agreed to try two weeks between RCs. It will
> allow QA to do more testing. Also it will allow developers to fix the
> found regressions.
> 
> Please, find the updated release plan at
> http://wiki.documentfoundation.org/ReleasePlan

As mentioned, the 3.7.0 release and 3.7.1-rc1 are planed for the same
week now. It is bad because there is no time to proceed feedback from
3.7.0 users.

Possible solutions:

1. Make 3.7.0 two weeks earlier. I am not happy to change this so close
   to the feature freeze.

2. Make 3.7.X bugfix releases 1 or 2 weeks later. It might cause
   troubles for Ubuntu, Fedora, and other distros who planed to use .3
   bugfix release in their distro releases.

   Well, they might use 3.7.3-rc1 or 3.7.2. They should be pretty good
   as well. The number of weeks for bugfixing stays the same.


3. Remove 3.7.0-rc3 or some beta. It would mean to do the hard code
   freeze 1 or two weeks earlier => less time for testing and fixing

4. Do 3.7.0-RCs every week (use the original schedule). There is not
   enough time for feedback => demotivating for QA.


I think that the 2nd solution is the best compromise for 3.7.0. The 1st
variant would be best for the further releases (3.8.0, 3.9.0).

Bjorn, Caolan, others, would you mind if we delay 3.7.X bugfix releases
by 1 or 2 weeks?


Best Regards,
Petr

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

Re: [REVIEW 3-6][REVIEWED] fdo#53938 Prevent crash on pivot table refresh on non-existent data source

2012-08-30 Thread Markus Mohrhard 
Hey Kohei,

2012/8/30 Kohei Yoshida :
> I'd like the following two:
>
> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=286ce144981aaa426622624302e296588abab1c2
> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=6ad86f8cc036d01702e9d491874b2b3bde23fe77
>
> backported to 3-6 in order to fix
>
> https://bugs.freedesktop.org/show_bug.cgi?id=53938
>
> It's a simple null pointer check, plus additional error checks.  Should be a
> safe change.
>

Looks good and correct to me. Approved for 3-6.

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

ANNOUNCE: Release plan updated - two weeks between RCs

2012-08-30 Thread Petr Mladek 
Hi,

on the recent ESC call, we agreed to try two weeks between RCs. It will
allow QA to do more testing. Also it will allow developers to fix the
found regressions.

Please, find the updated release plan at
http://wiki.documentfoundation.org/ReleasePlan


Best Regards,
Petr


PS: We should add more time between 3.7.0 release and 3.7.1-rc1. There
are several possibilities. Let's discuss it as replay to this mail on
the dev and qa mailing lists.

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

[REVIEW 3-6] fdo#53938 Prevent crash on pivot table refresh on non-existent data source

2012-08-30 Thread Kohei Yoshida 

I'd like the following two:

https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=286ce144981aaa426622624302e296588abab1c2
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=6ad86f8cc036d01702e9d491874b2b3bde23fe77

backported to 3-6 in order to fix

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

It's a simple null pointer check, plus additional error checks.  Should 
be a safe change.


Thanks,

Kohei

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - configure.in

2012-08-30 Thread Libreoffice Gerrit user 
 configure.in |   17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 8d3ea9985e6defd2b6522b755a29c6406c8cdcb6
Author: Tomas Chvatal 
Date:   Sun Aug 26 11:30:14 2012 +0200

Update desc of mergelib configure option

Also do not be fatal on clash with binfilter and just warn the user that
mergelib was disabled in favor of binfilter if he has both enabled.

Change-Id: I3b683a948e00b1134c10881c5ec442e6380f2822
Signed-off-by: Matúš Kukan 

diff --git a/configure.in b/configure.in
index a080a02..276d844 100644
--- a/configure.in
+++ b/configure.in
@@ -561,7 +561,8 @@ dnl -- *** --
 
 AC_ARG_ENABLE(mergelibs,
 AS_HELP_STRING([--enable-mergelibs],
-[Enables linking of big merged library used for better performance.])
+[Enables linking of big, merged, library. Experimental feature tested
+   only on Linux and Android.])
 )
 
 AC_ARG_ENABLE(graphite,
@@ -11648,9 +11649,17 @@ fi
 # ===
 AC_MSG_CHECKING([whether to create a big library for better performance])
 MERGELIBS=
-if test "$enable_mergelibs" = "yes"; then
-MERGELIBS="TRUE"
-AC_MSG_RESULT([yes])
+if test $enable_mergelibs = yes; then
+if test $WITH_BINFILTER = YES; then
+add_warning "--enable-mergelibs conflicts with --enable-binfilter. 
Disabling mergelibs."
+AC_MSG_RESULT([no])
+else
+if test $_os != Linux -a $_os != Android; then
+add_warning "--enable-mergelibs is not tested for this platform"
+fi
+MERGELIBS="TRUE"
+AC_MSG_RESULT([yes])
+fi
 else
 AC_MSG_RESULT([no])
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-08-30 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #99 from t.gla...@tarent.de 2012-08-30 14:46:50 UTC ---
As already mentioned in 53341, adding it because it makes the dpkg status
database invalid, which other Debian utilities (rightfully) complain about, and
the fix is likely somewhat trivial (though potentially not uninvasive).

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2012-08-30 Thread Libreoffice Gerrit user 
 sc/inc/dpobject.hxx|2 +-
 sc/source/core/data/dpobject.cxx   |9 +
 sc/source/ui/docshell/dbdocfun.cxx |3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 6ad86f8cc036d01702e9d491874b2b3bde23fe77
Author: Kohei Yoshida 
Date:   Thu Aug 30 10:45:27 2012 -0400

fdo#53938: Don't proceed when error occurs.

This prevents the same error dialog from appearing 3 times in a row,
also the pivot table outout from becoming empty.

Change-Id: I09a72f78561f3f0446a95732fb9c242c1144878a

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 06ad537..cba66cc 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -243,7 +243,7 @@ public:
  * Remove in the save data entries for members that don't exist anymore.
  * This is called during pivot table refresh.
  */
-void SyncAllDimensionMembers();
+bool SyncAllDimensionMembers();
 
 static bool HasRegisteredSources();
 static com::sun::star::uno::Sequence GetRegisteredSources();
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index af6ac2d..78b1e03 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -859,26 +859,27 @@ void ScDPObject::BuildAllDimensionMembers()
 pSaveData->BuildAllDimensionMembers(GetTableData());
 }
 
-void ScDPObject::SyncAllDimensionMembers()
+bool ScDPObject::SyncAllDimensionMembers()
 {
 if (!pSaveData)
-return;
+return false;
 
 // #i111857# don't always create empty mpTableData for external service.
 // Ideally, xSource should be used instead of mpTableData.
 if (pServDesc)
-return;
+return false;
 
 ScDPTableData* pData = GetTableData();
 if (!pData)
 // No table data exists.  This can happen when refreshing from an
 // external source which doesn't exist.
-return;
+return false;
 
 // Refresh the cache wrapper since the cache may have changed.
 pData->SetEmptyFlags(pSaveData->GetIgnoreEmptyRows(), 
pSaveData->GetRepeatIfEmpty());
 pData->ReloadCacheTable();
 pSaveData->SyncAllDimensionMembers(pData);
+return true;
 }
 
 bool ScDPObject::GetMemberNames( sal_Int32 nDim, Sequence& rNames )
diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index d7cff63..74674e6 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1470,7 +1470,8 @@ sal_uLong ScDBDocFunc::RefreshPivotTables(ScDPObject* 
pDPObj, bool bApi)
 for (; it != itEnd; ++it)
 {
 ScDPObject* pObj = *it;
-pObj->SyncAllDimensionMembers();
+if (!pObj->SyncAllDimensionMembers())
+continue;
 
 // This action is intentionally not undoable since it modifies cache.
 DataPilotUpdate(pObj, pObj, false, bApi);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-08-30 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=6

t.gla...@tarent.de changed:

   What|Removed |Added

 Depends on||53341

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sc/source

2012-08-30 Thread Libreoffice Gerrit user 
 sc/source/core/data/dpobject.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 286ce144981aaa426622624302e296588abab1c2
Author: Kohei Yoshida 
Date:   Thu Aug 30 10:36:57 2012 -0400

fdo#53938: Check for null pointer.

Change-Id: I4beb5e3c071933dce72468ca87faceca079aa50c

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index ce9b236..af6ac2d 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -870,6 +870,11 @@ void ScDPObject::SyncAllDimensionMembers()
 return;
 
 ScDPTableData* pData = GetTableData();
+if (!pData)
+// No table data exists.  This can happen when refreshing from an
+// external source which doesn't exist.
+return;
+
 // Refresh the cache wrapper since the cache may have changed.
 pData->SetEmptyFlags(pSaveData->GetIgnoreEmptyRows(), 
pSaveData->GetRepeatIfEmpty());
 pData->ReloadCacheTable();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-08-30 Thread Libreoffice Gerrit user 
 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6df97ec93936d088a4bbce1d9a3d34fd10a879d2
Author: Matúš Kukan 
Date:   Thu Aug 30 16:32:39 2012 +0200

fix typo

Change-Id: I9efba3e5229c9236cfff58920373d8c7d83b1770

diff --git a/configure.in b/configure.in
index 7a29c97..619a6ce 100644
--- a/configure.in
+++ b/configure.in
@@ -12115,7 +12115,7 @@ AC_MSG_CHECKING([whether to create huge library])
 MERGELIBS=
 if test $enable_mergelibs = yes; then
 if test $WITH_BINFILTER = YES; then
-add_warining "--enable-mergelibs conflicts with --enable-binfilter. 
Disabling mergelibs."
+add_warning "--enable-mergelibs conflicts with --enable-binfilter. 
Disabling mergelibs."
 AC_MSG_RESULT([no])
 else
 if test $_os != Linux -a $_os != Android; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svx/source

2012-08-30 Thread Libreoffice Gerrit user 
 svx/source/svdraw/svdmark.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 582d2e364ab020d90927b6064643e34e21251b35
Author: Caolán McNamara 
Date:   Thu Aug 30 15:28:13 2012 +0100

fix build

Change-Id: I3642501e83247d6f88a3436c795be2acd794a4d2

diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index e475dd6..23e32d5 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -356,7 +356,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst)
 mbSorted = rLst.mbSorted;
 }
 
-SdrMark* GetMark(sal_uLong nNum) const
+SdrMark* SdrMarkList::GetMark(sal_uLong nNum) const
 {
 return (nNum < maList.size()) ? maList[nNum] : NULL;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-08-30 Thread Libreoffice Gerrit user 
 svx/inc/svx/svdmark.hxx   |6 +-
 svx/source/svdraw/svdmark.cxx |5 +
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 90d84743a0bafaea836c8602c6043f90b4e008c9
Author: Ivan Timofeev 
Date:   Thu Aug 30 18:01:50 2012 +0400

SdrMarkList: fix STL conversion

regression from aa11e7bae89fe691f914abb27d1c4a03d27a7ee5:
Container::GetObject returned NULL if the index is out of bounds,
and callers seem to rely on that.

Change-Id: I4c9f5249514efad0d516b6ffd6f04dadb019052f

diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx
index 81121c1..9673d72 100644
--- a/svx/inc/svx/svdmark.hxx
+++ b/svx/inc/svx/svdmark.hxx
@@ -226,11 +226,7 @@ public:
 return maList.size();
 }
 
-SdrMark* GetMark(sal_uLong nNum) const
-{
-return maList[nNum];
-}
-
+SdrMark* GetMark(sal_uLong nNum) const;
 sal_uLong FindObject(const SdrObject* pObj) const;
 void InsertEntry(const SdrMark& rMark, sal_Bool bChkSort = sal_True);
 void DeleteMark(sal_uLong nNum);
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index b99cff9..e475dd6 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -356,6 +356,11 @@ void SdrMarkList::operator=(const SdrMarkList& rLst)
 mbSorted = rLst.mbSorted;
 }
 
+SdrMark* GetMark(sal_uLong nNum) const
+{
+return (nNum < maList.size()) ? maList[nNum] : NULL;
+}
+
 sal_uLong SdrMarkList::FindObject(const SdrObject* pObj) const
 {
 // Since relying on OrdNums is not allowed for the selection because 
objects in the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-08-30 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=37361

--- Comment #361 from Roman Eisele  2012-08-30 13:15:24 UTC ---
For the record:
Sasha has added bug 35991 -- "merged cells in tables in DOC files not saved
correctly by Writer on Linux 64bit".

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-08-30 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #98 from Roman Eisele  2012-08-30 13:12:31 UTC ---
(In reply to comment #97)
> I would like to nominate the nasty Bug 51023. It is already a 3.5 most 
> annoying
> bug, but should be a 3.6 most annoying bug:

Sorry, but you don’t need to add that bug to the this list if the bug is
already a “LibreOffice 3.5 most annoying bugs”. As long as LibreOffice 3.5 is
maintained actively, only bugs new in LibreOffice 3.6 should be added to this
(3.6) list; but all bugs which have been inherited from previous versions (3.3,
3.4, 3.5) should be added only to the “LibreOffice 3.5 most annoying bugs” list
-- see

  https://wiki.documentfoundation.org/Most_Annoying_Bugs

Entering a bug into both lists does not help fixing it, it just makes it more
difficult to keep track of the most annoying bugs.

Thank you very much for your understanding!

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: RepositoryExternal.mk sd/Library_sd.mk sd/source sfx2/Library_qstart.mk

2012-08-30 Thread Libreoffice Gerrit user 
 RepositoryExternal.mk  |   13 +
 sd/Library_sd.mk   |5 -
 sd/source/ui/remotecontrol/BluetoothServer.cxx |5 ++---
 sfx2/Library_qstart.mk |1 +
 4 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit aabc73d04a4c97272576edd4f73bde0cfa2392b2
Author: Caolán McNamara 
Date:   Thu Aug 30 13:58:15 2012 +0100

Do the same thing for gio as we do for dbus

and add -DENABLE_GIO to flags at build-time and an empty 
gb_LinkTarget__use_gio
when disabled.

Change-Id: I4adf0701a3d490cceecc00f6b81d6416a1e83088

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 96709fb..8401164 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1117,6 +1117,7 @@ endef
 
 endif # SYSTEM_LPSOLVE
 
+ifeq ($(ENABLE_GIO),TRUE)
 
 define gb_LinkTarget__use_gio
 $(call gb_LinkTarget_set_include,$(1),\
@@ -1124,10 +1125,22 @@ $(call gb_LinkTarget_set_include,$(1),\
$(GIO_CFLAGS) \
 )
 
+$(call gb_LinkTarget_add_defs,$(1),\
+-DENABLE_GIO \
+)
+
 $(call gb_LinkTarget_add_libs,$(1),$(GIO_LIBS))
 
 endef
 
+else # ENABLE_GIO
+
+define gb_LinkTarget__use_gio
+
+endef
+
+endif # ENABLE_GIO
+
 define gb_LinkTarget__use_gtk
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 35d9002..e2c7191 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -108,13 +108,8 @@ $(eval $(call gb_Library_use_libraries,sd,\
 
 $(eval $(call gb_Library_use_externals,sd,\
  libxml2 \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_externals,sd,\
  gio \
 ))
-endif
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_libraries,sd,\
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index a2de11c..0fc4624 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -9,7 +9,7 @@
 #include "BluetoothServer.hxx"
 #include 
 
-#ifdef LINUX
+#if defined(LINUX) && defined(ENABLE_GIO) && defined(ENABLE_DBUS)
 #include 
 #include 
 #include 
@@ -53,7 +53,7 @@ struct oslSocketImpl {
 
 void BluetoothServer::execute()
 {
-#ifdef LINUX
+#if defined(LINUX) && defined(ENABLE_GIO) && defined(ENABLE_DBUS)
 #ifdef GLIB_VERSION_2_26
 g_type_init();
 GError* aError = NULL;
@@ -218,4 +218,4 @@ void BluetoothServer::setup( std::vector* 
pCommunicators )
 }
 
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 84d4e5d..ccd254c 100644
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\
 ))
 
 $(eval $(call gb_Library_use_externals,qstart_gtk,\
+   gio \
gtk \
libxml2 \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Object Catalog: double-click to modules and dialogs

2012-08-30 Thread Gerrit 
>From Andras Timar :

Andras Timar has submitted this change and it was merged.

Change subject: Object Catalog: double-click to modules and dialogs
..


Object Catalog: double-click to modules and dialogs

In Basic IDE in Object Catalog, only methods could be loaded by
double-click. Now modules and dialogs can be too.

Change-Id: If1c4412d2f6d35e6d1cbf48e700e2566dad9e97a
---
M basctl/source/basicide/bastype2.cxx
1 file changed, 21 insertions(+), 10 deletions(-)

Approvals:
  Andras Timar: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1c4412d2f6d35e6d1cbf48e700e2566dad9e97a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: János Uray 
Gerrit-Reviewer: Andras Timar 

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

[Libreoffice-commits] .: basctl/source

2012-08-30 Thread Libreoffice Gerrit user 
 basctl/source/basicide/bastype2.cxx |   31 +--
 1 file changed, 21 insertions(+), 10 deletions(-)

New commits:
commit f8182a1c53c2bc77444d58ffb140b39ea798
Author: Uray M. János 
Date:   Thu Aug 30 11:23:16 2012 +0200

Object Catalog: double-click to modules and dialogs

In Basic IDE in Object Catalog, only methods could be loaded by
double-click. Now modules and dialogs can be too.

Change-Id: If1c4412d2f6d35e6d1cbf48e700e2566dad9e97a
Reviewed-on: https://gerrit.libreoffice.org/515
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 40c84a2..4b8b1e4 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -907,17 +907,28 @@ void TreeListBox::MouseButtonDown( const MouseEvent& 
rMEvt )
 SvTreeListBox::MouseButtonDown( rMEvt );
 if ( rMEvt.IsLeft() && ( rMEvt.GetClicks() == 2 ) )
 {
-EntryDescriptor aDesc( GetEntryDescriptor( GetCurEntry() ) );
-
-if ( aDesc.GetType() == OBJ_TYPE_METHOD )
+EntryDescriptor aDesc = GetEntryDescriptor(GetCurEntry());
+switch (aDesc.GetType())
 {
-if (SfxDispatcher* pDispatcher = GetDispatcher())
-{
-SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), 
aDesc.GetLibName(), aDesc.GetName(),
-aDesc.GetMethodName(), ConvertType( aDesc.GetType() ) );
-pDispatcher->Execute( SID_BASICIDE_SHOWSBX,
-SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
-}
+case OBJ_TYPE_METHOD:
+case OBJ_TYPE_MODULE:
+case OBJ_TYPE_DIALOG:
+if (SfxDispatcher* pDispatcher = GetDispatcher())
+{
+SbxItem aSbxItem(
+SID_BASICIDE_ARG_SBX, aDesc.GetDocument(),
+aDesc.GetLibName(), aDesc.GetName(), 
aDesc.GetMethodName(),
+ConvertType(aDesc.GetType())
+);
+pDispatcher->Execute(
+SID_BASICIDE_SHOWSBX,
+SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L
+);
+}
+break;
+
+default:
+break;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Undo/Redo description+shortcut in Basic IDE

2012-08-30 Thread Gerrit 
>From Andras Timar :

Andras Timar has submitted this change and it was merged.

Change subject: Undo/Redo description+shortcut in Basic IDE
..


Undo/Redo description+shortcut in Basic IDE

This solves an issue about Edit > Redo in BasicIDE (Hungarian site):
http://bug.openscope.org/browse/OOO-269
1. Redo should have a shortcut (Ctrl+Y), like in other parts of
LibreOffice. (Undo has the usual Ctrl+Z.)
2. In the Edit menu, Undo and Redo should print something after the
colon (what is to be undone, redone).

This patch fixes both.
Unfortunately the shortcut isn't shown in the menu (it's in
vcl/source/window/keycod.cxx like Undo, and not in
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu).

Change-Id: I2cfbfeb7d57309a27676e48943633cdb194288bc
---
M basctl/source/basicide/baside2b.cxx
M vcl/AllLangResTarget_vcl.mk
M vcl/source/edit/textund2.hxx
M vcl/source/edit/textundo.cxx
A vcl/source/edit/textundo.hrc
M vcl/source/edit/textundo.hxx
A vcl/source/edit/textundo.src
M vcl/source/window/keycod.cxx
8 files changed, 204 insertions(+), 25 deletions(-)

Approvals:
  Andras Timar: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cfbfeb7d57309a27676e48943633cdb194288bc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: János Uray 
Gerrit-Reviewer: Andras Timar 

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

[Libreoffice-commits] .: basctl/source vcl/AllLangResTarget_vcl.mk vcl/source

2012-08-30 Thread Libreoffice Gerrit user 
 basctl/source/basicide/baside2b.cxx |   31 --
 vcl/AllLangResTarget_vcl.mk |1 
 vcl/source/edit/textund2.hxx|   15 -
 vcl/source/edit/textundo.cxx|  104 ++--
 vcl/source/edit/textundo.hrc|   28 +
 vcl/source/edit/textundo.hxx|5 +
 vcl/source/edit/textundo.src|   41 ++
 vcl/source/window/keycod.cxx|4 -
 8 files changed, 204 insertions(+), 25 deletions(-)

New commits:
commit 1191f4e432d3cb49662e6133411af3a2faf10a7a
Author: Uray M. János 
Date:   Thu Aug 30 10:18:14 2012 +0200

Undo/Redo description+shortcut in Basic IDE

This solves an issue about Edit > Redo in BasicIDE (Hungarian site):
http://bug.openscope.org/browse/OOO-269
1. Redo should have a shortcut (Ctrl+Y), like in other parts of
LibreOffice. (Undo has the usual Ctrl+Z.)
2. In the Edit menu, Undo and Redo should print something after the
colon (what is to be undone, redone).

This patch fixes both.
Unfortunately the shortcut isn't shown in the menu (it's in
vcl/source/window/keycod.cxx like Undo, and not in
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu).

Change-Id: I2cfbfeb7d57309a27676e48943633cdb194288bc
Reviewed-on: https://gerrit.libreoffice.org/514
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 41e31c7..a184d06 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -464,28 +464,23 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
 
 if ( !bDone && ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() 
 ) )
 {
-if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) && 
rKEvt.GetKeyCode().IsMod1() )
-bDone = true;
-else
+if ( ( rKEvt.GetKeyCode().GetCode() == KEY_TAB ) && 
!rKEvt.GetKeyCode().IsMod1() &&
+  !rKEvt.GetKeyCode().IsMod2() && !GetEditView()->IsReadOnly() )
 {
-if ( ( rKEvt.GetKeyCode().GetCode() == KEY_TAB ) && 
!rKEvt.GetKeyCode().IsMod1() &&
-  !rKEvt.GetKeyCode().IsMod2() && !GetEditView()->IsReadOnly() 
)
+TextSelection aSel( pEditView->GetSelection() );
+if ( aSel.GetStart().GetPara() != aSel.GetEnd().GetPara() )
 {
-TextSelection aSel( pEditView->GetSelection() );
-if ( aSel.GetStart().GetPara() != aSel.GetEnd().GetPara() )
-{
-bDelayHighlight = false;
-if ( !rKEvt.GetKeyCode().IsShift() )
-pEditView->IndentBlock();
-else
-pEditView->UnindentBlock();
-bDelayHighlight = true;
-bDone = true;
-}
+bDelayHighlight = false;
+if ( !rKEvt.GetKeyCode().IsShift() )
+pEditView->IndentBlock();
+else
+pEditView->UnindentBlock();
+bDelayHighlight = true;
+bDone = true;
 }
-if ( !bDone )
-bDone = pEditView->KeyInput( rKEvt );
 }
+if ( !bDone )
+bDone = pEditView->KeyInput( rKEvt );
 }
 if ( !bDone )
 {
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 6fd8c1a..b6c557b 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
 vcl/source/src/stdtext.src \
 vcl/source/src/units.src \
 vcl/source/src/fpicker.src \
+vcl/source/edit/textundo.src \
 ))
 
 
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index c5ce90c..153e3db 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -19,7 +19,8 @@
 #ifndef _TEXTUND2_HXX
 #define _TEXTUND2_HXX
 
-#include 
+#include "textundo.hxx"
+#include 
 
 
 class TextUndoDelPara : public TextUndo
@@ -36,6 +37,8 @@ public:
 
 virtual voidUndo();
 virtual voidRedo();
+
+virtual rtl::OUString GetComment () const;
 };
 
 
@@ -52,6 +55,8 @@ public:
 
 virtual voidUndo();
 virtual voidRedo();
+
+virtual rtl::OUString GetComment () const;
 };
 
 
@@ -68,6 +73,8 @@ public:
 
 virtual voidUndo();
 virtual voidRedo();
+
+virtual rtl::OUString GetComment () const;
 };
 
 
@@ -85,6 +92,8 @@ public:
 virtual voidRedo();
 
 virtual sal_BoolMerge( SfxUndoAction *pNextAction );
+
+virtual rtl::OUString GetComment () const;
 };
 
 
@@ -100,6 +109,8 @@ public:
 
 virtual voidUndo();
 virtual voidRedo();
+
+virtual rtl::OUString GetComment () const;
 };
 
 
@@ -115,6 +126,8 @@ public:
 
 virtual voidUndo();
 virtual voidRedo();
+
+virt

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-08-30 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #97 from Vossman  2012-08-30 12:46:05 UTC ---
I would like to nominate the nasty Bug 51023. It is already a 3.5 most annoying
bug, but should be a 3.6 most annoying bug:

Bug 51023 EDITING: Drag-and-drop slide always moves slide to first position,
leading to data corruption and sometimes CRASH

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: RepositoryExternal.mk

2012-08-30 Thread Libreoffice Gerrit user 
 RepositoryExternal.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9ec0a3ec629a05809852728482fdb3f3d997edef
Author: Caolán McNamara 
Date:   Thu Aug 30 13:44:53 2012 +0100

these ENABLE_FOOs are set to TRUE not YES

Change-Id: I821a41752643fe78cc99ea20e5d7ef11e7a5e91a

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index cf41f69..96709fb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1157,7 +1157,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
 endef
 
 
-ifeq ($(ENABLE_DBUS),YES)
+ifeq ($(ENABLE_DBUS),TRUE)
 
 define gb_LinkTarget__use_dbus
 $(call gb_LinkTarget_set_include,$(1),\
@@ -1727,7 +1727,7 @@ endef
 endif # ENABLE_KDE4
 
 
-ifeq ($(ENABLE_TDE),YES)
+ifeq ($(ENABLE_TDE),TRUE)
 
 define gb_LinkTarget__use_tde
 $(call gb_LinkTarget_add_libs,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] Change in core[feature/killsdf]: More cleanup aka clean up cleanup

2012-08-30 Thread Stephan Bergmann 

On 08/30/2012 01:17 PM, Zolnai Tamás wrote:

I submit a patch, which uses types more thoughtfully.
I hope that it meets all the requirements.


Thanks -- and no big deal anyway.  (I had just been afraid of an 
upcoming bulk replacement that could have caused trouble.)


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

Re: Selection of dictionaries per installation

2012-08-30 Thread Olivier Hallot 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi

Em 30-08-2012 08:16, Stephan Bergmann escreveu:
> (b) to rethink having dictionaries as bundled extensions (though I would
> prefer to keep things simple, solving the problem by harmonizing
> behavior across platforms now and leaving anything more ambitious for
> the future).

Jumping in... I would prefer dictionaries to be shared extensions for
the time being, because in large deployments the trend is to keep a
stable, known LO version but accessories like dictionaries are allowed
to upgrade. For the end-user that is completely transparent, and for the
sysadmin, a bit easier to upgrade (I may be missing smthg wrt to bundled
extension update).
- -- 
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Fundação responsável civilmente, de acordo com o direito civil
Detalhes Legais: http://www.documentfoundation.org/imprint
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJQP1NkAAoJEJp3R7nH3vLxcYsH+wYBzILhytnuducG4qvXINCN
X6d+0cLgn81a//bvbDRfxYzSUHs1GvuvVrYeYR2s+oIo01d/J9hiRneNgsMK08V5
RtXbNpanUQOIBUuR2c7cnZWoqreML0mvETPDBoWyQnXqLjcRMRIFHJRmQBh4Magq
9x1rxj7hA5dZSYC+M40inMyqTkYFbHfHrMCGfNtFB0anCm1H8OyVQucqRmsvRW0Q
RB3DIUVitqsfz3k5AyQ8BfOmsL61sx6cfr+t5SXFjInb9aqQH0UwEbT2a6uzad40
WbX8W/gv8RUDl3dTkhlXvd1LWqptc4kp6Imxaf9yHvY25urUhwkw1dLmTyo0fRw=
=Tkn/
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: most efficient way to keep in sync with configuration data ?

2012-08-30 Thread Stephan Bergmann 

On 08/30/2012 01:09 PM, Caolán McNamara wrote:

What's the most efficient way to repeatedly get an up-to-date
configuration value ?

Just do
sal_Int32 nFoo = officecfg::Office::Writer::Foo::get();
every time you need Foo, or request Foo once and register some listener
of some kind on Foo modifications ?


Which is more efficient overall depends on whether there will be more 
instances where your code wants to obtain the value or more instances of 
other code modifying it.  I would go with the simple approach of reading 
the value afresh whenever needed.


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

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

2012-08-30 Thread Libreoffice Gerrit user 
 solenv/bin/uilangfilter.xslt  |   11 +++---
 vcl/inc/vcl/builder.hxx   |4 +-
 vcl/source/window/builder.cxx |   77 --
 3 files changed, 75 insertions(+), 17 deletions(-)

New commits:
commit f53b51c3e1b498f1aa9708e81ae45c0880a3e9d5
Author: Caolán McNamara 
Date:   Thu Aug 30 12:41:18 2012 +0100

autoconnect multi-column list stores to dropdowns

Default to importing the first column into the list and the second column as
the additional data and only considering the first column for translation

Change-Id: Ic74a4550167455c83634c4112ab2b698c1d25ea1

diff --git a/solenv/bin/uilangfilter.xslt b/solenv/bin/uilangfilter.xslt
index a202b0e..42d066f 100644
--- a/solenv/bin/uilangfilter.xslt
+++ b/solenv/bin/uilangfilter.xslt
@@ -14,7 +14,7 @@
 
   

   
-  
+  
   
 
 
@@ -25,10 +25,10 @@
   

 
 
-
+

   
-  
+  
   
   

 
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 0f6f228..ae0bc7f 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -62,7 +62,8 @@ private:
 
 struct ListStore
 {
-std::vector m_aEntries;
+typedef std::vector row;
+std::vector m_aEntries;
 };
 
 struct ModelAndId
@@ -189,6 +190,7 @@ private:
 void collectProperty(xmlreader::XmlReader &reader, const rtl::OString 
&rID, stringmap &rVec);
 
 void handleListStore(xmlreader::XmlReader &reader, const rtl::OString 
&rID);
+void handleRow(xmlreader::XmlReader &reader, const rtl::OString &rID, 
sal_Int32 nRowIndex);
 void handleAdjustment(const rtl::OString &rID, stringmap &rProperties);
 void handleTabChild(Window *pParent, xmlreader::XmlReader &reader);
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 49373ee..50e6b94 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -536,7 +536,10 @@ Window *VclBuilder::insertObject(Window *pParent, const 
rtl::OString &rClass, co
 if (pCurrentChild->IsDialog())
 pCurrentChild->SetStyle(pCurrentChild->GetStyle() | WB_SIZEMOVE | 
WB_3DLOOK);
 if (pCurrentChild->GetHelpId().isEmpty())
+{
 pCurrentChild->SetHelpId(m_sHelpRoot + m_sID);
+fprintf(stderr, "for toplevel dialog %p %s, set helpid %s\n", 
this, rID.getStr(), pCurrentChild->GetHelpId().getStr());
+}
 }
 else
 {
@@ -782,12 +785,13 @@ void VclBuilder::handleAdjustment(const rtl::OString 
&rID, stringmap &rPropertie
 m_pParserState->m_aAdjustments.push_back(AdjustmentAndId(rID, 
rProperties));
 }
 
-void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const 
rtl::OString &rID)
+void VclBuilder::handleRow(xmlreader::XmlReader &reader, const rtl::OString 
&rID, sal_Int32 nRowIndex)
 {
-m_pParserState->m_aModels.push_back(ModelAndId(rID, new ListStore));
-
 int nLevel = 1;
-sal_Int32 nIndex = 0;
+
+fprintf(stderr, "handleRow for %s\n", rID.getStr());
+
+ListStore::row aRow;
 
 while(1)
 {
@@ -807,12 +811,18 @@ void VclBuilder::handleListStore(xmlreader::XmlReader 
&reader, const rtl::OStrin
 {
 bool bTranslated = false;
 rtl::OString sProperty, sValue;
+sal_uInt32 nId = 0;
 
 while (reader.nextAttribute(&nsId, &name))
 {
-if 
(name.equals(RTL_CONSTASCII_STRINGPARAM("translatable")) && 
reader.getAttributeValue(false).equals(RTL_CONSTASCII_STRINGPARAM("yes")))
+if (name.equals(RTL_CONSTASCII_STRINGPARAM("id")))
+{
+name = reader.getAttributeValue(false);
+nId = rtl::OString(name.begin, name.length).toInt32();
+}
+else if (nId == 0 && 
name.equals(RTL_CONSTASCII_STRINGPARAM("translatable")) && 
reader.getAttributeValue(false).equals(RTL_CONSTASCII_STRINGPARAM("yes")))
 {
-sValue = getTranslation(rID, 
rtl::OString::valueOf(nIndex));
+sValue = getTranslation(rID, 
rtl::OString::valueOf(nRowIndex));
 bTranslated = !sValue.isEmpty();
 }
 }
@@ -823,9 +833,9 @@ void VclBuilder::handleListStore(xmlreader::XmlReader 
&reader, const rtl::OStrin
 if (!bTranslated)
 sValue = rtl::OString(name.begin, name.length);
 
-
m_pParserState->m_aModels.back().m_pModel->m_aEntries.push_back(sValue);
-
-++nIndex;
+if (aRow.size() < nId+1)
+aRow.resize(nId+1);
+aRow[nId] = sValue;
 }
 }
 
@@ -837,6 +847,45 @@ void VclBuilder::handleListStore(xmlreader::XmlReader 
&reader, const rtl::OStrin
 if (!nLevel)
 break;
 }
+
+if (!aRow.empty())
+m_pParserState->m_aModels.back().m_pModel->m_aEntries.push_bac

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-08-30 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=37361

sasha.libreoff...@gmail.com changed:

   What|Removed |Added

 Depends on||35991

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - reportdesign/source uui/source

2012-08-30 Thread Libreoffice Gerrit user 
 reportdesign/source/filter/xml/xmlControlProperty.cxx |1 +
 uui/source/iahndl.cxx |9 +
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 44ecabdbb367fc5ed84990540e5810d66be6
Author: Tor Lillqvist 
Date:   Thu Aug 30 14:24:48 2012 +0300

#include 

diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx 
b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 85248f1..346451d 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -28,6 +28,7 @@
 
 #include "xmlControlProperty.hxx"
 
+#include 
 #include 
 #include "xmlfilter.hxx"
 #include 
commit 863a82a369b797e920687ffd05c7ddf959ba9f83
Author: Tor Lillqvist 
Date:   Thu Aug 30 14:22:33 2012 +0300

Revert "no member named 'OStringBuffer' in namespace 'rtl'"

Instead just #include  then.

This reverts commit 15768dac2b0a326cb1f8b7985f18a6ab54d1a664.

Change-Id: Ib6aed3f73bf106b4804fb418af80fefa6d662c79

diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index f444516..127f7d4 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -60,6 +60,7 @@
 #include "com/sun/star/xforms/InvalidDataOnSubmitException.hpp"
 #include "com/sun/star/loader/CannotActivateFactoryException.hpp"
 
+#include 
 #include "osl/conditn.hxx"
 #include "tools/rcid.h" // RSC_STRING
 #include "tools/errinf.hxx" // ErrorHandler, ErrorContext, ...
@@ -342,10 +343,10 @@ namespace
 if ( !pTypeDesc || !pTypeDesc->pWeakRef )
 {
 #if OSL_DEBUG_LEVEL > 0
-::rtl::OUStringBuffer aMessage;
-aMessage.appendAscii( "no type found for '" );
-aMessage.append( i_rTypeName );
-aMessage.appendAscii( "'" );
+::rtl::OStringBuffer aMessage;
+aMessage.append( "no type found for '" );
+aMessage.append( ::rtl::OUStringToOString( i_rTypeName, 
RTL_TEXTENCODING_UTF8 ) );
+aMessage.append( "'" );
 OSL_FAIL( aMessage.makeStringAndClear().getStr() );
 #endif
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - solenv/bin

2012-08-30 Thread Libreoffice Gerrit user 
 solenv/bin/uilangfilter.xslt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d467f99ca239db10eef8e50abdb367ac2f7eaecb
Author: Caolán McNamara 
Date:   Thu Aug 30 12:27:15 2012 +0100

missing seperator

Change-Id: I758f61d51070a144f5c893e4ca0adb3b40d7ced1

diff --git a/solenv/bin/uilangfilter.xslt b/solenv/bin/uilangfilter.xslt
index 8f4b1c5..bf58014 100644
--- a/solenv/bin/uilangfilter.xslt
+++ b/solenv/bin/uilangfilter.xslt
@@ -27,7 +27,7 @@
 

   
-  
+  
   
   

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

Re:[PATCH] Change in core[feature/killsdf]: More cleanup aka clean up cleanup

2012-08-30 Thread Zolnai Tamás 
Hi,  Stephan and Miklós

I submit a patch, which uses types more thoughtfully.
I hope that it meets all the requirements.

Regards,
Zolnai Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Selection of dictionaries per installation

2012-08-30 Thread Stephan Bergmann 
The recent removal of the extension prereg mechanism revealed a problem 
with how we select which dictionaries (which come in the form of bundled 
extensions) are included in a given installation.


At least with the "official" () Linux 
and Mac OS X installation sets, the base installation set contains en-US 
localization and only contains dictionaries "related" to that locale 
(dict-en, dict-es, dict-fr; see below for details of what "related" 
means).  The additional per-language langpacks contain dictionaries 
"related" to the given langpack (e.g., langpack_de contains dict-de).


However, on Windows, the base installation set contains all available 
localizations and all available dictionaries.  During msi installation, 
some code apparently determines a default selection of only a subset of 
the "Additional user interface languages" entries (presumably based on 
the current system locale settings), but all of the available "Optional 
Components - Dictionaries" entries are selected by default.  This now 
causes per-user generation of data about all those bundled dictionary 
extensions at per-user first-start of LO, leading to noticeable time and 
space requirements (see 
 "Large 
UserInstallation's user/extensions/bundled/ tree").


Hence, one suggestion to address that problem would be to reduce the 
amount of "Optional Components - Dictionaries" entries selected by 
default during Windows msi installation, similar to how a certain 
combination of base installation set plus langpack(s) on the other 
platforms also only installs a subset of all the available dictionaries. 
 (That is, the code that apparently now determines a default selection 
of "Additional user interface languages" entries would need to be 
extended to also determine a default selection of "related" "Optional 
Components - Dictionaries" entries.)


Initial reactions on IRC (see below) were that (a) the status quo on 
Windows was to avoid "political issues" (though that would be 
inconsistent with the status quo on the other platforms), and (b) to 
rethink having dictionaries as bundled extensions (though I would prefer 
to keep things simple, solving the problem by harmonizing behavior 
across platforms now and leaving anything more ambitious for the future).


Any further thoughts?

Stephan

PS1: The way dictionaries "related" to a given locale are determined 
appears to be the the list at 
setup_native/source/packinfo/spellchecker_selection.txt.  That's why the 
en-US base installation set for Linux and Mac OS X contains dict-en, 
dict-es, and dict-fr, for example.  However, an apparent inconsistency 
is that langpack_de only contains dict-de, and not also dict-fr and 
dict-it, as that list would suggest.


PS2: At least the Mac OS X LO 3.6.1 en-US base installation set contains 
share/extension/dict-* directories for all available dictionaries, not 
just dict-en, dict-es, dict-fr, but the additional ones are effectively 
empty and their existence is a bug.


PS3: For the record, the relevant log of yesterday's #libreofifice-dev:


Aug 29 12:50:57  timar, do you know anything about our msi by default installing all 
"Optional Components - Dictionaries" entries, but only selected (at installation time, I 
presume?) "Additional user interface languages"?
Aug 29 12:51:59  sberg: yes, we always install all dictionaries on Windows in 
order to avoid "political issues"
Aug 29 12:52:26  is this the old "omg, I waste SEVERAL MEGABYTES on 
dictionaries for languages I don't even like" discussion?
Aug 29 12:53:41  timar, but that causes one part of the problems of 
fdo#53009, so I had hoped we could fix that
Aug 29 12:53:44  LibreOffice-Libreoffice normal/medium ASSIGNED Large 
UserInstallation's user/extensions/bundled/ tree 
https://bugs.freedesktop.org/show_bug.cgi?id=53009
Aug 29 12:54:41  wouldn't the best solution then be to stop treating these as 
"extensions"?
Aug 29 12:55:12  don't we have too much optionality in the installer 
anyway?
Aug 29 12:55:40  hmm, those are orthogonal issues, sorry
Aug 29 12:58:36  sberg: what is your suggestion?
Aug 29 13:02:55  timar, assuming that there is code in our msi to default-enable some subset X of 
"Additional user interface languages" entries: extend that code to also default-enable only a 
"matching" subset of "Optional Components - Dictionaries" entries
Aug 29 13:03:44  that assumes people would prefer to use software 
(including the OS) in the same language as they write/edit documents it. not true
Aug 29 13:03:46  ...for some suitable definition of "matching"
Aug 29 13:05:01  sberg: tml_ there is 
http://opengrok.libreoffice.org/xref/core/setup_native/source/packinfo/spellchecker_selection.txt
 that we still use for creating Linux langpacks IMHO (not sure)
Aug 29 13:05:11  tml_, no, but it might be a better approximation to typical 
users' needs than the current "install everything" approach (after all, u

[PUSHED] Change in core[feature/killsdf]: More cleanup aka clean up cleanup

2012-08-30 Thread Gerrit 
>From Andras Timar :

Andras Timar has submitted this change and it was merged.

Change subject: More cleanup aka clean up cleanup
..


More cleanup aka clean up cleanup

Use integers consistently
Change headers
Make variable initialization uniform

Change-Id: I91937704a80c0d5997ad81591ce79076794a4e32
---
M l10ntools/Executable_renewpo.mk
M l10ntools/inc/po.hxx
M l10ntools/source/po.cxx
M l10ntools/source/renewpo.cxx
4 files changed, 35 insertions(+), 97 deletions(-)

Approvals:
  Andras Timar: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91937704a80c0d5997ad81591ce79076794a4e32
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 

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

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/Executable_renewpo.mk l10ntools/inc l10ntools/source

2012-08-30 Thread Libreoffice Gerrit user 
 l10ntools/Executable_renewpo.mk |   19 +-
 l10ntools/inc/po.hxx|   31 
 l10ntools/source/po.cxx |   51 
 l10ntools/source/renewpo.cxx|   31 
 4 files changed, 35 insertions(+), 97 deletions(-)

New commits:
commit 61eadf2df432ed4f048006b1409046505d9a4e8c
Author: Zolnai Tamás 
Date:   Thu Aug 30 12:41:18 2012 +0200

More cleanup aka clean up cleanup

Use integers consistently
Change headers
Make variable initialization uniform

Change-Id: I91937704a80c0d5997ad81591ce79076794a4e32
Reviewed-on: https://gerrit.libreoffice.org/517
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/l10ntools/Executable_renewpo.mk b/l10ntools/Executable_renewpo.mk
index 33e38b2..4872e8a 100644
--- a/l10ntools/Executable_renewpo.mk
+++ b/l10ntools/Executable_renewpo.mk
@@ -1,18 +1,13 @@
-# for the specific language governing rights and limitations under the
-# License.
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky  (initial developer)
+# This file is part of the LibreOffice project.
 #
-# All Rights Reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For minor contributions see the git repository.
+# convert old po to new po
 #
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Executable_Executable,renewpo))
 
@@ -33,4 +28,4 @@ $(eval $(call gb_Executable_add_exception_objects,renewpo,\
 l10ntools/source/renewpo \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 3330afb..c03baf8 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -1,30 +1,11 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 
 #ifndef _PO_INCLUDED
 #define _PO_INCLUDED
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 472e876..6848d7e 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -1,30 +1,11 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE

most efficient way to keep in sync with configuration data ?

2012-08-30 Thread Caolán McNamara 
What's the most efficient way to repeatedly get an up-to-date
configuration value ?

Just do
sal_Int32 nFoo = officecfg::Office::Writer::Foo::get();
every time you need Foo, or request Foo once and register some listener
of some kind on Foo modifications ?

C.

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

[PATCH] Change in core[feature/killsdf]: More cleanup aka clean up cleanup

2012-08-30 Thread Gerrit 
>From Zolnai Tamás :

Zolnai Tamás has uploaded a new change for review.

Change subject: More cleanup aka clean up cleanup
..

More cleanup aka clean up cleanup

Use integers consistently
Change headers
Make variable initialization uniform

Change-Id: I91937704a80c0d5997ad81591ce79076794a4e32
---
M l10ntools/Executable_renewpo.mk
M l10ntools/inc/po.hxx
M l10ntools/source/po.cxx
M l10ntools/source/renewpo.cxx
4 files changed, 35 insertions(+), 97 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/517/1
--
To view, visit https://gerrit.libreoffice.org/517
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91937704a80c0d5997ad81591ce79076794a4e32
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 

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

Re:[PUSHED] [REVIEW-3-6] fix for fdo 53424, use new way to create cond formats also for xlsb

2012-08-30 Thread Noel Power 

On 30/08/12 02:53, Markus Mohrhard wrote:

Hey,

the attached patch solves the crash for fdo#53424. The xlsb code needs
the same treatment as the xlsx code.

Regards,
Markus
looks ok to me ( at least assuming importCondFormatting is only called 
once per instance of CondFormat ) might be an idea still to ensure that 
there is no possibility of a leak there regardless of the present usage 
expectation ( that could change )


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

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

2012-08-30 Thread Libreoffice Gerrit user 
 sc/source/filter/oox/condformatbuffer.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 132ffae17678df9c10d31dd3ae7540254a58dbf0
Author: Markus Mohrhard 
Date:   Thu Aug 30 02:05:20 2012 +0200

also handle the cond format code for xlsb the new way, fdo#53424

Change-Id: I8d54e5fee29952635c3d4c2d5a12203668e2ff28

diff --git a/sc/source/filter/oox/condformatbuffer.cxx 
b/sc/source/filter/oox/condformatbuffer.cxx
index b110df2..8315793 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -877,6 +877,7 @@ void CondFormat::importCondFormatting( SequenceInputStream& 
rStrm )
 rStrm.skip( 8 );
 rStrm >> aRanges;
 getAddressConverter().convertToCellRangeList( maModel.maRanges, aRanges, 
getSheetIndex(), true );
+mpFormat = new ScConditionalFormat(0, &getScDocument());
 }
 
 void CondFormat::importCfRule( SequenceInputStream& rStrm )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] remove unused code

2012-08-30 Thread Gerrit 
>From Babati Bence :

Babati Bence has uploaded a new change for review.

Change subject: remove unused code
..

remove unused code

Change-Id: I49e84449a0ea1f77ff4d14b3631aeb7670d4f4e7
---
M sd/inc/pglink.hxx
M sd/source/core/pglink.cxx
2 files changed, 0 insertions(+), 66 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/516/1
--
To view, visit https://gerrit.libreoffice.org/516
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49e84449a0ea1f77ff4d14b3631aeb7670d4f4e7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Babati Bence 

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

Re: [Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source

2012-08-30 Thread Miklos Vajna 
On Thu, Aug 30, 2012 at 11:42:40AM +0200, Stephan Bergmann 
 wrote:
> >-sal_Int32 nActChar = rUnEscaped.indexOf(rText[nIndex]);
> >+int nActChar = rUnEscaped.indexOf(rText[nIndex]);
> >  if(nActChar!=-1)
> >  sResult = sResult.replaceAt((nIndex)+(nCount++),1,
> >  rEscaped.copy(2*nActChar,2));
> 
> What's the reason for changes like this?  The involved type is
> sal_Int32, not int, and sal_Int32 is not necessarily a typedef for
> int (e.g., it is a typedef for long on some platforms).  I fear that
> routinely using plain int instead of those sal types when
> interfacing with code using those sal types leads to unnecessary
> compiler warnings.

It was me who suggested using int and not sal_Int* when the size does
not matter. However I forgot to point out that sal_Int* types are the
way to go when the variable is initialized by a method returning
sal_Int* already.

Sorry for the confusion. :)

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

[PUSHED] fdo#39468: Translated German comments in sc/source/core/tool

2012-08-30 Thread Gerrit 
>From Eike Rathke :

Eike Rathke has submitted this change and it was merged.

Change subject: fdo#39468: Translated German comments in sc/source/core/tool
..


fdo#39468: Translated German comments in sc/source/core/tool

Change-Id: I3d27d33a973c601234b5b6e48756df16f567149d
---
M sc/source/core/tool/address.cxx
M sc/source/core/tool/adiasync.cxx
M sc/source/core/tool/autoform.cxx
M sc/source/core/tool/callform.cxx
M sc/source/core/tool/chartarr.cxx
M sc/source/core/tool/chartlis.cxx
6 files changed, 31 insertions(+), 31 deletions(-)

Approvals:
  Eike Rathke: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d27d33a973c601234b5b6e48756df16f567149d
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: gerhard öttl 
Gerrit-Reviewer: Eike Rathke 
Gerrit-Reviewer: gerhard öttl 

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

[Libreoffice-commits] .: sc/source

2012-08-30 Thread Libreoffice Gerrit user 
 sc/source/core/tool/address.cxx  |2 +-
 sc/source/core/tool/adiasync.cxx |   14 +++---
 sc/source/core/tool/autoform.cxx |   16 
 sc/source/core/tool/callform.cxx |2 +-
 sc/source/core/tool/chartarr.cxx |   20 ++--
 sc/source/core/tool/chartlis.cxx |8 
 6 files changed, 31 insertions(+), 31 deletions(-)

New commits:
commit e2faffebde9bf2a9b579e7f49cb3d4314808b978
Author: gerhard oettl 
Date:   Tue Aug 28 21:28:28 2012 +0200

fdo#39468: Translated German comments in sc/source/core/tool

Change-Id: I3d27d33a973c601234b5b6e48756df16f567149d
Reviewed-on: https://gerrit.libreoffice.org/503
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 1c3c66a..5850e01 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1959,7 +1959,7 @@ bool ScAddress::Move( SCsCOL dx, SCsROW dy, SCsTAB dz, 
ScDocument* pDoc )
 
 bool ScRange::Move( SCsCOL dx, SCsROW dy, SCsTAB dz, ScDocument* pDoc )
 {
-// Einfahces &, damit beides ausgefuehrt wird!!
+// single & to process both
 return aStart.Move( dx, dy, dz, pDoc ) & aEnd.Move( dx, dy, dz, pDoc );
 }
 
diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index ddfd0ce..ff21c91 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -76,12 +76,12 @@ ScAddInAsync::ScAddInAsync(sal_uLong nHandleP, FuncData* 
pFuncData, ScDocument*
 
 ScAddInAsync::~ScAddInAsync()
 {
-// aSeekObj hat das alles nicht, Handle 0 gibt es sonst nicht
+// aSeekObj does not have that, handle 0 does not exist otherwise
 if ( nHandle )
 {
-// im dTor wg. theAddInAsyncTbl.DeleteAndDestroy in ScGlobal::Clear
+// in dTor because of theAddInAsyncTbl.DeleteAndDestroy in 
ScGlobal::Clear
 mpFuncData->Unadvice( (double)nHandle );
-if ( meType == PTR_STRING && pStr )  // mit Typvergleich wg. Union!
+if ( meType == PTR_STRING && pStr )  // include type comparison 
because of union
 delete pStr;
 delete pDocs;
 }
@@ -107,10 +107,10 @@ void ScAddInAsync::CallBack( sal_uLong nHandleP, void* 
pData )
 ScAddInAsync* p;
 if ( (p = Get( nHandleP )) == NULL )
 return;
-// keiner mehr dran? Unadvice und weg damit
+
 if ( !p->HasListeners() )
 {
-// nicht im dTor wg. theAddInAsyncTbl.DeleteAndDestroy in 
ScGlobal::Clear
+// not in dTor because of theAddInAsyncTbl.DeleteAndDestroy in 
ScGlobal::Clear
 theAddInAsyncTbl.erase( p );
 delete p;
 return ;
@@ -148,7 +148,7 @@ void ScAddInAsync::RemoveDocument( ScDocument* pDocumentP )
 if ( !theAddInAsyncTbl.empty() )
 {
 for( ScAddInAsyncs::reverse_iterator iter1 = 
theAddInAsyncTbl.rbegin(); iter1 != theAddInAsyncTbl.rend(); ++iter1 )
-{   // rueckwaerts wg. Pointer-Aufrueckerei im Array
+{   // backwards because of pointer-movement in array
 ScAddInAsync* pAsync = *iter1;
 ScAddInDocs* p = pAsync->pDocs;
 ScAddInDocs::iterator iter2 = p->find( pDocumentP );
@@ -156,7 +156,7 @@ void ScAddInAsync::RemoveDocument( ScDocument* pDocumentP )
 {
 p->erase( iter2 );
 if ( p->empty() )
-{   // dieses AddIn wird nicht mehr benutzt
+{   // this AddIn is not used anymore
 theAddInAsyncTbl.erase( --(iter1.base()) );
 delete pAsync;
 }
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index ff2cef6..14be99e 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -51,13 +51,13 @@ const sal_Char *linker_dummy = "";
 
 static const sal_Char sAutoTblFmtName[] = "autotbl.fmt";
 
-// bis SO5PF
+// till SO5PF
 const sal_uInt16 AUTOFORMAT_ID_X= 9501;
 const sal_uInt16 AUTOFORMAT_ID_358  = 9601;
 const sal_uInt16 AUTOFORMAT_DATA_ID_X   = 9502;
 
-// ab SO5
-//! in nachfolgenden Versionen muss der Betrag dieser IDs groesser sein
+// from SO5 on
+// in following versions the value of the IDs must be higher
 const sal_uInt16 AUTOFORMAT_ID_504  = 9801;
 const sal_uInt16 AUTOFORMAT_DATA_ID_504 = 9802;
 
@@ -923,8 +923,8 @@ ScAutoFormat::ScAutoFormat(const ScAutoFormat& r) :
 
 ScAutoFormat::~ScAutoFormat()
 {
-//  Bei Aenderungen per StarOne wird nicht sofort gespeichert, sondern 
zuerst nur
-//  das SaveLater Flag gesetzt. Wenn das Flag noch gesetzt ist, jetzt 
speichern.
+//  When modified via StarOne then only the SaveLater flag is set and no 
saving is done.
+//  If the flag is set then save now.
 
 if (mbSaveLater)
 Save();
@@ -1039,7 +1039,7 @@ bool ScAutoFormat::Load()
 if (bRet)
 {
 SvStream& rStream = *pStream;
-// Achtung hier muss ein allgemeiner Header

[Libreoffice-commits] .: sd/Library_sd.mk

2012-08-30 Thread Libreoffice Gerrit user 
 sd/Library_sd.mk |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 6285e9da02445cace8a25d5318c01419ad3d717e
Author: Tor Lillqvist 
Date:   Thu Aug 30 12:57:59 2012 +0300

Use gio only on Linux

Change-Id: Ice64f084a04b879ccaec66f9a679f82ab9001547

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index c009ed9..35d9002 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -107,10 +107,15 @@ $(eval $(call gb_Library_use_libraries,sd,\
 ))
 
 $(eval $(call gb_Library_use_externals,sd,\
- gio \
  libxml2 \
 ))
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_use_externals,sd,\
+ gio \
+))
+endif
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_libraries,sd,\
ws2_32 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-6]: fdo#53887 convert filter value as LIKE pattern only on (NOT)...

2012-08-30 Thread Gerrit 
>From Andras Timar :

Andras Timar has submitted this change and it was merged.

Change subject: fdo#53887 convert filter value as LIKE pattern only on (NOT) 
LIKE
..


fdo#53887 convert filter value as LIKE pattern only on (NOT) LIKE

Change-Id: I24d1f3af5d428e735a94fc9a69960244d0225513
---
M dbaccess/source/ui/dlg/queryfilter.cxx
1 file changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Andras Timar: Verified; Looks good to me, approved
  Björn Michaelsen: Looks good to me, but someone else must approve


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24d1f3af5d428e735a94fc9a69960244d0225513
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Lionel Elie Mamane 
Gerrit-Reviewer: Andras Timar 
Gerrit-Reviewer: Björn Michaelsen 

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

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

2012-08-30 Thread Libreoffice Gerrit user 
 dbaccess/source/ui/dlg/queryfilter.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 5b43272845878243ce94c1170776ec87c19ad6fd
Author: Lionel Elie Mamane 
Date:   Thu Aug 30 05:55:35 2012 +0200

fdo#53887 convert filter value as LIKE pattern only on (NOT) LIKE

Change-Id: I24d1f3af5d428e735a94fc9a69960244d0225513
Reviewed-on: https://gerrit.libreoffice.org/513
Reviewed-by: Björn Michaelsen 
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx 
b/dbaccess/source/ui/dlg/queryfilter.cxx
index a639828..0f0d248 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -370,7 +370,9 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& 
_rField,const ListBox& _rCom
 if ( SQLFilterOperator::SQLNULL != _rFilter.Handle && _rFilter.Handle != 
SQLFilterOperator::NOT_SQLNULL )
 {
 String sPredicateValue = m_aPredicateInput.getPredicateValue( 
_rValue.GetText(), getMatchingColumn( _rValue ), sal_False );
-::Replace_OS_PlaceHolder( sPredicateValue );
+if ( _rFilter.Handle == SQLFilterOperator::LIKE ||
+ _rFilter.Handle == SQLFilterOperator::NOT_LIKE )
+::Replace_OS_PlaceHolder( sPredicateValue );
 _rFilter.Value <<= ::rtl::OUString(sPredicateValue);
 }
 return bHaving;
@@ -486,7 +488,9 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const 
PropertyValue& _rItem,sal_Boo
 ::rtl::OUString aCondition;
 _rItem.Value >>= aCondition;
 String aStr = aCondition.getStr();
-::Replace_SQL_PlaceHolder(aStr);
+if ( _rItem.Handle == SQLFilterOperator::LIKE ||
+ _rItem.Handle == SQLFilterOperator::NOT_LIKE )
+::Replace_SQL_PlaceHolder(aStr);
 aStr.EraseTrailingChars();
 
 Reference< XPropertySet > xColumn = getColumn( _rItem.Name );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source

2012-08-30 Thread Stephan Bergmann 

On 08/29/2012 09:06 PM, Libreoffice Gerrit user wrote:

commit ecfa813595cb577781668219d9e17a0494f92bea
Author: Zolnai Tamás 
Date:   Wed Aug 29 12:58:29 2012 +0200

 Some cleanup

 Use normal integer types when it's unecessary to use
 sal_int types.
 Delete some hack from code.

 Change-Id: I93f0b1f260578d3aa9609b7e9d8a79053693971b
 Reviewed-on: https://gerrit.libreoffice.org/510
 Reviewed-by: Andras Timar 
 Tested-by: Andras Timar 


[...]

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index c488c87..472e876 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -59,10 +59,10 @@ OString ImplEscapeText(const OString& rText,
  {
  if(rEscaped.getLength()!=2*rUnEscaped.getLength()) throw;
  OString sResult = rText;
-sal_Int32 nCount = 0;
-for(sal_Int32 nIndex=0; nIndex

What's the reason for changes like this?  The involved type is 
sal_Int32, not int, and sal_Int32 is not necessarily a typedef for int 
(e.g., it is a typedef for long on some platforms).  I fear that 
routinely using plain int instead of those sal types when interfacing 
with code using those sal types leads to unnecessary compiler warnings.


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

[Libreoffice-commits] .: sd/Library_sd.mk

2012-08-30 Thread Libreoffice Gerrit user 
 sd/Library_sd.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea705d630fa520f223a2c518e220454248957f0a
Author: Caolán McNamara 
Date:   Thu Aug 30 10:39:26 2012 +0100

missing symbols are in gio

Change-Id: I6c746d678f8472251b6d2139b7c46ffe2a7767c0

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 23bb018..c009ed9 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -107,7 +107,7 @@ $(eval $(call gb_Library_use_libraries,sd,\
 ))
 
 $(eval $(call gb_Library_use_externals,sd,\
- glib \
+ gio \
  libxml2 \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Object Catalog: double-click to modules and dialogs

2012-08-30 Thread Gerrit 
>From János Uray :

János Uray has uploaded a new change for review.

Change subject: Object Catalog: double-click to modules and dialogs
..

Object Catalog: double-click to modules and dialogs

In Basic IDE in Object Catalog, only methods could be loaded by
double-click. Now modules and dialogs can be too.

Change-Id: If1c4412d2f6d35e6d1cbf48e700e2566dad9e97a
---
M basctl/source/basicide/bastype2.cxx
1 file changed, 21 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/515/1
--
To view, visit https://gerrit.libreoffice.org/515
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1c4412d2f6d35e6d1cbf48e700e2566dad9e97a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: János Uray 

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

[Libreoffice-commits] .: uui/source

2012-08-30 Thread Libreoffice Gerrit user 
 uui/source/iahndl.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5949de433f8de411cf15906a250c83ba72b74747
Author: Tor Lillqvist 
Date:   Thu Aug 30 12:28:21 2012 +0300

no member named 'OStringBuffer' in namespace 'rtl'

Change-Id: Idb06612e30b6ef3e9ce26d461f3664fbafdb1cab

diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 98b25bd..f444516 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -342,10 +342,10 @@ namespace
 if ( !pTypeDesc || !pTypeDesc->pWeakRef )
 {
 #if OSL_DEBUG_LEVEL > 0
-::rtl::OStringBuffer aMessage;
-aMessage.append( "no type found for '" );
-aMessage.append( ::rtl::OUStringToOString( i_rTypeName, 
RTL_TEXTENCODING_UTF8 ) );
-aMessage.append( "'" );
+::rtl::OUStringBuffer aMessage;
+aMessage.appendAscii( "no type found for '" );
+aMessage.append( i_rTypeName );
+aMessage.appendAscii( "'" );
 OSL_FAIL( aMessage.makeStringAndClear().getStr() );
 #endif
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: ld -z build failures on master

2012-08-30 Thread Stephan Bergmann 

On 08/30/2012 08:03 AM, Noel Grandin wrote:

There is now a "-z" option passed to ld?

Getting build failures on master when building under Ubuntu Oneiric.


Meanwhile fixed with 
 
"Fix -Wl,-z,origin -Wl,-rpath,... quoting."


Stephan

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

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

2012-08-30 Thread Libreoffice Gerrit user 
 canvas/source/directx/dx_9rm.cxx |4 ++--
 sw/source/ui/misc/linenum.cxx|6 +++---
 vcl/inc/vcl/edit.hxx |1 +
 vcl/inc/vcl/field.hxx|   12 +++-
 vcl/inc/vcl/spinfld.hxx  |1 +
 vcl/source/control/edit.cxx  |   11 +++
 vcl/source/control/field.cxx |   34 ++
 vcl/source/control/spinfld.cxx   |   12 
 vcl/source/window/window2.cxx|3 +--
 9 files changed, 64 insertions(+), 20 deletions(-)

New commits:
commit 2420c409694375f5a36ca4b537baa1cace4d3f3a
Author: Caolán McNamara 
Date:   Thu Aug 30 10:13:53 2012 +0100

call queue_layout from queue_resize

Change-Id: I7f28c844bfbf739337937970355dbd4a8d39fe81

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index bb7aa5a..73eff89 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1781,8 +1781,7 @@ void Window::queue_resize()
 
 if (!pDialog || pDialog == this)
 return;
-if (pDialog->isLayoutEnabled())
-pDialog->Resize();
+pDialog->queue_layout();
 }
 
 //We deliberately do not overwrite our maHelpId here
commit 8e11c9ee92eeaff75b5fdd89119aef73d6349929
Author: Caolán McNamara 
Date:   Thu Aug 30 10:03:30 2012 +0100

Get optimal size of spinbuttons from min/max values, not current val

Change-Id: I2af72a1d88d2d411924110c6ead03bc8ed8b5dde

diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 7e19cf0..42b9718 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -229,6 +229,7 @@ public:
 AutocompleteAction  GetAutocompleteAction() const { return 
meAutocompleteAction; }
 
 virtual SizeCalcMinimumSize() const;
+virtual SizeCalcMinimumSizeForText(const rtl::OUString &rString) 
const;
 virtual SizeGetOptimalSize(WindowSizeType eType) const;
 virtual SizeCalcSize( sal_uInt16 nChars ) const;
 virtual xub_StrLen  GetMaxVisChars() const;
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index e7a5eb4..1278a43 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -171,8 +171,6 @@ protected:
 protected:
 NumericFormatter();
 
-virtual XubString   CreateFieldText( sal_Int64 nValue ) const;
-
 voidFieldUp();
 voidFieldDown();
 voidFieldFirst();
@@ -213,6 +211,7 @@ public:
 voidSetUserValue( sal_Int64 nNewValue );
 virtual voidSetValue( sal_Int64 nNewValue );
 virtual sal_Int64   GetValue() const;
+virtual XubString   CreateFieldText( sal_Int64 nValue ) const;
 sal_BoolIsValueModified() const;
 sal_Int64   GetCorrectedValue() const { return 
mnCorrectedValue; }
 
@@ -241,8 +240,6 @@ protected:
 protected:
 MetricFormatter();
 
-virtual XubString   CreateFieldText( sal_Int64 nValue ) const;
-
 SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
 SAL_DLLPRIVATE sal_Bool ImplMetricReformat( const XubString& rStr, 
double& rValue, XubString& rOutStr );
 
@@ -275,6 +272,7 @@ public:
 voidSetUserValue( sal_Int64 nNewValue, FieldUnit 
eInUnit );
 virtual sal_Int64   GetValue( FieldUnit eOutUnit ) const;
 virtual sal_Int64   GetValue() const;
+virtual XubString   CreateFieldText( sal_Int64 nValue ) const;
 using NumericFormatter::GetCorrectedValue;
 sal_Int64   GetCorrectedValue( FieldUnit eOutUnit ) const;
 
@@ -296,7 +294,6 @@ private:
 
 protected:
 CurrencyFormatter();
-virtual XubString   CreateFieldText( sal_Int64 nValue ) const;
 SAL_DLLPRIVATE sal_Bool ImplCurrencyReformat( const XubString& rStr, 
XubString& rOutStr );
 
 public:
@@ -308,6 +305,7 @@ public:
 
 virtual voidSetValue( sal_Int64 nNewValue );
 virtual sal_Int64   GetValue() const;
+virtual XubString   CreateFieldText( sal_Int64 nValue ) const;
 };
 
 
@@ -525,6 +523,8 @@ public:
 virtual longNotify( NotifyEvent& rNEvt );
 virtual voidDataChanged( const DataChangedEvent& rDCEvt );
 
+virtual SizeCalcMinimumSize() const;
+
 virtual voidModify();
 
 virtual voidUp();
@@ -552,6 +552,8 @@ public:
 virtual longNotify( NotifyEvent& rNEvt );
 virtual voidDataChanged( const DataChangedEvent& rDCEvt );
 
+virtual SizeCalcMinimumSize() const;
+
 virtual voidModify();
 
 virtual voidUp();
diff --git a/vcl/inc/vcl/spinfld.hxx b/vcl/inc/vcl/spinfld.hxx
index fbe2fb4..f773baa 100644
--- a/vcl/inc/vcl/spinfld.hxx
+++ b/vcl/inc/vcl/spinfld.hxx
@@ -101,6 +101,7 @@ public:
 const Link& GetLastHdl() const { return maLastHdlLink; }
 
 virtual Size

[Libreoffice-commits] .: sd/Library_sd.mk

2012-08-30 Thread Libreoffice Gerrit user 
 sd/Library_sd.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c5e69ec0775913a3ab6133f62e87596490556a78
Author: Cédric Bosdonnat 
Date:   Thu Aug 30 11:14:45 2012 +0200

Fixed remotecontrol build without gtk

Change-Id: I3b2118dea19a8ef3683ce192b3be703114bc02ae

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 8348914..23bb018 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -107,7 +107,7 @@ $(eval $(call gb_Library_use_libraries,sd,\
 ))
 
 $(eval $(call gb_Library_use_externals,sd,\
- gtk \
+ glib \
  libxml2 \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Undo/Redo description+shortcut in Basic IDE

2012-08-30 Thread Gerrit 
>From János Uray :

János Uray has uploaded a new change for review.

Change subject: Undo/Redo description+shortcut in Basic IDE
..

Undo/Redo description+shortcut in Basic IDE

This solves an issue about Edit > Redo in BasicIDE (Hungarian site):
http://bug.openscope.org/browse/OOO-269
1. Redo should have a shortcut (Ctrl+Y), like in other parts of
LibreOffice. (Undo has the usual Ctrl+Z.)
2. In the Edit menu, Undo and Redo should print something after the
colon (what is to be undone, redone).

This patch fixes both.
Unfortunately the shortcut isn't shown in the menu (it's in
vcl/source/window/keycod.cxx like Undo, and not in
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu).

Change-Id: I2cfbfeb7d57309a27676e48943633cdb194288bc
---
M basctl/source/basicide/baside2b.cxx
M vcl/AllLangResTarget_vcl.mk
M vcl/source/edit/textund2.hxx
M vcl/source/edit/textundo.cxx
A vcl/source/edit/textundo.hrc
M vcl/source/edit/textundo.hxx
A vcl/source/edit/textundo.src
M vcl/source/window/keycod.cxx
8 files changed, 204 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/514/1
--
To view, visit https://gerrit.libreoffice.org/514
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cfbfeb7d57309a27676e48943633cdb194288bc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: János Uray 

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

Re: [PUSHED][PATCH] Cleanup in Tools -> Options -> User Data

2012-08-30 Thread Caolán McNamara 
On Mon, 2012-08-13 at 10:14 +0200, Miklos Vajna wrote:
> Please submit an updated patch that does not have this problem --
> otherwise the patch looks really great. :-)

I see this landed as 030df631a8830d7c3225c22d5e36c0ef88577b24 now, so
marking thread as pushed.

C.

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

[Libreoffice-commits] .: Branch 'update' - check.php

2012-08-30 Thread Petr Mladek 
 check.php |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit f3be52d2ec952038ace5693a9698b33489825429
Author: Petr Mladek 
Date:   Thu Aug 30 10:03:01 2012 +0200

Offer update to 3.6.1.2 (3.6.1-final)

diff --git a/check.php b/check.php
index 8447812..ffc42b3 100644
--- a/check.php
+++ b/check.php
@@ -149,7 +149,12 @@ $update_versions = array(
 '73f9fb6-115b9dc-d7b744e-21dd070-d656a7' => 'LO-3.6',  # 3.6.0 RC1
 '815c576-a5d8898-9df72e7-b4d87fe-96ce64' => 'LO-3.6',  # 3.6.0 RC2
 '61d5034-02759b5-145085a-056ecdd-4e8a3e' => 'LO-3.6',  # 3.6.0 RC3
-#'932b512-69e3009-7a10e5c-fc86223-a55908' => 'LO-3.6',  # 3.6.0 RC4
+'932b512-69e3009-7a10e5c-fc86223-a55908' => 'LO-3.6',  # 3.6.0 RC4 / Final
+
+# 3.6.1 versions
+'4db6344-f0536b8-bbcdb32-f398e1b-f43716' => 'LO-3.6',  # 3.6.1.1
+#'e29a214-2bbed72-0621de6-a97528c-8f066d' => 'LO-3.6',  # 3.6.1.2 / Final
+
 );
 
 # Descriptions of the target versions
@@ -176,9 +181,9 @@ $update_map = array(
 #  'update_type' => 'text/html',
 #  'update_src'  => 
'http://www.libreoffice.org/download/pre-releases/'),
 
-'LO-3.6' => array('gitid'   => 
'932b512-69e3009-7a10e5c-fc86223-a55908',
-  'id'  => 'LibreOffice 3.6.0',
-  'version' => '3.6.0',
+'LO-3.6' => array('gitid'   => 
'e29a214-2bbed72-0621de6-a97528c-8f066d',
+  'id'  => 'LibreOffice 3.6.1',
+  'version' => '3.6.1',
   'update_type' => 'text/html',
   'update_src'  => 'http://www.libreoffice.org/download/'),
 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - moz/seamonkey-source-1.1.14.patch oox/source

2012-08-30 Thread Libreoffice Gerrit user 
 moz/seamonkey-source-1.1.14.patch  |   10 +-
 oox/source/drawingml/table/tableproperties.cxx |2 --
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 78d8557aab0046d51d1ee09d11164248dd1d1391
Author: Jung-uk Kim 
Date:   Thu Aug 30 09:31:42 2012 +0200

fdo#54015: At least FreeBSD ld requires -z origin, moz redux

Change-Id: Ide36957d1826f5ac20b14a6919abfc684c33cb9c

diff --git a/moz/seamonkey-source-1.1.14.patch 
b/moz/seamonkey-source-1.1.14.patch
index a23bcaa..1d0db1f 100644
--- a/moz/seamonkey-source-1.1.14.patch
+++ b/moz/seamonkey-source-1.1.14.patch
@@ -5876,7 +5876,15 @@
  #endif
 --- misc/mozilla/security/coreconf/FreeBSD.mk  2006-12-22 14:48:06.0 
+0100
 +++ misc/build/mozilla/security/coreconf/FreeBSD.mk2008-08-14 
16:22:21.0 +0200
-@@ -65,7 +65,7 @@
+@@ -52,6 +52,7 @@
+ 
+ DSO_CFLAGS= -fPIC
+ DSO_LDOPTS= -shared -Wl,-soname -Wl,$(notdir $@)
++DSO_LDOPTS+= -Wl,-z,origin 
-Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+ 
+ #
+ # The default implementation strategy for FreeBSD is pthreads.
+@@ -65,7 +66,7 @@
  
  ARCH  = freebsd
  
commit 18f08e53d8ca0df16485159bd72eaa404368ff38
Author: Stephan Bergmann 
Date:   Thu Aug 30 09:31:10 2012 +0200

-Werror,-Wunused-value (Clang towards 3.2)

Change-Id: I24bf5a91544269e9284c52aedca1fcd8435a8e4a

diff --git a/oox/source/drawingml/table/tableproperties.cxx 
b/oox/source/drawingml/table/tableproperties.cxx
index 29b5db5..e76108b 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -132,8 +132,6 @@ const TableStyle& TableProperties::getUsedTableStyle( const 
::oox::core::XmlFilt
 void TableProperties::pushToPropSet( const ::oox::core::XmlFilterBase& 
rFilterBase,
 const Reference < XPropertySet >& xPropSet, TextListStylePtr 
pMasterTextListStyle )
 {
-TableStyleListPtr( const_cast< ::oox::core::XmlFilterBase& >( rFilterBase 
).getTableStyles() );
-
 uno::Reference< XColumnRowRange > xColumnRowRange(
  xPropSet->getPropertyValue( 
OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ) ), uno::UNO_QUERY_THROW );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: forms/source

2012-08-30 Thread Libreoffice Gerrit user 
 forms/source/runtime/formoperations.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a0b3feafe7c8106d6873d4db4023b1911b846d5a
Author: Lionel Elie Mamane 
Date:   Thu Aug 30 09:29:23 2012 +0200

fix C++ warning declaration shadows member of this

Change-Id: Id14e14222615df33f5da7bab6f73d2752ae41509

diff --git a/forms/source/runtime/formoperations.hxx 
b/forms/source/runtime/formoperations.hxx
index 34f3a6a..9685348 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -301,13 +301,13 @@ namespace frm
 /** calls a (member) function, catches SQLExceptions, extends them 
with additional context information,
 and rethrows them
 
-@param Action
+@param f
 a fuctionoid with no arguments to do the work
 @param _nErrorResourceId
 the id of the resources string to use as error message
 */
 template < typename FunctObj >
-voidimpl_doActionInSQLContext_throw( FunctObj Action, 
sal_uInt16 _nErrorResourceId ) const;
+voidimpl_doActionInSQLContext_throw( FunctObj f, sal_uInt16 
_nErrorResourceId ) const;
 
 // functionoid to call appendOrderByColumn
 class impl_appendOrderByColumn_throw
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: forms/source

2012-08-30 Thread Libreoffice Gerrit user 
 forms/source/runtime/formoperations.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit de8d2c313bc0baea4babf2ab75ac2f92249e57b9
Author: Lionel Elie Mamane 
Date:   Thu Aug 30 09:23:03 2012 +0200

fix C++ warning: declaration shadows member of this

Change-Id: Ib88fecd856c9767cafa0191d3d93b372776d414a

diff --git a/forms/source/runtime/formoperations.cxx 
b/forms/source/runtime/formoperations.cxx
index 97ad91c..ad5e0fd 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -1664,11 +1664,11 @@ namespace frm
 
 
//--
 template < typename FunctObj >
-void FormOperations::impl_doActionInSQLContext_throw( FunctObj Action, 
sal_uInt16 _nErrorResourceId ) const
+void FormOperations::impl_doActionInSQLContext_throw( FunctObj f, 
sal_uInt16 _nErrorResourceId ) const
 {
 try
 {
-Action();
+f();
 }
 catch( const SQLException& e )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-08-30 Thread Libreoffice Gerrit user 
 solenv/gbuild/UnoApiTarget.mk |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit b7afe94667d4acd1979fb0aff32b8b55d617dfbc
Author: Tor Lillqvist 
Date:   Thu Aug 30 10:18:28 2012 +0300

Make verbose make output more informative for cppumaker commands

Put only the presumably not so interesting long list of input files
into the response file, have options (which might be what one wants to
see if using verbose=t) on the command line as such.

Change-Id: Ia73614744f4fba65bc47dc463197941e65eae78f

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 87fd57b..7e44d06 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -56,11 +56,12 @@ define gb_UnoApiPartTarget__command
$(call gb_Output_announce,$(2),$(true),IDL,2)
mkdir -p $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) && \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
+   $(sort $(patsubst $(call 
gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3 && \
+   $(gb_UnoApiPartTarget_IDLCCOMMAND) \
$(INCLUDE) \
-M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir 
$(2 \
-O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose \
-   $(sort $(patsubst $(call 
gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3 && \
-   $(gb_UnoApiPartTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \
+   @$${RESPONSEFILE} > /dev/null && \
rm -f $${RESPONSEFILE} && \
touch $(1)
 
@@ -276,12 +277,14 @@ gb_UnoApiHeadersTarget_CPPUMAKERTARGET := $(call 
gb_Executable_get_target_for_bu
 gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) 
SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
 
 define gb_UnoApiHeadersTarget__command
-RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
-   -Gc $(4) -BUCR \
-   -O$(3) $(call gb_UnoApiTarget_get_target,$(2)) $(UNOAPI_DEPS)) && \
-$(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \
-rm -f $${RESPONSEFILE} && \
-touch $(1)
+   RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
+   $(UNOAPI_DEPS)) && \
+   $(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) \
+   -Gc $(4) -BUCR \
+   -O$(3) $(call gb_UnoApiTarget_get_target,$(2)) \
+   @$${RESPONSEFILE} && \
+   rm -f $${RESPONSEFILE} && \
+   touch $(1)
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-08-30 Thread Libreoffice Gerrit user 
 sw/qa/extras/ooxmlimport/data/n777337.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   20 ++--
 writerfilter/source/dmapper/PropertyMap.cxx |4 
 3 files changed, 22 insertions(+), 2 deletions(-)

New commits:
commit dd11bca8ab191ce10054a5f2de7010ca400eb0b5
Author: Miklos Vajna 
Date:   Thu Aug 30 09:11:58 2012 +0100

n#777337 testcase

Also remove the #if 0 I forgot to remove previously.

Change-Id: I2cc5e1407c509414c8395d0fd63ab3b379bef04f

diff --git a/sw/qa/extras/ooxmlimport/data/n777337.docx 
b/sw/qa/extras/ooxmlimport/data/n777337.docx
new file mode 100644
index 000..8bb377d
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n777337.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 00e36b8..ec61993 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -88,10 +88,10 @@ public:
 void testN775906();
 void testN775899();
 void testN777345();
+void testN777337();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
-#if 0
 CPPUNIT_TEST(testN751054);
 CPPUNIT_TEST(testN751117);
 CPPUNIT_TEST(testN751017);
@@ -118,8 +118,8 @@ public:
 CPPUNIT_TEST(testAllGapsWord);
 CPPUNIT_TEST(testN775906);
 CPPUNIT_TEST(testN775899);
-#endif
 CPPUNIT_TEST(testN777345);
+CPPUNIT_TEST(testN777337);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -785,6 +785,22 @@ void Test::testN777345()
 CPPUNIT_ASSERT_EQUAL(sal_uLong(2404338915U), aGraphic.GetChecksum());
 }
 
+void Test::testN777337()
+{
+/*
+ * The problem was that the top and bottom margin on the first page was 
only 0.1cm instead of 1.7cm.
+ *
+ * oFirst = ThisComponent.StyleFamilies.PageStyles.getByName("First Page")
+ * xray oFirst.TopMargin
+ * xray oFirst.BottomMargin
+ */
+load("n777337.docx");
+
+uno::Reference 
xPropertySet(getStyles("PageStyles")->getByName("First Page"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1702), getProperty(xPropertySet, 
"TopMargin"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1702), getProperty(xPropertySet, 
"BottomMargin"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit a474559ff1e560b83952f00595dbd8ae7fde88b6
Author: Miklos Vajna 
Date:   Thu Aug 30 09:11:17 2012 +0100

n#777337 fix DOCX import of title page top/bottom margin with 
headers/footers

SectionPropertyMap::PrepareHeaderFooterProperties() already backed up
m_nTopMargin to have the same result when that method is called multiple
times. Do the same for the header footer height values as well to match
the WW8 behaviour.

Change-Id: Ib2347abc3db39308900c7721c0e15de040d9a01f

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 70bb53b..aceba89 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -712,6 +712,7 @@ void SectionPropertyMap::CopyLastHeaderFooter( bool 
bFirstPage, DomainMapper_Imp
 void SectionPropertyMap::PrepareHeaderFooterProperties( bool bFirstPage )
 {
 sal_Int32 nTopMargin = m_nTopMargin;
+sal_Int32 nHeaderTop = m_nHeaderTop;
 if(HasHeader(bFirstPage))
 {
 m_nTopMargin = m_nHeaderTop;
@@ -745,6 +746,7 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( 
bool bFirstPage )
 }
 
 sal_Int32 nBottomMargin = m_nBottomMargin;
+sal_Int32 nHeaderBottom = m_nHeaderBottom;
 if( HasFooter( bFirstPage ) )
 {
 m_nBottomMargin = m_nHeaderBottom;
@@ -779,6 +781,8 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( 
bool bFirstPage )
 
 // Restore original top margin, so we don't end up with a smaller margin 
in case we have to produce two page styles from one Word section.
 m_nTopMargin = nTopMargin;
+m_nHeaderTop = nHeaderTop;
+m_nHeaderBottom = nHeaderBottom;
 }
 
 uno::Reference lcl_GetRangeProperties(bool 
bIsFirstSection, DomainMapper_Impl& rDM_Impl, uno::Reference 
xStartingRange)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits