date:20120618

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

vitriol  changed:

   What|Removed |Added

 Depends on||47355

--- Comment #332 from vitriol  2012-06-18 
22:45:52 PDT ---
I nominate again Bug 47355. There are daily duplicated reports for this nasty
regression bug.

-- 
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

Re: [GERRIT] gbuild migration: pyuno module

2012-06-18 Thread David Tardon

Hi,

On Fri, Jun 08, 2012 at 09:22:12AM +0200, David Ostrovsky wrote:
> Hi,
> 
> with the last change set https://gerrit.libreoffice.org/#/c/179/
> clean build on linux x86_64 with --enable-python=internal is working.
> 
> Two questions:
> The thing is
> on unix:
> python.sh is get copied to bin/pyuno/python in Package_python_shell.mk
> 
> on wnt:
> native python executable wrapper is built in
> pyuno/Executable_python.mk now and is delivered by default to
> bin/python.exe.
> But then we have a collision with native python executable artifact
> which get build in python module.
> How can i force on gbuild land (RepositoryFixes.mk doesn't handle
> executables, only libs so far)

Sorry I am late here... This is actually very easy--all you need to do
is to name the executable pyuno/python instead of just python :-)
IOW

$(eval $(call gb_Executable_Executable,python))

becomes

$(eval $(call gb_Executable_Executable,pyuno/python))

etc.

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

[Libreoffice-commits] .: Branch 'feature/template-dialog' - sfx2/inc sfx2/source

 sfx2/inc/sfx2/templatefolderview.hxx   |5 +
 sfx2/inc/templatedlg.hxx   |2 ++
 sfx2/source/control/templatefolderview.cxx |   17 ++---
 sfx2/source/doc/templatedlg.cxx|6 ++
 4 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 114dde47903b7c174eca934690c1372d4be52330
Author: Rafael Dominguez 
Date:   Mon Jun 18 23:40:59 2012 -0430

Close overlay when clicking outside.

Change-Id: Iee39a99e89881aeaeaca93adfcfce9b51eeaec78

diff --git a/sfx2/inc/sfx2/templatefolderview.hxx 
b/sfx2/inc/sfx2/templatefolderview.hxx
index a6aec17..b5b967f 100644
--- a/sfx2/inc/sfx2/templatefolderview.hxx
+++ b/sfx2/inc/sfx2/templatefolderview.hxx
@@ -25,6 +25,11 @@ public:
 // Fill view with template folders thumbnails
 void Populate ();
 
+// Check if the overlay is visible or not.
+bool isOverlayVisible () const;
+
+void showOverlay (bool bVisible);
+
 private:
 
 virtual void OnItemDblClicked (ThumbnailViewItem *pRegionItem);
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index bb13fe0..ee98e2e 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -31,6 +31,8 @@ public:
 
 private:
 
+virtual void MouseButtonDown( const MouseEvent& rMEvt );
+
 DECL_LINK(OnClickSelectionMode, ImageButton*);
 
 private:
diff --git a/sfx2/source/control/templatefolderview.cxx 
b/sfx2/source/control/templatefolderview.cxx
index 8106cb3..c2165f5 100644
--- a/sfx2/source/control/templatefolderview.cxx
+++ b/sfx2/source/control/templatefolderview.cxx
@@ -189,11 +189,22 @@ void TemplateFolderView::Populate ()
 Invalidate();
 }
 
-void TemplateFolderView::OnItemDblClicked (ThumbnailViewItem *pRegionItem)
+bool TemplateFolderView::isOverlayVisible () const
+{
+return mpItemView->IsVisible();
+}
+
+void TemplateFolderView::showOverlay (bool bVisible)
 {
-// Clear previous items
-mpItemView->Clear();
+mpItemView->Show(bVisible);
 
+// Clear items is the overlay is closed.
+if (!bVisible)
+mpItemView->Clear();
+}
+
+void TemplateFolderView::OnItemDblClicked (ThumbnailViewItem *pRegionItem)
+{
 // Fill templates
 sal_uInt16 nRegionId = pRegionItem->mnId-1;
 const SfxDocumentTemplates* pTemplates = mpMgr->GetTemplates();
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index a7d5c32..6fab400 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -69,6 +69,12 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg,ViewDrawsHdl)
 return 0;
 }
 
+void SfxTemplateManagerDlg::MouseButtonDown( const MouseEvent& rMEvt )
+{
+if (!maView->GetActiveClipRegion().IsInside(rMEvt.GetPosPixel()) && 
maView->isOverlayVisible())
+maView->showOverlay(false);
+}
+
 IMPL_LINK (SfxTemplateManagerDlg, OnClickSelectionMode, ImageButton*, pButton)
 {
 maView->setSelectionMode(pButton->GetState() == STATE_CHECK);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/template-dialog' - 6 commits - sfx2/inc sfx2/Library_sfx.mk sfx2/Package_inc.mk sfx2/source

 sfx2/Library_sfx.mk|1 
 sfx2/Package_inc.mk|1 
 sfx2/inc/sfx2/templatefolderview.hxx   |   40 +++
 sfx2/inc/sfx2/thumbnailview.hxx|   21 +
 sfx2/inc/sfx2/thumbnailviewitem.hxx|   23 ++
 sfx2/inc/templatedlg.hxx   |4 
 sfx2/source/control/templatefolderview.cxx |  213 +++
 sfx2/source/control/thumbnailview.cxx  |  310 +
 sfx2/source/control/thumbnailviewitem.cxx  |   97 -
 sfx2/source/doc/templatedlg.cxx|4 
 10 files changed, 406 insertions(+), 308 deletions(-)

New commits:
commit 0f53d3bfb93537f20d9734fe7c84a88e8a82092b
Author: Rafael Dominguez 
Date:   Mon Jun 18 22:57:35 2012 -0430

Display templates when double clicking a folder.

Change-Id: Idf9be4b2f5fbff60b881e72fe52ac13767f32459

diff --git a/sfx2/inc/sfx2/templatefolderview.hxx 
b/sfx2/inc/sfx2/templatefolderview.hxx
index ad56fcc..a6aec17 100644
--- a/sfx2/inc/sfx2/templatefolderview.hxx
+++ b/sfx2/inc/sfx2/templatefolderview.hxx
@@ -27,7 +27,12 @@ public:
 
 private:
 
+virtual void OnItemDblClicked (ThumbnailViewItem *pRegionItem);
+
+private:
+
 SfxOrganizeMgr *mpMgr;
+ThumbnailView *mpItemView;
 };
 
 #endif // TEMPLATEFOLDERVIEW_HXX
diff --git a/sfx2/source/control/templatefolderview.cxx 
b/sfx2/source/control/templatefolderview.cxx
index 2f224e2..8106cb3 100644
--- a/sfx2/source/control/templatefolderview.cxx
+++ b/sfx2/source/control/templatefolderview.cxx
@@ -139,13 +139,20 @@ BitmapEx lcl_fetchThumbnail (const rtl::OUString &msURL, 
int width, int height)
 
 TemplateFolderView::TemplateFolderView ( Window* pParent, const ResId& rResId, 
bool bDisableTransientChildren)
 : ThumbnailView(pParent,rResId,bDisableTransientChildren),
-  mpMgr(new SfxOrganizeMgr(NULL,NULL))
+  mpMgr(new SfxOrganizeMgr(NULL,NULL)),
+  mpItemView(new ThumbnailView(this,WB_VSCROLL))
 {
+mpItemView->SetColor(Color(COL_WHITE));
+mpItemView->SetPosPixel(Point(0,0));
+mpItemView->SetSizePixel(GetOutputSizePixel());
+mpItemView->SetColCount(3);
+mpItemView->SetLineCount(2);
 }
 
 TemplateFolderView::~TemplateFolderView()
 {
 delete mpMgr;
+delete mpItemView;
 }
 
 void TemplateFolderView::Populate ()
@@ -182,6 +189,25 @@ void TemplateFolderView::Populate ()
 Invalidate();
 }
 
+void TemplateFolderView::OnItemDblClicked (ThumbnailViewItem *pRegionItem)
+{
+// Clear previous items
+mpItemView->Clear();
+
+// Fill templates
+sal_uInt16 nRegionId = pRegionItem->mnId-1;
+const SfxDocumentTemplates* pTemplates = mpMgr->GetTemplates();
+
+sal_uInt16 nEntries = pTemplates->GetCount(nRegionId);
+for (sal_uInt16 i = 0; i < nEntries; ++i)
+{
+
mpItemView->InsertItem(i+1,lcl_fetchThumbnail(pTemplates->GetPath(nRegionId,i),128,128),
+   pTemplates->GetName(nRegionId,i));
+}
+
+mpItemView->Show();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 
 
commit 927f4ecd40ea6652709551690be9d2f583a6d1d9
Author: Rafael Dominguez 
Date:   Mon Jun 18 22:04:59 2012 -0430

Add a double click handler to ThumbnailView.

Change-Id: I8c5711c89fe2d2cede55399028f8a3910a7bcbec

diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index f54a549..a1db106 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -266,6 +266,8 @@ protected:
 
 virtual void DrawItem (ThumbnailViewItem *pItem);
 
+virtual void OnItemDblClicked (ThumbnailViewItem *pItem);
+
 protected:
 
 friend class ThumbnailViewAcc;
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 9ea0edd..e9d3e27 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -203,6 +203,10 @@ void ThumbnailView::DrawItem (ThumbnailViewItem *pItem)
 pItem->Paint(mpProcessor,mpItemAttrs);
 }
 
+void ThumbnailView::OnItemDblClicked (ThumbnailViewItem*)
+{
+}
+
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible 
> ThumbnailView::CreateAccessible()
 {
 return new ThumbnailViewAcc( this, mbIsTransientChildrenDisabled );
@@ -674,7 +678,7 @@ void ThumbnailView::MouseButtonDown( const MouseEvent& 
rMEvt )
 }
 }
 else if ( rMEvt.GetClicks() == 2 )
-;
+OnItemDblClicked(pItem);
 }
 
 return;
commit 0a89ff70b440158e301dff5b5c6eb612f1c2a676
Author: Rafael Dominguez 
Date:   Mon Jun 18 21:53:07 2012 -0430

Create a thumbnailview for templates folders.

Change-Id: I2c5e2899e854df0edb3ee7bade55f39c8984177d

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 9009ede..9fbcee3 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -148,6 +148,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 s

[Libreoffice-commits] .: Branch 'feature/template-dialog' - 4 commits - icon-themes/galaxy sfx2/inc sfx2/source

 icon-themes/galaxy/sfx2/res/select.png|binary
 sfx2/inc/sfx2/thumbnailviewitem.hxx   |6 ++
 sfx2/source/control/thumbnailview.cxx |   70 +-
 sfx2/source/control/thumbnailviewitem.cxx |   17 +++
 sfx2/source/doc/templatedlg.src   |2 
 5 files changed, 84 insertions(+), 11 deletions(-)

New commits:
commit e10392bb8c09c3a8e9b99f37d85f0814af372242
Author: Rafael Dominguez 
Date:   Mon Jun 18 18:51:52 2012 -0430

Set selection mode button image.

Change-Id: I3fb2592d61622a0d3f07d70cfc26c10f4f2ef2fe

diff --git a/icon-themes/galaxy/sfx2/res/select.png 
b/icon-themes/galaxy/sfx2/res/select.png
new file mode 100644
index 000..9c7dba0
Binary files /dev/null and b/icon-themes/galaxy/sfx2/res/select.png differ
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index fa23895..6771611 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -70,7 +70,7 @@ ModalDialog DLG_TEMPLATE_MANAGER
 
 ButtonImage = Image
 {
-ImageBitmap = Bitmap { File = "signet.png" ; };
+ImageBitmap = Bitmap { File = "select.png" ; };
 };
 };
 
commit ecf97d7f60dc8dc0b3ce51300023bdee3e0e1e49
Author: Rafael Dominguez 
Date:   Mon Jun 18 18:11:06 2012 -0430

Paint item children control when painting an item.

Change-Id: I7978e4c346d1a72b462d9916b7cdafc718a42bdc

diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx 
b/sfx2/inc/sfx2/thumbnailviewitem.hxx
index f8c6c0f..7cc6252 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx
@@ -89,6 +89,8 @@ struct ThumbnailViewItem
 
 bool isInsideTitle (const Point &pt) const;
 
+void Paint (const Rectangle &aRect);
+
 private:
 
 DECL_LINK (OnClick, CheckBox *);
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 64b19ed..c8a2959 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -406,6 +406,8 @@ void ThumbnailView::DrawItem (ThumbnailViewItem *pItem)
 *this, aNewViewInfos );
 
 pProcessor->process(aSeq);
+
+pItem->Paint(aRect);
 }
 }
 
diff --git a/sfx2/source/control/thumbnailviewitem.cxx 
b/sfx2/source/control/thumbnailviewitem.cxx
index 873fb19..f86bfd0 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -149,6 +149,11 @@ bool ThumbnailViewItem::isInsideTitle (const Point &pt) 
const
 return aRect.IsInside(pt);
 }
 
