date:20150505

[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications

2015-05-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=34555

Philippe Jung  changed:

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

--- Comment #64 from Philippe Jung  ---
So we now have:
- save image
- change picture
- compress image
- edit with external tools
- crop image
in impress, writer and calc

-- 
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: svx/source

2015-05-05 Thread Caolán McNamara

 svx/source/tbxctrls/fillctrl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c4dacea24f8ca83e6c178e2846aeb40b3a100dcb
Author: CaolÃ¡n McNamara 
Date:   Tue May 5 20:08:34 2015 +0100

Â´ColorÂ´ : ambiguous symbol

Change-Id: I5a33d518a62c35c9ac03600f02a37ac987e6e066

diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index fa8c675..d730a44 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -616,7 +616,7 @@ IMPL_LINK(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox 
*, pToolBox)
 mpLbFillAttr->Hide();
 mpToolBoxColor->Show();
 const OUString aTmpStr;
-const Color aColor = mpColorItem->GetColorValue();
+const ::Color aColor = mpColorItem->GetColorValue();
 const XFillColorItem aXFillColorItem( aTmpStr, aColor );
 
 // #i122676# change FillStyle and Color in one call
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: formula/source include/formula scaddins/source sc/inc sc/qa sc/source

2015-05-05 Thread Winfried Donkers

 formula/source/core/resource/core_resource.src |7 ++
 include/formula/compiler.hrc   |3 
 include/formula/opcode.hxx |1 
 sc/inc/helpids.h   |1 
 sc/qa/unit/ucalc.cxx   |1 
 sc/source/core/inc/interpre.hxx|6 +
 sc/source/core/tool/interpr2.cxx   |   77 -
 sc/source/core/tool/interpr4.cxx   |3 
 sc/source/core/tool/odffmap.cxx|2 
 sc/source/core/tool/parclass.cxx   |1 
 sc/source/filter/excel/xlformula.cxx   |7 +-
 sc/source/filter/oox/formulabase.cxx   |2 
 sc/source/ui/src/scfuncs.src   |   48 +++
 scaddins/source/analysis/analysishelper.cxx|2 
 14 files changed, 136 insertions(+), 25 deletions(-)

New commits:
commit 111952dccc1bf9e28e61c0233816248c848cbf53
Author: Winfried Donkers 
Date:   Mon May 12 12:02:11 2014 +0200

fdo#77985 make calc function NETWORKDAYS comply with ODFF1.2

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

diff --git a/formula/source/core/resource/core_resource.src 
b/formula/source/core/resource/core_resource.src
index 4462ee9..298560c 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -390,6 +390,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
 String SC_OPCODE_WEEK { Text = "ISOWEEKNUM" ; };
 String SC_OPCODE_EASTERSUNDAY { Text = "ORG.OPENOFFICE.EASTERSUNDAY" ; };
 String SC_OPCODE_GET_DAY_OF_WEEK { Text = "WEEKDAY" ; };
+String SC_OPCODE_NETWORKDAYS { Text = "NETWORKDAYS" ; };
 String SC_OPCODE_NETWORKDAYS_MS { Text = "COM.MICROSOFT.NETWORKDAYS.INTL" 
; };
 String SC_OPCODE_WORKDAY_MS { Text = "COM.MICROSOFT.WORKDAY.INTL" ; };
 String SC_OPCODE_NO_NAME { Text = "#NAME!" ; };
@@ -808,6 +809,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
 String SC_OPCODE_WEEK { Text = "WEEKNUM" ; };
 String SC_OPCODE_EASTERSUNDAY { Text = "EASTERSUNDAY" ; };
 String SC_OPCODE_GET_DAY_OF_WEEK { Text = "WEEKDAY" ; };
+String SC_OPCODE_NETWORKDAYS { Text = "NETWORKDAYS" ; };
 String SC_OPCODE_NETWORKDAYS_MS { Text = "NETWORKDAYS.INTL" ; };
 String SC_OPCODE_WORKDAY_MS { Text = "WORKDAY.INTL" ; };
 String SC_OPCODE_NO_NAME { Text = "#NAME!" ; };
@@ -1228,6 +1230,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
 String SC_OPCODE_WEEK { Text = "WEEKNUM" ; };
 String SC_OPCODE_EASTERSUNDAY { Text = "EASTERSUNDAY" ; };
 String SC_OPCODE_GET_DAY_OF_WEEK { Text = "WEEKDAY" ; };
+String SC_OPCODE_NETWORKDAYS { Text = "NETWORKDAYS" ; };
 String SC_OPCODE_NETWORKDAYS_MS { Text = "NETWORKDAYS.INTL" ; };
 String SC_OPCODE_WORKDAY_MS { Text = "WORKDAY.INTL" ; };
 String SC_OPCODE_NO_NAME { Text = "#NAME!" ; };
@@ -2689,6 +2692,10 @@ Resource RID_STRLIST_FUNCTION_NAMES
 {
 Text [ en-US ] = "WEEKDAY" ;
 };
+String SC_OPCODE_NETWORKDAYS
+{
+Text [ en-US ] = "NETWORKDAYS" ;
+};
 String SC_OPCODE_NETWORKDAYS_MS
 {
 Text [ en-US ] = "NETWORKDAYS.INTL" ;
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index f5bd316..4798c19 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -481,7 +481,8 @@
 #define SC_OPCODE_COLOR 471
 #define SC_OPCODE_CEIL  472
 #define SC_OPCODE_CEIL_PRECISE  473
-#define SC_OPCODE_STOP_2_PAR474 /* last function with two or more 
parameters' OpCode + 1 */
+#define SC_OPCODE_NETWORKDAYS   474
+#define SC_OPCODE_STOP_2_PAR475 /* last function with two or more 
parameters' OpCode + 1 */
 
 #define SC_OPCODE_STOP_FUNCTION SC_OPCODE_STOP_2_PAR/* last 
function's OpCode + 1 */
 #define SC_OPCODE_LAST_OPCODE_ID(SC_OPCODE_STOP_FUNCTION - 1)   /* last 
OpCode */
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 73b911a..9d4d676 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -448,6 +448,7 @@ enum OpCode : sal_uInt16
 // miscellaneous
 ocWeek  = SC_OPCODE_WEEK,
 ocGetDayOfWeek  = SC_OPCODE_GET_DAY_OF_WEEK,
+ocNetWorkdays   = SC_OPCODE_NETWORKDAYS,
 ocNetWorkdays_MS= SC_OPCODE_NETWORKDAYS_MS,
 ocWorkday_MS= SC_OPCODE_WORKDAY_MS,
 ocNoName= SC_OPCODE_NO_NAME,
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 0425fe5..367bb0d 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -621,6 +621,7 @@
 #define HID_FUNC_CEIL_PRECISE   
"SC_HID_FUNC_CEIL_PRECISE"
 #define HID_FUNC_CEIL_ISO   
"SC_HID_FUNC_CEIL_ISO"
 #define HID_FUNC_FLOOR_MS

Re: Re: Extension: Keyboard shortcut for menu item

2015-05-05 Thread Jan Rheinländer

Ok I understand the reason.

I'm currently testing a BASIC macro (which I can assign a keyboard
shortcut through the UI) which sends a URL to my
XDispatch::queryDispatch() method. That seems to be a possible workaround.

P.S. How do I answer to a thread if I only get the digest version of the
mailing list?

 Original thread --
> in my extension I have an .xcu file (beginning of file see below). How
> can I assign a keyboard shortcut to a menu item (e.g. node
> "010:edit:change")? The schema only offers to put an icon in the
> beginning of the menu line. But many LO menus have a shortcut defined at
> the end of the menu line, e.g. F1 for help.
You can't, IIUC.  (I guess the main reason being that with leaving the
feature out entirely you avoid having to worry about how to arbitrate in
case of contention over key bindings among different extensions, or
between an extension and the LO core.)




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

[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl

2015-05-05 Thread Michael Meeks

 scripts/esc-bug-stats.pl |   73 +++
 1 file changed, 43 insertions(+), 30 deletions(-)

New commits:
commit 0b2452ebcecb3e6efc2ffe442b04f6d1f0a02234
Author: Michael Meeks 
Date:   Tue May 5 20:44:23 2015 +0100

Adapt generated formulae for 5.0.

diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 0b056f2..85effa4 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -29,7 +29,7 @@ sub build_overall_bugstats()
 }
 
 my %bug_to_ver = (
-'4.5' => '86696',
+'5.0' => '86696',
 '4.4' => '79641',
 '4.3' => '75025',
 '4.2' => '65675',
@@ -161,79 +161,89 @@ print << "EOF"
   
  
 
-
- 
+
+ 
   Date
  
- 
+ 
   Open 3.5
  
- 
+ 
   Closed 3.5
  
- 
+ 
   Open 3.6
  
- 
+ 
   Closed 3.6
  
- 
+ 
   Open 4.0
  
- 
+ 
   Closed 4.0
  
- 
+ 
   Open 4.1
  
- 
+ 
   Closed 4.1
  
- 
+ 
   Open 4.2
  
- 
+ 
   Closed 4.2
  
- 
+ 
   Open 4.3
  
- 
+ 
   Closed 4.3
  
- 
+ 
   Open 4.4
  
- 
+ 
   Closed 4.4
  
- 
+ 
+  Open 5.0
+ 
+ 
+  Closed 5.0
+ 
+ 
   Total 3.5
  
- 
+ 
   Total 3.6
  
- 
+ 
   Total 4.0
  
- 
+ 
   Total 4.1
  
- 
+ 
   Total 4.2
  
- 
+ 
   Total 4.3
  
- 
+ 
   Total 4.4
  
- 
+ 
+  Total 5.0
+ 
+ 
   Total Open
  
- 
+ 
   Total Closed
  
+ 
 
 
 
@@ -251,9 +261,11 @@ print << "EOF"
   
  
  
- 
+ 
  
- 
+ 
+ 
+ 
  
  
  
@@ -261,8 +273,9 @@ print << "EOF"
  
  
  
- 
- 
+ 
+ 
+ 
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Caolán McNamara

 vcl/source/window/toolbox.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 22da3ae40027ff2d31f89cf92f0d4ad7217aed1e
Author: CaolÃ¡n McNamara 
Date:   Tue May 5 21:06:09 2015 +0100

VclPtr: crash on exit on impress

Change-Id: I3f81128b58992db68263fb6c8d2a94cbae855632

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index de02402..5c0c541 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4498,6 +4498,9 @@ void ToolBox::ToggleFloatingMode()
 {
 DockingWindow::ToggleFloatingMode();
 
+if (!mpData)
+return;
+
 bool mbOldHorz = mbHorz;
 
 if ( ImplIsFloatingMode() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Deena Francis

 sc/source/ui/inc/gridwin.hxx   |2 
 sc/source/ui/inc/viewfunc.hxx  |2 
 sc/source/ui/view/gridwin.cxx  |   16 
 sc/source/ui/view/viewfun2.cxx |  142 +
 4 files changed, 162 insertions(+)

New commits:
commit 5c793b582e5afda68bb6acf7aa22f70c48f59b12
Author: Deena Francis 
Date:   Sun Mar 15 02:34:55 2015 +0530

Resolves tdf#84240 : Red squiggly underline does not appear instantly

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

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 07bb227..aa683cb 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -414,6 +414,8 @@ public:
 void EnableAutoSpell( bool bEnable );
 void ResetAutoSpell();
 void SetAutoSpellData( SCCOL nPosX, SCROW nPosY, const 
std::vector* pRanges );
+const std::vector* GetAutoSpellData( SCCOL nPosX, 
SCROW nPosY );
+bool InsideVisibleRange( SCCOL nPosX, SCROW nPosY );
 
 voidDeleteCopySourceOverlay();
 voidUpdateCopySourceOverlay();
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 2e696f1..6f3cabd 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -368,6 +368,8 @@ private:
 bool bAttrChanged, bool bAddUndo );
 
 voidMarkAndJumpToRanges(const ScRangeList& rRanges);
+voidCopyAutoSpellData( FillDir eDir, SCCOL nStartCol, SCROW 
nStartRow,
+   SCCOL nEndCol, SCROW nEndRow, sal_uLong 
nCount );
 };
 
 #endif
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 8cf05b2..6f0544a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5764,6 +5764,22 @@ void ScGridWindow::SetAutoSpellData( SCCOL nPosX, SCROW 
nPosY, const std::vector
 mpSpellCheckCxt->setMisspellRanges(nPosX, nPosY, pRanges);
 }
 
+const std::vector* ScGridWindow::GetAutoSpellData( 
SCCOL nPosX, SCROW nPosY )
+{
+if (!mpSpellCheckCxt)
+return NULL;
+
+if (!maVisibleRange.isInside(nPosX, nPosY))
+return NULL;
+
+return mpSpellCheckCxt->getMisspellRanges(nPosX, nPosY);
+}
+
+bool ScGridWindow::InsideVisibleRange( SCCOL nPosX, SCROW nPosY )
+{
+return maVisibleRange.isInside(nPosX, nPosY);
+}
+
 // #114409#
 void ScGridWindow::CursorChanged()
 {
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index db445ce..070b109 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -56,6 +56,7 @@
 #include "docfunc.hxx"
 #include "docpool.hxx"
 #include "docsh.hxx"
+#include "docoptio.hxx"
 #include "global.hxx"
 #include "patattr.hxx"
 #include "printfun.hxx"
@@ -1204,6 +1205,10 @@ void ScViewFunc::FillSimple( FillDir eDir, bool bRecord )
 {
 pDocSh->UpdateOle(&GetViewData());
 UpdateScrollBars();
+bool bDoAutoSpell = 
pDocSh->GetDocument().GetDocOptions().IsAutoSpell();
+if ( bDoAutoSpell )
+CopyAutoSpellData(eDir, aRange.aStart.Col(), 
aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row(),
+::std::numeric_limits::max());
 }
 }
 else
@@ -1249,6 +1254,10 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL 
nStartCol, SCROW nStartRow,
 pDocSh->UpdateOle(&GetViewData());
 UpdateScrollBars();
 
+bool bDoAutoSpell = 
pDocSh->GetDocument().GetDocOptions().IsAutoSpell();
+if ( bDoAutoSpell )
+CopyAutoSpellData(eDir, nStartCol, nStartRow, nEndCol, nEndRow, 
nCount);
+
 if (ScModelObj* pModelObj = 
HelperNotifyChanges::getMustPropagateChangesModel(*pDocSh))
 {
 ScRangeList aChangeRanges;
@@ -1276,6 +1285,139 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL 
nStartCol, SCROW nStartRow,
 }
 }
 
