LibreOffice Gerrit News for core on 2014-02-06

2014-02-05 Thread gerrit 
Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ fdo#54938 Convert oox, sc, vcl, svtools... to cppu::supportsService
  in https://gerrit.libreoffice.org/7886 from Alexandre Vicenzi
  about module bridges, oox, sc, svtools, vcl, xmlscript
+ Code changes for fdo#74107:File Corruption - Issue with outerShdw
  in https://gerrit.libreoffice.org/7880 from Yogesh Bharate
  about module sw
+ Add unit-tests for DOCX preservation of 'table cell redline'
  in https://gerrit.libreoffice.org/7878 from Adam CloudOn
  about module sw
+ DOCX Export of 'Table Cell Redline' (like insert cell or delete cell)
  in https://gerrit.libreoffice.org/7877 from Adam CloudOn
  about module sw
+ Add XML dumping of the new 'SwTableCellRedline'
  in https://gerrit.libreoffice.org/7876 from Adam CloudOn
  about module sw
+ DOCX import sends 'table cell redline' to SW core, and core stores it
  in https://gerrit.libreoffice.org/7875 from Adam CloudOn
  about module sw, writerfilter
+ Rename 'makeTableRedline' to 'makeTableRowRedline'
  in https://gerrit.libreoffice.org/7874 from Adam CloudOn
  about module sw
+ Add support for 'Table Cell Redlines' in SW core
  in https://gerrit.libreoffice.org/7873 from Adam CloudOn
  about module sw
+ Add code in DOCX importer to handle 'table cell redline'
  in https://gerrit.libreoffice.org/7872 from Adam CloudOn
  about module writerfilter
+ Add tokens for 'table cell insert & delete' in DOCX's model.xml
  in https://gerrit.libreoffice.org/7871 from Adam CloudOn
  about module writerfilter
+ Add some property IDs in the DOCX importer (for future table redline patc
  in https://gerrit.libreoffice.org/7870 from Adam CloudOn
  about module writerfilter
+ Add tokens for 'table cell' redlines (future patch)
  in https://gerrit.libreoffice.org/7869 from Adam CloudOn
  about module oox
 End of freshness 

+ Change from com::sun::star and ::com::sun::star to css alias.
  in https://gerrit.libreoffice.org/7889 from Chris Sherlock
  about module include
+ Reindent outdev.hxx - minor formatting change
  in https://gerrit.libreoffice.org/7888 from Chris Sherlock
  about module include
+ Converted pivot table layout dlg to .ui, 4th cut
  in https://gerrit.libreoffice.org/7840 from Katarina Behrens
  about module sc
+ Improve usability of the outline
  in https://gerrit.libreoffice.org/7832 from Rob Snelders
  about module sd
+ Seperate initialization of OutputDevice instance
  in https://gerrit.libreoffice.org/ from Chris Sherlock
  about module include, vcl
+ API remove image : change document state #i74651#
  in https://gerrit.libreoffice.org/7286 from Maxime de Roucy
  about module svx
+ sw/docx export: fix handling of document with header and section(s)
  in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
  about module sw
+ fdo#72468 Remove memory overflow on static memory.
  in https://gerrit.libreoffice.org/7087 from Arnaud Versini
  about module sal
+ convert SvStream::operator>> methods to ReadXXX methods
  in https://gerrit.libreoffice.org/7879 from Noel Grandin
  about module basctl, basic, chart2, compilerplugins, connectivity, cppcanvas, 
dbaccess, desktop, editeng, extensions, filter, idl, include, linguistic, 
lotuswordpro, sc, sd, sfx2, sot, starmath, svl, svtools, svx, sw, toolkit, 
tools, vcl, writerfilter


* Merged changes on master for project core changed in the last 25 hours:

+ Copied icons based on the GNOME icon theme from tango-testing to tango
  in https://gerrit.libreoffice.org/7251 from Alexander Wilms
+ fdo#51525 Add Paste Unformatted Text to Impress.
  in https://gerrit.libreoffice.org/7783 from Andrzej Hunt
+ fdo#73070 - UI: "Insert shapes" does not belong under "Properties"
  in https://gerrit.libreoffice.org/7804 from Rob Snelders
+ Add a line what you need to build to see your changes in officecfg
  in https://gerrit.libreoffice.org/7803 from Rob Snelders
+ Remove a now unneeded cast (xub_StrLen and tools/string.hxx removal).
  in https://gerrit.libreoffice.org/7854 from Andrzej Hunt
+ Translate German comments
  in https://gerrit.libreoffice.org/7885 from Philipp Weissenbacher
+ fdo#69358 Introduction of native Mac OSX Toolbar, based on CoreUI
  in https://gerrit.libreoffice.org/7884 from Joren De Cuyper
+ fdo#35105: notify role change through a new UNO a11y event
  in https://gerrit.libreoffice.org/7853 from Jacobo Aragunde Pérez
+ fdo#62082 Fix buttons in Custom animation toolbar
  in https://gerrit.libreoffice.org/7867 from Samuel Mehrbrodt
+ fdo#74424 Use Window::GetOutDev() to access ImplHasMirroredGraphics()
  in https://gerrit.libreoffice.org/7794 from Chris Sherlock
+ fdo#74424 - added TODO
  in https://gerrit.libreoffice.org/7796 from Chris Sherlock
+ fdo#74424 Use Window::GetOutDev() to access ImplInitOutDevData()
  in https://gerrit.libreoffice.org/7795 from Chris Sherlock
+ fdo#74424 Use Window::GetOutDev() to access ImplDrawFrameDev()
  in https:/

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

2014-02-05 Thread Kohei Yoshida 
 sc/source/core/data/document.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 458c2482da665089f0fe7ca4f419ef11e33c9b13
Author: Kohei Yoshida 
Date:   Wed Feb 5 23:20:56 2014 -0500

Typo: s -> e

Change-Id: Iae7db3816ab2aac81e433bfe3562eefa38ef7f62

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 3f08fd6..9f5b3bb 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6252,7 +6252,7 @@ void ScDocument::ForgetNoteCaptions( const ScRangeList& 
rRanges )
 const ScRange* p = rRanges[i];
 const ScAddress& s = p->aStart;
 const ScAddress& e = p->aEnd;
-for (SCTAB nTab = s.Tab(); nTab <= s.Tab(); ++nTab)
+for (SCTAB nTab = s.Tab(); nTab <= e.Tab(); ++nTab)
 {
 ScTable* pTab = FetchTable(nTab);
 if (!pTab)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Kohei Yoshida 
 sc/inc/column.hxx|2 
 sc/inc/document.hxx  |2 
 sc/inc/mtvcellfunc.hxx   |   10 ++
 sc/inc/table.hxx |3 
 sc/qa/unit/ucalc.cxx |  174 ---
 sc/qa/unit/ucalc.hxx |8 +
 sc/source/core/data/column.cxx   |2 
 sc/source/core/data/column2.cxx  |   28 ++
 sc/source/core/data/document.cxx |   31 --
 sc/source/core/data/table2.cxx   |   17 +++
 sc/source/ui/undo/undoblk.cxx|1 
 11 files changed, 199 insertions(+), 79 deletions(-)

New commits:
commit bc504b5adfaeeac0b910b89b0c98ae564f1ff5b8
Author: Kohei Yoshida 
Date:   Wed Feb 5 22:59:04 2014 -0500

fdo#74556: Correctly handle note captions life cycles.

When copying notes to clipboard, we don't clone captions but leave them
pointing to the original captions objects. Also, during undo and redo,
we need to clear all caption pointers to prevent them from being deleted
when the ScPostIt objects get deleted. The undo and redo of caption objects
are handled in the drawing layer afterwards.

Change-Id: I2b9cf0858dba5b3cac26db3ef501ea09779a795a

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 23a2a82..7f91d90 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -518,6 +518,7 @@ public:
 ScPostIt* ReleaseNote( SCROW nRow );
 size_t GetNoteCount() const;
 void CreateAllNoteCaptions();
+void ForgetNoteCaptions( SCROW nRow1, SCROW nRow2 );
 SCROW GetNotePosition( size_t nIndex ) const;
 void GetAllNoteEntries( std::vector& rNotes ) const;
 void GetNotesInRange( SCROW nStartRow, SCROW nEndRow, 
std::vector& rNotes ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e214a32..64212ed 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -919,6 +919,7 @@ public:
  * code uses sdr objects to export note data.
  */
 void CreateAllNoteCaptions();
+void ForgetNoteCaptions( const ScRangeList& rRanges );
 
 ScAddress GetNotePosition( size_t nIndex ) const;
 SCROW GetNotePosition( SCTAB nTab, SCCOL nCol, size_t nIndex ) const;
diff --git a/sc/inc/mtvcellfunc.hxx b/sc/inc/mtvcellfunc.hxx
index 793f2db..fc6d2dc 100644
--- a/sc/inc/mtvcellfunc.hxx
+++ b/sc/inc/mtvcellfunc.hxx
@@ -166,6 +166,16 @@ void ProcessNote(CellNoteStoreType& rStore, _Func& rFunc)
 ProcessElements1 >(rStore, rFunc, aElse);
 }
 
+template
+typename CellNoteStoreType::iterator
+ProcessNote(
+const CellNoteStoreType::iterator& it, CellNoteStoreType& rStore, SCROW 
nRow1, SCROW nRow2, _FuncElem& rFuncElem)
+{
+FuncElseNoOp aElse;
+return ProcessElements1<
+CellNoteStoreType, cellnote_block, _FuncElem, FuncElseNoOp 
>(it, rStore, nRow1, nRow2, rFuncElem, aElse);
+}
+
 }
 
 #endif
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 0ac441c..1e8764b 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -393,6 +393,7 @@ public:
 size_t GetNoteCount( SCCOL nCol ) const;
 SCROW GetNotePosition( SCCOL nCol, size_t nIndex ) const;
 void CreateAllNoteCaptions();
+void ForgetNoteCaptions( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2 );
 
 void GetAllNoteEntries( std::vector& rNotes ) const;
 void GetNotesInRange( const ScRange& rRange, std::vector& 
rNotes ) const;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index ff8ed6b..52eb27e 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1278,7 +1278,7 @@ class CopyToClipHandler
 
 void duplicateNotes(SCROW nStartRow, size_t nDataSize )
 {
-mrSrcCol.DuplicateNotes(nStartRow, nDataSize, mrDestCol, maDestPos);
+mrSrcCol.DuplicateNotes(nStartRow, nDataSize, mrDestCol, maDestPos, 
false);
 }
 
 public:
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index f6c7cd9..af06f1b 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1252,6 +1252,14 @@ public:
 }
 };
 
+struct NoteCaptionCleaner
+{
+void operator() ( size_t /*nRow*/, ScPostIt* p )
+{
+p->ForgetCaption();
+}
+};
+
 }
 
 void ScColumn::CreateAllNoteCaptions()
@@ -1260,6 +1268,16 @@ void ScColumn::CreateAllNoteCaptions()
 sc::ProcessNote(maCellNotes, aFunc);
 }
 
+void ScColumn::ForgetNoteCaptions( SCROW nRow1, SCROW nRow2 )
+{
+if (!ValidRow(nRow1) || !ValidRow(nRow2))
+return;
+
+NoteCaptionCleaner aFunc;
+sc::CellNoteStoreType::iterator it = maCellNotes.begin();
+sc::ProcessNote(it, maCellNotes, nRow1, nRow2, aFunc);
+}
+
 SCROW ScColumn::GetNotePosition( size_t nIndex ) const
 {
 // Return the row position of the nth note in the column.
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 3194f78..3f08fd6 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6245,6 +6245,24 @@ void ScDocument::CreateAllNoteCaptions()

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

Joel Madero  changed:

   What|Removed |Added

 Depends on||74573

-- 
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 54938] Adapt supportsService implementations to cppu::supportsService

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=54938

--- Comment #46 from Alexandre Vicenzi  ---
Stephan,

Does OObjectBase (reportdesign/source/core/sdr/RptObject.cxx,
reportdesign/inc/RptObject.hxx) support any service? I can't find
Implementation Name and
Supported Service Names.

If OObjectBase doesn't support, I think my implementation would be OK. Else if
supports any service I need those services name to fix what I have done.

I can't find what services OObjectBase support.

The old implementation not even had getSupportedServiceNames() and
getImplementationName() methods.

-- 
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 65675] LibreOffice 4.2 most annoying bugs

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

--- Comment #84 from Björn Michaelsen  ---
Nominating 74553: regression vs. 4.1.4, dataloss

-- 
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: [Libreoffice-ux-advise] Minutes of ESC call 2014-01-09

2014-02-05 Thread Cor Nouws 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Cor Nouws wrote (16-01-14 18:56)
> Jan Holesovsky wrote (09-01-14 18:41)
>> * Pending Action Items: + need design for copying styles between
>> templates (Cor Nouws/other UX?) cf.
>> http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01658.html
>>
>> 
http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01663.html
> 
> This is one of the two things that I'm hoping to focus on at the 
> Brussels-UX-Hackfest!

So we worked out a solution for:
 - copying styles between templates
 - opening templates not from the repos
 - including Styles in the Side bar

It's close to finished. I hope that Astron/me can finish details soon.

cheers,
Cor


- -- 
Cor Nouws
GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28  A038 E49D 7365 B134
80A6
- - vrijwilliger http://nl.libreoffice.org
- - volunteer http://www.libreoffice.org
- - The Document Foundation Membership Committee Member
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJS8sMUAAoJEOSdc2WxNICmxRcH/2uQp4eTXQfFLFtPDrHC8d4T
xoo451M0RwU4iytUTprzTwCe6o4BPfl0r4tlyuG2Rgv1MJRP/3HM1602lfJl2gsq
NXvW2+Xg3RQhKgsTAaesVp8aLBALgw/bJKMpmhEV+BAdIGg3PNc0269LbsU1VvR8
5HrPdLijcy5XiNr20Qi5FQBGMd6GdguhXZmsfG7yEh5+UOXhTzqFWbvCuSuIYl1m
MuIBeT2gGUYOsLePFDzEdDIXw8BuFlyOX0qMC/mroKvU4sxBGeeyZSzuripD+D8n
dritoclTNbePBp/sAew9ePW2tdm2EQ2oA7hiJCkN/B4AoWZ8yyZr4D3YeitFBKE=
=IDPM
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-02-05 Thread Norbert Thiebaud 
 editeng/source/editeng/impedit3.cxx |9 +
 editeng/source/items/frmitems.cxx   |   24 ---
 editeng/source/misc/splwrap.cxx |4 +-
 editeng/source/misc/svxacorr.cxx|   48 +--
 editeng/source/misc/txtrange.cxx|3 -
 editeng/source/rtf/svxrtf.cxx   |   28 +++---
 include/editeng/splwrap.hxx |6 ---
 include/editeng/txtrange.hxx|   16 --
 sw/source/core/text/txtfly.cxx  |   17 ---
 vcl/source/window/toolbox2.cxx  |   55 ++--
 10 files changed, 85 insertions(+), 125 deletions(-)

New commits:
commit 352ff66347d3e71e7091522a73c24a4bc65b9975
Author: Norbert Thiebaud 
Date:   Wed Feb 5 15:58:56 2014 -0600

Revert "hidpi: Blind fix - avoid double scaling by updating GetItemImage()."

The GetItemImage change causes some controls to draw wrongly and have
hit-testing problems. The change is broken because we want them to
think the bitmap is big. One day LibreOffice will use large bitmaps.

Some places call SetItemImage repeatedly, such as the font color dropdown
control and so it needs a sanity check in SetItemImage.


This reverts commit 0459682b4186b7522783e33cca3791420559817a.

Change-Id: If208543def6467ad7d19e21edf0ab11e9a32f0f4

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 90278a7..c29a4a6 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -622,17 +622,9 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& 
rImage,
 DBG_ASSERT( GetItemPos( nItemId ) == TOOLBOX_ITEM_NOTFOUND,
 "ToolBox::InsertItem(): ItemId already exists" );
 
-Image aImage(rImage);
-if (GetDPIScaleFactor() > 1)
-{
-BitmapEx aBitmap(aImage.GetBitmapEx());
-aBitmap.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), 
BMP_SCALE_FAST);
-aImage = Image(aBitmap);
-}
-
-mpData->m_aItems.insert((nPos < mpData->m_aItems.size()) ? 
mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(),
-ImplToolItem(nItemId, aImage, nBits));
-
+// Item anlegen und in die Liste einfuegen
+mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? 
mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), ImplToolItem( nItemId, 
rImage, nBits ) );
+SetItemImage(nItemId, rImage);
 mpData->ImplClearLayoutData();
 
 ImplInvalidate( sal_True );
@@ -652,17 +644,9 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& 
rImage,
 DBG_ASSERT( GetItemPos( nItemId ) == TOOLBOX_ITEM_NOTFOUND,
 "ToolBox::InsertItem(): ItemId already exists" );
 
-Image aImage(rImage);
-if (GetDPIScaleFactor() > 1)
-{
-BitmapEx aBitmap(aImage.GetBitmapEx());
-aBitmap.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), 
BMP_SCALE_FAST);
-aImage = Image(aBitmap);
-}
-
-mpData->m_aItems.insert((nPos < mpData->m_aItems.size()) ? 
mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(),
-ImplToolItem(nItemId, aImage, ImplConvertMenuString(rText), 
nBits));
-
+// Item anlegen und in die Liste einfuegen
+mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? 
mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), ImplToolItem( nItemId, 
rImage, ImplConvertMenuString( rText ), nBits ) );
+SetItemImage(nItemId, rImage);
 mpData->ImplClearLayoutData();
 
 ImplInvalidate( sal_True );
@@ -1369,11 +1353,17 @@ void ToolBox::SetItemImage( sal_uInt16 nItemId, const 
Image& rImage )
 {
 Image aImage(rImage);
 
-if (GetDPIScaleFactor() > 1)
+if ( GetDPIScaleFactor() > 1)
 {
 BitmapEx aBitmap(aImage.GetBitmapEx());
-aBitmap.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), 
BMP_SCALE_FAST);
-aImage = Image(aBitmap);
+
+// Some code calls this twice, so add a sanity check
+// FIXME find out what that code is & fix accordingly
+if (aBitmap.GetSizePixel().Width() < 32)
+{
+aBitmap.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), 
BMP_SCALE_FAST);
+aImage = Image(aBitmap);
+}
 }
 
 ImplToolItem* pItem = &mpData->m_aItems[nPos];
@@ -1497,20 +1487,7 @@ Image ToolBox::GetItemImage( sal_uInt16 nItemId ) const
 ImplToolItem* pItem = ImplGetItem( nItemId );
 
 if ( pItem )
-{
-Image aImage(pItem->maImage);
-
-if (GetDPIScaleFactor() > 1)
-{
-// we have scaled everything we have inserted, so scale it back to
-// the original size
-BitmapEx aBitmap(aImage.GetBitmapEx());
-aBitmap.Scale(1.0/GetDPIScaleFactor(), 1.0/GetDPIScaleFactor(), 
BMP_SCALE_FAST);
-aImage = Image(aBitmap);
-}
-
-return aImage;
-}
+return pItem->maImage;
 else
 return Image();
 }
c

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

2014-02-05 Thread Armin Le Grand 
 svgio/source/svgreader/svgnode.cxx |   23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 8335b5b2c930cd2336973d73506128e8ae5b3850
Author: Armin Le Grand 
Date:   Wed Oct 30 11:22:20 2013 +

Resolves: fdo#69271 i#123510 changed priority in style preparation

(cherry picked from commit 86459550d81c3eae067e89d9af1b6e872215a588)

(cherry picked from commit 8b2fb0e153fa846a171105b7801c398ffbe3d595)

Change-Id: Ia567666cd76dce646479003a830d969f4962da71
Signed-off-by: Michael Stahl 

diff --git a/svgio/source/svgreader/svgnode.cxx 
b/svgio/source/svgreader/svgnode.cxx
index 262ec56..f1e7ea8 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -106,14 +106,12 @@ namespace svgio
 }
 }
 
-if(maCssStyleVector.empty())
+if(!maCssStyleVector.empty())
 {
-return &rOriginal;
-}
-else
-{
-// set CssStyleParent at maCssStyleVector members to hang them 
in front of
-// the existing style. Build a style chain, reset parent of 
original for security.
+// #i123510# if CSS styles were found, create a linked list 
with rOriginal as parent
+// and all CSS styles as linked children, so that the style 
attribute has
+// priority over the CSS style. If there is no style attribute 
this means that
+// no values are set at rOriginal, thus it is still correct to 
have that order.
 // Repeated style requests should only be issued from sub-Text 
nodes and I'm not
 // sure if in-between text nodes may build other chains 
(should not happen). But
 // it's only a re-chaining with pointers (cheap), so allow to 
do it every time.
@@ -122,14 +120,15 @@ namespace svgio
 
 for(sal_uInt32 a(0); a < maCssStyleVector.size(); a++)
 {
-SvgStyleAttributes* pCandidate = const_cast< 
SvgStyleAttributes* >(maCssStyleVector[maCssStyleVector.size() - a - 1]);
+SvgStyleAttributes* pNext = const_cast< 
SvgStyleAttributes* >(maCssStyleVector[a]);
 
-pCandidate->setCssStyleParent(pCurrent);
-pCurrent = pCandidate;
+pCurrent->setCssStyleParent(pNext);
+pCurrent = pNext;
+pCurrent->setCssStyleParent(0);
 }
-
-return pCurrent;
 }
+
+return &rOriginal;
 }
 
 SvgNode::SvgNode(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Kohei Yoshida 
 sc/qa/unit/ucalc.cxx |7 +--
 sc/qa/unit/ucalc.hxx |4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 444baecf4483c96e680fdb3f81c7197161720cbb
Author: Kohei Yoshida 
Date:   Wed Feb 5 16:35:00 2014 -0500

Fix typo and a bit of cleanup.

Change-Id: Id32fcce20a72774794f413a8b2217aeca1c5946c

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index a8a349f..d393aa4 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4756,9 +4756,8 @@ void Test::testNoteDeleteCol()
 pDoc->DeleteTab(0);
 }
 
-void Test::testAerasWithNotes()
+void Test::testAreasWithNotes()
 {
-
 ScDocument* pDoc = getDocShell().GetDocument();
 OUString aSheet1("Sheet1");
 pDoc->InsertTab(0, aSheet1);
@@ -4860,10 +4859,6 @@ void Test::testAerasWithNotes()
 CPPUNIT_ASSERT_MESSAGE("No PrintAreaVer found", dataFound);
 CPPUNIT_ASSERT_MESSAGE("PrintAreaVer wrong row", row == 3);
 
-
-std::cout << "cell area col " << col << std::endl;
-std::cout << "cell area row " << row << std::endl;
-
 pDoc->DeleteTab(0);
 }
 
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 6bbaad0..7c9b5f8 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -300,7 +300,7 @@ public:
 void testShiftCells();
 void testNoteDeleteRow();
 void testNoteDeleteCol();
-void testAerasWithNotes();
+void testAreasWithNotes();
 void testAnchoredRotatedShape();
 void testCellTextWidth();
 void testEditTextIterator();
@@ -428,7 +428,7 @@ public:
 CPPUNIT_TEST(testShiftCells);
 CPPUNIT_TEST(testNoteDeleteRow);
 CPPUNIT_TEST(testNoteDeleteCol);
-CPPUNIT_TEST(testAerasWithNotes);
+CPPUNIT_TEST(testAreasWithNotes);
 CPPUNIT_TEST(testAnchoredRotatedShape);
 CPPUNIT_TEST(testCellTextWidth);
 CPPUNIT_TEST(testEditTextIterator);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

2014-02-05 Thread Caolán McNamara 
 external/nss/ExternalProject_nss.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92532e9543d58b270a153c612fc34a8d7de6abee
Author: Caolán McNamara 
Date:   Wed Feb 5 20:50:58 2014 +

quote AR, etc. for AR='callcatcher ar'