+void ThumbnailViewItem::Paint (const Rectangle &aRect)
+{
+mpSelectBox->Paint(aRect);
+}
+
 IMPL_LINK (ThumbnailViewItem, OnClick, CheckBox*, )
 {
 mbSelected = mpSelectBox->GetState() == STATE_CHECK;
commit 9dea0121b8f9c56ec172847ffa14fd353eda7faf
Author: Rafael Dominguez 
Date:   Mon Jun 18 17:38:52 2012 -0430

Control item visibility through the object instead of doing it directly.

Change-Id: Ib70adb45d9ba5e1294abbe6b33b31be50cf554db

diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx 
b/sfx2/inc/sfx2/thumbnailviewitem.hxx
index 730c4aa..f8c6c0f 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx
@@ -56,6 +56,10 @@ struct ThumbnailViewItem
 
 ~ThumbnailViewItem ();
 
+bool isVisible () const { return mbVisible; }
+
+void show (bool bVisible);
+
 bool isSelected () const { return mbSelected; }
 
 void setSelection (bool state);
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 3e056a1..64b19ed 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -256,7 +256,7 @@ void ThumbnailView::ImplDeleteItems()
 for ( size_t i = 0; i < n; ++i )
 {
 ThumbnailViewItem *const pItem = mItemList[i];
-if ( pItem->mbVisible && ImplHasAccessibleListeners() )
+if ( pItem->isVisible() && ImplHasAccessibleListeners() )
 {
 ::com::sun::star::uno::Any aOldAny, aNewAny;
 
@@ -516,7 +516,7 @@ void ThumbnailView::CalculateItemPositions ()
 
 for ( size_t i = 0; i < nItemCount; i++ )
 {
-mItemList[i]->mbVisible = false;
+mItemList[i]->show(false);
 }
 
 if ( mpScrBar )
@@ -575,7 +575,7 @@ void ThumbnailView::CalculateItemPositions ()
 
 if ( (i >= nFirstItem) && (i < nLastItem) )
 {
-if( !pItem->mbVisible && ImplHasAccessibleListeners() )
+if( !pItem->isVisible() && ImplHasAccessibleListeners() )
 {
 ::com::sun::star::uno::Any aOldAny, aNewAny;
 
@@ -583,7 +583,7 @@ void ThumbnailView::CalculateItemPositions ()
 ImplFireAccessibleEvent( 
::com::sun::star::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny );
 }
 
-pItem->mbVisible = true;
+pItem->s

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

2012-06-18 Thread René Engelhard

 connectivity/source/drivers/evoab2/EApi.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6ee6515c0e408b87f2aca5937a6e9b7b41d8fd77
Author: Rene Engelhard 
Date:   Mon Jun 18 23:19:09 2012 +0200

evoab2: add libebook-1.2.so.13 (evolution 3.4)

Change-Id: I03d9c2416de66d694948b9fe560f83317d6b03ef

diff --git a/connectivity/source/drivers/evoab2/EApi.cxx 
b/connectivity/source/drivers/evoab2/EApi.cxx
index 38908f7..84701e1 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -22,6 +22,7 @@
 #define  DECLARE_FN_POINTERS 1
 #include "EApi.h"
 static const char *eBookLibNames[] = {
+"libebook-1.2.so.13", // bumped again (evolution-3.4)
 "libebook-1.2.so.12", // bumped again
 "libebook-1.2.so.10", // bumped again
 "libebook-1.2.so.9",  // evolution-2.8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source

2012-06-18 Thread René Engelhard

 connectivity/source/drivers/evoab2/EApi.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d25453e200f6af427363bc27278da540b56f6855
Author: Rene Engelhard 
Date:   Mon Jun 18 23:19:09 2012 +0200

evoab2: add libebook-1.2.so.13 (evolution 3.4)

Change-Id: I03d9c2416de66d694948b9fe560f83317d6b03ef

diff --git a/connectivity/source/drivers/evoab2/EApi.cxx 
b/connectivity/source/drivers/evoab2/EApi.cxx
index 38908f7..84701e1 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -22,6 +22,7 @@
 #define  DECLARE_FN_POINTERS 1
 #include "EApi.h"
 static const char *eBookLibNames[] = {
+"libebook-1.2.so.13", // bumped again (evolution-3.4)
 "libebook-1.2.so.12", // bumped again
 "libebook-1.2.so.10", // bumped again
 "libebook-1.2.so.9",  // evolution-2.8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] fdo#32181: don't exceed margins on pdfexport

On Fri, 2012-06-15 at 16:24 +0400, Ivan Timofeev wrote:

FWIW, I'm sure you know that #i16816# maps to (thesedays)
https://issues.apache.org/ooo/show_bug.cgi?id=16816 so that's the bug
apparently being addressed by the original commit. Though there's no
immediate explanation there for that specific hunk.

> so on pdfexport we are taking next portion if it is a hole portion 
> regardless of its position. What is this: "a hole portion"?

I haven't a clue, but I see that SwTxtPortion::FormatEOL is one of two
places that makes one, which makes me wonder if
https://bugs.freedesktop.org/show_bug.cgi?id=43737 is related.

> I am thinking: maybe the proper fix is to negate that condition:
> 
>!pNext->IsHolePortion()
> 
> (it solves the problem as well)

Apparently a HolePortion is a basically a chunk of blank space required
to exist in some edge-cases. My guess is that the logic isn't reversed
in the original and if the choices are between fixing fdo#32181 and
retaining the fix for some obscure palmos pdf problem of #i16816# that
your first patch is the better choice. Just a guess.

Lack of visual layout regression tests is hurting us here :-( Custom
testing font + save to pdf + ye-old-imagemagick-subtract-images-trick is
probable way to go on that front for long term.

C.

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

[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf' - 2 commits - sc/source

2012-06-18 Thread Daniel Bankston

 sc/source/filter/xml/XMLDetectiveContext.cxx |2 
 sc/source/filter/xml/xmlcelli.cxx|8 
 sc/source/filter/xml/xmlcoli.cxx |1 
 sc/source/filter/xml/xmlsubti.cxx|  265 ++-
 sc/source/filter/xml/xmlsubti.hxx|   61 --
 5 files changed, 40 insertions(+), 297 deletions(-)

New commits:
commit 74dd823ebdc6910529f5b916780ace49121c04ea
Author: Daniel Bankston 
Date:   Mon Jun 18 16:04:36 2012 -0500

Use better variable and method names for ScMyTables current cell position

Change-Id: Icdefd17751b61e9c27e3ab4468691bba08e245c0

diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx 
b/sc/source/filter/xml/XMLDetectiveContext.cxx
index e669dae..fbe2143 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.cxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.cxx
@@ -241,7 +241,7 @@ 
ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext(
 break;
 }
 }
-aDetectiveOp.aPosition =  rImport.GetTables().GetRealScCellPos();
+aDetectiveOp.aPosition =  rImport.GetTables().GetCurrentCellPos();
 }
 
 ScXMLDetectiveOperationContext::~ScXMLDetectiveOperationContext()
diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 56aafc7..841c85c 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -304,7 +304,7 @@ bool cellExists( const ScAddress& rCellPos )
 
 void ScXMLTableRowCellContext::SetCursorOnTextImport(const rtl::OUString& 
rOUTempText)
 {
-ScAddress aCellPos = rXMLImport.GetTables().GetRealScCellPos();
+ScAddress aCellPos = rXMLImport.GetTables().GetCurrentCellPos();
 if (cellExists(aCellPos))
 {
 sal_Int32 nCol = static_cast( aCellPos.Col() );
@@ -354,7 +354,7 @@ SvXMLImportContext 
*ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPr
 bIsEmpty = false;
 bTextP = true;
 
-ScAddress aCellPos = rXMLImport.GetTables().GetRealScCellPos();
+ScAddress aCellPos = rXMLImport.GetTables().GetCurrentCellPos();
 
 if( ((nCellType == util::NumberFormat::TEXT) || 
bFormulaTextResult) &&
 !rXMLImport.GetTables().IsPartOfMatrix(aCellPos.Col(), 
aCellPos.Row()) )
@@ -432,7 +432,7 @@ SvXMLImportContext 
*ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPr
 
 if (!pContext && !bTextP)
 {
-ScAddress aCellPos = rXMLImport.GetTables().GetRealScCellPos();
+ScAddress aCellPos = rXMLImport.GetTables().GetCurrentCellPos();
 uno::Reference xShapes 
(rXMLImport.GetTables().GetCurrentXShapes());
 if (xShapes.is())
 {
@@ -1103,7 +1103,7 @@ void ScXMLTableRowCellContext::EndElement()
 }
 }
 
-ScAddress aCellPos = rXMLImport.GetTables().GetRealScCellPos();
+ScAddress aCellPos = rXMLImport.GetTables().GetCurrentCellPos();
 if( aCellPos.Col() > 0 && nRepeatedRows > 1 )
 aCellPos.SetRow( aCellPos.Row() - (nRepeatedRows - 1) );
 if( bIsMerged )
diff --git a/sc/source/filter/xml/xmlsubti.cxx 
b/sc/source/filter/xml/xmlsubti.cxx
index 820c58e..8db9eb1 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -74,7 +74,7 @@ ScXMLTabProtectionData::ScXMLTabProtectionData() :
 ScMyTables::ScMyTables(ScXMLImport& rTempImport)
 : rImport(rTempImport),
 aFixupOLEs(rTempImport),
-maCellPos(ScAddress::INITIALIZE_INVALID),
+maCurrentCellPos(ScAddress::INITIALIZE_INVALID),
 nCurrentColStylePos(0),
 nCurrentDrawPage( -1 ),
 nCurrentXShapes( -1 )
@@ -116,22 +116,22 @@ void ScMyTables::NewSheet(const rtl::OUString& 
sTableName, const rtl::OUString&
 nCurrentColStylePos = 0;
 sCurrentSheetName = sTableName;
 //reset cols and rows for new sheet, but increment tab
-maCellPos.SetCol(-1);
-maCellPos.SetRow(-1);
-maCellPos.SetTab(maCellPos.Tab() + 1);
+maCurrentCellPos.SetCol(-1);
+maCurrentCellPos.SetRow(-1);
+maCurrentCellPos.SetTab(maCurrentCellPos.Tab() + 1);
 
 maProtectionData = rProtectData;
 ScDocument *pDoc = ScXMLConverter::GetScDocument(rImport.GetModel());
 
 // The document contains one sheet when created. So for the first
 // sheet, we only need to set its name.
-if (maCellPos.Tab() > 0)
+if (maCurrentCellPos.Tab() > 0)
 pDoc->AppendTabOnLoad(sTableName);
 else
-pDoc->SetTabNameOnLoad(maCellPos.Tab(), sTableName);
+pDoc->SetTabNameOnLoad(maCurrentCellPos.Tab(), sTableName);
 
 rImport.SetTableStyle(sStyleName);
-xCurrentSheet = getCurrentSheet(rImport.GetModel(), maCellPos.Tab());
+xCurrentSheet = getCurrentSheet(rImport.GetModel(), 
maCurrentCellPos.Tab());
 if (xCurrentSheet.is())
 {
 // We need to set the current cell range here regardless of
@@ -172,7 +172,7 @@ void ScMyTables::SetTable

Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #4

2012-06-18 Thread Thorsten Behrens

Marco Cecchetti wrote:
> >Slightly tangential - how about filing a few easy hacks for adding
> >more shape and slide animations? It's mostly busy work, and a nice
> >rewarding experience for new hackers - here's how:
> >
> >  http://wiki.documentfoundation.org/Development/Easy_Hacks
> 
> Ok, I appended it to my to do list.
> Is there some animation you're especially interested in ?
> 
Nope - maybe best to have something of two meta-easy-hack bugs, that just
links to
 
 http://cgit.freedesktop.org/libreoffice/core/tree/sd/xml/effects.xml

and 

 http://cgit.freedesktop.org/libreoffice/core/tree/sd/xml/transitions.xml

such that people can pick their favourite?

> >With the pending changes, would you want to create a new
> >features/svg-export2 branch & stick them in there for me & others to
> >play?
> 
> Just to be sure I got it correctly:
> do you mean a new branch separated from the feature/svg-export
> branch where I push my contributions weekly ?
> 
Yeah - since you merged feature/svg-export already, committing and
merging that again (I think) gives a somewhat nasty non-linear git
history - best practice it seems is to create a new branch from
current master HEAD, and cherry-pick your outstanding
feature/svg-export commits into that.

Cheers,

-- Thorsten


pgpc5NLSOFW6J.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] - avoid some memset

2012-06-18 Thread Marion & Christophe JAILLET


Hi,

in a previous commit, the only memset in the file has been removed, so 
it should be safe to remove this include.
See 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=441b28d4e9d0345f91fed6a2345d4d6a7c7eb5f7


Best regards,
Christophe JAILLET
>From fa3bb68bfa88ba2bbe12611eb67936038780f2d0 Mon Sep 17 00:00:00 2001
From: Christophe Christophe Marion 
Date: Mon, 18 Jun 2012 22:48:25 +0200
Subject: [PATCH] Remove a useless include

---
 .../source/breakiterator/breakiterator_ctl.cxx |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx 
b/i18npool/source/breakiterator/breakiterator_ctl.cxx
index 5d1d7a1..3cf177c 100644
--- a/i18npool/source/breakiterator/breakiterator_ctl.cxx
+++ b/i18npool/source/breakiterator/breakiterator_ctl.cxx
@@ -30,8 +30,6 @@
 #include 
 #include 
 
-#include  // for memset
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::rtl;
-- 
1.7.9

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source officecfg/registry sfx2/source svtools/inc svtools/source

 cui/source/options/optgdlg.cxx |   18 +-
 cui/source/options/optgdlg.hrc |3 +
 cui/source/options/optgdlg.hxx |1 
 cui/source/options/optgdlg.src |6 ++
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   10 +++
 sfx2/source/view/viewfrm.cxx   |4 -
 svtools/inc/svtools/miscopt.hxx|3 +
 svtools/source/config/miscopt.cxx  |   34 -
 8 files changed, 72 insertions(+), 7 deletions(-)

New commits:
commit 3c904d64f4e160d2feade4b05c5115d2db8f37f6
Author: Cor Nouws 
Date:   Sun Jun 10 23:00:36 2012 +0200

Give Macro recorder separate option, apart from Experimental features

Change-Id: I9dbf5d510ebaff8448a152d75a006a183303bd81
(cherry picked from commit 5ae11320a26a6356dfadeb812e0d6baf5bdc951c)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 762ec3d..b8cc40f 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -215,7 +215,8 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const 
SfxItemSet& rSet ) :
 aInterpretFT( this, CUI_RES( FT_INTERPRET ) ),
 aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ),
 aToYearFT   ( this, CUI_RES( FT_TOYEAR ) ),
-aExperimentalCB ( this, CUI_RES( CB_EXPERIMENTAL ) )
+aExperimentalCB ( this, CUI_RES( CB_EXPERIMENTAL ) ),
+aMacroRecorderCB( this, CUI_RES( CB_MACRORECORDER ) )
 {
 FreeResource();
 
@@ -250,7 +251,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const 
SfxItemSet& rSet ) :
 Window* pWins[] =
 {
 &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, 
&aSaveAlwaysCB,
-&aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, 
&aExperimentalCB
+&aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, 
&aExperimentalCB, &aMacroRecorderCB
 };
 Window** pCurrent = pWins;
 const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
@@ -271,7 +272,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const 
SfxItemSet& rSet ) :
 Window* pWins[] =
 {
 &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, 
&aSaveAlwaysCB,
-&aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, 
&aExperimentalCB
+&aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, 
&aExperimentalCB, &aMacroRecorderCB
 };
 Window** pCurrent = pWins;
 const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
@@ -297,7 +298,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const 
SfxItemSet& rSet ) :
 Window* pWins[] =
 {
 &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, &aTwoFigureFL,
-&aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB
+&aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB, 
&aMacroRecorderCB
 };
 Window** pCurrent = pWins;
 const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
@@ -441,6 +442,13 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
 bModified = sal_True;
 }
 
+if ( aMacroRecorderCB.IsChecked() != aMacroRecorderCB.GetSavedValue() )
+{
+SvtMiscOptions aMiscOpt;
+aMiscOpt.SetMacroRecorderMode( aMacroRecorderCB.IsChecked() );
+bModified = sal_True;
+}
+
 const SfxUInt16Item* pUInt16Item =
 PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) );
 sal_uInt16 nNum = (sal_uInt16)aYearValueField.GetText().ToInt32();
@@ -486,6 +494,8 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
 aSaveAlwaysCB.SaveValue();
 aExperimentalCB.Check( aMiscOpt.IsExperimentalMode() );
 aExperimentalCB.SaveValue();
+aMacroRecorderCB.Check( aMiscOpt.IsMacroRecorderMode() );
+aMacroRecorderCB.SaveValue();
 
 aODMADlgCB.Check( aMiscOpt.TryODMADialog() );
 aODMADlgCB.SaveValue();
diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index d870e29..2ccc503 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -65,6 +65,7 @@
 #define ROW12   (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
 #define ROW13   (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
 #define ROW14   (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE+6)
+#define ROW15   (ROW14+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
 
 #define DIFF(v1,v2) (v2-v1)
 #define OFFS_TEXTBOX_FIXEDTEXT(base)
(base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
@@ -112,6 +113,8 @@
 #define LB_HELPFORMAT   16
 #define FT_EXPERIMENTAL 17
 #define CB_EXPERIMENTAL 18
+#define FT_MACRORECORDER19
+#define CB_MACRORECORDER20
 
 //#define

Re: [PATCH][PUSHED 3-6] Give Macro recorder separate option, apart from Experimental features

On Mon, 2012-06-18 at 07:53 +0200, Cor Nouws wrote:
> Hi Michael, all,
> 
> Michael Meeks wrote (15-06-12 19:17)
> 
> > On Sun, 2012-06-10 at 23:07 +0200, Cor Nouws wrote:
> >> See fdo#41865
> >
> > Incidentally - if you want to get this into 3.6 as a late feature you
> > need to be drumming up support for another 2x reviews quickly ;-) - we
> > want to get that lot in by Monday.
> 
> Ah, if possible, that would be nice.
> I see a + 1 from Olivier already, so if one other developer has a little 
> time to look at the patch, that would be great.

Pushed to 3-6 now

C.

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

Re: Locating Text Rotation Code

On Mon, 2012-06-18 at 12:47 -0700, Joel Madero wrote:
> I haven't found the code that actually tells writer what to do with
> the rotation. Any help greatly appreciated, once I find the code I can
> handle the bug.

The SwFont::SetVertical and SwFont::GetOrientation stuff in
sw/source/core/txtnode/swfont.cxx might be helpful. Or maybe run around
to the other side where the text actually gets drawn to screen in
vcl/unx/generic/gdi/salgdi3.cxx and put breakpoints on the two
cairo_matrix_rotate calls and examine the backtrace then to see where it
all comes from.

C.

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

Re: [PATCH] [REVIEW 3-5-5 (1/3)][PUSHED 3-5] fdo#43967 legacy report wizard improperly formats dates

On Mon, 2012-06-18 at 16:54 +0200, Lionel Elie Mamane wrote:
> Legacy reports (not Sun/Oracle Report Builder ones) wizard show date
> columns as an integer days-since-epoch instead of e.g. nicely
> formatted "DD-MM-YY" (day-month-year) in *newly* *created* reports.
> 
> Commit message is explanatory; shout if you have other question.
> 
> Please apply to libreoffice-3-5 and libreoffice-3-5-5 branch.

Pushed to 3-5 as 7d0fbe9070ea01f3b650776edcb9ecfee7921bf4, 2 more
reviews required for 3-5-5.

C.

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

[Libreoffice-commits] .: 2 commits - toolkit/prj toolkit/source touch/prj

 toolkit/prj/build.lst  |2 +-
 toolkit/source/awt/vclxtoolkit.cxx |5 +
 touch/prj/build.lst|2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit ed880251bd250b5eeaa28501cbcf05cb13f69ac2
Author: Tor Lillqvist 
Date:   Mon Jun 18 23:04:48 2012 +0300

WaE: unused parameters

Change-Id: I8dc4dadd3e26578500b555cdf850c3fb95bc1401

diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index e027b23..b3b6828 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -585,7 +585,12 @@ void SAL_CALL VCLXToolkit::disposing()
 ByteBufferWrapper *bbw = (ByteBufferWrapper *) (intptr_t) 
addressOfMemoryBufferForSharedArrayWrapper;
 pV->SetOutputSizePixelScaleOffsetAndBuffer( Size( Width, Height ), 
Fraction(ScaleNumerator, ScaleDenominator), Point( XOffset, YOffset), 
basebmp::RawMemorySharedArray( bbw->pointer(), *bbw ));
 #else
+(void) ScaleNumerator;
+(void) ScaleDenominator;
+(void) XOffset;
+(void) YOffset;
 OSL_FAIL( "rendering to a pre-allocated buffer not done yet for this 
OS" );
+pV->SetOutputSizePixel( Size( Width, Height ) );
 #endif
 } else {
 pV->SetOutputSizePixel( Size( Width, Height ) );
commit 533092a738a00a226006cc9343f2a0d27a856b0a
Author: Tor Lillqvist 
Date:   Mon Jun 18 23:01:49 2012 +0300

touch depends on sal, toolkit depends on touch

Change-Id: I77e108391b48a9dc50491f8e76de8f277f92dfc6

diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
index e8a7b48..1db10f6 100644
--- a/toolkit/prj/build.lst
+++ b/toolkit/prj/build.lst
@@ -1,2 +1,2 @@
-ti toolkit : LIBXSLT:libxslt vcl QADEVOOO:qadevOOo test NULL
+ti toolkit : LIBXSLT:libxslt vcl touch QADEVOOO:qadevOOo test NULL
 ti toolkit\prj nmake - all ti_prj NULL
diff --git a/touch/prj/build.lst b/touch/prj/build.lst
index dfe282b..113bee3 100644
--- a/touch/prj/build.lst
+++ b/touch/prj/build.lst
@@ -1,2 +1,2 @@
-th touch : sw sc NULL
+th touch : sal NULL
 th touch\prj nmake - all th_prj NULL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - wizards/com

 wizards/com/sun/star/wizards/common/NumberFormatter.java |5 +++-
 wizards/com/sun/star/wizards/db/FieldColumn.java |   16 +++
 2 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 7d0fbe9070ea01f3b650776edcb9ecfee7921bf4
Author: Lionel Elie Mamane 
Date:   Mon Jun 18 16:28:14 2012 +0200

fdo#43967 legacy report designer wizard formats dates improperly

1) Set FormatsSupplier property only if underlying object has one.
   Else, exception is thrown and the format is not set
2) getTyperelatedFieldData uses the format keys, so initialize them
   before call, not after.

Change-Id: I68c4c96a9da9a6afdc3ab8964e973588f53ee814

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java 
b/wizards/com/sun/star/wizards/common/NumberFormatter.java
index 9c0feb5..bbf6385 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.java
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java
@@ -201,7 +201,10 @@ public class NumberFormatter
 Locale oLocale = (Locale) 
Helper.getUnoPropertyValue(xNumberFormat, "Locale");
 int NewFormatKey = defineNumberFormat(FormatString, oLocale);
 XPropertySet xPSet = UnoRuntime.queryInterface(XPropertySet.class, 
_xFormatObject);
-xPSet.setPropertyValue("FormatsSupplier", 
_oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier());
+if 
(xPSet.getPropertySetInfo().hasPropertyByName("FormatsSupplier"))
+{
+xPSet.setPropertyValue("FormatsSupplier", 
_oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier());
+}
 if (xPSet.getPropertySetInfo().hasPropertyByName("NumberFormat"))
 {
 xPSet.setPropertyValue("NumberFormat", new 
Integer(NewFormatKey));
diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java 
b/wizards/com/sun/star/wizards/db/FieldColumn.java
index ebedd22..47b37df 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.java
@@ -154,13 +154,8 @@ public class FieldColumn
 {
 try
 {
-m_xColPropertySet = UnoRuntime.queryInterface(XPropertySet.class, 
_xColumns.getByName(m_sFieldName));
-ColIndex = JavaTools.FieldInList(_xColumns.getElementNames(), 
m_sFieldName) + 1;
-m_nFieldType = 
AnyConverter.toInt(m_xColPropertySet.getPropertyValue("Type"));
-getTyperelatedFieldData();
-
- if (!bFormatKeysInitialized)
- {
+if (!bFormatKeysInitialized)
+{
 final NumberFormatter aNumberFormatter = 
oCommandMetaData.getNumberFormatter();
 
 iDateFormatKey = aNumberFormatter.getDateFormatKey();
@@ -170,7 +165,12 @@ public class FieldColumn
 iTimeFormatKey = aNumberFormatter.getTimeFormatKey();
 iLogicalFormatKey = aNumberFormatter.getLogicalFormatKey();
 bFormatKeysInitialized = true;
- }
+}
+
+m_xColPropertySet = UnoRuntime.queryInterface(XPropertySet.class, 
_xColumns.getByName(m_sFieldName));
+ColIndex = JavaTools.FieldInList(_xColumns.getElementNames(), 
m_sFieldName) + 1;
+m_nFieldType = 
AnyConverter.toInt(m_xColPropertySet.getPropertyValue("Type"));
+getTyperelatedFieldData();
 }
 catch (Exception e)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-5][PUSHED 3-5-5] fdo#30519 bad slide transitions with cairo

On Mon, 2012-06-18 at 13:38 +0300, Tor Lillqvist wrote:
> > I cherry-picked to 3-5. Two more good souls for 3-5-5
> 
> +1 from me.

pushed to 3-5-5.

C.

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

[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - canvas/source

 canvas/source/cairo/cairo_spritecanvashelper.cxx |   56 ++-
 canvas/source/cairo/cairo_spritecanvashelper.hxx |   12 +++-
 2 files changed, 53 insertions(+), 15 deletions(-)

New commits:
commit f9ef83a80fb05274e4c5268459d84af9b4558df1
Author: David Tardon 
Date:   Sat Jun 16 16:31:28 2012 +0200

fdo#30519 paint scrolled area from the right surface

This adds a way to test whether mpCompositeSurface contains the front
buffer image, so it can be used as a source in painting operations.
It means the mpCompositeSurface changed status from 'temporary' to
'persistent' (which it was anyway, from implementation POV :-)

Change-Id: Iee4fc7a97cd60e47d0abb148e7337f0b50cabb40
(cherry picked from commit 012b43d571aaa4f79b7f6fcfa92939e8d19af492)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx 
b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index 549bc95..3db9dcf 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -145,7 +145,8 @@ namespace cairocanvas
 mpRedrawManager( NULL ),
 mpOwningSpriteCanvas( NULL ),
 mpCompositingSurface(),
-maCompositingSurfaceSize()
+maCompositingSurfaceSize(),
+mbCompositingSurfaceDirty(true)
 {
 }
 
@@ -223,7 +224,7 @@ namespace cairocanvas
 
 // TODO(P1): Might be worthwile to track areas of background
 // changes, too.
-if( !bUpdateAll && !io_bSurfaceDirty )
+if( !bUpdateAll && !io_bSurfaceDirty && !mbCompositingSurfaceDirty )
 {
 // background has not changed, so we're free to optimize
 // repaint to areas where a sprite has changed
@@ -271,6 +272,7 @@ namespace cairocanvas
 // rendering and sprite changing
 mpRedrawManager->clearChangeRecords();
 
+mbCompositingSurfaceDirty = false;
 io_bSurfaceDirty = false;
 
 // commit to screen
@@ -352,16 +354,33 @@ namespace cairocanvas
 ::basegfx::B2IRange aDestRect( rDestRect );
 aDestRect.intersect( aOutputBounds );
 
-cairo_save( pCompositingCairo.get() );
-// scroll content in device back buffer
-cairo_set_source_surface( pCompositingCairo.get(),
-  
mpOwningSpriteCanvas->getBufferSurface()->getCairoSurface().get(),
+::basegfx::B2ISize aScrollSize( aDestRect.getWidth(), 
aDestRect.getHeight() );
+SurfaceSharedPtr pScrollSurface( getTemporarySurface() );
+CairoSharedPtr pScrollCairo( pScrollSurface->getCairo() );
+
+cairo_save( pScrollCairo.get() );
+// scroll the current content of the compositing surface (and,
+// thus, of the window) in temp. surface
+cairo_set_source_surface( pScrollCairo.get(),
+  
pCompositingSurface->getCairoSurface().get(),
   aDestPos.getX() - 
aSourceUpperLeftPos.getX(),
   aDestPos.getY() - 
aSourceUpperLeftPos.getY() );
+cairo_rectangle( pScrollCairo.get(),
+aDestPos.getX(), aDestPos.getY(),
+aScrollSize.getX(), aScrollSize.getY() );
+cairo_clip( pScrollCairo.get() );
+cairo_set_operator( pScrollCairo.get(), CAIRO_OPERATOR_SOURCE );
+cairo_paint( pScrollCairo.get() );
+cairo_restore( pScrollCairo.get() );
+
+cairo_save( pCompositingCairo.get() );
+// copy the scrolled area back onto the compositing surface
+cairo_set_source_surface( pCompositingCairo.get(),
+  pScrollSurface->getCairoSurface().get(),
+  0, 0 );
 cairo_rectangle( pCompositingCairo.get(),
  aDestPos.getX(), aDestPos.getY(),
- 
sal::static_int_cast(aDestRect.getWidth()),
- 
sal::static_int_cast(aDestRect.getHeight()) );
+ aScrollSize.getX(), aScrollSize.getY() );
 cairo_clip( pCompositingCairo.get() );
 cairo_set_operator( pCompositingCairo.get(), CAIRO_OPERATOR_SOURCE 
);
 cairo_paint( pCompositingCairo.get() );
@@ -531,15 +550,28 @@ namespace cairocanvas
 
 if( !mpCompositingSurface )
 {
-mpCompositingSurface =
-mpOwningSpriteCanvas->getWindowSurface()->getSimilar(
-CAIRO_CONTENT_COLOR,
-rNeededSize.getX(), rNeededSize.getY() );
+mpCompositingSurface = createSurface( rNeededSize );
 maCompositingSurfaceSize = rNeededSize;
+mbCompositingSurfaceDirty = true;
+mpTemporarySurface.reset();
 }
 
 return mpCompositingSurface;

Re: [PUSHED-3-5][PUSHED-3-5-5] rhbz#678440: Always include User-Agent to avoid 403 from picky servers

On Tue, 2012-06-12 at 23:59 +0200, Michael Stahl wrote:
> On 12.06.2012 22:42, Fridrich Strba wrote:
> > Cherry-picked to 3-5, we need two more people for the 3-5-5 branch.
> 
> +1 from me

pushed to 3-5-5

C.

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

[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - ucb/source

 ucb/source/ucp/webdav/DAVResourceAccess.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit 0c25d43ce8150b423251d9d7e84bf648c3369dae
Author: Stephan Bergmann 
Date:   Tue Jun 12 18:17:37 2012 +0200

rhbz#678440: Always include User-Agent to avoid 403 from picky servers

Change-Id: I4fa7b45062b0058427f77cf9dc0abebd6b26fb49
(cherry picked from commit 4d0e3127ed2def7212bc05aa860cd06704bb1efe)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx 
b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 11b5251..e669245 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1151,6 +1151,21 @@ void DAVResourceAccess::getUserRequestHeaders(
 }
 }
 }
+
+// Make sure a User-Agent header is always included, as at least
+// en.wikipedia.org:80 forces back 403 "Scripts should use an informative
+// User-Agent string with contact information, or they may be IP-blocked
+// without notice" otherwise:
+for ( DAVRequestHeaders::iterator i(rRequestHeaders.begin());
+  i != rRequestHeaders.end(); ++i )
+{
+if ( i->first.equalsIgnoreAsciiCase( "User-Agent" ) )
+{
+return;
+}
+}
+rRequestHeaders.push_back(
+DAVRequestHeader( "User-Agent", "LibreOffice" ) );
 }
 
 //=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] A few more improvements to the About dialogue

2012-06-18 Thread Stefan Knorr

On Mo, 2012-06-18 at 16:39 +0200, Fridrich Strba wrote:
> I pushed the second patch to master. Nevertheless, the first one does
> not apply on today's master checkout, any chance you can pull and resend?

Ah, sorry, Andras had already fixed the tab order before I found out how
to do this... here's the new version.

Astron.
>From 71d174fc334290211e55b1985f6e2d7f26717dec Mon Sep 17 00:00:00 2001
From: "Stefan Knorr (astron)" 
Date: Thu, 7 Jun 2012 23:50:37 +0200
Subject: [PATCH 1/2] Fix display of About dialog when buttons contain long
 strings

Thanks to Jean-Baptiste Faure for spotting.

Change-Id: Ie05a15fca7f40c9a621a6aa758a19f7455d312a6
---
 cui/source/dialogs/about.cxx |   99 +++---
 cui/source/inc/about.hxx |6 +--
 2 files changed, 66 insertions(+), 39 deletions(-)

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ddf296f..c8576ab 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -63,8 +63,8 @@ using namespace ::com::sun::star;
 enum AboutDialogButton
 {
 CREDITS_BUTTON,
-WEBSITE_BUTTON,
-LICENSE_BUTTON
+LICENSE_BUTTON,
+WEBSITE_BUTTON
 };
 
 AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
@@ -103,13 +103,13 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
 
 // Allow the button to be identifiable once they are clicked
 aCreditsButton.SetData( (void*)CREDITS_BUTTON );
-aWebsiteButton.SetData( (void*)WEBSITE_BUTTON );
 aLicenseButton.SetData( (void*)LICENSE_BUTTON );
+aWebsiteButton.SetData( (void*)WEBSITE_BUTTON );
 
 // Connect all handlers
 aCreditsButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
-aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
 aLicenseButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
+aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
 
 aCancelButton.SetClickHdl( LINK( this, AboutDialog, CancelHdl ) );
 
@@ -127,10 +127,10 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
 AboutDialogButton* pDialogButton = (AboutDialogButton*)pButton->GetData();
 if ( pDialogButton ==  (AboutDialogButton*)CREDITS_BUTTON )
 sURL = m_aCreditsLinkStr;
-else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
-sURL = m_aWebsiteLinkStr;
 else if ( pDialogButton == (AboutDialogButton*)LICENSE_BUTTON)
 sURL = m_aLicenseLinkStr;
+else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
+sURL = m_aWebsiteLinkStr;
 
 // If the URL is empty, don't do anything
 if ( sURL.isEmpty() )
@@ -195,26 +195,24 @@ void AboutDialog::LayoutControls()
 // Obtain an appropriate text width from the size of the screen
 sal_Int32 aIdealTextWidth = aScreenRect.GetWidth() / 2.4;
 
-sal_Int32 aDialogBorder = 6;
-sal_Int32 aContentWidth = aIdealTextWidth + aDialogBorder * 2;
-sal_Int32 aShadowWidth = aContentWidth * 0.02;
-sal_Int32 aDialogWidth = aContentWidth + aShadowWidth * 2;
+sal_Int32 aDialogBorder = 12;
+sal_Int32 aDialogWidth = aIdealTextWidth + aDialogBorder * 2;
 
 // Render and Position Logo
 vcl::RenderGraphicRasterizer aRasterizerLogo = Application::LoadBrandSVG("flat_logo");
 float aLogoWidthHeightRatio = (float)aRasterizerLogo.GetDefaultSizePixel().Width() /
(float)aRasterizerLogo.GetDefaultSizePixel().Height();
 
-Size aLogoSize( aContentWidth * 0.6, (aContentWidth * 0.6) / aLogoWidthHeightRatio );
-Point aLogoPos( aShadowWidth + ( aContentWidth - aLogoSize.Width() ) / 2,
-aShadowWidth + aDialogBorder );
+Size aLogoSize( aDialogWidth * 0.6, (aDialogWidth * 0.6) / aLogoWidthHeightRatio );
+Point aLogoPos( ( aDialogWidth - aLogoSize.Width() ) / 2,
+aDialogBorder );
 aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
 aLogoImage.SetImage( Image( aLogoBitmap ) );
 aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
 
 // Position version text
 sal_Int32 aLogoVersionSpacing = aLogoSize.Height() * 0.15;
-Point aVersionPos( aShadowWidth + aDialogBorder,
+Point aVersionPos( aDialogBorder,
aLogoPos.Y() + aLogoSize.Height() + aLogoVersionSpacing );
 Size aVersionSize = aVersionText.CalcMinimumSize();
 aVersionSize.Width() = aIdealTextWidth;
@@ -222,7 +220,7 @@ void AboutDialog::LayoutControls()
 
 // Position description text
 sal_Int32 aVersionDescriptionSpacing = aLogoSize.Height() * 0.45;
-Point aDescriptionPos( aShadowWidth + aDialogBorder, aVersionPos.Y() + aVersionSize.Height() + aVersionDescriptionSpacing );
+Point aDescriptionPos( aDialogBorder, aVersionPos.Y() + aVersionSize.Height() + aVersionDescriptionSpacing );
 Size aDescriptionSize = aDescriptionText.GetSizePixel();
 aDescriptionSize.Width() = aIdealTextWidth;
 aDescriptionText.SetPosSizePixe

[Bug 37361] LibreOffice 3.5 most annoying bugs

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

--- Comment #331 from Rainer Bielefeld  
2012-06-18 13:01:30 PDT ---
bugzilla-dae...@freedesktop.org schrieb:

> Nominating 49610: EDITING: Terminating 'Find' when reached end of document
> second time deletes slides, replaces contents by templates

Hi,

you are a little late, and:


Best Regards

Rainer

-- 
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

Locating Text Rotation Code

Hi All,

Trying to tackle a bug on text rotation but am having a worthless time
locating the code. Any ideas where I can find it? What I've found:

chardlg.src -- the Character Dialog code
charrotateitem.hxx


I haven't found the code that actually tells writer what to do with
the rotation. Any help greatly appreciated, once I find the code I can
handle the bug.


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

[Libreoffice-commits] .: 2 commits - android/experimental Library_merged.mk offapi/com sal/inc toolkit/inc toolkit/Library_tk.mk toolkit/source touch/Library_libotouch.mk touch/source vcl/inc vcl/sour

 Library_merged.mk  
  |6 
 
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 |   90 +++---
 offapi/com/sun/star/awt/XToolkit2.idl  
  |6 
 sal/inc/sal/ByteBufferWrapper.hxx  
  |   23 --
 toolkit/Library_tk.mk  
  |6 
 toolkit/inc/toolkit/awt/vclxtoolkit.hxx
  |2 
 toolkit/source/awt/vclxtoolkit.cxx 
  |7 
 touch/Library_libotouch.mk 
  |4 
 touch/source/android/android.cxx   
  |   34 +++
 touch/source/uno/Document.cxx  
  |2 
 vcl/inc/vcl/virdev.hxx 
  |2 
 vcl/source/gdi/virdev.cxx  
  |   17 -
 12 files changed, 140 insertions(+), 59 deletions(-)

New commits:
commit daaa550121a97d80e1ab43cbd5c73da6915e4ac4
Author: Tor Lillqvist 
Date:   Mon Jun 18 22:32:35 2012 +0300

Pass also scale and offset to createScreenCompatibleDeviceUsingBuffer()

Pass on to VirtualDevice where used to set the MapMode of the device
appropriately. Adapt DocumentLoader, use to scale the page rendering
to exactly fit the virtual device.

Change-Id: I4b0bc67e12114d3d9d493ff1aca2ef5d2cc78912

diff --git a/Library_merged.mk b/Library_merged.mk
index d689e42..49c90cf 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -75,6 +75,12 @@ $(eval $(call gb_Library_use_libraries,merged,\
 ))
 endif
 
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_Library_use_libraries,merged,\
+   libotouch \
+))
+endif
+
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_use_libraries,merged,\
 objc \
diff --git 
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index a458d02..412c57d 100644
--- 
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++ 
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -44,6 +44,7 @@ import android.widget.ViewFlipper;
 
 import com.polites.android.GestureImageView;
 
+import com.sun.star.awt.Size;
 import com.sun.star.awt.XBitmap;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XDevice;
@@ -202,40 +203,75 @@ public class DocumentLoader
 
 ByteBuffer renderPage(int number)
 {
-ByteBuffer bb;
-
-bb = ByteBuffer.allocateDirect(1024*1024*4);
-long wrapped_bb = Bootstrap.new_byte_buffer_wrapper(bb);
-Log.i(TAG, "bb is " + bb);
-XDevice device = toolkit.createScreenCompatibleDeviceUsingBuffer(1024, 
1024, wrapped_bb);
+try {
+// A small device with no scale of offset just to find out the 
paper size of this page
 
-dumpUNOObject("device", device);
+ByteBuffer smallbb = ByteBuffer.allocateDirect(128*128*4);
+long wrapped_smallbb = Bootstrap.new_byte_buffer_wrapper(smallbb);
+XDevice device = 
toolkit.createScreenCompatibleDeviceUsingBuffer(128, 128, 1, 1, 0, 0, 
wrapped_smallbb);
 
-PropertyValue renderProps[] = new PropertyValue[3];
-renderProps[0] = new PropertyValue();
-renderProps[0].Name = "IsPrinter";
-renderProps[0].Value = new Boolean(true);
-renderProps[1] = new PropertyValue();
-renderProps[1].Name = "RenderDevice";
-renderProps[1].Value = device;
-renderProps[2] = new PropertyValue();
-renderProps[2].Name = "View";
-renderProps[2].Value = new MyXController();
+PropertyValue renderProps[] = new PropertyValue[3];
+renderProps[0] = new PropertyValue();
+renderProps[0].Name = "IsPrinter";
+renderProps[0].Value = new Boolean(true);
+renderProps[1] = new PropertyValue();
+renderProps[1].Name = "RenderDevice";
+renderProps[1].Value = device;
+renderProps[2] = new PropertyValue();
+renderProps[2].Name = "View";
+renderProps[2].Value = new MyXController();
 
-try {
+// getRenderer returns a set of properties that include the 
PageSize
 long t0 = System.currentTimeMillis();
-renderable.render(number, doc, renderProps);
+PropertyValue rendererProps[] = renderable.getRenderer(number, 
doc, renderProps);
 long t1 = System.currentTimeMillis();
+

Re: How to integrate an image into the source tree

On Mon, Jun 18, 2012 at 2:38 PM, Cedric Bosdonnat wrote:

> On Mon, 2012-06-18 at 14:20 -0430, Rafael Dominguez wrote:
> > Im trying to use a picture in my dialog for a button, i added the
> > image (check.png) to icon-themes/galaxy/sfx2/res folder but when i
> > compile, i get an error msg
> > The image(s)  could not be found.
>
> Could you show a snippet of your code trying to load the image? It won't
> be easy to help you otherwise ;)
>
> --
> Cedric
>
>
/*
 * Copyright 2012 LibreOffice contributors.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

#include "doc.hrc"
#include "templatedlg.hrc"
#include "helpid.hrc"

ModalDialog DLG_TEMPLATE_MANAGER
{
HelpId = CMD_SID_TEMPLATE_MANAGER;
OutputSize = TRUE;
SVLook = TRUE;
Moveable = TRUE;
Closeable = TRUE;
Hide = TRUE;
Size = MAP_APPFONT ( 290 , 250 );
Text [en-US] = "Template Manager";

PushButton BTN_SELECT_ALL
{
Pos = MAP_APPFONT(10,5);
Size = MAP_APPFONT(50,14);
TabStop = TRUE;
DefButton = TRUE;
Text [en-US] = "All";
};

PushButton BTN_SELECT_DOCS
{
Pos = MAP_APPFONT(60,5);
Size = MAP_APPFONT(50,14);
TabStop = TRUE;
Text [en-US] = "Documents";
};

PushButton BTN_SELECT_PRESENTATIONS
{
Pos = MAP_APPFONT(110,5);
Size = MAP_APPFONT(50,14);
TabStop = TRUE;
Text [en-US] = "Presentations";
};

PushButton BTN_SELECT_SHEETS
{
Pos = MAP_APPFONT(160,5);
Size = MAP_APPFONT(50,14);
TabStop = TRUE;
Text [en-US] = "Spreedsheets";
};

PushButton BTN_SELECT_DRAWS
{
Pos = MAP_APPFONT(210,5);
Size = MAP_APPFONT(50,14);
TabStop = TRUE;
Text [en-US] = "Drawings";
};

ImageButton BTN_SELECTION_MODE
{
Pos = MAP_APPFONT(265,5);
Size = MAP_APPFONT(14,14);
TabStop = TRUE;

ButtonImage = Image
{
ImageBitmap = Bitmap { File = "selection.png" ; };
};
};

Control TEMPLATE_VIEW
{
Pos = MAP_APPFONT(5,30);
Size = MAP_APPFONT(280,220);
TabStop = TRUE;
};
};

Dialog code, loading resources

SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent)
: ModalDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)),
  aButtonAll(this,SfxResId(BTN_SELECT_ALL)),
  aButtonDocs(this,SfxResId(BTN_SELECT_DOCS)),
  aButtonPresents(this,SfxResId(BTN_SELECT_PRESENTATIONS)),
  aButtonSheets(this,SfxResId(BTN_SELECT_SHEETS)),
  aButtonDraws(this,SfxResId(BTN_SELECT_DRAWS)),
  maButtonSelMode(this,SfxResId(BTN_SELECTION_MODE)),
  maView(new ThumbnailView(this,SfxResId(TEMPLATE_VIEW)))
{
maButtonSelMode.SetStyle(maButtonSelMode.GetStyle() | WB_TOGGLE);

maView->SetStyle(WB_TABSTOP | WB_VSCROLL);
maView->SetColCount(MAX_COLUMN_COUNT);
maView->SetLineCount(MAX_LINE_COUNT);

aButtonAll.SetClickHdl(LINK(this,SfxTemplateManagerDlg,ViewAllHdl));
aButtonDocs.SetClickHdl(LINK(this,SfxTemplateManagerDlg,ViewDocsHdl));

maButtonSelMode.SetClickHdl(LINK(this,SfxTemplateManagerDlg,OnClickSelectionMode));

maView->Populate();
maView->Show();

FreeResource();
}

 when i compile the code i get this error

[ build RES ] sfxen-US
S=/home/ralph/Proyectos/libreoffice/core && O=$S/solver/unxlngi6.pro &&
W=$S/workdir/unxlngi6.pro &&  mkdir -p $W/ResTarget/ $O/bin $W/ResTarget/
&& RESPONSEFILE=`mktemp -t gbuild.XX` && echo "-r -p -lgen-US
-fs=$W/ResTarget/sfxen-US.res -lip=$S/icon-themes/galaxy/sfx2/sfx
-lip=$S/icon-themes/galaxy/sfx2/imglst/en-US
-lip=$S/icon-themes/galaxy/sfx2/imglst
-lip=$S/icon-themes/galaxy/sfx2/res/en-US
-lip=$S/icon-themes/galaxy/sfx2/res -lip=$S/icon-themes/galaxy/sfx2
-lip=$S/icon-themes/galaxy/res/en-US -lip=$S/icon-themes/galaxy/res
-subMODULE=$S/icon-themes/galaxy/ -subGLOBALRES=$S/icon-themes/galaxy/res
-oil=$W/ResTarget/ $W/SrsTarget/sfx/res.srs" > ${RESPONSEFILE} &&
LD_LIBRARY_PATH="$O/lib" SOLARBINDIR=$O/bin $O/bin/rsc @${RESPONSEFILE} &&
rm -f ${RESPONSEFILE}
f268: Error: The image(s)  could not be found.
Terminating compiler
make: *** [/home/ralph/Proyectos/libreoffice/core/workdir/
unxlngi6.pro/ResTarget/sfxen-US.res] Error 1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

How to integrate an image into the source tree

Im trying to use a picture in my dialog for a button, i added the image
(check.png) to icon-themes/galaxy/sfx2/res folder but when i compile, i get
an error msg
The image(s)  could not be found.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] fdo#43192: : confusing label for data validity criterion

2012-06-18 Thread Daniel Bankston


On 06/18/2012 10:12 AM, Joel Madero wrote:

Thanks for the heads up. Marking bug as RESOLVED. Hopefully can get
some higher priority things patched soon. Not going to lie, I was
excited for my first patch, wife didn't understand ;)


Joel


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

Re: Cleaning bug list

I agree with the save comment, I'll change that right now. Also
realized I didn't put a note in for regressions so I added to the
bottom notes:

**Regressions**
Special attention should be paid to regressions. In most cases a
regression calls for an increase in priority but in some cases it will
not. If the regression is not elevated to a higher priority, a comment
may be useful to explain why this decision was made


Joel

On Mon, Jun 18, 2012 at 10:54 AM, Petr Mladek  wrote:
> Joel Madero píše v Po 18. 06. 2012 v 09:32 -0700:
>> Version 2, changed orientation and tried to take comments into
>> account. Let me know what you all think.
>
> It is much better readable. I finally got a better picture :-)
>
> Well, I think that it still need some thinking. You set "inability to
> safe" as major. I think that it should be blocker. The application
> would be almost useless with this bug ;-)
>
>
> I suggest the following changes in the top levels:
>
>   Q: "Does bug cause crash, loss of data[*], inability to install,
>       broken core function, e.g. inability to safe any writer
>       documents, print?
>
>    + A: "yes":
>        => Q: "Does it affect almost all users within everyday usage and
>               is it a regression?"
>                + A: "yes" => blocker, highest, MAB
>                + A: "no"  => critical, high, MAB
>                  I would leave the
>
>
>    + A: "no"
>        => Q: "Does bug involve a serious glitch such as tediously
>               slow, inability to open particular documents, install
>               some extensions, print on some printers?
>
>                + A: "yes": => "major", high
>
> IMHO, the rest might stay as is. Well, it would be great to create
> several examples also for the other categories. I do not have power to
> invent them now, though ;-)
>
> [*] Note that data loss might be caused by incomplete import. If it is
> not a regression, it might be marked by developers as an enhancement.
> Note that it needs many developer/years to support some file formats.
> OOXML format is described on several thousands of pages...
>
> I am very happy with the progress and the state.
>
> Thanks a lot for working on it.
>
>
> Best Regards,
> Petr
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Cleaning bug list

Joel Madero píše v Po 18. 06. 2012 v 09:32 -0700:
> Version 2, changed orientation and tried to take comments into
> account. Let me know what you all think.

It is much better readable. I finally got a better picture :-)

Well, I think that it still need some thinking. You set "inability to
safe" as major. I think that it should be blocker. The application
would be almost useless with this bug ;-)


I suggest the following changes in the top levels:

   Q: "Does bug cause crash, loss of data[*], inability to install,
   broken core function, e.g. inability to safe any writer
   documents, print?

+ A: "yes":
=> Q: "Does it affect almost all users within everyday usage and
   is it a regression?"
+ A: "yes" => blocker, highest, MAB
+ A: "no"  => critical, high, MAB 
  I would leave the 


+ A: "no"
=> Q: "Does bug involve a serious glitch such as tediously
   slow, inability to open particular documents, install
   some extensions, print on some printers?

+ A: "yes": => "major", high

IMHO, the rest might stay as is. Well, it would be great to create
several examples also for the other categories. I do not have power to
invent them now, though ;-)

[*] Note that data loss might be caused by incomplete import. If it is
not a regression, it might be marked by developers as an enhancement.
Note that it needs many developer/years to support some file formats.
OOXML format is described on several thousands of pages...

I am very happy with the progress and the state.

Thanks a lot for working on it.


Best Regards,
Petr

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

[Libreoffice-commits] .: Library_merged.mk

 Library_merged.mk |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 36244dcfa196c27a23a6eb4b20cc0b62507f6ed0
Author: Tor Lillqvist 
Date:   Mon Jun 18 20:22:01 2012 +0300

Drop accidentally duplicated section

Change-Id: I7444c59efa4fceff9046341cbac934488dd67514

diff --git a/Library_merged.mk b/Library_merged.mk
index c40343d..d689e42 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -82,11 +82,4 @@ $(eval $(call gb_Library_use_libraries,merged,\
 ))
 endif
 
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_use_libraries,merged,\
-objc \
-Cocoa \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #4

2012-06-18 Thread Marco Cecchetti

On Mon, 18 Jun 2012 12:30:06 +0200, Thorsten Behrens
wrote:

Marco Cecchetti wrote:

I started studying how to support repeated animations and performed
several tests. Support is not yet available anyway I have some idea
for getting it working.
Now to animations and repeated to animations are handled by both
the C++ and the JavaScript presentation engine as the SMIL spec
describes.

Hi Marco,

nice writeup there - but I think with questions like how SMIL is to
be interpreted, we should move that to this list. Otherwise great
analysis.

Hi Thorsten,
yep, SMIL is not always simple to interpret, however there is
a list of reasons that lead me to such an interpretation here:
https://docs.google.com/document/d/1GSLPSIWRGSDTSi69dT9Te8tRyTJcAekxT7scoCoGO2M/edit?pli=1#heading=h.fn5e5n4gmpg0

Obviously I'm happy to discuss them on this list. :)

Slightly tangential - how about filing a few easy hacks for adding
more shape and slide animations? It's mostly busy work, and a nice
rewarding experience for new hackers - here's how:

http://wiki.documentfoundation.org/Development/Easy_Hacks

Ok, I appended it to my to do list.
Is there some animation you're especially interested in ?

I started also investigating the possibility to add support for
hyperlink to the svg export filter. Finally I merged the
feature/svg-export branch to the master branch, so now support
for shape and slide transitions is available on the master branch.

Lovely - that gives a nice teaser for people to download & try our
nightlies. :)

With the pending changes, would you want to create a new
features/svg-export2 branch & stick them in there for me & others to
play?

Just to be sure I got it correctly:
do you mean a new branch separated from the feature/svg-export
branch where I push my contributions weekly ?

Cheers,
-- Marco

--
Using Opera's revolutionary e-mail client: http://www.opera.com/mail/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 37361] LibreOffice 3.5 most annoying bugs

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

--- Comment #330 from Joel Madero  2012-06-18 09:39:58 PDT ---
Nominating 49610: EDITING: Terminating 'Find' when reached end of document
second time deletes slides, replaces contents by templates

Nominated because many users use Find feature and would be affected if slides
were deleted. Loss of data = really annoying ;)

-- 
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

Re: Smooth filter - to release notes

2012-06-18 Thread Jan Holesovsky

Hi Tomaž,

On 2012-06-18 at 15:05 +0200, Tomaž Vajngerl wrote:

> I intended to add this to the release notes but 3.7 release is still
> far away and I want to play with the UI for filters. I want to make
> something similar to "contour editor" and "image map" but for image
> manipulation, where you could make changes to the specified image and
> see the changes in the preview window. Afterwards you could apply the
> changes to the actual image in the document. I think this is a more
> natural way to do image manipulation than the current solution. What
> do you think?

Sounds wonderful to me - so probably really not worth bothering with the
release notes yet :-)  If you want any input from the UX guys, the best
is to CC: the libreoffice-ux-advise@ list [I've CC'd them in this post,
so that they know].

All the best,
Kendy

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

Re: [PUSHED 3-5-5][REVIEW 3-5][REVIEW 3-5-5] fdo#48601 second crash?

Hi,

On Monday, 2012-06-18 13:36:30 +0300, Tor Lillqvist wrote:

> > Looks safe to me. Pushed to 3-5. Two more reviews needed for 3-5-5
> 
> +1 from me.

Cherry-picked to 3-5-5
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5-5&id=4dc81a8c3a3ca1054c2c62cc96e75eec4c896409

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpWOYE4UWk19.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-5-5][PUSHED 3-5][REVIEW 3-5-5] fdo#48601 FILEOPEN: Open Visio's file with bitmap's blocks

Hi,

On Monday, 2012-06-18 10:28:22 +0200, Fridrich Strba wrote:

> Thanks for the fix. I pushed it into the 3-5 branch, we need 2 more
> people for the 3-5-5 by the end of today.

Fridrich mentioned on IRC Michael will sign this off, so cherry-picked
to 3-5-5
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5-5&id=f7c639ba95ddf2b66401f9ce6943e7c40fa925f2

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgp5Kqrt78wdw.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-5-5][PUSHED 3-5][REVIEW 3-5-5] fdo#50988 Draw crashes on loading MS Logical Design Diagram example visio file

Hi,

Cherry-picked to 3-5-5
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5-5&id=c49a512e630fdba3a706f582cd37424f9d695281

  Eike


On Friday, 2012-06-15 22:16:19 +0200, Fridrich Strba wrote:

> Done for 3-5.
> 
> Julien, can you also fix similar things in contrib/libvisio repository?
> 
> Thanks a lot
> 
> Fridrich
> 
> On 15/06/12 22:02, Michael Meeks wrote:
> >
> >On Thu, 2012-06-14 at 13:10 -0700, julien2412 wrote:
> >>I pushed a patch on master for fdo#50988 (see
> >>http://cgit.freedesktop.org/libreoffice/core/commit/?id=cc85e1303fbdf7d1ff9c5b63ed9942206b53ddac).
> >>As indicated in the comment
> >>https://bugs.freedesktop.org/show_bug.cgi?id=50988#c2 and in the commit
> >>comment, it's the same type of problem than fdo#50178
> >
> > Looks good to me; thanks for that.
> >
> > Fridrich - can you merge to -3-5 as/when you notice this ;-) it'd be
> >good to get one more +1 to get it into -3-5-5
> >
> > Nice work Julien !
> >
> > Michael.

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpw3oYDiE61W.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - 3 commits - libvisio/libvisio-0.0.17-fdo48601_part1.patch libvisio/libvisio-0.0.17-fdo48601_part2.patch libvisio/libvisio-0.0.17-fdo50988.patch li

 libvisio/libvisio-0.0.17-fdo48601_part1.patch |   26 ++
 libvisio/libvisio-0.0.17-fdo48601_part2.patch |   64 ++
 libvisio/libvisio-0.0.17-fdo50988.patch   |   27 ++
 libvisio/makefile.mk  |3 +
 4 files changed, 120 insertions(+)

New commits:
commit 4dc81a8c3a3ca1054c2c62cc96e75eec4c896409
Author: Fridrich Å trba 
Date:   Mon Jun 18 10:20:27 2012 +0200

Trying to solve out of bonds in fdo#48601

Change-Id: Idf9d56714d658a14af826a74c58aad26a9e29414
Signed-off-by: Markus Mohrhard 
(cherry picked from commit 1969514f20cde8728a1d732e0cc3f566ca1400e1)

Signed-off-by: Eike Rathke 
Signed-off-by: Tor Lillqvist 

diff --git a/libvisio/libvisio-0.0.17-fdo48601_part2.patch 
b/libvisio/libvisio-0.0.17-fdo48601_part2.patch
new file mode 100644
index 000..5b65d8d
--- /dev/null
+++ b/libvisio/libvisio-0.0.17-fdo48601_part2.patch
@@ -0,0 +1,64 @@
+--- misc/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp  2012-06-18 
10:18:48.450129329 +0200
 misc/build/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp
2012-06-18 10:18:17.935927778 +0200
+@@ -91,7 +91,8 @@
+   else if (m_fillPattern == 1)
+   {
+ m_fillType = "solid";
+-m_styleProps.insert("draw:fill-color", 
getColourString(m_colours[colourIndexFG]));
++if (colourIndexFG < m_colours.size())
++  m_styleProps.insert("draw:fill-color", 
getColourString(m_colours[colourIndexFG]));
+ if (m_fillFGTransparency > 0)
+   m_styleProps.insert("draw:opacity", (double)(1 - 
m_fillFGTransparency/255.0), WPX_PERCENT);
+ else
+@@ -101,8 +102,10 @@
+   {
+ m_fillType = "gradient";
+ m_styleProps.insert("draw:style", "axial");
+-m_styleProps.insert("draw:start-color", 
getColourString(m_colours[colourIndexFG]));
+-m_styleProps.insert("draw:end-color", 
getColourString(m_colours[colourIndexBG]));
++if (colourIndexFG < m_colours.size())
++  m_styleProps.insert("draw:start-color", 
getColourString(m_colours[colourIndexFG]));
++if (colourIndexBG < m_colours.size())
++  m_styleProps.insert("draw:end-color", 
getColourString(m_colours[colourIndexBG]));
+ m_styleProps.remove("draw:opacity");
+ if (m_fillBGTransparency > 0)
+   m_styleProps.insert("libwpg:start-opacity", (double)(1 - 
m_fillBGTransparency/255.0), WPX_PERCENT);
+@@ -123,8 +126,10 @@
+   {
+ m_fillType = "gradient";
+ m_styleProps.insert("draw:style", "linear");
+-m_styleProps.insert("draw:start-color", 
getColourString(m_colours[colourIndexBG]));
+-m_styleProps.insert("draw:end-color", 
getColourString(m_colours[colourIndexFG]));
++if (colourIndexBG < m_colours.size())
++  m_styleProps.insert("draw:start-color", 
getColourString(m_colours[colourIndexBG]));
++if (colourIndexFG < m_colours.size())
++  m_styleProps.insert("draw:end-color", 
getColourString(m_colours[colourIndexFG]));
+ m_styleProps.remove("draw:opacity");
+ if (m_fillBGTransparency > 0)
+   m_styleProps.insert("libwpg:start-opacity", (double)(1 - 
m_fillBGTransparency/255.0), WPX_PERCENT);
+@@ -170,8 +175,10 @@
+ m_styleProps.insert("draw:style", "rectangular");
+ m_styleProps.insert("svg:cx", 0.5, WPX_PERCENT);
+ m_styleProps.insert("svg:cy", 0.5, WPX_PERCENT);
+-m_styleProps.insert("draw:start-color", 
getColourString(m_colours[colourIndexBG]));
+-m_styleProps.insert("draw:end-color", 
getColourString(m_colours[colourIndexFG]));
++if (colourIndexBG < m_colours.size())
++  m_styleProps.insert("draw:start-color", 
getColourString(m_colours[colourIndexBG]));
++if (colourIndexFG < m_colours.size())
++  m_styleProps.insert("draw:end-color", 
getColourString(m_colours[colourIndexFG]));
+ m_styleProps.remove("draw:opacity");
+ if (m_fillBGTransparency > 0)
+   m_styleProps.insert("libwpg:start-opacity", (double)(1 - 
m_fillBGTransparency/255.0), WPX_PERCENT);
+@@ -188,8 +195,10 @@
+   {
+ m_fillType = "gradient";
+ m_styleProps.insert("draw:style", "radial");
+-m_styleProps.insert("draw:start-color", 
getColourString(m_colours[colourIndexBG]));
+-m_styleProps.insert("draw:end-color", 
getColourString(m_colours[colourIndexFG]));
++if (colourIndexBG < m_colours.size())
++  m_styleProps.insert("draw:start-color", 
getColourString(m_colours[colourIndexBG]));
++if (colourIndexFG < m_colours.size())
++  m_styleProps.insert("draw:end-color", 
getColourString(m_colours[colourIndexFG]));
+ m_styleProps.remove("draw:opacity");
+ if (m_fillBGTransparency > 0)
+   m_styleProps.insert("libwpg:start-opacity", (double)(1 - 
m_fillBGTransparency/255.0), WPX_PERCENT);
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 2855741..1de538b 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -60,6 +60,7 @@ TARFILE_MD5=90010e213dd25648e70f0cc12f8fed55
 PATCH_FILES=\
$(TARFILE_NAME)-fdo50988.patch \
$(TARFILE_NAME)-fdo48601_part1

Re: [PATCH] Fixed out of bounds memory access

On Mon, 2012-06-18 at 13:41 +0200, Stephan Bergmann wrote:
> In either case, the strdup(aUser.getStr()) should be OK?

I bet this is one if the false-positive occasions where valgrind isn't
aware of one of the strlen performance hacks IIRC where glibc knows that
it can get away with traversing that strdup's memory block in 4byte
chunks in its strlen e.g. someone with a 4/8 character length username
wouldn't see it :-)

So... if you just changed the strlen to be aUser.getLength() + 1 would
that silence valgrind too ?

C.

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

Re: New Bugzilla Branch Version Picker items – 3

Rainer Bielefeld píše v Po 18. 06. 2012 v 17:16 +0200:
> Hi all,
> 
> I am happy to see that we have a solution for the general problem, I 
> will change picker texts with 3.6.0.0.beta2
> 
> The remaining problem is what we will do with

Ah, I forgot this ;-)

> 3.7.0.0.alpha1+daily
> 3.7.0.0.alpha2+daily
> 3.7.0.0.beta1+ daily
> 3.7.0.0.beta2+ daily

These will be used in the about dialog.

> 3.7.1.0.alpha1+daily
> 3.7.2.0.alpha1+daily
> 3.7.3.0.alpha1+daily
> 3.7.4.0.alpha1+daily
> 3.7.5.0.alpha1+daily
> 3.7.6.0.alpha1+daily

We do not allow dangerous changes for bugfix releases => the daily
builds should have the quality of release candidates. So, there will be:

3.7.1.0+  daily
3.7.2.0+  daily
3.7.3.0+  daily
3.7.4.0+  daily
3.7.5.0+  daily
3.7.6.0+  daily

> what are possible versions for the daily builds available during life 
> cycle of 3.7 branch.

We have one alpha, three betas, three release candidates for .0 release,
and two release candidates for bugfix releases.

> Those are a horrible lot of versions filling the picker with nearby 0 
> reports/version (a "x.x.5" does not produce many regressions, and only 
> few users will test dailies).
>
> I would like to have a common "Branch Daily" in Bugzilla Version picker 
> for these Versions, for example *"3.7.0.0.alpha++"* (this way only 
> visible in Bugzilla, not in "Help About").
> 
> With acceptable workload it would be possible to create all those 
> versions from above (also to have the possibility to use a Atom Feed 
> "ticker" as "early warning system" and to shift them all to such a 
> "3.7.0.0.alpha++" 1/4 year after life cycle of the branch has been 
> terminated. So only 1 Branch version would remain for the picker instead 
> of 10 (or so).

Nice trick.

Another solution would be to omit these daily builds versions in
bugzilla at all. It is motivated by these ideas:

+ 3.6.0.0.beta2+ version is incomplete anyway; there are more
  daily builds with this version; reporter should cut&paste
  the whole buildid from the about dialog anyway

+ daily builds are used only by active QA testers; they
  are more experienced and could handle the missing "+"
  versions in bugzilla reasonably


Best Regards,
Petr

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

[PATCH] [REVIEW:3-5,3-5-5] fdo#43967 legacy report wizard improperly formats dates

Legacy reports (not Sun/Oracle Report Builder ones) wizard show date
columns as an integer days-since-epoch instead of e.g. nicely
formatted "DD-MM-YY" (day-month-year) in *newly* *created* reports.

Commit message is explanatory; shout if you have other question.

Please apply to libreoffice-3-5 and libreoffice-3-5-5 branch.

I ask for libreoffice-3-5-5 because the fix seems rather safe to me:

 1) Protects a setProperty with test for existence of this property

 2) Initializes values before they are used (see the code of
getTyperelatedFieldData in the same file)

-- 
Lionel
>From e834a95359738961037b7f747f55ac60a0b9e922 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane 
Date: Mon, 18 Jun 2012 16:28:14 +0200
Subject: [PATCH] fdo#43967 legacy report designer wizard formats dates
 improperly

1) Set FormatsSupplier property only if underlying object has one.
   Else, exception is thrown and the format is not set
2) getTyperelatedFieldData uses the format keys, so initialize them
   before call, not after.

Change-Id: I68c4c96a9da9a6afdc3ab8964e973588f53ee814
---
 .../com/sun/star/wizards/common/NumberFormatter.java   |5 -
 wizards/com/sun/star/wizards/db/FieldColumn.java   |   16 
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java
index 9c0feb5..bbf6385 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.java
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java
@@ -201,7 +201,10 @@ public class NumberFormatter
 Locale oLocale = (Locale) Helper.getUnoPropertyValue(xNumberFormat, "Locale");
 int NewFormatKey = defineNumberFormat(FormatString, oLocale);
 XPropertySet xPSet = UnoRuntime.queryInterface(XPropertySet.class, _xFormatObject);
-xPSet.setPropertyValue("FormatsSupplier", _oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier());
+if (xPSet.getPropertySetInfo().hasPropertyByName("FormatsSupplier"))
+{
+xPSet.setPropertyValue("FormatsSupplier", _oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier());
+}
 if (xPSet.getPropertySetInfo().hasPropertyByName("NumberFormat"))
 {
 xPSet.setPropertyValue("NumberFormat", new Integer(NewFormatKey));
diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java b/wizards/com/sun/star/wizards/db/FieldColumn.java
index ebedd22..47b37df 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.java
@@ -154,13 +154,8 @@ public class FieldColumn
 {
 try
 {
-m_xColPropertySet = UnoRuntime.queryInterface(XPropertySet.class, _xColumns.getByName(m_sFieldName));
-ColIndex = JavaTools.FieldInList(_xColumns.getElementNames(), m_sFieldName) + 1;
-m_nFieldType = AnyConverter.toInt(m_xColPropertySet.getPropertyValue("Type"));
-getTyperelatedFieldData();
-
- if (!bFormatKeysInitialized)
- {
+if (!bFormatKeysInitialized)
+{
 final NumberFormatter aNumberFormatter = oCommandMetaData.getNumberFormatter();
 
 iDateFormatKey = aNumberFormatter.getDateFormatKey();
@@ -170,7 +165,12 @@ public class FieldColumn
 iTimeFormatKey = aNumberFormatter.getTimeFormatKey();
 iLogicalFormatKey = aNumberFormatter.getLogicalFormatKey();
 bFormatKeysInitialized = true;
- }
+}
+
+m_xColPropertySet = UnoRuntime.queryInterface(XPropertySet.class, _xColumns.getByName(m_sFieldName));
+ColIndex = JavaTools.FieldInList(_xColumns.getElementNames(), m_sFieldName) + 1;
+m_nFieldType = AnyConverter.toInt(m_xColPropertySet.getPropertyValue("Type"));
+getTyperelatedFieldData();
 }
 catch (Exception e)
 {
-- 
1.7.10

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

Re: [REVIEW 3.6 FEATURE] Masterpages

On Fri, 2012-06-15 at 17:59 +0200, Bjoern Michaelsen wrote:
> On Fri, Jun 15, 2012 at 12:20:54PM +0400, Ivan Timofeev wrote:
> > In the old templates the language is Russian initially...
> > 
> > I don't know how this stuff works, uhm, can it be that in the old
> > templates the language determines automatically and in the new
> > templates it is hard-coded?
> 
> Sounds nasty. I pinged Thorsten about it, he said "rings a bell", but did not
> have a immediate magic fix.

I haven't been following this this, but seeing the above I wonder if
0a4365afa3300b8aa9b9063daf6aacce1ba17422 (fdo#32897) is what "rings a
bell" i.e. solenv/bin/bin/striplanguagetags.sh was my earlier hack to
strip out any explicit language tags so that a template will fall back
to the underlying default document language. Maybe that's
required/connected to this subissue.

C.

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

[Bug 37361] LibreOffice 3.5 most annoying bugs

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

Timur  changed:

   What|Removed |Added

 Depends on||40481, 50509, 46508, 46510

--- Comment #329 from Timur  2012-06-18 08:31:19 PDT ---
Added 40481 50509 46508 46510 of which only 46510 is still unresolved.

-- 
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

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

--- Comment #19 from Rainer Bielefeld  
2012-06-18 08:25:44 PDT ---
@Timur:
This is no place for discussions. If you have a question concerning proceeding
ask on !
Short answer here: This is for MAB what can't be fixed in 3.5, but please shift
NO bug between these tracking Bugs. Anything else in Mailing list!

-- 
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

Re: Cleaning bug list

Joel Madero píše v Po 18. 06. 2012 v 07:04 -0700:
> I'll modify the orientation today or tomorrow and try to see where 
> regression should fit. I think that it has to go in Priority and not in 
> Severity.

Makes sense.

>  As for how devs use it, I agree completely that right now it's 
> almost useless but maybe if it becomes more uniform and it actually 
> provides some information as to what the bug is doingwho knows.

I think that normal developers might ignore unconfirmed bugs. The will
be happy if confirmed bugs are prioritized some "standardized" way.

>  For instance for me, at this point my abilities are pretty low so trivial 
> bugs seem to be the go to...

Heh, even minor bug might be hard to fix. On the other hand, crashes are
sometimes easier because backtrace and valgrind log points to the
probleamtic code ;-)

> As for users prioritizing themselves, I've (mentioned/suggested/got irritated 
> with) in comments a couple users setting Severity to Critical for 
> something as minor as Conditional Formatting, it's almost to the point 
> that it is useless to "let" the end user categorize their own bugs like 
> this.

Sure. Well, it can be solved by filtering the non-confirmed bugs.

> Maybe regression should automatically set Priority to "Highest" 
> regardless of how many people are affected.

I would still prefer to take in account the seriousness and visibility.
If it takes months to report a regression, it means that nobody active
used the functionality for a long time. Such a regression could wait a
bit longer ;-)


> Ok off to work. Glad it at least seems a little useful. I have such 
> limited experience in programming/programming projects that I just felt 
> a bit overwhelmed so this helped me quite a bit last night when I was 
> going through bugs.

I am sure that it will help others as well. It is possible that some
people did not start triaging because they were not sure how to do it.

Thanks for working on it.


Best Regards,
Petr

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

New Bugzilla Branch Version Picker items – 3

2012-06-18 Thread Rainer Bielefeld


Hi all,

I am happy to see that we have a solution for the general problem, I 
will change picker texts with 3.6.0.0.beta2


The remaining problem is what we will do with

3.7.0.0.alpha1+daily
3.7.0.0.alpha2+daily
3.7.0.0.beta1+ daily
3.7.0.0.beta2+ daily
3.7.1.0.alpha1+daily
3.7.2.0.alpha1+daily
3.7.3.0.alpha1+daily
3.7.4.0.alpha1+daily
3.7.5.0.alpha1+daily
3.7.6.0.alpha1+daily

what are possible versions for the daily builds available during life 
cycle of 3.7 branch.


Those are a horrible lot of versions filling the picker with nearby 0 
reports/version (a "x.x.5" does not produce many regressions, and only 
few users will test dailies).


I would like to have a common "Branch Daily" in Bugzilla Version picker 
for these Versions, for example *"3.7.0.0.alpha++"* (this way only 
visible in Bugzilla, not in "Help About").


With acceptable workload it would be possible to create all those 
versions from above (also to have the possibility to use a Atom Feed 
"ticker" as "early warning system" and to shift them all to such a 
"3.7.0.0.alpha++" 1/4 year after life cycle of the branch has been 
terminated. So only 1 Branch version would remain for the picker instead 
of 10 (or so).


a) @petr:
Is my assumption concerning the "Daily" numeration (without remark 
"Daily" in "Help/About") correct?


@all:
Your Ideas?

Discussion please on !

Best Regards


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

Re: [PUSHED] fdo#43192: : confusing label for data validity criterion

Thanks for the heads up. Marking bug as RESOLVED. Hopefully can get
some higher priority things patched soon. Not going to lie, I was
excited for my first patch, wife didn't understand ;)


Joel

On Mon, Jun 18, 2012 at 2:35 AM, Fridrich Strba
 wrote:
> My bad, was too excited about your contribution and I forgot to modify
> the subject :)
>
> On 18/06/12 11:33, Fridrich Strba wrote:
>> Hello, Joel,
>>
>> On 15/06/12 16:50, Joel Madero wrote:
>>> My first patch so I apologize in advance if I screwed something up.
>>
>> Welcome to the club. You just became LO developer and there was a lot of
>> rejoicing :)
>>
>>
>>> https://bugs.freedesktop.org/show_bug.cgi?id=43192
>>> Let me know if anything needs corrected or if the language will not be
>>> changed so that I can update the bug to WILLNOTFIX.
>>
>> The patch is harmless and I pushed it to master. Any chance you can
>> verify whether there is a corresponding help entry that might need to be
>> changed?
>>
>> Fridrich
>>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Cleaning bug list

Rainer Bielefeld píše v Po 18. 06. 2012 v 13:21 +0200:
> Joel Madero schrieb:
> > I brainstormed a bit today and I came up with this flowchart.
> 
> 
> Hi Joel,
> 
> great to see that all in a chart, your conclusions and definitions seem 
> plausible.
> 
> But the chart also shows the limitations of that concept: It's really 
> sophisticated, and no developer will sit at his's desk to decide whether 
> he should fix a Bug with Severity=major and Priority=normal before or 
> after a bug with  Severity=normal and Priority=high  ;-)

You are right, developers will not strictly follow the severity and
priority. On the other hand, they care of the usability of the
application. They are actively working on the most annoying bugs. They
prioritize bugs themselves, so why not help them.

Note that MAB is only a workaround because all the other bugs are not
prioritized.

I think that it is hard job to prioritize all bugs. It will cause some
troubles because different people might have different opinions. Though,
I think that we should try it.


> But as you stated, such a chart can give some orientation, and so I 
> think it should be shown in the Wiki. Not on one of the current existing 
> Pages like BugTriage or similar, but on a page where should gather 
> detailed background information what would blow up those pages too much, 
> but nevertheless are interesting or important to know for all who want 
> to gain more knowledge concerning th bugfixing, QA or whatever else process.

You are right that we need to keep the bugtriage page easy to do not
scare people. It would make sense to describe the prioritization on
extra page and just link it from the BugTriage page.

BTW: Recently someone said that the Bugtriage page was not easy to
understand (state CONFIRMED). I think that some people might prefer the
graphics flow chart over the text. It would be nice to have similar flow
chart also for the overall bugtriage process :-)


> The question is whether the Priority entry is evaluated by anyone, IMHO 
> most here see that as a personal statement (of reporter?) concerning 
> importance of the bug - and ignore it.

Good question. My opinion is:

+ severity defines how much a bug affect the functionality
+ priority defines order in which it should be fixed

It means that, some feature might have higher priority because of
marketing reasons. Also some less severe bug might have higher priority
because it affects many users.

Hmm, when I think about it, I would propose another prioritization:

1. Define severity by symptoms.

+ this is well handled in the flow chart.

+ alternative proposal is at at
  http://wiki.documentfoundation.org/BugReport_Details#Severity
  is reasonable. 
  
+ I think that they both describe the same things different way.
  I do not have any strong opinion what formulation is easier to
  understand. We would need feedback from more people ;-)


2. Define priority more clever way:

+ the default priority should basically follow the severity; it
  means that critical bugs should have high priority, ...

+ the number of affected users and visibility should shift it
  higher or lower, though

+ it is already somehow handled in the flowchart. Well, I would,
  allow to skip even more levels. For example, typo
  in the main menu is minor bug but it might have even
  highest priority. Such bug in final release would look
  amateurish and would bring bad feeling from users.
  
  Hmm, I am not sure how to effectively describe it in the
  flowchart.

+ with this logic, the bugs with the high and highest priority
  should be mentioned in MAB.

+ anyway, developers should have the final word about
  priorities (for assigned bugs); they might want to organize
  their daily work by it 

Best Regards,
Petr




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

[REVIEW 3-5-5] GTK: don't crash on X errors

Hello, I cherry-picked with my signoff to 3-6 and 3-5. We need 2 more
people for 3-5-5

F.


On Mon, 2012-06-18 at 18:55 +0400, Ruslan Kabatsayev wrote: 
> Thanks for pushing. Would be good if this patch got into 3.5.5 and 3.6 as 
> well.
> 
> On Mon, Jun 18, 2012 at 6:37 PM, Fridrich Strba
>  wrote:
> > On 18/06/12 15:27, Ruslan Kabatsayev wrote:
> >> Hello,
> >>
> >> This patch disables GDK's default behaviour of abort() on X errors
> >> such as BadAtom etc.. It'll just ignore such errors.
> >> Rationale:
> >> 1. KDE4 and GEN plugins ignore the X erorrs
> >> 2. X errors may be unavoidable in some cases, like when wrong Atom is
> >> returned in XConvertSelection/SelectionNotify
> >>
> >> This will fix fdo#50920 and invalidate my message
> >> http://lists.freedesktop.org/archives/libreoffice/2012-June/033550.html
> >> .
> >>
> >> Regards,
> >> Ruslan
> >>
> >>
> >>
> >> ___
> >> LibreOffice mailing list
> >> LibreOffice@lists.freedesktop.org
> >> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> >>
> >
> >


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

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx

 vcl/unx/gtk/app/gtkdata.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 058a767706d23c1ab9f3ce89da738c706b9b4e38
Author: Ruslan Kabatsayev 
Date:   Mon Jun 18 17:23:46 2012 +0400

GTK: don't crash on X errors

Change-Id: I5b1353b409bc7043d2d1c313a3606ed807eced4b

Signed-off-by: Fridrich Å trba 

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index c147f3e..fbc3b22 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -667,6 +667,7 @@ void GtkData::Init()
 
 // init gtk/gdk
 gtk_init_check( &nParams, &pCmdLineAry );
+gdk_error_trap_push();
 
 for (i = 0; i < nParams; i++ )
 g_free( pCmdLineAry[i] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/unx

 vcl/unx/gtk/app/gtkdata.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3a15168ae587cdc8f329ae049d0c1d1e9d9de21a
Author: Ruslan Kabatsayev 
Date:   Mon Jun 18 17:23:46 2012 +0400

GTK: don't crash on X errors

Change-Id: I5b1353b409bc7043d2d1c313a3606ed807eced4b

Signed-off-by: Fridrich Å trba 

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 4d58110..07beacc 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -668,6 +668,7 @@ void GtkData::Init()
 
 // init gtk/gdk
 gtk_init_check( &nParams, &pCmdLineAry );
+gdk_error_trap_push();
 
 for (i = 0; i < nParams; i++ )
 g_free( pCmdLineAry[i] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-5][REVIEW 3-5-5] fdo#48601 second crash?

Hi,

On Monday, 2012-06-18 13:36:30 +0300, Tor Lillqvist wrote:

> > Looks safe to me. Pushed to 3-5. Two more reviews needed for 3-5-5
> 
> +1 from me.

And one from me. I did not cherry-pick though because it depends on
84464c91aec92fec6eda49629ac8eb11507dd42a of 3-5 that is still pending
a 3rd review, subject
[PUSHED 3-5][REVIEW 3-5-5] fdo#48601 FILEOPEN: Open Visio's file with bitmap's 
blocks

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD

pgpvsTUEZhK2s.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] GTK: don't crash on X errors

2012-06-18 Thread Ruslan Kabatsayev

Thanks for pushing. Would be good if this patch got into 3.5.5 and 3.6 as well.

On Mon, Jun 18, 2012 at 6:37 PM, Fridrich Strba
 wrote:
> On 18/06/12 15:27, Ruslan Kabatsayev wrote:
>> Hello,
>>
>> This patch disables GDK's default behaviour of abort() on X errors
>> such as BadAtom etc.. It'll just ignore such errors.
>> Rationale:
>> 1. KDE4 and GEN plugins ignore the X erorrs
>> 2. X errors may be unavoidable in some cases, like when wrong Atom is
>> returned in XConvertSelection/SelectionNotify
>>
>> This will fix fdo#50920 and invalidate my message
>> http://lists.freedesktop.org/archives/libreoffice/2012-June/033550.html
>> .
>>
>> Regards,
>> Ruslan
>>
>>
>>
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-5][REVIEW 3-5-5] fdo#48601 FILEOPEN: Open Visio's file with bitmap's blocks

Hi,

On Monday, 2012-06-18 10:28:22 +0200, Fridrich Strba wrote:

> Thanks for the fix. I pushed it into the 3-5 branch, we need 2 more
> people for the 3-5-5 by the end of today.

One from me.

Btw, this is 84464c91aec92fec6eda49629ac8eb11507dd42a on 3-5, whoever
cherry-picks it to 3-5-5 as the third reviewer please also cherry-pick
1969514f20cde8728a1d732e0cc3f566ca1400e1 from 3-5 that depends on this
patch and has already 3 reviews.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD

pgpC2m5gqUIQR.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: wizards/com

 wizards/com/sun/star/wizards/common/NumberFormatter.java |5 +++-
 wizards/com/sun/star/wizards/db/FieldColumn.java |   16 +++
 2 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit b86f2147e496e3b7ca5a085b302f6144f338aa82
Author: Lionel Elie Mamane 
Date:   Mon Jun 18 16:28:14 2012 +0200

fdo#43967 legacy report designer wizard formats dates improperly

1) Set FormatsSupplier property only if underlying object has one.
   Else, exception is thrown and the format is not set
2) getTyperelatedFieldData uses the format keys, so initialize them
   before call, not after.

Change-Id: I68c4c96a9da9a6afdc3ab8964e973588f53ee814

diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java 
b/wizards/com/sun/star/wizards/common/NumberFormatter.java
index 9c0feb5..bbf6385 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.java
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java
@@ -201,7 +201,10 @@ public class NumberFormatter
 Locale oLocale = (Locale) 
Helper.getUnoPropertyValue(xNumberFormat, "Locale");
 int NewFormatKey = defineNumberFormat(FormatString, oLocale);
 XPropertySet xPSet = UnoRuntime.queryInterface(XPropertySet.class, 
_xFormatObject);
-xPSet.setPropertyValue("FormatsSupplier", 
_oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier());
+if 
(xPSet.getPropertySetInfo().hasPropertyByName("FormatsSupplier"))
+{
+xPSet.setPropertyValue("FormatsSupplier", 
_oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier());
+}
 if (xPSet.getPropertySetInfo().hasPropertyByName("NumberFormat"))
 {
 xPSet.setPropertyValue("NumberFormat", new 
Integer(NewFormatKey));
diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java 
b/wizards/com/sun/star/wizards/db/FieldColumn.java
index ebedd22..47b37df 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.java
@@ -154,13 +154,8 @@ public class FieldColumn
 {
 try
 {
-m_xColPropertySet = UnoRuntime.queryInterface(XPropertySet.class, 
_xColumns.getByName(m_sFieldName));
-ColIndex = JavaTools.FieldInList(_xColumns.getElementNames(), 
m_sFieldName) + 1;
-m_nFieldType = 
AnyConverter.toInt(m_xColPropertySet.getPropertyValue("Type"));
-getTyperelatedFieldData();
-
- if (!bFormatKeysInitialized)
- {
+if (!bFormatKeysInitialized)
+{
 final NumberFormatter aNumberFormatter = 
oCommandMetaData.getNumberFormatter();
 
 iDateFormatKey = aNumberFormatter.getDateFormatKey();
@@ -170,7 +165,12 @@ public class FieldColumn
 iTimeFormatKey = aNumberFormatter.getTimeFormatKey();
 iLogicalFormatKey = aNumberFormatter.getLogicalFormatKey();
 bFormatKeysInitialized = true;
- }
+}
+
+m_xColPropertySet = UnoRuntime.queryInterface(XPropertySet.class, 
_xColumns.getByName(m_sFieldName));
+ColIndex = JavaTools.FieldInList(_xColumns.getElementNames(), 
m_sFieldName) + 1;
+m_nFieldType = 
AnyConverter.toInt(m_xColPropertySet.getPropertyValue("Type"));
+getTyperelatedFieldData();
 }
 catch (Exception e)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - wizards/com

 wizards/com/sun/star/wizards/common/NumberFormatter.java |5 +++-
 wizards/com/sun/star/wizards/db/FieldColumn.java |   16 +++
 2 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit fec488b9dc3018d421747fb887edee93ad3ed98e
Author: Lionel Elie Mamane 
Date:   Mon Jun 18 16:28:14 2012 +0200

fdo#43967 legacy report designer wizard formats dates improperly

1) Set FormatsSupplier property only if underlying object has one.
   Else, exception is thrown and the format is not set
2) getTyperelatedFieldData uses the format keys, so initialize them
   before call, not after.

Change-Id: I68c4c96a9da9a6afdc3ab8964e973588f53ee814

diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java 
b/wizards/com/sun/star/wizards/common/NumberFormatter.java
index 9c0feb5..bbf6385 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.java
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java
@@ -201,7 +201,10 @@ public class NumberFormatter
 Locale oLocale = (Locale) 
Helper.getUnoPropertyValue(xNumberFormat, "Locale");
 int NewFormatKey = defineNumberFormat(FormatString, oLocale);
 XPropertySet xPSet = UnoRuntime.queryInterface(XPropertySet.class, 
_xFormatObject);
-xPSet.setPropertyValue("FormatsSupplier", 
_oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier());
+if 
(xPSet.getPropertySetInfo().hasPropertyByName("FormatsSupplier"))
+{
+xPSet.setPropertyValue("FormatsSupplier", 
_oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier());
+}
 if (xPSet.getPropertySetInfo().hasPropertyByName("NumberFormat"))
 {
 xPSet.setPropertyValue("NumberFormat", new 
Integer(NewFormatKey));
diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java 
b/wizards/com/sun/star/wizards/db/FieldColumn.java
index ebedd22..47b37df 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.java
@@ -154,13 +154,8 @@ public class FieldColumn
 {
 try
 {
-m_xColPropertySet = UnoRuntime.queryInterface(XPropertySet.class, 
_xColumns.getByName(m_sFieldName));
-ColIndex = JavaTools.FieldInList(_xColumns.getElementNames(), 
m_sFieldName) + 1;
-m_nFieldType = 
AnyConverter.toInt(m_xColPropertySet.getPropertyValue("Type"));
-getTyperelatedFieldData();
-
- if (!bFormatKeysInitialized)
- {
+if (!bFormatKeysInitialized)
+{
 final NumberFormatter aNumberFormatter = 
oCommandMetaData.getNumberFormatter();
 
 iDateFormatKey = aNumberFormatter.getDateFormatKey();
@@ -170,7 +165,12 @@ public class FieldColumn
 iTimeFormatKey = aNumberFormatter.getTimeFormatKey();
 iLogicalFormatKey = aNumberFormatter.getLogicalFormatKey();
 bFormatKeysInitialized = true;
- }
+}
+
+m_xColPropertySet = UnoRuntime.queryInterface(XPropertySet.class, 
_xColumns.getByName(m_sFieldName));
+ColIndex = JavaTools.FieldInList(_xColumns.getElementNames(), 
m_sFieldName) + 1;
+m_nFieldType = 
AnyConverter.toInt(m_xColPropertySet.getPropertyValue("Type"));
+getTyperelatedFieldData();
 }
 catch (Exception e)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'features/base-preview'

New branch 'features/base-preview' available with the following commits:
commit e834a95359738961037b7f747f55ac60a0b9e922
Author: Lionel Elie Mamane 
Date:   Mon Jun 18 16:28:14 2012 +0200

fdo#43967 legacy report designer wizard formats dates improperly

1) Set FormatsSupplier property only if underlying object has one.
   Else, exception is thrown and the format is not set
2) getTyperelatedFieldData uses the format keys, so initialize them
   before call, not after.

Change-Id: I68c4c96a9da9a6afdc3ab8964e973588f53ee814

commit 56a6ac54c5b657f0625a9e6640a35d3148b332e1
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:28:50 2012 +0200

legacy reports: unify treatment of query and table

In *both* cases, the value of hidden control "Sorting" (if non-empty)
decides the columns being sorted on.

Change-Id: I7f4b50c3af8c12e48e5dedd36b5877ad7a9e1b66

commit 262f4bdf977badd1c6a898adbf4ee63b351f438f
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:26:58 2012 +0200

legacy report wizard: when source is table, save name in QueryName

Change-Id: Ie0bdbed9578b95f7fccc3d9ff6d9c8b5b91ac0ab

commit 88a941120c33ec085082e7554c5d5513d902522a
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:25:51 2012 +0200

SQLQueryComposer allow setQueryCommand with prependSorting instead of append

Change-Id: Ia06794537ea4d0f6f069c83709792ebbcc084804

commit a1d9f7037831b00c3f0325b89a97ab608e78704e
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:24:54 2012 +0200

db.SQLQueryComposer allow prependSortingCriteria call with 
addAliasFieldNames

Change-Id: I05889ccac213743a55c302bd7249b30f817c0428

commit cd86bca6b855f32abb5267997c3f6fe704efa2fe
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:23:50 2012 +0200

cleanup

Change-Id: I1ce4279d434ffa58328e17863b2e68af1e813a99

commit 065dc0e21a5e37a7b9ddfd2dcf110f9eaf1222e7
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:23:30 2012 +0200

untabify

Change-Id: I984c84534cb4c6cda8bd73a43d79ec8e49afcdeb

commit 93f3a2ec2a9d1bf909559d06cf69a70fb2542e44
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:54:30 2012 +0200

i#102625 avoid fetching same row twice in different queries

We do a "SELECT * FROM table" just to fetch the primary key columns;
so reuse the same XResultSet to fetch all columns.
Else, we immediately issue a "SELECT * FROM table WHERE
primary_key=current_value" to read the other columns, which is
wasteful and particularly silly.

Commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b already tried
to do that, but was essentially reverted piecewise because
it caused fdo#47520, fdo#48345, fdo#50372.

Commit c08067d6da94743d53217cbc26cffae00a22dc3a thought it did that,
but actually reverted commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b.

This implementation fetches the whole current row and caches it in memory;
only one row is cached: when the current row changes, the cache contains
the new current row.

This could be problematic (wrt to memory consumption) if the current
row is big (e.g. with BLOBs) and nobody is interested in the data
anyway (as would often be the case with BLOBs). Note that because of
our "SELECT *", the driver most probably has it in memory already
anyway, so we don't make the situation that much worse.

This could be incrementally improved with a heuristic of not
preemptively caching binary data (and also not LONGVARCHAR / TEXT /
MEMO / ...); a getFOO on these columns would issue a specific "SELECT
column FROM table WHERE primary_key=current_value" each time.

The *real* complete fix to all these issues would be to not do "SELECT
*" at all. Use "SELECT pkey_col1, pkey_col2, ..." when we are only
interested in the key columns. As to data, somehow figure out which
columns were ar interested in and "SELECT" only these (and maybe only
those with "small datatype"?). Interesting columns could be determined
by our caller (creator) as an argument to our constructor, or some
heuristic (no binary data, no "big" unbound data).
Also be extra smart and use *(m_aKeyIter) when getFOO is called
on a column included in it (and don't include it in any subsequent
SELECT).

However, there are several pitfalls.

One is buggy drivers that give use column names of columns that we
cannot fetch :-| Using "SELECT *" works around that because the driver
there *obviously* gives us only fetchable columns in the result.

Another one is the very restrictive nature of some database access
technologies. Take for example ODBC:

 - Data can be fetched only *once* (with the SQLGetData interface;
   bound columns offer a way around that, but that's viable only for
   constant-length data, not variable-length data).

   This could be addressed by an intelligent & lazy cache.

Re: [PATCH] A few more improvements to the About dialogue

I pushed the second patch to master. Nevertheless, the first one does
not apply on today's master checkout, any chance you can pull and resend?

F.

On 18/06/12 15:52, Stefan Knorr wrote:
> Hi all,
> 
> I hope it's okay to send multiple related patches to the list like
> this...
> 
> Some time ago, Jean-Baptiste Faure criticised my slightly nicer version
> of About for it cutting of the button row when it got too long. This is
> fixed by 0001-Fix-display... – the About box now resizes in that case.
> (Screenshot with long text string attached.)
> 
> 0002-Remove... removes the help menu entries for Credits and License
> information, as these are duplicated inside the new About box. (Note
> however that About for some reason uses the online versions, while the
> menu entries opened the local versions of these files.)
> 
> Regards,
> 
> Astron.
> 
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 


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

[Libreoffice-commits] .: basctl/uiconfig chart2/uiconfig dbaccess/uiconfig extensions/source framework/uiconfig reportdesign/uiconfig sc/uiconfig sd/uiconfig starmath/uiconfig sw/uiconfig

 basctl/uiconfig/basicide/menubar/menubar.xml  |
2 --
 chart2/uiconfig/menubar/menubar.xml   |
2 --
 dbaccess/uiconfig/dbapp/menubar/menubar.xml   |
2 --
 dbaccess/uiconfig/dbquery/menubar/menubar.xml |
2 --
 dbaccess/uiconfig/dbrelation/menubar/menubar.xml  |
2 --
 dbaccess/uiconfig/dbtable/menubar/menubar.xml |
2 --
 dbaccess/uiconfig/dbtdata/menubar/menubar.xml |
2 --
 extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml |
1 -
 framework/uiconfig/startmodule/menubar/menubar.xml|
2 --
 reportdesign/uiconfig/dbreport/menubar/menubar.xml|
2 --
 sc/uiconfig/scalc/menubar/menubar.xml |
2 --
 sd/uiconfig/sdraw/menubar/menubar.xml |
2 --
 sd/uiconfig/simpress/menubar/menubar.xml  |
2 --
 starmath/uiconfig/smath/menubar/menubar.xml   |
2 --
 sw/uiconfig/sglobal/menubar/menubar.xml   |
2 --
 sw/uiconfig/sweb/menubar/menubar.xml  |
2 --
 sw/uiconfig/swform/menubar/menubar.xml|
2 --
 sw/uiconfig/swreport/menubar/menubar.xml  |
2 --
 sw/uiconfig/swriter/menubar/menubar.xml   |
2 --
 sw/uiconfig/swxform/menubar/menubar.xml   |
2 --
 20 files changed, 39 deletions(-)

New commits:
commit f4c567f8d4c46aca75f7c73d67e0bc952b4c2e2d
Author: Stefan Knorr (astron) 
Date:   Mon Jun 18 15:25:10 2012 +0200

Remove License/Credits menu items

The About dialog now houses these functions.

Change-Id: I7f751027564897a063d2910644c69680d471b6d9

Signed-off-by: Fridrich Å trba 

diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml 
b/basctl/uiconfig/basicide/menubar/menubar.xml
index e326a25..a3cca1e 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -102,8 +102,6 @@
 
 
 
-
-
 
 
 
diff --git a/chart2/uiconfig/menubar/menubar.xml 
b/chart2/uiconfig/menubar/menubar.xml
index 353a8ad..8a17aec 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -150,8 +150,6 @@
 
 
 
-
-
 
 
 
diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml 
b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index e15bfe4..4ee268b 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -152,8 +152,6 @@
 
 
 
-
-
 
 
 
diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml 
b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index 09ab390..d94e849 100644
--- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -93,8 +93,6 @@
 
 
 
-
-
 
 
 
diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml 
b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index 7587caa..0a8c014 100644
--- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -76,8 +76,6 @@
 
 
 
-
-
 
 
 
diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml 
b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index 213afbc..ba8f9b4 100644
--- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
@@ -77,8 +77,6 @@
 
 
 
-
-
 
 
 
diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml 
b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index f1fe857..fdce113 100644
--- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
@@ -85,8 +85,6 @@
 
 
 
-
-
 
 
 
diff --git 
a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 
b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
index f66c285..c2416e6 100644
--- a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
+++ b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
@@ -86,7 +86,6 @@
 
 
 
-

[PUSHED] GTK: don't crash on X errors

On 18/06/12 15:27, Ruslan Kabatsayev wrote:
> Hello,
> 
> This patch disables GDK's default behaviour of abort() on X errors
> such as BadAtom etc.. It'll just ignore such errors.
> Rationale:
> 1. KDE4 and GEN plugins ignore the X erorrs
> 2. X errors may be unavoidable in some cases, like when wrong Atom is
> returned in XConvertSelection/SelectionNotify
> 
> This will fix fdo#50920 and invalidate my message
> http://lists.freedesktop.org/archives/libreoffice/2012-June/033550.html
> .
> 
> Regards,
> Ruslan
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 


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

[Libreoffice-commits] .: Branch 'features/base-preview' - 0 commits -

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

[Libreoffice-commits] .: vcl/unx

 vcl/unx/gtk/app/gtkdata.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a7f69caf25662d72b685a2c3412f3a352a0c5a88
Author: Ruslan Kabatsayev 
Date:   Mon Jun 18 17:23:46 2012 +0400

GTK: don't crash on X errors

Change-Id: I5b1353b409bc7043d2d1c313a3606ed807eced4b

Signed-off-by: Fridrich Å trba 

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 4d58110..07beacc 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -668,6 +668,7 @@ void GtkData::Init()
 
 // init gtk/gdk
 gtk_init_check( &nParams, &pCmdLineAry );
+gdk_error_trap_push();
 
 for (i = 0; i < nParams; i++ )
 g_free( pCmdLineAry[i] );
___
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

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

--- Comment #18 from Timur  2012-06-18 07:31:40 PDT ---
Can you please explain the relation between this bug and Bug 37361 -
LibreOffice 3.5 most annoying bugs? 
Should unresolved bugs from Bug 37361 at some point (which?) be added here?

-- 
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

Re: [PUSHED] [PUSHED 3-5-5] fdo#50896 and typo in fdo#47044

Hi Stephan,

On Monday, 2012-06-18 16:16:13 +0200, Stephan Bergmann wrote:

> With Eike's +1 coming in delayed,

hmpf..
X-Greylist: delayed 2260 seconds by postgrey-1.32 at gabe;
Mon, 18 Jun 2012 13:30:11 CEST

> that's enough to actually push it

You were 10 minutes faster than me ;)

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpO1JBioR6DQ.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/cmclayout' - 9 commits - sfx2/inc sfx2/source tools/inc vcl/inc vcl/qa vcl/source

 sfx2/inc/sfx2/tabdlg.hxx |2 
 sfx2/source/dialog/tabdlg.cxx|   34 ---
 tools/inc/tools/wintypes.hxx |2 
 vcl/inc/vcl/dialog.hxx   |2 
 vcl/inc/vcl/layout.hxx   |4 +
 vcl/qa/cppunit/builder/demo.ui   |1 
 vcl/source/control/tabctrl.cxx   |8 ++-
 vcl/source/uipreviewer/previewer.cxx |4 +
 vcl/source/window/dialog.cxx |   75 ---
 vcl/source/window/layout.cxx |   75 ++-
 vcl/source/window/tabdlg.cxx |   12 -
 vcl/source/window/tabpage.cxx|3 -
 vcl/source/window/window.cxx |   36 ++--
 13 files changed, 171 insertions(+), 87 deletions(-)

New commits:
commit 8f9edf76a0c55c7ded76b40db3b5e9118e5b56e4
Author: CaolÃ¡n McNamara 
Date:   Mon Jun 18 14:38:37 2012 +0100

hook up tooltips

diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index 681212e..f1517ba 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -177,6 +177,7 @@
 True
 True
 True
+A 
tooltip example
 False
   
   
diff --git a/vcl/source/uipreviewer/previewer.cxx 
b/vcl/source/uipreviewer/previewer.cxx
index 5a09974..e18730b 100644
--- a/vcl/source/uipreviewer/previewer.cxx
+++ b/vcl/source/uipreviewer/previewer.cxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class UIPreviewApp : public Application
@@ -76,6 +77,9 @@ int UIPreviewApp::Main()
 aArgs[ 1 ] <<= 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY2_OFFICE));
 ::ucbhelper::ContentBroker::initialize(xSFactory, aArgs);
 
+// turn on tooltips
+Help::EnableQuickHelp();
+
 try
 {
 Dialog *pDialog = new Dialog(NULL, WB_STDDIALOG);
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index ba09b98..a8a3754 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9945,6 +9945,10 @@ bool Window::set_property(const rtl::OString &rKey, 
const rtl::OString &rValue)
 set_halign(toAlign(rValue));
 else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("valign")))
 set_valign(toAlign(rValue));
+else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("tooltip-markup")))
+SetQuickHelpText(rtl::OStringToOUString(rValue, 
RTL_TEXTENCODING_UTF8));
+else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("tooltip-text")))
+SetQuickHelpText(rtl::OStringToOUString(rValue, 
RTL_TEXTENCODING_UTF8));
 else
 {
 fprintf(stderr, "unhandled property %s\n", rKey.getStr());
commit 3c59fcb030daab7581c89bcf31fcd339ac49f690
Author: CaolÃ¡n McNamara 
Date:   Mon Jun 18 13:21:15 2012 +0100

make isLayoutEnabled stricter

dialog/tabpage must have only one child that is a container

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 5c41f18..dfe9aa5 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -694,9 +694,6 @@ void Dialog::StateChanged( StateChangedType nType )
 SetMinOutputSizePixel(aSize);
 SetSizePixel(aSize);
 setPosSizeOnContainee(aSize, *pBox);
-
-fprintf(stderr, "101 dialog sized to %d %d\n", aSize.Width(),
-aSize.Height());
 }
 
 if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
@@ -1184,9 +1181,9 @@ void Dialog::Draw( OutputDevice* pDev, const Point& rPos, 
const Size& rSize, sal
 
 bool Dialog::isLayoutEnabled() const
 {
-//Child is a container => we're layout enabled
+//Single child is a container => we're layout enabled
 const Window *pChild = GetWindow(WINDOW_FIRSTCHILD);
-return pChild && pChild->GetType() == WINDOW_CONTAINER;
+return pChild && pChild->GetType() == WINDOW_CONTAINER && 
!pChild->GetWindow(WINDOW_NEXT);
 }
 
 Size Dialog::GetOptimalSize(WindowSizeType eType) const
@@ -1221,12 +1218,14 @@ IMPL_LINK( Dialog, ImplHandleLayoutTimerHdl, void*, 
EMPTYARG )
 {
 fprintf(stderr, "ImplHandleLayoutTimerHdl\n");
 
-VclBox *pBox = static_cast(GetWindow(WINDOW_FIRSTCHILD));
-if (!pBox)
+if (!isLayoutEnabled())
 {
-fprintf(stderr, "WTF!\n");
+fprintf(stderr, "Dialog has become non-layout because extra children 
have been added directly to it!\n");
 return 0;
 }
+
+VclBox *pBox = static_cast(GetWindow(WINDOW_FIRSTCHILD));
+assert(pBox);
 setPosSizeOnContainee(GetSizePixel(), *pBox);
 return 0;
 }
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 418b056..d3a8ab4 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -49,8 +49,6 @@ Size VclContainer::GetOptimalSize(WindowSizeType eType) const
 
 void VclContainer::SetPosSizePixe

[Libreoffice-commits] .: 2 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/inc

 binfilter/bf_basic/source/sbx/sbxscan.cxx |4 ++--
 binfilter/bf_sc/source/core/tool/sc_compiler.cxx  |4 ++--
 binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx |2 +-
 binfilter/bf_svtools/source/numbers/svt_zforfind.cxx  |4 ++--
 binfilter/bf_svtools/source/numbers/svt_zforscan.cxx  |6 +++---
 binfilter/bf_svx/source/items/svx_paraitem.cxx|4 ++--
 binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx   |2 +-
 binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx   |2 +-
 binfilter/bf_sw/source/core/bastyp/sw_calc.cxx|   10 +-
 binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx  |2 +-
 binfilter/inc/bf_tools/string.hxx |5 +
 11 files changed, 25 insertions(+), 20 deletions(-)

New commits:
commit 841ffc4a848f8ca496154e4a37be8c3dc0db3107
Author: CaolÃ¡n McNamara 
Date:   Mon Jun 18 11:34:32 2012 +0100

detect wrong UniString ctor

there's no way j was intended to be used as a rtl_TextEncoding
here. From context it's clearly meant to create a UniString from
a subset of the input ByteString

Change-Id: I4aa47173a8c81b3e61a14697ed3db89e93f4637b

diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx 
b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
index e2bcfe0..ea35f0f 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
@@ -1178,7 +1178,7 @@ void SgfFontOne::ReadOne( const rtl::OString& rID, 
ByteString& Dsc )
 i--;
 j++;
 }
-SVFName=String(Dsc,i+1,j);   // SV-Fontname rausholen
+SVFName=String(Dsc,i+1,j,RTL_TEXTENCODING_IBM_437); // SV-Fontname 
rausholen
 Dsc.Erase(i,j);
 
 IFID = (UINT32)rID.toInt32();
diff --git a/binfilter/inc/bf_tools/string.hxx 
b/binfilter/inc/bf_tools/string.hxx
index ab65840..d8dfdfd 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -277,6 +277,11 @@ private:
 
 //detect and reject use of RTL_CONSTASCII_STRINGPARAM instead of 
RTL_CONSTASCII_USTRINGPARAM
 UniString( const sal_Char*, sal_Int32 );
+
+//detect and reject wrong way to attempt to create a UniString from a 
substring of
+//a ByteString
+UniString( const ByteString& rByteStr, xub_StrLen nPos, xub_StrLen nLen,
+   sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS );
 public:
 UniString();
 UniString( const UniString& rStr );
commit df9db235f9b1053bda9f220e383c8c5c0475bf23
Author: CaolÃ¡n McNamara 
Date:   Sun Jun 17 21:01:13 2012 +0100

convert LocaleDataWrapper to OUString

Change-Id: I3b0be7583db3985185ae7bd70d13ef0d233af84a

diff --git a/binfilter/bf_basic/source/sbx/sbxscan.cxx 
b/binfilter/bf_basic/source/sbx/sbxscan.cxx
index d6874e3..ccce18a 100644
--- a/binfilter/bf_basic/source/sbx/sbxscan.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxscan.cxx
@@ -51,8 +51,8 @@ void ImpGetIntntlSep( sal_Unicode& rcDecimalSep, sal_Unicode& 
rcThousandSep )
 {
 SvtSysLocale aSysLocale;
 const LocaleDataWrapper& rData = aSysLocale.GetLocaleData();
-rcDecimalSep = rData.getNumDecimalSep().GetBuffer()[0];
-rcThousandSep = rData.getNumThousandSep().GetBuffer()[0];
+rcDecimalSep = rData.getNumDecimalSep()[0];
+rcThousandSep = rData.getNumThousandSep()[0];
 }
 
 // Scannen eines Strings nach BASIC-Konventionen
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx 
b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index cc24c94..1fd82e0 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -867,7 +867,7 @@ namespace binfilter {
 /*N*/ // Has to be called before IsValue
 /*N*/   sal_Unicode ch1 = rName.GetChar(0);
 /*N*/   sal_Unicode cDecSep = ( pSymbolTable == pSymbolTableEnglish ? '.' :
-/*N*/ ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0) );
+/*N*/ ScGlobal::pLocaleData->getNumDecimalSep()[0] );
 /*N*/   if ( ch1 == cDecSep )
 /*N*/   return FALSE;
 /*N*/ // Who was that imbecile introducing '.' as the sheet name 
separator!?!
@@ -3049,7 +3049,7 @@ namespace binfilter {
 /*N*/ ::rtl::math::doubleToUStringBuffer( rBuffer, 
t->GetDouble(),
 /*N*/ rtl_math_StringFormat_Automatic,
 /*N*/ rtl_math_DecimalPlaces_Max,
-/*N*/ 
ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0),
+/*N*/ ScGlobal::pLocaleData->getNumDecimalSep()[0],
 /*N*/ TRUE );
 /*N*/ }
 /*N*/   }
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx 
b/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
index 17a38bb..b7b146b 100644
--- a/binfilter/bf_sv