+void ScViewFunc::CopyAutoSpellData( FillDir eDir, SCCOL nStartCol, SCROW 
nStartRow,
+   SCCOL nEndCol, SCROW nEndRow, sal_uLong 
nCount )
+{
+ScGridWindow* pWin = this->GetActiveWin();
+if ( pWin->InsideVisibleRange(nStartCol, nStartRow) && 
pWin->InsideVisibleRange(nEndCol, nEndRow) )
+{
+if ( nCount == ::std::numeric_limits::max() )
+{
+switch( eDir )
+{
+case FILL_TO_BOTTOM:
+for ( SCCOL nColItr = nStartCol; nColItr <= nEndCol; 
++nColItr )
+{
+const std::vector* pRanges = 
pWin->GetAutoSpellData(nColItr, nStartRow);
+if ( !pRanges )
+continue;
+for ( SCROW nRowItr = nStartRow + 1; nRowItr <= 
nEndRow; ++nRowItr )
+pWin->SetAutoSpellData(nColItr, nRowItr, pRanges);

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svx/uiconfig

2015-05-05 Thread Caolán McNamara

 svx/uiconfig/ui/sidebararea.ui |   31 ++-
 1 file changed, 10 insertions(+), 21 deletions(-)

New commits:
commit 921f69baa078dfd2b96004880538a22306a06367
Author: CaolÃ¡n McNamara 
Date:   Tue May 5 13:31:29 2015 +0100

use a sizegroup to stop area panel 'jumping'

toolbox and lists are a little different in height naturally causing a 
little
jump in layout on toggling between color and anything else

Change-Id: I0b2ab92ab2fb5bec7d7fecc7aeaf15f47781a67b
(cherry picked from commit 7fb784ff2c58f7ad89b0f961fee76e3a363841ff)
Reviewed-on: https://gerrit.libreoffice.org/15637
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index cbea7cb..adad038 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -1,7 +1,8 @@
 
+
 
-  
-  
+  
+  
   
 True
 False
@@ -36,8 +37,6 @@
   
 0
 0
-1
-1
   
 
 
@@ -53,8 +52,6 @@
   
 0
 1
-1
-1
   
 
 
@@ -64,7 +61,6 @@
 True
 
   
-True
 False
 
   
@@ -91,7 +87,6 @@
 
 
   
-False
 False
 True
 Select 
the effect to apply.
@@ -107,8 +102,6 @@
   
 1
 1
-1
-1
   
 
 
@@ -126,8 +119,6 @@
   
 0
 2
-1
-1
   
 
 
@@ -137,8 +128,6 @@
 True
 Select the 
type of transparency to apply.
 Select the 
type of transparency to apply.
-0
-1
 
   None
   Solid
@@ -153,8 +142,6 @@
   
 0
 3
-1
-1
   
 
 
@@ -198,7 +185,6 @@
 True
 100
 â¢
-True
 False
 5
 True
@@ -213,8 +199,6 @@
   
 1
 3
-1
-1
   
 
 
@@ -234,9 +218,14 @@
   
 0
 0
-1
-1
   
 
   
+  
+both
+
+  
+  
+
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Matteo Casalin

 sw/source/core/unocore/unostyle.cxx |   23 +++--
 sw/source/core/unocore/unotbl.cxx   |   38 ++--
 sw/source/core/view/viewsh.cxx  |6 ++---
 sw/source/core/view/vprint.cxx  |2 -
 sw/source/filter/basflt/fltini.cxx  |6 ++---
 sw/source/filter/basflt/shellio.cxx |4 +--
 6 files changed, 40 insertions(+), 39 deletions(-)

New commits:
commit 1848430d614e0f2f52e288363d0367c9207b0802
Author: Matteo Casalin 
Date:   Tue May 5 22:45:29 2015 +0200

Use more proper integer types

Change-Id: If1515df57cd90451f2c912bf5c268fec8688c063

diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 4911902..cde2dcf 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -438,14 +438,15 @@ static bool lcl_GetHeaderFooterItem(
 }
 
 static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc,
-SfxStyleFamily eFamily, OUString *pString, sal_uInt16 nIndex = USHRT_MAX)
+SfxStyleFamily eFamily, OUString *pString, sal_Int32 nIndex = 
SAL_MAX_INT32)
 {
 sal_Int32 nCount = 0;
 switch( eFamily )
 {
 case SFX_STYLE_FAMILY_CHAR:
 {
-sal_uInt16 nBaseCount =  RES_POOLCHR_HTML_END - 
RES_POOLCHR_HTML_BEGIN  +
+const sal_Int32 nBaseCount =
+ RES_POOLCHR_HTML_END - 
RES_POOLCHR_HTML_BEGIN  +
  RES_POOLCHR_NORMAL_END - 
RES_POOLCHR_NORMAL_BEGIN;
 nIndex = nIndex - nBaseCount;
 const size_t nArrLen = rDoc.GetCharFmts()->size();
@@ -474,7 +475,8 @@ static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc,
 break;
 case SFX_STYLE_FAMILY_PARA:
 {
-sal_uInt16 nBaseCount = RES_POOLCOLL_HTML_END - 
RES_POOLCOLL_HTML_BEGIN +
+const sal_Int32 nBaseCount =
+RES_POOLCOLL_HTML_END - 
RES_POOLCOLL_HTML_BEGIN +
 RES_POOLCOLL_DOC_END - 
RES_POOLCOLL_DOC_BEGIN +
 RES_POOLCOLL_REGISTER_END - 
RES_POOLCOLL_REGISTER_BEGIN +
 RES_POOLCOLL_EXTRA_END - 
RES_POOLCOLL_EXTRA_BEGIN +
@@ -502,7 +504,7 @@ static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc,
 break;
 case SFX_STYLE_FAMILY_FRAME:
 {
-sal_uInt16 nBaseCount = RES_POOLFRM_END - RES_POOLFRM_BEGIN;
+const sal_Int32 nBaseCount = RES_POOLFRM_END - RES_POOLFRM_BEGIN;
 nIndex = nIndex - nBaseCount;
 const size_t nArrLen = rDoc.GetFrmFmts()->size();
 for( size_t i = 0; i < nArrLen; ++i )
@@ -525,7 +527,7 @@ static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc,
 break;
 case SFX_STYLE_FAMILY_PAGE:
 {
-sal_uInt16 nBaseCount = RES_POOLPAGE_END - RES_POOLPAGE_BEGIN;
+const sal_Int32 nBaseCount = RES_POOLPAGE_END - RES_POOLPAGE_BEGIN;
 nIndex = nIndex - nBaseCount;
 const sal_uInt16 nArrLen = rDoc.GetPageDescCnt();
 for(sal_uInt16 i = 0; i < nArrLen; ++i)
@@ -547,7 +549,7 @@ static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc,
 break;
 case SFX_STYLE_FAMILY_PSEUDO:
 {
-sal_uInt16 nBaseCount = RES_POOLNUMRULE_END - 
RES_POOLNUMRULE_BEGIN;
+const sal_Int32 nBaseCount = RES_POOLNUMRULE_END - 
RES_POOLNUMRULE_BEGIN;
 nIndex = nIndex - nBaseCount;
 const SwNumRuleTbl& rNumTbl = rDoc.GetNumRuleTbl();
 for(size_t i = 0; i < rNumTbl.size(); ++i)
@@ -581,14 +583,13 @@ sal_Int32 SwXStyleFamily::getCount() throw( 
uno::RuntimeException, std::exceptio
 return lcl_GetCountOrName ( *pDocShell->GetDoc(), eFamily, NULL );
 }
 
-uno::Any SwXStyleFamily::getByIndex(sal_Int32 nTempIndex)
+uno::Any SwXStyleFamily::getByIndex(sal_Int32 nIndex)
 throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, 
uno::RuntimeException, std::exception )
 {
 SolarMutexGuard aGuard;
 uno::Any aRet;
-if ( nTempIndex >= 0 && nTempIndex < USHRT_MAX )
+if ( nIndex >= 0 )
 {
-sal_uInt16 nIndex = static_cast < sal_uInt16 > ( nTempIndex );
 if(pBasePool)
 {
 OUString sStyleName;
@@ -1065,7 +1066,7 @@ SwStyleProperties_Impl::~SwStyleProperties_Impl()
 
 bool SwStyleProperties_Impl::SetProperty(const OUString& rName, const 
uno::Any& rVal)
 {
-sal_uInt16 nPos = 0;
+sal_uInt32 nPos = 0;
 bool bRet = false;
 PropertyEntryVector_t::const_iterator aIt = aPropertyEntries.begin();
 while( aIt != aPropertyEntries.end() )
@@ -2250,7 +2251,7 @@ void SAL_CALL SwXStyle::SetPropertyValues_Impl(
 throw uno::RuntimeException();
 }
 
-for(sal_Int16 nProp = 0; nProp < rPropertyNames.getLength(); nProp++)
+for(sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); ++nProp)
 {
 const SfxItemPropertySimpleEnt

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

2015-05-05 Thread Julien Nabet

 i18npool/source/localedata/data/es_CR.xml |   42 ++
 1 file changed, 32 insertions(+), 10 deletions(-)

New commits:
commit 021943dad044076c10b9b032d4e0b243e64f631c
Author: Julien Nabet 
Date:   Sat May 2 10:30:19 2015 +0200

tdf#91009: Correct thousands separator character for locale es_CR

Thanks to Severo Raz for having indicated this link:

http://es.wikipedia.org/wiki/Wikipedia_discusi%C3%B3n:Manual_de_estilo/N%C3%BAmeros#Costa_Rica

(cherry picked from commit 78ef368b8ca6fb53b67330c305f8c2c581cbf68e)

Related tdf#91009: Correct thousands separator character for locale es_CR

Reviewed-on: https://gerrit.libreoffice.org/15630
Tested-by: Eike Rathke 
Reviewed-by: Eike Rathke 
(cherry picked from commit aa06ce15fdd68983001ef33d1931fbaf6b515282)

cf080bb9f21ef75487d43d8a582625be512968c4

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

diff --git a/i18npool/source/localedata/data/es_CR.xml 
b/i18npool/source/localedata/data/es_CR.xml
index ff0d73a..c048257 100644
--- a/i18npool/source/localedata/data/es_CR.xml
+++ b/i18npool/source/localedata/data/es_CR.xml
@@ -28,7 +28,29 @@
   Costa Rica
 
   
-  
+  
+
+  /
+  Â 
+  ,
+  :
+  ,
+  ;
+  , 
+   de 
+   de 
+   
+
+
+  â
+  â
+  â
+  â
+
+AM
+PM
+metric
+  
   
 D/M
 
@@ -134,31 +156,31 @@
   0,00
 
 
-  #.##0
+  #Â ##0
 
 
-  #.##0,00
+  #Â ##0,00
 
 
-  #.###,00
+  #Â ###,00
 
 
-  [$â¡-140A] #.##0;-[$â¡-140A] #.##0
+  [$â¡-140A] #Â ##0;-[$â¡-140A] #Â ##0
 
 
-  [$â¡-140A] #.##0,00;-[$â¡-140A] #.##0,00
+  [$â¡-140A] #Â ##0,00;-[$â¡-140A] #Â ##0,00
 
 
-  [$â¡-140A] #.##0;[RED]-[$â¡-140A] #.##0
+  [$â¡-140A] #Â ##0;[RED]-[$â¡-140A] #Â ##0
 
 
-  [$â¡-140A] #.##0,00;[RED]-[$â¡-140A] #.##0,00
+  [$â¡-140A] #Â ##0,00;[RED]-[$â¡-140A] #Â 
##0,00
 
 
-  #.##0,00 CCC
+  #Â ##0,00 CCC
 
 
-  [$â¡-140A] #.##0,--;[RED]-[$â¡-140A] #.##0,--
+  [$â¡-140A] #Â ##0,--;[RED]-[$â¡-140A] #Â 
##0,--
 
 
   0%
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Michael Stahl

 sw/source/core/doc/DocumentRedlineManager.cxx |   40 --
 sw/source/core/docnode/ndtbl.cxx  |   28 ++
 sw/source/core/unocore/unotext.cxx|7 
 3 files changed, 54 insertions(+), 21 deletions(-)

New commits:
commit 6a37faafa545ccf0b242d4f3b179dcbe710a2814
Author: Michael Stahl 
Date:   Tue May 5 23:30:00 2015 +0200

sw: make SplitRedline() a little more readable

Change-Id: Icd99c8d98ae4c5cd6c6552a929c28ad0f096c214

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index eda5205..5659a96 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1823,59 +1823,57 @@ bool DocumentRedlineManager::SplitRedline( const SwPaM& 
rRange )
 {
 bool bChg = false;
 sal_uInt16 n = 0;
-const SwPosition* pStt = rRange.Start(),
-  * pEnd = pStt == rRange.GetPoint() ? rRange.GetMark()
- : rRange.GetPoint();
+const SwPosition* pStt = rRange.Start();
+const SwPosition* pEnd = rRange.End();
 GetRedline( *pStt, &n );
-for( ; n < mpRedlineTbl->size() ; ++n )
+for ( ; n < mpRedlineTbl->size(); ++n)
 {
-SwRangeRedline* pTmp = (*mpRedlineTbl)[ n ];
-SwPosition* pTStt = pTmp->Start(),
-  * pTEnd = pTStt == pTmp->GetPoint() ? pTmp->GetMark()
-  : pTmp->GetPoint();
-if( *pTStt <= *pStt && *pStt <= *pTEnd &&
-*pTStt <= *pEnd && *pEnd <= *pTEnd )
+SwRangeRedline * pRedline = (*mpRedlineTbl)[ n ];
+SwPosition *const pRedlineStart = pRedline->Start();
+SwPosition *const pRedlineEnd = pRedline->End();
+if (*pRedlineStart <= *pStt && *pStt <= *pRedlineEnd &&
+*pRedlineStart <= *pEnd && *pEnd <= *pRedlineEnd)
 {
 bChg = true;
 int nn = 0;
-if( *pStt == *pTStt )
+if (*pStt == *pRedlineStart)
 nn += 1;
-if( *pEnd == *pTEnd )
+if (*pEnd == *pRedlineEnd)
 nn += 2;
 
 SwRangeRedline* pNew = 0;
 switch( nn )
 {
 case 0:
-pNew = new SwRangeRedline( *pTmp );
-pTmp->SetEnd( *pStt, pTEnd );
+pNew = new SwRangeRedline( *pRedline );
+pRedline->SetEnd( *pStt, pRedlineEnd );
 pNew->SetStart( *pEnd );
 break;
 
 case 1:
-*pTStt = *pEnd;
+*pRedlineStart = *pEnd;
 break;
 
 case 2:
-*pTEnd = *pStt;
+*pRedlineEnd = *pStt;
 break;
 
 case 3:
-pTmp->InvalidateRange();
+pRedline->InvalidateRange();
 mpRedlineTbl->DeleteAndDestroy( n-- );
-pTmp = 0;
+pRedline = nullptr;
 break;
 }
-if( pTmp && !pTmp->HasValidRange() )
+if (pRedline && !pRedline->HasValidRange())
 {
 // re-insert
 mpRedlineTbl->Remove( n );
-mpRedlineTbl->Insert( pTmp, n );
+mpRedlineTbl->Insert( pRedline, n );
 }
 if( pNew )
 mpRedlineTbl->Insert( pNew, n );
 }
-else if( *pEnd < *pTStt )
+else if (*pEnd < *pRedlineStart)
 break;
 }
 return bChg;
commit c4cf85766453982f1aa94a7f2cb22af19ed100be
Author: Michael Stahl 
Date:   Tue May 5 23:15:20 2015 +0200

sw: fix crash due to redlines on tables on ooo121112-2.docx

Problem is that after import there are SwRangeRedline that start in the
first cell of a table and end in the paragraph following the table.

There are  elements covering every individual paragraph in the
table; all of these are merged into one SwRangeRedline.

This could possibly be fixed in writerfilter by buffering the
m_pParaMarkerRedline until after convertToTable() to prevent the
merging, but perhaps it's better to fix it in SwXText::convertToTable().

Change-Id: I853ae624fffedb59a48bd90decb0973bf33beb68

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 208aefc..fe562d5 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1172,12 +1172,40 @@ const SwTable* SwDoc::TextToTable( const std::vector< 
std::vector >
 ++aRg.aEnd;
 }
 
+assert(aRg.aEnd == pEnd->nNode);
+assert(aRg.aStart == pStt->nNode);
 if( aRg.aEnd.GetIndex() == aRg.aStart.GetIndex() )
 {
 OSL_FAIL( "empty range" );
 ++aRg.aEnd;
 }
 
+
+{
+// TODO: this is not Undo-able - only good enough for file import
+IDocumentRedli

[Libreoffice-commits] core.git: Branch 'feature/rendercontext' - 2 commits - include/vcl vcl/source

2015-05-05 Thread Tomaž Vajngerl

 include/vcl/edit.hxx |4 
 include/vcl/menu.hxx |6 
 vcl/source/control/edit.cxx  |  256 +++
 vcl/source/window/menu.cxx   |  205 ++--
 vcl/source/window/menubarwindow.cxx  |  155 +-
 vcl/source/window/menubarwindow.hxx  |2 
 vcl/source/window/menufloatingwindow.cxx |  143 -
 vcl/source/window/menufloatingwindow.hxx |4 
 8 files changed, 372 insertions(+), 403 deletions(-)

New commits:
commit 0aec75d301b2d3d260efef2ff18b249383097dbc
Author: TomaÅ¾ Vajngerl 
Date:   Wed May 6 07:57:01 2015 +0900

Tackle Menu with RenderContext refactoring, Invalidate

Change-Id: Ib2812723141c5dfe39b30c95f12d1aeca9c367bd

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 32dfd5a..2227b91 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -165,7 +165,7 @@ protected:
 SAL_DLLPRIVATE sal_uInt16   ImplGetFirstVisible() const;
 SAL_DLLPRIVATE sal_uInt16   ImplGetPrevVisible( sal_uInt16 nPos ) 
const;
 SAL_DLLPRIVATE sal_uInt16   ImplGetNextVisible( sal_uInt16 nPos ) 
const;
-SAL_DLLPRIVATE void ImplPaint( vcl::Window* pWin, sal_uInt16 
nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, bool bHighlighted = 
false, bool bLayout = false, bool bRollover = false ) const;
+SAL_DLLPRIVATE void ImplPaint(vcl::RenderContext& 
rRenderContext, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly 
= 0, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) 
const;
 SAL_DLLPRIVATE void ImplSelect();
 SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 
nHighlightItem );
 SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, 
sal_uInt16 nPos );
@@ -178,11 +178,11 @@ protected:
 
 // returns native check and option menu symbol height in rCheckHeight and 
rRadioHeight
 // return value is maximum width and height of checkboxes and radiobuttons
-SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize( const 
vcl::Window*, long& rCheckHeight, long& rRadioHeight ) const;
+SAL_DLLPRIVATE Size 
ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, long& 
rCheckHeight, long& rRadioHeight) const;
 
 // returns native submenu arrow size and spacing from right border
 // return value is whether it's supported natively
-SAL_DLLPRIVATE bool ImplGetNativeSubmenuArrowSize( vcl::Window* 
pWin, Size& rArrowSize, long& rArrowSpacing ) const;
+SAL_DLLPRIVATE bool 
ImplGetNativeSubmenuArrowSize(vcl::RenderContext& rRenderContext, Size& 
rArrowSize, long& rArrowSpacing ) const;
 
 SAL_DLLPRIVATE voidImplAddDel( ImplMenuDelData &rDel );
 SAL_DLLPRIVATE voidImplRemoveDel( ImplMenuDelData &rDel );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e972321..a230cdc 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1393,7 +1393,7 @@ void Menu::SetAccessible( const 
::com::sun::star::uno::Reference< ::com::sun::st
 mxAccessible = rxAccessible;
 }
 
-Size Menu::ImplGetNativeCheckAndRadioSize( const vcl::Window* pWin, long& 
rCheckHeight, long& rRadioHeight ) const
+Size Menu::ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, 
long& rCheckHeight, long& rRadioHeight) const
 {
 long nCheckWidth = 0, nRadioWidth = 0;
 rCheckHeight = rRadioHeight = 0;
@@ -1405,32 +1405,21 @@ Size Menu::ImplGetNativeCheckAndRadioSize( const 
vcl::Window* pWin, long& rCheck
 Rectangle aNativeContent;
 Point tmp( 0, 0 );
 Rectangle aCtrlRegion( Rectangle( tmp, Size( 100, 15 ) ) );
-if( pWin->IsNativeControlSupported( CTRL_MENU_POPUP, 
PART_MENU_ITEM_CHECK_MARK ) )
+if (rRenderContext.IsNativeControlSupported(CTRL_MENU_POPUP, 
PART_MENU_ITEM_CHECK_MARK) )
 {
-if( pWin->GetNativeControlRegion( ControlType(CTRL_MENU_POPUP),
-  
ControlPart(PART_MENU_ITEM_CHECK_MARK),
-  aCtrlRegion,
-  
ControlState(ControlState::ENABLED),
-  aVal,
-  OUString(),
-  aNativeBounds,
-  aNativeContent )
-)
+if 
(rRenderContext.GetNativeControlRegion(ControlType(CTRL_MENU_POPUP), 
ControlPart(PART_MENU_ITEM_CHECK_MARK),
+  aCtrlRegion, 
ControlState(ControlState::ENABLED), aVal, OUString(),
+  aNativeBounds, 
aNativeContent))
 {
 rCheckHeight = aNativ

LibreOffice Gerrit News for core on 2015-05-06

2015-05-05 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ tdf#91066: Condensed Character Spacing i.e spc(negative value) is not exp
  in https://gerrit.libreoffice.org/15635 from Yogesh Bharate
  about module oox, sc
+ Breeze: update will sync with the svg plasma-next-icons git repository
  in https://gerrit.libreoffice.org/15564 from Andreas Kainz
  about module icon-themes
+ tdf#90905 fix for url encoding in internal urls
  in https://gerrit.libreoffice.org/15625 from Vasily Melenchuk
  about module sw
+ tdf#90190 PPTX table cell border width is not exported.
  in https://gerrit.libreoffice.org/15350 from Yogesh Bharate
  about module include, oox, sd
+ tdf#74299: improve DXF import
  in https://gerrit.libreoffice.org/15627 from Mike Kaganski
  about module filter
+ Resolves tdf#83365 Other: Access across spreadsheet returns Err:504
  in https://gerrit.libreoffice.org/15363 from Henry Castro
  about module sc
+ tdf#90494: Change gradient angle diagonally by choosing option.
  in https://gerrit.libreoffice.org/15180 from Heena Gupta
  about module cui
+ tdf#90174 FILESAVE: export of bullet color for pptx
  in https://gerrit.libreoffice.org/15169 from Priyanka Gaikwad
  about module oox, sd
+ tdf#90672: PPTX table cell border color is not exported.
  in https://gerrit.libreoffice.org/15364 from Yogesh Bharate
  about module oox, sd
 End of freshness 

+ tdf#90994 Sidebar tab bar buttons should should have accessible names
  in https://gerrit.libreoffice.org/15639 from Niklas Johansson
  about module sfx2
+ editing/experimental mode as user-preference (Android Viewer)
  in https://gerrit.libreoffice.org/15638 from Christian Lohmaier
  about module android
+ tdf#90258 Sidebar: toggle Thousand/Engineering
  in https://gerrit.libreoffice.org/15609 from Laurent BP
  about module include, sc
+ tdf#90258 Toggle Thousand Separator with Engineering Notation
  in https://gerrit.libreoffice.org/15606 from Laurent BP
  about module cui, include, svl, svx
+ tdf#90994 The accessible name should not contain the accessible role
  in https://gerrit.libreoffice.org/15636 from Niklas Johansson
  about module sfx2


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

+ fdo#77985 make calc function NETWORKDAYS comply with ODFF1.2
  in https://gerrit.libreoffice.org/9827 from Winfried Donkers
+ Resolves tdf#84240 : Red squiggly underline does not appear instantly
  in https://gerrit.libreoffice.org/14872 from Deena Francis
+ Avoid redefine of TRANSPARENT on solaris after including stream.h
  in https://gerrit.libreoffice.org/15361 from Richard PALO
+ Related tdf#91009: Correct thousands separator character for locale es_CR
  in https://gerrit.libreoffice.org/15630 from Julien Nabet
+ tdf#91081 Fix LO crash after dialog closing by ESC
  in https://gerrit.libreoffice.org/15626 from Philippe Jung
+ Use typed Timer::SetTimeoutHdl Link
  in https://gerrit.libreoffice.org/15634 from Stephan Bergmann
+ loplugin:staticmethods
  in https://gerrit.libreoffice.org/15511 from Noel Grandin
+ loplugin:staticmethods
  in https://gerrit.libreoffice.org/15512 from Noel Grandin
+ loplugin:staticmethods
  in https://gerrit.libreoffice.org/15513 from Noel Grandin
+ loplugin:staticmethods
  in https://gerrit.libreoffice.org/15516 from Noel Grandin
+ loplugin:staticmethods
  in https://gerrit.libreoffice.org/15517 from Noel Grandin
+ loplugin:staticmethods
  in https://gerrit.libreoffice.org/15518 from Noel Grandin
+ seed mt19937 with random data
  in https://gerrit.libreoffice.org/15591 from Norbert Thiebaud
+ tdf#34555 add crop features to sw
  in https://gerrit.libreoffice.org/15590 from Philippe Jung
+ tdf#34555 add to scalc: crop, change img, save img, edit with ext tools
  in https://gerrit.libreoffice.org/15589 from Philippe Jung
+ tdf#34555 add crop features to svx
  in https://gerrit.libreoffice.org/15588 from Philippe Jung
+ prefer OUStringBuffer to concatenating OUString in a loop
  in https://gerrit.libreoffice.org/15582 from Takeshi Abe
+ tdf#90539 special case for EMF placeholder icon of OLE object
  in https://gerrit.libreoffice.org/15632 from Andras Timar
+ typo: strech -> stretch
  in https://gerrit.libreoffice.org/15628 from Andras Timar


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

+ fdo#50950 make Calc functions (ISO)WEEKNUM comply with ODFF1.2
  in https://gerrit.libreoffice.org/12089 from Winfried Donkers
+ convert SFX_STYLESHEET_ constants to scoped enum
  in https://gerrit.libreoffice.org/15346 from Noel Grandin
+ convert SVX_SEARCHIN_ flags to scoped enum
  in https://gerrit.libreoffice.org/15347 from Noel Grandin
+ convert BROWSER_ constants to scoped enum
  in https://gerrit.libreoffice.org/15348 from Noel Grandin
+ convert BorderWidth flags to scoped enum
  in https://gerrit.libreoffice.org/15398 from Noel Grandin
+ convert FONTLIST_FONTNAMETYPE constants to scoped enum
  in https:

[Bug 75025] LibreOffice 4.3 most annoying bugs

2015-05-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=75025

Joel Madero  changed:

   What|Removed |Added

 Depends on||91078

-- 
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 75025] LibreOffice 4.3 most annoying bugs

2015-05-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=75025

--- Comment #109 from Joel Madero  ---
Added bug 91078 - regression + bibisected

Deleting a sheet that has no relationship to formulas on other sheets ruins the
formulas on those sheets. Simple test document attached.

-- 
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: sc/source

2015-05-05 Thread Stephan Bergmann

 sc/source/filter/starcalc/scflt.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f593be5bcde09965bb3478e00bcdedbc6bd5bc57
Author: Stephan Bergmann 
Date:   Wed May 6 08:17:32 2015 +0200

SfxBoolItem takes a sal_uInt16 nWhich as first argument

This code was like that ever since 9ae5a91f7955e44d3b24a3f7741f9bca02ac7f24
"initial import."  From the surrounding code, the best bet appears to be
ATTR_LINEBREAK?

Change-Id: Id0e3346f2f9bb9c00c202003d06c2518dea38112

diff --git a/sc/source/filter/starcalc/scflt.cxx 
b/sc/source/filter/starcalc/scflt.cxx
index 682eb20..b21f9a4 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1189,7 +1189,7 @@ void Sc10Import::LoadPatternCollection()
 }
 
 if( ( OJustify & ojWordBreak ) == ojWordBreak )
-rItemSet.Put( SfxBoolItem( sal_True ) );
+rItemSet.Put( SfxBoolItem( ATTR_LINEBREAK, true ) );
 if( ( OJustify & ojBottomTop ) == ojBottomTop )
 rItemSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 9000 ) );
 else if( ( OJustify & ojTopBottom ) == ojTopBottom )
@@ -1830,7 +1830,7 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
 }
 
 if (OJustify & ojWordBreak)
-aScPattern.GetItemSet().Put(SfxBoolItem(sal_True));
+aScPattern.GetItemSet().Put(SfxBoolItem(ATTR_LINEBREAK, true));
 if (OJustify & ojBottomTop)
 
aScPattern.GetItemSet().Put(SfxInt32Item(ATTR_ROTATE_VALUE,9000));
 else if (OJustify & ojTopBottom)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - avmedia/inc avmedia/source chart2/source cui/source dbaccess/source extensions/source framework/inc framework/source include/sfx2 include/svx include/vcl re

2015-05-05 Thread Stephan Bergmann

 avmedia/inc/mediacontrol.hxx|2 
 avmedia/source/framework/mediacontrol.cxx   |4 -
 chart2/source/controller/dialogs/dlg_DataEditor.cxx |4 -
 chart2/source/controller/inc/dlg_DataEditor.hxx |2 
 cui/source/customize/cfg.cxx|4 -
 cui/source/inc/cfg.hxx  |2 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx  |3 
 dbaccess/source/ui/app/AppDetailPageHelper.hxx  |2 
 dbaccess/source/ui/dlg/indexdialog.cxx  |4 -
 dbaccess/source/ui/inc/indexdialog.hxx  |2 
 extensions/source/bibliography/toolbar.cxx  |3 
 extensions/source/bibliography/toolbar.hxx  |2 
 framework/inc/uielement/addonstoolbarmanager.hxx|   10 +-
 framework/inc/uielement/toolbarmanager.hxx  |   12 +--
 framework/source/uielement/addonstoolbarmanager.cxx |   30 ++--
 framework/source/uielement/toolbarmanager.cxx   |   43 ---
 include/sfx2/sidebar/SidebarToolBox.hxx |   12 +--
 include/sfx2/templatedlg.hxx|8 +-
 include/sfx2/titledockwin.hxx   |6 -
 include/svx/fontwork.hxx|6 -
 include/svx/imapdlg.hxx |2 
 include/vcl/toolbox.hxx |   29 +++
 reportdesign/source/ui/dlg/AddField.cxx |3 
 reportdesign/source/ui/dlg/Condition.cxx|7 -
 reportdesign/source/ui/dlg/Condition.hxx|4 -
 reportdesign/source/ui/dlg/GroupsSorting.cxx|3 
 reportdesign/source/ui/inc/AddField.hxx |2 
 reportdesign/source/ui/inc/GroupsSorting.hxx|2 
 sc/source/ui/inc/navipi.hxx |2 
 sc/source/ui/navipi/navipi.cxx  |4 -
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx|   11 +-
 sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx|4 -
 sc/source/ui/sidebar/CellBorderStyleControl.cxx |   18 +---
 sc/source/ui/sidebar/CellBorderStyleControl.hxx |6 -
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx  |6 -
 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx  |2 
 sd/source/ui/dlg/navigatr.cxx   |   12 +--
 sd/source/ui/inc/navigatr.hxx   |6 -
 sfx2/source/appl/newhelp.cxx|4 -
 sfx2/source/appl/newhelp.hxx|4 -
 sfx2/source/dialog/recfloat.cxx |4 -
 sfx2/source/dialog/taskpane.cxx |6 -
 sfx2/source/dialog/templdlg.cxx |   11 +-
 sfx2/source/dialog/titledockwin.cxx |6 -
 sfx2/source/doc/templatedlg.cxx |   16 +---
 sfx2/source/inc/recfloat.hxx|2 
 sfx2/source/inc/templdgi.hxx|6 -
 sfx2/source/sidebar/SidebarToolBox.cxx  |   45 
 sfx2/source/sidebar/TitleBar.cxx|4 -
 sfx2/source/sidebar/TitleBar.hxx|2 
 starmath/inc/toolbox.hxx|4 -
 starmath/source/toolbox.cxx |6 -
 svx/inc/galbrws2.hxx|2 
 svx/source/dialog/_bmpmask.cxx  |6 -
 svx/source/dialog/_contdlg.cxx  |4 -
 svx/source/dialog/contimp.hxx   |2 
 svx/source/dialog/fontwork.cxx  |9 --
 svx/source/dialog/imapdlg.cxx   |4 -
 svx/source/form/datanavi.cxx|3 
 svx/source/gallery2/galbrws2.cxx|4 -
 svx/source/inc/datanavi.hxx |2 
 svx/source/sidebar/area/AreaPropertyPanel.cxx   |   10 +-
 svx/source/sidebar/area/AreaPropertyPanel.hxx   |2 
 svx/source/sidebar/area/AreaTransparencyGradientControl.cxx |   12 +--
 svx/source/sidebar/area/AreaTransparencyGradientControl.hxx |4 -
 svx/source/sidebar/line/LinePropertyPanel.cxx   |9 +-
 svx/source/sidebar/line/LinePropertyPanel.hxx   |2 
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx  |   14 +--
 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx  |4 -
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |4 -
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |

[Libreoffice-commits] core.git: Branch 'feature/rendercontext' - 6 commits - basctl/source include/vcl sw/source vcl/source

2015-05-05 Thread Tomaž Vajngerl

 basctl/source/basicide/baside2b.cxx |6 -
 include/vcl/slider.hxx  |9 +
 include/vcl/spin.h  |   14 +-
 include/vcl/tabctrl.hxx |6 -
 include/vcl/textview.hxx|   17 +--
 include/vcl/toolbox.hxx |   10 +-
 sw/source/uibase/docvw/srcedtw.cxx  |4 
 vcl/source/app/help.cxx |   36 +++
 vcl/source/control/slider.cxx   |  166 +++--
 vcl/source/control/spinbtn.cxx  |   18 +--
 vcl/source/control/spinfld.cxx  |  154 +++---
 vcl/source/control/tabctrl.cxx  |  179 ++--
 vcl/source/edit/texteng.cxx |5 -
 vcl/source/edit/textview.cxx|   86 -
 vcl/source/edit/vclmedit.cxx|6 -
 vcl/source/window/toolbox.cxx   |2 
 16 files changed, 368 insertions(+), 350 deletions(-)

New commits:
commit 4d69a3fec28a4d35d9c09b6e0feee80dfbc2aaaf
Author: TomaÅ¾ Vajngerl 
Date:   Wed May 6 15:49:16 2015 +0900

refactor "TextEdit" & co. to use RenderContext

Change-Id: Ib26ecb9640d23714acec73304f26e2fd6af90ed4

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 6cbaaf5..d805646 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -915,12 +915,12 @@ void EditorWindow::SetupAndShowCodeCompleteWnd( const 
std::vector< OUString >& a
 pEditView->GetWindow()->GrabFocus();
 }
 
-void EditorWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const 
Rectangle& rRect )
+void EditorWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& 
rRect)
 {
-if ( !pEditEngine ) // We need it now at latest
+if (!pEditEngine) // We need it now at latest
 CreateEditEngine();
 
-pEditView->Paint( rRect );
+pEditView->Paint(rRenderContext, rRect);
 }
 
 void EditorWindow::LoseFocus()
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index baf97a9..721c0c0 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -25,10 +25,11 @@
 #include 
 #include 
 #include 
+#include 
 
 class TextEngine;
 class OutputDevice;
-namespace vcl { class Window; }
+
 class KeyEvent;
 class MouseEvent;
 class CommandEvent;
@@ -37,11 +38,7 @@ class SelectionEngine;
 class VirtualDevice;
 struct TextDDInfo;
 
-namespace com {
-namespace sun {
-namespace star {
-namespace datatransfer {
-namespace clipboard {
+namespace com { namespace sun { namespace star { namespace datatransfer { 
namespace clipboard {
 class XClipboard;
 }
 
@@ -72,8 +69,8 @@ protected:
 voidImpSetSelection( const TextSelection& rNewSel, bool 
bUI );
 boolIsInSelection( const TextPaM& rPaM );
 
-voidImpPaint( OutputDevice* pOut, const Point& rStartPos, 
Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, 
TextSelection const* pSelection = 0 );
-voidImpPaint( const Rectangle& rRect, bool bUseVirtDev );
+voidImpPaint(vcl::RenderContext& rRenderContext, const 
Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange 
= 0, TextSelection const* pSelection = 0);
+voidImpPaint(vcl::RenderContext& rRenderContext, const 
Rectangle& rRect, bool bUseVirtDev);
 voidImpShowCursor( bool bGotoCursor, bool bForceVisCursor, 
bool bEndKey );
 voidImpHighlight( const TextSelection& rSel );
 voidImpSetSelection( const TextSelection& rSelection );
@@ -127,8 +124,8 @@ public:
 
 voidInsertText( const OUString& rNew, bool bSelect = false 
);
 
-boolKeyInput( const KeyEvent& rKeyEvent );
-voidPaint( const Rectangle& rRect );
+boolKeyInput( const KeyEvent& rKeyEvent );
+voidPaint(vcl::RenderContext& rRenderContext, const 
Rectangle& rRect);
 voidMouseButtonUp( const MouseEvent& rMouseEvent );
 voidMouseButtonDown( const MouseEvent& rMouseEvent );
 voidMouseMove( const MouseEvent& rMouseEvent );
diff --git a/sw/source/uibase/docvw/srcedtw.cxx 
b/sw/source/uibase/docvw/srcedtw.cxx
index cd66ace..2e42082 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -479,9 +479,9 @@ void  TextViewOutWin::KeyInput( const KeyEvent& rKEvt )
 }
 }
 
-void  TextViewOutWin::Paint( vcl::RenderContext& /*rRenderContext*/, const 
Rectangle& rRect )
+void TextViewOutWin::Paint(vcl::RenderContext& rRenderContext, const 
Rectangle& rRect)
 {
-pTextView->Paint( rRect );
+pTextView->Paint(rRenderContext, rRect);
 }
 
 void SwSrcEditWindow::CreateTextEngine()
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 235dd13..86a7173 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@

Re: About removing "include "

2015-05-05 Thread Tor Lillqvist

>  (Though it is unclear to me how much removing redundant includes of
> standard headers actually helps"accelerating compile times" in practice.)
>

Exactly.  One should also keep in mind that the slowest compilation is on
Windows (isn't it?), and there we use precompiled headers for the largest
subdirectories. Any timings of the effect of such cleanup work should be
done on Windows.

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

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

2015-05-05 Thread Miklos Vajna

 sw/source/filter/ww8/rtfsdrexport.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit b60142af8c3adce35e2c158e14815b1226a97fc2
Author: Miklos Vajna 
Date:   Tue May 5 09:04:26 2015 +0200

RtfSdrExport::StartShape: use std::unique_ptr<>

Change-Id: I236d7d951bae8c40d2caaa5ecd6dfd669f8ea982

diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx 
b/sw/source/filter/ww8/rtfsdrexport.cxx
index 58b82f3..50a 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -521,7 +521,7 @@ sal_Int32 RtfSdrExport::StartShape()
 if (pTxtObj)
 {
 const OutlinerParaObject* pParaObj = 0;
-bool bOwnParaObj = false;
+std::unique_ptr pOwnedParaObj;
 
 /*
 #i13885#
@@ -530,8 +530,8 @@ sal_Int32 RtfSdrExport::StartShape()
 */
 if (pTxtObj->IsTextEditActive())
 {
-pParaObj = pTxtObj->GetEditOutlinerParaObject();
-bOwnParaObj = true;
+pOwnedParaObj.reset(pTxtObj->GetEditOutlinerParaObject());
+pParaObj = pOwnedParaObj.get();
 }
 else
 {
@@ -542,8 +542,6 @@ sal_Int32 RtfSdrExport::StartShape()
 {
 // this is reached only in case some text is attached to the shape
 WriteOutliner(*pParaObj);
-if (bOwnParaObj)
-delete pParaObj;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Caolán McNamara

 sd/source/ui/sidebar/MasterPageDescriptor.hxx|8 
 sd/source/ui/sidebar/PanelFactory.hxx|2 +-
 sd/source/ui/sidebar/PreviewValueSet.hxx |2 +-
 sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx |2 +-
 sd/source/ui/slideshow/slideshowimpl.cxx |   11 ---
 sw/source/core/text/frmform.cxx  |   13 -
 6 files changed, 7 insertions(+), 31 deletions(-)

New commits:
commit a0fca97eda10778be076c411dfd513e2a38937ae
Author: CaolÃ¡n McNamara 
Date:   Tue May 5 08:11:08 2015 +0100

drop useless temp debugging strings

Change-Id: Iee9c1bd37664188e4dc10b929eb72b6370001417

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 7ad55d7..aa18669 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1873,19 +1873,6 @@ bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
 OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
 "SwTxtFrm::FormatQuick with swapped frame" );
 
-#if OSL_DEBUG_LEVEL > 1
-const OUString aXXX = GetTxtNode()->GetTxt();
-const SwTwips nDbgY = Frm().Top();
-(void)nDbgY;
-// nStopAt allows CV to alter it
-static sal_uInt16 nStopAt = 0;
-if( nStopAt == GetFrmId() )
-{
-int i = GetFrmId();
-(void)i;
-}
-#endif
-
 if( IsEmpty() && FormatEmpty() )
 return true;
 
commit f74ac7c486fd8f0a19a2a76b2b2fcbf45a84b4e4
Author: CaolÃ¡n McNamara 
Date:   Mon May 4 20:57:01 2015 +0100

cppcheck: unreadVariable

since

Start slideshow with the next visible slide

commit 45e4a5ef5347f7e2fe90a0d411e3749f24008c3a
Author: Katarina Behrens 
Date:   Sat Mar 23 20:32:40 2013 +0100

Change-Id: Ib04aac2b223a38dbf46ee8cea3194e116e435eb6

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 28c4a82..d7c2c6d 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -941,17 +941,6 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* 
pPresSettings )
 {
 maPresSettings.mbAll = false;
 }
-else
-{
-bStartWithActualSlide = false;
-}
-}
-}
-else
-{
-if( !pStartPage || pStartPage->GetPageKind() != PK_STANDARD )
-{
-bStartWithActualSlide = false;
 }
 }
 
commit a0791aa295a12439952140a3ac76d42ae2f05886
Author: CaolÃ¡n McNamara 
Date:   Mon May 4 20:52:50 2015 +0100

cppcheck: noExplicitConstructor

Change-Id: I07aaf57291239e30b1600bd1061821b4759b8a0b

diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx 
b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index 7636cf6..a002203 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -204,21 +204,21 @@ public:
 
 class URLComparator { public:
 OUString msURL;
-URLComparator (const OUString& sURL);
+explicit URLComparator (const OUString& sURL);
 bool operator() (const SharedMasterPageDescriptor& rDescriptor);
 };
 class StyleNameComparator { public:
 OUString msStyleName;
-StyleNameComparator (const OUString& sStyleName);
+explicit StyleNameComparator (const OUString& sStyleName);
 bool operator() (const SharedMasterPageDescriptor& rDescriptor);
 };
 class PageObjectComparator { public:
 const SdPage* mpMasterPage;
-PageObjectComparator (const SdPage* pPageObject);
+explicit PageObjectComparator (const SdPage* pPageObject);
 bool operator() (const SharedMasterPageDescriptor& rDescriptor);
 };
 class AllComparator { public:
-AllComparator(const SharedMasterPageDescriptor& rDescriptor);
+explicit AllComparator(const SharedMasterPageDescriptor& rDescriptor);
 bool operator() (const SharedMasterPageDescriptor& rDescriptor);
 private:
 SharedMasterPageDescriptor mpDescriptor;
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx 
b/sd/source/ui/sidebar/PanelFactory.hxx
index 6188e30..654fd9d 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -57,7 +57,7 @@ public:
 const css::uno::Reference& rxFactory);
 static css::uno::Sequence SAL_CALL 
getSupportedServiceNames();
 
-PanelFactory (const css::uno::Reference& 
rxContext);
+explicit PanelFactory (const 
css::uno::Reference& rxContext);
 virtual ~PanelFactory();
 
 virtual void SAL_CALL disposing() SAL_OVERRIDE;
diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx 
b/sd/source/ui/sidebar/PreviewValueSet.hxx
index c8629f6..b48c840 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.hxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.hxx
@@ -30,7 +30,7 @@ class PreviewValueS

[Libreoffice-commits] core.git: Branch 'feature/rendercontext' - 3 commits - cui/source include/vcl vcl/source

2015-05-05 Thread Tomaž Vajngerl

 cui/source/dialogs/hangulhanjadlg.cxx |4 
 include/vcl/button.hxx|   20 -
 include/vcl/status.hxx|   12 
 vcl/source/control/button.cxx |  525 +-
 vcl/source/control/fixed.cxx  |  114 +++
 vcl/source/window/status.cxx  |   34 +-
 6 files changed, 358 insertions(+), 351 deletions(-)

New commits:
commit f0b0510a6aec11c625d474f39562b6f8644c15e6
Author: TomaÅ¾ Vajngerl 
Date:   Tue May 5 16:20:53 2015 +0900

Refactor Buttons to use RenderContext when painting

Change-Id: I4ebecb2bda44319a3590a62a2c113c73c94ba974

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx 
b/cui/source/dialogs/hangulhanjadlg.cxx
index c607375..7414297 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -234,7 +234,7 @@ namespace svx
 }
 
 
-void RubyRadioButton::Paint( vcl::RenderContext& /*rRenderContext*/, const 
Rectangle& )
+void RubyRadioButton::Paint( vcl::RenderContext& rRenderContext, const 
Rectangle& )
 {
 HideFocus();
 
@@ -289,7 +289,7 @@ namespace svx
 aImageLocation.Top() = aPrimaryTextLocation.Top() + ( nTextHeight - 
aImageSize.Height() ) / 2;
 aImageLocation.Bottom() = aImageLocation.Top() + aImageSize.Height();
 SetStateRect( aImageLocation );
-DrawRadioButtonState( );
+DrawRadioButtonState(rRenderContext);
 
 // mouse clicks should be recognized in a rect which is one pixel 
larger in each direction, plus
 // includes the image
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 8fb9ded..392f7a8 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -49,7 +49,7 @@ public:
 SAL_DLLPRIVATE sal_uInt16   ImplGetButtonState() const;
 SAL_DLLPRIVATE sal_uInt16&  ImplGetButtonState();
 SAL_DLLPRIVATE sal_uInt16   ImplGetTextStyle( OUString& rText, WinBits 
nWinStyle, sal_uLong nDrawFlags );
-SAL_DLLPRIVATE void ImplDrawAlignedImage( OutputDevice* pDev, 
Point& rPos, Size& rSize,
+SAL_DLLPRIVATE void ImplDrawAlignedImage(OutputDevice* pDev, 
Point& rPos, Size& rSize,
   bool bLayout, sal_uLong 
nImageSep, sal_uLong nDrawFlags,
   sal_uInt16 nTextStyle, Rectangle 
*pSymbolRect=NULL, bool bAddImageSep = false );
 SAL_DLLPRIVATE void ImplSetFocusRect( const Rectangle 
&rFocusRect );
@@ -121,8 +121,8 @@ protected:
 SAL_DLLPRIVATE voidImplInitPushButtonData();
 SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* 
pPrevWindow, WinBits nStyle );
 SAL_DLLPRIVATE voidImplInitSettings( bool bFont, bool 
bForeground, bool bBackground );
-SAL_DLLPRIVATE voidImplDrawPushButtonContent( OutputDevice* 
pDev, sal_uLong nDrawFlags,
-   const Rectangle& rRect, bool 
bLayout, bool bMenuBtnSep );
+SAL_DLLPRIVATE voidImplDrawPushButtonContent(OutputDevice* 
pDev, sal_uLong nDrawFlags,
+ const Rectangle& 
rRect, bool bLayout, bool bMenuBtnSep);
 SAL_DLLPRIVATE voidImplDrawPushButton(vcl::RenderContext& 
rRenderContext, bool bLayout = false);
 using Button::ImplGetTextStyle;
 SAL_DLLPRIVATE sal_uInt16  ImplGetTextStyle( sal_uLong nDrawFlags 
) const;
@@ -139,8 +139,8 @@ protected:
 using Window::ImplInit;
 public:
 SAL_DLLPRIVATE voidImplSetDefButton( bool bSet );
-SAL_DLLPRIVATE static void ImplDrawPushButtonFrame( vcl::Window* pDev, 
Rectangle& rRect, sal_uInt16 nStyle );
-SAL_DLLPRIVATE static bool ImplHitTestPushButton( vcl::Window* pDev, 
const Point& rPos );
+SAL_DLLPRIVATE voidImplDrawPushButtonFrame(vcl::RenderContext& 
rRenderContext, Rectangle& rRect, sal_uInt16 nStyle);
+SAL_DLLPRIVATE static bool ImplHitTestPushButton(vcl::Window* pDev, 
const Point& rPos);
 SAL_DLLPRIVATE boolImplIsDefButton() const;
 
 protected:
@@ -291,13 +291,12 @@ private:
 SAL_DLLPRIVATE void ImplInitRadioButtonData();
 SAL_DLLPRIVATE WinBits  ImplInitStyle( const vcl::Window* pPrevWindow, 
WinBits nStyle );
 SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, 
bool bBackground );
-SAL_DLLPRIVATE void ImplDrawRadioButtonState();
+SAL_DLLPRIVATE void ImplDrawRadioButtonState(vcl::RenderContext& 
rRenderContext);
 SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
   const Point& rPos, const Size& rSize,
   const Size& rImageSize, Rectangle& rStateRect,
   Rectangle& rMouseRect, bool bLayout = false );
 SAL_DLLPRIVATE void ImplDrawRadioButton(vcl::RenderContext& 
rRenderContext, bool bLayout

[Libreoffice-commits] core.git: chart2/source drawinglayer/source include/svx sc/source svx/source sw/source test/source toolkit/test vcl/opengl vcl/source

2015-05-05 Thread Andras Timar

 chart2/source/view/axes/Tickmarks.cxx |   10 +-
 chart2/source/view/axes/Tickmarks.hxx |2 +-
 drawinglayer/source/attribute/sdrfillgraphicattribute.cxx |2 +-
 include/svx/svdsnpv.hxx   |2 +-
 sc/source/filter/excel/xichart.cxx|4 ++--
 sc/source/filter/lotus/lotimpop.cxx   |2 +-
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx  |2 +-
 svx/source/unodraw/unobrushitemhelper.cxx |2 +-
 sw/source/core/crsr/crstrvl.cxx   |2 +-
 sw/source/core/layout/ftnfrm.cxx  |2 +-
 test/source/mtfxmldump.cxx|2 +-
 toolkit/test/accessibility/ov/ObjectViewContainer.java|2 +-
 vcl/opengl/win/WinDeviceInfo.cxx  |2 +-
 vcl/source/filter/sgvtext.cxx |6 +++---
 14 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit f62af191bf0f0d1578abc919ca3c902864fefa22
Author: Andras Timar 
Date:   Mon May 4 18:12:42 2015 +0200

typo: strech -> stretch

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

diff --git a/chart2/source/view/axes/Tickmarks.cxx 
b/chart2/source/view/axes/Tickmarks.cxx
index a8cd9a5..6f12154 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -139,20 +139,20 @@ void TickFactory::updateScreenValues( TickInfoArraysType& 
/*rAllTickInfos*/ ) co
 // ___TickFactory_2D___
 TickFactory2D::TickFactory2D(
   const ExplicitScaleData& rScale, const ExplicitIncrementData& 
rIncrement
-  //, double fStrech_SceneToScreen, double fOffset_SceneToScreen )
+  //, double fStretch_SceneToScreen, double fOffset_SceneToScreen )
   , const B2DVector& rStartScreenPos, const B2DVector& rEndScreenPos
   , const B2DVector& rAxisLineToLabelLineShift )
   : TickFactory( rScale, rIncrement )
   , m_aAxisStartScreenPosition2D(rStartScreenPos)
   , m_aAxisEndScreenPosition2D(rEndScreenPos)
   , m_aAxisLineToLabelLineShift(rAxisLineToLabelLineShift)
-  , m_fStrech_LogicToScreen(1.0)
+  , m_fStretch_LogicToScreen(1.0)
   , m_fOffset_LogicToScreen(0.0)
 {
 double fWidthY = m_fScaledVisibleMax - m_fScaledVisibleMin;
 if (chart2::AxisOrientation_MATHEMATICAL == m_rScale.Orientation)
 {
-m_fStrech_LogicToScreen = 1.0/fWidthY;
+m_fStretch_LogicToScreen = 1.0/fWidthY;
 m_fOffset_LogicToScreen = -m_fScaledVisibleMin;
 }
 else
@@ -161,7 +161,7 @@ TickFactory2D::TickFactory2D(
 m_aAxisStartScreenPosition2D = m_aAxisEndScreenPosition2D;
 m_aAxisEndScreenPosition2D = aSwap;
 
-m_fStrech_LogicToScreen = -1.0/fWidthY;
+m_fStretch_LogicToScreen = -1.0/fWidthY;
 m_fOffset_LogicToScreen = -m_fScaledVisibleMax;
 }
 }
@@ -197,7 +197,7 @@ B2DVector TickFactory2D::getTickScreenPosition2D( double 
fScaledLogicTickValue )
 {
 B2DVector aRet(m_aAxisStartScreenPosition2D);
 aRet += (m_aAxisEndScreenPosition2D-m_aAxisStartScreenPosition2D)
-
*((fScaledLogicTickValue+m_fOffset_LogicToScreen)*m_fStrech_LogicToScreen);
+
*((fScaledLogicTickValue+m_fOffset_LogicToScreen)*m_fStretch_LogicToScreen);
 return aRet;
 }
 
diff --git a/chart2/source/view/axes/Tickmarks.hxx 
b/chart2/source/view/axes/Tickmarks.hxx
index b47dde2b..b9ecc35 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -150,7 +150,7 @@ private: //member
 //add this vector to go from the axis line to the label line (border of 
the diagram)
 ::basegfx::B2DVectorm_aAxisLineToLabelLineShift;
 
-double  m_fStrech_LogicToScreen;
+double  m_fStretch_LogicToScreen;
 double  m_fOffset_LogicToScreen;
 };
 
diff --git a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx 
b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
index 2e7f05e..4ad7cdb 100644
--- a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
@@ -213,7 +213,7 @@ namespace drawinglayer
 basegfx::B2DPoint aBitmapSize(1.0, 1.0);
 basegfx::B2DVector aBitmapTopLeft(0.0, 0.0);
 
-// are changes needed? When streched we are already done, all 
other values will have no influence
+// are changes needed? When stretched we are already done, all 
other values will have no influence
 if(getTiling() || !getStretch())
 {
 // init values with range sizes
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index 8f2eeea..fb2fc32 100644
--- a/include/svx/svdsnpv.hxx
+++ b

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

2015-05-05 Thread Andras Timar

 vcl/source/filter/wmf/winmtf.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 0c58017468abb0ebee3088336e7e7a074e53edee
Author: Andras Timar 
Date:   Mon May 4 20:03:27 2015 +0200

tdf#90539 special case for EMF placeholder icon of OLE object

Change-Id: Id775680d6b2aec1fd84981a72a94fe4934bef003
Reviewed-on: https://gerrit.libreoffice.org/15632
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 740ac49..9b06893 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1639,6 +1639,15 @@ void WinMtfOutput::ResolveBitmapActions( 
BSaveStructList_impl& rSaveList )
 bDrawn = true;
 i++;
 }
+// tdf#90539
+else if ( ( nWinRop == SRCAND ) && ( 
pSave2->nWinRop == SRCINVERT ) )
+{
+Bitmap aMask( pSave->aBmp );
+BitmapEx aBmpEx( pSave2->aBmp, aMask );
+ImplDrawBitmap( aPos, aSize, aBmpEx );
+bDrawn = true;
+i++;
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Tor Lillqvist

 basegfx/source/inc/stringconversiontools.hxx   |   69 +-
 basegfx/source/polygon/b2dsvgpolypolygon.cxx   |  162 -
 basegfx/source/tools/stringconversiontools.cxx |   49 +++
 3 files changed, 143 insertions(+), 137 deletions(-)

New commits:
commit 3363f828d63775a11073276dce927b9538b57be6
Author: Tor Lillqvist 
Date:   Tue May 5 10:27:00 2015 +0300

Drop misused lcl_ prefix

If used at all, lcl_ is supposed to be used for static functions truly local
to one source files. The functions here occur in several source files (well,
two, the one where they are defined and one other) so they are not "local" 
in
that sense. (But they could be local in the one file that uses them...) 
Also,
they are already in a basegfx::internal namespace.

While at it, drop the :: prefix eyesore from basegfx::internal, and align
parameter lists consistently.

Change-Id: I68b91075e0b1779ac0fa884d8f9e956f1ab7b308

diff --git a/basegfx/source/inc/stringconversiontools.hxx 
b/basegfx/source/inc/stringconversiontools.hxx
index 04b9f83..92713bf 100644
--- a/basegfx/source/inc/stringconversiontools.hxx
+++ b/basegfx/source/inc/stringconversiontools.hxx
@@ -27,15 +27,17 @@ namespace basegfx
 {
 namespace internal
 {
-void lcl_skipSpaces(sal_Int32&  io_rPos,
-const OUString&  rStr,
-const sal_Int32 nLen);
+void skipSpaces(sal_Int32&  io_rPos,
+const OUString& rStr,
+const sal_Int32 nLen);
 
-void lcl_skipSpacesAndCommas(sal_Int32& io_rPos,
-const OUString& rStr,
-const sal_Int32 nLen);
+void skipSpacesAndCommas(sal_Int32&  io_rPos,
+ const OUString& rStr,
+ const sal_Int32 nLen);
 
-inline bool lcl_isOnNumberChar(const sal_Unicode aChar, bool 
bSignAllowed = true, bool bDotAllowed = true)
+inline bool isOnNumberChar(const sal_Unicode aChar,
+   bool  bSignAllowed = true,
+   bool  bDotAllowed = true)
 {
 const bool bPredicate( (sal_Unicode('0') <= aChar && 
sal_Unicode('9') >= aChar)
 || (bSignAllowed && sal_Unicode('+') == 
aChar)
@@ -45,40 +47,43 @@ namespace basegfx
 return bPredicate;
 }
 
-inline bool lcl_isOnNumberChar(const OUString& rStr, const sal_Int32 
nPos, bool bSignAllowed = true, bool bDotAllowed = true)
+inline bool isOnNumberChar(const OUString& rStr,
+   const sal_Int32 nPos,
+   boolbSignAllowed = true,
+   boolbDotAllowed = true)
 {
-return lcl_isOnNumberChar(rStr[nPos], bSignAllowed, bDotAllowed);
+return isOnNumberChar(rStr[nPos], bSignAllowed, bDotAllowed);
 }
 
-bool lcl_getDoubleChar(double&  o_fRetval,
-sal_Int32&  io_rPos,
-const OUString&  rStr);
+bool getDoubleChar(double&  o_fRetval,
+   sal_Int32&   io_rPos,
+   const OUString&  rStr);
 
-bool lcl_importDoubleAndSpaces( double& o_fRetval,
-sal_Int32&  io_rPos,
-const OUString&  rStr,
-const sal_Int32 nLen );
+bool importDoubleAndSpaces(double&  o_fRetval,
+   sal_Int32&   io_rPos,
+   const OUString&  rStr,
+   const sal_Int32  nLen );
 
-bool lcl_importFlagAndSpaces(sal_Int32& o_nRetval,
- sal_Int32& io_rPos,
- const OUString&rStr,
- const sal_Int32nLen);
+bool importFlagAndSpaces(sal_Int32&  o_nRetval,
+ sal_Int32&  io_rPos,
+ const OUString& rStr,
+ const sal_Int32 nLen);
 
-void lcl_skipNumber(sal_Int32&  io_rPos,
-const OUString&  rStr,
-const sal_Int32 nLen);
+void skipNumber(sal_Int32&   io_rPos,
+const OUString&  rStr,
+const sal_Int32  nLen);
 
-void lcl_skipDouble(sal_Int32&  io_rPos,
-const OUString&  rStr);
+

[Libreoffice-commits] core.git: 2 commits - dbaccess/source

2015-05-05 Thread Miklos Vajna

 dbaccess/source/core/dataaccess/databasedocument.cxx |   43 +++---
 dbaccess/source/core/inc/core_resource.hrc   |1 
 dbaccess/source/core/resource/strings.src|5 --
 dbaccess/source/filter/xml/xmlfilter.cxx |   45 +++
 4 files changed, 64 insertions(+), 30 deletions(-)

New commits:
commit 2b1bd0fac8007adeefb91f6d505186221143fb4f
Author: Miklos Vajna 
Date:   Tue May 5 09:57:03 2015 +0200

dbaccess: implement ODatabaseDocument::loadFromStorage()

With this, it's finally possible to load a .odb file embedded inside a
.odt.

Change-Id: Ib5eec603ce958abd848e456871aacfad4ab0a8b7

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 1721287..7028a9d 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1914,14 +1914,45 @@ Reference< XDataSource > SAL_CALL 
ODatabaseDocument::getDataSource() throw (Runt
 return m_pImpl->getOrCreateDataSource();
 }
 
-void SAL_CALL ODatabaseDocument::loadFromStorage( const Reference< XStorage >& 
/*xStorage*/, const Sequence< PropertyValue >& /*aMediaDescriptor*/ ) throw 
(IllegalArgumentException, DoubleInitializationException, IOException, 
Exception, RuntimeException, std::exception)
+namespace
 {
-DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
+/// Property map for embedded import info set.
+comphelper::PropertyMapEntry const aEmbeddedImportInfoMap[] =
+{
+{OUString("StreamRelPath"), 0, cppu::UnoType::get(), 
beans::PropertyAttribute::MAYBEVOID, 0},
+{OUString("StreamName"), 0, cppu::UnoType::get(), 
beans::PropertyAttribute::MAYBEVOID, 0},
+{OUString("SourceStorage"), 0, cppu::UnoType::get(), 
beans::PropertyAttribute::MAYBEVOID, 0},
+{OUString(), 0, css::uno::Type(), 0, 0}
+};
+}
 
-throw Exception(
-DBACORE_RESSTRING( RID_STR_NO_EMBEDDING ),
-*this
-);
+void SAL_CALL ODatabaseDocument::loadFromStorage(const Reference& 
xStorage, const Sequence& rMediaDescriptor) throw 
(IllegalArgumentException, DoubleInitializationException, IOException, 
Exception, RuntimeException, std::exception)
+{
+DocumentGuard aGuard(*this, DocumentGuard::InitMethod);
+
+uno::Reference 
xInfoSet(comphelper::GenericPropertySet_CreateInstance(new 
comphelper::PropertySetInfo(aEmbeddedImportInfoMap)));
+comphelper::NamedValueCollection aDescriptor(rMediaDescriptor);
+xInfoSet->setPropertyValue("StreamRelPath", 
uno::makeAny(aDescriptor.getOrDefault("HierarchicalDocumentName", OUString(;
+xInfoSet->setPropertyValue("StreamName", 
uno::makeAny(OUString("content.xml")));
+xInfoSet->setPropertyValue("SourceStorage", uno::makeAny(xStorage));
+
+uno::Sequence aFilterCreationArgs(1);
+aFilterCreationArgs[0] <<= xInfoSet;
+
+uno::Reference 
xImporter(m_pImpl->m_aContext->getServiceManager()->createInstanceWithArgumentsAndContext("com.sun.star.comp.sdb.DBFilter",
 aFilterCreationArgs, m_pImpl->m_aContext), uno::UNO_QUERY_THROW);
+
+uno::Reference xComponent(*this, uno::UNO_QUERY_THROW);
+xImporter->setTargetDocument(xComponent);
+
+uno::Reference xFilter(xImporter, uno::UNO_QUERY_THROW);
+uno::Sequence aFilterArgs;
+xFilter->filter(aFilterArgs);
+
+// In case of embedding, XModel::attachResource is already called.
+if (m_bEmbedded)
+impl_setInitialized();
+
+impl_setModified_nothrow(false, aGuard);
 }
 
 void SAL_CALL ODatabaseDocument::storeToStorage( const Reference< XStorage >& 
_rxStorage, const Sequence< PropertyValue >& _rMediaDescriptor ) throw 
(IllegalArgumentException, IOException, Exception, RuntimeException, 
std::exception)
diff --git a/dbaccess/source/core/inc/core_resource.hrc 
b/dbaccess/source/core/inc/core_resource.hrc
index 151d000..4ab8b27 100644
--- a/dbaccess/source/core/inc/core_resource.hrc
+++ b/dbaccess/source/core/inc/core_resource.hrc
@@ -91,7 +91,6 @@
 #define RID_STR_CURSOR_BEFORE_OR_AFTER  ( RID_CORE_STRINGS_START + 61 )
 #define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 62 )
 #define RID_STR_NO_BOOKMARK_DELETED ( RID_CORE_STRINGS_START + 63 )
-#define RID_STR_NO_EMBEDDING( RID_CORE_STRINGS_START + 64 )
 #define RID_STR_CONNECTION_REQUEST  ( RID_CORE_STRINGS_START + 65 )
 #define RID_STR_MISSING_EXTENSION   ( RID_CORE_STRINGS_START + 66 )
 
diff --git a/dbaccess/source/core/resource/strings.src 
b/dbaccess/source/core/resource/strings.src
index 1784a3d..fdad3c6 100644
--- a/dbaccess/source/core/resource/strings.src
+++ b/dbaccess/source/core/resource/strings.src
@@ -345,11 +345,6 @@ String RID_STR_NO_BOOKMARK_DELETED
 Text [ en-US ] = "The current row is deleted, and thus doesn't have a 
bookmark.";
 };
 
-String RID_STR_NO_EMBEDDING
-{
-Text [ en-US ] = "Embedding of database documents is not supported.";
-}

[Libreoffice-commits] core.git: vcl/inc vcl/unx

2015-05-05 Thread Tor Lillqvist

 vcl/inc/unx/gtk/gtkframe.hxx   |4 ++--
 vcl/unx/gtk/window/gtksalframe.cxx |8 
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 83076579132eabf50748c15d7a8defb6c3aa851e
Author: Tor Lillqvist 
Date:   Tue May 5 11:34:52 2015 +0300

AllocateFrame() and TriggerPaintEvent() can't be static when --enable-gtk3

Change-Id: I1d637285b6b6ef64b83ab759bd4a379713bbf96b

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 6c354c3..de8903e 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -304,8 +304,8 @@ class GtkSalFrame : public SalFrame, public 
X11WindowProvider
 void createNewWindow( ::Window aParent, bool bXEmbed, SalX11Screen 
nXScreen );
 void askForXEmbedFocus( sal_Int32 nTimecode );
 
-static void AllocateFrame();
-static void TriggerPaintEvent();
+void AllocateFrame();
+void TriggerPaintEvent();
 
 void updateWMClass();
 void SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSize = 
NULL );
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx 
b/vcl/unx/gtk/window/gtksalframe.cxx
index 2c829db..26825f2 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -3653,7 +3653,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, 
GdkEvent*, gpointer frame )
 #endif
 
 pThis->CallCallback( SALEVENT_RESIZE, NULL );
-TriggerPaintEvent();
+pThis->TriggerPaintEvent();
 
 return false;
 }
@@ -3739,7 +3739,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, 
GdkEventConfigure* pEvent, gp
 
 pThis->updateScreenNumber();
 if( bSized )
-AllocateFrame();
+pThis->AllocateFrame();
 
 if( bMoved && bSized )
 pThis->CallCallback( SALEVENT_MOVERESIZE, NULL );
@@ -3749,7 +3749,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, 
GdkEventConfigure* pEvent, gp
 pThis->CallCallback( SALEVENT_RESIZE, NULL );
 
 if (bSized)
-TriggerPaintEvent();
+pThis->TriggerPaintEvent();
 return false;
 }
 
@@ -3925,7 +3925,7 @@ gboolean GtkSalFrame::signalState( GtkWidget*, GdkEvent* 
pEvent, gpointer frame
 if( (pThis->m_nState & GDK_WINDOW_STATE_ICONIFIED) != 
(pEvent->window_state.new_window_state & GDK_WINDOW_STATE_ICONIFIED ) )
 {
 GtkSalFrame::getDisplay()->SendInternalEvent( pThis, NULL, 
SALEVENT_RESIZE );
-TriggerPaintEvent();
+pThis->TriggerPaintEvent();
 }
 
 if(   (pEvent->window_state.new_window_state & GDK_WINDOW_STATE_MAXIMIZED) 
&&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source svtools/source

2015-05-05 Thread Michael Meeks

 dbaccess/source/ui/dlg/dbwizsetup.cxx|1 +
 svtools/source/dialogs/roadmapwizard.cxx |   10 --
 svtools/source/dialogs/wizardmachine.cxx |   14 +++---
 svtools/source/dialogs/wizdlg.cxx|9 -
 4 files changed, 20 insertions(+), 14 deletions(-)

New commits:
commit 36c8dd27b19ce5088b65096af5f464ec5720efaa
Author: Michael Meeks 
Date:   Tue May 5 10:13:50 2015 +0100

tdf#91027 - cleanup dbaccess related dispose logic.

Change-Id: Ice92188b097974b8e305c0180a791e25ed537054

diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx 
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 6edc3ce..bb3885c 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -270,6 +270,7 @@ ODbTypeWizDialogSetup::~ODbTypeWizDialogSetup()
 void ODbTypeWizDialogSetup::dispose()
 {
 delete m_pOutSet;
+m_pOutSet = NULL;
 m_pGeneralPage.clear();
 m_pMySQLIntroPage.clear();
 m_pFinalPage.clear();
diff --git a/svtools/source/dialogs/roadmapwizard.cxx 
b/svtools/source/dialogs/roadmapwizard.cxx
index 83ef2f4..e6399790 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -33,16 +33,14 @@
 
 namespace svt
 {
-
-
 namespace
 {
-typedef ::std::set< WizardTypes::WizardState >  StateSet;
+typedef ::std::set< WizardTypes::WizardState > StateSet;
 
 typedef ::std::map<
 RoadmapWizardTypes::PathId,
 RoadmapWizardTypes::WizardPath
->   Paths;
+> Paths;
 
 typedef ::std::map<
 WizardTypes::WizardState,
@@ -50,7 +48,7 @@ namespace svt
 OUString,
 RoadmapWizardTypes::RoadmapPageFactory
 >
->   
StateDescriptions;
+> StateDescriptions;
 }
 
 struct RoadmapWizardImpl : public RoadmapWizardTypes
@@ -155,10 +153,10 @@ namespace svt
 void RoadmapWizard::dispose()
 {
 delete m_pImpl;
+m_pImpl = NULL;
 OWizardMachine::dispose();
 }
 
-
 void RoadmapWizard::SetRoadmapHelpId( const OString& _rId )
 {
 m_pImpl->pRoadmap->SetHelpId( _rId );
diff --git a/svtools/source/dialogs/wizardmachine.cxx 
b/svtools/source/dialogs/wizardmachine.cxx
index 278df80..156159c 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -213,10 +213,18 @@ namespace svt
 m_pPrevPage.disposeAndClear();
 m_pHelp.disposeAndClear();
 
-for (WizardState i=0; inFirstUnknownPage; ++i)
-GetPage(i)->disposeOnce();
+if (m_pImpl)
+{
+for (WizardState i = 0; i < m_pImpl->nFirstUnknownPage; ++i)
+{
+TabPage *pPage = GetPage(i);
+if (pPage)
+pPage->disposeOnce();
+}
+delete m_pImpl;
+m_pImpl = NULL;
+}
 
-delete m_pImpl;
 WizardDialog::dispose();
 }
 
diff --git a/svtools/source/dialogs/wizdlg.cxx 
b/svtools/source/dialogs/wizdlg.cxx
index 0d0acc4..74c04e7 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -622,15 +622,14 @@ void WizardDialog::SetPage( sal_uInt16 nLevel, TabPage* 
pPage )
 
 TabPage* WizardDialog::GetPage( sal_uInt16 nLevel ) const
 {
-sal_uInt16  nTempLevel = 0;
-ImplWizPageData*pPageData = mpFirstPage;
-while ( pPageData )
+sal_uInt16 nTempLevel = 0;
+
+for (ImplWizPageData* pPageData = mpFirstPage; pPageData;
+ pPageData = pPageData->mpNext)
 {
 if ( nTempLevel == nLevel )
 return pPageData->mpPage;
-
 nTempLevel++;
-pPageData = pPageData->mpNext;
 }
 
 return NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Noel Grandin

 sw/source/uibase/docvw/edtwin.cxx   |8 
 sw/source/uibase/inc/edtwin.hxx |   16 
 sw/source/uibase/shells/textsh1.cxx |   12 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 7ebed1d63e2ad5728fa81b65fa98f09b0406965d
Author: Noel Grandin 
Date:   Tue May 5 11:43:48 2015 +0200

fix windows build

Error is "ambiguous call to overloaded function"
Rename methods to something more specific to avoid this.

Change-Id: Iac275e38cf7fb06be55cd859041acc641c13db35

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 58957e2..13d140e 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -189,8 +189,8 @@ longSwEditWin::m_nDDStartPosX = 0;
  * and in case of writer for text(background)color also in 
/core/sw/source/uibase/docvw/edtwin.cxx
  * (SwEditWin::m_aTextBackColor and SwEditWin::m_aTextColor)
  */
-Color   SwEditWin::m_aTextBackColor(COL_YELLOW);
-Color   SwEditWin::m_aTextColor(COL_RED);
+Color   SwEditWin::m_aWaterCanTextBackColor(COL_YELLOW);
+Color   SwEditWin::m_aWaterCanTextColor(COL_RED);
 
 extern bool g_bExecuteDrag;
 
@@ -4701,9 +4701,9 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
 if( rSh.IsSelection() && !rSh.HasReadonlySel() )
 {
 if(nId == RES_CHRATR_BACKGROUND)
-rSh.SetAttrItem( SvxBrushItem( 
SwEditWin::m_aTextBackColor, nId ) );
+rSh.SetAttrItem( SvxBrushItem( 
SwEditWin::m_aWaterCanTextBackColor, nId ) );
 else
-rSh.SetAttrItem( SvxColorItem( 
SwEditWin::m_aTextColor, nId ) );
+rSh.SetAttrItem( SvxColorItem( 
SwEditWin::m_aWaterCanTextColor, nId ) );
 rSh.UnSetVisCrsr();
 rSh.EnterStdMode();
 rSh.SetVisCrsr(aDocPt);
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index a036583..1fb8f2d 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -71,8 +71,8 @@ friend void PageNumNotify(  SwViewShell* pVwSh,
 
 static  longm_nDDStartPosX, m_nDDStartPosY;
 
-static  Color   m_aTextColor; // text color; for the watering can
-static  Color   m_aTextBackColor; // text background; for the watering can
+static  Color   m_aWaterCanTextColor; // text color; for the watering 
can
+static  Color   m_aWaterCanTextBackColor; // text background; for the 
watering can
 
 /*
  * timer and handler for scrolling on when the mousepointer
@@ -253,14 +253,14 @@ public:
 sal_uInt16   GetDropAction() const { return m_nDropAction; }
 SotClipboardFormatId GetDropFormat() const { return m_nDropFormat; }
 
-static ColorGetTextColor() { return m_aTextColor; }
+static ColorGetWaterCanTextColor() { return m_aWaterCanTextColor; }
 
-static void SetTextColor(const Color& rCol ) { m_aTextColor = rCol; }
+static void SetWaterCanTextColor(const Color& rCol ) { 
m_aWaterCanTextColor = rCol; }
 
-static ColorGetTextBackColor()
-{ return m_aTextBackColor; }
-static void SetTextBackColor(const Color& rCol )
-{ m_aTextBackColor = rCol; }
+static ColorGetWaterCanTextBackColor()
+{ return m_aWaterCanTextBackColor; 
}
+static void SetWaterCanTextBackColor(const Color& rCol )
+{ m_aWaterCanTextBackColor = rCol; 
}
 voidLockKeyInput(bool bSet){m_bLockInput = bSet;}
 
 const SwView &GetView() const { return m_rView; }
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index d6eebc6..0893c42 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1148,7 +1148,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
 {
 Color aSet = static_cast(pItem)->GetValue();
 SwEditWin& rEditWin = GetView().GetEditWin();
-SwEditWin::SetTextColor(aSet);
+SwEditWin::SetWaterCanTextColor(aSet);
 SwApplyTemplate* pApply = rEditWin.GetApplyTemplate();
 
 // If there is a selection, then set the color on it
@@ -1171,7 +1171,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
 aSet = COL_TRANSPARENT;
 
 SwEditWin& rEdtWin = GetView().GetEditWin();
-SwEditWin::SetTextBackColor(aSet);
+SwEditWin::SetWaterCanTextBackColor(aSet);
 SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate();
 
 if(!pApply && (rWrtSh.HasSelection() || rReq.IsAPI()))
@@ -1220,9 +1220,9 @@ void SwTextShell::Execute(SfxRequest &rReq)
 // and reopened, its co

Re: [Libreoffice-commits] Adapt SwSrcEditWindow's SyntaxTimerHdl to being used in an Idle now

2015-05-05 Thread Stephan Bergmann

I assume deleting the SetTimeout calls without replacement is fine, as 
the idle handler will automatically keep being called again?


But then, is it OK that it only ever gets Stop()'ed in 
SwSrcEditWindow::dispose, or should it also stop itself when there's no 
more work to do?


And is it necessary to do that

  if (... !pIdle->IsActive()) pIdle->Start();

thing from within the handler?

On 05/05/2015 10:22 AM, Stephan Bergmann wrote:

commit c0e209bf5f418f1564d16e234251783a0857a9d4
Author: Stephan Bergmann 
Date:   Tue May 5 10:16:43 2015 +0200

 Adapt SwSrcEditWindow's SyntaxTimerHdl to being used in an Idle now

 ...not a Timer, since d843f3de731667a298a83fc66637c7f983f3b24d "changed 
timers
 to idle"

 Change-Id: If8c6a52d6fb7b1e392e8f31bc8f0db22b2f049e1

diff --git a/sw/source/uibase/docvw/srcedtw.cxx 
b/sw/source/uibase/docvw/srcedtw.cxx
index cd66ace..02e1e66 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -56,7 +56,6 @@ struct SwTextPortion

  #define MAX_SYNTAX_HIGHLIGHT 20
  #define MAX_HIGHLIGHTTIME 200
-#define SYNTAX_HIGHLIGHT_TIMEOUT 200

  typedef std::deque SwTextPortions;

@@ -579,7 +578,7 @@ IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll)
  return 0;
  }

-IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer )
+IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Idle *, pIdle )
  {
  tools::Time aSyntaxCheckStart( tools::Time::SYSTEM );
  SAL_WARN_IF(pTextView == 0, "sw", "No View yet, but syntax 
highlighting?!");
@@ -605,7 +604,6 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer 
)
  break;
  if((tools::Time( tools::Time::SYSTEM ).GetTime() - 
aSyntaxCheckStart.GetTime()) > MAX_HIGHLIGHTTIME )
  {
-pTimer->SetTimeout( 2 * SYNTAX_HIGHLIGHT_TIMEOUT );
  break;
  }
  }
@@ -620,13 +618,12 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, 
pTimer )
  nCount ++;
  if(tools::Time( tools::Time::SYSTEM ).GetTime() - 
aSyntaxCheckStart.GetTime() > MAX_HIGHLIGHTTIME)
  {
-pTimer->SetTimeout( 2 * SYNTAX_HIGHLIGHT_TIMEOUT );
  break;
  }
  }

-if(!aSyntaxLineTable.empty() && !pTimer->IsActive())
-pTimer->Start();
+if(!aSyntaxLineTable.empty() && !pIdle->IsActive())
+pIdle->Start();
  // SyntaxTimerHdl is called when text changed
  // => good opportunity to determine text width!
  long nPrevTextWidth = nCurTextWidth;
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index 823e3cd..55e53f4 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -95,7 +95,7 @@ private:
  using OutputDevice::SetFont;
  voidSetFont();

-DECL_LINK( SyntaxTimerHdl, Timer * );
+DECL_LINK( SyntaxTimerHdl, Idle * );
  DECL_LINK( TimeoutHdl, Timer * );

  using Window::Notify;


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

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

2015-05-05 Thread Philippe Jung

 include/svx/svdedtv.hxx|2 
 include/svx/svdobj.hxx |3 
 include/svx/svdograf.hxx   |2 
 svx/inc/globlmn_tmpl.hrc   |5 +
 svx/source/svdraw/svddrgmt.cxx |  171 -
 svx/source/svdraw/svddrgv.cxx  |2 
 svx/source/svdraw/svdedtv.cxx  |   12 ++
 svx/source/svdraw/svdmrkv.cxx  |   12 +-
 svx/source/svdraw/svdobj.cxx   |   19 
 9 files changed, 215 insertions(+), 13 deletions(-)

New commits:
commit 80a38d299133823e93ec5c29e8fe5c51771940d5
Author: Philippe Jung 
Date:   Fri May 1 23:32:00 2015 +0200

tdf#34555 add crop features to svx

Adds crop feature to SdrObject. In EndSdrDrag related to Crop, there is
a new branch. If object is a regular SdrGrafObj (known inside svx), it
is used. Else, a virtual method on the object is used. This enables to
forward End of crop action to SwVirtFlyDrawObj objects (when you crop
with handles in writer).
Regarding writer, coordinates based on Twip/MM100 are used, not the
matrix based one.

This is part of a serie of 4 patches that adds Save graphic, Change Picture,
Edit with external tool, Crop (by handles) in all products (scalc,
sdraw, simpress, swriter).
Main menus, toolbars and contextual menus are updated accordingly.


Change-Id: Ie1a133d18487f51bb9c44ae2f000e63d911bf6b3
Reviewed-on: https://gerrit.libreoffice.org/15588
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index c22074b..cdc2308 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -109,6 +109,7 @@ protected:
 boolbShearAllowed : 1;
 boolbEdgeRadiusAllowed : 1;
 boolbTransparenceAllowed : 1;
+boolbCropAllowed : 1;
 boolbGradientAllowed : 1;
 boolbCanConvToPath : 1;
 boolbCanConvToPoly : 1;
@@ -250,6 +251,7 @@ public:
 bool IsShearAllowed() const;
 bool IsEdgeRadiusAllowed() const;
 bool IsCrookAllowed(bool bNoContortion=false) const;
+bool IsCropAllowed() const;
 bool IsDistortAllowed(bool bNoContortion=false) const;
 
 // Unite several objects to a polygon:
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index de32cf0..d7f71d5 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -571,6 +571,7 @@ public:
 virtual sal_uInt32 GetPlusHdlCount(const SdrHdl& rHdl) const;
 virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlNum) const;
 virtual void AddToHdlList(SdrHdlList& rHdlList) const;
+virtual void addCropHandles(SdrHdlList& rTarget) const;
 
 /// The standard transformations (Move,Resize,Rotate,Mirror,Shear) are
 /// taken over by the View (TakeXorPoly(),...).
@@ -630,12 +631,14 @@ public:
 /// Nbc means "no broadcast".
 virtual void NbcMove  (const Size& rSiz);
 virtual void NbcResize(const Point& rRef, const Fraction& xFact, const 
Fraction& yFact);
+virtual void NbcCrop  (const Point& rRef, const Fraction& xFact, const 
Fraction& yFact);
 virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double 
cs);
 virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
 virtual void NbcShear (const Point& rRef, long nAngle, double tn, bool 
bVShear);
 
 virtual void Move  (const Size& rSiz);
 virtual void Resize(const Point& rRef, const Fraction& xFact, const 
Fraction& yFact, bool bUnsetRelative = true);
+virtual void Crop  (const Point& rRef, const Fraction& xFact, const 
Fraction& yFact);
 virtual void Rotate(const Point& rRef, long nAngle, double sn, double cs);
 virtual void Mirror(const Point& rRef1, const Point& rRef2);
 virtual void Shear (const Point& rRef, long nAngle, double tn, bool 
bVShear);
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 29499a1..c0becce 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -210,7 +210,7 @@ public:
 virtual SdrObject* getFullDragClone() const SAL_OVERRIDE;
 
 // add handles for crop mode when selected
-void addCropHandles(SdrHdlList& rTarget) const;
+virtual void addCropHandles(SdrHdlList& rTarget) const;
 };
 
 #endif // INCLUDED_SVX_SVDOGRAF_HXX
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index b53f23a..ae6953d 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -253,6 +253,11 @@
 Command = ".uno:ExternalEdit" ; \
 Text [ en-US ] = "Edit with External Tool..." ; \
 
+#define ITEM_OBJECT_CROP \
+Identifier = SID_OBJECT_CROP ; \
+Command = ".uno:Crop" ; \
+Text [ en-US ] = "Crop I~mage" ; \
+
 #define ITEM_COMPRESS_GRAPHIC \
 Identifier = SID_COMPRESS_GRAPHIC ; \
 Command = ".uno:CompressGraphic" ; \
diff --git a/svx/source/

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/sdi sc/source sc/uiconfig

2015-05-05 Thread Philippe Jung

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   28 ++
 sc/inc/sc.hrc |1 
 sc/sdi/graphsh.sdi|   19 +
 sc/source/ui/drawfunc/graphsh.cxx |  129 
++
 sc/source/ui/drawfunc/objdraw.src |   23 +
 sc/source/ui/inc/graphsh.hxx  |9 
 sc/uiconfig/scalc/menubar/menubar.xml |   13 -
 sc/uiconfig/scalc/toolbar/graphicobjectbar.xml|1 
 8 files changed, 218 insertions(+), 5 deletions(-)

New commits:
commit b1df1ac809fd6de972a6ed4f638a1ac8d29ba40d
Author: Philippe Jung 
Date:   Sat May 2 00:22:25 2015 +0200

tdf#34555 add to scalc: crop, change img, save img, edit with ext tools

Adds Save graphic, Change Picture, Edit with external tool, Crop (by
handles) to scalc. Proposal of new Format menu and image context menu
organisation.


This is part of a serie of 4 patches that adds Save graphic, Change Picture,
Edit with external tool, Crop (by handles) in all products (scalc,
sdraw, simpress, swriter).
Main menus, toolbars and contextual menus are updated accordingly.

Change-Id: I7f5cf2d1eb3870245684eadf5909fe590d56bf42
Reviewed-on: https://gerrit.libreoffice.org/15589
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 103bc02..433c723 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1914,9 +1914,9 @@
   Pri~nt Ranges
 
   
-  
+  
 
-  Graph~ic
+  O~bject
 
   
   
@@ -1994,6 +1994,30 @@
   Paste Only Value
 
   
+  
+
+  Co~mpress Image...
+
+
+1
+
+  
+  
+
+  Save Image...
+
+
+1
+
+  
+  
+
+  ~Change Image...
+
+
+1
+
+  
 
   
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 242d8e8..174db9b 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -724,6 +724,7 @@
 #define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62)
 #define RID_MN_INSERT_FIELDS(SC_RESOURCE_START+63)
 #define RID_STATISTICS_DLGS (SC_RESOURCE_START+64)
+#define RID_IMAGE_SUBMENU   (SC_RESOURCE_START+65)
 
 #define STR_START   (SC_RESOURCE_START+100)
 #define STR_ROWHEIGHT   (STR_START)
diff --git a/sc/sdi/graphsh.sdi b/sc/sdi/graphsh.sdi
index 2329ede..6b2f4bc 100644
--- a/sc/sdi/graphsh.sdi
+++ b/sc/sdi/graphsh.sdi
@@ -146,6 +146,25 @@ interface GraphSelection
 ExecMethod = ExecuteCompressGraphic;
 StateMethod = GetCompressGraphicState;
 ]
+
+SID_OBJECT_CROP
+[
+ExecMethod = ExecuteCropGraphic ;
+StateMethod = GetCropGraphicState ;
+]
+
+SID_SAVE_GRAPHIC
+[
+ExecMethod = ExecuteSaveGraphic;
+StateMethod = GetSaveGraphicState ;
+]
+
+SID_CHANGE_PICTURE
+[
+ExecMethod = ExecuteChangePicture ;
+StateMethod = GetChangePictureState ;
+]
+
 }
 
 
diff --git a/sc/source/ui/drawfunc/graphsh.cxx 
b/sc/source/ui/drawfunc/graphsh.cxx
index f8c2be9..94742a0 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -21,11 +21,13 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "graphsh.hxx"
@@ -34,6 +36,7 @@
 #include "drawview.hxx"
 #include "scresid.hxx"
 #include 
+#include "tabvwsh.hxx"
 
 #define ScGraphicShell
 #include "scslots.hxx"
@@ -216,4 +219,130 @@ void ScGraphicShell::ExecuteCompressGraphic( SfxRequest& )
 Invalidate();
 }
 
+void ScGraphicShell::GetCropGraphicState( SfxItemSet& rSet )
+{
+ScDrawView* pView = GetViewData()->GetScDrawView();
+const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
+bool bEnable = false;
+if( rMarkList.GetMarkCount() == 1 )
+{
+SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
+
+if( pObj && pObj->ISA( SdrGrafObj ) && ( 
static_cast(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) )
+bEnable = true;
+}
+
+if( !bEnable )
+rSet.DisableItem( SID_OBJECT_CROP );
+}
+
+void ScGraphicShell::ExecuteCropGraphic( SfxRequest& )
+{
+ScDrawView* pView = GetViewData()->GetScDrawView();
+const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
+
+if( rMarkList.GetMarkCount() == 1 )
+{
+SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
+
+if( pObj && pObj->ISA( SdrGrafObj ) && 
static_cast(

[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications

2015-05-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=34555

--- Comment #61 from Commit Notification 
 ---
Philippe Jung committed a patch related to this issue.
It has been pushed to "master":

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

tdf#34555 add crop features to svx

It will be available in 5.0.0.

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: officecfg/registry sw/inc sw/sdi sw/source sw/uiconfig

2015-05-05 Thread Philippe Jung

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   16 +
 sw/inc/fesh.hxx |6 
 sw/sdi/_grfsh.sdi   |   12 -
 sw/source/core/draw/dflyobj.cxx |  104 
++
 sw/source/core/frmedt/feshview.cxx  |   52 
+
 sw/source/core/inc/dflyobj.hxx  |3 
 sw/source/ui/app/mn.src |3 
 sw/source/uibase/docvw/edtwin.cxx   |8 
 sw/source/uibase/shells/grfsh.cxx   |   17 +
 sw/uiconfig/sglobal/menubar/menubar.xml |   12 +
 sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml|1 
 sw/uiconfig/sweb/menubar/menubar.xml|   12 +
 sw/uiconfig/swform/menubar/menubar.xml  |   12 +
 sw/uiconfig/swform/toolbar/graphicobjectbar.xml |1 
 sw/uiconfig/swreport/menubar/menubar.xml|   12 +
 sw/uiconfig/swreport/toolbar/graphicobjectbar.xml   |1 
 sw/uiconfig/swriter/menubar/menubar.xml |   12 +
 sw/uiconfig/swriter/toolbar/graphicobjectbar.xml|1 
 sw/uiconfig/swxform/menubar/menubar.xml |   12 +
 sw/uiconfig/swxform/toolbar/graphicobjectbar.xml|1 
 20 files changed, 292 insertions(+), 6 deletions(-)

New commits:
commit 8c4a1663f5d93380268365d35a5581d8065df897
Author: Philippe Jung 
Date:   Sat May 2 00:55:37 2015 +0200

tdf#34555 add crop features to sw

Adds Crop (by handles) to writer. Proposal of new Format menu and image
context menu organisation.

This is part of a serie of 4 patches that adds Save graphic, Change Picture,
Edit with external tool, Crop (by handles) in all products (scalc,
sdraw, simpress, swriter).
Main menus, toolbars and contextual menus are updated accordingly.

Change-Id: I6fe8907e08519326c78f0bc71f27032b5716bb8e
Reviewed-on: https://gerrit.libreoffice.org/15590
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index a712068..40ddf82 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -765,6 +765,22 @@
   1
 
   
+  
+
+  ~Change Image...
+
+
+1
+
+  
+  
+
+  Co~mpress Image...
+
+
+1
+
+  
   
 
   Create ~HTML Document
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 69a2b65..289fb92 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -473,6 +473,12 @@ public:
 /// Set DragMode (e.g. Rotate), but do nothing when frame is selected.
 void SetDragMode( sal_uInt16 eSdrDragMode );
 
+// Get the current drag mode
+SdrDragMode GetDragMode() const;
+
+// Start cropping the selected image
+void StartCropImage();
+
 size_t IsObjSelected() const;   ///< @return object count, but doesn't 
count the objects in groups.
 bool IsObjSelected( const SdrObject& rObj ) const;
 bool IsObjSameLevelWithMarked(const SdrObject* pObj) const;
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 2eb2ab2..bb50bc9 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -90,6 +90,13 @@ interface BaseTextGraphic
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
+SID_OBJECT_CROP
+[
+ExecMethod = Execute ;
+StateMethod = GetAttrState ;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+]
+
 SID_INSERT_GRAPHIC // zeigt auf FN_FORMAT_GRAFIC_DLG
 [
 ExecMethod = Execute ;
@@ -231,11 +238,6 @@ interface BaseTextGraphic
 StateMethod = GetAttrState ;
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
-SID_CHANGE_PICTURE
-[
-ExecMethod = FuTemporary ;
-StateMethod = GetMenuState ;
-]
 SID_GRFFILTER_SOLARIZE  // status(final|play|rec)
 [
 ExecMethod = ExecAttr ;
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index ec6a2f3..6ba8e51 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -19,10 +19,12 @@
 
 #include "hintids.hxx"
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -45,6 +47,7 @@
 #include "grfatr.hxx"
 #include "pagefrm.hxx"
 #include "rootfrm.hxx"
+#include "wrtsh.hxx"
 
 #include 
 #include 
@@ -729,6 +732,83 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSi

[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications

2015-05-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=34555

--- Comment #62 from Commit Notification 
 ---
Philippe Jung committed a patch related to this issue.
It has been pushed to "master":

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

tdf#34555 add to scalc: crop, change img, save img, edit with ext tools

It will be available in 5.0.0.

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

[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications

2015-05-05 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=34555

--- Comment #63 from Commit Notification 
 ---
Philippe Jung committed a patch related to this issue.
It has been pushed to "master":

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

tdf#34555 add crop features to sw

It will be available in 5.0.0.

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

2015-05-05 Thread Stephan Bergmann

 include/svx/svdograf.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f7b3b805b9881f3674e565484e05c9d30b32ee84
Author: Stephan Bergmann 
Date:   Tue May 5 12:22:53 2015 +0200

-Werror,-Winconsistent-missing-override

Change-Id: Ibd9d3858f833c24f38f982a941353204d9aa9081

diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index c0becce..1029b55 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -210,7 +210,7 @@ public:
 virtual SdrObject* getFullDragClone() const SAL_OVERRIDE;
 
 // add handles for crop mode when selected
-virtual void addCropHandles(SdrHdlList& rTarget) const;
+virtual void addCropHandles(SdrHdlList& rTarget) const SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_SVX_SVDOGRAF_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Stephan Bergmann

 sw/source/core/inc/dflyobj.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9503fe93e08a11393188099a272e7fb8d6623157
Author: Stephan Bergmann 
Date:   Tue May 5 12:30:34 2015 +0200

-Werror,-Winconsistent-missing-override

Change-Id: If6643acec764def691a3229655a992ae852e1238

diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index 173edfa..b169595 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -106,7 +106,7 @@ public:
 virtual   void   Resize(const Point& rRef, const Fraction& xFact,
 const Fraction& yFact, bool bUnsetRelative 
= true) SAL_OVERRIDE;
 virtual   void   Crop(const Point& rRef, const Fraction& xFact, 
const Fraction& yFact) SAL_OVERRIDE;
-virtual   void   addCropHandles(SdrHdlList& rTarget) const;
+virtual   void   addCropHandles(SdrHdlList& rTarget) const 
SAL_OVERRIDE;
 
 const SwFrmFmt *GetFmt() const;
   SwFrmFmt *GetFmt();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Norbert Thiebaud

 comphelper/source/misc/random.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 011563a083da45b7c6805ec42778672d4a0fb0dc
Author: Norbert Thiebaud 
Date:   Fri May 1 22:58:26 2015 -0500

seed mt19937 with random data

time(NULL) is a poor seed. It is quite predictable and
multiple instance starting in the same second will get the same seed
and therefore the same pseudo random number sequence

Use std::random_device, witch is meant to provide 'true' random
data.. mix time(NULL) just in case the std implementation is crappy.

PS: sadly std::random_device.entropy() cannot be relied on
as clang and gcc are known to return 0 despite their random_device
being non-deterministic, hence the prophylactic systematic
mixing with time(null)

Change-Id: I44dab9970f8f0388dc1c99e9816d49d1afbecf18
Reviewed-on: https://gerrit.libreoffice.org/15591
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/comphelper/source/misc/random.cxx 
b/comphelper/source/misc/random.cxx
index ea6c6a1..84e3176 100644
--- a/comphelper/source/misc/random.cxx
+++ b/comphelper/source/misc/random.cxx
@@ -37,12 +37,13 @@ struct RandomNumberGenerator
 STD_RNG_ALGO global_rng;
 RandomNumberGenerator()
 {
+std::random_device rd;
 // initialises the state of the global random number generator
 // should only be called once.
 // (note, a few std::variate_generator<> (like normal) have their
 // own state which would need a reset as well to guarantee identical
 // sequence of numbers, e.g. via myrand.distribution().reset())
-global_rng.seed(time(NULL));
+global_rng.seed(rd() ^ time(nullptr));
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Stephan Bergmann

 sw/source/core/draw/dflyobj.cxx|6 +++---
 sw/source/core/frmedt/feshview.cxx |4 ++--
 sw/source/uibase/shells/grfsh.cxx  |2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ca35b597012154d655ed50e53d9d614098058ab0
Author: Stephan Bergmann 
Date:   Tue May 5 12:48:27 2015 +0200

Various loplugin warnings

Change-Id: I8d38521f08441f123a236729c01909f2da4ec478

diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 6ba8e51..4baf26c 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -748,7 +748,7 @@ void SwVirtFlyDrawObj::NbcCrop(const Point& rRef, const 
Fraction& xFact, const F
 ResizeRect( aNewRect, rRef, xFact, yFact );
 
 // Get graphic object size in 100th of mm
-GraphicObject *pGraphicObject = (GraphicObject *) pSh->GetGraphicObj();
+GraphicObject const *pGraphicObject = pSh->GetGraphicObj();
 if (!pGraphicObject)
 return;
 const MapMode aMapMode100thmm(MAP_100TH_MM);
@@ -756,14 +756,14 @@ void SwVirtFlyDrawObj::NbcCrop(const Point& rRef, const 
Fraction& xFact, const F
 if( MAP_PIXEL == pGraphicObject->GetPrefMapMode().GetMapUnit() )
 aGraphicSize = Application::GetDefaultDevice()->PixelToLogic( 
aGraphicSize, aMapMode100thmm );
 else
-aGraphicSize = Application::GetDefaultDevice()->LogicToLogic( 
aGraphicSize, pGraphicObject->GetPrefMapMode(), aMapMode100thmm);
+aGraphicSize = OutputDevice::LogicToLogic( aGraphicSize, 
pGraphicObject->GetPrefMapMode(), aMapMode100thmm);
 if( aGraphicSize.A() == 0 || aGraphicSize.B() == 0 )
 return ;
 
 // Get old values for crop in 10th of mm
 SfxItemSet aSet( pSh->GetAttrPool(), RES_GRFATR_CROPGRF, 
RES_GRFATR_CROPGRF );
 pSh->GetCurAttr( aSet );
-SwCropGrf aCrop( (const SwCropGrf&) aSet.Get(RES_GRFATR_CROPGRF) );
+SwCropGrf aCrop( static_cast(aSet.Get(RES_GRFATR_CROPGRF)) );
 
 Rectangle aCropRectangle(
 convertTwipToMm100(aCrop.GetLeft()),
diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 0045a67..cf8481b 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -638,11 +638,11 @@ void SwFEShell::StartCropImage()
 for ( sal_uInt16 i = 0; i < rMarkList.GetMarkCount(); ++i )
 {
 SdrObject *pTmpObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
-sal_Bool bForget = pTmpObj->ISA(SwVirtFlyDrawObj);
+bool bForget = pTmpObj->ISA(SwVirtFlyDrawObj);
 if( bForget )
 {
 pView->UnmarkAll();
-pView->MarkObj( pTmpObj, Imp()->GetPageView(), sal_False, 
sal_False );
+pView->MarkObj( pTmpObj, Imp()->GetPageView(), false, false );
 break;
 }
 }
diff --git a/sw/source/uibase/shells/grfsh.cxx 
b/sw/source/uibase/shells/grfsh.cxx
index 170f966..86f76c2 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -477,7 +477,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
 
 case SID_OBJECT_CROP:
 {
-GraphicObject *pGraphicObject = (GraphicObject *) 
rSh.GetGraphicObj();
+GraphicObject const *pGraphicObject = rSh.GetGraphicObj();
 if (0 != pGraphicObject  && SDRDRAG_CROP != rSh.GetDragMode()) {
 rSh.StartCropImage();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Philippe Jung

 vcl/source/control/ctrl.cxx |   39 +--
 1 file changed, 21 insertions(+), 18 deletions(-)

New commits:
commit aa87af58b195af94ea5b9dcb01faf09e01e76e1b
Author: Philippe Jung 
Date:   Tue May 5 12:29:34 2015 +0200

tdf#91081 Fix LO crash after dialog closing by ESC

When control is no longuer valid, skip emission of
notification - chaining to the parent

When opening a popup dialog by right click and immediately
pressing ESC immediately, LO crashes.

A focus event listener is still registered. It triggers an event on a
component previously freed.

Change-Id: Icfc941849be5d50e2477d4e92afff844f76892d8

diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index e57c296..9dcdfc0 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -253,33 +253,36 @@ OUString Control::GetDisplayText() const
 
 bool Control::Notify( NotifyEvent& rNEvt )
 {
-if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
-{
-if ( !mbHasControlFocus )
-{
-mbHasControlFocus = true;
-StateChanged( StateChangedType::CONTROL_FOCUS );
-if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_GETFOCUS, 
maGetFocusHdl, this ) )
-// been destroyed within the handler
-return true;
-}
-}
-else
+// tdf#91081 if control is not valid, skip the emission - chaining to the 
parent
+if (mpControlData)
 {
-if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
+if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
 {
-vcl::Window* pFocusWin = Application::GetFocusWindow();
-if ( !pFocusWin || !ImplIsWindowOrChild( pFocusWin ) )
+if ( !mbHasControlFocus )
 {
-mbHasControlFocus = false;
+mbHasControlFocus = true;
 StateChanged( StateChangedType::CONTROL_FOCUS );
-if ( ImplCallEventListenersAndHandler( 
VCLEVENT_CONTROL_LOSEFOCUS, maLoseFocusHdl, this ) )
+if ( ImplCallEventListenersAndHandler( 
VCLEVENT_CONTROL_GETFOCUS, maGetFocusHdl, this ) )
 // been destroyed within the handler
 return true;
 }
 }
+else
+{
+if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
+{
+vcl::Window* pFocusWin = Application::GetFocusWindow();
+if ( !pFocusWin || !ImplIsWindowOrChild( pFocusWin ) )
+{
+mbHasControlFocus = false;
+StateChanged( StateChangedType::CONTROL_FOCUS );
+if ( ImplCallEventListenersAndHandler( 
VCLEVENT_CONTROL_LOSEFOCUS, maLoseFocusHdl, this ) )
+// been destroyed within the handler
+return true;
+}
+}
+}
 }
-
 return Window::Notify( rNEvt );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Julien Nabet

 i18npool/source/localedata/data/es_CR.xml |   42 ++
 1 file changed, 32 insertions(+), 10 deletions(-)

New commits:
commit aa06ce15fdd68983001ef33d1931fbaf6b515282
Author: Julien Nabet 
Date:   Mon May 4 19:39:32 2015 +0200

Related tdf#91009: Correct thousands separator character for locale es_CR

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

diff --git a/i18npool/source/localedata/data/es_CR.xml 
b/i18npool/source/localedata/data/es_CR.xml
index 244cf0d..a4f5905 100644
--- a/i18npool/source/localedata/data/es_CR.xml
+++ b/i18npool/source/localedata/data/es_CR.xml
@@ -28,7 +28,29 @@
   Costa Rica
 
   
-  
+  
+
+  /
+  Â 
+  ,
+  :
+  ,
+  ;
+  , 
+   de 
+   de 
+   
+
+
+  â
+  â
+  â
+  â
+
+AM
+PM
+metric
+  
   
 D/M
 
@@ -134,31 +156,31 @@
   0,00
 
 
-  # ##0
+  #Â ##0
 
 
-  # ##0,00
+  #Â ##0,00
 
 
-  # ###,00
+  #Â ###,00
 
 
-  [$â¡-140A] # ##0;-[$â¡-140A] #.##0
+  [$â¡-140A] #Â ##0;-[$â¡-140A] #Â ##0
 
 
-  [$â¡-140A] # ##0,00;-[$â¡-140A] #.##0,00
+  [$â¡-140A] #Â ##0,00;-[$â¡-140A] #Â ##0,00
 
 
-  [$â¡-140A] # ##0;[RED]-[$â¡-140A] #.##0
+  [$â¡-140A] #Â ##0;[RED]-[$â¡-140A] #Â ##0
 
 
-  [$â¡-140A] # ##0,00;[RED]-[$â¡-140A] #.##0,00
+  [$â¡-140A] #Â ##0,00;[RED]-[$â¡-140A] #Â 
##0,00
 
 
-  # ##0,00 CCC
+  #Â ##0,00 CCC
 
 
-  [$â¡-140A] # ##0,--;[RED]-[$â¡-140A] #.##0,--
+  [$â¡-140A] #Â ##0,--;[RED]-[$â¡-140A] #Â 
##0,--
 
 
   0%
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - chart2/source compilerplugins/clang cui/source desktop/inc desktop/source filter/source reportdesign/source sd/source slideshow/source starmath/inc starmath

2015-05-05 Thread Noel Grandin

 chart2/source/view/charttypes/PieChart.hxx   |2 -
 compilerplugins/clang/staticmethods.cxx  |9 
 cui/source/customize/cfgutil.cxx |   15 ---
 cui/source/inc/cfgutil.hxx   |8 
 desktop/inc/app.hxx  |2 -
 desktop/source/app/app.cxx   |2 -
 filter/source/xsltdialog/xmlfiltertabdialog.cxx  |2 -
 filter/source/xsltdialog/xmlfiltertabdialog.hxx  |2 -
 reportdesign/source/filter/xml/xmlControlProperty.hxx|2 -
 reportdesign/source/filter/xml/xmlExport.hxx |4 +-
 reportdesign/source/ui/dlg/Condition.cxx |2 -
 reportdesign/source/ui/dlg/GroupsSorting.cxx |8 ++--
 reportdesign/source/ui/inc/FixedTextColor.hxx|2 -
 reportdesign/source/ui/inc/GeometryHandler.hxx   |4 +-
 reportdesign/source/ui/inc/ReportController.hxx  |8 ++--
 reportdesign/source/ui/inc/ReportSection.hxx |2 -
 reportdesign/source/ui/inc/ViewsWindow.hxx   |2 -
 reportdesign/source/ui/inc/metadata.hxx  |   10 ++---
 reportdesign/source/ui/inc/propbrw.hxx   |2 -
 reportdesign/source/ui/inspection/DataProviderHandler.cxx|   22 +--
 reportdesign/source/ui/inspection/DefaultInspection.cxx  |2 -
 reportdesign/source/ui/inspection/GeometryHandler.cxx|   20 +-
 reportdesign/source/ui/inspection/ReportComponentHandler.cxx |2 -
 reportdesign/source/ui/inspection/metadata.cxx   |8 ++--
 reportdesign/source/ui/report/ReportController.cxx   |4 +-
 sd/source/ui/dlg/headerfooterdlg.cxx |2 -
 sd/source/ui/inc/gluectrl.hxx|4 +-
 sd/source/ui/inc/headerfooterdlg.hxx |2 -
 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx |4 +-
 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx |2 -
 slideshow/source/engine/eventmultiplexer.cxx |   10 ++---
 slideshow/source/engine/shapes/drawshapesubsetting.cxx   |2 -
 slideshow/source/engine/shapes/drawshapesubsetting.hxx   |4 +-
 slideshow/source/engine/shapes/viewshape.cxx |2 -
 slideshow/source/engine/shapes/viewshape.hxx |4 +-
 slideshow/source/engine/transitions/slidechangebase.hxx  |4 +-
 slideshow/source/inc/listenercontainer.hxx   |4 +-
 starmath/inc/cursor.hxx  |2 -
 starmath/inc/dialog.hxx  |2 -
 starmath/inc/document.hxx|6 +--
 starmath/inc/edit.hxx|2 -
 starmath/inc/node.hxx|6 +--
 starmath/inc/smmod.hxx   |   12 +++---
 starmath/inc/symbol.hxx  |8 ++--
 starmath/inc/utility.hxx |4 +-
 starmath/inc/view.hxx|8 ++--
 starmath/inc/visitors.hxx|2 -
 starmath/qa/cppunit/test_starmath.cxx|   12 +++---
 starmath/source/document.cxx |2 -
 starmath/source/edit.cxx |2 -
 starmath/source/mathmlexport.hxx |4 +-
 starmath/source/mathmlimport.hxx |4 +-
 starmath/source/mathtype.hxx |   12 +++---
 starmath/source/node.cxx |4 +-
 starmath/source/parse.cxx|6 +--
 starmath/source/smmod.cxx|8 ++--
 starmath/source/symbol.cxx   |6 +--
 starmath/source/unomodel.cxx |2 -
 starmath/source/utility.cxx  |2 -
 starmath/source/view.cxx |2 -
 sw/qa/extras/inc/bordertest.hxx  |2 -
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 -
 sw/qa/extras/rtfimport/rtfimport.cxx |2 -
 sw/qa/extras/ww8import/ww8import.cxx |2 -
 unotools/source/config/eventcfg.cxx  |4 +-
 65 files changed, 151 insertions(+), 169 deletions(-)

New commits:
commit 9bbfb78de44c93a19a7dc919f960e2ee17c17c4e
Author: Noel Grandin 
Date:   Tue May 5 14:04:30 2015 +0200

loplugin:staticmethods

Change-Id: I5d02ba0db00e11af3c17eaf77ce19c635a52077f

diff --git a/reportdes

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

2015-05-05 Thread Stephan Bergmann

 sw/source/uibase/inc/edtwin.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 2186e3f8d667b5af9042dcb2c3f21509ec800d2a
Author: Stephan Bergmann 
Date:   Tue May 5 14:08:25 2015 +0200

Remove using directive that has become unused

...with 7ebed1d63e2ad5728fa81b65fa98f09b0406965d "fix windows build"

Change-Id: Ibb8182cbfab47fed117c731f24fa90519b20653b

diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index a24dd4f..54e7333 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -179,8 +179,6 @@ friend void PageNumNotify(  SwViewShell* pVwSh,
 // timer for ApplyTemplates via mouse (in disguise Drag&Drop)
 DECL_LINK_TYPED( TemplateTimerHdl, Idle *, void );
 
-using OutputDevice::GetTextColor;
-
 voidMoveCursor( SwWrtShell &rSh, const Point& rDocPos,
 const bool bOnlyText, bool bLockView );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

2015-05-05 Thread Stephan Bergmann

 compilerplugins/clang/vclwidgets.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit d879d5346b525c478e93363b7ec06e797ce01461
Author: Stephan Bergmann 
Date:   Tue May 5 14:16:08 2015 +0200

Downgrade for old Clang

Change-Id: Ia4c241040c52631df86c5bb7a95bca6af234251f

diff --git a/compilerplugins/clang/vclwidgets.cxx 
b/compilerplugins/clang/vclwidgets.cxx
index d239c67..e7066c2 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -150,7 +150,9 @@ bool VCLWidgets::VisitCXXDestructorDecl(const 
CXXDestructorDecl* pCXXDestructorD
 return true;
 }
 bool foundVclPtrField = false;
-for(auto fieldDecl : pRecordDecl->fields()) {
+for(auto fieldDecl = pRecordDecl->field_begin();
+fieldDecl != pRecordDecl->field_end(); ++fieldDecl)
+{
 const RecordType *pFieldRecordType = 
fieldDecl->getType()->getAs();
 if (pFieldRecordType) {
 const CXXRecordDecl *pFieldRecordTypeDecl = 
dyn_cast(pFieldRecordType->getDecl());
@@ -161,7 +163,9 @@ bool VCLWidgets::VisitCXXDestructorDecl(const 
CXXDestructorDecl* pCXXDestructorD
}
 }
 bool foundDispose = false;
-for(auto methodDecl : pRecordDecl->methods()) {
+for(auto methodDecl = pRecordDecl->method_begin();
+methodDecl != pRecordDecl->method_end(); ++methodDecl)
+{
 if (methodDecl->isInstance() && methodDecl->param_size()==0 && 
methodDecl->getNameAsString() == "dispose") {
foundDispose = true;
break;
@@ -303,7 +307,9 @@ bool VCLWidgets::VisitFieldDecl(const FieldDecl * 
fieldDecl) {
 && startsWith(recordDecl->getQualifiedNameAsString(), "VclPtr"))
 {
 bool foundDispose = false;
-for(auto methodDecl : pParentRecordDecl->methods()) {
+for(auto methodDecl = pParentRecordDecl->method_begin();
+methodDecl != pParentRecordDecl->method_end(); ++methodDecl)
+{
 if (methodDecl->isInstance() && methodDecl->param_size()==0 && 
methodDecl->getNameAsString() == "dispose") {
foundDispose = true;
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

2015-05-05 Thread Michael Meeks

I believe I forgot to post this; apologies ...

* Present:
+ Stephan, Eike, Caolan, Sophie, Bjoern, Andras, Miklos, Thorsten,
  Michael M, Christianc, Norbert, Robinson, Lionel, Michael S, Muthu
  David
 
* Completed Action Items:
+ gerrit synching re-enable (Norbert)
+ get AppArmor profile included as a template (Caolan)
 
* Pending Action Items:
+ please file an Easy-Hack this week: just a bug with whiteboard: (All)
"EasyHack DifficultyBeginner SkillCpp TopicCleanup"
+ thanks to: Tor Lillqvist, Dan
+ http://bit.ly/1KR4HWX
+ send Christian pictures of in-person ESC meetings for report (All)
[ none yet ]
+ send an E-mail with list of gerrit usernames to Norbert (Muthu)
+ Cambridge hackfest - poke about students (Michael)
+ post a list of functions we'd like to rename to the dev list (Kendy/All)
 
* Release Engineering update (Christian)
+ 4.3.x - retrospective
 + 4.3.7 made available last Saturday, enabled for on-line update too
   everything <4.3.7 will get recommended 4.3.7 or 4.4.2
+ 4.4.3 RC2 status
 + made public today, just before the call
+ 5.0.0
 + branch-off May 18th - 3 weeks out
+ Android & iOS Remote
 
* GSoC (Thorsten)
+ Announced student acceptance, we have these slots (Miklos)
  Title Student 
   Mentors
  Implement Apple Numbers import filter Anurag Kanungo  
   David Tardon, Fridrich Strba
  Improving Automated Error CheckingBenjamin Ni 
   Markus Mohrhard, Katarina Behrens
  Rework the Expert Configuration dialogfreetank
   Caolán McNamara
  Haskell UNO Language Binding  Jorge Mendes
   Michael Stahl, Stephan Bergmann
  Cleanup internal drawing units in CalcKrisztian 
Pinter   Jan Holesovsky, Markus Mohrhard
  Dynamic Text Chaining and Hyphenation in Draw matteocam   
   Fridrich Strba, Thorsten Behrens
  Reuse Mozilla's rolling update mechanism for LibreOffice  Nathan Yee  
   Jan Holesovsky, Jacobo Aragunde Pérez
  Finishing integration of Firebird backend Popa Adrian 
Marius Lionel Mamane
  Integrate gtktiledviewer into GNOME-Documents pranavk 
   Miklos Vajna, Michael Meeks
  Review of the sidebar & its functionality Rishabh Kumar   
   Katarina Behrens, Philipz
  Improve user experience with CMIS Szymon Klos 
   Jan Holesovsky, Cedric Bosdonnat
  More and Better Tests Varun Dhall 
   Michael Stahl, Bjoern Michaelsen
+ In the Community Bonding period (Thorsten)
+ encourage people to appear on IRC, give their phone #
+ do we have IRC nicks ? (Norbert)
   + please add them to the (C) tracking page / table.
+ and have them introduce their project on the dev list
+ might make sense to give them push rights on their feature branches 
;) 
+ we do not have per-branch ACL on gerrit.. so it is committer or 
bust :-) (norbert)
 
* Crashtest update (Caolán)
+ Import - down to 3x in the last report (29th)
+ Miklos & Caolan fixed 1x each -> down to 1x in the next run.
+ Export - unchanged, but big drop expected from 180 next run.
+ Coverity holding steady at ~zero.
 
* Hackfests (Bjoern)
+ Cambridge, UK - May 2015 - contact (Michael)
+ 21st -> 23rd May confirmed. Thur / Fri / Sat.
+ Cambridge Beer Festival overlap / Punting Excursion planned etc.
  https://wiki.documentfoundation.org/Hackfest/Cambridge2015
+ next venues / suggestions ?
+ another hack-fest before the summer:
+ Freiburg, Hamburg, Liege - considering Hamburg
 
* UX Update (Kendy)
+ ill sadly.
 
* l10n Update (Sophie)
+ still migrating the data to the new tool
+ waiting for Cloph's green-light on translating 5.0
+ can already translate (Cloph)
+ the auto-translation bits not yet done.
+ use the master version in pootle that will be 5.0
 
* Developer Certification (Stephan/Bjoern/Kendy/Thorsten)
+ 3-4 proposed names under discussion; perhaps more to come.
+ still pending ... / no news ...
 
* Jenkins update (Norbert)
from:Thu Apr 23 14:06:57 2015
master linux rel jobs:167 ok:152 ko:14 fail ratio:8.38% break:5 broken 
duration:4.64%
master linux dbg jobs:96 ok:72 ko:24 fail ratio:24.99% break:4 broken 
duration:11.84%
master mac rel  jobs:131 ok:129 ko:2 fail ratio:1.52% break:2 broken 
duration:4.07%
master win rel  jobs:130 ok:100 ko:30 fail ratio:23.07% break:9 broken 
duration:15.81%
master win dbg  jobs:101 ok:82 ko:19 fail ratio:18.81% break:6 broken 
duration:15.65%
lo-4.4 mac  jobs:20 ok:19 ko:1 fail ratio:4.99% break:1 br

Crash test update

2015-05-05 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/2b0be6c0e9d23f1b8535ba7033732ae2e3bfb5c9/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Android Print

2015-05-05 Thread Massimiliano Fiori

Hi!
I'm trying to do this hack: 
https://bugs.documentfoundation.org/show_bug.cgi?id=89860 
 , i see that all 
menu options in LibreOfficeMainActivity.java send an Event to UNO, so my 
question is: to implement a print option i have to write a new UNO command? I’m 
new in LO project, what is UNO and where can i find documentation to hack the 
code?

Thanks a lot

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

Re: Android Print

2015-05-05 Thread Miklos Vajna

Hi,

On Tue, May 05, 2015 at 03:05:36PM +0200, Massimiliano Fiori 
 wrote:
> I'm trying to do this hack:
> https://bugs.documentfoundation.org/show_bug.cgi?id=89860
>  , i see
> that all menu options in LibreOfficeMainActivity.java send an Event to
> UNO, so my question is: to implement a print option i have to write a
> new UNO command? I’m new in LO project, what is UNO and where can i
> find documentation to hack the code?

There is .uno:Print already, but that brings up the print dialog on the
desktop, so it won't work as-is.

From the bug description, I imagine what would be better is just
exporting to PDF, and then handling the printing from the Java part.

See include/LibreOfficeKit/LibreOfficeKit.hxx, lok::Document::saveAs()
can do PDF export for you.

Documentation links:

https://wiki.documentfoundation.org/Development
https://wiki.documentfoundation.org/Development/Android

Regards,

Miklos

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

[Libreoffice-commits] core.git: 5 commits - avmedia/source cui/source dbaccess/source extensions/source forms/source framework/source include/postwin.h include/svtools include/svx include/vcl reportde

2015-05-05 Thread Michael Stahl

 UnoControls/source/controls/statusindicator.cxx|1 
 avmedia/source/viewer/mediawindow_impl.cxx |4 
 cui/source/dialogs/hangulhanjadlg.cxx  |2 
 cui/source/dialogs/iconcdlg.cxx|2 
 cui/source/options/connpooloptions.cxx |2 
 cui/source/tabpages/autocdlg.cxx   |2 
 cui/source/tabpages/numfmt.cxx |4 
 dbaccess/source/ui/browser/dataview.cxx|4 
 dbaccess/source/ui/control/dbtreelistbox.cxx   |2 
 dbaccess/source/ui/dlg/indexdialog.cxx |4 
 dbaccess/source/ui/dlg/tablespage.cxx  |2 
 dbaccess/source/ui/querydesign/JoinTableView.cxx   |2 
 dbaccess/source/ui/querydesign/TableWindow.cxx |2 
 dbaccess/source/ui/querydesign/TableWindowTitle.cxx|2 
 extensions/source/propctrlr/browserpage.cxx|2 
 forms/source/richtext/richtextimplcontrol.hxx  |2 
 forms/source/richtext/richtextvclcontrol.cxx   |6 
 forms/source/solar/control/navtoolbar.cxx  |8 -
 framework/source/uielement/addonstoolbarmanager.cxx|2 
 framework/source/uielement/toolbarmanager.cxx  |6 
 include/postwin.h  |2 
 include/svtools/wizdlg.hxx |2 
 include/svx/sidebar/PanelLayout.hxx|2 
 include/vcl/dialog.hxx |2 
 include/vcl/dockwin.hxx|2 
 include/vcl/layout.hxx |2 
 include/vcl/syswin.hxx |2 
 include/vcl/tabctrl.hxx|2 
 include/vcl/window.hxx |   44 +++---
 reportdesign/inc/pch/precompiled_rptui.hxx |1 
 reportdesign/source/ui/report/FixedTextColor.cxx   |1 
 reportdesign/source/ui/report/FormattedFieldBeautifier.cxx |1 
 sc/source/ui/app/inputwin.cxx  |2 
 sc/source/ui/formdlg/dwfunctr.cxx  |4 
 sc/source/ui/formdlg/privsplt.cxx  |8 -
 sc/source/ui/miscdlgs/anyrefdg.cxx |2 
 sc/source/ui/namedlg/namemgrtable.cxx  |2 
 sd/source/ui/animations/CustomAnimationPane.cxx|2 
 sd/source/ui/dlg/PaneDockingWindow.cxx |4 
 sfx2/source/control/thumbnailview.cxx  |   16 +-
 sfx2/source/dialog/basedlgs.cxx|4 
 sfx2/source/dialog/dockwin.cxx |4 
 sfx2/source/dialog/recfloat.cxx|2 
 sfx2/source/dialog/srchdlg.cxx |2 
 sfx2/source/dialog/templdlg.cxx|2 
 sfx2/source/dialog/titledockwin.cxx|2 
 sfx2/source/view/frame2.cxx|2 
 sfx2/source/view/viewfrm2.cxx  |2 
 starmath/source/toolbox.cxx|2 
 starmath/source/view.cxx   |4 
 svtools/source/brwbox/brwbox1.cxx  |2 
 svtools/source/brwbox/brwbox2.cxx  |   14 +-
 svtools/source/brwbox/ebbcontrols.cxx  |2 
 svtools/source/brwbox/editbrowsebox.cxx|   12 -
 svtools/source/contnr/fileview.cxx |2 
 svtools/source/contnr/treelistbox.cxx  |4 
 svtools/source/control/calendar.cxx|4 
 svtools/source/control/filectrl.cxx|   12 -
 svtools/source/control/headbar.cxx |   10 -
 svtools/source/control/ruler.cxx   |   12 -
 svtools/source/control/tabbar.cxx  |   12 -
 svtools/source/control/toolbarmenu.cxx |2 
 svtools/source/control/valueset.cxx|   16 +-
 svtools/source/dialogs/wizdlg.cxx  |2 
 svtools/source/table/tablecontrol.cxx  |8 -
 svx/source/dialog/charmap.cxx  |4 
 svx/source/dialog/dialcontrol.cxx  |6 
 svx/source/dialog/dlgctrl.cxx  |8 -
 svx/source/dialog/fntctrl.cxx  |4 
 svx/source/fmcomp/gridctrl.cxx |   14 +-
 svx/source/tbxctrls/tbcontrl.cxx   |4 
 sw/source/ui/dbui/mmoutputtypepage.cxx |2 
 sw/source/ui/fldui/inpdlg.cxx  |2 
 sw/source/u

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - include/vcl

2015-05-05 Thread Richard PALO

 include/vcl/window.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 31c2a2230e6debd0fa53656f6a2159918d2d67d8
Author: Richard PALO 
Date:   Fri Apr 17 08:34:40 2015 +0200

Avoid redefine of TRANSPARENT on solaris after including stream.h

Change-Id: I90611a4855320148f1d4b6e61a420ada47308c28
Reviewed-by: Michael Stahl 
(cherry picked from commit e4f10cb0e12e7965df5e469cc22e6893044cabc3)
Signed-off-by: Michael Stahl 

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ce43cd4..bc75618 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -228,6 +228,9 @@ namespace svt { class PopupWindowControllerImpl; }
 #define AUTOSCROLL_VERT ((sal_uInt16)0x0001)
 #define AUTOSCROLL_HORZ ((sal_uInt16)0x0002)
 
+#ifdef TRANSPARENT
+#undef TRANSPARENT
+#endif
 // Flags for StateChanged()
 enum class StateChangedType : sal_uInt16
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Android Print

2015-05-05 Thread Massimiliano Fiori

Hi Miklos,
First of all thank you for your reply.
I will check your links and your suggestions, but where can i find a 
documentation that explain me how UNO works? I would write a documentation of 
my work but first I have to understand the working logical.

Thanks again for your help.

—Massimiliano


> Il giorno 05/mag/2015, alle ore 15:58, Miklos Vajna  
> ha scritto:
> 
> Hi,
> 
> On Tue, May 05, 2015 at 03:05:36PM +0200, Massimiliano Fiori 
>  wrote:
>> I'm trying to do this hack:
>> https://bugs.documentfoundation.org/show_bug.cgi?id=89860
>>  , i see
>> that all menu options in LibreOfficeMainActivity.java send an Event to
>> UNO, so my question is: to implement a print option i have to write a
>> new UNO command? I’m new in LO project, what is UNO and where can i
>> find documentation to hack the code?
> 
> There is .uno:Print already, but that brings up the print dialog on the
> desktop, so it won't work as-is.
> 
> From the bug description, I imagine what would be better is just
> exporting to PDF, and then handling the printing from the Java part.
> 
> See include/LibreOfficeKit/LibreOfficeKit.hxx, lok::Document::saveAs()
> can do PDF export for you.
> 
> Documentation links:
> 
> https://wiki.documentfoundation.org/Development
> https://wiki.documentfoundation.org/Development/Android
> 
> Regards,
> 
> Miklos

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

Re: Android Print

2015-05-05 Thread Stephan Bergmann


On 05/05/2015 04:48 PM, Massimiliano Fiori wrote:

I will check your links and your suggestions, but where can i find a 
documentation that explain me how UNO works? I would write a documentation of 
my work but first I have to understand the working logical.


Note that those .uno URLs (like .uno:Print) have nothing really to do 
with UNO the component technology.  (For documentation about the latter, 
see 
.)


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

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

2015-05-05 Thread Eike Rathke

 sc/source/core/data/table1.cxx |   68 -
 1 file changed, 34 insertions(+), 34 deletions(-)

New commits:
commit 48d7d093bae06b7883434161882cb9d5f2ce08ae
Author: Eike Rathke 
Date:   Tue May 5 17:12:45 2015 +0200

rework the twisted ShrinkToUsedDataArea logic

It is unnecessary to check the remaining columns/rows twice if they
really contain data, and that even for every empty row removed.
Also, put loops inside conditions instead of conditions inside loop.

Change-Id: Idbb1a647d99806ebab26a17a83b455cacc157c18

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index b665e9f..d93d1f4 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -927,65 +927,65 @@ bool ScTable::ShrinkToUsedDataArea( bool& o_bShrunk, 
SCCOL& rStartCol, SCROW& rS
 if (rEndRow > MAXROW)
 rEndRow = MAXROW, o_bShrunk = true;
 
-bool bChanged;
-do
+while (rStartCol < rEndCol)
 {
-bChanged = false;
+if (aCol[rEndCol].IsEmptyBlock( rStartRow, rEndRow))
+{
+--rEndCol;
+o_bShrunk = true;
+}
+else
+break;  // while
+}
 
+if (!bStickyLeftCol)
+{
 while (rStartCol < rEndCol)
 {
-if (aCol[rEndCol].IsEmptyBlock( rStartRow, rEndRow))
+if (aCol[rStartCol].IsEmptyBlock( rStartRow, rEndRow))
 {
---rEndCol;
-bChanged = true;
+++rStartCol;
+o_bShrunk = true;
 }
 else
 break;  // while
 }
+}
 
-if (!bStickyLeftCol)
-{
-while (rStartCol < rEndCol)
-{
-if (aCol[rStartCol].IsEmptyBlock( rStartRow, rEndRow))
-{
-++rStartCol;
-bChanged = true;
-}
-else
-break;  // while
-}
-}
-
-if (!bColumnsOnly)
+if (!bColumnsOnly)
+{
+if (!bStickyTopRow)
 {
-if (!bStickyTopRow && rStartRow < rEndRow)
+while (rStartRow < rEndRow)
 {
 bool bFound = false;
 for (SCCOL i=rStartCol; i<=rEndCol && !bFound; i++)
+{
 if (aCol[i].HasDataAt( rStartRow))
 bFound = true;
+}
 if (!bFound)
 {
 ++rStartRow;
-bChanged = true;
+o_bShrunk = true;
 }
+else
+break;  // while
 }
+}
 
-if (rStartRow < rEndRow)
+while (rStartRow < rEndRow)
+{
+SCROW nLastDataRow = GetLastDataRow( rStartCol, rEndCol, rEndRow);
+if (0 <= nLastDataRow && nLastDataRow < rEndRow)
 {
-SCROW nLastDataRow = GetLastDataRow( rStartCol, rEndCol, 
rEndRow);
-if (0 <= nLastDataRow && nLastDataRow < rEndRow)
-{
-rEndRow = std::max( rStartRow, nLastDataRow);
-bChanged = true;
-}
+rEndRow = std::max( rStartRow, nLastDataRow);
+o_bShrunk = true;
 }
+else
+break;  // while
 }
-
-if (bChanged)
-o_bShrunk = true;
-} while( bChanged );
+}
 
 return rStartCol != rEndCol || (bColumnsOnly ?
 !aCol[rStartCol].IsEmptyBlock( rStartRow, rEndRow) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Stephan Bergmann

 editeng/source/editeng/impedit.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 25487875563c5aa05253e3f3199b082ded16184c
Author: Stephan Bergmann 
Date:   Tue May 5 17:47:26 2015 +0200

vcl::Window::Scroll takes a sal_uInt16 nFlags, not a sal_Bool

This passing of sal_True instead of some SCROLL_* flags has been there ever
since fd069bee7e57ad529c3c0974559fd2d84ec3151a "initial import," and the
signature of vcl::Window::Scroll has been like that at least since
f59676fe09175725ee0a75a1678dd1581decc20b "INTEGRATION: CWS
hedaburemove01: #72503# get rid of hedabu procedure: Moving headers to
vcl/inc/vcl and correspondent necessary changes," so lets arbitrarily assume
that this wants to pass SCROLL_CLIP (which has the same numeric value as

Change-Id: I8da6536404aa220611a7df96605c7a4a9efc7f7c

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 2061716..3d126ba 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1057,7 +1057,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, sal_uInt8 
nRangeCheck )
 aVisDocStartPos = pOutWin->LogicToPixel( aVisDocStartPos );
 aVisDocStartPos = pOutWin->PixelToLogic( aVisDocStartPos );
 Rectangle aRect( aOutArea );
-pOutWin->Scroll( nRealDiffX, nRealDiffY, aRect, sal_True );
+pOutWin->Scroll( nRealDiffX, nRealDiffY, aRect, SCROLL_CLIP );
 pOutWin->Update();
 pCrsr->SetPos( pCrsr->GetPos() + Point( nRealDiffX, nRealDiffY ) );
 if ( bVisCursor )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-05 Thread Miklos Vajna

 sw/inc/swdbdata.hxx   |1 +
 sw/source/core/doc/docfmt.cxx |   12 
 2 files changed, 13 insertions(+)

New commits:
commit 72cb877e07194f5f9f13dd2716d03f9a50531b1b
Author: Miklos Vajna 
Date:   Tue May 5 18:12:20 2015 +0200

sw doc model xml dump: include SwDBData

Change-Id: I082a9d3ca268d19ac21c28a6b453d457ed27c959

diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx
index 2547e3d..6d91e2b 100644
--- a/sw/inc/swdbdata.hxx
+++ b/sw/inc/swdbdata.hxx
@@ -30,6 +30,7 @@ struct SwDBData
 sal_Int32   nCommandType; //com::sun::star::sdb::CommandType
 SwDBData() :
 nCommandType(0){}
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 
 bool operator !=(const SwDBData& rCmp) const
 {return rCmp.sDataSource != sDataSource || rCmp.sCommand != sCommand 
|| rCmp.nCommandType != nCommandType;}
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 227b053..c900a08 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1923,6 +1923,7 @@ void SwDoc::dumpAsXml(xmlTextWriterPtr pWriter) const
 xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
 
 m_pNodes->dumpAsXml(pWriter);
+maDBData.dumpAsXml(pWriter);
 mpMarkManager->dumpAsXml(pWriter);
 m_pUndoManager->dumpAsXml(pWriter);
 getIDocumentFieldsAccess().GetFldTypes()->dumpAsXml(pWriter);
@@ -1949,6 +1950,17 @@ void SwDoc::dumpAsXml(xmlTextWriterPtr pWriter) const
 }
 }
 
+void SwDBData::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("swDBData"));
+
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("sDataSource"), 
BAD_CAST(sDataSource.toUtf8().getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("sCommand"), 
BAD_CAST(sCommand.toUtf8().getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nCommandType"), 
BAD_CAST(OString::number(nCommandType).getStr()));
+
+xmlTextWriterEndElement(pWriter);
+}
+
 std::set SwDoc::GetDocColors()
 {
 std::set aDocColors;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - extras/source include/sfx2 include/svx svx/source svx/uiconfig sw/source

2015-05-05 Thread Caolán McNamara

 extras/source/glade/libreoffice-catalog.xml.in |8 
 include/sfx2/tbxctrl.hxx   |3 
 include/svx/fillctrl.hxx   |   46 
 svx/source/sidebar/area/AreaPropertyPanel.cxx  |8 
 svx/source/tbxctrls/fillctrl.cxx   | 1186 -
 svx/uiconfig/ui/sidebararea.ui |   31 
 sw/source/uibase/lingu/hhcwrp.cxx  |   12 
 7 files changed, 640 insertions(+), 654 deletions(-)

New commits:
commit f34a473ba96849e2e5277702a7b2bbef9398b6d4
Author: CaolÃ¡n McNamara 
Date:   Tue May 5 16:51:17 2015 +0100

restore this utter madness

where we get the untranslated names for these for some
weird and wonderful reason that escapes me, but this
is clearly why this existed.

Change-Id: Ic7a7897a4988a981a3a77a8e64521d1738a323ee

diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 7ec5ff6..e1e58e6 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -28,6 +28,9 @@
 #include 
 #include 
 
+#define TMP_STR_BEGIN   "["
+#define TMP_STR_END "]"
+
 #include "svx/drawitem.hxx"
 #include "svx/xattr.hxx"
 #include 
@@ -355,6 +358,39 @@ void SvxFillToolBoxControl::Update()
 const OUString aString(mpFillGradientItem->GetName());
 
 mpLbFillAttr->SelectEntry(aString);
+
+// Check if the entry is not in the list
+if (mpLbFillAttr->GetSelectEntry() != aString)
+{
+sal_Int32 nCount = mpLbFillAttr->GetEntryCount();
+OUString aTmpStr;
+if( nCount > 0 )
+{
+// Last entry gets tested against temporary 
entry
+aTmpStr = mpLbFillAttr->GetEntry( nCount - 1 );
+if( aTmpStr.startsWith(TMP_STR_BEGIN) &&
+aTmpStr.endsWith(TMP_STR_END) )
+{
+mpLbFillAttr->RemoveEntry(nCount - 1);
+}
+}
+aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END;
+
+boost::scoped_ptr pEntry(new 
XGradientEntry(mpFillGradientItem->GetGradientValue(), aTmpStr));
+XGradientList aGradientList( "", ""/*TODO?*/ );
+aGradientList.Insert( pEntry.get() );
+aGradientList.SetDirty( false );
+const Bitmap aBmp = aGradientList.GetUiBitmap( 0 );
+
+if(!aBmp.IsEmpty())
+{
+mpLbFillAttr->InsertEntry(pEntry->GetName(), 
Image(aBmp));
+
mpLbFillAttr->SelectEntryPos(mpLbFillAttr->GetEntryCount() - 1);
+}
+
+aGradientList.Remove( 0 );
+}
+
 }
 else
 {
@@ -384,6 +420,40 @@ void SvxFillToolBoxControl::Update()
 const OUString aString(mpHatchItem->GetName());
 
 mpLbFillAttr->SelectEntry( aString );
+
+// Check if the entry is not in the list
+if( mpLbFillAttr->GetSelectEntry() != aString )
+{
+sal_uInt16 nCount = mpLbFillAttr->GetEntryCount();
+OUString aTmpStr;
+if( nCount > 0 )
+{
+// Last entry gets tested against temporary 
entry
+aTmpStr = mpLbFillAttr->GetEntry( nCount - 1 );
+if(  aTmpStr.startsWith(TMP_STR_BEGIN) &&
+ aTmpStr.endsWith(TMP_STR_END) )
+{
+mpLbFillAttr->RemoveEntry( nCount - 1 );
+}
+}
+aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END;
+
+XHatchEntry* pEntry = new 
XHatchEntry(mpHatchItem->GetHatchValue(), aTmpStr);
+XHatchList aHatchList( "", ""/*TODO?*/ );
+aHatchList.Insert( pEntry );
+aHatchList.SetDirty( sal_False );
+const Bitmap aBmp = aHatchList.GetUiBitmap( 0 );
+
+if( !aBmp.IsEmpty() )
+{
+mpLbFillAttr->InsertEntry(pEntry->GetName(), 
Image(aBmp));
+mpLbFillAttr->SelectEntryPos( 
mpLbFillAttr->GetEntryCount(

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

2015-05-05 Thread Tor Lillqvist

 svx/source/tbxctrls/fillctrl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d2724d4e07c9bfc58f1c9a008d538d6459c392fb
Author: Tor Lillqvist 
Date:   Tue May 5 19:25:40 2015 +0300

WaE: implicit conversion of literal of type 'int' to 'bool'

Change-Id: I3a22d6a2a3d655337608826c9981039ba8b5483c

diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index e1e58e6..fa8c675 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -441,7 +441,7 @@ void SvxFillToolBoxControl::Update()
 XHatchEntry* pEntry = new 
XHatchEntry(mpHatchItem->GetHatchValue(), aTmpStr);
 XHatchList aHatchList( "", ""/*TODO?*/ );
 aHatchList.Insert( pEntry );
-aHatchList.SetDirty( sal_False );
+aHatchList.SetDirty( false );
 const Bitmap aBmp = aHatchList.GetUiBitmap( 0 );
 
 if( !aBmp.IsEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Android Build Error on Linux (openSuSE)

2015-05-05 Thread Andreas Mantke

Hi Miklos,

thanks for your hints.

Am 04.05.2015 um 10:49 schrieb Miklos Vajna:
> Hi Andreas,
>
> (...)
> Hmm, ideally none of these switches should cause a problem, but just in
> case, can you try './autogen.sh' with 'autogen.input' having just:
>
> --enable-werror
> --with-android-sdk=/home/andi/Android/Sdk
> --with-android-ndk=/home/andi/android_development/android-ndk-r10d
> --with-distro=LibreOfficeAndroid
>
> and nothing else?
>
I run the buildout with that configuration only, but with no success.

The messages seemed to be the same as before (I copied a bit more of the
output):

[build ALL] All modules but instset: UnoControls accessibility
animations apple_remote avmedia basctl basebmp basegfx basic bean
binaryurp bridges canvas chart2 cli_ure comphelper configmgr
connectivity cppcanvas cppu cppuhelper cpputools cui dbaccess desktop
drawinglayer dtrans editeng embeddedobj embedserv eventattacher
extensions external accessories beanshell boost clucene coinmp curl
expat fontconfig freetype glew glm harfbuzz hsqldb hunspell hyphen icu
jpeg lcms2 libabw libcdr libcmis libebook libetonyek libexttextcat
libfreehand libmspub libmwaw libodfgen liborcus libpagemaker libpng
librevenge libvisio libwpd libwpg libwps libxml2 libxmlsec libxslt mdds
more_fonts mythes nss openssl redland rhino ucpp vigra extras filter
forms formula framework hwpfilter i18nlangtag i18npool i18nutil idl io
javaunohelper jurt jvmaccess jvmfwk librelogo libreofficekit
lingucomponent linguistic lotuswordpro o3tl offapi officecfg oovbaapi
oox package postprocess readlicense_oo registry remotebridges
reportbuilder reportdesign ridljar rsc sal salhelper sax sc scaddins
sccomp scripting sd sdext sfx2 shell slideshow smoketest solenv soltools
sot starmath stoc store svgio svl svtools svx sw swext sysui test
testtools toolkit tools tubes ucb ucbhelper udkapi unodevtools unoidl
unoil unotest unotools unoxml ure uui vbahelper vcl winaccessibility
wizards writerfilter writerperfect xmerge xmloff xmlreader xmlscript
xmlsecurity
[build MAK] CustomTarget/android/experimental/LOAndroid3/done
cp: der Aufruf von stat für
„/home/andi/Android/Sdk/extras/android/support/v7/appcompat/*“ ist nicht
möglich: Datei oder Verzeichnis nicht gefunden
../../Bootstrap/Makefile.shared:56: die Regel für Ziel
„prepare-appcompat“ scheiterte
make[2]: *** [prepare-appcompat] Fehler 1
make[2]: *** Es wird auf noch nicht beendete Prozesse gewartet...
Skipping UI files
removed org.openoffice.Office/Addons - saving 4296
removed org.openoffice.Office.DataAccess/Drivers - saving 860
removed org.openoffice.Office/TableWizard - saving 1123
removed org.openoffice.Office.UI/BaseWindowState - saving 359
removed org.openoffice.Office.UI/BasicIDECommands - saving 457
removed org.openoffice.Office.UI/BasicIDEWindowState - saving 363
removed org.openoffice.Office.UI/BibliographyCommands - saving 461
removed org.openoffice.Office.UI/BibliographyWindowState - saving 367
removed org.openoffice.Office.UI/Category - saving 310
removed org.openoffice.Office.UI/ChartCommands - saving 454
removed org.openoffice.Office.UI/ChartWindowState - saving 360
removed org.openoffice.Office.UI/Controller - saving 697
removed org.openoffice.Office.UI/DbBrowserWindowState - saving 364
removed org.openoffice.Office.UI/DbQueryWindowState - saving 362
removed org.openoffice.Office.UI/DbRelationWindowState - saving 365
removed org.openoffice.Office.UI/DbTableDataWindowState - saving 366
removed org.openoffice.Office.UI/DbTableWindowState - saving 362
removed org.openoffice.Office.UI/DbuCommands - saving 452
removed org.openoffice.Office.UI/DrawImpressCommands - saving 460
removed org.openoffice.Office.UI/GenericCategories - saving 357
removed org.openoffice.Office.UI/GenericCommands - saving 456
removed org.openoffice.Office.UI/GlobalSettings - saving 515
removed org.openoffice.Office.UI/Sidebar - saving 2198
removed org.openoffice.Office.UI/StartModuleCommands - saving 460
removed org.openoffice.Office.UI/StartModuleWindowState - saving 366
removed org.openoffice.Office.UI/WindowContentFactories - saving 566
removed org.openoffice.Office/WebWizard - saving 5200
removed org.openoffice.Office/TableWizard - saving 175291
removed org.openoffice.Office.UI/BaseWindowState - saving 2547
removed org.openoffice.Office.UI/BasicIDECommands - saving 2153
removed org.openoffice.Office.UI/BasicIDEWindowState - saving 3783
removed org.openoffice.Office.UI/BibliographyCommands - saving 1636
removed org.openoffice.Office.UI/ChartCommands - saving 20305
removed org.openoffice.Office.UI/ChartWindowState - saving 3738
removed org.openoffice.Office.UI/Controller - saving 13158
removed org.openoffice.Office.UI/DbBrowserWindowState - saving 681
removed org.openoffice.Office.UI/DbQueryWindowState - saving 1620
removed org.openoffice.Office.UI/DbRelationWindowState - saving 689
removed org.openoffice.Office.UI/DbTableDataWindowState - saving 683
removed org.openoffice.Office.UI/DbTableWindowState - saving 686
removed org.openoffice

59 matches

Mail list logo