Change-Id: I8dbaeb87e65114e8db4571fe5f9c58974ff4e701

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index dc19ec4..3a6a2bd 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject
$(if $(filter YES,$(CROSS_COMPILING)),\
NSINSTALL="$(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/external/nss/nsinstall.py") \
NSDISTMODE=copy \
-   $(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit 
nss_build_all \
+   $(MAKE) -j1 AR="$(AR)" RANLIB="$(RANLIB)" NMEDIT="$(NM)edit" 
nss_build_all \
&& rm -f $(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
$(if $(filter MACOSX,$(OS)),\
&& chmod u+w $(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dylib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Andrzej Hunt 
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu   |6 ++
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 ++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |5 --
 sd/sdi/_drvwsh.sdi   |5 ++
 sd/sdi/outlnvsh.sdi  |5 ++
 sd/source/ui/app/sddll.cxx   |1 
 sd/source/ui/func/fuoltext.cxx   |   15 
++
 sd/source/ui/func/fupoor.cxx |   18 
+++
 sd/source/ui/inc/fuoltext.hxx|1 
 sd/source/ui/inc/fupoor.hxx  |1 
 sd/source/ui/view/drviews7.cxx   |4 +
 sd/source/ui/view/drviewse.cxx   |   24 
+
 sd/source/ui/view/outlnvs2.cxx   |2 
 sd/source/ui/view/outlnvsh.cxx   |   25 
++
 14 files changed, 112 insertions(+), 5 deletions(-)

New commits:
commit 84b4b7b931b194fc4d1980d2fa9c7fd6e0c9134c
Author: Andrzej Hunt 
Date:   Sun Feb 2 22:35:39 2014 +

fdo#51525 Add Paste Unformatted Text to Impress.

Change-Id: I4eff66ee2990fd7bf6a9be6b9f0801e7a70206e9
Reviewed-on: https://gerrit.libreoffice.org/7783
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 272278c..624bcdf 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -2927,6 +2927,12 @@
 .uno:PasteSpecial
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:PasteUnformatted
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index a16b900..e174849 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3425,6 +3425,11 @@
   1
 
   
+  
+
+  Paste Unformatted Text
+
+  
   
 
   Delete C~ontents...
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 4ed20add..3cb9be4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1081,11 +1081,6 @@
   1
 
   
-  
-
-  Paste Unformatted Text
-
-  
   
 
   Paste ~Special...
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 857b30e..5e3373e 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -96,6 +96,11 @@ interface DrawView
 ExecMethod = FuSupport ;
 StateMethod = GetMenuState ;
 ]
+SID_PASTE_UNFORMATTED
+[
+ExecMethod = FuSupport ;
+StateMethod = GetMenuState ;
+]
 SID_CLIPBOARD_FORMAT_ITEMS
 [
 ExecMethod = FuSupport ;
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 7216934..dae93d6 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -36,6 +36,11 @@ interface OutlineView
 ExecMethod = FuSupport ;
 StateMethod = GetMenuState ;
 ]
+SID_PASTE_UNFORMATTED // ole : no, status : ?
+[
+ExecMethod = FuSupport ;
+StateMethod = GetMenuState ;
+]
 SID_DELETE // ole : no, status : ?
 [
 ExecMethod = FuSupport ;
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index f7a27c0..1863c75 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -262,6 +262,7 @@ void SdDLL::RegisterControllers()
 svx::FormatPaintBrushToolBoxControl::RegisterControl(SID_FORMATPAINTBRUSH, 
pMod );
 
 SvxClipBoardControl::RegisterControl( SID_PASTE, pMod );
+SvxClipBoardControl::RegisterControl( SID_PASTE_UNFORMATTED, pMod );
 
 svx::ExtrusionColorControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod 
);
 svx::FontWorkShapeTypeControl::RegisterControl( SID_FONTWORK_SHAPE_TYPE, 
pMod );
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index 22836070..09ee7d3 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -278,6 +278,21 @@ void FuOutlineText::DoPaste()
 pOutlineView->GetViewByWindow(mpWindow)->PasteSpecial();
 }
 
+/**
+ * Paste object as unforma

[Libreoffice-commits] core.git: officecfg/registry

2014-02-05 Thread Rob Snelders 
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |   23 ---
 1 file changed, 23 deletions(-)

New commits:
commit 7cd90162f1c4a1d763e40c8f9972fd59e219ccd1
Author: Rob Snelders 
Date:   Mon Feb 3 12:34:33 2014 +0100

fdo#73070 - UI: "Insert shapes" does not belong under "Properties"

Change-Id: I6fe9c21b13d154744721cec564d7a3f5974d12a4
Reviewed-on: https://gerrit.libreoffice.org/7804
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 0f5f2ea..a269c93 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -969,29 +969,6 @@
 
   
 
-  
-
-  Insert Shapes
-
-
-  InsertPropertyPanel
-
-
-  PropertyDeck
-
-
-  
-Draw, any, visible ;
-  
-
-
-  
private:resource/toolpanel/SvxPanelFactory/InsertPropertyPanel
-
-
-  50
-
-  
-
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/README

2014-02-05 Thread Rob Snelders 
 officecfg/README |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit fcd3d85ea4bf0d82190551df3d5c88d5230b4567
Author: Rob Snelders 
Date:   Mon Feb 3 12:34:03 2014 +0100

Add a line what you need to build to see your changes in officecfg

Change-Id: I38f961e153246b29d0959d0b4491b9f7eecbaf8f
Reviewed-on: https://gerrit.libreoffice.org/7803
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/officecfg/README b/officecfg/README
index 3a39d28..add1276 100644
--- a/officecfg/README
+++ b/officecfg/README
@@ -1,4 +1,6 @@
 The schema and default settings for the OpenOffice.org configuration database.
 
+If you change change a file in this module, then a make postprocess is needed 
after make officecfg.
+
 See also:
 [[configmgr]]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Andrzej Hunt 
 editeng/source/outliner/outliner.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d232561a7472bead8add4bdb98bf2d90d2b7c820
Author: Andrzej Hunt 
Date:   Tue Feb 4 15:13:03 2014 +

Remove a now unneeded cast (xub_StrLen and tools/string.hxx removal).

Change-Id: Ic45b3c572483aa0292c227274565a1750dd51f17
Reviewed-on: https://gerrit.libreoffice.org/7854
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 1aaeb24..ae027cd 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -537,7 +537,7 @@ bool Outliner::ImpConvertEdtToOut( sal_Int32 
nPara,EditView* pView)
 
 sal_Int32 nPos = nHeadingNumberStart ? nHeadingNumberStart : 
nNumberingNumberStart;
 OUString aLevel = comphelper::string::stripStart(aName.copy(nPos), ' 
');
-nTabs = sal::static_int_cast< sal_uInt16 >(aLevel.toInt32());
+nTabs = aLevel.toInt32();
 if( nTabs )
 nTabs--; // Level 0 = "heading 1"
 bConverted = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Philipp Weissenbacher 
 sw/source/core/layout/fly.cxx  |  150 ++---
 sw/source/core/layout/paintfrm.cxx |   19 +---
 sw/source/core/layout/tabfrm.cxx   |   11 --
 3 files changed, 85 insertions(+), 95 deletions(-)

New commits:
commit 103229d032a0fe21df5debda38de91d39595f38f
Author: Philipp Weissenbacher 
Date:   Wed Feb 5 21:41:36 2014 +0100

Translate German comments

Remove some left over German comments with their translation
underneath. Also, correct some Denglish and typos.

Change-Id: I3c321dd1030695ca4443447a852e81dec9383aed
Reviewed-on: https://gerrit.libreoffice.org/7885
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 1a2291d..48bdefe 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -424,7 +424,7 @@ void SwFlyFrm::InitDrawObj( sal_Bool bNotify )
 // OD 2004-03-22 #i26791#
 SetDrawObj( *(CreateNewRef( pContact )) );
 
-//Den richtigen Layer setzen.
+// Set the right Layer
 // OD 2004-01-19 #110582#
 SdrLayerID nHeavenId = pIDDMA->GetHeavenId();
 SdrLayerID nHellId = pIDDMA->GetHellId();
@@ -580,11 +580,10 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm 
*pFollow )
 }
 
 // The Follow needs his own content to be served
-//Der Follow muss mit seinem eigenen Inhalt versorgt werden.
 const SwFmtCntnt &rCntnt = pFollow->GetFmt()->GetCntnt();
 OSL_ENSURE( rCntnt.GetCntntIdx(), ":-( No content prepared." );
 sal_uLong nIndex = rCntnt.GetCntntIdx()->GetIndex();
-// Lower() bedeutet SwColumnFrm, dieser beinhaltet wieder einen SwBodyFrm
+// Lower() means SwColumnFrm: this one contains another SwBodyFrm
 ::_InsertCnt( pFollow->Lower() ? 
(SwLayoutFrm*)((SwLayoutFrm*)pFollow->Lower())->Lower()
: (SwLayoutFrm*)pFollow,
   pFollow->GetFmt()->GetDoc(), ++nIndex );
@@ -610,7 +609,7 @@ SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrmFmt &rChain, 
SwFrm *pAnch )
 // We look for the Fly that's in the same Area.
 // Areas can for now only be Head/Footer or Flys.
 
-if ( !pAnch ) // If an Anchor was passed along, that one couts (ctor!)
+if ( !pAnch ) // If an Anchor was passed along, that one counts (ctor!)
 pAnch = AnchorFrm();
 
 SwLayoutFrm *pLay;
@@ -646,7 +645,7 @@ SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrmFmt &rChain, 
SwFrm *pAnch )
 }
 else if ( pFly )
 {
-OSL_ENSURE( !aIter.Next(), "chain with more than one inkarnation" );
+OSL_ENSURE( !aIter.Next(), "chain with more than one instance" );
 }
 return pFly;
 }
@@ -831,12 +830,12 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, 
const SfxPoolItem *pNew,
 const SwRect aTmp( GetObjRectWithSpaces() );
 NotifyBackground( FindPageFrm(), aTmp, PREP_FLY_ATTR_CHG );
 
-// Durch eine Umlaufaenderung von rahmengebundenen Rahmen kann eine
-// vertikale Ausrichtung aktiviert/deaktiviert werden => MakeFlyPos
+// By changing the flow of frame-bound Frames, a vertical alignment
+// can be activated/deactivated => MakeFlyPos
 if( FLY_AT_FLY == GetFmt()->GetAnchor().GetAnchorId() )
 rInvFlags |= 0x09;
 
-//Ggf. die Kontur am Node loeschen.
+// Delete contour in the Node if necessary
 if ( Lower() && Lower()->IsNoTxtFrm() &&
  !GetFmt()->GetSurround().IsContour() )
 {
@@ -894,10 +893,10 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, 
const SfxPoolItem *pNew,
 aNew.Union( aOld );
 NotifyBackground( FindPageFrm(), aNew, PREP_CLEAR );
 
-//Dummer Fall. Bei der Zusweisung einer Vorlage k?nnen wir uns
-//nicht auf das alte Spaltenattribut verlassen. Da diese
-//wenigstens anzahlgemass fuer ChgColumns vorliegen muessen,
-//bleibt uns nur einen temporaeres Attribut zu basteln.
+// Special case:
+// When assigning a template we cannot rely on the old column
+// attribute. As there need to be at least enough for 
ChgColumns,
+// we need to create a temporary attribute.
 SwFmtCol aCol;
 if ( Lower() && Lower()->IsColumnFrm() )
 {
@@ -918,7 +917,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const 
SfxPoolItem *pNew,
 const SwFmtFrmSize &rOld = nWhich == RES_FRM_SIZE ?
 *(SwFmtFrmSize*)pNew :
 ((SwFmtChg*)pOld)->pChangedFmt->GetFrmSize();
-//#35091# Kann beim Laden von Vorlagen mal 0 sein
+//#35091# Can be "times zero", when loading the template
 if ( rOld.GetWidth() && rOld.GetHeight() )
 {
 
@@

[Libreoffice-commits] core.git: vcl/Library_vcl.mk vcl/osx

2014-02-05 Thread Joren De Cuyper 
 vcl/Library_vcl.mk   |2 ++
 vcl/osx/salframe.cxx |3 +++
 vcl/osx/salnativewidgets.cxx |   39 ++-
 3 files changed, 39 insertions(+), 5 deletions(-)

New commits:
commit 0c7e6080519014f1fb345ed25e2f12c9a043b3ae
Author: Joren De Cuyper 
Date:   Tue Feb 4 18:50:27 2014 +0100

fdo#69358 Introduction of native Mac OSX Toolbar, based on CoreUI

Change-Id: I7774368a9b59e8087573348f6061b6a220fea130

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 204a0d6..04fc6cc 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -81,6 +81,8 @@ $(eval $(call gb_Library_use_libraries,vcl,\
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_add_libs,vcl,\
 -framework IOKit \
+-F/System/Library/PrivateFrameworks \
+-framework CoreUI \
 -lobjc \
 ))
 endif
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 6b236d6..e592649 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1301,6 +1301,9 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings 
)
 
 rSettings.SetStyleSettings( aStyleSettings );
 
+// don't draw frame around each and every toolbar
+ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames = true;
+
 [mpNSView unlockFocus];
 }
 
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 299e1f9..f0224fb 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -35,6 +35,16 @@
 #define NSAppKitVersionNumber10_7 1138
 #endif
 
+extern "C"
+{
+typedef CFTypeRef CUIRendererRef;
+void CUIDraw(CUIRendererRef r, CGRect rect, CGContextRef ctx, 
CFDictionaryRef options, CFDictionaryRef* result);
+}
+
+@interface NSWindow(CoreUIRendererPrivate)
++ (CUIRendererRef)coreUIRenderer;
+@end
+
 class AquaBlinker : public Timer
 {
 AquaSalFrame*   mpFrame;
@@ -524,11 +534,30 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType 
nType,
 
 case CTRL_TOOLBAR:
 {
-HIThemeMenuItemDrawInfo aMenuItemDrawInfo;
-aMenuItemDrawInfo.version = 0;
-aMenuItemDrawInfo.state = kThemeMenuActive;
-aMenuItemDrawInfo.itemType = kThemeMenuItemHierBackground;
-
HIThemeDrawMenuItem(&rc,&rc,&aMenuItemDrawInfo,mrContext,kHIThemeOrientationNormal,NULL);
+if (nPart == PART_DRAW_BACKGROUND_HORZ || nPart == 
PART_DRAW_BACKGROUND_VERT)
+{
+BOOL isMain = [mpFrame->getNSWindow() isMainWindow];
+CGFloat unifiedHeight = rControlRegion.GetHeight();
+CGRect drawRect = CGRectMake(rControlRegion.Left(), 
rControlRegion.Top(), rControlRegion.GetWidth(), rControlRegion.GetHeight());
+CUIDraw([NSWindow coreUIRenderer], drawRect, mrContext,
+(CFDictionaryRef)[NSDictionary 
dictionaryWithObjectsAndKeys:
+@"kCUIWidgetWindowFrame", @"widget",
+@"regularwin", @"windowtype",
+(isMain ? @"normal" : @"inactive"), @"state",
+[NSNumber numberWithDouble:unifiedHeight], 
@"kCUIWindowFrameUnifiedTitleBarHeightKey",
+[NSNumber numberWithBool:YES], 
@"kCUIWindowFrameDrawTitleSeparatorKey",
+[NSNumber numberWithBool:YES], @"is.flipped",
+nil],
+nil);;
+}
+else
+{
+HIThemeMenuItemDrawInfo aMenuItemDrawInfo;
+aMenuItemDrawInfo.version = 0;
+aMenuItemDrawInfo.state = kThemeMenuActive;
+aMenuItemDrawInfo.itemType = kThemeMenuItemHierBackground;
+HIThemeDrawMenuItem(&rc, &rc, &aMenuItemDrawInfo, mrContext, 
kHIThemeOrientationNormal, NULL);
+}
 bOK = true;
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Stephan Bergmann 
 include/svl/itemset.hxx  |2 +-
 svl/source/items/itemset.cxx |   16 
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 352fc0ae2866eb0b222d90d51299c05222af8df5
Author: Stephan Bergmann 
Date:   Wed Feb 5 21:02:38 2014 +0100

SfxItemSet::operator == should return bool

...and need not be virtual

Change-Id: I8cf38c4942526c6ca66595fdc3297be750ec09a0

diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 26ba3f3..7157ecf 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -143,7 +143,7 @@ public:
   const SfxItemPool *pRefPool = 0 );
 virtual SvStream &  Store( SvStream &, bool bDirect = false ) 
const;
 
-virtual int operator==(const SfxItemSet &) const;
+booloperator==(const SfxItemSet &) const;
 };
 
 inline void SfxItemSet::SetParent( const SfxItemSet* pNew )
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index e4155cc..268af38 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -1627,7 +1627,7 @@ SvStream &SfxItemSet::Load
 
 // ---
 
-int SfxItemSet::operator==(const SfxItemSet &rCmp) const
+bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
 {
 DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
 DBG_CHKOBJ(&rCmp, SfxItemSet, DbgCheckItemSet);
@@ -1636,13 +1636,13 @@ int SfxItemSet::operator==(const SfxItemSet &rCmp) const
 if ( _pParent != rCmp._pParent ||
  _pPool != rCmp._pPool ||
  Count() != rCmp.Count() )
-return sal_False;
+return false;
 
 // Ranges durchzaehlen lassen dauert laenger, muss aber auch gleich sein
 sal_uInt16 nCount1 = TotalCount();
 sal_uInt16 nCount2 = rCmp.TotalCount();
 if ( nCount1 != nCount2 )
-return sal_False;
+return false;
 
 // sind die Ranges selbst ungleich?
 for ( sal_uInt16 nRange = 0; _pWhichRanges[nRange]; nRange += 2 )
@@ -1664,15 +1664,15 @@ int SfxItemSet::operator==(const SfxItemSet &rCmp) const
 ( !pItem1 || IsInvalidItem(pItem1) ||
   ( _pPool->IsItemFlag(*pItem1, SFX_ITEM_POOLABLE) &&
 *pItem1 != *pItem2 ) ) ) )
-return sal_False;
+return false;
 }
 
-return sal_True;
+return true;
 }
 
 // Pointer alle gleich?
 if ( 0 == memcmp( _aItems, rCmp._aItems, nCount1 * sizeof(_aItems[0]) ) )
-return sal_True;
+return true;
 
 // dann werden wir wohl alle einzeln vergleichen muessen
 const SfxPoolItem **ppItem1 = (const SfxPoolItem**) _aItems;
@@ -1686,13 +1686,13 @@ int SfxItemSet::operator==(const SfxItemSet &rCmp) const
( IsInvalidItem(*ppItem1) || IsInvalidItem(*ppItem2) ) ||
( _pPool->IsItemFlag(**ppItem1, SFX_ITEM_POOLABLE) ) ||
  **ppItem1 != **ppItem2 ) )
-return sal_False;
+return false;
 
 ++ppItem1;
 ++ppItem2;
 }
 
-return sal_True;
+return true;
 }
 
 // ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/inc scp2/source

2014-02-05 Thread Michael Stahl 
 scp2/inc/macros.inc|6 -
 scp2/source/accessories/file_samples_accessories.scp   |   12 +--
 scp2/source/accessories/file_templates_accessories.scp |   66 -
 scp2/source/ooo/file_extra_ooo.scp |   18 ++--
 scp2/source/ooo/file_ooo.scp   |   10 +-
 5 files changed, 56 insertions(+), 56 deletions(-)

New commits:
commit 73f4ef48d065c4108de4af52a4dc7d86815b9b05
Author: Michael Stahl 
Date:   Wed Feb 5 20:20:13 2014 +0100

scp2: stop cargo-culting DONT_OVERWRITE around

There appears to be no usage of this Style in the installer Perl code in
the git history.

Change-Id: I137627505af5c7b33006437e83624b34ca2e3583

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index c70bafd..9266bb5 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -226,7 +226,7 @@ End
 TXT_FILE_BODY; \
 Name = STRING(CONCAT2(name,.jar)); \
 Dir  = gid_Dir_Classes; \
-Styles   = (PACKED,DONT_OVERWRITE); \
+Styles   = (PACKED); \
 End
 
 #define URE_JAR_FILE(id,name) \
@@ -549,13 +549,13 @@ End
 File gid_File_Extra_Gall##id \
 Dir = FILELIST_DIR; \
 TXT_FILE_BODY; \
-Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \
+Styles = (FILELIST, WORKSTATION); \
 Name = STRING(CONCAT3(Gallery/,id,.filelist)); \
 End \
 File gid_File_Extra_GallFiles##id \
 Dir = FILELIST_DIR; \
 TXT_FILE_BODY; \
-Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \
+Styles = (FILELIST, WORKSTATION); \
 Name = STRING(CONCAT3(Gallery/Files/,id,.filelist)); \
 End
 
diff --git a/scp2/source/accessories/file_samples_accessories.scp 
b/scp2/source/accessories/file_samples_accessories.scp
index c495d8d..eb29717 100644
--- a/scp2/source/accessories/file_samples_accessories.scp
+++ b/scp2/source/accessories/file_samples_accessories.scp
@@ -17,21 +17,21 @@
 File gid_File_Extra_Samples_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (FILELIST, DONT_OVERWRITE);
+Styles = (FILELIST);
 EXTRA_ALL_LANG(accessoriessamples,filelist);
 End
 
 File gid_File_Extra_Samples_Documentations_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (FILELIST, DONT_OVERWRITE);
+Styles = (FILELIST);
 EXTRA_ALL_LANG(accessoriessamplesdocumentation,filelist);
 End
 
 File gid_File_Extra_Samples_Advertisement_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (FILELIST, DONT_OVERWRITE);
+Styles = (FILELIST);
 EXTRA_ALL_LANG(accessoriessamplesadvertisement,filelist);
 End
 
@@ -40,21 +40,21 @@ End
 File gid_File_Extra_Samples_NONFREE_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (FILELIST, DONT_OVERWRITE);
+Styles = (FILELIST);
 EXTRA_ALL_LANG(accessoriessamplesnonfree,filelist);
 End
 
 File gid_File_Extra_Samples_NONFREE_Documentations_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (FILELIST, DONT_OVERWRITE);
+Styles = (FILELIST);
 EXTRA_ALL_LANG(accessoriessamplesnonfreedocumentation,filelist);
 End
 
 File gid_File_Extra_Samples_NONFREE_Advertisement_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (FILELIST, DONT_OVERWRITE);
+Styles = (FILELIST);
 EXTRA_ALL_LANG(accessoriessamplesnonfreeadvertisement,filelist);
 End
 
diff --git a/scp2/source/accessories/file_templates_accessories.scp 
b/scp2/source/accessories/file_templates_accessories.scp
index 76100c2..2f570a0 100644
--- a/scp2/source/accessories/file_templates_accessories.scp
+++ b/scp2/source/accessories/file_templates_accessories.scp
@@ -17,77 +17,77 @@
 File gid_File_Extra_Templates_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (FILELIST, DONT_OVERWRITE);
+Styles = (FILELIST);
 EXTRA_ALL_LANG(accessoriestemplates,filelist);
 End
 
 File gid_File_Extra_Templates_Layout_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (FILELIST, DONT_OVERWRITE);
+Styles = (FILELIST);
 EXTRA_ALL_LANG(accessoriestemplateslayout,filelist);
 End
 
 File gid_File_Extra_Templates_Present_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (FILELIST, DONT_OVERWRITE);
+Styles = (FILELIST);
 EXTRA_ALL_LANG(accessoriestemplatespresent,filelist);
 End
 
 File gid_File_Extra_Templates_Educate_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (FILELIST, DONT_OVERWRITE);
+Styles = (FILELIST);
 EXTRA_ALL_LANG(accessoriestemplateseducate,filelist);
 End
 
 File gid_File_Extra_Templates_Finance_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (FILELIST, DONT_OVERWRITE);
+Styles = (FILELIST);
 EXTRA_ALL_LANG(accessoriestemplatesfinance,filelist);
 End
 
 File gid_File_Extra_Templates_Forms_Accessories
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (FILELIST, DONT_OVERWRITE);
+Styles = (FILELIST);
 EXTRA_ALL_

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

2014-02-05 Thread Kohei Yoshida 
 editeng/source/editeng/editeng.cxx  |2 +-
 editeng/source/editeng/impedit2.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f504768a96601622f089dc6ee7620df1d014c6fb
Author: Kohei Yoshida 
Date:   Wed Feb 5 14:34:00 2014 -0500

Get typed text inside cell (in Calc) to display again.

This also fixes non-displayed text box contents in Draw / Impress.

Change-Id: I49d022ea71df398a70d1dc65eeb122c9a6373b27

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 9e6807f..ed8c54d 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1290,7 +1290,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& 
rKeyEvent, EditView* pEditVie
 if ( pImpEditEngine->GetStatus().DoAutoComplete() && ( 
nCharCode != ' ' ) )
 {
 // Only at end of word...
-sal_uInt16 nIndex = aCurSel.Max().GetIndex();
+sal_Int32 nIndex = aCurSel.Max().GetIndex();
 if ( ( nIndex >= aCurSel.Max().GetNode()->Len() ) ||
  ( pImpEditEngine->aWordDelimiters.indexOf( 
aCurSel.Max().GetNode()->GetChar( nIndex ) ) != -1 ) )
 {
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index d9884c6..eb1e366 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3578,11 +3578,11 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* 
pPortion )
 // Syndicate and more ...
 aRange.Max() = aRange.Min();
 aRange.Max() += pPortion->GetFirstLineOffset();
-if ( nFirstInvalid > 0 )   // Only if the first line is invalid
+if (nFirstInvalid >= 0)   // Only if the first line is invalid
 aRange.Min() = aRange.Max();
 
 sal_Int32 nLastInvalid = pPortion->GetLines().Count()-1;
-if(nFirstInvalid > 0)
+if (nFirstInvalid >= 0)
 {
 for ( nLine = nFirstInvalid; nLine < pPortion->GetLines().Count(); 
nLine++ )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

Jean-Baptiste Faure  changed:

   What|Removed |Added

 Depends on||74333

--- Comment #83 from Jean-Baptiste Faure  ---
I nominate bug 74333 : Textfield or Picture inside a chart is hidden
That is a regression

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

[SOLVED] Re: Cppcheck redundantAssignment gridcell.cxx (svx module)

2014-02-05 Thread Julien Nabet 

On 05/02/2014 12:16, Caolán McNamara wrote:

On Tue, 2014-02-04 at 21:47 +0100, Julien Nabet wrote:

I downloaded https://issues.apache.org/ooo/attachment.cgi?id=54553 and
gave a try.
Without applying the patch, it works since the rounding is ok and the
currency appears.
With the patch, the cells contain 0 but if I click on a cell, the good
value appears (with the rounding + the currency) on the clicked cell
only. Then, if I click on another cell, the previous gets back to 0 and
the new selected one is ok.
So I'd tend now to remove the 2 unused lines since it seems the needed
format is retrieved in another way than in 2008.

Heh!, yeah, lets remove those two lines whose result doesn't get used
then.

Patch pushed on master, see 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5ca114ece2774c2eb8f467df8b7ed9e36456765a

Thank you again Caolán!

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

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

2014-02-05 Thread Julien Nabet 
 svx/source/fmcomp/gridcell.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 5ca114ece2774c2eb8f467df8b7ed9e36456765a
Author: Julien Nabet 
Date:   Wed Feb 5 19:53:30 2014 +0100

cppcheck: variable reassigned before the old value has been used

For more details, see 
http://nabble.documentfoundation.org/Cppcheck-redundantAssignment-gridcell-cxx-svx-module-td4095032.html

Change-Id: I9b74a819a1431f5eada727d14933133fbdf7a47f

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 015a873..95bdb6d 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2145,8 +2145,6 @@ namespace
 if ( !_rxField->wasNull() )
 {
 _rField.SetValue( fValue );
-BigInt aValue = _rField.GetCorrectedValue();
-sValue = aValue.GetString();
 sValue = _rField.GetText();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/svx officecfg/registry svx/inc svx/source svx/uiconfig svx/util sw/source sw/uiconfig

2014-02-05 Thread Matúš Kukan 
 include/svx/dialogs.hrc |2 
 include/svx/srchdlg.hxx |   11 
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   11 
 svx/inc/tbunosearchcontrollers.hxx  |   32 ++
 svx/source/dialog/srchdlg.cxx   |   52 
 svx/source/dialog/srchdlg.src   |8 
 svx/source/tbxctrls/tbunosearchcontrollers.cxx  |  115 
--
 svx/uiconfig/ui/findreplacedialog.ui|2 
 svx/util/svx.component  |4 
 sw/source/ui/uiview/viewsrch.cxx|   63 +
 sw/uiconfig/sglobal/toolbar/findbar.xml |2 
 sw/uiconfig/sweb/toolbar/findbar.xml|2 
 sw/uiconfig/swriter/toolbar/findbar.xml |1 
 sw/uiconfig/swxform/toolbar/findbar.xml |2 
 14 files changed, 231 insertions(+), 76 deletions(-)

New commits:
commit f25cdaa78d5e7d200fbaf31cce9895bab7c5ee63
Author: Matúš Kukan 
Date:   Tue Feb 4 15:46:41 2014 +0100

fdo#74132: Do not interrupt search in Writer.

Instead of "Do you want to continue at the beginning?" dialog,
just inform that we were at the end of the document in new label.

Also replace 'Search key not found' dialog with label.

Change-Id: I6a140cbad93406b73996f87a6d05fcc5d245fdbf

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 2bf58e7..e0d7095 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -242,11 +242,13 @@
 #define RID_SVXSTR_LANGUAGE_ALL (RID_SVX_START +  15)
 
 // Strings from the search dialog
+#define RID_SVXSTR_SEARCH_END   (RID_SVX_START +  79)
 #define RID_SVXSTR_SEARCH_STYLES(RID_SVX_START +  80)
 #define RID_SVXSTR_SEARCH   (RID_SVX_START +  81)
 #define RID_SVXSTR_REPLACE  (RID_SVX_START +  82)
 #define RID_SVXSTR_WRITER_STYLES(RID_SVX_START +  83)
 #define RID_SVXSTR_CALC_STYLES  (RID_SVX_START +  85)
+#define RID_SVXSTR_SEARCH_NOT_FOUND (RID_SVX_START +  88)
 // ResIds for the PageDialog
 
 // Strings of the ToolBox-Controls from tbcontrl.cxx
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index b640100..50f7d63 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -79,6 +79,13 @@ public:
 
 // class SvxSearchDialogWrapper --
 
+enum SearchLabel
+{
+SL_Empty,
+SL_NotFound,
+SL_End
+};
+
 class SvxSearchDialog;
 class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow
 {
@@ -89,6 +96,7 @@ public:
 
 ~SvxSearchDialogWrapper ();
 SvxSearchDialog *getDialog ();
+static void SetSearchLabel(const SearchLabel& rSL);
 SFX_DECL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper);
 };
 
@@ -139,6 +147,8 @@ public:
 
 voidSetSaveToModule(bool b);
 
+void SetSearchLabel(const OUString& rStr) { m_pSearchLabel->SetText(rStr); 
}
+
 private:
 Window* mpDocWin;
 sal_BoolmbSuccess;
@@ -147,6 +157,7 @@ private:
 ComboBox*   m_pSearchLB;
 ListBox*m_pSearchTmplLB;
 FixedText*  m_pSearchAttrText;
+FixedText*  m_pSearchLabel;
 
 VclFrame*   m_pReplaceFrame;
 ComboBox*   m_pReplaceLB;
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index b9308fd..c25e19d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -396,6 +396,17 @@
   com.sun.star.svx.FindTextToolboxController
 
   
+  
+
+  .uno:SearchLabel
+
+
+  
+
+
+  com.sun.star.svx.SearchLabelToolboxController
+
+  
   
 
   .uno:DownSearch
diff --git a/svx/inc/tbunosearchcontrollers.hxx 
b/svx/inc/tbunosearchcontrollers.hxx
index f1aaa58..97af023 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -111,7 +111,6 @@ public:
 virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any 
>& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException );
 
 // XToolbarController
-virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( 
css::uno::RuntimeException);
 virtual css::uno::Reference< css::awt::XWindow > SAL_CALL 
createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) 
throw ( css::uno::RuntimeException );
 
 // XStatusListener
@@ -217,7 +216,6 @@ public:
 virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any 
>& aArguments ) throw ( css::uno::Exception,

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

2014-02-05 Thread Matúš Kukan 
 uui/source/interactionhandler.cxx |   64 --
 uui/source/interactionhandler.hxx |   80 --
 2 files changed, 60 insertions(+), 84 deletions(-)

New commits:
commit ed9e1e739041c8ef30e68559e9e9415632b21d94
Author: Matúš Kukan 
Date:   Thu Jan 30 13:28:40 2014 +0100

Use anonymous namespace for UUIInteractionHandler.

After it's no longer used in uui_component_getFactory,
since fe537786a42abea57551395f73328db48bebd086

Change-Id: I27f77b88c898f665d481931a55f1a0c1fce15818

diff --git a/uui/source/interactionhandler.cxx 
b/uui/source/interactionhandler.cxx
index dd71174..872bf52 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -17,14 +17,68 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "iahndl.hxx"
-#include "interactionhandler.hxx"
-#include "comphelper/namedvaluecollection.hxx"
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
 #include 
-#include "com/sun/star/awt/XWindow.hpp"
 
 using namespace com::sun::star;
 
+namespace {
+
+class UUIInteractionHandler:
+public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo,
+  com::sun::star::lang::XInitialization,
+  com::sun::star::task::XInteractionHandler2 >
+{
+private:
+UUIInteractionHelper * m_pImpl;
+
+UUIInteractionHandler(UUIInteractionHandler &); // not implemented
+void operator =(UUIInteractionHandler); // not implemented
+
+public:
+UUIInteractionHandler(com::sun::star::uno::Reference<
+  com::sun::star::uno::XComponentContext >
+  const & rxContext)
+SAL_THROW(());
+
+virtual ~UUIInteractionHandler() SAL_THROW(());
+
+virtual OUString SAL_CALL getImplementationName()
+throw (com::sun::star::uno::RuntimeException);
+
+virtual sal_Bool SAL_CALL supportsService(OUString const &
+  rServiceName)
+throw (com::sun::star::uno::RuntimeException);
+
+virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
+getSupportedServiceNames()
+throw (com::sun::star::uno::RuntimeException);
+
+virtual void SAL_CALL
+initialize(
+com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
+rArguments)
+throw (com::sun::star::uno::Exception);
+
+virtual void SAL_CALL
+handle(com::sun::star::uno::Reference<
+   com::sun::star::task::XInteractionRequest > const &
+   rRequest)
+throw (com::sun::star::uno::RuntimeException);
+
+virtual ::sal_Bool SAL_CALL
+handleInteractionRequest(
+const ::com::sun::star::uno::Reference< 
::com::sun::star::task::XInteractionRequest >& _Request
+)   throw ( ::com::sun::star::uno::RuntimeException );
+};
+
 UUIInteractionHandler::UUIInteractionHandler(
 uno::Reference< uno::XComponentContext > const &
 rxContext)
@@ -124,6 +178,8 @@ UUIInteractionHandler::handle(
 }
 }
 
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 com_sun_star_comp_uui_UUIInteractionHandler_get_implementation(
 css::uno::XComponentContext *context,
diff --git a/uui/source/interactionhandler.hxx 
b/uui/source/interactionhandler.hxx
deleted file mode 100644
index d5ea999..000
--- a/uui/source/interactionhandler.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef UUI_INTERACTIONHANDLER_HXX
-#define UUI_INTERACTIONHANDLER_HXX
-
-#include "com/sun/star/lang/XInitialization.hpp"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/task/XInteractionHandler2.hpp"
-#include "cppuhelper/implbase3.hxx"
-
-class UUIInteractionHelper;
-
-class UUIInteractionHandler:
-public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo,
-  com::sun::star::lang::XInitialization,
-  com::sun::star::task::XInteractionHandler2 >
-{
-private:
-UUIInteractionHelper * m_pImpl;

[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/util uui/source uui/util

2014-02-05 Thread Matúš Kukan 
 sw/inc/SwPanelFactory.hxx   |   71 
 sw/source/ui/sidebar/SwPanelFactory.cxx |   71 
 sw/source/ui/uno/unofreg.cxx|9 
 sw/util/sw.component|3 -
 uui/source/interactionhandler.cxx   |   44 +--
 uui/source/interactionhandler.hxx   |   15 --
 uui/source/services.cxx |   20 -
 uui/util/uui.component  |3 -
 8 files changed, 55 insertions(+), 181 deletions(-)

New commits:
commit fe537786a42abea57551395f73328db48bebd086
Author: Matúš Kukan 
Date:   Thu Jan 30 13:21:53 2014 +0100

uui: Ctor feature for com.sun.star.comp.uui.UUIInteractionHandler.

Change-Id: I94858cef5402e88ddcc3e0e9e4383f7be8443e77

diff --git a/uui/source/interactionhandler.cxx 
b/uui/source/interactionhandler.cxx
index 207b968..dd71174 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -20,7 +20,6 @@
 #include "iahndl.hxx"
 #include "interactionhandler.hxx"
 #include "comphelper/namedvaluecollection.hxx"
-#include "comphelper/processfactory.hxx"
 #include 
 #include "com/sun/star/awt/XWindow.hpp"
 
@@ -42,7 +41,7 @@ UUIInteractionHandler::~UUIInteractionHandler()
 OUString SAL_CALL UUIInteractionHandler::getImplementationName()
 throw (uno::RuntimeException)
 {
-return OUString::createFromAscii(m_aImplementationName);
+return OUString("com.sun.star.comp.uui.UUIInteractionHandler");
 }
 
 sal_Bool SAL_CALL
@@ -56,7 +55,13 @@ uno::Sequence< OUString > SAL_CALL
 UUIInteractionHandler::getSupportedServiceNames()
 throw (uno::RuntimeException)
 {
-return getSupportedServiceNames_static();
+uno::Sequence< OUString > aNames(3);
+aNames[0] = "com.sun.star.task.InteractionHandler";
+// added to indicate support for configuration.backend.MergeRecoveryRequest
+aNames[1] = "com.sun.star.configuration.backend.InteractionHandler";
+aNames[2] = "com.sun.star.uui.InteractionHandler";
+// for backwards compatibility
+return aNames;
 }
 
 void SAL_CALL
@@ -119,35 +124,12 @@ UUIInteractionHandler::handle(
 }
 }
 
-char const UUIInteractionHandler::m_aImplementationName[]
-= "com.sun.star.comp.uui.UUIInteractionHandler";
-
-uno::Sequence< OUString >
-UUIInteractionHandler::getSupportedServiceNames_static()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_uui_UUIInteractionHandler_get_implementation(
+css::uno::XComponentContext *context,
+css::uno::Sequence const &)
 {
-uno::Sequence< OUString > aNames(3);
-aNames[0] = "com.sun.star.task.InteractionHandler";
-// added to indicate support for configuration.backend.MergeRecoveryRequest
-aNames[1] = "com.sun.star.configuration.backend.InteractionHandler";
-aNames[2] = "com.sun.star.uui.InteractionHandler";
-// for backwards compatibility
-return aNames;
-}
-
-uno::Reference< uno::XInterface > SAL_CALL
-UUIInteractionHandler::createInstance(
-uno::Reference< lang::XMultiServiceFactory > const &
-rServiceFactory)
-SAL_THROW((uno::Exception))
-{
-try
-{
-return *new 
UUIInteractionHandler(comphelper::getComponentContext(rServiceFactory));
-}
-catch (std::bad_alloc const &)
-{
-throw uno::RuntimeException("out of memory", 0);
-}
+return cppu::acquire(new UUIInteractionHandler(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/interactionhandler.hxx 
b/uui/source/interactionhandler.hxx
index a8d7595..d5ea999 100644
--- a/uui/source/interactionhandler.hxx
+++ b/uui/source/interactionhandler.hxx
@@ -32,26 +32,13 @@ class UUIInteractionHandler:
   com::sun::star::lang::XInitialization,
   com::sun::star::task::XInteractionHandler2 >
 {
-public:
-static char const m_aImplementationName[];
-
-static com::sun::star::uno::Sequence< OUString >
-getSupportedServiceNames_static();
-
-static com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-SAL_CALL
-createInstance(
-com::sun::star::uno::Reference<
-com::sun::star::lang::XMultiServiceFactory > const &
-rServiceFactory)
-SAL_THROW((com::sun::star::uno::Exception));
-
 private:
 UUIInteractionHelper * m_pImpl;
 
 UUIInteractionHandler(UUIInteractionHandler &); // not implemented
 void operator =(UUIInteractionHandler); // not implemented
 
+public:
 UUIInteractionHandler(com::sun::star::uno::Reference<
   com::sun::star::uno::XComponentContext >
   const & rxContext)
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index f2d7c76..642f863 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 
-#include "interactionhandler.hxx"
 #include "requeststringresolver

[Libreoffice-commits] core.git: 4 commits - include/svx sc/inc sc/source sc/uiconfig svx/source svx/uiconfig sw/inc sw/source

2014-02-05 Thread Matúš Kukan 
 include/svx/dialogs.hrc   |1 
 include/svx/srchdlg.hxx   |5 -
 sc/inc/globstr.hrc|7 -
 sc/source/ui/src/globstr.src  |   24 --
 sc/source/ui/view/viewfun2.cxx|   41 +-
 sc/uiconfig/scalc/toolbar/findbar.xml |2 
 svx/source/dialog/srchdlg.cxx |  132 +-
 svx/source/dialog/srchdlg.src |4 +
 svx/uiconfig/ui/findreplacedialog.ui  |   15 ---
 sw/inc/mdiexp.hxx |3 
 sw/source/core/crsr/viscrs.cxx|3 
 sw/source/ui/docvw/edtwin3.cxx|5 -
 sw/source/ui/inc/view.hxx |2 
 sw/source/ui/uiview/view.hrc  |2 
 sw/source/ui/uiview/viewsrch.cxx  |   35 ++---
 15 files changed, 51 insertions(+), 230 deletions(-)

New commits:
commit d50e08b4e18ad6fa8b4078df6e23ffbaf47e708c
Author: Matúš Kukan 
Date:   Wed Feb 5 13:47:45 2014 +0100

fdo#74132: Do not interrupt search in Calc.

Extending f25cdaa78d5e7d200fbaf31cce9895bab7c5ee63
"fdo#74132: Do not interrupt search in Writer." for Calc.

Change-Id: I3a7e5070300993d2811a79f17cb1b2edb0355c44

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index e0d7095..cc31b77 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -242,6 +242,7 @@
 #define RID_SVXSTR_LANGUAGE_ALL (RID_SVX_START +  15)
 
 // Strings from the search dialog
+#define RID_SVXSTR_SEARCH_END_SHEET (RID_SVX_START +  71)
 #define RID_SVXSTR_SEARCH_END   (RID_SVX_START +  79)
 #define RID_SVXSTR_SEARCH_STYLES(RID_SVX_START +  80)
 #define RID_SVXSTR_SEARCH   (RID_SVX_START +  81)
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 50f7d63..07cf330 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -82,8 +82,9 @@ public:
 enum SearchLabel
 {
 SL_Empty,
-SL_NotFound,
-SL_End
+SL_End,
+SL_EndSheet,
+SL_NotFound
 };
 
 class SvxSearchDialog;
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index f02ef51..c402de2 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -89,7 +89,6 @@
 #define STR_MSSG_INSERTCELLS_0  50
 #define STR_MSSG_DELETECELLS_0  51
 #define STR_MSSG_MERGECELLS_0   52
-#define STR_MSSG_SEARCHANDREPLACE_0 53
 #define STR_MSSG_SOLVE_054
 #define STR_MSSG_SOLVE_155
 #define STR_MSSG_SOLVE_256
@@ -301,9 +300,6 @@
 #define STR_NAMECONFLICT223
 
 #define STR_ERR_AUTOFILTER  224
-#define STR_MSSG_SEARCHANDREPLACE_1 225
-#define STR_MSSG_SEARCHANDREPLACE_2 226
-#define STR_MSSG_SEARCHANDREPLACE_3 227
 
 #define STR_CREATENAME_REPLACE  228
 #define STR_CREATENAME_MARKERR  229
@@ -476,9 +472,6 @@
 #define STR_CLOSE_ERROR_LINK351
 #define STR_UNDO_RANGENAMES 352
 
-#define STR_MSSG_SEARCHANDREPLACE_4 353
-#define STR_MSSG_SEARCHANDREPLACE_5 354
-
 #define STR_UNDO_RESIZEMATRIX   355
 #define STR_TIP_RESIZEMATRIX356
 
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 1944470..47c5d94 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -437,10 +437,6 @@ Resource RID_GLOBSTR
 {
 Text [ en-US ] = "Ranges containing merged cells can only be sorted 
without formats." ;
 };
-String STR_MSSG_SEARCHANDREPLACE_0
-{
-Text [ en-US ] = "Search key not found." ;
-};
 String STR_MSSG_SOLVE_0
 {
 Text [ en-US ] = "Goal Seek succeeded. Result: " ;
@@ -1189,26 +1185,6 @@ Resource RID_GLOBSTR
 {
 Text [ en-US ] = "AutoFilter not possible" ;
 };
-String STR_MSSG_SEARCHANDREPLACE_1
-{
-Text [ en-US ] = "%PRODUCTNAME Calc has searched to the beginning of 
the sheet. Do you want to continue at the end?" ;
-};
-String STR_MSSG_SEARCHANDREPLACE_2
-{
-Text [ en-US ] = "%PRODUCTNAME Calc has searched to the end of the 
sheet. Do you want to continue at the beginning?" ;
-};
-String STR_MSSG_SEARCHANDREPLACE_3
-{
-Text [ en-US ] = "Find & Replace" ;
-};
-String STR_MSSG_SEARCHANDREPLACE_4
-{
-Text [ en-US ] = "%PRODUCTNAME Calc has searched to the beginning of 
the document. Do you want to continue at the end?" ;
-};
-String STR_MSSG_SEARCHANDREPLACE_5
-{
-Text [ en-US ] = "%PRODUCTNAME Calc has searched to the end of the 
document. Do you want to continue at the beginning?" ;
-};
 String STR_CREATENAME_REPLACE
 {
 Text [ en-US ] = "Replace existing definition of #?" ;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 76afd32..8d32061 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1552,6 +1553,7 @@ void ScViewFunc::AutoFormat( sal_uInt16 nForm

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

Joel Madero  changed:

   What|Removed |Added

 Depends on|74573   |

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

[Libreoffice-commits] core.git: 3 commits - bin/findunusedcode solenv/bin svx/source svx/uiconfig

2014-02-05 Thread Caolán McNamara 
 bin/findunusedcode|   51 --
 solenv/bin/callcatchEnv.Set.sh|   15 ---
 solenv/bin/callcatcher.Makefile   |   34 -
 svx/source/dialog/docrecovery.src |2 -
 svx/source/sidebar/area/AreaPropertyPanel.src |2 -
 svx/source/svdraw/svdstr.src  |2 -
 svx/uiconfig/ui/sidebararea.ui|4 +-
 7 files changed, 45 insertions(+), 65 deletions(-)

New commits:
commit 351cfed9dea6099cf27f7f818dcd0e4f94c9f35e
Author: Caolán McNamara 
Date:   Wed Feb 5 16:50:12 2014 +

transparence->transparency

Change-Id: Ief774a0e02dc1489239b2a0c1fd550a5f6ee66de

diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 8e591c6..725980cc 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -135,8 +135,8 @@
 True
 False
 True
-Select the 
type of transparence to apply.
-Select the 
type of transparence to apply.
+Select the 
type of transparency to apply.
+Select the 
type of transparency to apply.
 0
 1
 
commit 8d6debac7796ba35c254da282bbcb039f56f6d15
Author: Jürgen Schmidt 
Date:   Wed Feb 5 14:06:17 2014 +

Resolves: #i123116# correct spelling errors

Patch By: Aivaras Stepukonis
Review By: jsc

(cherry picked from commit a845d71360fc3cd0205d554964c4fd9fe87f0f8a)

Conflicts:
svx/source/sidebar/area/AreaPropertyPanel.src

Change-Id: Ib5158a2e28f1af426cd845ac648bcd4674d496f0

diff --git a/svx/source/dialog/docrecovery.src 
b/svx/source/dialog/docrecovery.src
index 10d9e3c..48f9f58 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -148,7 +148,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER
 Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW2 );
 Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RECOV_DESCRHEIGHT );
 WordBreak = TRUE;
-Text[ en-US ] = "Press 'Start Recovery' to start the recovery process 
of the documents listed below.\n\nThe 'Status' column shows whether the 
document could be recovered.";
+Text[ en-US ] = "Press 'Start Recovery' to start the recovery process 
of the documents listed below.\n\nThe 'Status' column shows whether the 
document can be recovered.";
 };
 FixedText FT_RECOV_PROGR
 {
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src 
b/svx/source/sidebar/area/AreaPropertyPanel.src
index 77bb6cb..888d33b 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -178,7 +178,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
 Border = TRUE ;
 Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
 HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_BORDER ;
-QuickHelpText [ en-US ] = "Specify the border value of gradient 
transparence." ;
+QuickHelpText [ en-US ] = "Specify the border value of gradient 
transparency." ;
 TabStop = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 2abdd28..fe82180 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -2301,7 +2301,7 @@ String SIP_SA_MEASUREDECIMALPLACES
 
 String SIP_SA_MEASURERESERVE05
 {
-Text [ en-US ] = "Dimensioning reserved 5";
+Text [ en-US ] = "Dimensioning reserved for 5";
 };
 
 String SIP_SA_MEASURERESERVE06
commit 621ddc9c951262cdbdda1fe5479b48bc40e6e3b4
Author: Caolán McNamara 
Date:   Wed Feb 5 16:23:24 2014 +

get make findunusedcode working again

Change-Id: I8fed32b8eb1e986321dde0542c15b7b8cf91b123

diff --git a/bin/findunusedcode b/bin/findunusedcode
index 62e56c8..4aaf9cc 100755
--- a/bin/findunusedcode
+++ b/bin/findunusedcode
@@ -6,16 +6,45 @@ GNUMAKE=$2
 cd ${SRCDIR}
 which callcatcher > /dev/null 2>&1 || \
(echo "callcatcher not installed" && false)
-mkdir -p ${SRCDIR}/callcatcher/config_host
-cp config_host/* callcatcher/config_host
-cp config_host.mk* callcatcher
-cat config_host.mk | sed -e s,"export OOO_JUNIT_JAR=.*","export 
OOO_JUNIT_JAR=",g > ${SRCDIR}/callcatcher/config_host.mk
-sed -i -e s,g++,"callcatcher g++",g ${SRCDIR}/callcatcher/config_host.mk
-sed -i -e s,gcc,"callcatcher gcc",g ${SRCDIR}/callcatcher/config_host.mk
-echo unexport ARCH_FLAGS >> ${SRCDIR}/callcatcher/config_host.mk
-echo unexport CFLAGS >> ${SRCDIR}/callcatcher/config_host.mk
-echo unexport CXXFLAGS >> ${SRCDIR}/callcatcher/config_host.mk
-${GNUMAKE} -f ${SRCDIR}/solenv/bin/callcatcher.Makefile findunusedcode
+
+mkdir -p ${SRCDIR}/callcatcher
+cd ${SRCDIR}/callcatcher
+
+echo "--without-doxygen
+  --enable-verbose
+  --enable-gio
+  --enable-packagekit
+  --disable-gnome-vfs
+  --enable-extension-integration
+

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a8/45d71360fc3cd0205d554964c4fd9fe87f0f8a

2014-02-05 Thread Caolán McNamara 
 a8/45d71360fc3cd0205d554964c4fd9fe87f0f8a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 626f0f9e3bebdd66edb2ac9b0b4e2f2ece548118
Author: Caolán McNamara 
Date:   Wed Feb 5 16:53:25 2014 +

Notes added by 'git notes add'

diff --git a/a8/45d71360fc3cd0205d554964c4fd9fe87f0f8a 
b/a8/45d71360fc3cd0205d554964c4fd9fe87f0f8a
new file mode 100644
index 000..39c2651
--- /dev/null
+++ b/a8/45d71360fc3cd0205d554964c4fd9fe87f0f8a
@@ -0,0 +1 @@
+merged as: 8d6debac7796ba35c254da282bbcb039f56f6d15
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com sw/source vcl/unx

2014-02-05 Thread Jacobo Aragunde Pérez 
 offapi/com/sun/star/accessibility/AccessibleEventId.idl |7 +++
 sw/source/core/access/accpara.cxx   |   11 ++-
 vcl/unx/gtk/a11y/atklistener.cxx|8 
 vcl/unx/gtk/a11y/atkwrapper.cxx |8 
 vcl/unx/gtk/a11y/atkwrapper.hxx |1 +
 5 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit c1d69c0e9e3361f9dd340ac133407e1dbb1d08ca
Author: Jacobo Aragunde Pérez 
Date:   Tue Feb 4 15:07:51 2014 +0100

fdo#35105: notify role change through a new UNO a11y event

A new UNO accessibility event called ROLE_CHANGED has been created.
It should be triggered when an accessible object changes its role and
every accessibility toolkit should use its own methods to make that
change effective.

Code to support the event in ATK has been added.

Change-Id: I132e303bdb148967231334458c3cfa369c36ec8f
Reviewed-on: https://gerrit.libreoffice.org/7853
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl 
b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
index 7e31996..20d0d05 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
@@ -380,6 +380,13 @@ constants AccessibleEventId
 const short PAGE_CHANGED =38;
 const short SECTION_CHANGED =39;
 const short COLUMN_CHANGED =40;
+
+/** Constant used to indicate that the role of an accessible object has
+changed.
+
+@since LibreOffice 4.3
+*/
+const short ROLE_CHANGED =41;
 };
 
 }; }; }; };
diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index e5d6b42..6935f43 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -437,7 +437,16 @@ void SwAccessibleParagraph::_InvalidateContent( sal_Bool 
bVisibleDataFired )
 bIsHeading = bNewIsHeading;
 }
 
-if( bNewIsHeading != bOldIsHeading || rText != sOldText )
+if( bNewIsHeading != bOldIsHeading )
+{
+// The role has changed
+AccessibleEventObject aEvent;
+aEvent.EventId = AccessibleEventId::ROLE_CHANGED;
+
+FireAccessibleEvent( aEvent );
+}
+
+if( rText != sOldText )
 {
 OUString sNewDesc( GetDescription() );
 OUString sOldDesc;
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index f1614d8..f13a0a3 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -549,6 +549,14 @@ void AtkListener::notifyEvent( const 
accessibility::AccessibleEventObject& aEven
 g_signal_emit_by_name( G_OBJECT( atk_obj ), 
"property_change::accessible-hypertext-offset");
 break;
 
+case accessibility::AccessibleEventId::ROLE_CHANGED:
+{
+uno::Reference< accessibility::XAccessibleContext > xContext;
+xContext = getAccessibleContextFromSource( aEvent.Source );
+atk_object_wrapper_set_role( mpWrapper, 
xContext->getAccessibleRole() );
+break;
+}
+
 default:
 g_warning( "Unknown event notification %d", aEvent.EventId );
 break;
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 6e48230..ac5075b 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -876,6 +876,14 @@ void atk_object_wrapper_remove_child(AtkObjectWrapper* 
wrapper, AtkObject *child
 
 /*/
 
+void atk_object_wrapper_set_role(AtkObjectWrapper* wrapper, sal_Int16 role)
+{
+AtkObject *atk_obj = ATK_OBJECT( wrapper );
+atk_object_set_role( atk_obj, mapToAtkRole( role ) );
+}
+
+/*/
+
 #define RELEASE(i) if( i ) { i->release(); i = NULL; }
 
 void atk_object_wrapper_dispose(AtkObjectWrapper* wrapper)
diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx
index 2b018b9..02126cb 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.hxx
@@ -84,6 +84,7 @@ AtkObject *atk_object_wrapper_new(
 
 void   atk_object_wrapper_add_child(AtkObjectWrapper* wrapper, 
AtkObject *child, gint index);
 void   atk_object_wrapper_remove_child(AtkObjectWrapper* 
wrapper, AtkObject *child, gint index);
+void   atk_object_wrapper_set_role(AtkObjectWrapper* wrapper, 
sal_Int16 role);
 
 void   atk_object_wrapper_dispose(AtkObjectWrapper* wrapper);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

David Clayton  changed:

   What|Removed |Added

 Depends on||74573

--- Comment #82 from David Clayton  ---
Hi, adding bug#74573 (Paste Special skip empty cells broken)

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

Developer wanted for plugin/add-on development Docear

2014-02-05 Thread Victor Ferreira 

Sorry if someone else already published a similar request:
the Docear team needs a develloper to help with a Libreoffice plugin:
http://www.docear.org/2013/08/14/who-wants-to-develop-docear4libreoffice-or-docear4openoffice/
They are willing to find payment for the task.
Cheers,
Victor Ferreira

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

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

2014-02-05 Thread Lionel Elie Mamane 
 forms/source/component/EditBase.cxx |   46 
 1 file changed, 41 insertions(+), 5 deletions(-)

New commits:
commit 24c01fae1c9ad1ced40f29660468f4464ce35e26
Author: Lionel Elie Mamane 
Date:   Wed Feb 5 16:53:10 2014 +0100

fdo#69652 Default(Date|Time) is a UNO struct now

Changed to UNO struct from integer by
  fdo#67235 adapt form control code to time nanosecond API change

Change-Id: I5817d44438d70a0da534c03afd22d74a311252f5
Reviewed-on: https://gerrit.libreoffice.org/7882
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/forms/source/component/EditBase.cxx 
b/forms/source/component/EditBase.cxx
index bfbb76f..18473e1 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -26,10 +26,15 @@
 #include 
 #include "frm_resource.hxx"
 #include "frm_resource.hrc"
+#include 
+#include 
+#include 
+#include 
 
 //.
 namespace frm
 {
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
@@ -42,9 +47,14 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-const sal_uInt16 DEFAULT_LONG=  0x0001;
-const sal_uInt16 DEFAULT_DOUBLE  =  0x0002;
-const sal_uInt16 FILTERPROPOSAL  =  0x0004;
+namespace
+{
+const sal_uInt16 DEFAULT_LONG=  0x0001;
+const sal_uInt16 DEFAULT_DOUBLE  =  0x0002;
+const sal_uInt16 FILTERPROPOSAL  =  0x0004;
+const sal_uInt16 DEFAULT_TIME=  0x0008;
+const sal_uInt16 DEFAULT_DATE=  0x0010;
+}
 
 DBG_NAME( OEditBaseModel )
 //--
@@ -84,7 +94,7 @@ void OEditBaseModel::write(const 
Reference& _rxOutStream) t
 OBoundControlModel::write(_rxOutStream);
 
 // Version
-sal_uInt16 nVersionId = 0x0005;
+sal_uInt16 nVersionId = 0x0006;
 DBG_ASSERT((getPersistenceFlags() & ~PF_SPECIAL_FLAGS) == 0,
 "OEditBaseModel::write : invalid special version flags !");
 // please don't use other flags, older versions can't interpret them !
@@ -102,6 +112,10 @@ void OEditBaseModel::write(const 
Reference& _rxOutStream) t
 nAnyMask |= DEFAULT_LONG;
 else if (m_aDefault.getValueType().getTypeClass() == TypeClass_DOUBLE)
 nAnyMask |= DEFAULT_DOUBLE;
+else if (m_aDefault.getValueType() == ::getCppuType((const util::Time*)0))
+nAnyMask |= DEFAULT_TIME;
+else if (m_aDefault.getValueType() == ::getCppuType((const util::Date*)0))
+nAnyMask |= DEFAULT_DATE;
 
 if (m_bFilterProposal)  // Don't save a value, because it's boolean
 nAnyMask |= FILTERPROPOSAL;
@@ -113,6 +127,18 @@ void OEditBaseModel::write(const 
Reference& _rxOutStream) t
 _rxOutStream->writeLong(getINT32(m_aDefault));
 else if ((nAnyMask & DEFAULT_DOUBLE) == DEFAULT_DOUBLE)
 _rxOutStream->writeDouble(getDouble(m_aDefault));
+else if ((nAnyMask & DEFAULT_TIME) == DEFAULT_TIME)
+{
+util::Time aTime;
+OSL_VERIFY(m_aDefault >>= aTime);
+_rxOutStream->writeHyper(::Time(aTime).GetTime());
+}
+else if ((nAnyMask & DEFAULT_DATE) == DEFAULT_DATE)
+{
+util::Date aDate;
+OSL_VERIFY(m_aDefault >>= aDate);
+_rxOutStream->writeLong(::Date(aDate).GetDate());
+}
 
 // since version 5 we write the help text
 writeHelpTextCompatibly(_rxOutStream);
@@ -169,6 +195,14 @@ void OEditBaseModel::read(const 
Reference& _rxInStream) thro
 double fValue = _rxInStream->readDouble();
 m_aDefault <<= (double)fValue;
 }
+else if ((nAnyMask & DEFAULT_TIME) == DEFAULT_TIME)
+{
+m_aDefault <<= ::Time(_rxInStream->readHyper()).GetUNOTime();
+}
+else if ((nAnyMask & DEFAULT_DATE) == DEFAULT_DATE)
+{
+m_aDefault <<= ::Date(_rxInStream->readLong()).GetUNODate();
+}
 
 if ((nAnyMask & FILTERPROPOSAL) == FILTERPROPOSAL)
 m_bFilterProposal = sal_True;
@@ -281,8 +315,10 @@ sal_Bool OEditBaseModel::convertFastPropertyValue( Any& 
rConvertedValue, Any& rO
 bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, 
m_aDefault, ::getCppuType((const double*)0));
 break;
 case PROPERTY_ID_DEFAULT_DATE:
+bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, 
m_aDefault, ::getCppuType((const util::Date*)0));
+break;
 case PROPERTY_ID_DEFAULT_TIME:
-bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, 
m_aDefault, ::getCppuType((const sal_Int32*)0));
+bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, 
m_aDefault, ::getCppuType((const util::Time*)0));
 break;
 default:
 bMod

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

2014-02-05 Thread Lionel Elie Mamane 
 forms/source/component/EditBase.cxx |   46 
 1 file changed, 41 insertions(+), 5 deletions(-)

New commits:
commit 8e8827a2d092810394c819c536d48b74080abce8
Author: Lionel Elie Mamane 
Date:   Wed Feb 5 16:53:10 2014 +0100

fdo#69652 Default(Date|Time) is a UNO struct now

Changed to UNO struct from integer by
  fdo#67235 adapt form control code to time nanosecond API change

Change-Id: I5817d44438d70a0da534c03afd22d74a311252f5
Reviewed-on: https://gerrit.libreoffice.org/7881
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/forms/source/component/EditBase.cxx 
b/forms/source/component/EditBase.cxx
index 73de846..695a724 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -26,10 +26,15 @@
 #include 
 #include "frm_resource.hxx"
 #include "frm_resource.hrc"
+#include 
+#include 
+#include 
+#include 
 
 //.
 namespace frm
 {
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
@@ -42,9 +47,14 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-const sal_uInt16 DEFAULT_LONG=  0x0001;
-const sal_uInt16 DEFAULT_DOUBLE  =  0x0002;
-const sal_uInt16 FILTERPROPOSAL  =  0x0004;
+namespace
+{
+const sal_uInt16 DEFAULT_LONG=  0x0001;
+const sal_uInt16 DEFAULT_DOUBLE  =  0x0002;
+const sal_uInt16 FILTERPROPOSAL  =  0x0004;
+const sal_uInt16 DEFAULT_TIME=  0x0008;
+const sal_uInt16 DEFAULT_DATE=  0x0010;
+}
 
 DBG_NAME( OEditBaseModel )
 //--
@@ -84,7 +94,7 @@ void OEditBaseModel::write(const 
Reference& _rxOutStream) t
 OBoundControlModel::write(_rxOutStream);
 
 // Version
-sal_uInt16 nVersionId = 0x0005;
+sal_uInt16 nVersionId = 0x0006;
 DBG_ASSERT((getPersistenceFlags() & ~PF_SPECIAL_FLAGS) == 0,
 "OEditBaseModel::write : invalid special version flags !");
 // please don't use other flags, older versions can't interpret them !
@@ -102,6 +112,10 @@ void OEditBaseModel::write(const 
Reference& _rxOutStream) t
 nAnyMask |= DEFAULT_LONG;
 else if (m_aDefault.getValueType().getTypeClass() == TypeClass_DOUBLE)
 nAnyMask |= DEFAULT_DOUBLE;
+else if (m_aDefault.getValueType() == ::getCppuType((const util::Time*)0))
+nAnyMask |= DEFAULT_TIME;
+else if (m_aDefault.getValueType() == ::getCppuType((const util::Date*)0))
+nAnyMask |= DEFAULT_DATE;
 
 if (m_bFilterProposal)  // Don't save a value, because it's boolean
 nAnyMask |= FILTERPROPOSAL;
@@ -113,6 +127,18 @@ void OEditBaseModel::write(const 
Reference& _rxOutStream) t
 _rxOutStream->writeLong(getINT32(m_aDefault));
 else if ((nAnyMask & DEFAULT_DOUBLE) == DEFAULT_DOUBLE)
 _rxOutStream->writeDouble(getDouble(m_aDefault));
+else if ((nAnyMask & DEFAULT_TIME) == DEFAULT_TIME)
+{
+util::Time aTime;
+OSL_VERIFY(m_aDefault >>= aTime);
+_rxOutStream->writeHyper(::Time(aTime).GetTime());
+}
+else if ((nAnyMask & DEFAULT_DATE) == DEFAULT_DATE)
+{
+util::Date aDate;
+OSL_VERIFY(m_aDefault >>= aDate);
+_rxOutStream->writeLong(::Date(aDate).GetDate());
+}
 
 // since version 5 we write the help text
 writeHelpTextCompatibly(_rxOutStream);
@@ -169,6 +195,14 @@ void OEditBaseModel::read(const 
Reference& _rxInStream) thro
 double fValue = _rxInStream->readDouble();
 m_aDefault <<= (double)fValue;
 }
+else if ((nAnyMask & DEFAULT_TIME) == DEFAULT_TIME)
+{
+m_aDefault <<= ::Time(_rxInStream->readHyper()).GetUNOTime();
+}
+else if ((nAnyMask & DEFAULT_DATE) == DEFAULT_DATE)
+{
+m_aDefault <<= ::Date(_rxInStream->readLong()).GetUNODate();
+}
 
 if ((nAnyMask & FILTERPROPOSAL) == FILTERPROPOSAL)
 m_bFilterProposal = sal_True;
@@ -281,8 +315,10 @@ sal_Bool OEditBaseModel::convertFastPropertyValue( Any& 
rConvertedValue, Any& rO
 bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, 
m_aDefault, ::getCppuType((const double*)0));
 break;
 case PROPERTY_ID_DEFAULT_DATE:
+bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, 
m_aDefault, ::getCppuType((const util::Date*)0));
+break;
 case PROPERTY_ID_DEFAULT_TIME:
-bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, 
m_aDefault, ::getCppuType((const sal_Int32*)0));
+bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, 
m_aDefault, ::getCppuType((const util::Time*)0));
 break;
 default:
 bMod

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

2014-02-05 Thread Lionel Elie Mamane 
 forms/source/component/EditBase.cxx |   46 
 1 file changed, 41 insertions(+), 5 deletions(-)

New commits:
commit f5c7e770314826c121fb6a03d56f424d308e1e2f
Author: Lionel Elie Mamane 
Date:   Wed Feb 5 16:53:10 2014 +0100

fdo#69652 Default(Date|Time) is a UNO struct now

Changed to UNO struct from integer by
  fdo#67235 adapt form control code to time nanosecond API change

Change-Id: I5817d44438d70a0da534c03afd22d74a311252f5

diff --git a/forms/source/component/EditBase.cxx 
b/forms/source/component/EditBase.cxx
index 5d4aa31..100d355 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -26,10 +26,15 @@
 #include 
 #include "frm_resource.hxx"
 #include "frm_resource.hrc"
+#include 
+#include 
+#include 
+#include 
 
 //.
 namespace frm
 {
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
@@ -42,9 +47,14 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-const sal_uInt16 DEFAULT_LONG=  0x0001;
-const sal_uInt16 DEFAULT_DOUBLE  =  0x0002;
-const sal_uInt16 FILTERPROPOSAL  =  0x0004;
+namespace
+{
+const sal_uInt16 DEFAULT_LONG=  0x0001;
+const sal_uInt16 DEFAULT_DOUBLE  =  0x0002;
+const sal_uInt16 FILTERPROPOSAL  =  0x0004;
+const sal_uInt16 DEFAULT_TIME=  0x0008;
+const sal_uInt16 DEFAULT_DATE=  0x0010;
+}
 
 //--
 OEditBaseModel::OEditBaseModel( const Reference< XComponentContext >& 
_rxFactory, const OUString& rUnoControlModelName,
@@ -80,7 +90,7 @@ void OEditBaseModel::write(const 
Reference& _rxOutStream) t
 OBoundControlModel::write(_rxOutStream);
 
 // Version
-sal_uInt16 nVersionId = 0x0005;
+sal_uInt16 nVersionId = 0x0006;
 DBG_ASSERT((getPersistenceFlags() & ~PF_SPECIAL_FLAGS) == 0,
 "OEditBaseModel::write : invalid special version flags !");
 // please don't use other flags, older versions can't interpret them !
@@ -98,6 +108,10 @@ void OEditBaseModel::write(const 
Reference& _rxOutStream) t
 nAnyMask |= DEFAULT_LONG;
 else if (m_aDefault.getValueType().getTypeClass() == TypeClass_DOUBLE)
 nAnyMask |= DEFAULT_DOUBLE;
+else if (m_aDefault.getValueType() == ::getCppuType((const util::Time*)0))
+nAnyMask |= DEFAULT_TIME;
+else if (m_aDefault.getValueType() == ::getCppuType((const util::Date*)0))
+nAnyMask |= DEFAULT_DATE;
 
 if (m_bFilterProposal)  // Don't save a value, because it's boolean
 nAnyMask |= FILTERPROPOSAL;
@@ -109,6 +123,18 @@ void OEditBaseModel::write(const 
Reference& _rxOutStream) t
 _rxOutStream->writeLong(getINT32(m_aDefault));
 else if ((nAnyMask & DEFAULT_DOUBLE) == DEFAULT_DOUBLE)
 _rxOutStream->writeDouble(getDouble(m_aDefault));
+else if ((nAnyMask & DEFAULT_TIME) == DEFAULT_TIME)
+{
+util::Time aTime;
+OSL_VERIFY(m_aDefault >>= aTime);
+_rxOutStream->writeHyper(::Time(aTime).GetTime());
+}
+else if ((nAnyMask & DEFAULT_DATE) == DEFAULT_DATE)
+{
+util::Date aDate;
+OSL_VERIFY(m_aDefault >>= aDate);
+_rxOutStream->writeLong(::Date(aDate).GetDate());
+}
 
 // since version 5 we write the help text
 writeHelpTextCompatibly(_rxOutStream);
@@ -165,6 +191,14 @@ void OEditBaseModel::read(const 
Reference& _rxInStream) thro
 double fValue = _rxInStream->readDouble();
 m_aDefault <<= (double)fValue;
 }
+else if ((nAnyMask & DEFAULT_TIME) == DEFAULT_TIME)
+{
+m_aDefault <<= ::Time(_rxInStream->readHyper()).GetUNOTime();
+}
+else if ((nAnyMask & DEFAULT_DATE) == DEFAULT_DATE)
+{
+m_aDefault <<= ::Date(_rxInStream->readLong()).GetUNODate();
+}
 
 if ((nAnyMask & FILTERPROPOSAL) == FILTERPROPOSAL)
 m_bFilterProposal = sal_True;
@@ -277,8 +311,10 @@ sal_Bool OEditBaseModel::convertFastPropertyValue( Any& 
rConvertedValue, Any& rO
 bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, 
m_aDefault, ::getCppuType((const double*)0));
 break;
 case PROPERTY_ID_DEFAULT_DATE:
+bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, 
m_aDefault, ::getCppuType((const util::Date*)0));
+break;
 case PROPERTY_ID_DEFAULT_TIME:
-bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, 
m_aDefault, ::getCppuType((const sal_Int32*)0));
+bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, 
m_aDefault, ::getCppuType((const util::Time*)0));
 break;
 default:
 bModified = OBoundControlModel::

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

2014-02-05 Thread Tor Lillqvist 
 vcl/source/gdi/outdev.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a093cea5daf5a6e934bf7c5aa5acfc66a644637f
Author: Tor Lillqvist 
Date:   Wed Feb 5 18:18:02 2014 +0200

WaE: [loplugin:literaltoboolconversion]

Change-Id: I4025c6a00ed6f9dc3522701bcd85153276626330

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 55bcb87..8174379 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -500,7 +500,7 @@ bool OutputDevice::ImplHasMirroredGraphics() const
 {
// HOTFIX for #i55719#
if( meOutDevType == OUTDEV_PRINTER )
-   return sal_False;
+   return false;
 
return ( ImplGetGraphics() && (mpGraphics->GetLayout() & 
SAL_LAYOUT_BIDI_RTL) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Jürgen Schmidt 
 svx/source/dialog/docrecovery.src |2 +-
 svx/source/sidebar/area/AreaPropertyPanel.src |4 ++--
 svx/source/svdraw/svdstr.src  |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a845d71360fc3cd0205d554964c4fd9fe87f0f8a
Author: Jürgen Schmidt 
Date:   Wed Feb 5 14:06:17 2014 +

#123116# correct spelling errors

Patch By: Aivaras Stepukonis
Review By: jsc

diff --git a/svx/source/dialog/docrecovery.src 
b/svx/source/dialog/docrecovery.src
index f5049e8..bce8079 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -152,7 +152,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER
 Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW2 );
 Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RECOV_DESCRHEIGHT );
 WordBreak = TRUE;