Re: Enable CTL for Default?

I guess with all of this said my question still is, should I mark the 
bug report as WONTFIX and just have a comment why? It seems like 
enabling by default isn't the way to go and the time/energy it would 
take to add a language check might just be too much for a bug that 
affects such a limited number of usersespecially when there is an 
easy workaround (enable CTL in the options). I have never used it before 
so I can't even say I knew anything that it was used for until this 
thread, shows my ignorance.


Let me know and I'll pass on the message to the user (or someone else 
can throw a comment in the bug if you'd like).


Thanks,
Joel


On 06/18/2012 07:02 AM, Eike Rathke wrote:

Hi Khaled,

On Monday, 2012-06-18 13:39:03 +0200, Khaled Hosny wrote:


IMO CTL/Asian options is a remnants of distant past

Yes, it is ...


and should be
killed for good (not to mention that "Asian" is a so ignorant
orientalistic term in this context).

... but it is something that MS bestowed us and even persists in file
formats.

   Eike



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

Re: [PUSHED] [PUSHED 3-5-5] fdo#50896 and typo in fdo#47044


On 06/18/2012 02:08 PM, Stephan Bergmann wrote:

On 06/18/2012 11:03 AM, Fridrich Strba wrote:

I pushed the two commits to 3-6 and this one also to 3-5. WE need more
review for 3-5-5


Rats. Yes, quick, one more please to get this embarrassment out of the
way. ;)


With Eike's +1 coming in delayed, that's enough to actually push it as 
 
"fix typo: = -> ==."


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

[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - shell/source

 shell/source/backends/wininetbe/wininetbackend.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37939e6f03b89c678cdd83f1280f960dddb93bfc
Author: David Tardon 
Date:   Tue Jun 12 09:30:12 2012 +0200

fix typo: = -> ==

Signed-off-by: Fridrich Å trba 

(cherry picked from commit 1b0d64e7ac9225826368126d67a1381f823e3ed3)
Signed-off-by: Eike Rathke 
Signed-off-by: Stephan Bergmann 

Change-Id: Iba320b00bdef3704bdfe1abe2a60b8c767a571ec

diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx 
b/shell/source/backends/wininetbe/wininetbackend.cxx
index 5686689..cd82060 100755
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -140,7 +140,7 @@ WinInetBackend::WinInetBackend()
 if (!ok)
 {
 DWORD err = GetLastError();
-if (err = ERROR_INSUFFICIENT_BUFFER)
+if (err == ERROR_INSUFFICIENT_BUFFER)
 {
 // allocate sufficient space on the heap
 // insufficient space on the heap results
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Cleaning bug list

I'll modify the orientation today or tomorrow and try to see where 
regression should fit. I think that it has to go in Priority and not in 
Severity. As for how devs use it, I agree completely that right now it's 
almost useless but maybe if it becomes more uniform and it actually 
provides some information as to what the bug is doingwho knows. For 
instance for me, at this point my abilities are pretty low so trivial 
bugs seem to be the go to...hopefully in the future this changes. As for 
users prioritizing themselves, I've (mentioned/suggested/got irritated 
with) in comments a couple users setting Severity to Critical for 
something as minor as Conditional Formatting, it's almost to the point 
that it is useless to "let" the end user categorize their own bugs like 
this.


Maybe regression should automatically set Priority to "Highest" 
regardless of how many people are affected.


Ok off to work. Glad it at least seems a little useful. I have such 
limited experience in programming/programming projects that I just felt 
a bit overwhelmed so this helped me quite a bit last night when I was 
going through bugs.



Joel

On 06/18/2012 04:21 AM, Rainer Bielefeld wrote:

Joel Madero schrieb:

I brainstormed a bit today and I came up with this flowchart.



Hi Joel,

great to see that all in a chart, your conclusions and definitions 
seem plausible.


But the chart also shows the limitations of that concept: It's really 
sophisticated, and no developer will sit at his's desk to decide 
whether he should fix a Bug with Severity=major and Priority=normal 
before or after a bug with  Severity=normal and Priority=high  ;-)


But as you stated, such a chart can give some orientation, and so I 
think it should be shown in the Wiki. Not on one of the current 
existing Pages like BugTriage or similar, but on a page where should 
gather detailed background information what would blow up those pages 
too much, but nevertheless are interesting or important to know for 
all who want to gain more knowledge concerning th bugfixing, QA or 
whatever else process.


The question is whether the Priority entry is evaluated by anyone, 
IMHO most here see that as a personal statement (of reporter?) 
concerning importance of the bug - and ignore it.


Best regards


Rainer


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

[Libreoffice-commits] .: sw/source uui/source xmlhelp/source

2012-06-18 Thread Takeshi Abe

 sw/source/core/access/acccontext.hxx   |2 --
 sw/source/core/access/accfrmobjmap.hxx |1 -
 sw/source/core/inc/SwXMLTextBlocks.hxx |1 -
 sw/source/core/inc/UndoCore.hxx|1 -
 sw/source/core/inc/flyfrm.hxx  |1 -
 sw/source/core/inc/fntcache.hxx|1 -
 sw/source/core/inc/frame.hxx   |1 -
 sw/source/core/inc/frmtool.hxx |1 -
 sw/source/core/inc/layouter.hxx|2 --
 sw/source/core/inc/notxtfrm.hxx|1 -
 sw/source/core/inc/pagefrm.hxx |1 -
 sw/source/core/inc/retrieveinputstreamconsumer.hxx |1 -
 sw/source/core/inc/rolbck.hxx  |3 ---
 sw/source/core/inc/swblocks.hxx|1 -
 sw/source/core/inc/tblrwcl.hxx |2 --
 sw/source/core/inc/unometa.hxx |1 -
 sw/source/core/text/inftxt.hxx |1 -
 sw/source/core/text/txtfly.hxx |1 -
 sw/source/filter/html/swcss1.hxx   |1 -
 sw/source/filter/inc/fltglbls.hxx  |3 ---
 sw/source/filter/inc/wrtswtbl.hxx  |2 --
 sw/source/filter/ww8/WW8TableInfo.hxx  |1 -
 sw/source/filter/ww8/attributeoutputbase.hxx   |3 ---
 sw/source/filter/ww8/docxexport.hxx|2 --
 sw/source/filter/ww8/rtfattributeoutput.hxx|1 -
 sw/source/filter/ww8/rtfexport.hxx |4 
 sw/source/filter/ww8/writerhelper.hxx  |1 -
 sw/source/filter/ww8/wrtww8.hxx|2 --
 sw/source/filter/xml/xmlexp.hxx|1 -
 sw/source/filter/xml/xmlimp.hxx|1 -
 sw/source/ui/dbui/addresslistdialog.hxx|1 -
 sw/source/ui/dialog/swdlgfact.hxx  |2 --
 sw/source/ui/envelp/labimp.hxx |2 --
 sw/source/ui/inc/basesh.hxx|2 --
 sw/source/ui/inc/dbtree.hxx|3 ---
 sw/source/ui/inc/drwtxtsh.hxx  |1 -
 sw/source/ui/inc/frmmgr.hxx|1 -
 sw/source/ui/inc/mailmergechildwindow.hxx  |2 --
 sw/source/ui/inc/mailmergehelper.hxx   |5 -
 sw/source/ui/inc/mmconfigitem.hxx  |1 -
 sw/source/ui/inc/navsh.hxx |3 ---
 sw/source/ui/inc/optpage.hxx   |1 -
 sw/source/ui/inc/pardlg.hxx|3 ---
 sw/source/ui/inc/regionsw.hxx  |1 -
 sw/source/ui/inc/tabledlg.hxx  |1 -
 sw/source/ui/inc/tablemgr.hxx  |1 -
 sw/source/ui/inc/titlepage.hxx |2 --
 sw/source/ui/inc/uitool.hxx|1 -
 sw/source/ui/inc/view.hxx  |8 
 sw/source/ui/inc/wordcountdialog.hxx   |2 --
 sw/source/ui/inc/wrtsh.hxx |7 ---
 sw/source/ui/lingu/sdrhhcwrap.hxx  |1 -
 sw/source/ui/uiview/viewfunc.hxx   |1 -
 sw/source/ui/uno/swdetect.hxx  |8 
 uui/source/lockfailed.hxx  |2 --
 uui/source/secmacrowarnings.hxx|4 
 xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx |3 ---
 xmlhelp/source/cxxhelp/inc/qe/Query.hxx|3 ---
 xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx   |3 ---
 59 files changed, 120 deletions(-)

New commits:
commit 40bb1f631b1b79db919474846996e67eb12a9907
Author: Takeshi Abe 
Date:   Mon Jun 18 23:03:37 2012 +0900

removed unused forward declarations of class

Change-Id: I32894b853912741e935e2409d2857fe384f67665

diff --git a/sw/source/core/access/acccontext.hxx 
b/sw/source/core/access/acccontext.hxx
index a11e91b..0c51298 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -47,8 +47,6 @@ namespace utl {
 namespace accessibility {
 class AccessibleShape;
 }
-class SwFmtFld;
-class SwAccessibleChildContainer;
 
 const sal_Char sAccessibleServiceName[] = 
"com.sun.star.accessibility.Accessible";
 
diff --git a/sw/source/core/access/accfrmobjmap.hxx 
b/sw/source/core/access/accfrmobjmap.hxx
index 441202e..63814f1 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -35,7 +35,6 @@
 #include 
 
 class SwAccessibleMap;
-class SwDoc;
 class SwRect;
 class SwFrm;
 class SdrObject;
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx 
b/sw/source/core/inc/SwXMLTextBlocks.hxx
index bb80612..895f759 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 
-class SfxMedium;
 class SwPaM;
 class SwDo

Re: Enable CTL for Default?

Hi Khaled,

On Monday, 2012-06-18 13:39:03 +0200, Khaled Hosny wrote:

> IMO CTL/Asian options is a remnants of distant past

Yes, it is ...

> and should be
> killed for good (not to mention that "Asian" is a so ignorant
> orientalistic term in this context).

... but it is something that MS bestowed us and even persists in file
formats.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpDL1j3QHEH7.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 3.6 FEATURE] Masterpages

2012-06-18 Thread Bjoern Michaelsen

Hi,

On Mon, Jun 18, 2012 at 03:35:11PM +0200, Petr Mladek wrote:
> 1. Make sure that "CubaLibre" is not listed as the first template
>(rename it or rename any other template).
> 
>I like it. The problem is that it is not standard because the text is
>rotated. If you start with this template, the text stays rotated even
>if you later use another background. If you start with default
>document and use this background, the text is not rotated and it
>looks ugly.
> 
>=> I think that this template is a timing bomb to produce flood of
>   bug reports and bad feedback. If we want it, it should not be the
>   first template at least ;-)