-Text[ en-US ] = "Press 'Start Recovery' to start the recovery process 
of the documents listed below.\n\nThe 'Status' column shows whether the 
document could be recovered.";
+Text[ en-US ] = "Press 'Start Recovery' to start the recovery process 
of the documents listed below.\n\nThe 'Status' column shows whether the 
document can be recovered.";
 };
 FixedText FT_RECOV_PROGR
 {
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src 
b/svx/source/sidebar/area/AreaPropertyPanel.src
index 5d31457..5ba9dc8 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -144,7 +144,7 @@ Control RID_SIDEBAR_AREA_PANEL
 Border = TRUE ;
 Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , 
SECTIONPAGE_MARGIN_VERTICAL_TOP + 2*(FIXED_TEXT_HEIGHT + 
TEXT_CONTROL_SPACING_VERTICAL) + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
 Size = MAP_APPFONT ( MBOX_WIDTH , LISTBOX_HEIGHT ) ;
-QuickHelpText [ en-US ] = "Select the type of transparence to apply." ;
+QuickHelpText [ en-US ] = "Select the type of transparency to apply." ;
 TabStop = TRUE ;
 DropDown = TRUE ;
 HelpID = HID_PPROPERTYPANEL_AREA_LB_TRGR_TYPES ;
@@ -325,7 +325,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
 Border = TRUE ;
 Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
 HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_BORDER ;
-QuickHelpText [ en-US ] = "Specify the border value of gradient 
transparence." ;
+QuickHelpText [ en-US ] = "Specify the border value of gradient 
transparency." ;
 TabStop = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index ddfda90..25a668c 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -2337,7 +2337,7 @@ String SIP_SA_MEASUREDECIMALPLACES
 
 String SIP_SA_MEASURERESERVE05
 {
-Text [ en-US ] = "Dimensioning reserved 5";
+Text [ en-US ] = "Dimensioning reserved for 5";
 };
 
 String SIP_SA_MEASURERESERVE06
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - icon-themes/galaxy sd/source sd/uiconfig

2014-02-05 Thread Samuel Mehrbrodt 
 dev/null |binary
 sd/source/ui/animations/CustomAnimationPane.cxx  |2 
 sd/uiconfig/simpress/ui/customanimationspanel.ui |   73 +++
 3 files changed, 35 insertions(+), 40 deletions(-)

New commits:
commit d18a29455ab6297d7b8a0b37dc93062ce94d37f1
Author: Samuel Mehrbrodt 
Date:   Wed Feb 5 10:13:34 2014 +0100

fdo#62082 Fix buttons in Custom animation toolbar

* Use small button size
* Fix duplicate arrows
* Change "Remove" icon
* Remove no longer used icons

Change-Id: I28a22704fc0696d00d97ac3b6b6fc0c98c3433ed
Reviewed-on: https://gerrit.libreoffice.org/7868
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/icon-themes/galaxy/cmd/lc_list-add.png 
b/icon-themes/galaxy/cmd/lc_list-add.png
deleted file mode 100644
index 117ec83..000
Binary files a/icon-themes/galaxy/cmd/lc_list-add.png and /dev/null differ
diff --git a/icon-themes/galaxy/cmd/lc_playback-start.png 
b/icon-themes/galaxy/cmd/lc_playback-start.png
deleted file mode 100644
index 734b889..000
Binary files a/icon-themes/galaxy/cmd/lc_playback-start.png and /dev/null differ
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 2897d2e..2c7565d 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -192,8 +192,6 @@ CustomAnimationPane::CustomAnimationPane( ::Window* 
pParent, ViewShellBase& rBas
 maStrProperty = mpFTProperty->GetText();
 
 fillDurationComboBox( mpCBSpeed );
-mpPBMoveUp->SetSymbol( SYMBOL_ARROW_UP );
-mpPBMoveDown->SetSymbol( SYMBOL_ARROW_DOWN );
 
 mpPBAddEffect->SetClickHdl( LINK( this, CustomAnimationPane, 
implControlHdl ) );
 mpPBChangeEffect->SetClickHdl( LINK( this, CustomAnimationPane, 
implControlHdl ) );
diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui 
b/sd/uiconfig/simpress/ui/customanimationspanel.ui
index b341cd6..9c99a23 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanel.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui
@@ -2,6 +2,41 @@
 
   
   
+  
+True
+False
+svtools/res/list_add.png
+2
+  
+  
+True
+False
+cmd/sc_editdoc.png
+2
+  
+  
+True
+False
+cmd/sc_movedown.png
+2
+  
+  
+True
+False
+sd/res/playblue_16.png
+  
+  
+True
+False
+extensions/res/buttonminus.png
+2
+  
+  
+True
+False
+cmd/sc_moveup.png
+2
+  
   
 True
 False
@@ -20,9 +55,6 @@
 True
 True
 True
-
-  
-
   
   
 True
@@ -318,39 +350,4 @@
   
 
   
-  
-True
-False
-cmd/lc_list-add.png
-2
-  
-  
-True
-False
-cmd/lc_editdoc.png
-2
-  
-  
-True
-False
-cmd/lc_movedown.png
-2
-  
-  
-True
-False
-cmd/lc_playback-start.png
-  
-  
-True
-False
-cmd/lc_delete.png
-2
-  
-  
-True
-False
-cmd/lc_moveup.png
-2
-  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/galaxy sd/source sd/uiconfig

2014-02-05 Thread Samuel Mehrbrodt 
 dev/null |binary
 sd/source/ui/animations/CustomAnimationPane.cxx  |2 
 sd/uiconfig/simpress/ui/customanimationspanel.ui |   73 +++
 3 files changed, 35 insertions(+), 40 deletions(-)

New commits:
commit 5350d30b10ebcd939d4b2ca5f142d6c5a3444f42
Author: Samuel Mehrbrodt 
Date:   Wed Feb 5 10:13:34 2014 +0100

fdo#62082 Fix buttons in Custom animation toolbar

* Use small button size
* Fix duplicate arrows
* Change "Remove" icon
* Remove no longer used icons

Change-Id: I28a22704fc0696d00d97ac3b6b6fc0c98c3433ed
Reviewed-on: https://gerrit.libreoffice.org/7867
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/icon-themes/galaxy/cmd/lc_list-add.png 
b/icon-themes/galaxy/cmd/lc_list-add.png
deleted file mode 100644
index 117ec83..000
Binary files a/icon-themes/galaxy/cmd/lc_list-add.png and /dev/null differ
diff --git a/icon-themes/galaxy/cmd/lc_playback-start.png 
b/icon-themes/galaxy/cmd/lc_playback-start.png
deleted file mode 100644
index 734b889..000
Binary files a/icon-themes/galaxy/cmd/lc_playback-start.png and /dev/null differ
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 74eed98..3fdc632 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -192,8 +192,6 @@ CustomAnimationPane::CustomAnimationPane( ::Window* 
pParent, ViewShellBase& rBas
 maStrProperty = mpFTProperty->GetText();
 
 fillDurationComboBox( mpCBSpeed );
-mpPBMoveUp->SetSymbol( SYMBOL_ARROW_UP );
-mpPBMoveDown->SetSymbol( SYMBOL_ARROW_DOWN );
 
 mpPBAddEffect->SetClickHdl( LINK( this, CustomAnimationPane, 
implControlHdl ) );
 mpPBChangeEffect->SetClickHdl( LINK( this, CustomAnimationPane, 
implControlHdl ) );
diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui 
b/sd/uiconfig/simpress/ui/customanimationspanel.ui
index b341cd6..9c99a23 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanel.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui
@@ -2,6 +2,41 @@
 
   
   
+  
+True
+False
+svtools/res/list_add.png
+2
+  
+  
+True
+False
+cmd/sc_editdoc.png
+2
+  
+  
+True
+False
+cmd/sc_movedown.png
+2
+  
+  
+True
+False
+sd/res/playblue_16.png
+  
+  
+True
+False
+extensions/res/buttonminus.png
+2
+  
+  
+True
+False
+cmd/sc_moveup.png
+2
+  
   
 True
 False
@@ -20,9 +55,6 @@
 True
 True
 True
-
-  
-
   
   
 True
@@ -318,39 +350,4 @@
   
 
   
-  
-True
-False
-cmd/lc_list-add.png
-2
-  
-  
-True
-False
-cmd/lc_editdoc.png
-2
-  
-  
-True
-False
-cmd/lc_movedown.png
-2
-  
-  
-True
-False
-cmd/lc_playback-start.png
-  
-  
-True
-False
-cmd/lc_delete.png
-2
-  
-  
-True
-False
-cmd/lc_moveup.png
-2
-  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=60270

Cor Nouws  changed:

   What|Removed |Added

 Depends on||72284

--- Comment #137 from Cor Nouws  ---
adding Bug 72284 - FILESAVE: Crashes when trying to save a particular docx file
(2013-12-03 ..)

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.5.3'

2014-02-05 Thread Christian Lohmaier 
Tag 'libreoffice-4.1.5.3' created by Christian Lohmaier 
 at 2014-02-05 15:04 -0800

Tag libreoffice-4.1.5.3
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJS8lMQAAoJEPQ0oe+v7q6jT78QAIrQOUNBUZ3D8OVuHXjk2yFy
Ah9fyEtkXm5kslAsjWzcFGHIaC9K0S4+SCP0kNF5yLYKUh1h56jQlZ9K9mnoPp5h
y6U/Z8w3kfTECEwENNPNJjcm0Bun4tpbe93tMR0C3BbH6DS/J+ceYzr2gWT6IItX
LV/XTWooYLzabRcgQWQkBb0H1KW4yUmxXmFOqdpPJ05++rlBo9H7Ab4qQ/8FkD2R
TsSLXISG7Ib4cafT7Ysvhi94DpUCioFtYxYuO3DFtx0BQK4v8hIdH6fe5TqSkEaq
UnSe7P+UKyGvXM5iEUXxXCt77LhSy3H5tL5w7IHJTTULSa5/A8yVPo9wc91LPRb0
WJlQgSM70u/fiM/KASeh7qcDWVEdQlCacZMTsTnxo/u00V+TYlzDoqUBcpdySwAs
pY4HawKRYptnvS4Bhplscvs615UPcdChhJhKIQfJjfxjBQpb5sXtle8FArBNku/Z
uu4xHOPhhFIrRhaNMVbInMMvE1Ydh0JrsI0kw7ptRmaLs4kLMcDaTWhG5dMo0zd/
XI9b0r1z4AvWxoKBqHQNoEq1olMXVPye1M1eVPkZyxYF4SMzeFENUo8vanAosZvQ
7dYn+VAb2fSFMRPI/OPg8AsdA+MLujBSUyGOMvqxXeEZXU8Ocbp24PbaMfTxTzv4
JcijQoqeknhQyeVmRfJw
=dqlZ
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-5' - configure.ac

2014-02-05 Thread Christian Lohmaier 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a060bc14cdcfa7ccfd07c1e664d1b8d869194822
Author: Christian Lohmaier 
Date:   Wed Feb 5 16:06:30 2014 +0100

bump version to 4.1.5.3.0+

Change-Id: Iaaa295c43e577b4ec5875003ddd3a6e6a0bb1284

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.5.3'

2014-02-05 Thread Christian Lohmaier 
Tag 'libreoffice-4.1.5.3' created by Christian Lohmaier 
 at 2014-02-05 15:04 -0800

Tag libreoffice-4.1.5.3
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJS8lMIAAoJEPQ0oe+v7q6jYpcP/ijczhjYBpl++0BAWgBnSjdi
HPST1J5e8xT4ZZBuc4ROnIkfHnftTWUsZ2n7MFEF7AI9QPQWGqa1LVSG1048VcSI
1l6YJtMOMid+av6MgHD7MDoxduQAZvfgUPqNjMQekfncrz046/7LIucM2MvIUtRQ
corGv9Xz36no7i7oSzVHewQaDTdG98DV3DUWX/OzWpiCNtZvyxMT4FKD2b34LMcH
n8INzJQXd7m3BC8vdc8v1XlC9jJvcmbHzk91T0lTz8R/g4mZR8E0DAlVYMm3t6xt
KdqAJCUL1lCxblxvrN/d7mdGij0HYq5UcydcVm089w0rWIp/p4O7xrpfMtQzi6y7
vBTl3HRtACM045+nmu89uLTD7FtZmLBf53ML4j0cgaroaIRMTcV04+iofr3iwg8g
canu9Yb4ow8XWGEJG4nSjn6QWrFKU41/Lr46Ff+J/BbaJSUL25Wf08y7ddYQL/0A
Gz77n/Wh/Zl4zErRXj+ZihIOhYys3FmJJou9cXmu+mEzeub2qBDz4s/ACTV67mfX
NS5az1BFG95vGYte7WKN+0ON4pe9W0Qm37hLwQj4bA37wcH+dweZo8lVXfZdMNmG
H5PMkATRMx1v4I/YvlghFqf9yVY7jOvM1oqRXJiwl5W95A09N6PPvAZyiobu9316
JOjqi4cXiIVC6xU61PKp
=Uwom
-END PGP SIGNATURE-

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.5.3'

2014-02-05 Thread Christian Lohmaier 
Tag 'libreoffice-4.1.5.3' created by Christian Lohmaier 
 at 2014-02-05 15:04 -0800

Tag libreoffice-4.1.5.3
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJS8lL/AAoJEPQ0oe+v7q6jOAcQAJpTciKwWr502Mg57jGnJ3k5
ubWHN9t7PtazeIgbUsroTrvquzLl7TLg4zQbSPF/DeJ6ySfWzsBoJHzxITlZbRSu
MGWe6Fxn2t3zMaE83geqLQFAvGGH8IXfY2dp1QQBjM/vku8O69qdsowxW50alrqm
3xC8L+pWViJSoUqn04SdftRnXhESlTFz1PZM0itwhPqVoKD62+DnEgZqWUWMOYKo
YUBDDkHr0cVBzmgIhJALjdncXUa7y0PCXVMpa109oPOGX168szuqER/OrYUG8Qg5
cIcKoy80urvJGpyUQOXbPnVEAgq5FJPXE1dRAFiCN5QU7jdzlF1z5iMlu+Kr8JdA
4Xs/QJo0tptJ/PFdu66fWnDnAHs/ngNLTJBkfhZ/ab3T//4eO2wHHyQcvi0rVdkD
XvmpLeKSEbpLqxlVm2p/4JbARYwfOXtkNfjSdjLHY9hScVYrupcH8zGc9o8qpx6b
2WDHFwOdAEDgXya/gEzLjjZCuOZYtpsp08wpV1ih4D+Pt6DyGlYp/492B8DqHJVR
EnljT/cDnmaEJ0rZ4tTmhqVGfSpC68z12JoDOxyqhY+YZdF3wsHw9SaPBXAO/8Cy
mxBe8V+I9LcqNgIMDmxQpOZmrEc9yo8B3icmKeRVtTgbUuOgKR8VKRBf28H8Kot5
wP4zei+dg4SWZR2uoAPW
=3y23
-END PGP SIGNATURE-

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.5.3'

2014-02-05 Thread Christian Lohmaier 
Tag 'libreoffice-4.1.5.3' created by Christian Lohmaier 
 at 2014-02-05 15:04 -0800

Tag libreoffice-4.1.5.3
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJS8lMMAAoJEPQ0oe+v7q6jJ5QP/ihaO7Jf6sboGhdUaVh3fel5
yqKtpTHYwi73Ua7u5tioJF+ORQbRcNssTQLaWjvLzD0M3zYID/AwKw0pkQKrbKPh
2/oUTc7WbE+KhRS1bUKspRuj3JFC6EqCmLOMIUqaibSwT+PpXPYqFkF62iMODYzd
3aCssqNG6/amCIDv4aUfWLUw/9xMSwRNDRie4NK6lvjkUDuEzwBZ7OLfsIUcY8z/
7k2HFky8VESMrziTVGLZUiywGUTnj0Ir4gJ7E73k6HbspqsxrJV/YUBPbkBETjho
W9dcY0neCVSJkhp2tCZaMBGq3h4aB5IHd8c4oFxwzFK5uUqYDWK1icHbpGKU1w9H
nXunrIYuRalhZxydq3x/iNq7aHVKwzMDWzY1izecsQaKKCGG6gG25VdQPRfqLmNB
b+fz9L0lwzcHgt5EjJ6yqr3bT2Bj6zxK3Ill5U4MsFq4Pb+0WVD0/cLFDJB7FaR8
Bcqs/pjBSqTwbw8IpkDVVtLjzJEsPUBCsU0TeDag7R14Vx+3aLEApgJftZt5XKEd
QCa/WhqEoC4NBZTr6fTEz7UYQuCpGwxDUmD/mkaNPALRZ9yAxY+UeYKhSTKN3BAV
84QlS1e2Czqc+wSsmwCGiHHTV3AjoPE5xXtVNLswTTewQ3vuzTz+WOPPffPj/dls
uDa0rlpBd7g25R0BaFQS
=vfQg
-END PGP SIGNATURE-

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

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

2014-02-05 Thread Chris Sherlock 
 vcl/source/window/window.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 9cb1018c81dbceead9ee2f4da26989035c5a0bab
Author: Chris Sherlock 
Date:   Mon Feb 3 20:00:11 2014 +1100

fdo#74424 Use Window::GetOutDev() to access ImplInitOutDevData()

Part of the decoupling of Window from OutputDevice. We now get
the Window's OutputDevice instance and manipulate this. Do not rely
on the inherited function.

Conflicts:
vcl/source/window/window.cxx

Change-Id: Ia68ba25a9d42ce653c093dbea7087ab8431c8509
Reviewed-on: https://gerrit.libreoffice.org/7795
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6c3dca2..41f7ebe 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9032,7 +9032,10 @@ void Window::SetAccessibilityEventsSuppressed(sal_Bool 
bSuppressed)
 void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const 
Rectangle& rRect )
 {
 if( ! mpOutDevData )
-ImplInitOutDevData();
+{
+OutputDevice *pOutDev = GetOutDev();
+pOutDev->ImplInitOutDevData();
+}
 mpOutDevData->mpRecordLayout = pLayout;
 mpOutDevData->maRecordRect = rRect;
 Paint( rRect );
@@ -9601,7 +9604,8 @@ void Window::ImplPaintToDevice( OutputDevice* 
i_pTargetOutDev, const Point& i_rP
 if( pChild->mpWindowImpl->mpFrame == mpWindowImpl->mpFrame && 
pChild->IsVisible() )
 {
 long nDeltaX = pChild->mnOutOffX - mnOutOffX;
-if( ImplHasMirroredGraphics() )
+
+if( pOutDev->ImplHasMirroredGraphics() )
 nDeltaX = mnOutWidth - nDeltaX - pChild->mnOutWidth;
 long nDeltaY = pChild->GetOutOffYPixel() - GetOutOffYPixel();
 Point aPos( i_rPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Caolán McNamara 
 include/vcl/outdev.hxx|2 +-
 vcl/source/gdi/outdev.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f1e96f263d3fddf028a8fd6e09c3a6781718aab7
Author: Caolán McNamara 
Date:   Wed Feb 5 14:46:08 2014 +

OutputDevice::ImplHasMirroredGraphics can be const

Change-Id: I639c4821d9ef4da04ccbed6b93f7e6e3b51ae74d

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 4223135..8bf356d 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -359,7 +359,7 @@ public:
 SAL_DLLPRIVATE sal_Int32ImplGetDPIY() const { return mnDPIY; }
 SAL_DLLPRIVATE SalGraphics* ImplGetGraphics() const;
 SAL_DLLPRIVATE void ImplReleaseGraphics( sal_Bool bRelease = 
sal_True );
-SAL_DLLPRIVATE sal_Bool ImplHasMirroredGraphics();
+SAL_DLLPRIVATE bool ImplHasMirroredGraphics() const;
 SAL_DLLPRIVATE void ImplReMirror( Point &rPoint ) const;
 SAL_DLLPRIVATE void ImplReMirror( Rectangle &rRect ) const;
 SAL_DLLPRIVATE void ImplReMirror( Region &rRegion ) const;
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 0699ac7..f2aedd1 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -496,7 +496,7 @@ void OutputDevice::EnableRTL( sal_Bool bEnable )
 mpAlphaVDev->EnableRTL( bEnable );
 }
 
-sal_Bool OutputDevice::ImplHasMirroredGraphics()
+bool OutputDevice::ImplHasMirroredGraphics() const
 {
// HOTFIX for #i55719#
if( meOutDevType == OUTDEV_PRINTER )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Chris Sherlock 
 vcl/source/window/dockmgr.cxx  |6 +++-
 vcl/source/window/floatwin.cxx |4 +--
 vcl/source/window/status.cxx   |5 ++--
 vcl/source/window/window.cxx   |   50 ++---
 vcl/source/window/winproc.cxx  |5 ++--
 5 files changed, 39 insertions(+), 31 deletions(-)

New commits:
commit 999a83b455b9db32116203fcc7337f9910d1d5f7
Author: Chris Sherlock 
Date:   Mon Feb 3 19:11:40 2014 +1100

fdo#74424 Use Window::GetOutDev() to access ImplHasMirroredGraphics()

Part of the decoupling of Window from OutputDevice. We now get
the Window's OutputDevice instance and manipulate this. Do not rely
on the inherited function.

Conflicts:
vcl/source/window/window.cxx

Change-Id: If429486dee4f7cc1e55ca48ab5d715d0c30578a3
Reviewed-on: https://gerrit.libreoffice.org/7794
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 8aee080..4980edb 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -802,7 +802,8 @@ void ImplPopupFloatWin::MouseButtonDown( const MouseEvent& 
rMEvt )
 {
 // get mouse pos at a static window to have a fixed reference point
 PointerState aState = GetParent()->GetPointerState();
-if (ImplHasMirroredGraphics() && IsRTLEnabled())
+const OutputDevice *pOutDev = GetOutDev();
+if (pOutDev->ImplHasMirroredGraphics() && IsRTLEnabled())
 ImplMirrorFramePos(aState.maPos);
 maTearOffPosition = GetWindow( WINDOW_BORDER )->GetPosPixel();
 maDelta = aState.maPos - maTearOffPosition;
@@ -827,7 +828,8 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent& 
rTEvt )
 {
 // move the window according to mouse pos
 PointerState aState = GetParent()->GetPointerState();
-if (ImplHasMirroredGraphics() && IsRTLEnabled())
+const OutputDevice *pOutDev = GetOutDev();
+if (pOutDev->ImplHasMirroredGraphics() && IsRTLEnabled())
 ImplMirrorFramePos(aState.maPos);
 maTearOffPosition = aState.maPos - maDelta;
 GetWindow( WINDOW_BORDER )->SetPosPixel( maTearOffPosition );
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index e01d5f1..60f8d16 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -457,7 +457,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* 
pReference, const Poin
 const OutputDevice *pWindowOutDev = pReference->GetOutDev();
 
 // compare coordinates in absolute screen coordinates
-if( pReference->ImplHasMirroredGraphics()  )
+if( pWindowOutDev->ImplHasMirroredGraphics()  )
 {
 if(!pReference->IsRTLEnabled() )
 // --- RTL --- re-mirror back to get device coordiantes
@@ -690,7 +690,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& 
rRect, sal_uLong nFlags )
 
 // compare coordinates in absolute screen coordinates
 // Keep in sync with FloatingWindow::ImplFloatHitTest, e.g. fdo#33509
-if( pReference->ImplHasMirroredGraphics()  )
+if( pParentWinOutDev->ImplHasMirroredGraphics()  )
 {
 if(!pReference->IsRTLEnabled() )
 // --- RTL --- re-mirror back to get device coordiantes
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index c477789..cf8794d 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -282,7 +282,9 @@ void StatusBar::ImplFormat()
 nExtraWidth2 = 0;
 }
 nX = STATUSBAR_OFFSET_X;
-if( ImplHasMirroredGraphics() && IsRTLEnabled() )
+
+const OutputDevice *pOutDev = GetOutDev();
+if( pOutDev->ImplHasMirroredGraphics() && IsRTLEnabled() )
 nX += ImplGetSVData()->maNWFData.mnStatusBarLowerRightOffset;
 }
 
@@ -481,7 +483,6 @@ void StatusBar::ImplDrawItem( sal_Bool bOffScreen, 
sal_uInt16 nPos, sal_Bool bDr
 }
 
 const OutputDevice *pOutDev = GetOutDev();
-
 if ( !pOutDev->ImplIsRecordLayout() )
 ImplCallEventListeners( VCLEVENT_STATUSBAR_DRAWITEM, (void*) 
sal_IntPtr(pItem->mnId) );
 }
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 41f7ebe..3b50e1e 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3338,7 +3338,8 @@ void Window::ImplPosSizeWindow( long nX, long nY,
 long nOrgX = nX;
 // --- RTL ---  (compare the screen coordinates)
 Point aPtDev( Point( nX+mnOutOffX, 0 ) );
-if( ImplHasMirroredGraphics() )
+OutputDevice *pOutDev = GetOutDev();
+if( pOutDev->ImplHasMirroredGraphics() )
 {
 mpGraphics->mirror( aPtDev.X(), this );
 
@@ -7090,25 +7091,29 @@ void Window::setPosSizePixel( long nX, long nY,
 {
 // --- RTL ---  make sure the old right aligned position is not 
changed
 /

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

2014-02-05 Thread Chris Sherlock 
 vcl/source/gdi/outdev.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c11b48d09f8ef31d3ec326e1dfda91a8e384ae81
Author: Chris Sherlock 
Date:   Mon Feb 3 20:30:31 2014 +1100

fdo#74424 - added TODO

The function OutputDevice::ImplInitClipRegion() should be moved into
Window, VirtualDevice and Printer. Added a TODO note.

Change-Id: Ia9c7a5299e8762ad96788232466b0772c0a2e6bb
Reviewed-on: https://gerrit.libreoffice.org/7796
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index f2aedd1..55bcb87 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -916,6 +916,8 @@ void OutputDevice::ImplInitFillColor()
 mbInitFillColor = false;
 }
 
+// TODO: fdo#74424 - this needs to be moved out of OutputDevice and into the
+// Window, VirtualDevice and Printer classes
 void OutputDevice::ImplInitClipRegion()
 {
 DBG_TESTSOLARMUTEX();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-5' - translations

2014-02-05 Thread Christian Lohmaier 
 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d005815af59864790b0717dee40a69850ca6eaf1
Author: Christian Lohmaier 
Date:   Wed Feb 5 14:51:22 2014 +0100

Updated core
Project: translations  64b0266170e1ddd1c6fd13b84b276e65b8f09be8

diff --git a/translations b/translations
index 18a4076..64b0266 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 18a4076d256e3626b719a191571c1e9085ef08c9
+Subproject commit 64b0266170e1ddd1c6fd13b84b276e65b8f09be8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Chris Sherlock 
 vcl/source/window/window2.cxx |   23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 8f542a605baec0b777effbb3eeff09a09a28
Author: Chris Sherlock 
Date:   Mon Feb 3 22:53:05 2014 +1100

fdo#74424 Use Window::GetOutDev() to access ImplDrawFrameDev()

Part of the decoupling of Window from OutputDevice. We now get
the Window's OutputDevice instance and manipulate this. Do not rely
on the inherited function.

Change-Id: Ie1381b06b940f9220ee77606f9882aa7a4ea1381
Reviewed-on: https://gerrit.libreoffice.org/7808
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index ba9976b..e407bcf 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -173,9 +173,11 @@ void Window::ImplSaveOverlapBackground()
 mpWindowImpl->mpOverlapData->mnSaveBackSize = 
nSaveBackSize;
 mpWindowImpl->mpFrameData->mnAllSaveBackSize += 
nSaveBackSize;
 Point aDevPt;
-mpWindowImpl->mpFrameWindow->ImplGetFrameDev( Point( 
mnOutOffX, mnOutOffY ),
-aDevPt, aOutSize,
-
*(mpWindowImpl->mpOverlapData->mpSaveBackDev) );
+
+OutputDevice *pOutDev = 
mpWindowImpl->mpFrameWindow->GetOutDev();
+pOutDev->ImplGetFrameDev( Point( mnOutOffX, mnOutOffY ),
+  aDevPt, aOutSize,
+  
*(mpWindowImpl->mpOverlapData->mpSaveBackDev) );
 mpWindowImpl->mpOverlapData->mpNextBackWin = 
mpWindowImpl->mpFrameData->mpFirstBackWin;
 mpWindowImpl->mpFrameData->mpFirstBackWin = this;
 }
@@ -203,20 +205,23 @@ sal_Bool Window::ImplRestoreOverlapBackground( Region& 
rInvRegion )
 Point   aDevPt;
 Point   aDestPt( mnOutOffX, mnOutOffY );
 SizeaDevSize = 
mpWindowImpl->mpOverlapData->mpSaveBackDev->GetOutputSizePixel();
+
+OutputDevice *pOutDev = mpWindowImpl->mpFrameWindow->GetOutDev();
+
 if ( mpWindowImpl->mpOverlapData->mpSaveBackRgn )
 {
 mpWindowImpl->mpOverlapData->mpSaveBackRgn->Intersect( 
mpWindowImpl->maWinClipRegion );
 rInvRegion = mpWindowImpl->maWinClipRegion;
 rInvRegion.Exclude( 
*mpWindowImpl->mpOverlapData->mpSaveBackRgn );
-mpWindowImpl->mpFrameWindow->ImplDrawFrameDev( aDestPt, 
aDevPt, aDevSize,
- 
*(mpWindowImpl->mpOverlapData->mpSaveBackDev),
- 
*mpWindowImpl->mpOverlapData->mpSaveBackRgn );
+pOutDev->ImplDrawFrameDev( aDestPt, aDevPt, aDevSize,
+   
*(mpWindowImpl->mpOverlapData->mpSaveBackDev),
+   
*mpWindowImpl->mpOverlapData->mpSaveBackRgn );
 }
 else
 {
-mpWindowImpl->mpFrameWindow->ImplDrawFrameDev( aDestPt, 
aDevPt, aDevSize,
- 
*(mpWindowImpl->mpOverlapData->mpSaveBackDev),
- mpWindowImpl->maWinClipRegion 
);
+pOutDev->ImplDrawFrameDev( aDestPt, aDevPt, aDevSize,
+   
*(mpWindowImpl->mpOverlapData->mpSaveBackDev),
+   mpWindowImpl->maWinClipRegion );
 }
 ImplDeleteOverlapBackground();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Chris Sherlock 
 vcl/source/window/window.cxx  |   10 --
 vcl/source/window/window2.cxx |4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit d892e5d4da5b4fe4664c22a6bde21619b62eeae5
Author: Chris Sherlock 
Date:   Mon Feb 3 15:02:11 2014 +1100

fdo#74424 Use Window::GetOutDev() to access ImplGetGraphics()

Part of the decoupling of Window from OutputDevice. We now get
the Window's OutputDevice instance and manipulate this. Do not rely
on the inherited function.

Conflicts:
vcl/source/window/window2.cxx

Change-Id: I964596bb6457ccb24e69bad15c497dbf97e5880f
Reviewed-on: https://gerrit.libreoffice.org/7789
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a5ebc0c..6c3dca2 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -937,7 +937,8 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, 
SystemParentData* pSyste
 }
 else
 {
-if ( ImplGetGraphics() )
+OutputDevice *pOutDev = GetOutDev();
+if ( pOutDev->ImplGetGraphics() )
 {
 mpGraphics->GetResolution( mpWindowImpl->mpFrameData->mnDPIX, 
mpWindowImpl->mpFrameData->mnDPIY );
 }
@@ -1396,9 +1397,14 @@ ImplWinData* Window::ImplGetWinData() const
 SalGraphics* Window::ImplGetFrameGraphics() const
 {
 if ( mpWindowImpl->mpFrameWindow->mpGraphics )
+{
 mpWindowImpl->mpFrameWindow->mbInitClipRegion = true;
+}
 else
-mpWindowImpl->mpFrameWindow->ImplGetGraphics();
+{
+OutputDevice *pFrameWinOutDev = mpWindowImpl->mpFrameWindow;
+pFrameWinOutDev->ImplGetGraphics();
+}
 mpWindowImpl->mpFrameWindow->mpGraphics->ResetClipRegion();
 return mpWindowImpl->mpFrameWindow->mpGraphics;
 }
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 0af2550..ba9976b 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -424,7 +424,7 @@ void Window::Invert( const Polygon& rPoly, sal_uInt16 
nFlags )
 // we need a graphics
 if ( !mpGraphics )
 {
-if ( !ImplGetGraphics() )
+if ( !pOutDev->ImplGetGraphics() )
 return;
 }
 
@@ -505,7 +505,7 @@ void Window::InvertTracking( const Rectangle& rRect, 
sal_uInt16 nFlags )
 // we need a graphics
 if ( !mpGraphics )
 {
-if ( !ImplGetGraphics() )
+if ( !pOutDev->ImplGetGraphics() )
 return;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Chris Sherlock 
 vcl/source/window/window.cxx  |   16 +---
 vcl/source/window/window2.cxx |   19 +++
 vcl/source/window/winproc.cxx |8 +---
 3 files changed, 25 insertions(+), 18 deletions(-)

New commits:
commit e45c729da21c6923032b64c543136efe066b756a
Author: Chris Sherlock 
Date:   Mon Feb 3 21:48:31 2014 +1100

fdo#74424 Use Window::GetOutDev() to access ImplLogicToDevicePixel()

Part of the decoupling of Window from OutputDevice. We now get
the Window's OutputDevice instance and manipulate this. Do not rely
on the inherited function.

Conflicts:
vcl/source/window/window.cxx
vcl/source/window/window2.cxx

Change-Id: I5e5241ed9eb586bc31ae9411cd7eef460aa707c3
Reviewed-on: https://gerrit.libreoffice.org/7800
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6aa8d7b..a5ebc0c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2983,6 +2983,8 @@ void Window::ImplScroll( const Rectangle& rRect,
 if ( !mpWindowImpl->mpFirstChild )
 bScrollChildren = sal_False;
 
+OutputDevice *pOutDev = GetOutDev();
+
 // --- RTL --- check if this window requires special action
 sal_Bool bReMirror = ( ImplIsAntiparallel() );
 
@@ -2991,7 +2993,6 @@ void Window::ImplScroll( const Rectangle& rRect,
 {
 // --- RTL --- make sure the invalidate region of this window is
 // computed in the same coordinate space as the one from the overlap 
windows
-const OutputDevice *pOutDev = GetOutDev();
 pOutDev->ImplReMirror( aRectMirror );
 }
 
@@ -3055,9 +3056,6 @@ void Window::ImplScroll( const Rectangle& rRect,
 SalGraphics* pGraphics = ImplGetFrameGraphics();
 if ( pGraphics )
 {
-
-OutputDevice *pOutDev = GetOutDev();
-
 if( bReMirror )
 {
 // --- RTL --- frame coordinates require re-mirroring
@@ -4221,7 +4219,8 @@ void Window::ImplNewInputContext()
 aNewContext.mpFont = NULL;
 if (!rFontName.isEmpty())
 {
-Size aSize = pFocusWin->ImplLogicToDevicePixel( rFont.GetSize() );
+OutputDevice *pFocusWinOutDev = pFocusWin->GetOutDev();
+Size aSize = pFocusWinOutDev->ImplLogicToDevicePixel( rFont.GetSize() 
);
 if ( !aSize.Height() )
 {
 // only set default sizes if the font height in logical
@@ -7328,7 +7327,8 @@ void Window::Scroll( long nHorzScroll, long nVertScroll,
  const Rectangle& rRect, sal_uInt16 nFlags )
 {
 
-Rectangle aRect = ImplLogicToDevicePixel( rRect );
+OutputDevice *pOutDev = GetOutDev();
+Rectangle aRect = pOutDev->ImplLogicToDevicePixel( rRect );
 aRect.Intersection( Rectangle( Point( mnOutOffX, mnOutOffY ), Size( 
mnOutWidth, mnOutHeight ) ) );
 if ( !aRect.IsEmpty() )
 ImplScroll( aRect, nHorzScroll, nVertScroll, nFlags );
@@ -7353,7 +7353,9 @@ void Window::Invalidate( const Rectangle& rRect, 
sal_uInt16 nFlags )
 if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight )
 return;
 
-Rectangle aRect = ImplLogicToDevicePixel( rRect );
+
+OutputDevice *pOutDev = GetOutDev();
+Rectangle aRect = pOutDev->ImplLogicToDevicePixel( rRect );
 if ( !aRect.IsEmpty() )
 {
 Region aRegion( aRect );
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 2689957..0af2550 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -378,7 +378,8 @@ void Window::Invert( const Rectangle& rRect, sal_uInt16 
nFlags )
 if ( !IsDeviceOutputNecessary() )
 return;
 
-Rectangle aRect( ImplLogicToDevicePixel( rRect ) );
+OutputDevice *pOutDev = GetOutDev();
+Rectangle aRect( pOutDev->ImplLogicToDevicePixel( rRect ) );
 
 if ( aRect.IsEmpty() )
 return;
@@ -387,7 +388,7 @@ void Window::Invert( const Rectangle& rRect, sal_uInt16 
nFlags )
 // we need a graphics
 if ( !mpGraphics )
 {
-if ( !ImplGetGraphics() )
+if ( !pOutDev->ImplGetGraphics() )
 return;
 }
 
@@ -417,7 +418,8 @@ void Window::Invert( const Polygon& rPoly, sal_uInt16 
nFlags )
 if ( nPoints < 2 )
 return;
 
-Polygon aPoly( ImplLogicToDevicePixel( rPoly ) );
+OutputDevice *pOutDev = GetOutDev();
+Polygon aPoly( pOutDev->ImplLogicToDevicePixel( rPoly ) );
 
 // we need a graphics
 if ( !mpGraphics )
@@ -486,7 +488,8 @@ void Window::HideTracking()
 
 void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags )
 {
-Rectangle aRect( ImplLogicToDevicePixel( rRect ) );
+OutputDevice *pOutDev = GetOutDev();
+Rectangle aRect( pOutDev->ImplLogicToDevicePixel( rRect ) );
 
 if ( aRect.IsEmpty() )
 return;
@@ -523,7 +526,6 @@ void Window::InvertTracking( const Rectangle& rRect, 
sal_uInt16 nFlags )
 Poi

[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=43157

Stephan Bergmann  changed:

   What|Removed |Added

URL||https://wiki.documentfounda
   ||tion.org/Development/Genera
   ||lProgrammingGuidelines#Asse
   ||rtions_and_Logging

--- Comment #18 from Stephan Bergmann  ---
(In reply to comment #0)
> See
> ,
> the mail thread at
>  html>, and the documentation in the sal/log.h header for further information.

The first of those links got stale, use

now (as reflected in this issue's URL field now).  Thanks to Caolán for
spotting.

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

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

2014-02-05 Thread Chris Sherlock 
 vcl/source/window/window.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7e122c54f588f56d45e7c09a3327fecb0f8dbef8
Author: Chris Sherlock 
Date:   Mon Feb 3 21:13:10 2014 +1100

fdo#74424 Use Window::GetOutDev() to access ImplInitFontList()

Part of the decoupling of Window from OutputDevice. We now get
the Window's OutputDevice instance and manipulate this. Do not rely
on the inherited function.

Change-Id: I18a2688d85ed23a4773e6527bd4923f7d6c83a28
Reviewed-on: https://gerrit.libreoffice.org/7799
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index bc7acff..6aa8d7b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -465,7 +465,8 @@ void Window::ImplUpdateGlobalSettings( AllSettings& 
rSettings, sal_Bool bCallHdl
 
 if ( !bUseSystemFont )
 {
-ImplInitFontList();
+OutputDevice *pOutDev = GetOutDev();
+pOutDev->ImplInitFontList();
 OUString aConfigFont = 
utl::DefaultFontConfiguration::get().getUserInterfaceFont( 
rSettings.GetUILanguageTag() );
 sal_Int32 nIndex = 0;
 while( nIndex != -1 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=54938

--- Comment #45 from Commit Notification 
 ---
Alexandre Vicenzi committed a patch related to this issue.
It has been pushed to "master":

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

fdo#54938 Convert comphelper and vcl to cppu::supportsService



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

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

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

2014-02-05 Thread Chris Sherlock 
 vcl/source/window/window.cxx  |   10 +++---
 vcl/source/window/window2.cxx |6 --
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit d56804f00c927100d78ee847416e3ae6c131ecd0
Author: Chris Sherlock 
Date:   Mon Feb 3 20:39:35 2014 +1100

fdo#74424 Use Window::GetOutDev() to access ImplSelectClipRegion()

Part of the decoupling of Window from OutputDevice. We now get
the Window's OutputDevice instance and manipulate this. Do not rely
on the inherited function.

Conflicts:
vcl/source/window/window.cxx

Change-Id: Idae6dcaa1c774a437887a7cfdbfc882aa4b35325
Reviewed-on: https://gerrit.libreoffice.org/7797
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 1760a2e..bc7acff 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3054,14 +3054,16 @@ void Window::ImplScroll( const Rectangle& rRect,
 SalGraphics* pGraphics = ImplGetFrameGraphics();
 if ( pGraphics )
 {
+
+OutputDevice *pOutDev = GetOutDev();
+
 if( bReMirror )
 {
 // --- RTL --- frame coordinates require re-mirroring
-const OutputDevice *pOutDev = GetOutDev();
 pOutDev->ImplReMirror( aRegion );
 }
 
-ImplSelectClipRegion( aRegion, pGraphics );
+pOutDev->ImplSelectClipRegion( aRegion, pGraphics );
 pGraphics->CopyArea( rRect.Left()+nHorzScroll, 
rRect.Top()+nVertScroll,
  rRect.Left(), rRect.Top(),
  rRect.GetWidth(), rRect.GetHeight(),
@@ -3499,7 +3501,9 @@ void Window::ImplPosSizeWindow( long nX, long nY,
 SalGraphics* pGraphics = ImplGetFrameGraphics();
 if ( pGraphics )
 {
-const bool bSelectClipRegion = 
ImplSelectClipRegion( aRegion, pGraphics );
+
+OutputDevice *pOutDev = GetOutDev();
+const bool bSelectClipRegion = 
pOutDev->ImplSelectClipRegion( aRegion, pGraphics );
 if ( bSelectClipRegion )
 {
 pGraphics->CopyArea( mnOutOffX, mnOutOffY,
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index ecbd0d6..2689957 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -523,8 +523,9 @@ void Window::InvertTracking( const Rectangle& rRect, 
sal_uInt16 nFlags )
 Point aPoint( mnOutOffX, mnOutOffY );
 Region aRegion( Rectangle( aPoint,
Size( mnOutWidth, mnOutHeight ) ) );
+OutputDevice *pOutDev = GetOutDev();
 ImplClipBoundaries( aRegion, sal_False, sal_False );
-ImplSelectClipRegion( aRegion, pGraphics );
+pOutDev->ImplSelectClipRegion( aRegion, pGraphics );
 }
 }
 
@@ -587,8 +588,9 @@ void Window::InvertTracking( const Polygon& rPoly, 
sal_uInt16 nFlags )
 Point aPoint( mnOutOffX, mnOutOffY );
 Region aRegion( Rectangle( aPoint,
Size( mnOutWidth, mnOutHeight ) ) );
+OutputDevice *pOutDev = GetOutDev();
 ImplClipBoundaries( aRegion, sal_False, sal_False );
-ImplSelectClipRegion( aRegion, pGraphics );
+pOutDev->ImplSelectClipRegion( aRegion, pGraphics );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Alexandre Vicenzi 
 comphelper/source/compare/AnyCompareFactory.cxx|   16 
 comphelper/source/container/IndexedPropertyValuesContainer.cxx |5 
 comphelper/source/container/NamedPropertyValuesContainer.cxx   |6 
 vcl/osx/DragSource.cxx |   32 
 vcl/osx/DropTarget.cxx |  495 
--
 vcl/osx/clipboard.cxx  |  111 --
 6 files changed, 274 insertions(+), 391 deletions(-)

New commits:
commit e17cf910320848edbc3d11ec62acbf1c8f531ae5
Author: Alexandre Vicenzi 
Date:   Fri Jan 31 03:39:50 2014 -0200

fdo#54938 Convert comphelper and vcl to cppu::supportsService

Change-Id: I391a7324bf92208fe632dac17874943343b1f65a
Reviewed-on: https://gerrit.libreoffice.org/7757
Reviewed-by: Marcos Souza 
Tested-by: Marcos Souza 

diff --git a/comphelper/source/compare/AnyCompareFactory.cxx 
b/comphelper/source/compare/AnyCompareFactory.cxx
index 88842f0..2801729 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "comphelper_module.hxx"
 
 #include 
@@ -27,21 +26,18 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 
-
 using namespace com::sun::star::uno;
 using namespace com::sun::star::ucb;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::i18n;
 
-
-//=
-
 class AnyCompare : public ::cppu::WeakImplHelper1< XAnyCompare >
 {
 Reference< XCollator > m_rCollator;
@@ -57,8 +53,6 @@ public:
 virtual sal_Int16 SAL_CALL compare( const Any& any1, const Any& any2 ) 
throw(RuntimeException);
 };
 
-//=
-
 class AnyCompareFactory : public cppu::WeakImplHelper3< XAnyCompareFactory, 
XInitialization, XServiceInfo >
 {
 Reference< XAnyCompare >m_rAnyCompare;
@@ -87,8 +81,6 @@ public:
 static Reference< XInterface > SAL_CALL Create( const Reference< 
XComponentContext >& );
 };
 
-//===
-
 sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) 
throw(::com::sun::star::uno::RuntimeException)
 {
 sal_Int16 aResult = 0;
@@ -104,8 +96,6 @@ sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, 
const Any& any2 ) throw
 return aResult;
 }
 
-//===
-
 Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( 
const OUString& aPropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
 // for now only OUString properties compare is implemented
@@ -127,7 +117,6 @@ void SAL_CALL AnyCompareFactory::initialize( const 
Sequence< Any >& aArguments )
 return;
 }
 }
-
 }
 
 OUString SAL_CALL AnyCompareFactory::getImplementationName(  ) throw( 
RuntimeException )
@@ -142,8 +131,7 @@ OUString SAL_CALL 
AnyCompareFactory::getImplementationName_static(  )
 
 sal_Bool SAL_CALL AnyCompareFactory::supportsService( const OUString& 
ServiceName ) throw(RuntimeException)
 {
-OUString aServiceName( "com.sun.star.ucb.AnyCompareFactory" );
-return aServiceName == ServiceName;
+return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames(  ) 
throw(RuntimeException)
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx 
b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index 38dca1d..ee4bc6c 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "comphelper_module.hxx"
 
 #include 
@@ -25,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -226,8 +226,7 @@ OUString SAL_CALL 
IndexedPropertyValuesContainer::getImplementationName_static(
 
 sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const 
OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
 {
-OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" );
-return aServiceName == ServiceName;
+return cppu::supportsService(this, ServiceName);
 }
 
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL 
IndexedPropertyValuesContainer::getSupportedServiceNames(  ) 
throw(::com::sun::star::uno::RuntimeException)
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx 
b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 66817f2..9492944 100644
--- a/comphelper/source/container/NamedPropert

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

2014-02-05 Thread Chris Sherlock 
 vcl/source/window/window.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit a7395942aecd2523ab392b09018dcc1a05527077
Author: Chris Sherlock 
Date:   Mon Feb 3 15:21:22 2014 +1100

fdo#74424 Use Window::GetOutDev() to access ImplReleaseGraphics()

Part of the decoupling of Window from OutputDevice. We now get
the Window's OutputDevice instance and manipulate this. Do not rely
on the inherited function.

Change-Id: Idde976aacd1bea2871cc72509a59c17af6f560f5
Reviewed-on: https://gerrit.libreoffice.org/7790
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 081..1760a2e 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1130,7 +1130,8 @@ void Window::ImplRemoveWindow( sal_Bool bRemoveFrameData )
 if ( bRemoveFrameData )
 {
 // release the graphic
-ImplReleaseGraphics();
+OutputDevice *pOutDev = GetOutDev();
+pOutDev->ImplReleaseGraphics();
 }
 }
 
@@ -3154,7 +3155,8 @@ void Window::ImplUpdateWindowPtr( Window* pWindow )
 if ( mpWindowImpl->mpFrameWindow != pWindow->mpWindowImpl->mpFrameWindow )
 {
 // release graphic
-ImplReleaseGraphics();
+OutputDevice *pOutDev = GetOutDev();
+pOutDev->ImplReleaseGraphics();
 }
 
 mpWindowImpl->mpFrameData = pWindow->mpWindowImpl->mpFrameData;
@@ -4656,7 +4658,8 @@ Window::~Window()
 }
 
 // release SalGraphics
-ImplReleaseGraphics();
+OutputDevice *pOutDev = GetOutDev();
+pOutDev->ImplReleaseGraphics();
 
 // notify ImplDelData subscribers of this window about the window deletion
 ImplDelData* pDelData = mpWindowImpl->mpFirstDel;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Chris Sherlock 
 vcl/source/window/status.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit be16bfd4c2d43c9152eac4ce4519fc31e9de9f34
Author: Chris Sherlock 
Date:   Tue Feb 4 00:06:40 2014 +1100

fdo#74424 Use Window::GetOutDev() to access ImplIsRecordLayout()

Part of the decoupling of Window from OutputDevice. We now get
the Window's OutputDevice instance and manipulate this. Do not rely
on the inherited function.

Change-Id: Ibbdd8062659ed0de2925a61ce5e63e5a21834ade
Reviewed-on: https://gerrit.libreoffice.org/7814
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 6a69afe..c477789 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -480,7 +480,9 @@ void StatusBar::ImplDrawItem( sal_Bool bOffScreen, 
sal_uInt16 nPos, sal_Bool bDr
 }
 }
 
-if ( !ImplIsRecordLayout() )
+const OutputDevice *pOutDev = GetOutDev();
+
+if ( !pOutDev->ImplIsRecordLayout() )
 ImplCallEventListeners( VCLEVENT_STATUSBAR_DRAWITEM, (void*) 
sal_IntPtr(pItem->mnId) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Chris Sherlock 
 vcl/source/control/ilstbox.cxx |7 +++-
 vcl/source/window/dndevdis.cxx |5 ++-
 vcl/source/window/floatwin.cxx |7 +++-
 vcl/source/window/window.cxx   |   65 ++---
 vcl/source/window/window2.cxx  |6 ++-
 vcl/source/window/winproc.cxx  |3 +
 6 files changed, 62 insertions(+), 31 deletions(-)

New commits:
commit fba46c6efd08d50fee92cc11546f3ed253a57af8
Author: Chris Sherlock 
Date:   Mon Feb 3 16:46:04 2014 +1100

fdo#74424 Use Window::GetOutDev() to access ImplReMirrored()

Part of the decoupling of Window from OutputDevice. We now get
he Window's OutputDevice instance and manipulate this. Do not rely
on the inherited function.

Conflicts:
include/vcl/window.hxx

Change-Id: Ie422df837e1596881b61d34a1627b0ecc668a54e
Reviewed-on: https://gerrit.libreoffice.org/7793
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index c72a294..4b07372 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -3265,8 +3265,11 @@ void ImplListBoxFloatingWindow::StartFloat( sal_Bool 
bStartTracking )
 // check if the control's parent is un-mirrored which is the case for 
form controls in a mirrored UI
 // where the document is unmirrored
 // because StartPopupMode() expects a rectangle in mirrored 
coordinates we have to re-mirror
-if( GetParent()->GetParent()->ImplIsAntiparallel() )
-GetParent()->GetParent()->ImplReMirror( aRect );
+Window *pGrandparent = GetParent()->GetParent();
+const OutputDevice *pGrandparentOutDev = pGrandparent->GetOutDev();
+
+if( pGrandparent->ImplIsAntiparallel() )
+pGrandparentOutDev->ImplReMirror( aRect );
 
 StartPopupMode( aRect, FLOATWIN_POPUPMODE_DOWN );
 
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index 74101c6..e278e95 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -67,7 +67,10 @@ Window* DNDEventDispatcher::findTopLevelWindow(Point 
location)
 pChildWindow = pChildWindow->ImplGetClientWindow();
 
 if( pChildWindow->ImplIsAntiparallel() )
-pChildWindow->ImplReMirror( location );
+{
+const OutputDevice *pChildWinOutDev = pChildWindow->GetOutDev();
+pChildWinOutDev->ImplReMirror( location );
+}
 
 return pChildWindow;
 }
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 8f614f3..e01d5f1 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -454,12 +454,14 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* 
pReference, const Poin
 
 Point aAbsolute( rPos );
 
+const OutputDevice *pWindowOutDev = pReference->GetOutDev();
+
 // compare coordinates in absolute screen coordinates
 if( pReference->ImplHasMirroredGraphics()  )
 {
 if(!pReference->IsRTLEnabled() )
 // --- RTL --- re-mirror back to get device coordiantes
-pReference->ImplReMirror( aAbsolute );
+pWindowOutDev->ImplReMirror( aAbsolute );
 
 Rectangle aRect( pReference->ScreenToOutputPixel(aAbsolute), Size(1,1) 
) ;
 aRect = pReference->ImplOutputToUnmirroredAbsoluteScreenPixel( aRect );
@@ -684,6 +686,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& 
rRect, sal_uLong nFlags )
 maFloatRect = rRect;
 
 Window *pReference =  GetParent();
+const OutputDevice *pParentWinOutDev = pReference->GetOutDev();
 
 // compare coordinates in absolute screen coordinates
 // Keep in sync with FloatingWindow::ImplFloatHitTest, e.g. fdo#33509
@@ -691,7 +694,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& 
rRect, sal_uLong nFlags )
 {
 if(!pReference->IsRTLEnabled() )
 // --- RTL --- re-mirror back to get device coordiantes
-pReference->ImplReMirror(maFloatRect);
+pParentWinOutDev->ImplReMirror(maFloatRect);
 
 
maFloatRect.SetPos(pReference->ScreenToOutputPixel(maFloatRect.TopLeft()));
 maFloatRect = 
pReference->ImplOutputToUnmirroredAbsoluteScreenPixel(maFloatRect);
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a836fc5..081 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1452,7 +1452,8 @@ sal_uInt16 Window::ImplHitTest( const Point& rFramePos )
 if( ImplIsAntiparallel() )
 {
 // - RTL - re-mirror frame pos at this window
-ImplReMirror( aFramePos );
+const OutputDevice *pOutDev = GetOutDev();
+pOutDev->ImplReMirror( aFramePos );
 }
 Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, 
mnOutHeight ) );
 if ( !aRect.IsInside( aFramePos ) )
@@ -2463,8 +2464,9 @@ void Window::ImplCallPaint( const Region* pRegion, 
sal_uInt16 nPaintFlag

Re: FreeBSD 10 PowerPC LibreOffice

2014-02-05 Thread precutcolours 
G5 fans were fixed in FreeBSD 9 methinks, now FreeBSD sits at release 10
Linux had identical fan trouble on G5's, also fixed in that kernel
NetBSD is fixed too I expect
http://mail-index.netbsd.org/port-macppc/2013/04/13/msg001905.html
"I spend several days figuring [G5 SMU] out, thanks to FreeBSD i could fix it"

http://people.freebsd.org/~nwhitehorn/ppcinstall.txt
"November 6, 2013
...The very first Powermac G5 systems (PowerMac 7,2) have unsupported
fan control if you are using an older release than FreeBSD 9..."
[rephrasing: we fixed G5 fans in FreeBSD 9]

Ask FreeBSD about such things as I'm just an airhead
http://lists.freebsd.org/pipermail/freebsd-ppc/

-- 
http://www.fastmail.fm - Does exactly what it says on the tin

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

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

2014-02-05 Thread Chris Sherlock 
 vcl/source/window/window.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit d662116bb978190693432c8725757d36dd6e7232
Author: Chris Sherlock 
Date:   Mon Feb 3 14:48:47 2014 +1100

fdo#74424 Use Window::GetOutDev() to access ImplGetDPI(X|Y)()

Part of the decoupling of Window from OutputDevice. We now get
the Window's OutputDevice instance and manipulate this. Do not rely
on the inherited function.

Conflicts:
include/vcl/window.hxx

Change-Id: I93c83578eb92cdf10c7009f98e91ab177879c141
Reviewed-on: https://gerrit.libreoffice.org/7788
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 7654e2e..a836fc5 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9471,8 +9471,9 @@ void Window::ImplPaintToDevice( OutputDevice* 
i_pTargetOutDev, const Point& i_rP
 sal_Bool bDevOutput = mbDevOutput;
 mbDevOutput = true;
 
-long nOldDPIX = ImplGetDPIX();
-long nOldDPIY = ImplGetDPIY();
+const OutputDevice *pOutDev = GetOutDev();
+long nOldDPIX = pOutDev->ImplGetDPIX();
+long nOldDPIY = pOutDev->ImplGetDPIY();
 mnDPIX = i_pTargetOutDev->ImplGetDPIX();
 mnDPIY = i_pTargetOutDev->ImplGetDPIY();
 sal_Bool bOutput = IsOutputEnabled();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=54938

--- Comment #44 from Commit Notification 
 ---
Alexandre Vicenzi committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=625971b104bd39c0168816f822d1a0c491e25f45

fdo#54938 Convert sfx2, xmloff and connec.. to cppu::supportsService



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

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

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

2014-02-05 Thread Alexandre Vicenzi 
 include/connectivity/CommonTools.hxx |   24 +-
 include/sfx2/sfxuno.hxx  |   42 +--
 xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx |7 +--
 xmloff/source/transform/OOo2Oasis.cxx|5 +-
 xmloff/source/transform/Oasis2OOo.cxx|5 +-
 5 files changed, 16 insertions(+), 67 deletions(-)

New commits:
commit 625971b104bd39c0168816f822d1a0c491e25f45
Author: Alexandre Vicenzi 
Date:   Wed Feb 5 00:43:23 2014 -0200

fdo#54938 Convert sfx2, xmloff and connec.. to cppu::supportsService

Change-Id: Ib5d3aabf8aa88ec24e44584047d0405a09fa44ed
Reviewed-on: https://gerrit.libreoffice.org/7864
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Marcos Souza 

diff --git a/include/connectivity/CommonTools.hxx 
b/include/connectivity/CommonTools.hxx
index 0fca51e..b8b4df7 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace com { namespace sun { namespace star { namespace util {
 struct Date;
@@ -50,7 +51,6 @@ namespace jvmaccess { class VirtualMachine; }
 
 namespace connectivity
 {
-
//--
 OOO_DLLPUBLIC_DBTOOLS sal_Bool match(const sal_Unicode* pWild, const 
sal_Unicode* pStr, const sal_Unicode cEscape);
 inline sal_Bool match(const OUString &rWild, const OUString &rStr, const 
sal_Unicode cEscape)
 {
@@ -62,9 +62,7 @@ namespace connectivity
 
 typedef std::map OSQLTables;
 
-// 
-
 // class ORefVector allows reference counting on a std::vector
-// 
-
 template< class VectorVal > class ORefVector
 {
 std::vector< VectorVal > m_vector;
@@ -112,11 +110,10 @@ namespace connectivity
 }
 
 };
-// 
-
+
 // class ORowVector incudes refcounting and initialze himself
 // with at least one element. This first element is reserved for
 // the bookmark
-// 
-
 template< class VectorVal > class ORowVector : public  ORefVector< 
VectorVal >
 {
 public:
@@ -127,7 +124,6 @@ namespace connectivity
 
 typedef ORefVector< ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet> > OSQLColumns;
 
-// 
===
 // search from __first to __last the column with the name _rVal
 // when no such column exist __last is returned
 OOO_DLLPUBLIC_DBTOOLS
@@ -135,7 +131,7 @@ namespace connectivity
 OSQLColumns::Vector::const_iterator 
__last,
 const OUString& _rVal,
 const ::comphelper::UStringMixEqual& 
_rCase);
-// 
===
+
 // search from __first to __last the column with the realname _rVal
 // when no such column exist __last is returned
 OOO_DLLPUBLIC_DBTOOLS
@@ -144,9 +140,7 @@ namespace connectivity
 const OUString& _rVal,
 const 
::comphelper::UStringMixEqual& _rCase);
 
-// 
===
 // the first two find methods are much faster than the one below
-// 
===
 // search from __first to __last the column with the property _rProp 
equals the value _rVal
 // when no such column exist __last is returned
 OOO_DLLPUBLIC_DBTOOLS
@@ -177,8 +171,6 @@ namespace connectivity
 #endif
 }
 
-//==
-
 #define DECLARE_SERVICE_INFO()  \
 virtual OUString SAL_CALL getImplementationName(  ) throw 
(::com::sun::star::uno::RuntimeException); \
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 
throw(::com::sun::star::uno::RuntimeException); \
@@ -197,17 +189,9 @@ namespace connectivity
 }   \
 sal_Bool SAL_CALL classname::supportsService( const OUString& 
_rServiceName ) throw(::com::sun::star::uno::RuntimeException) \
 {   \
-Sequence< OUString > aSupported(getSupportedServiceNames());   
  \
-const OUString* pSupported = aSupported.getConstArray();   
  \
-const OUString* pEnd = pSupported + aSupported.getLength();
  \
-for (;pSupported != pEnd && !pSupported->equals(_rServiceName);

Re: GoogleAds API usage ?

2014-02-05 Thread Alex Thurgood 
Le 05/02/2014 13:36, Michael Stahl a écrit :

Hi Michael,

> don't see such messages here...
> 
> do you perhaps use --enable-ext-google-docs ?  i've never used that but
> could imagine it would try to contact Google somehow...
> 

Yes, I built that extension at the same time as the main build, so it
could be that. I tried grepping in the code for the error message
string, but couldn't find any reference to it. Will dig a bit deeper,
but seems strange that it is also trying to contact bizographics.com too.

Alex


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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 05/e9a04ef0191aeb59e09d2bf8306f88baf399e3

2014-02-05 Thread Caolán McNamara 
 05/e9a04ef0191aeb59e09d2bf8306f88baf399e3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7f460a9725b185be3a41ff992f43bf11ce8443e0
Author: Caolán McNamara 
Date:   Wed Feb 5 13:46:41 2014 +

Notes added by 'git notes add'

diff --git a/05/e9a04ef0191aeb59e09d2bf8306f88baf399e3 
b/05/e9a04ef0191aeb59e09d2bf8306f88baf399e3
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/05/e9a04ef0191aeb59e09d2bf8306f88baf399e3
@@ -0,0 +1 @@
+ignore: fixed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Chris Sherlock 
 include/vcl/window.hxx   |7 +++
 vcl/source/window/window.cxx |5 +
 2 files changed, 12 insertions(+)

New commits:
commit 6a6a51ed0546de2d6e198b0d7486d347b2fb345b
Author: Chris Sherlock 
Date:   Mon Feb 3 14:36:42 2014 +1100

fdo#74424 Start to decouple Window class from OutputDevice

We want to start to decouple Window from OutputDevice. This is
because a Window should *use* an OutputDevice, a Window is *not*
an OutputDevice.

In order to start to decouple the two classes, the strategy will be:

1. This patch adds in a new private member pOutputDevice as well
   as an accessor. When the Window is initialized, pOutputDevice
   is set to a downcasted instance of this (because we are still
   inheriting Window from OutputDevice).

2. We will start to go through all the functions in Window that rely
   on OutputDevice and use the getter function to use the OutputDevice
   private member.

3. Any subclasses of Window will then need to have the same procedure
   done on them.

4. Once this is done, we need to work out the best way of initializing
   mpOutputDevice, then we can remove OutputDevice as the parent
   class of Window (and all Window subclasses).

Change-Id: I39886c77070befb1542c8f22346111cde1c360b1
Reviewed-on: https://gerrit.libreoffice.org/7786
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 2fcdf0c..bf6bf24 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -362,6 +362,10 @@ private:
 //
 WindowImpl* mpWindowImpl;
 
+// This is a first attempt to start to remove the dependency of Window on
+// OutputDevice
+OutputDevice* mpOutputDevice;
+
 SAL_DLLPRIVATE void ImplInitWindowData( WindowType nType );
 
 #ifdef DBG_UTIL
@@ -578,6 +582,9 @@ public:
 Window( Window* pParent, const ResId& rResId );
 virtual ~Window();
 
+OutputDevice const* GetOutDev() const { return mpOutputDevice; };
+OutputDevice*   GetOutDev()   { return mpOutputDevice; };
+
 virtual voidMouseMove( const MouseEvent& rMEvt );
 virtual voidMouseButtonDown( const MouseEvent& rMEvt );
 virtual voidMouseButtonUp( const MouseEvent& rMEvt );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index b881d1e..7654e2e 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -731,6 +731,11 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, 
SystemParentData* pSyste
 {
 DBG_ASSERT( mpWindowImpl->mbFrame || pParent, "Window::Window(): pParent 
== NULL" );
 
+// We will eventually being removing the inheritance of OutputDevice from 
Window.
+// It will be replaced with a composition relationship. A Window will use 
an OutputDevice,
+// it will not *be* an OutputDevice
+mpOutputDevice = (OutputDevice*)this;
+
 ImplSVData* pSVData = ImplGetSVData();
 Window* pRealParent = pParent;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: recovery dialogs crash reporter features and .ui conversion

2014-02-05 Thread Jonathan Aquilina 
Hi Caolan and everyone,

This is just an idea, why not rework it that if a crash does happen it 
interfaces with the bugzilla submission assistant to help a user submit a bug 
and it will gather all the necessary dump information etc to submit with the 
bug report?

On Wednesday, February 05, 2014 12:55:55 PM Caolán McNamara wrote:
> Our default configuration for crash reporting during document Recovery
> is off (officecfg/registry/schema/org/openoffice/Office/Recovery.xcs see
> CrashReporter) and there are a bunch of dialogs and tabpages related to
> crash reporting.
> 
> I don't want to convert these to the .ui format unless we are going to
> use them. We haven't enabled that crash reporting set of dialogs AFAIK
> since day 0 of LibreOffice. This would be the UI shown on document
> recovery which would allow you to send some crash report information.
> 
> So anyone disagree with removing these recovery-time crash reporter
> dialogs ?
> 
> I believe this stuff is somewhat orthogonal to the --enable-crashdump
> stuff (which is also disabled by default at build-time) in that the
> crashreporter applications (if they exist at run-time) would still get
> called in the event of a crash. FWIW the windows one appears to have its
> own UI and the unx not. I guess the follow up question is if anyone is
> using the --enable-crashdump stuff.
> 
> C.
> 
> ___
> 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

recovery dialogs crash reporter features and .ui conversion

2014-02-05 Thread Caolán McNamara 
Our default configuration for crash reporting during document Recovery
is off (officecfg/registry/schema/org/openoffice/Office/Recovery.xcs see
CrashReporter) and there are a bunch of dialogs and tabpages related to
crash reporting.

I don't want to convert these to the .ui format unless we are going to
use them. We haven't enabled that crash reporting set of dialogs AFAIK
since day 0 of LibreOffice. This would be the UI shown on document
recovery which would allow you to send some crash report information.

So anyone disagree with removing these recovery-time crash reporter
dialogs ?

I believe this stuff is somewhat orthogonal to the --enable-crashdump
stuff (which is also disabled by default at build-time) in that the
crashreporter applications (if they exist at run-time) would still get
called in the event of a crash. FWIW the windows one appears to have its
own UI and the unx not. I guess the follow up question is if anyone is
using the --enable-crashdump stuff.

C.

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

[Libreoffice-commits] core.git: chart2/Package_opengl.mk

2014-02-05 Thread Michael Stahl 
 chart2/Package_opengl.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit a10f9277b51f55050782dcd4fc1bc8d9af05cbe2
Author: Michael Stahl 
Date:   Wed Feb 5 13:43:22 2014 +0100

chart2: remove unnecessary complexity

Change-Id: I4c63fbb31ab49ed70c4e3092c5fe70a2b3514e3d

diff --git a/chart2/Package_opengl.mk b/chart2/Package_opengl.mk
index 356e6cc..9c3a663 100644
--- a/chart2/Package_opengl.mk
+++ b/chart2/Package_opengl.mk
@@ -9,9 +9,7 @@
 
 $(eval $(call gb_Package_Package,chart2_opengl_shader,$(SRCDIR)/chart2/opengl))
 
-$(eval $(call 
gb_Package_set_outdir,chart2_opengl_shader,$(INSTROOT)/$(LIBO_BIN_FOLDER)))
-
-$(eval $(call gb_Package_add_files,chart2_opengl_shader,opengl,\
+$(eval $(call 
gb_Package_add_files,chart2_opengl_shader,$(LIBO_BIN_FOLDER)/opengl,\
backgroundFragmentShader.glsl \
backgroundVertexShader.glsl \
commonFragmentShader.glsl \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH][PUSHED] fdo#43157: Clean up OSL_ASSERT, DBG_ASSERT, etc.

2014-02-05 Thread Caolán McNamara 
On Fri, 2014-01-31 at 22:36 +0100, Tim Markle wrote:
> Here is a small contribution I tried for one of the easy hacks.

Thanks for this, merged now.

caolanm->sbergman: The links at the top of
https://bugs.freedesktop.org/show_bug.cgi?id=43157
that point to
https://wiki.documentfoundation.org/Development#Assertions_and_Logging
is stale and now is at
https://wiki.documentfoundation.org/Development/GeneralProgrammingGuidelines#Assertions_and_Logging

Maybe might be worth closing that bug and opening a new one with the
correct info or something.

C.


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

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

2014-02-05 Thread Timothy Markle 
 cppu/source/UnsafeBridge/UnsafeBridge.cxx |8 
 include/sal/log-areas.dox |6 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 995073b08e69f6616479f5dd4d4094d96f893207
Author: Timothy Markle 
Date:   Fri Jan 31 21:17:10 2014 +0100

fdo#43157 - Clean up OSL_ASSERT

Changed OSL_ASSERT to SAL_WARN_IF

Change-Id: I6f81a265aefe769e1449b1f10c796bf3aa1d0f1c

diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx 
b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 7cd18fa..dcb3fe7 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -71,7 +71,7 @@ UnsafeBridge::~UnsafeBridge(void)
 {
 LOG_LIFECYCLE_UnsafeBridge_emit(fprintf(stderr, "LIFE: %s -> %p\n", 
"UnsafeBridge::~UnsafeBridge(void)", this));
 
-OSL_ASSERT(m_count >= 0);
+SAL_WARN_IF(m_count < 0, "cppu.unsafebridge", "m_count is less than 0");
 }
 
 void UnsafeBridge::v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam)
@@ -83,7 +83,7 @@ void UnsafeBridge::v_callInto_v(uno_EnvCallee * pCallee, 
va_list * pParam)
 
 void UnsafeBridge::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam)
 {
-OSL_ASSERT(m_count > 0);
+SAL_WARN_IF(m_count <= 0, "cppu.unsafebridge", "m_count is less than or 
equal to 0");
 
 -- m_count;
 pCallee(pParam);
@@ -97,7 +97,7 @@ void UnsafeBridge::v_enter(void)
 {
 m_mutex.acquire();
 
-OSL_ASSERT(m_count >= 0);
+SAL_WARN_IF(m_count < 0, "cppu.unsafebridge", "m_count is less than 0");
 
 if (m_count == 0)
 m_threadId = osl::Thread::getCurrentIdentifier();
@@ -107,7 +107,7 @@ void UnsafeBridge::v_enter(void)
 
 void UnsafeBridge::v_leave(void)
 {
-OSL_ASSERT(m_count > 0);
+SAL_WARN_IF(m_count <= 0, "cppu.unsafebridge", "m_count is less than or 
equal to 0");
 
 -- m_count;
 if (!m_count)
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index fa8cd45..5ff8c18 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -80,6 +80,11 @@ certain functionality.
 @li @c comphelper
 @li @c comphelper.container
 
+@section cppu
+
+@li @c cppu
+@li @c cppu.unsafebridge
+
 @section cppuhelper
 
 @li @c cppuhelper
@@ -437,7 +442,6 @@ certain functionality.
 @li @c configmgr
 @li @c cppcanvas
 @li @c cppcanvas.emf
-@li @c cppu
 @li @c helpcompiler
 @li @c linguistic
 @li @c oox
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=43157

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner
   |SkillCpp TopicCleanup   |SkillCpp TopicCleanup
   |target:4.1.0 target:4.2.0   |target:4.1.0 target:4.2.0
   ||target:4.3.0

--- Comment #17 from Commit Notification 
 ---
Timothy Markle committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=995073b08e69f6616479f5dd4d4094d96f893207

fdo#43157 - Clean up OSL_ASSERT



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

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

Re: GoogleAds API usage ?

2014-02-05 Thread Michael Stahl 
On 05/02/14 09:55, Alex Thurgood wrote:
> Le 05/02/2014 08:53, Alex Thurgood a écrit :
>>
>> In my own master 4.3 build (Linux 64bit Mint Petra) from yesterday I'm
>> seeing the following on the console from which I run LO when consulting
>> the built-in help:
>>
>> No permission to use the keyboard API for http://googleads.g.doubleclick.net
>>
>> Do we really use the GoogleAds API ?
>>
> 
> I am also seeing this output, doing nothing but leaving a Draw window,
> and the built-in help running :
> 
> No permission to use the keyboard API for http://googleads.g.doubleclick.net
> No permission to use the keyboard API for http://googleads.g.doubleclick.net
> No permission to use the keyboard API for http://js.bizographics.com
> No permission to use the keyboard API for http://googleads.g.doubleclick.net
> No permission to use the keyboard API for http://googleads.g.doubleclick.net
> 
> If I try to open the bizographics link in Firefox, I get this :
> AccessDeniedAccess
> Denied8D5EA546C29D62AAn5DhuX6aCtgK5ViWqZxZ4clvmQOdRGk2pPUW+Vxn+oEKi/YP7Y/ddHTM3yyGwYLj
> 
> So this begs the questions :
> - was this code introduced knowingly, and if so why ?
> - if it wasn't, how did it get past the review process ?
> 
> Trying to understand what is going on here and the consequences thereof.

don't see such messages here...

do you perhaps use --enable-ext-google-docs ?  i've never used that but
could imagine it would try to contact Google somehow...


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

[Libreoffice-commits] core.git: chart2/Package_opengl.mk

2014-02-05 Thread Stephan Bergmann 
 chart2/Package_opengl.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1b5beba7c168fc8c20c8e4326b863171cf9662a7
Author: Stephan Bergmann 
Date:   Wed Feb 5 13:33:56 2014 +0100

Fix previous fix

Change-Id: I6a38e537279884079fbc10086d153113d38b8bfd

diff --git a/chart2/Package_opengl.mk b/chart2/Package_opengl.mk
index 18b8c7a..356e6cc 100644
--- a/chart2/Package_opengl.mk
+++ b/chart2/Package_opengl.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,chart2_opengl_shader,$(SRCDIR)/chart2/opengl))
 
-$(eval $(call gb_Package_set_outdir,chart2_opengl_shader,$(INSTROOT)/program))
+$(eval $(call 
gb_Package_set_outdir,chart2_opengl_shader,$(INSTROOT)/$(LIBO_BIN_FOLDER)))
 
 $(eval $(call gb_Package_add_files,chart2_opengl_shader,opengl,\
backgroundFragmentShader.glsl \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: FreeBSD 10 PowerPC LibreOffice

2014-02-05 Thread Christian Lohmaier 
Hi *,

On Fri, Jan 31, 2014 at 9:59 AM,   wrote:
> FreeBSD just accomplished a major new release. Yet apparently
> LibreOffice needs attention on the PPC Mac port - and perhaps others?

I attempted a while back to compile on PPC64 (Mac G5) - but it failed
to support thermal management on the machine, and thus fans were
running at full speed all the time (and if you know power mac G5, you
know that this is loud, like a jet trying to take off...

I should give it another try...

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

[Libreoffice-commits] core.git: chart2/Package_opengl.mk

2014-02-05 Thread Stephan Bergmann 
 chart2/Package_opengl.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2e2ef617543f7d124ecec53813e90d1cb759e5c
Author: Stephan Bergmann 
Date:   Wed Feb 5 13:28:05 2014 +0100

Fix target of .glsl files on Mac OS X

Change-Id: I874c97d7e6a80accc48b876b9151e3a8a2148280

diff --git a/chart2/Package_opengl.mk b/chart2/Package_opengl.mk
index 499ca0c..18b8c7a 100644
--- a/chart2/Package_opengl.mk
+++ b/chart2/Package_opengl.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,chart2_opengl_shader,$(SRCDIR)/chart2/opengl))
 
-$(eval $(call gb_Package_set_outdir,chart2_opengl_shader,$(INSTDIR)/program))
+$(eval $(call gb_Package_set_outdir,chart2_opengl_shader,$(INSTROOT)/program))
 
 $(eval $(call gb_Package_add_files,chart2_opengl_shader,opengl,\
backgroundFragmentShader.glsl \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Herbert Dürr 
 canvas/source/cairo/cairo_textlayout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05e9a04ef0191aeb59e09d2bf8306f88baf399e3
Author: Herbert Dürr 
Date:   Wed Feb 5 07:19:11 2014 +

#i123068# remove implicit conversion from aUTF8String to its char pointer

diff --git a/canvas/source/cairo/cairo_textlayout.cxx 
b/canvas/source/cairo/cairo_textlayout.cxx
index aaa6973..35f498d 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -333,7 +333,7 @@ namespace cairocanvas
before we were depending on unmodified current point which I 
believed was preserved by save/restore */
 cairo_move_to( pCairo, 0, 0 );
 useFont( pCairo );
-cairo_show_text( pCairo, aUTF8String );
+cairo_show_text( pCairo, aUTF8String.getStr() );
 cairo_restore( pCairo );
 
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Michael Stahl 
 svx/source/svdraw/svdograf.cxx   |3 +++
 sw/source/core/graphic/ndgrf.cxx |3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 45618cc1549fd00d9d0155cbeaa50e04e8300c86
Author: Michael Stahl 
Date:   Fri Jan 31 23:00:24 2014 +0100

fdo#73300: sw: don't swap in all images when loading files

(regression from bd55f05b332c1573bd410fd9e21ea7fcf977e1b0)

(cherry picked from commit 9b9eb2e4f619c63eabdc54b5d749ac55d8eaf333)

Conflicts:
svx/source/svdraw/svdograf.cxx

Change-Id: I55532ac0fe983461e961a61149479343d2b879a1
Reviewed-on: https://gerrit.libreoffice.org/7812
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 39892ecb0db10ffa4a9803862264fd6e12d497aa)
Reviewed-on: https://gerrit.libreoffice.org/7845
Reviewed-by: Eike Rathke 
Reviewed-by: Christian Lohmaier 

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 46b88da..d918eaa 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -277,6 +277,9 @@ sdr::contact::ViewContact* 
SdrGrafObj::CreateObjectSpecificViewContact()
 
 void SdrGrafObj::onGraphicChanged()
 {
+if (!pGraphic || pGraphic->IsSwappedOut()) // don't force swap-in for this
+return;
+
 String aName;
 String aTitle;
 String aDesc;
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 5cedf29..97ff385 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -338,6 +338,9 @@ SwGrfNode::~SwGrfNode()
 /// allow reaction on change of content of GraphicObject
 void SwGrfNode::onGraphicChanged()
 {
+if (GetGrfObj().IsSwappedOut()) // don't force swap-in for this
+return;
+
 // try to access SwFlyFrmFmt; since title/desc/name are set there, there 
is no
 // use to continue if it is not yet set. If not yet set, call 
onGraphicChanged()
 // when it is set.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c0/11af1087411a9bacd29cd479c807e698b2e92c

2014-02-05 Thread Caolán McNamara 
 c0/11af1087411a9bacd29cd479c807e698b2e92c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cbcfa019cf576bc6289daf235cbf8312042fe5e7
Author: Caolán McNamara 
Date:   Wed Feb 5 11:38:12 2014 +

Notes added by 'git notes add'

diff --git a/c0/11af1087411a9bacd29cd479c807e698b2e92c 
b/c0/11af1087411a9bacd29cd479c807e698b2e92c
new file mode 100644
index 000..4bdfe5b
--- /dev/null
+++ b/c0/11af1087411a9bacd29cd479c807e698b2e92c
@@ -0,0 +1 @@
+merged as: 258e6f93e81539d90b23f45224dd225a6e20ab0d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/xmloff sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk xmloff/source

2014-02-05 Thread Caolán McNamara 
 include/xmloff/shapeimport.hxx |7 
 include/xmloff/xmlictxt.hxx|5 
 sc/AllLangResTarget_sc.mk  |1 
 sc/UIConfig_scalc.mk   |1 
 sc/inc/sc.hrc  |1 
 sc/inc/scabstdlg.hxx   |1 
 sc/source/ui/attrdlg/scdlgfact.cxx |   20 -
 sc/source/ui/attrdlg/scdlgfact.hxx |1 
 sc/source/ui/dbgui/scendlg.cxx |  151 ---
 sc/source/ui/dbgui/scendlg.hrc |   52 ---
 sc/source/ui/dbgui/scendlg.src |  165 
 sc/source/ui/docshell/docsh4.cxx   |2 
 sc/source/ui/inc/scendlg.hxx   |   27 --
 sc/source/ui/view/cellsh3.cxx  |2 
 sc/uiconfig/scalc/ui/scenariodialog.ui |  382 +
 xmloff/source/core/xmlictxt.cxx|3 
 xmloff/source/core/xmlmultiimagehelper.cxx |   11 
 xmloff/source/draw/shapeimport.cxx |   31 ++
 xmloff/source/draw/ximpshap.cxx|   67 +
 xmloff/source/draw/ximpshap.hxx|4 
 20 files changed, 580 insertions(+), 354 deletions(-)

New commits:
commit e401b9c8243af61d4b2889d38e8390e8971099f2
Author: Caolán McNamara 
Date:   Wed Feb 5 10:06:56 2014 +

convert scenario dialog to .ui

Change-Id: I66f7fe04155ad4c6e42e6aa96bb2db71ba4f682f

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index b312bba..e56cafc 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
 sc/source/ui/dbgui/dpgroupdlg.src \
 sc/source/ui/dbgui/pvfundlg.src \
 sc/source/ui/dbgui/dapitype.src \
-sc/source/ui/dbgui/scendlg.src \
 sc/source/ui/dbgui/validate.src \
 sc/source/ui/drawfunc/drformsh.src \
 sc/source/ui/drawfunc/objdraw.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index e0cd107..0e9c1fd 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -133,6 +133,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/rowheightdialog \
sc/uiconfig/scalc/ui/samplingdialog \
sc/uiconfig/scalc/ui/standardfilterdialog \
+   sc/uiconfig/scalc/ui/scenariodialog \
sc/uiconfig/scalc/ui/scgeneralpage \
sc/uiconfig/scalc/ui/searchresults \
sc/uiconfig/scalc/ui/selectdatasource \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 3bdad83..a733aec 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1014,7 +1014,6 @@
 #define RID_SCDLG_PIVOTFILTER   (SC_DIALOGS_START + 33)
 #define RID_SCDLG_PIVOT_LAYOUT  (SC_DIALOGS_START + 34)
 #define RID_SCDLG_CONSOLIDATE   (SC_DIALOGS_START + 35)
-#define RID_SCDLG_NEWSCENARIO   (SC_DIALOGS_START + 39)
 #define RID_SCDLG_INSERT_TABLE  (SC_DIALOGS_START + 42)
 
 #define RID_SCPAGE_AREAS(SC_DIALOGS_START + 44)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 0861d60..39fd50c 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -442,7 +442,6 @@ public:
 sal_uInt16 
nOrient ) = 0;
 
 virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* 
pParent, const OUString& rName,
-int nId,
 sal_Bool bEdit 
= false, sal_Bool bSheetProtected = false ) = 0;
 virtual AbstractScShowTabDlg * CreateScShowTabDlg(Window* pParent) = 0;
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index f9e146c..381e868 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -901,23 +901,11 @@ AbstractScDPShowDetailDlg * 
ScAbstractDialogFactory_Impl::CreateScDPShowDetailDl
 return 0;
 }
 
-AbstractScNewScenarioDlg * 
ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg ( Window* pParent, const 
OUString& rName,
-int nId,
-sal_Bool bEdit 
, sal_Bool bSheetProtected )
+AbstractScNewScenarioDlg * 
ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg(Window* pParent, const 
OUString& rName,
+sal_Bool bEdit, sal_Bool bSheetProtected)
 {
-ScNewScenarioDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_NEWSCENARIO :
-pDlg = new ScNewScenarioDlg( pParent, rName, bEdit,bSheetProtected 
);
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScNewScenarioDlg_Impl( pDlg );
-return 0;
+ScNewScenarioDlg *pDlg = new ScNewScenarioDlg(pParent, rName, bEdit, 
bSheetProtected);
+return new AbstractScNewScenarioDlg_Impl( pDlg );
 }
 
 AbstractScShowTabDlg * 
ScAbstractDialogFactory_Impl::CreateScShowTabDlg(Window* pParent)
diff --git a/sc/source/ui/attrdlg/scdlgfact.h

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

2014-02-05 Thread Michael Stahl 
 svx/source/svdraw/svdpagv.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 94ae67fb31360343241010598d517b8c378bcf82
Author: Michael Stahl 
Date:   Mon Feb 3 11:26:59 2014 +0100

fdo#63433 fdo#74435: SdrPageView::DrawLayer(): avoid spuriously visible 
images

In the TestBook2.odt of fdo#73300 it happens that at some particular
points when scrolling down, the
ViewObjectContactOfPageHierarchy::getPrimitive2DSequenceHierarchy()
will determine that > 200 images are visible; most likely this is due to
an empty ObjectContactOfPageView::maViewInformation2D::getViewport().

Loading this many images may need more RAM than is available on 32bit
platforms.

That appears to happen only (but not always) if somehow (not sure
how exactly) the rectangle passed to SdrPageView::DrawLayer() and the
existing GetRedrawRegion() do not overlap at all.

(regression from commit 8af09bf33291df2fb2bfbbd6e42f9bf074fcc4fc)

(cherry picked from commit 66f8b54931f193bdc844c6bca388d9bde98779cd)

Change-Id: Iafc595241df05204bccec1f2336014fc471b6602
Reviewed-on: https://gerrit.libreoffice.org/7813
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 5200d19a541b59141d15e3780f5197569b6b135e)
Reviewed-on: https://gerrit.libreoffice.org/7846
Reviewed-by: Jan Holesovsky 
Reviewed-by: Christian Lohmaier 

diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index cd13358..bbd94bf 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -350,7 +350,16 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* 
pGivenTarget, sdr::con
 // Copy existing paint region to use the same as prepared 
in BeginDrawLayer
 SdrPaintWindow& rExistingPaintWindow = 
pPreparedTarget->GetPaintWindow();
 const Region& rExistingRegion = 
rExistingPaintWindow.GetRedrawRegion();
-if ( rRect.IsEmpty() )
+bool bUseRect(false);
+if (!rRect.IsEmpty())
+{
+Region r(rExistingRegion);
+r.Intersect(rRect);
+// fdo#74435: FIXME: visibility check broken if empty
+if (!r.IsEmpty())
+bUseRect = true;
+}
+if (!bUseRect)
 aTemporaryPaintWindow.SetRedrawRegion(rExistingRegion);
 else
 aTemporaryPaintWindow.SetRedrawRegion(Region(rRect));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Caolán McNamara 
 include/vcl/builder.hxx |   66 
 1 file changed, 33 insertions(+), 33 deletions(-)

New commits:
commit ee2fcbab6de42e2d631c0e0b1b4c66b0ca3ebc93
Author: Caolán McNamara 
Date:   Wed Feb 5 11:37:38 2014 +

C2872: ´Window´ : ambiguous symbol

Change-Id: Id5a342b9fdc5240b70b0985f4c6de9493162f10c

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 68392c1..9424306 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -42,7 +42,7 @@ class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable
 {
 public:
 typedef std::map stringmap;
-typedef Window* (*customMakeWidget)(Window *pParent, stringmap &rVec);
+typedef ::Window* (*customMakeWidget)(::Window *pParent, stringmap &rVec);
 private:
 typedef boost::ptr_map ModuleMap;
 //We store these until the builder is deleted, that way we can use the
@@ -71,10 +71,10 @@ private:
 struct WinAndId
 {
 OString m_sID;
-Window *m_pWindow;
+::Window *m_pWindow;
 short m_nResponseId;
 PackingData m_aPackingData;
-WinAndId(const OString &rId, Window *pWindow, bool bVertical)
+WinAndId(const OString &rId, ::Window *pWindow, bool bVertical)
 : m_sID(rId)
 , m_pWindow(pWindow)
 , m_nResponseId(RET_CANCEL)
@@ -182,7 +182,7 @@ private:
 }
 };
 
-typedef std::map< Window*, stringmap> AtkMap;
+typedef std::map< ::Window*, stringmap> AtkMap;
 
 struct ParserState
 {
@@ -207,7 +207,7 @@ private:
 
 Translations m_aTranslations;
 
-std::map< Window*, Window*> m_aRedundantParentWidgets;
+std::map< ::Window*, ::Window*> m_aRedundantParentWidgets;
 
 std::vector m_aSizeGroups;
 
@@ -224,17 +224,17 @@ private:
 OString m_sID;
 OString m_sHelpRoot;
 ResHookProc m_pStringReplace;
-Window *m_pParent;
+::Window *m_pParent;
 bool m_bToplevelHasDeferredInit;
 bool m_bToplevelHasDeferredProperties;
 bool m_bToplevelParentFound;
 ParserState *m_pParserState;
 
-Window *get_by_name(OString sID);
+::Window *get_by_name(OString sID);
 void delete_by_name(OString sID);
 
 class sortIntoBestTabTraversalOrder
-: public std::binary_function
+: public std::binary_function
 {
 VclBuilder *m_pBuilder;
 public:
@@ -242,22 +242,22 @@ private:
 : m_pBuilder(pBuilder)
 {
 }
-bool operator()(const Window *pA, const Window *pB) const;
+bool operator()(const ::Window *pA, const ::Window *pB) const;
 };
 
 /// XFrame to be able to extract labels and other properties of the UNO 
commands (like of .uno:Bold).
 css::uno::Reference m_xFrame;
 
 public:
-VclBuilder(Window *pParent, OUString sUIRootDir, OUString sUIFile,
+VclBuilder(::Window *pParent, OUString sUIRootDir, OUString sUIFile,
 OString sID = OString(),
 const 
com::sun::star::uno::Reference &rFrame = 
com::sun::star::uno::Reference());
 ~VclBuilder();
-Window *get_widget_root();
+::Window *get_widget_root();
 //sID must exist and be of type T
 template  T* get(T*& ret, OString sID)
 {
-Window *w = get_by_name(sID);
+::Window *w = get_by_name(sID);
 SAL_WARN_IF(!w, "vcl.layout", "widget \"" << sID.getStr() << "\" not 
found in .ui");
 SAL_WARN_IF(!dynamic_cast(w),
 "vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to 
correspond to vcl type " << typeid(T).name());
@@ -273,9 +273,9 @@ public:
 return ret;
 }
 //sID may not exist, but must be of type T if it does
-template  T* get(OString sID)
+template  T* get(OString sID)
 {
-Window *w = get_by_name(sID);
+::Window *w = get_by_name(sID);
 SAL_WARN_IF(w && !dynamic_cast(w),
 "vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to 
correspond to vcl type " << typeid(T).name());
 assert(!w || dynamic_cast(w));
@@ -285,13 +285,13 @@ public:
 PopupMenu* get_menu(OString sID);
 
 //given an sID return the response value for that widget
-short get_response(const Window *pWindow) const;
+short get_response(const ::Window *pWindow) const;
 
-OString get_by_window(const Window *pWindow) const;
-void delete_by_window(const Window *pWindow);
+OString get_by_window(const ::Window *pWindow) const;
+void delete_by_window(const ::Window *pWindow);
 
 //apply the properties of rProps to pWindow
-static void set_properties(Window *pWindow, const stringmap &rProps);
+static void set_properties(::Window *pWindow, const stringmap &rProps);
 
 //Convert _ gtk markup to ~ vcl markup
 static OString convertMnemonicMarkup(const OString &rIn);
@@ -310,17 +310,17 @@ public:
 void setDeferredProperties();
 
 //Helpers to retrofit all the existing code to the builder
-static void

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

2014-02-05 Thread Stephan Bergmann 
 include/sfx2/htmlmode.hxx |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 461550cdb5b86fd3b20e6f381acb14bcccf91406
Author: Stephan Bergmann 
Date:   Wed Feb 5 12:35:22 2014 +0100

Remove unused HTMLMODE_* defines

...and turn the remaining ones into an enum.

Change-Id: I2e650fe2640f2bf512f356c7881a9722faa6ce25

diff --git a/include/sfx2/htmlmode.hxx b/include/sfx2/htmlmode.hxx
index 952b93d..4888c48 100644
--- a/include/sfx2/htmlmode.hxx
+++ b/include/sfx2/htmlmode.hxx
@@ -19,13 +19,11 @@
 #ifndef INCLUDED_SFX2_HTMLMODE_HXX
 #define INCLUDED_SFX2_HTMLMODE_HXX
 
-#define HTMLMODE_ON 0x0001
-#define HTMLMODE_PARA_DISTANCE  0x0004
-#define HTMLMODE_SOME_STYLES0x0020 /* mind. MS IE */
-#define HTMLMODE_FULL_STYLES0x0040 /* == SW */
-#define HTMLMODE_PARA_BLOCK 0x0100
-#define HTMLMODE_RESERVED1  0x4000
-#define HTMLMODE_RESERVED0  0x8000
+enum {
+HTMLMODE_ON = 0x0001,
+HTMLMODE_SOME_STYLES = 0x0020, /* mind. MS IE */
+HTMLMODE_FULL_STYLES = 0x0040 /* == SW */
+};
 
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 72022, which changed state.

Bug 72022 Summary: Integrated help ignored if installed
https://bugs.freedesktop.org/show_bug.cgi?id=72022

   What|Removed |Added

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

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

Re: Cppcheck redundantAssignment gridcell.cxx (svx module)

2014-02-05 Thread Caolán McNamara 
On Tue, 2014-02-04 at 21:47 +0100, Julien Nabet wrote:
> I downloaded https://issues.apache.org/ooo/attachment.cgi?id=54553 and 
> gave a try.
> Without applying the patch, it works since the rounding is ok and the 
> currency appears.
> With the patch, the cells contain 0 but if I click on a cell, the good 
> value appears (with the rounding + the currency) on the clicked cell 
> only. Then, if I click on another cell, the previous gets back to 0 and 
> the new selected one is ok.
> So I'd tend now to remove the 2 unused lines since it seems the needed 
> format is retrieved in another way than in 2008.

Heh!, yeah, lets remove those two lines whose result doesn't get used
then.

C.

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

Re: A question about extension and sidebar

2014-02-05 Thread ludovic SMADJA 

Hi,

I haven't find any solution yet. I've not on IRC now, Il will connect.

Ludovic

Le 05/02/2014 11:35, Miklos Vajna a écrit :

Hi Ludovic,

On Mon, Jan 27, 2014 at 03:11:39PM +0100, ludovic SMADJA 
 wrote:

I can detect that the loaded document is present in intranet but I
don't know how to open a sidebar panel via API.

Is there any way to do that ? is a dispatch command to open a sideba panel ?

Did you sort this out in the end? I saw some related discussion on IRC
with Kendy, not sure what was the outcome.

Miklos


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

RE: how to detect compiler warning

2014-02-05 Thread Winfried Donkers 
Hi Miklos,

>> I only hope that 'others' will get rid of 'their' warnings too ;-)

> Several of us build with --enable-werror, so yes, we fix the warnings 
> introduced by others as well. But it's good if you can get rid of them before 
> you push. :-)

Of course I will try to fix warnings if I encounter them. And if my trying 
doesn't succeed, I will just humbly wait for better developers to solve it. ;-)

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-02-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

sophie  changed:

   What|Removed |Added

 Depends on||74556

--- Comment #81 from sophie  ---
Add bug 74556, Calc crashes when undo inserted comments

-- 
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: A question about extension and sidebar

2014-02-05 Thread Miklos Vajna 
Hi Ludovic,

On Mon, Jan 27, 2014 at 03:11:39PM +0100, ludovic SMADJA 
 wrote:
> I can detect that the loaded document is present in intranet but I
> don't know how to open a sidebar panel via API.
> 
> Is there any way to do that ? is a dispatch command to open a sideba panel ?

Did you sort this out in the end? I saw some related discussion on IRC
with Kendy, not sure what was the outcome.

Miklos


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

Re: how to detect compiler warning

2014-02-05 Thread Miklos Vajna 
Hi Winfried,

On Fri, Jan 31, 2014 at 11:00:34AM +0100, Winfried Donkers 
 wrote:
> Thank you, will do so.
> I only hope that 'others' will get rid of 'their' warnings too ;-)

Several of us build with --enable-werror, so yes, we fix the warnings
introduced by others as well. But it's good if you can get rid of them
before you push. :-)

Miklos


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

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

2014-02-05 Thread Michael Stahl 
 basic/source/comp/exprgen.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c820a2816ab3b90c4166ffdc532ad0a17af019b
Author: Michael Stahl 
Date:   Tue Feb 4 23:19:00 2014 +0100

basic: _FIND_STATIC likely not an error in SbiExprNode::GenElement()

All other _FIND_* are explicitly not errors, and probably CWS npower10
forgot to adapt this assertion.

Change-Id: If721c275eb1bc31d76140898602b41e11c23d82e
Reviewed-on: https://gerrit.libreoffice.org/7863
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index b24bbc2..93ca51e 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -171,7 +171,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
 void SbiExprNode::GenElement( SbiOpcode eOp )
 {
 #ifdef DBG_UTIL
-if( (eOp < _RTL || eOp > _CALLC) && eOp != _FIND_G && eOp != _FIND_CM )
+if ((eOp < _RTL || eOp > _CALLC) && eOp != _FIND_G && eOp != _FIND_CM && 
eOp != _FIND_STATIC)
 pGen->GetParser()->Error( SbERR_INTERNAL_ERROR, "Opcode" );
 #endif
 SbiSymDef* pDef = aVar.pDef;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Stephan Bergmann 
 bridges/source/jni_uno/jni_bridge.cxx |   79 ++
 1 file changed, 34 insertions(+), 45 deletions(-)

New commits:
commit 970df64bc975a0a8aaae19bf46157c27f34f9a35
Author: Stephan Bergmann 
Date:   Wed Feb 5 11:11:39 2014 +0100

static assert is enough

Change-Id: I51be076119b23611f006fb4ebefd8f4bb727ded8

diff --git a/bridges/source/jni_uno/jni_bridge.cxx 
b/bridges/source/jni_uno/jni_bridge.cxx
index 056e269..7de0a7e 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -478,58 +478,47 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping(
 BOOST_STATIC_ASSERT( sizeof (jshort) == sizeof (sal_Int16) );
 BOOST_STATIC_ASSERT( sizeof (jint) == sizeof (sal_Int32) );
 BOOST_STATIC_ASSERT( sizeof (jlong) == sizeof (sal_Int64) );
-if ((JNI_FALSE == sal_False) &&
-(JNI_TRUE == sal_True) &&
-(sizeof (jboolean) == sizeof (sal_Bool)) &&
-(sizeof (jchar) == sizeof (sal_Unicode)) &&
-(sizeof (jdouble) == sizeof (double)) &&
-(sizeof (jfloat) == sizeof (float)) &&
-(sizeof (jbyte) == sizeof (sal_Int8)) &&
-(sizeof (jshort) == sizeof (sal_Int16)) &&
-(sizeof (jint) == sizeof (sal_Int32)) &&
-(sizeof (jlong) == sizeof (sal_Int64)))
-{
-OUString const & from_env_typename =
-OUString::unacquired( &pFrom->pTypeName );
-OUString const & to_env_typename =
-OUString::unacquired( &pTo->pTypeName );
 
-uno_Mapping * mapping = 0;
+OUString const & from_env_typename =
+OUString::unacquired( &pFrom->pTypeName );
+OUString const & to_env_typename =
+OUString::unacquired( &pTo->pTypeName );
 
-try
+uno_Mapping * mapping = 0;
+
+try
+{
+if ( from_env_typename == UNO_LB_JAVA && to_env_typename == UNO_LB_UNO 
)
 {
-if ( from_env_typename == UNO_LB_JAVA && to_env_typename == 
UNO_LB_UNO )
-{
-Bridge * bridge =
-new Bridge( pFrom, pTo->pExtEnv, true ); // ref count = 1
-mapping = &bridge->m_java2uno;
-uno_registerMapping(
-&mapping, Bridge_free,
-pFrom, (uno_Environment *)pTo->pExtEnv, 0 );
-}
-else if ( from_env_typename == UNO_LB_UNO && to_env_typename == 
UNO_LB_JAVA )
-{
-Bridge * bridge =
-new Bridge( pTo, pFrom->pExtEnv, false ); // ref count = 1
-mapping = &bridge->m_uno2java;
-uno_registerMapping(
-&mapping, Bridge_free,
-(uno_Environment *)pFrom->pExtEnv, pTo, 0 );
-}
+Bridge * bridge =
+new Bridge( pFrom, pTo->pExtEnv, true ); // ref count = 1
+mapping = &bridge->m_java2uno;
+uno_registerMapping(
+&mapping, Bridge_free,
+pFrom, (uno_Environment *)pTo->pExtEnv, 0 );
 }
-catch (const BridgeRuntimeError & err)
+else if ( from_env_typename == UNO_LB_UNO && to_env_typename == 
UNO_LB_JAVA )
 {
-SAL_WARN(
-"bridges",
-"ingoring BridgeRuntimeError \"" << err.m_message << "\"");
-}
-catch (const 
::jvmaccess::VirtualMachine::AttachGuard::CreationException &)
-{
-SAL_WARN("bridges", "attaching current thread to java failed");
+Bridge * bridge =
+new Bridge( pTo, pFrom->pExtEnv, false ); // ref count = 1
+mapping = &bridge->m_uno2java;
+uno_registerMapping(
+&mapping, Bridge_free,
+(uno_Environment *)pFrom->pExtEnv, pTo, 0 );
 }
-
-*ppMapping = mapping;
 }
+catch (const BridgeRuntimeError & err)
+{
+SAL_WARN(
+"bridges",
+"ingoring BridgeRuntimeError \"" << err.m_message << "\"");
+}
+catch (const ::jvmaccess::VirtualMachine::AttachGuard::CreationException &)
+{
+SAL_WARN("bridges", "attaching current thread to java failed");
+}
+
+*ppMapping = mapping;
 }
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread David Tardon 
 include/vcl/outdev.hxx |6 
 vcl/source/gdi/outdev3.cxx |   59 -
 2 files changed, 59 insertions(+), 6 deletions(-)

New commits:
commit 6b127d40c7d57745bc602d9ff7914392f9d3b92b
Author: David Tardon 
Date:   Wed Feb 5 10:55:25 2014 +0100

rhbz#1057977 avoid use of invalidated pointers

Change-Id: Ib81f79da696b5e8002f5a2ddcf160903231dc3f1

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 8a7c439..4223135 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -537,9 +537,15 @@ protected:
 OutputDevice();
 
 private:
+typedef void ( OutputDevice::* FontUpdateHandler_t )( bool );
+
 SAL_DLLPRIVATEOutputDevice( const OutputDevice& rOutDev );
 SAL_DLLPRIVATE OutputDevice&  operator =( const OutputDevice& rOutDev );
 
+SAL_DLLPRIVATE void ImplClearFontData( bool bNewFontLists );
+SAL_DLLPRIVATE void ImplRefreshFontData( bool bNewFontLists );
+SAL_DLLPRIVATE static void  ImplUpdateFontDataForAllFrames( 
FontUpdateHandler_t pHdl, bool bNewFontLists );
+
 public:
 virtual ~OutputDevice();
 
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 5c5dcf2..c347f71 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -154,7 +154,7 @@ static void ImplRotatePos( long nOriginX, long nOriginY, 
long& rX, long& rY,
 }
 }
 
-void OutputDevice::ImplUpdateFontData( bool bNewFontLists )
+void OutputDevice::ImplClearFontData( const bool bNewFontLists )
 {
 // the currently selected logical font is no longer needed
 if ( mpFontEntry )
@@ -205,6 +205,38 @@ void OutputDevice::ImplUpdateFontData( bool bNewFontLists )
 delete mpFontList;
 if( mpFontCache && mpFontCache != 
pSVData->maGDIData.mpScreenFontCache )
 delete mpFontCache;
+mpFontList = 0;
+mpFontCache = 0;
+}
+}
+}
+}
+
+// also update child windows if needed
+if ( GetOutDevType() == OUTDEV_WINDOW )
+{
+Window* pChild = ((Window*)this)->mpWindowImpl->mpFirstChild;
+while ( pChild )
+{
+pChild->ImplClearFontData( true );
+pChild = pChild->mpWindowImpl->mpNext;
+}
+}
+}
+
+void OutputDevice::ImplRefreshFontData( const bool bNewFontLists )
+{
+//if ( GetOutDevType() == OUTDEV_PRINTER || mpPDFWriter )
+{
+ImplSVData* pSVData = ImplGetSVData();
+
+if ( bNewFontLists )
+{
+// we need a graphics
+if ( ImplGetGraphics() )
+{
+if( mpPDFWriter )
+{
 mpFontList = pSVData->maGDIData.mpScreenFontList->Clone( 
true, true );
 mpFontCache = new ImplFontCache();
 }
@@ -222,16 +254,24 @@ void OutputDevice::ImplUpdateFontData( bool bNewFontLists 
)
 Window* pChild = ((Window*)this)->mpWindowImpl->mpFirstChild;
 while ( pChild )
 {
-pChild->ImplUpdateFontData( true );
+pChild->ImplRefreshFontData( true );
 pChild = pChild->mpWindowImpl->mpNext;
 }
 }
 }
 
+void OutputDevice::ImplUpdateFontData( bool bNewFontLists )
+{
+ImplClearFontData( bNewFontLists );
+ImplRefreshFontData( bNewFontLists );
+}
+
 void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists )
 {
 ImplSVData* pSVData = ImplGetSVData();
 
+ImplUpdateFontDataForAllFrames( &OutputDevice::ImplClearFontData, 
bNewFontLists );
+
 // clear global font lists to have them updated
 pSVData->maGDIData.mpScreenFontCache->Invalidate();
 if ( bNewFontLists )
@@ -250,16 +290,23 @@ void OutputDevice::ImplUpdateAllFontData( bool 
bNewFontLists )
 }
 }
 
+ImplUpdateFontDataForAllFrames( &OutputDevice::ImplRefreshFontData, 
bNewFontLists );
+}
+
+void OutputDevice::ImplUpdateFontDataForAllFrames( const FontUpdateHandler_t 
pHdl, const bool bNewFontLists )
+{
+ImplSVData* const pSVData = ImplGetSVData();
+
 // update all windows
 Window* pFrame = pSVData->maWinData.mpFirstFrame;
 while ( pFrame )
 {
-pFrame->ImplUpdateFontData( bNewFontLists );
+( pFrame->*pHdl )( bNewFontLists );
 
 Window* pSysWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap;
 while ( pSysWin )
 {
-pSysWin->ImplUpdateFontData( bNewFontLists );
+( pSysWin->*pHdl )( bNewFontLists );
 pSysWin = pSysWin->mpWindowImpl->mpNextOverlap;
 }
 
@@ -270,7 +317,7 @@ void OutputDevice::ImplUpdateAllFontData( bool 
bNewFontLists )
 VirtualDevice* pVirDev = pSVData->maGDIData.mpFirstVirDev;
 while ( pVirDev )
 {
-pVirDev->ImplUpdateFontData( bNewFontLists );
+( pVirDev->*pHdl )( bNewFontLists );
 pVirDev = pVirDev->mpNext;

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

2014-02-05 Thread Stephan Bergmann 
 sw/qa/complex/accessibility/AccessibleRelationSet.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 561c48178c5ea544f4c1e845f77970d2830ed544
Author: Stephan Bergmann 
Date:   Wed Feb 5 10:56:37 2014 +0100

Adapt JunitTest_sw_complex to 2bb87dd6596f8e961f5618d8e7686fa12c64e2cf

"fdo#39944: Add DOCUMENT_* accessibility UNO roles"

Change-Id: I8b68ef756d054ee4e53941927108253d62e82672

diff --git a/sw/qa/complex/accessibility/AccessibleRelationSet.java 
b/sw/qa/complex/accessibility/AccessibleRelationSet.java
index d28470f..42ad00f 100644
--- a/sw/qa/complex/accessibility/AccessibleRelationSet.java
+++ b/sw/qa/complex/accessibility/AccessibleRelationSet.java
@@ -174,7 +174,7 @@ public class AccessibleRelationSet {
 XWindow xWindow = AccessibilityTools.getCurrentWindow(factory, aModel);
 XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
-XAccessibleContext ctx = 
AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT);
+XAccessibleContext ctx = 
AccessibilityTools.getAccessibleObjectForRole(xRoot, 
AccessibleRole.DOCUMENT_TEXT);
 
 para1 = ctx.getAccessibleChild(0);
 para2 = ctx.getAccessibleChild(1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-05 Thread Zolnai Tamás 
 filter/source/msfilter/escherex.cxx  |   14 ++--
 include/oox/drawingml/textparagraphproperties.hxx|4 +
 oox/source/drawingml/textbodycontext.cxx |1 
 oox/source/drawingml/textcharacterpropertiescontext.cxx  |   17 
 oox/source/drawingml/textparagraphpropertiescontext.cxx  |   21 ++
 sw/qa/extras/ooxmlimport/data/dml-groupshape-capitalization.docx |binary
 sw/qa/extras/ooxmlimport/data/dml-groupshape-paraadjust.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   35 
++
 8 files changed, 85 insertions(+), 7 deletions(-)

New commits:
commit 07eb648d82a4a26b4b6c7fa78aa2d22ccbd0593d
Author: Zolnai Tamás 
Date:   Tue Feb 4 18:10:03 2014 +0100

Remove some extra break

Change-Id: I55405c748d67101ecef8ef8a52037a26bc52b9f6

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 293aead..6a8ea7f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1961,8 +1961,10 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( 
const ::com::sun::star::uno
 switch( aSegments[ j ].Command )
 {
 case 
drawing::EnhancedCustomShapeSegmentCommand::UNKNOWN: break;
-case 
drawing::EnhancedCustomShapeSegmentCommand::MOVETO : nPointIndex++; break;
-case 
drawing::EnhancedCustomShapeSegmentCommand::LINETO : nPointIndex++; break;
+case 
drawing::EnhancedCustomShapeSegmentCommand::MOVETO :
+case 
drawing::EnhancedCustomShapeSegmentCommand::LINETO :
+nPointIndex++;
+break;
 case 
drawing::EnhancedCustomShapeSegmentCommand::CURVETO :
 {
 aPolygon.SetFlags( nPointIndex, 
POLY_CONTROL);
@@ -1994,10 +1996,10 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( 
const ::com::sun::star::uno
 case 
drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO :
 nPointIndex += 2;
 break;
-case 
drawing::EnhancedCustomShapeSegmentCommand::DARKEN : break;
-case 
drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS : break;
-case 
drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN : break;
-case 
drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS : break;
+case 
drawing::EnhancedCustomShapeSegmentCommand::DARKEN :
+case 
drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS :
+case 
drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN :
+case 
drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS :
 break;
 }
 }
commit a468e386695f470f65616adde4673aa43a562c51
Author: Zolnai Tamás 
Date:   Wed Feb 5 10:06:40 2014 +0100

drawingML import: paragraph adjustment inside group shape

Change-Id: I875cb1f12c9f81d329d7fe9cd3aa32a4cd818573

diff --git a/include/oox/drawingml/textparagraphproperties.hxx 
b/include/oox/drawingml/textparagraphproperties.hxx
index 8014929..2ed69f9 100644
--- a/include/oox/drawingml/textparagraphproperties.hxx
+++ b/include/oox/drawingml/textparagraphproperties.hxx
@@ -94,6 +94,9 @@ public:
 boost::optional< sal_Int32 >&   getParaLeftMargin(){ return 
moParaLeftMargin; }
 boost::optional< sal_Int32 >&   getFirstLineIndentation(){ return 
moFirstLineIndentation; }
 
+boost::optional< sal_Int16 >&   getParaAdjust() { return moParaAdjust; 
}
+voidsetParaAdjust( sal_Int16 nParaAdjust ) 
{ moParaAdjust = nParaAdjust; }
+
 voidapply( const TextParagraphProperties& 
rSourceProps );
 voidpushToPropSet( const 
::oox::core::XmlFilterBase* pFilterBase,
 const 
::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & 
xPropSet,
@@ -118,6 +121,7 @@ protected:
 TextSpacing maParaBottomMargin;
 boost::optional< sal_Int32 >moParaLeftMargin;
 boost::optional< sal_Int32 >moFirstLineIndentation;
+boost::optional< sal_Int16 >moParaAdjust;
 sal_Int16   mnLevel;
 };
 
diff --git a/oox/source/drawingml/textbodycontext.cxx 
b/oox/source/drawingml/textbodycontext.cxx
index b9921e0..48cf3ec 100644
--- a/oox/source/drawi

Re: make re-downloading the files when building LO for the second time.

2014-02-05 Thread Anubhav Yadav 
> I assume you mean autogen.sh

Yes

> You can specify a directory where the build should download the files to. It
> defaults to a subdirectory of the checkout.
> You can use --with-external-tar to change this.
>
> In either case the build should not redownload files that are on disk.
>
>> Isn't make is only responsible for recompiling only those parts which
>> were changed?
>
> Recompiling is different from redownloading.
>

> Either the version of the externals was updated since your last build or the
> files were no longer in the download folder.

There were files in both src folder and externals/tarballs folder. I
even moved the files
from src to externals/tarballs but still it started downloading the
external libraries.

Nevertheless I believe that the libraries have updated and have
postponed the idea of
building LO with all the recent changes until tomorrow!

-- 
Regards,
Anubhav Yadav
Imperial College of Engineering and Research,
Pune.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - reportbuilder/java

2014-02-05 Thread Lionel Elie Mamane 
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
 |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2dc383cd014bad144bdaa208fed309f48ad95ba7
Author: Lionel Elie Mamane 
Date:   Wed Feb 5 07:39:31 2014 +0100

fdo#69873 FixedText (label) is implemented as no value

And the actual label is put as *body* of the cell.
I'd prefer that the value be put as string-value attribute of the cell,
but since in the report definition the label is as body
(as opposed to as an attribute), it is easier that way.

We could move (actually *copy* for backwards compatibility reasons)
the label to an attribute of the rpt:fixed-content element
(similar to the rpt:formula attribute of rpt:formatted-text)
but it is not obvious this is completely desirable:
Indeed it would keep us from putting anything more complex than a string 
there
(which we don't do anyway now, but thinking of future extensibility here);
I'll leave the exploration of that idea to the indefinite future.

Change-Id: Ia0f7460718ee35a971117e2f79c0997e17e1095e
Reviewed-on: https://gerrit.libreoffice.org/7866
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 6883482..a9e0ef0 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -74,11 +74,12 @@ public class TableCellLayoutController extends 
SectionLayoutController
 FormatValueUtility.applyValueForCell(value.getValue(), 
attributeMap, valueType);
 }
 // #i114108#: except on form elements, the only value-type that can
-// occur without an accompanying value attribute is "string"
+// occur without an accompanying value attribute is "string";
+// the content is then in the body.
 else if (!"string".equals(valueType))
 {
 attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS,
-FormatValueUtility.VALUE_TYPE, "void");
+FormatValueUtility.VALUE_TYPE, "string");
 }
 }
 catch (Exception e)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

  1   2   >