Renaming it might be a good idea anyway as "CubaLibre" is politically loaded
and might or might not be offensive to some. While that is ok for optional
downloadable content, for a masterpage in the core product it might be better
to stay with something more neutral. @Alex: Any suggestions for an alternative
name? I will do that adjustment then together with the removal of BrightBlue as
both need to touch the list of masterpage names.

> 2. We need to make sure that all templates are centered, have right size
>by default and are resized when you resize the application window.
> 
>+ most of them have zoom set to more than 100% => you see only
>  part of it when opening. We should set 90% or so.

@Alex: Can you fix those up?

>+ Many of them has "ZoomOnPage" flag disabled => if you resize
>  the application window, the slide size stays the same. For
>  example, if you make the window smaller, you suddenly see only
>  part of the slide. If we enable "ZoomOnPage", the slide is
>  resized to follow the application window size (usual behavior).
> 
>  I am not sure where this is set in the UI. I see it in the
>  document (settings.xml):
> 
>  config:type="boolean">false

Ok, I will try to adjust those.

> 3. I would prefer if the title strings are set to "en_US" strings.
>It is the default language and fallback for everything. It might
>solve also the problem with Russian localization.
> 4. It would be great to optimize the png pictures using optipng tool. It
>safes about 10%. I could provide opimized PNGs if you want.

@Alex: Can you take care of these two too?

> PS: All would be easier if we support flat ODF for templates or if we
> keep them in another repo. Them we need not be that careful about
> committing changes and could do changes more iteratively.

Given the cardhouse fragility of this area of code, I wouldnt want to go there
for 3.6.

Best,

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

Re: [PUSHED] [REVIEW 3-5-5] fdo#50896 and typo in fdo#47044

Hi,

On Monday, 2012-06-18 11:03:40 +0200, Fridrich Strba wrote:

> >> * 
> >> http://cgit.freedesktop.org/libreoffice/core/commit/?id=02d9bd3b14575442a6532915cdb18bb4a69ad35f
> I pushed the two commits to 3-6 and this one also to 3-5. WE need more
> review for 3-5-5

Fine with me, one more review needed.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgppJ2WbfVKrl.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Cleaning bug list

2012-06-18 Thread Rainer Bielefeld


Joel Madero schrieb:

I brainstormed a bit today and I came up with this flowchart.



Hi Joel,

great to see that all in a chart, your conclusions and definitions seem 
plausible.


But the chart also shows the limitations of that concept: It's really 
sophisticated, and no developer will sit at his's desk to decide whether 
he should fix a Bug with Severity=major and Priority=normal before or 
after a bug with  Severity=normal and Priority=high  ;-)


But as you stated, such a chart can give some orientation, and so I 
think it should be shown in the Wiki. Not on one of the current existing 
Pages like BugTriage or similar, but on a page where should gather 
detailed background information what would blow up those pages too much, 
but nevertheless are interesting or important to know for all who want 
to gain more knowledge concerning th bugfixing, QA or whatever else process.


The question is whether the Priority entry is evaluated by anyone, IMHO 
most here see that as a personal statement (of reporter?) concerning 
importance of the bug - and ignore it.


Best regards


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

Re: Enable CTL for Default?

Hi Christian,

On Monday, 2012-06-18 13:28:15 +0200, Christian Lohmaier wrote:

> I don't agree with the "performance" statement there is no performance
> impact AFAIK. All RTL functionality is there even without the option
> activated. You can open and edit RTL/CTL documents even without that
> option turned on.
> Only the UI controls to set the advanced formatting options are hidden.

Not only. There's also visible cursor travelling, input sequence
checking and detection of writing mode that are only active for CTL.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgp0T7bA0vKiE.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 3.6 FEATURE] Masterpages

Hi,

ah, it is still pending, so I looked at it. Sigh, I though that I would
just approve it but I am afraid that we need some more changes before
pushing :-(


Bjoern Michaelsen píše v Pá 08. 06. 2012 v 18:28 +0200:
> Hi there,
> 
> please review the changes:
> 
> http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/masterpages&id=0442e067cdb4887aa6e57a0e31cd0df7c4eab086
> http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/masterpages&id=f456a863e6e05d05763a86506a953936453bcae6
> http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/masterpages&id=bb0c424f437cc86dd98251aeee2f22e3893986a8
> http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/masterpages&id=50046236bc52c67b0a1cc6a01600070855281d9c
> 
> for integration into libreoffice-3-6 as a late feature requireing 3 signoffs
> from different vendors. 0442e067cdb4887aa6e57a0e31cd0df7c4eab086 and
> f456a863e6e05d05763a86506a953936453bcae6 will be squashed into one commit for
> now needlessly expanding the repo. bb0c424f437cc86dd98251aeee2f22e3893986a8
> and 50046236bc52c67b0a1cc6a01600070855281d9c will be squashed as the
> intermediate state does not finish a compile from scratch.

I like the templates but I suggest the following changes:


1. Make sure that "CubaLibre" is not listed as the first template
   (rename it or rename any other template).

   I like it. The problem is that it is not standard because the text is
   rotated. If you start with this template, the text stays rotated even
   if you later use another background. If you start with default
   document and use this background, the text is not rotated and it
   looks ugly.

   => I think that this template is a timing bomb to produce flood of
  bug reports and bad feedback. If we want it, it should not be the
  first template at least ;-)


2. We need to make sure that all templates are centered, have right size
   by default and are resized when you resize the application window.

   + most of them have zoom set to more than 100% => you see only
 part of it when opening. We should set 90% or so.


   + Many of them has "ZoomOnPage" flag disabled => if you resize
 the application window, the slide size stays the same. For
 example, if you make the window smaller, you suddenly see only
 part of the slide. If we enable "ZoomOnPage", the slide is
 resized to follow the application window size (usual behavior).

 I am not sure where this is set in the UI. I see it in the
 document (settings.xml):

 false


3. I would prefer if the title strings are set to "en_US" strings.
   It is the default language and fallback for everything. It might
   solve also the problem with Russian localization.


4. It would be great to optimize the png pictures using optipng tool. It
   safes about 10%. I could provide opimized PNGs if you want.


I would prefer to fix the above before pushing to reduce the commit
size. I think that it is acceptable to wait for beta3 with this.

Are you able to have this ready for 3.6.0-beta3?


Best Regards,
Petr

PS: All would be easier if we support flat ODF for templates or if we
keep them in another repo. Them we need not be that careful about
committing changes and could do changes more iteratively.

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

[PATCH] GTK: don't crash on X errors

2012-06-18 Thread Ruslan Kabatsayev

Hello,

This patch disables GDK's default behaviour of abort() on X errors
such as BadAtom etc.. It'll just ignore such errors.
Rationale:
1. KDE4 and GEN plugins ignore the X erorrs
2. X errors may be unavoidable in some cases, like when wrong Atom is
returned in XConvertSelection/SelectionNotify

This will fix fdo#50920 and invalidate my message
http://lists.freedesktop.org/archives/libreoffice/2012-June/033550.html
.

Regards,
Ruslan


0002-GTK-don-t-crash-on-X-errors.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

gerrit for release branches (bots ftw?)

2012-06-18 Thread Bjoern Michaelsen


Hi all,

reviewing patches for a release branch is currently a hassle:

submitter:
- find cgit link
- write to mailing list with cgit link asking for review

reviewer:
- check out the release branch
- cherrypick commit on release branch by exctracting the commit-id from the 
cgit link
- review the commit
- push commit on the release branch
- mail to list that the stuff is pushed

using gerrit its a bit simpler for the reviewer:
- check out the release branch
- gerrit-cherry-pick the commit
- push the commit to the release branch (gerrit will take care of notifying the 
submitter

but the submitter has a bit more to do:
- check out the release branch
- cherry-pick the commit
- push to refs/for/libreoffice-3-5

While that is rather simple, it could be scripted even simpler. I submitted a 
bug to gerrit wrt this:

 http://code.google.com/p/gerrit/issues/detail?id=1446

but maybe I am just overlooking a best practice there. If not, we might
alternatively have either a email or an IRC bot, which you send a message like:

 releasereview 213d5355d78a0a690e366645d6416f4a8fe5e666 libroffice-3-5

and it will do all of the above on its own. Opinions on that? Is it better to
have an IRC or an Email bot?

Best,

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

Re: Smooth filter - to release notes

2012-06-18 Thread Tomaž Vajngerl

On Mon, Jun 18, 2012 at 9:56 AM, Jan Holesovsky  wrote:
> Hi Tomaž,
>
> First of all, thanks for all the work around the better bitmap
> filters! :-) - I love that:
>
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=ee41193f3e12ea55237f7681e4b53162a0d421d2
>
> [and around]
>
> Can you please add that to
>
> http://wiki.documentfoundation.org/ReleaseNotes/3.7
>
> ideally with a screenshot / screenshots?
>
> All the best,
> Kendy

Hi,

I intended to add this to the release notes but 3.7 release is still
far away and I want to play with the UI for filters. I want to make
something similar to "contour editor" and "image map" but for image
manipulation, where you could make changes to the specified image and
see the changes in the preview window. Afterwards you could apply the
changes to the actual image in the document. I think this is a more
natural way to do image manipulation than the current solution. What
do you think?

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

Re: [PUSHED 3-5][REVIEW 3-5-5] [PUSHED-3-5-5] Fix arguments to Rectangle constructor in GtkSalSystem::GetDisplayScreenPosSizePixel()

> Looks good indeed.  One more...

+1, cherry-picked and pushed to 3-5-5.

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

[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - vcl/unx

 vcl/unx/gtk/app/gtksys.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bd666d98e0f06dfd91f6a9604967d92088e01206
Author: Ruslan Kabatsayev 
Date:   Sat Jun 16 03:49:20 2012 +0400

Fix arguments of Rectangle constructor

Change-Id: I8f288e55694ac85f8dcd2884a53ff4b5b9eef02f
Signed-off-by: Fridrich Å trba 
Signed-off-by: Stephan Bergmann 
Signed-off-by: Tor Lillqvist 

diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index ec8fbef..78c528c 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -246,7 +246,7 @@ Rectangle GtkSalSystem::GetDisplayScreenPosSizePixel 
(unsigned int nScreen)
 if (!pScreen)
 return Rectangle();
 gdk_screen_get_monitor_geometry (pScreen, nMonitor, &aRect);
-return Rectangle (aRect.x, aRect.y, aRect.width, aRect.height);
+return Rectangle (Point(aRect.x, aRect.y), Size(aRect.width, 
aRect.height));
 }
 
 Rectangle GtkSalSystem::GetDisplayScreenWorkAreaPosSizePixel (unsigned int 
nScreen)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH 6/6] Remove unnecessary temp variable


On 06/18/2012 02:35 PM, Stephan Bergmann wrote:

On 06/18/2012 10:01 AM, Brad Sowden wrote:

diff --git a/sw/source/ui/docvw/edtwin.cxx
b/sw/source/ui/docvw/edtwin.cxx
index 04e6e73..9f6d2f2 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4992,12 +4992,9 @@ void SwEditWin::Command( const CommandEvent&
rCEvt )
rSh.IsCrsrReadonly();
if(!bIsDocReadOnly)
{
- QuickHelpData aTmpQHD;
if( pQuickHlpData->m_bIsDisplayed )
- {
- aTmpQHD.Move( *pQuickHlpData );
pQuickHlpData->Stop( rSh );
- }
+
String sWord;
if( rSh.HasDrawView() && rSh.GetDrawView()->IsTextEdit() )
{


Merely browsing through this quickly, just a minor nit that keeping {
... } even around a single statement is mostly preferable to removing
the (technically redundant) braces. All too easily, the next maintainer
(or somebody trying to quickly add a SAL_DEBUG locally) will
inadvertently forget to add the braces back when adding a second
statement to the conditional block.


...and looking closer, are you sure that aTmpQHD is really unnecessary 
anyway?  Note that QuickHelpData::Move modifies its argument (which it 
takes by non-const reference)---what it effectively does is clear 
pQuickHlpData->m_aHelpStrings, and I'm not sure whether that is relevant 
or just some misguided optimization.


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

Re: fdo#38731 - Papiamentu not avaliable as language

Hi Rob,

On Friday, 2012-06-15 23:27:22 +0200, Rob Snelders wrote:

> I have looked at this bug. The problem consists of 2 parts:
> - The language-name is updated. Because the country Dutch Antilles
> is gone and the country has split into Curacao and a part has become
> the Netherlands. The language Papiamentu has now pap_cw and pap_bq.

So we need new aliases and/or mappings for them to construct those
locales.

> Of both I can't find the locale IDs Windows uses to define them.
> Where should I find them (I used the links on
> http://erack.de/bookmarks/D.html#GIL_MS) or as what do I need to
> define them?

I'll take care of it.

Windows has only 0x0479 we use as LANGUAGE_PAPIAMENTU mapping to pap-AN,
and additionally we came up with LANGUAGE_USER_PAPIAMENTU_ARUBA 0x8079
mapping to pap-AW.

Any preference if pap-AN should map to the new pap-CW or pap-BQ and
which? Or should we better come up with completely new locales?

> - The current papiamentu languages can be found in the
> character-dialog when you set a language there. But they can't be
> found in the options-dialog at the language selecter. Can I add them
> there or isn't that allowed?

Locales and default document language lists show only locales for which
locale data exists, so far no pap-* locale has any. For how to
contribute please see
https://wiki.documentfoundation.org/LibreOffice_Localization_Guide/How_To_Submit_New_Locale_Data

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD

pgpNkjAmgNdvu.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH 6/6] Remove unnecessary temp variable


On 06/18/2012 10:01 AM, Brad Sowden wrote:

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 04e6e73..9f6d2f2 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4992,12 +4992,9 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
   rSh.IsCrsrReadonly();
 if(!bIsDocReadOnly)
 {
-QuickHelpData aTmpQHD;
 if( pQuickHlpData->m_bIsDisplayed )
-{
-aTmpQHD.Move( *pQuickHlpData );
 pQuickHlpData->Stop( rSh );
-}
+
 String sWord;
 if( rSh.HasDrawView() && rSh.GetDrawView()->IsTextEdit() )
 {


Merely browsing through this quickly, just a minor nit that keeping { 
... } even around a single statement is mostly preferable to removing 
the (technically redundant) braces.  All too easily, the next maintainer 
(or somebody trying to quickly add a SAL_DEBUG locally) will 
inadvertently forget to add the braces back when adding a second 
statement to the conditional block.


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

Re: Enable CTL for Default?

> IMO CTL/Asian options is a remnants of distant past and should be
> killed for good (not to mention that "Asian" is a so ignorant
> orientalistic term in this context).

I agree. It enforces the idea that "Western" (whatever *that* then
means...) languages and/or scripts would be the "normal" ones, and
others more or less "exotic". Goes directly against the stated
principles of TDF I think.

(I really wish, seriously, that Unicode wouldn't have put USASCII in
the first 128 slots, but assigned codepoints totally randomly.)

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

Re: [PUSHED] Add casts to reduce javac warning messages


On 06/18/2012 11:41 AM, Noel Grandin wrote:

This patch removes a few of the javac warning messages i.e. helps to
reduce noise in the build logs.


Pushed, thanks.  (Followed by some further clean up, while we are at it, 
 
"Clean up some more.")


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

[Libreoffice-commits] .: 2 commits - wizards/com

 wizards/com/sun/star/wizards/ui/event/DataAware.java|8 ++
 wizards/com/sun/star/wizards/ui/event/MethodInvocation.java |   14 ++--
 2 files changed, 6 insertions(+), 16 deletions(-)

New commits:
commit 213d5355d78a0a690e366645d6416f4a8fe5e666
Author: Stephan Bergmann 
Date:   Mon Jun 18 14:23:19 2012 +0200

Clean up some more

...making use of Java 5 variadic function parameters.

Change-Id: I1b538ec7fbb3021a225031543e25dad081a7a409

diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java 
b/wizards/com/sun/star/wizards/ui/event/DataAware.java
index 98c3ea7..c77f9eb 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java
@@ -291,15 +291,13 @@ public abstract class DataAware {
  * @param obj the object which contains the property.
  * @return the get method reflection object.
  */
-private static Class[] EMPTY_ARRAY = new Class[0];
-
 protected Method createGetMethod(String propName, Object obj)
 {
 Method m = null;
 try
 { //try to get a "get" method.
 
-m = obj.getClass().getMethod("get" + propName, EMPTY_ARRAY);
+m = obj.getClass().getMethod("get" + propName);
 }
 catch (NoSuchMethodException ex1)
 {
@@ -313,7 +311,7 @@ public abstract class DataAware {
  */
 public Object get(Object target) {
 try {
-return getMethod.invoke(target, (Object[])EMPTY_ARRAY);
+return getMethod.invoke(target);
 } catch (IllegalAccessException ex1) {
 ex1.printStackTrace();
 } catch (InvocationTargetException ex2) {
@@ -334,7 +332,7 @@ public abstract class DataAware {
 protected Method createSetMethod(String propName, Object obj, Class 
paramClass) {
 Method m = null;
 try {
-m = obj.getClass().getMethod("set" + propName, new Class[] { 
paramClass });
+m = obj.getClass().getMethod("set" + propName, paramClass);
 } catch (NoSuchMethodException ex1) {
 throw new IllegalArgumentException("set" + propName + "(" + 
getMethod.getReturnType().getName() + ") method does not exist on " + 
obj.getClass().getName());
 }
diff --git a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java 
b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
index 182e96f..b1d44e3 100644
--- a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
+++ b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
@@ -42,10 +42,6 @@ import java.lang.reflect.Method;
  */
 public class MethodInvocation
 {
-
-static final Class[] EMPTY_ARRAY =
-{
-};
 //the method to invoke.
 Method mMethod;
 //the object to invoke the method on.
@@ -66,10 +62,7 @@ public class MethodInvocation
 
 public MethodInvocation(String methodName, Object obj, Class paramClass) 
throws NoSuchMethodException
 {
-this(paramClass == null ? obj.getClass().getMethod(methodName, 
(Class[])null) : obj.getClass().getMethod(methodName, new Class[]
-{
-paramClass
-}), obj, paramClass);
+this(paramClass == null ? obj.getClass().getMethod(methodName) : 
obj.getClass().getMethod(methodName, paramClass), obj, paramClass);
 }
 
 public MethodInvocation(Method method, Object obj, Class paramClass)
@@ -86,12 +79,11 @@ public class MethodInvocation
 {
 if (mWithParam)
 {
-return mMethod.invoke(mObject, (Object) param
-);
+return mMethod.invoke(mObject, param);
 }
 else
 {
-return mMethod.invoke(mObject, (Object[])EMPTY_ARRAY);
+return mMethod.invoke(mObject);
 }
 }
 
commit 5695aea3bbe719881177b35c805920bee608751b
Author: Noel Grandin 
Date:   Mon Jun 18 11:37:19 2012 +0200

Add casts to reduce javac warning messages.

These warning arise because of the additional of varargs parameters
in Java1.6. Casting the parameter eliminates the compiler
confusion.

Change-Id: I4906bcfa2700ef80a67b79c61c6848a18e8a7168

diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java 
b/wizards/com/sun/star/wizards/ui/event/DataAware.java
index 6138286..98c3ea7 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java
@@ -313,7 +313,7 @@ public abstract class DataAware {
  */
 public Object get(Object target) {
 try {
-return getMethod.invoke(target, EMPTY_ARRAY);
+return getMethod.invoke(target, (Object[])EMPTY_ARRAY);
 } catch (IllegalAccessException ex1) {
 ex1.printStackTrace();
 } catch (InvocationTa

Re: [PUSHED] [REVIEW 3-5-5] fdo#50896 and typo in fdo#47044


On 06/18/2012 11:03 AM, Fridrich Strba wrote:

I pushed the two commits to 3-6 and this one also to 3-5. WE need more
review for 3-5-5


Rats.  Yes, quick, one more please to get this embarrassment out of the 
way.  ;)


Stephan


On 17/06/12 08:22, Korrawit Pruegsanusak wrote:

On Sun, Jun 17, 2012 at 11:40 AM, Korrawit Pruegsanusak
  wrote:

* 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=02d9bd3b14575442a6532915cdb18bb4a69ad35f
This fixed a typo in fdo#47044 and should go into both -3-5 and -3-6 branch.


and to -3-5-5 if possible. :-)

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

Re: [REVIEW-3-5] MSVC qsort issue

Hi Muthu,

On Thursday, 2012-06-14 20:02:38 +0530, Muthu Subramanian K wrote:

> qsort seems to change the order of the elements even if the elements
> are sorted.

Yes, qsort and std::sort are not stable and preexisting relative
ordering is not preserved for equivalent elements.

> (Technically though it is correct), our way of applying
> color attributes goes out of order.
> For the field it should have been _FIELD data followed by
> EE_CHAR_COLOR, but then because of the qsort this gets reversed.

I don't know how that is implemented, but that sounds like _FIELD data
and EE_CHAR_COLOR have the same start value on which the attributes are
sorted, and EE_CHAR_COLOR is expected to follow the corresponding
_FIELD, yes? I wonder how that survived any sort, not just failing on
resort. But maybe I misunderstood.

> Please let me know if there is a better way to solve this problem
> rather than a work-around...

In general if a relative ordering (also partial order) of equivalent
elements needs to be preserved, the original position within the list
needs to be included in the sort as second field, so something like
start,position here. If two or more start values are equivalent then the
original order within those values is kept.

> +static bool isAlreadySorted( CharAttribArray &rAttribs )
> +{
> + bool bSorted = true;
> + sal_uInt16 nCount = rAttribs.Count();
> + for( sal_uInt16 i = 1; i < nCount && bSorted; i++ )
> + if( rAttribs.GetObject( i - 1 )->GetStart() > 
> rAttribs.GetObject( i )->GetStart() )
> +  bSorted = false;
> + return bSorted;
> +}

Depending on the size of the list iterating through all values may be
a bottle neck if the list usually is already sorted. But then again
qsort's worst performance is also if elements are already (nearly)
sorted.. for which one can shuffle the order first.

So, if the _FIELD and EE_CHAR_COLOR situation is indeed as I understood
above, keeping them together using the position would be needed anyway,
I think. Otherwise your workaround may be good enough.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD

pgp07X6DkXULL.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-5][REVIEW 3-5-5] Fix arguments to Rectangle constructor in GtkSalSystem::GetDisplayScreenPosSizePixel()


On 06/18/2012 10:59 AM, Fridrich Strba wrote:

Looks pretty simple. I pushed to master, 3-6, 3-5.

We need 2 more good souls to push to 3-5-5.


Looks good indeed.  One more...

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 3 commits - config_host.mk.in configure.in external/mingw-dlls m4/ax_boost_base.m4 scp2/InstallModule_ooo.mk scp2/source

2012-06-18 Thread Jan Holesovsky

 config_host.mk.in   |1 
 configure.in|8 ++
 external/mingw-dlls/makefile.mk |1 
 m4/ax_boost_base.m4 |   50 +++-
 scp2/InstallModule_ooo.mk   |2 +
 scp2/source/ooo/mingw_dlls.scp  |6 
 6 files changed, 47 insertions(+), 21 deletions(-)

New commits:
commit 6873ec8a4eac985eb6fe7bd36d26194ce7fbfcf1
Author: David Tardon 
Date:   Wed Jun 13 18:28:29 2012 +0200

mingw: fix check for boost date_time dll

Change-Id: I4a31c215d70e6f8f8fc8a768851315b919fba03e

diff --git a/configure.in b/configure.in
index e61a01f..9cf0baa 100644
--- a/configure.in
+++ b/configure.in
@@ -7293,7 +7293,12 @@ if test "$with_system_boost" = "yes"; then
 AX_BOOST_BASE
 AX_BOOST_DATE_TIME
 mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 
's/\.dll$//'`
-libo_MINGW_CHECK_DLL([BOOST_DATE_TIME], [$mingw_boost_date_time_dll])
+libo_MINGW_TRY_DLL([BOOST_DATE_TIME], [$mingw_boost_date_time_dll])
+if test -z "$MINGW_BOOST_DATE_TIME_DLL"; then
+# if not found, try again with 'lib' prefix
+libo_MINGW_CHECK_DLL([BOOST_DATE_TIME],
+ [lib$mingw_boost_date_time_dll])
+fi
 else
 AC_MSG_RESULT([internal])
 BUILD_TYPE="$BUILD_TYPE BOOST"
commit b1250977f873eca6617e32ce4bc7d1d46eea93ad
Author: David Tardon 
Date:   Wed Jun 6 17:04:01 2012 +0200

better test for system boost date_time lib

This reverts commit 4c2e9fc655b6480ffc7f0feb5d07b8106b6b8e22.

Change-Id: Iea84991ee689240fe6e6ddbc47f44b444f582dde

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index eafe5ed..57b7249 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -273,7 +273,19 @@ endif # SYSTEM_HUNSPELL
 ifeq ($(SYSTEM_BOOST),YES)
 
 define gb_LinkTarget__use_boostdatetime
-$(call gb_LinkTarget_add_libs,$(1),-lboost_date_time)
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+   $(BOOST_CPPFLAGS) \
+)
+
+$(call gb_LinkTarget_add_ldflags,$(1),\
+   $(BOOST_LDFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(BOOST_DATE_TIME_LIB) \
+)
+
 endef
 
 else # !SYSTEM_BOOST
diff --git a/config_host.mk.in b/config_host.mk.in
index fd738fe..733f904 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -22,6 +22,9 @@ export ATL_INCLUDE=@ATL_INCLUDE@
 export ATL_LIB=@ATL_LIB@
 export AWTLIB=@AWTLIB@
 export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
+export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
+export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
+export BOOST_LDFLAGS=@BOOST_LDFLAGS@
 export BSH_JAR=@BSH_JAR@
 export BUILD_DMAKE=@BUILD_DMAKE@
 export BUILD_EPM=@BUILD_EPM@
@@ -296,6 +299,7 @@ export MFC_INCLUDE=@MFC_INCLUDE@
 export MFC_LIB=@MFC_LIB@
 export MINGWCXX=@MINGWCXX@
 export MINGWSTRIP=@MINGWSTRIP@
+export MINGW_BOOST_DATE_TIME_DLL=@MINGW_BOOST_DATE_TIME_DLL@
 export MINGW_CAIRO_DLL=@MINGW_CAIRO_DLL@
 export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@
 export MINGW_CRYPTO_DLL=@MINGW_CRYPTO_DLL@
diff --git a/configure.in b/configure.in
index 38f7b0c..e61a01f 100644
--- a/configure.in
+++ b/configure.in
@@ -7289,6 +7289,11 @@ if test "$with_system_boost" = "yes"; then
 fi
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
+
+AX_BOOST_BASE
+AX_BOOST_DATE_TIME
+mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 
's/\.dll$//'`
+libo_MINGW_CHECK_DLL([BOOST_DATE_TIME], [$mingw_boost_date_time_dll])
 else
 AC_MSG_RESULT([internal])
 BUILD_TYPE="$BUILD_TYPE BOOST"
@@ -7296,6 +7301,7 @@ else
 HAVE_BOOST_UNORDERED_MAP=TRUE
 fi
 AC_SUBST([HAVE_BOOST_UNORDERED_MAP])
+AC_SUBST([MINGW_BOOST_DATE_TIME_DLL])
 AC_SUBST(SYSTEM_BOOST)
 
 dnl ===
diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk
index 50aa73b..5f1722a 100644
--- a/external/mingw-dlls/makefile.mk
+++ b/external/mingw-dlls/makefile.mk
@@ -42,6 +42,7 @@ dummy:
 .ELSE
 
 MINGW_DLLS:= \
+$(MINGW_BOOST_DATE_TIME_DLL) \
 $(MINGW_CAIRO_DLL) \
 $(MINGW_CRYPTO_DLL) \
 $(MINGW_CURL_DLL) \
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
new file mode 100644
index 000..e5acfda
--- /dev/null
+++ b/m4/ax_boost_base.m4
@@ -0,0 +1,266 @@
+# ===
+#   http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
+# ===
+#
+# SYNOPSIS
+#
+#   AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# DESCRIPTION
+#
+#   Test for the Boost C++ libraries of a particular version (or newer)
+#
+#   If no path to the installed boost library is given the macro searchs
+#   under /usr, /usr/local, /opt and /opt/local and evaluates the
+#   $BOOST_ROOT environment variable. Further documentation is available at
+#

[Libreoffice-commits] .: sc/source

 sc/source/filter/xml/xmlexprt.cxx |   13 +
 sc/source/filter/xml/xmlexprt.hxx |2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit b0d2e68244c6745dc3fe145579b05f30e40793d5
Author: Stephan Bergmann 
Date:   Mon Jun 18 13:44:40 2012 +0200

-Werror=unused-parameter

Change-Id: Icb7fe93b6f21c8d34dcd263dbac07b32a5cb0432

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 56d3538..9b105d6 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -636,7 +636,7 @@ public:
 
 }
 
-void ScXMLExport::CollectSharedData(sal_Int32& nTableCount, sal_Int32& 
nShapesCount, const sal_Int32 nCellCount)
+void ScXMLExport::CollectSharedData(sal_Int32& nTableCount, sal_Int32& 
nShapesCount)
 {
 if (!GetModel().is())
 return;
@@ -812,7 +812,7 @@ void ScXMLExport::_ExportMeta()
 sal_Int32 nTableCount(0);
 sal_Int32 nShapesCount(0);
 GetAutoStylePool()->ClearEntries();
-CollectSharedData(nTableCount, nShapesCount, nCellCount);
+CollectSharedData(nTableCount, nShapesCount);
 
 uno::Sequence stats(3);
 stats[0] = 
beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableCount")),
@@ -1673,8 +1673,7 @@ void ScXMLExport::_ExportContent()
 {
 sal_Int32 nTableCount(0);
 sal_Int32 nShapesCount(0);
-sal_Int32 nCellCount(pDoc ? pDoc->GetCellCount() : 0);
-CollectSharedData(nTableCount, nShapesCount, nCellCount);
+CollectSharedData(nTableCount, nShapesCount);
 OSL_FAIL("no shared data setted");
 }
 ScXMLExportDatabaseRanges aExportDatabaseRanges(*this);
@@ -1763,8 +1762,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed )
 {
 sal_Int32 nTableCount(0);
 sal_Int32 nShapesCount(0);
-sal_Int32 nCellCount(pDoc ? pDoc->GetCellCount() : 0);
-CollectSharedData(nTableCount, nShapesCount, nCellCount);
+CollectSharedData(nTableCount, nShapesCount);
 }
 ScXMLStyleExport aStylesExp(*this, rtl::OUString(), 
GetAutoStylePool().get());
 if (GetModel().is())
@@ -2336,8 +2334,7 @@ void ScXMLExport::_ExportAutoStyles()
 {
 sal_Int32 nTableCount(0);
 sal_Int32 nShapesCount(0);
-sal_Int32 nCellCount(pDoc ? pDoc->GetCellCount() : 0);
-CollectSharedData(nTableCount, nShapesCount, nCellCount);
+CollectSharedData(nTableCount, nShapesCount);
 }
 sal_Int32 nTableCount(xIndex->getCount());
 pCellStyles->AddNewTable(nTableCount - 1);
diff --git a/sc/source/filter/xml/xmlexprt.hxx 
b/sc/source/filter/xml/xmlexprt.hxx
index 032bb18..af6c811 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -134,7 +134,7 @@ class ScXMLExport : public SvXMLExport
 
 sal_Int32   GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const;
 boolHasDrawPages(com::sun::star::uno::Reference 
& xDoc);
-voidCollectSharedData(sal_Int32& nTableCount, sal_Int32& 
nShapesCount, const sal_Int32 nCellCount);
+voidCollectSharedData(sal_Int32& nTableCount, sal_Int32& 
nShapesCount);
 voidCollectShapesAutoStyles(const sal_Int32 nTableCount);
 voidWriteTablesView(const com::sun::star::uno::Any& 
aTableView);
 voidWriteView(const com::sun::star::uno::Any& aView);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] Fixed out of bounds memory access


On 06/15/2012 05:45 PM, Marc-André Laverdière wrote:

Here is a patch for a small fish I caught while valgrinding. It was
accessing memory in the strdup.


Was it really?  My reading of the original


rtl::OUString aUserName;
rtl::OString aUser;
oslSecurity aSec = osl_getCurrentSecurity();
if( aSec )
{
osl_getUserName( aSec, &aUserName.pData );
aUser = rtl::OUStringToOString( aUserName, 
osl_getThreadTextEncoding() );
osl_freeSecurityHandle( aSec );
}

pSmProps[ 3 ].name  = const_cast(SmUserID);
pSmProps[ 3 ].type  = const_cast(SmARRAY8);
pSmProps[ 3 ].num_vals  = 1;
pSmProps[ 3 ].vals  = new SmPropValue;
pSmProps[ 3 ].vals->value   = strdup( aUser.getStr() );
pSmProps[ 3 ].vals->length  = strlen( (char *)pSmProps[ 3 ].vals->value 
)+1;


is that at the end aUser is either the empty string (if !aSec) or holds 
on to an OString copy of the data obtained from osl_getUserName.  In 
either case, the strdup(aUser.getStr()) should be OK?


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

Re: [PUSHED-3-5][PATCH-3-5-5] fdo#50603: Close fds across a restart of soffice on Mac OS X

2012-06-18 Thread Andras Timar

Hi,

2012/6/18 Stephan Bergmann :
> Hi all,
>
> Via some "remote debugging" I found out the reason for
>  "Unable to update
> LibreOffice without resetting user profile" is that an soffice restarting
> itself on Mac OS X (when it finds out that the per-user information about
> shared/bundled extensions is not in sync upon startup; or after a crash) has
> file descriptors from the old instance still open.
>
> 
> "fdo#50603: Close fds across a restart of soffice on Mac OS X" fixes that on
> master, and I already backported it to libreoffice-3-6.
>
> Please review that patch and consider it for backporting to libreoffice-3-5
> and libreoffice-3-5-5.  (According to Michal:  "I just created a new network
> test-user, installed LO 3.5.3 + sk lang-pack, ran it, created a document.
>  All fine (as it was before).  Deleted LO 3.5.3, installed 3.5.4 + sk
> lang-pack + your libuno_sal.dylib.3 [containing the patch].  Started LO,
> created a new document, played with it for some while, no crash at all
> (Yay!).")
>

pushed to libreoffice-3-5

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

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sal/osl

2012-06-18 Thread Andras Timar

 sal/osl/unx/salinit.cxx |   32 
 1 file changed, 32 insertions(+)

New commits:
commit dbc4070cacc85e4021c9f24947e84eeaa7f104f4
Author: Stephan Bergmann 
Date:   Mon Jun 18 13:00:08 2012 +0200

fdo#50603: Close fds across a restart of soffice on Mac OS X

...where the restart is directly from the old soffice instance, via exec, 
so the
restarted soffice would inherit all open fds from the old one.  The easiest
approach appears to close fds upon startup.

Change-Id: I89bb1c78f3adf2da1cd3cbd58c22df276133a883
Signed-off-by: Andras Timar 

diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index 81b1c1c..102ebe0 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -28,12 +28,44 @@
 
 #include "sal/config.h"
 
+#if defined MACOSX
+#include 
+#include 
+#include 
+#endif
+
 #include "osl/process.h"
 #include "sal/types.h"
 
 extern "C" {
 
 void SAL_CALL sal_detail_initialize(int argc, char ** argv) {
+#if defined MACOSX
+// On Mac OS X, soffice can restart itself via exec (see restartOnMac in
+// desktop/source/app/app.cxx), which leaves all file descriptors open,
+// which in turn can have unwanted effects (see
+//  "Unable to update
+// LibreOffice without resetting user profile").  But closing fds in
+// restartOnMac before calling exec does not work, as additional threads
+// might still be running then, wich can still use those fds and cause
+// crashes.  Therefore, the simples solution is to close fds at process
+// start (as early as possible, so that no other threads have been created
+// yet that might already have opened some fds); this is done for all kinds
+// of processes here, not just soffice, but hopefully none of our processes
+// rely on being spawned with certain fds already open.  Unfortunately, Mac
+// OS X appears to have no better interface to close all fds (like
+// closefrom):
+long openMax = sysconf(_SC_OPEN_MAX);
+if (openMax == -1) {
+// Some random value, but hopefully sysconf never returns -1 anyway:
+openMax = 1024;
+}
+assert(openMax >= 0 && openMax <= std::numeric_limits< int >::max());
+for (int fd = 3; fd < openMax; ++fd) {
+close(fd);
+}
+#endif
+
 osl_setCommandArgs(argc, argv);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Enable CTL for Default?

2012-06-18 Thread Khaled Hosny

On Mon, Jun 18, 2012 at 01:28:15PM +0200, Christian Lohmaier wrote:
> Hi Joel, *.
> 
> On Mon, Jun 18, 2012 at 4:28 AM, Joel Madero  wrote:
> > Is there a compelling reason why we don't enable CTL by default?
> 
> The lots and lots of additional UI options/dialog tabs confuse regular
> users that have no idea of CTL.
> 
> However enabling it when the UI language / the set of installed UI
> languages includes RTL/CTL languages should be fine. But there is no
> mechanism yet to enable/disable Options based on what langauges are
> installed, so the question is whether it is worth to add program logic
> to do so.

Many CTL users don't install a localised interface, so there is no
correlation.

IMO CTL/Asian options is a remnants of distant past and should be
killed for good (not to mention that "Asian" is a so ignorant
orientalistic term in this context).

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

[PATCH-3-5][PATCH-3-5-5] fdo#50603: Close fds across a restart of soffice on Mac OS X