[Libreoffice-commits] core.git: bin/list-dispatch-commands.php

[Philippe Jung]

 bin/list-dispatch-commands.php |  147 +
 1 file changed, 147 insertions(+)

New commits:
commit 60d1f712f4d130843516f159620ece9a1cb6d87a
Author: Philippe Jung <phil.j...@free.fr>
Date:   Fri Mar 17 14:39:29 2017 +0100

Add script to list dispatch commands

from https://wiki.documentfoundation.org/Development/DispatchCommands

Change-Id: I996f358518eb4b425cdd807f15d848cced36
Reviewed-on: https://gerrit.libreoffice.org/35337
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/bin/list-dispatch-commands.php b/bin/list-dispatch-commands.php
new file mode 100755
index ..7519be9d3f07
--- /dev/null
+++ b/bin/list-dispatch-commands.php
@@ -0,0 +1,147 @@
+#!/usr/bin/env php
+http://mozilla.org/MPL/2.0/.
+ */
+
+/// Script to generate 
https://wiki.documentfoundation.org/Development/DispatchCommands
+
+function getFilesList($directory, $extension) {
+$arrayItems = array();
+$skipByExclude = false;
+$handle = opendir($directory);
+if ($handle) {
+while (false !== ($file = readdir($handle))) {
+if ($file !== "." && $file !== "..") {
+if (is_dir($directory. DIRECTORY_SEPARATOR . $file)) {
+$arrayItems = array_merge($arrayItems, 
getFilesList($directory. DIRECTORY_SEPARATOR . $file, $extension));
+} else {
+$file = $directory . DIRECTORY_SEPARATOR . $file;
+if (substr($file, -4) === $extension)
+$arrayItems[] = $file;
+}
+}
+}
+}
+closedir($handle);
+return $arrayItems;
+}
+
+function addMode(&$mode, $haystack, $needle, $letter) {
+$mode .= (strpos($haystack, $needle) === FALSE) ? " " : $letter;
+}
+
+function analyseFile($fileName) {
+global $allSlots;
+
+$lines = file($fileName);
+$index = 0;
+$count = count($lines);
+while ($index<$count) {
+$aLine = $lines[$index];
+if(substr($aLine, 0, 12) === "// Slot Nr. ") {
+$tmp = explode(':', $aLine);
+$slotId = trim($tmp[1]);
+$index++;
+$aLine = $lines[$index];
+$isEnumSlot = strpos($aLine, 'SFX_NEW_SLOT_ENUM') !== FALSE;
+$tmp = explode(',', $aLine);
+$slotRID = $tmp[1];
+
+$index += $isEnumSlot ? 4 : 3;
+$aLine = $lines[$index];
+$mode = "";
+addMode($mode, $aLine, "CACHABLE",  "C");
+addMode($mode, $aLine, "AUTOUPDATE","U");
+addMode($mode, $aLine, "MENUCONFIG","M");
+addMode($mode, $aLine, "TOOLBOXCONFIG", "T");
+addMode($mode, $aLine, "ACCELCONFIG",   "A");
+$index += $isEnumSlot ? 1 : 3;
+$aLine = $lines[$index];
+if (strpos($aLine, '"') === FALSE) {
+$index++;
+$aLine = $lines[$index];
+}
+$tmp = explode('"', $aLine);
+$slotName = ".uno:" . $tmp[1];
+if (array_key_exists($slotName, $allSlots))
+$slotDescription = $allSlots[$slotName];
+else
+$slotDescription = "No description";
+if (!array_key_exists($slotName, $allSlots)) {
+$allSlots[$slotName] = new StdClass;
+$allSlots[$slotName]->slotId = $slotId;
+$allSlots[$slotName]->slotRID = $slotRID;
+$allSlots[$slotName]->mode = $mode;
+$allSlots[$slotName]->slotDescription = "";
+}
+}
+$index++;
+}
+}
+
+function analyseXCU($fileName)
+{
+global $allSlots;
+
+$lines = file($fileName);
+$index = 0;
+$count = count($lines);
+
+while ($index < $count)
+{
+$aLine = $lines[$index];
+if (strpos($aLine, '') === FALSE ) {
+$index++;
+$aLine = $lines[$index];
+}
+$aLine = str_replace('', '', $aLine);
+$aLine = trim(str_replace('', '', $aLine));
+if (array_key_exists($slotName, $allSlots))
+$allSlots[$slotName]->slotDescription = str_replace('~', '', 
$aLine);
+}
+$index++;
+}
+}
+
+
+if (count($argv) != 2) {
+print "Syntax error: ids.php module\n\n";
+print "  Module is one of:\n";
+print " basslots\n";
+print " scslots\n";
+print " sdgslots\n";
+print " sdslots\n";
+print " sfxslots\n";
+print " smslots\n";
+print " svxslots\n";
+   

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - officecfg/registry sd/source sd/uiconfig

[Philippe Jung]

 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |   10 ++
 sd/source/ui/app/optsitem.cxx   |   13 +++
 sd/source/ui/inc/optsitem.hxx   |4 ++
 sd/source/ui/view/ViewShellBase.cxx |   20 +++-
 sd/uiconfig/simpress/toolbar/standardbar.xml|5 +--
 5 files changed, 41 insertions(+), 11 deletions(-)

New commits:
commit bef97e1e067b4e0ef48c0ea8966c8107a0d2b6d4
Author: Philippe Jung <phil.j...@free.fr>
Date:   Mon Jan 18 13:25:41 2016 +0100

tdf#97119 Make TabBarVisible configuration persistant

Now the TabBarVisible status persist between LO quit/relaunch. It is also 
taking into accoutn when opening a (existing/new) presentation.
Fixes the incorrect toolbar button status
Moves the two buttons on Standard bar, in the PageSetup/SlideMasterPage 
group.
ShowTabBar button is also enabled but not selected by default.

Change-Id: Idd9ab15efebc2bf43bc827afaa1eb1457b39deec
Reviewed-on: https://gerrit.libreoffice.org/21541
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
(cherry picked from commit 87084436d39662636e92dd03a5161293efb80948)
Reviewed-on: https://gerrit.libreoffice.org/21584
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 276476a..2ba88b4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -559,6 +559,16 @@
 
 150
   
+  
+
+
+
+
+  Indicates whether the tab bar should be visible on top of the 
slide panel.
+  Tab bar is visible
+
+false
+  
   
 
   Contains text editing related configuration items.
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 628453b..ca0d104 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -428,6 +428,7 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, bool 
bUseConfig ) :
 bEnablePresenterScreen( true),
 bSolidDragging( true ),
 bSummationOfParagraphs( false ),
+bTabBarVisible( true ),
 bShowUndoDeleteWarning( true ),
 bSlideshowRespectZOrder( true ),
 bShowComments( true ),
@@ -460,6 +461,7 @@ bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) 
const
 IsEnableSdremote() == rOpt.IsEnableSdremote() &&
 IsEnablePresenterScreen() == rOpt.IsEnablePresenterScreen()&&
 IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
+IsTabBarVisible() == rOpt.IsTabBarVisible() &&
 IsSolidDragging() == rOpt.IsSolidDragging() &&
 IsShowUndoDeleteWarning() == rOpt.IsShowUndoDeleteWarning() &&
 IsSlideshowRespectZOrder() == rOpt.IsSlideshowRespectZOrder() &&
@@ -513,7 +515,8 @@ void SdOptionsMisc::GetPropNameArray( const char**& 
ppNames, sal_uLong& rCount )
 "PenColor",
 "PenWidth",
 "Start/EnableSdremote",
-"Start/EnablePresenterScreen"
+"Start/EnablePresenterScreen",
+"TabBarVisible"
 };
 
 rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? SAL_N_ELEMENTS(aPropNames) 
: 14 );
@@ -574,6 +577,10 @@ bool SdOptionsMisc::ReadData( const Any* pValues )
 
 if( pValues[25].hasValue() )
 SetEnablePresenterScreen( *static_cast(pValues[ 
25 ].getValue()) );
+
+if( pValues[26].hasValue() ) {
+SetTabBarVisible( *static_cast(pValues[ 26 
].getValue()) );
+}
 }
 
 return true;
@@ -615,6 +622,7 @@ bool SdOptionsMisc::WriteData( Any* pValues ) const
 pValues[ 23 ] <<= GetPresentationPenWidth();
 pValues[ 24 ] <<= IsEnableSdremote();
 pValues[ 25 ] <<= IsEnablePresenterScreen();
+pValues[ 26 ] <<= IsTabBarVisible();
 }
 
 return true;
@@ -642,6 +650,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, 
SdOptions* pOpts, ::sd
 maOptionsMisc.SetEnableSdremote( pOpts->IsEnableSdremote() );
 maOptionsMisc.SetEnablePresenterScreen( 
pOpts->IsEnablePresenterScreen() );
 maOptionsMisc.SetSummationOfParagraphs( 
pOpts->IsSummationOfParagraphs() );
+maOptionsMisc.SetTabBarVisible( pOpts->IsTabBarVisible() );
 maOptionsMisc.SetShowUndoDeleteWarning( 
pOpts->IsShowUndoDeleteWarning() );
 maOptionsMisc.SetPrinterIndependentLayout( 
pOpts->GetPrinterI

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

[Philippe Jung]

 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |   10 ++
 sd/source/ui/app/optsitem.cxx   |   13 +++
 sd/source/ui/inc/optsitem.hxx   |4 ++
 sd/source/ui/view/ViewShellBase.cxx |   20 +++-
 sd/uiconfig/simpress/toolbar/standardbar.xml|5 +--
 5 files changed, 41 insertions(+), 11 deletions(-)

New commits:
commit 87084436d39662636e92dd03a5161293efb80948
Author: Philippe Jung <phil.j...@free.fr>
Date:   Mon Jan 18 13:25:41 2016 +0100

tdf#97119 Make TabBarVisible configuration persistant

Now the TabBarVisible status persist between LO quit/relaunch. It is also 
taking into accoutn when opening a (existing/new) presentation.
Fixes the incorrect toolbar button status
Moves the two buttons on Standard bar, in the PageSetup/SlideMasterPage 
group.
ShowTabBar button is also enabled but not selected by default.

Change-Id: Idd9ab15efebc2bf43bc827afaa1eb1457b39deec
Reviewed-on: https://gerrit.libreoffice.org/21541
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 276476a..2ba88b4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -559,6 +559,16 @@
 
 150
   
+  
+
+
+
+
+  Indicates whether the tab bar should be visible on top of the 
slide panel.
+  Tab bar is visible
+
+false
+  
   
 
   Contains text editing related configuration items.
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 73b9ddd..d18cb77 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -428,6 +428,7 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, bool 
bUseConfig ) :
 bEnablePresenterScreen( true),
 bSolidDragging( true ),
 bSummationOfParagraphs( false ),
+bTabBarVisible( true ),
 bShowUndoDeleteWarning( true ),
 bSlideshowRespectZOrder( true ),
 bShowComments( true ),
@@ -460,6 +461,7 @@ bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) 
const
 IsEnableSdremote() == rOpt.IsEnableSdremote() &&
 IsEnablePresenterScreen() == rOpt.IsEnablePresenterScreen()&&
 IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
+IsTabBarVisible() == rOpt.IsTabBarVisible() &&
 IsSolidDragging() == rOpt.IsSolidDragging() &&
 IsShowUndoDeleteWarning() == rOpt.IsShowUndoDeleteWarning() &&
 IsSlideshowRespectZOrder() == rOpt.IsSlideshowRespectZOrder() &&
@@ -513,7 +515,8 @@ void SdOptionsMisc::GetPropNameArray( const char**& 
ppNames, sal_uLong& rCount )
 "PenColor",
 "PenWidth",
 "Start/EnableSdremote",
-"Start/EnablePresenterScreen"
+"Start/EnablePresenterScreen",
+"TabBarVisible"
 };
 
 rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? SAL_N_ELEMENTS(aPropNames) 
: 14 );
@@ -574,6 +577,10 @@ bool SdOptionsMisc::ReadData( const Any* pValues )
 
 if( pValues[25].hasValue() )
 SetEnablePresenterScreen( *static_cast(pValues[ 
25 ].getValue()) );
+
+if( pValues[26].hasValue() ) {
+SetTabBarVisible( *static_cast(pValues[ 26 
].getValue()) );
+}
 }
 
 return true;
@@ -615,6 +622,7 @@ bool SdOptionsMisc::WriteData( Any* pValues ) const
 pValues[ 23 ] <<= GetPresentationPenWidth();
 pValues[ 24 ] <<= IsEnableSdremote();
 pValues[ 25 ] <<= IsEnablePresenterScreen();
+pValues[ 26 ] <<= IsTabBarVisible();
 }
 
 return true;
@@ -642,6 +650,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, 
SdOptions* pOpts, ::sd
 maOptionsMisc.SetEnableSdremote( pOpts->IsEnableSdremote() );
 maOptionsMisc.SetEnablePresenterScreen( 
pOpts->IsEnablePresenterScreen() );
 maOptionsMisc.SetSummationOfParagraphs( 
pOpts->IsSummationOfParagraphs() );
+maOptionsMisc.SetTabBarVisible( pOpts->IsTabBarVisible() );
 maOptionsMisc.SetShowUndoDeleteWarning( 
pOpts->IsShowUndoDeleteWarning() );
 maOptionsMisc.SetPrinterIndependentLayout( 
pOpts->GetPrinterIndependentLayout() );
 maOptionsMisc.SetDefaultObjectSizeWidth( 
pOpts->GetDefaultObjectSizeWidth() );
@@ -718,6 +727,8 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
 pOpts->SetEnableSdremote( maOptionsMisc.IsEnableSdremote() );
 p

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - officecfg/registry sd/source sd/uiconfig

[Philippe Jung]

 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |   10 ++
 sd/source/ui/app/optsitem.cxx   |   13 +++
 sd/source/ui/inc/optsitem.hxx   |4 ++
 sd/source/ui/view/ViewShellBase.cxx |   20 +++-
 sd/uiconfig/simpress/toolbar/standardbar.xml|5 +--
 5 files changed, 41 insertions(+), 11 deletions(-)

New commits:
commit f9b0fec2ff0a17ae851077a2b74a0e9d6fc38476
Author: Philippe Jung <phil.j...@free.fr>
Date:   Mon Jan 18 13:25:41 2016 +0100

tdf#97119 Make TabBarVisible configuration persistant

Now the TabBarVisible status persist between LO quit/relaunch. It is also 
taking into accoutn when opening a (existing/new) presentation.
Fixes the incorrect toolbar button status
Moves the two buttons on Standard bar, in the PageSetup/SlideMasterPage 
group.
ShowTabBar button is also enabled but not selected by default.

Change-Id: Idd9ab15efebc2bf43bc827afaa1eb1457b39deec
Reviewed-on: https://gerrit.libreoffice.org/21541
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
(cherry picked from commit 87084436d39662636e92dd03a5161293efb80948)
Reviewed-on: https://gerrit.libreoffice.org/21582
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 276476a..2ba88b4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -559,6 +559,16 @@
 
 150
   
+  
+
+
+
+
+  Indicates whether the tab bar should be visible on top of the 
slide panel.
+  Tab bar is visible
+
+false
+  
   
 
   Contains text editing related configuration items.
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 628453b..ca0d104 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -428,6 +428,7 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, bool 
bUseConfig ) :
 bEnablePresenterScreen( true),
 bSolidDragging( true ),
 bSummationOfParagraphs( false ),
+bTabBarVisible( true ),
 bShowUndoDeleteWarning( true ),
 bSlideshowRespectZOrder( true ),
 bShowComments( true ),
@@ -460,6 +461,7 @@ bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) 
const
 IsEnableSdremote() == rOpt.IsEnableSdremote() &&
 IsEnablePresenterScreen() == rOpt.IsEnablePresenterScreen()&&
 IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
+IsTabBarVisible() == rOpt.IsTabBarVisible() &&
 IsSolidDragging() == rOpt.IsSolidDragging() &&
 IsShowUndoDeleteWarning() == rOpt.IsShowUndoDeleteWarning() &&
 IsSlideshowRespectZOrder() == rOpt.IsSlideshowRespectZOrder() &&
@@ -513,7 +515,8 @@ void SdOptionsMisc::GetPropNameArray( const char**& 
ppNames, sal_uLong& rCount )
 "PenColor",
 "PenWidth",
 "Start/EnableSdremote",
-"Start/EnablePresenterScreen"
+"Start/EnablePresenterScreen",
+"TabBarVisible"
 };
 
 rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? SAL_N_ELEMENTS(aPropNames) 
: 14 );
@@ -574,6 +577,10 @@ bool SdOptionsMisc::ReadData( const Any* pValues )
 
 if( pValues[25].hasValue() )
 SetEnablePresenterScreen( *static_cast(pValues[ 
25 ].getValue()) );
+
+if( pValues[26].hasValue() ) {
+SetTabBarVisible( *static_cast(pValues[ 26 
].getValue()) );
+}
 }
 
 return true;
@@ -615,6 +622,7 @@ bool SdOptionsMisc::WriteData( Any* pValues ) const
 pValues[ 23 ] <<= GetPresentationPenWidth();
 pValues[ 24 ] <<= IsEnableSdremote();
 pValues[ 25 ] <<= IsEnablePresenterScreen();
+pValues[ 26 ] <<= IsTabBarVisible();
 }
 
 return true;
@@ -642,6 +650,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, 
SdOptions* pOpts, ::sd
 maOptionsMisc.SetEnableSdremote( pOpts->IsEnableSdremote() );
 maOptionsMisc.SetEnablePresenterScreen( 
pOpts->IsEnablePresenterScreen() );
 maOptionsMisc.SetSummationOfParagraphs( 
pOpts->IsSummationOfParagraphs() );
+maOptionsMisc.SetTabBarVisible( pOpts->IsTabBarVisible() );
 maOptionsMisc.SetShowUndoDeleteWarning( 
pOpts->IsShowUndoDeleteWarning() );
 maOptionsMisc.SetPrinterIndependentLayout( 
pOpts->GetPrinterIndependentLayout() );
   

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/galaxy icon-themes/tango

[Philippe Jung]

 icon-themes/breeze/cmd/sc_toggletabbarvisibility.png |binary
 icon-themes/galaxy/cmd/sc_toggletabbarvisibility.png |binary
 icon-themes/tango/cmd/sc_toggletabbarvisibility.png  |binary
 3 files changed

New commits:
commit e4ec9232b633fe6623ccfdd9813cdad614e58589
Author: Philippe Jung <phil.j...@free.fr>
Date:   Tue Nov 24 10:12:32 2015 +0100

Add sc version of toggletabbarvisibility icons

Change-Id: Ie6097aeb8847971e79b78e83a9522e49d7271652
Reviewed-on: https://gerrit.libreoffice.org/20141
Reviewed-by: Philippe Jung <phil.j...@free.fr>
    Tested-by: Philippe Jung <phil.j...@free.fr>

diff --git a/icon-themes/breeze/cmd/sc_toggletabbarvisibility.png 
b/icon-themes/breeze/cmd/sc_toggletabbarvisibility.png
new file mode 100644
index 000..d3d0dda
Binary files /dev/null and 
b/icon-themes/breeze/cmd/sc_toggletabbarvisibility.png differ
diff --git a/icon-themes/galaxy/cmd/sc_toggletabbarvisibility.png 
b/icon-themes/galaxy/cmd/sc_toggletabbarvisibility.png
new file mode 100644
index 000..d3d0dda
Binary files /dev/null and 
b/icon-themes/galaxy/cmd/sc_toggletabbarvisibility.png differ
diff --git a/icon-themes/tango/cmd/sc_toggletabbarvisibility.png 
b/icon-themes/tango/cmd/sc_toggletabbarvisibility.png
new file mode 100644
index 000..d3d0dda
Binary files /dev/null and 
b/icon-themes/tango/cmd/sc_toggletabbarvisibility.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   24 
++
 1 file changed, 24 insertions(+)

New commits:
commit 8f07a723f932ac83b48afe55518b0a1e81e36f20
Author: Philippe Jung <phil.j...@free.fr>
Date:   Thu Nov 19 00:51:13 2015 +0100

tdf#91909 Add shortcuts for MovePage actions

Ctrl+Shift+Home: Move page first
Ctrl+Shift+Up: Move page up
Ctrl+Shift+Down: move page down
Ctrl+Shift+End: mov page last

Change-Id: I779c000719bf05885b5be65cca0d1e338902
Reviewed-on: https://gerrit.libreoffice.org/20048
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 4c80006..434b2e6 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -2667,6 +2667,12 @@
 .uno:InsertZWSP
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:MovePageDown
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -2680,6 +2686,12 @@
 .uno:SelectAll
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:MovePageLast
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -2808,6 +2820,12 @@
 .uno:SuperScript
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:MovePageFirst
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
@@ -2968,6 +2986,12 @@
 .uno:DesignerDialog
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:MovePageUp
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
5 
 sd/inc/app.hrc   |
2 
 sd/sdi/drviewsh.sdi  |
5 
 sd/sdi/sdraw.sdi |   
27 ---
 sd/source/ui/view/drviews1.cxx   |
1 
 sd/source/ui/view/drviews7.cxx   |   
86 --
 sd/source/ui/view/drviewse.cxx   |   
13 -
 7 files changed, 3 insertions(+), 136 deletions(-)

New commits:
commit d30a44aff1fb049a71e4eb2612be65a735fbe918
Author: Philippe Jung <phil.j...@free.fr>
Date:   Wed Jul 8 19:59:58 2015 +0200

Removal of SID_TITLE_MASTER related code

i35731 fixed a bug by deprecating SID_TITLE_MASTER
dispatch command in 2004.
So the feature can not be called anymore since 2004.
Ten years after, this changeset removes the code that could be
considered as dead code.

Change-Id: Ie212baf7ece2897578d2494030d790bcadd16f5f
Reviewed-on: https://gerrit.libreoffice.org/16933
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index a569a11..10580cf 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -447,11 +447,6 @@
   ~Notes Master
 
   
-  
-
-  ~Title Slide Master
-
-  
   
 
   Insert Slide Direct
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 0b21cd0..f75757e 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -391,7 +391,7 @@
 #define SID_SLIDE_MASTERPAGE(SID_SD_START+348)
 #define SID_HANDOUT_MASTERPAGE  (SID_SD_START+349)
 #define SID_NOTES_MASTERPAGE(SID_SD_START+350)
-#define SID_TITLE_MASTERPAGE(SID_SD_START+351)
+// FREE
 #define SID_INSERTPAGE_QUICK(SID_SD_START+352)
 // FREE
 #define SID_INSERT_FLD_PAGE_TITLE   (SID_SD_START+356)
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index 1d6a86d..682c7ec 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -150,11 +150,6 @@ interface ImpressEditView : DrawView
 ExecMethod = FuSupport ;
 StateMethod = GetMenuState ;
 ]
-SID_TITLE_MASTERPAGE // deprecated, to be removed see issue #i35731#
-[
-ExecMethod = FuSupport ;
-StateMethod = GetMenuState ;
-]
 SID_STYLE_FAMILY
 [
 ExecMethod = FuSupport ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index cda8bf8..fd0e8bc 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -6020,33 +6020,6 @@ SfxVoidItem TextToolbox SID_DRAWTBX_TEXT
 GroupId = GID_DRAWING;
 ]
 
-SfxVoidItem TitleMasterPage SID_TITLE_MASTERPAGE
-(SfxBoolItem Isactive ID_VAL_ISACTIVE)
-[
-/* flags: */
-AutoUpdate = FALSE,
-Cachable = Cachable,
-FastCall = FALSE,
-HasCoreId = FALSE,
-HasDialog = FALSE,
-ReadOnlyDoc = TRUE,
-Toggle = FALSE,
-Container = FALSE,
-RecordAbsolute = FALSE,
-RecordPerSet;
-Synchron;
-
-/* status: */
-SlotType = SfxBoolItem
-
-/* config: */
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-StatusBarConfig = FALSE,
-ToolBoxConfig = TRUE,
-GroupId = GID_VIEW;
-]
-
 SfxBoolItem Torus SID_3D_TORUS
 
 [
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 3c510e5..8be1d79 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -486,7 +486,6 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool 
bIsLayerModeActive)
 Invalidate( SID_DELETE_MASTER_PAGE );
 Invalidate( SID_DELETE_PAGE );
 Invalidate( SID_SLIDE_MASTERPAGE );
-Invalidate( SID_TITLE_MASTERPAGE );
 Invalidate( SID_NOTES_MASTERPAGE );
 Invalidate( SID_HANDOUT_MASTERPAGE );
 InvalidateWindows();
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 63108ae..feaad5e 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -752,40 +752,6 @@ void DrawViewShell::GetMenuState( SfxItemSet  )
 rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, false));
 rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, false));
 
-if (mePageKind == PK_STANDARD &&
-rSet.GetItemState(SID_TITLE_MASTERPAGE) == SfxItemState::DEFAULT)
-{
-// Is there a page with the AutoLayout "Title"?
-bool bDisable = true;
-sal_uInt16 i = 0;
-sal_uInt

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/galaxy icon-themes/tango officecfg/registry sd/inc sd/Library_sd.mk sd/sdi sd/source sd/uiconfig sd/util

[Philippe Jung]

 dev/null 
|binary
 icon-themes/breeze/cmd/lc_toggletabbarvisibility.png 
|binary
 icon-themes/galaxy/cmd/lc_toggletabbarvisibility.png 
|binary
 icon-themes/tango/cmd/lc_toggletabbarvisibility.png  
|binary
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu  |   
11 
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
16 
 sd/Library_sd.mk |
1 
 sd/inc/app.hrc   |   
23 
 sd/inc/sdcommands.h  |
4 
 sd/sdi/ViewShellBase.sdi |   
28 
 sd/sdi/drviewsh.sdi  |   
15 
 sd/sdi/sdraw.sdi |   
75 +-
 sd/source/filter/ppt/pptin.cxx   |
2 
 sd/source/ui/app/strings.src |   
23 
 sd/source/ui/controller/displaymodecontroller.cxx|  
316 ++
 sd/source/ui/controller/displaymodecontroller.hxx|   
53 +
 sd/source/ui/framework/module/SlideSorterModule.cxx  |
2 
 sd/source/ui/framework/module/ViewTabBarModule.cxx   |
4 
 sd/source/ui/framework/tools/FrameworkHelper.cxx |  
113 +--
 sd/source/ui/func/fusearch.cxx   |   
10 
 sd/source/ui/inc/FrameView.hxx   |   
11 
 sd/source/ui/inc/strings.hrc |   
31 
 sd/source/ui/inc/unokywds.hxx|
7 
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx   |   
16 
 sd/source/ui/view/GraphicViewShellBase.cxx   |   
10 
 sd/source/ui/view/ViewShellBase.cxx  |  
104 ++-
 sd/source/ui/view/drviews1.cxx   |
6 
 sd/source/ui/view/drviews5.cxx   |   
17 
 sd/source/ui/view/drviews7.cxx   |   
86 +-
 sd/source/ui/view/drviewsa.cxx   |   
14 
 sd/source/ui/view/drviewse.cxx   |   
89 --
 sd/source/ui/view/frmview.cxx|   
83 --
 sd/source/ui/view/outlnvsh.cxx   |   
20 
 sd/uiconfig/simpress/toolbar/standardbar.xml |
3 
 sd/util/sd.component |
4 
 35 files changed, 836 insertions(+), 361 deletions(-)

New commits:
commit 229fc164dc1773484b74eca016863cf68860e81b
Author: Philippe Jung <phil.j...@free.fr>
Date:   Fri Jul 10 17:02:44 2015 +0200

Impress: Rework the way the display modes are presented.

TODO: take into account remarks from Gerrit

New combo to select display mode among:
 - Slide edition (Normal)
 - Outline
 - Notes
 - Slide sorter
 - Slide master
 - Notes master
 - Handout (master, as we are designing the template used to generate
   the handout)

The combo is based on uno command .uno:DisplayMode

Center pane tabs are hidden by default. A new uno dispatch
command (.uno:ToggleTabBarVisibility) is available to show/hide
this tab bar.

Modified uno dispatch commands:

No uno name has been modified.

.uno:DiaMode :
SID_DIAMODE renamed SID_SLIDER_SORTER_MODE

.uno:OutlineMode
SID_OUTLINEMODE renamed SID_OUTLINE_MODE

.uno:NotesMode
No change

.uno:HandoutMode
SID_HANDOUT_MODE renamed SID_HANDOUT_MASTER_MODE
All internal code also considers the edit mode as master

.uno:SlideMasterPage
SID_SLIDE_MASTERPAGE renamed SID_SLIDE_MASTER_MODE
If the input parameter SfxBoolItem Isactive is true or not provided,
activates Slide Master mode. If parameter is false, activates the
"Normal" (slide editing) mode.

.uno:NotesMasterPage
SID_NOTES_MASTERPAGE renamed SID_NOTES_MASTER_MODE
If the input parameter SfxBoolItem Isactive is true or not provided,
activates Notes Master mode. If parameter is false, activates the
"Notes" mode.

Modified behaviours: Now only one mode can be chosen. It is possible to
navigate from a mode to any other mode.
Previous behaviour: the following navigation
 Normal -> Slide Master -> Notes -> Normal
was displaying slide master. It was required to activate Normal once more
to get back to normal.
   

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

[Philippe Jung]

 sd/source/ui/controller/displaymodecontroller.cxx |   58 +-
 sd/source/ui/controller/displaymodecontroller.hxx |3 -
 sd/source/ui/view/drviewse.cxx|1 
 3 files changed, 25 insertions(+), 37 deletions(-)

New commits:
commit db5358764fdb1855ee6b401d6165ed65677bdfbe
Author: Philippe Jung <phil.j...@free.fr>
Date:   Wed Nov 18 23:54:29 2015 +0100

Code cleanup for gerrit change 16723

Simple code clean-up taking into account Maxim Monastirsky remarks.

Change-Id: If6393851c3eb6fd8a460ef95ef88ccf3aed82e3e
Reviewed-on: https://gerrit.libreoffice.org/20047
Reviewed-by: Philippe Jung <phil.j...@free.fr>
    Tested-by: Philippe Jung <phil.j...@free.fr>

diff --git a/sd/source/ui/controller/displaymodecontroller.cxx 
b/sd/source/ui/controller/displaymodecontroller.cxx
index 9d37bd9..df86795 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -239,22 +239,8 @@ void DisplayModeToolbarMenu::SelectHdl(void * pControl)
 mrController.setToolboxItemImage( nImage );
 }
 
-OUString DisplayModeController_getImplementationName() throw 
(css::uno::RuntimeException)
-{
-return OUString( "com.sun.star.comp.sd.DisplayModeController" );
-}
-
-Sequence< OUString >  DisplayModeController_getSupportedServiceNames() throw( 
RuntimeException )
-{
-Sequence< OUString > aSNS( 1 );
-aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController";
-return aSNS;
-}
-
-// class SlideLayoutController
-
-DisplayModeController::DisplayModeController( const Reference< 
uno::XComponentContext >& rxContext, const OUString& sCommandURL )
-: svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), 
sCommandURL )
+DisplayModeController::DisplayModeController( const 
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& 
rxContext )
+: svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), 
OUString() )
 {
 }
 
@@ -262,6 +248,10 @@ void SAL_CALL DisplayModeController::initialize( const 
css::uno::Sequence< css::
 throw ( css::uno::Exception, css::uno::RuntimeException, 
std::exception )
 {
 svt::PopupWindowController::initialize( aArguments );
+ToolBox* pToolBox = nullptr;
+sal_uInt16 nId = 0;
+if ( getToolboxId( nId,  ) )
+pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | 
ToolBoxItemBits::DROPDOWNONLY );
 setToolboxItemImage( BMP_DISPLAYMODE_SLIDE );
 }
 
@@ -273,33 +263,33 @@ VclPtr 
DisplayModeController::createPopupWindow( vcl::Window* pPare
 void DisplayModeController::setToolboxItemImage( sal_uInt16 nImage )
 {
 sal_uInt16 nId;
-ToolBox* pToolBox;
-getToolboxId( nId,  );
-
-SdResId resId( nImage );
-BitmapEx aBmp( resId );
-int targetSize = (pToolBox->GetToolboxButtonSize() == 
TOOLBOX_BUTTONSIZE_LARGE) ? 32 : 16;
-double scale = 1.0f;
-Size size = aBmp.GetSizePixel();
-if (size.Width() > targetSize)
-scale = (double)targetSize / (double)size.Width();
-if (size.Height() > targetSize)
-scale = ::std::min( scale, (double)targetSize / (double)size.Height() 
);
-aBmp.Scale( scale, scale );
-pToolBox->SetItemImage( nId, Image( aBmp ) );
-
+ToolBox* pToolBox = nullptr;
+if (getToolboxId( nId,  )) {
+SdResId resId( nImage );
+BitmapEx aBmp( resId );
+int targetSize = (pToolBox->GetToolboxButtonSize() == 
TOOLBOX_BUTTONSIZE_LARGE) ? 32 : 16;
+double scale = 1.0f;
+Size size = aBmp.GetSizePixel();
+if (size.Width() > targetSize)
+scale = (double)targetSize / (double)size.Width();
+if (size.Height() > targetSize)
+scale = ::std::min( scale, (double)targetSize / 
(double)size.Height() );
+aBmp.Scale( scale, scale );
+pToolBox->SetItemImage( nId, Image( aBmp ) );
+}
 }
 
 // XServiceInfo
 
 OUString SAL_CALL DisplayModeController::getImplementationName() throw( 
RuntimeException, std::exception )
 {
-return DisplayModeController_getImplementationName();
+return OUString( "com.sun.star.comp.sd.DisplayModeController" );;
 }
 
 Sequence< OUString > SAL_CALL DisplayModeController::getSupportedServiceNames( 
 ) throw( RuntimeException, std::exception )
 {
-return DisplayModeController_getSupportedServiceNames();
+css::uno::Sequence aRet { "com.sun.star.frame.ToolbarController" 
};
+return aRet;
 }
 
 }
@@ -309,7 +299,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT 
::com::sun::star::uno::XInterface* SAL_CALL
 
com_sun_star_comp_sd_DisplayModeController_get_implementation(::com::sun::star::uno::XComponentContext*
 context,
   
::com::sun::star::uno::Sequence const &)
 {
-return cppu::acquire(new sd::Displ

Re: Killing obsolete Jenkins builds

[Philippe Jung]

Just in case,
Do you know
git commit --amend to update last commit before pushing it to gerrit
And
git rebase -i HEAD~5 to rewrite your local commit history including for exemple 
modify the third commit, merge commits 1 3 and 4 into a single one?
Philippe


Le 19 novembre 2015 04:20:03 CET, Ashod Nakashian  a écrit 
:
>On Wed, Nov 18, 2015 at 8:27 PM, Norbert Thiebaud 
>wrote:
>
>> On Wed, Nov 18, 2015 at 2:28 PM, Ashod Nakashian
>
>> wrote:
>> > (Sorry if this has already been discussed/considered.)
>> >
>> > Once a patch is pushed to Gerrit a Jenkins build automatically
>starts.
>> And
>> > once subsequent patches are pushed the cycle repeats.
>> >
>> > Is there a reason to keep running the builds of (old) patches that
>will
>> not
>> > get cherry picked?
>>
>> Is there a reason to keep pushing these patches then ?
>> Just stop building patch over patch and pushing them in bulk.. and
>> make your patch independent of each other as much as possible.
>>
>
>Sorry, I didn't explain well.
>
>The patches are related. They are updates based on feedback, partial
>failure or improvement.
>
>They aren't bulk pushes (whatever that means). They are updates on a
>single
>changeset.
>
>Why do people send multiple patches per push? That's the right question
>to
>ask.
>
>And the answer is: to improve the previous patch.
>
>Hence my question. If a patch has partially failed, or I got feedback
>to
>improve it, or (insert reason here), and I want to push an update, why
>should the previous patch still build when it's not necessary?
>
>Hope this makes sense.
>
>
>>
>> iow: make a patch, push it to gerrit, come back to 'master' make
>> another patch, push it to gerrit etc.
>> and _not_
>> make a patch, push it to gerrit
>> git pull -r
>> make another patch (on top of the non merged patch you just pushed to
>> gerrit), push it to gerrit => both patch get rebuilt
>> etc..
>>
>>
>Obviously I'm not doing that. Obviously.
>
>
>>
>> >
>> > To me it looks completely wasteful to spend hours building a few
>patches
>> > that were pushed one after the other when only the last one is
>relevant.
>>
>> Then do not push new version of 'irrelevant' patches
>>
>> > Not
>> > only it is wasteful to valuable shared resources, but the user is
>> punished
>>
>> again, do not do that then.
>>
>> Norbert
>>
>
>
>
>
>___
>LibreOffice mailing list
>LibreOffice@lists.freedesktop.org
>http://lists.freedesktop.org/mailman/listinfo/libreoffice

-- 
Envoyé de mon téléphone Android avec K-9 Mail. Excusez la brièveté.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - icon-themes/breeze icon-themes/galaxy icon-themes/tango sd/source writerfilter/source

[Philippe Jung]

 icon-themes/breeze/sd/res/displaymode_handoutmaster.png |binary
 icon-themes/breeze/sd/res/displaymode_notes.png |binary
 icon-themes/breeze/sd/res/displaymode_notesmaster.png   |binary
 icon-themes/breeze/sd/res/displaymode_outline.png   |binary
 icon-themes/breeze/sd/res/displaymode_slide.png |binary
 icon-themes/breeze/sd/res/displaymode_slidemaster.png   |binary
 icon-themes/breeze/sd/res/displaymode_slidesorter.png   |binary
 icon-themes/galaxy/cmd/lc_displaymode.png   |binary
 icon-themes/galaxy/sd/res/displaymode_handoutmaster.png |binary
 icon-themes/galaxy/sd/res/displaymode_notes.png |binary
 icon-themes/galaxy/sd/res/displaymode_notesmaster.png   |binary
 icon-themes/galaxy/sd/res/displaymode_outline.png   |binary
 icon-themes/galaxy/sd/res/displaymode_slide.png |binary
 icon-themes/galaxy/sd/res/displaymode_slidemaster.png   |binary
 icon-themes/galaxy/sd/res/displaymode_slidesorter.png   |binary
 icon-themes/tango/cmd/lc_displaymode.png|binary
 icon-themes/tango/sd/res/displaymode_handoutmaster.png  |binary
 icon-themes/tango/sd/res/displaymode_notes.png  |binary
 icon-themes/tango/sd/res/displaymode_notesmaster.png|binary
 icon-themes/tango/sd/res/displaymode_outline.png|binary
 icon-themes/tango/sd/res/displaymode_slide.png  |binary
 icon-themes/tango/sd/res/displaymode_slidemaster.png|binary
 icon-themes/tango/sd/res/displaymode_slidesorter.png|binary
 sd/source/ui/app/res_bmp.src|   28 
 sd/source/ui/inc/res_bmp.hrc|8 
 writerfilter/source/dmapper/FormControlHelper.cxx   |2 -
 26 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit 2085d5dcbc2c2158996e52e84c50ca5d5d100be7
Author: Philippe Jung <phil.j...@free.fr>
Date:   Wed Jul 8 21:04:40 2015 +0200

Add icons for future display mode selector

Change-Id: Iddc3a3dec55a4c1c2fb9fcb4cf6e9449b4f1d11e
Reviewed-on: https://gerrit.libreoffice.org/16934
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/icon-themes/breeze/sd/res/displaymode_handoutmaster.png 
b/icon-themes/breeze/sd/res/displaymode_handoutmaster.png
new file mode 100644
index 000..8cd68fc
Binary files /dev/null and 
b/icon-themes/breeze/sd/res/displaymode_handoutmaster.png differ
diff --git a/icon-themes/breeze/sd/res/displaymode_notes.png 
b/icon-themes/breeze/sd/res/displaymode_notes.png
new file mode 100644
index 000..01282985
Binary files /dev/null and b/icon-themes/breeze/sd/res/displaymode_notes.png 
differ
diff --git a/icon-themes/breeze/sd/res/displaymode_notesmaster.png 
b/icon-themes/breeze/sd/res/displaymode_notesmaster.png
new file mode 100644
index 000..576ae76
Binary files /dev/null and 
b/icon-themes/breeze/sd/res/displaymode_notesmaster.png differ
diff --git a/icon-themes/breeze/sd/res/displaymode_outline.png 
b/icon-themes/breeze/sd/res/displaymode_outline.png
new file mode 100644
index 000..5ec82cb
Binary files /dev/null and b/icon-themes/breeze/sd/res/displaymode_outline.png 
differ
diff --git a/icon-themes/breeze/sd/res/displaymode_slide.png 
b/icon-themes/breeze/sd/res/displaymode_slide.png
new file mode 100644
index 000..43d8377
Binary files /dev/null and b/icon-themes/breeze/sd/res/displaymode_slide.png 
differ
diff --git a/icon-themes/breeze/sd/res/displaymode_slidemaster.png 
b/icon-themes/breeze/sd/res/displaymode_slidemaster.png
new file mode 100644
index 000..9ea9f8d
Binary files /dev/null and 
b/icon-themes/breeze/sd/res/displaymode_slidemaster.png differ
diff --git a/icon-themes/breeze/sd/res/displaymode_slidesorter.png 
b/icon-themes/breeze/sd/res/displaymode_slidesorter.png
new file mode 100644
index 000..4e401f8
Binary files /dev/null and 
b/icon-themes/breeze/sd/res/displaymode_slidesorter.png differ
diff --git a/icon-themes/galaxy/cmd/lc_displaymode.png 
b/icon-themes/galaxy/cmd/lc_displaymode.png
new file mode 100644
index 000..481407d
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_displaymode.png differ
diff --git a/icon-themes/galaxy/sd/res/displaymode_handoutmaster.png 
b/icon-themes/galaxy/sd/res/displaymode_handoutmaster.png
new file mode 100644
index 000..8cd68fc
Binary files /dev/null and 
b/icon-themes/galaxy/sd/res/displaymode_handoutmaster.png differ
diff --git a/icon-themes/galaxy/sd/res/displaymode_notes.png 
b/icon-themes/galaxy/sd/res/displaymode_notes.png
new file mode 100644
index 000..01282985
Binary files /dev/null and b/icon-themes/galaxy/sd/res/displaymode_notes.png 
differ
diff --git a/icon-themes/galaxy/sd/res/displaymode_notesmaster.png 
b/icon-themes/galaxy/sd/res/displaymode_notesmaster.png
new file mode 100644
index 000..576ae76
Binary files /dev/null and 
b/icon-themes/galaxy/sd/res/displaymode_notesmaster.png differ
diff --git a/icon-th

[Libreoffice-commits] core.git: chart2/CppunitTest_chart2_trendcalculators.mk chart2/Module_chart2.mk chart2/qa

[Philippe Jung]

 chart2/CppunitTest_chart2_trendcalculators.mk   |  136 +++
 chart2/Module_chart2.mk |1 
 chart2/qa/extras/chart2_trendcalculators.cxx|  214 
 chart2/qa/extras/data/ods/trend_calculators.ods |binary
 4 files changed, 351 insertions(+)

New commits:
commit 733f5887af46d1d5e2fbea6be93cabb2a1749752
Author: Philippe Jung phil.j...@free.fr
Date:   Mon Jun 22 11:41:43 2015 +0200

Add unit tests for chart2 trend calculators

Will be used to check tdf#70673 is fixed. Test will fail before the fix
and should pass after.

Change-Id: I9e0fdc696fb99ac2f0e24b04273391d526c629a6
Reviewed-on: https://gerrit.libreoffice.org/16406
Reviewed-by: Philippe Jung phil.j...@free.fr
Tested-by: Philippe Jung phil.j...@free.fr

diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk 
b/chart2/CppunitTest_chart2_trendcalculators.mk
new file mode 100644
index 000..5187298
--- /dev/null
+++ b/chart2/CppunitTest_chart2_trendcalculators.mk
@@ -0,0 +1,136 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,chart2_trendcalculators))
+
+$(eval $(call gb_CppunitTest_use_externals,chart2_trendcalculators, \
+   boost_headers \
+   libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,chart2_trendcalculators, \
+chart2/qa/extras/chart2_trendcalculators \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,chart2_trendcalculators, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+for \
+forui \
+i18nlangtag \
+msfilter \
+vcl \
+oox \
+sal \
+salhelper \
+sax \
+sb \
+sc \
+sw \
+sd \
+sfx \
+sot \
+svl \
+svt \
+svx \
+svxcore \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vbahelper \
+xo \
+sw \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,chart2_trendcalculators,\
+-I$(SRCDIR)/chart2/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,chart2_trendcalculators,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,chart2_trendcalculators))
+$(eval $(call gb_CppunitTest_use_vcl,chart2_trendcalculators))
+
+$(eval $(call gb_CppunitTest_use_components,chart2_trendcalculators,\
+basic/util/sb \
+animations/source/animcore/animcore \
+chart2/source/controller/chartcontroller \
+chart2/source/chartcore \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+dtrans/util/mcnttype \
+embeddedobj/util/embobj \
+eventattacher/source/evtatt \
+filter/source/config/cache/filterconfig1 \
+filter/source/odfflatxml/odfflatxml \
+filter/source/storagefilterdetect/storagefd \
+filter/source/xmlfilteradaptor/xmlfa \
+filter/source/xmlfilterdetect/xmlfd \
+forms/util/frm \
+framework/util/fwk \
+i18npool/util/i18npool \
+linguistic/source/lng \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+sc/util/sc \
+sc/util/scd \
+sc/util/scfilt \
+sw/util/sw \
+sw/util/swd \
+sw/util/msword \
+sd/util/sd \
+sd/util/sdfilt \
+sd/util/sdd \
+$(call gb_Helper_optional,SCRIPTING, \
+   sc/util/vbaobj) \
+scaddins/source/analysis/analysis \
+scaddins/source/datefunc/date \
+scripting/source/basprov/basprov \
+scripting/util/scriptframe \
+sfx2/util/sfx \
+sot/util/sot \
+svl/source/fsstor/fsstorage \
+svl/util/svl \
+svtools/util/svt \
+svx/util/svx \
+svx/util/svxcore \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+ucb/source/ucp/tdoc/ucptdoc1 \
+unotools/util/utl \
+unoxml/source/rdf/unordf \
+unoxml/source/service/unoxml \
+writerfilter/util/writerfilter \
+xmloff/util/xo \
+xmlscript/util/xmlscript \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,chart2_trendcalculators))
+
+$(call gb_CppunitTest_get_target,chart2_trendcalculators): \
+$(call gb_AllLangResTarget_get_target,sd)
+
+# vim: set noet sw=4 ts=4:
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 16a74a1..de0ab12 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_l10n_targets,chart2,\
 $(eval $(call gb_Module_add_slowcheck_targets,chart2,\
 CppunitTest_chart2_export

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

[Philippe Jung]

 chart2/source/tools/PotentialRegressionCurveCalculator.cxx |   15 ++---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit e0e285574244e855fd148ab7320b1aeb5914655a
Author: Philippe Jung phil.j...@free.fr
Date:   Sun Jun 21 19:08:34 2015 +0200

tdf#92231 Potential regression curve calculation is wrong

Fixes potential regression curve class.

For potential regression curve algorithm, we try to get y = C * D^x
Switching to neperian logs:
   ln(y) = ln(C) + x ln(D)
So we make a linear regression and get
   slope = ln(D) = D = exp(slope)
   intercept = ln(C) = C = exp(intercept)

The current code computes the linear regression between log(y) and
log(x)
It should be between ln(y) and x.
Moreover, the slope is ln(D) so exp(slope) should be returned.
Finally, in getCurveValue, the return value is y = C x^D which is wrong

Change-Id: If8c952001229d3436be48abfef87c8302cf0544f
Reviewed-on: https://gerrit.libreoffice.org/16400
Reviewed-by: Philippe Jung phil.j...@free.fr
Tested-by: Philippe Jung phil.j...@free.fr

diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx 
b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index 7495c91..6f3d438 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -51,6 +51,14 @@ void SAL_CALL 
PotentialRegressionCurveCalculator::recalculateRegression(
 aXValues, aYValues,
 RegressionCalculationHelper::isValidAndBothPositive()));
 
+// We try to get y =C * D^x
+// switching to neperian logs:
+// ln(y) = ln(C) + x ln(D)
+// So we make a linear regression and get
+// slope = ln(D) = D = exp(slope)
+// intercept = ln(C) = C = exp(intercept)
+// Warning: the linear regression is between
+// ln(y) and x. Not between ln(y) and ln(x)
 const size_t nMax = aValues.first.size();
 if( nMax == 0 )
 {
@@ -64,7 +72,7 @@ void SAL_CALL 
PotentialRegressionCurveCalculator::recalculateRegression(
 size_t i = 0;
 for( i = 0; i  nMax; ++i )
 {
-fAverageX += log( aValues.first[i] );
+fAverageX += aValues.first[i] ;
 fAverageY += log( aValues.second[i] );
 }
 
@@ -75,7 +83,7 @@ void SAL_CALL 
PotentialRegressionCurveCalculator::recalculateRegression(
 double fQx = 0.0, fQy = 0.0, fQxy = 0.0;
 for( i = 0; i  nMax; ++i )
 {
-double fDeltaX = log( aValues.first[i] ) - fAverageX;
+double fDeltaX = aValues.first[i] - fAverageX;
 double fDeltaY = log( aValues.second[i] ) - fAverageY;
 
 fQx  += fDeltaX * fDeltaX;
@@ -87,6 +95,7 @@ void SAL_CALL 
PotentialRegressionCurveCalculator::recalculateRegression(
 m_fIntercept = fAverageY - m_fSlope * fAverageX;
 m_fCorrelationCoeffitient = fQxy / sqrt( fQx * fQy );
 
+m_fSlope = exp( m_fSlope );
 m_fIntercept = exp( m_fIntercept );
 }
 
@@ -100,7 +109,7 @@ double SAL_CALL 
PotentialRegressionCurveCalculator::getCurveValue( double x )
 if( ! ( ::rtl::math::isNan( m_fSlope ) ||
 ::rtl::math::isNan( m_fIntercept )))
 {
-fResult = m_fIntercept * pow( x, m_fSlope );
+fResult = m_fIntercept * pow( m_fSlope, x );
 }
 
 return fResult;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 chart2/source/tools/PotentialRegressionCurveCalculator.cxx |   15 ++---
 1 file changed, 3 insertions(+), 12 deletions(-)

New commits:
commit d16e154c627ecc0cb21aaf4b28f7f5ae48ebbde1
Author: Philippe Jung phil.j...@free.fr
Date:   Sun Jun 21 22:09:07 2015 +

Revert tdf#92231 Potential regression curve calculation is wrong

This reverts commit e0e285574244e855fd148ab7320b1aeb5914655a.

Wrong fix

Change-Id: Iddcbb84efbfc88013c6f2a217cb44061016c043b
Reviewed-on: https://gerrit.libreoffice.org/16405
Reviewed-by: Philippe Jung phil.j...@free.fr
Tested-by: Philippe Jung phil.j...@free.fr

diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx 
b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index 6f3d438..7495c91 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -51,14 +51,6 @@ void SAL_CALL 
PotentialRegressionCurveCalculator::recalculateRegression(
 aXValues, aYValues,
 RegressionCalculationHelper::isValidAndBothPositive()));
 
-// We try to get y =C * D^x
-// switching to neperian logs:
-// ln(y) = ln(C) + x ln(D)
-// So we make a linear regression and get
-// slope = ln(D) = D = exp(slope)
-// intercept = ln(C) = C = exp(intercept)
-// Warning: the linear regression is between
-// ln(y) and x. Not between ln(y) and ln(x)
 const size_t nMax = aValues.first.size();
 if( nMax == 0 )
 {
@@ -72,7 +64,7 @@ void SAL_CALL 
PotentialRegressionCurveCalculator::recalculateRegression(
 size_t i = 0;
 for( i = 0; i  nMax; ++i )
 {
-fAverageX += aValues.first[i] ;
+fAverageX += log( aValues.first[i] );
 fAverageY += log( aValues.second[i] );
 }
 
@@ -83,7 +75,7 @@ void SAL_CALL 
PotentialRegressionCurveCalculator::recalculateRegression(
 double fQx = 0.0, fQy = 0.0, fQxy = 0.0;
 for( i = 0; i  nMax; ++i )
 {
-double fDeltaX = aValues.first[i] - fAverageX;
+double fDeltaX = log( aValues.first[i] ) - fAverageX;
 double fDeltaY = log( aValues.second[i] ) - fAverageY;
 
 fQx  += fDeltaX * fDeltaX;
@@ -95,7 +87,6 @@ void SAL_CALL 
PotentialRegressionCurveCalculator::recalculateRegression(
 m_fIntercept = fAverageY - m_fSlope * fAverageX;
 m_fCorrelationCoeffitient = fQxy / sqrt( fQx * fQy );
 
-m_fSlope = exp( m_fSlope );
 m_fIntercept = exp( m_fIntercept );
 }
 
@@ -109,7 +100,7 @@ double SAL_CALL 
PotentialRegressionCurveCalculator::getCurveValue( double x )
 if( ! ( ::rtl::math::isNan( m_fSlope ) ||
 ::rtl::math::isNan( m_fIntercept )))
 {
-fResult = m_fIntercept * pow( m_fSlope, x );
+fResult = m_fIntercept * pow( x, m_fSlope );
 }
 
 return fResult;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - framework/source vcl/source

[Philippe Jung]

 framework/source/uielement/toolbarmanager.cxx |   18 ++
 vcl/source/window/toolbox2.cxx|2 ++
 2 files changed, 20 insertions(+)

New commits:
commit aecee4ff00f81ccd4654edb9124a9b3374c8b824
Author: Philippe Jung phil.j...@free.fr
Date:   Thu Jun 18 15:19:14 2015 +0200

tdf#91953 Mixture of icon sizes

Now, whatever the size of toolbar icons, the toolbar
context menu always shows small icons.

Change-Id: Id17df15278d74ae75a3e82d54ecf7af310e0ceb4
Reviewed-on: https://gerrit.libreoffice.org/16361
Reviewed-by: Philippe Jung phil.j...@free.fr
Tested-by: Philippe Jung phil.j...@free.fr
(cherry picked from commit 3090550b5297c86b63ba09ed1aa13bce4c0e5b70)
Reviewed-on: https://gerrit.libreoffice.org/16365
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Jan Holesovsky ke...@collabora.com

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index bf8fc49..e973cc4 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1715,6 +1715,11 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 if( !(pToolBar-GetFloatStyle()  WB_CLOSEABLE) )
 aQuickCustomizationMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
 
+// Temporary stores a Command -- Url map to update contextual menu 
with the
+// correct icons. The popup icons are by default the same as those in 
the
+// toolbar. They are not correct for contextual popup menu.
+std::map OUString, Image  commandToImage;
+
 // Go through all toolbar items and add them to the context menu
 for ( nPos = 0; nPos  m_pToolBar-GetItemCount(); ++nPos )
 {
@@ -1726,6 +1731,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 pVisibleItemsPopupMenu-CheckItem( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar-IsItemVisible( nId ) );
 pVisibleItemsPopupMenu-SetItemCommand( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
 Image aImage( GetImageFromURL( m_xFrame, aCommandURL, false ) 
);
+commandToImage[aCommandURL] = aImage;
 pVisibleItemsPopupMenu-SetItemImage( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, aImage );
 }
 else
@@ -1733,6 +1739,18 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 pVisibleItemsPopupMenu-InsertSeparator();
 }
 }
+
+// Now we go through all the contextual menu to update the icons
+std::map OUString, Image ::iterator it;
+for ( nPos = 0; nPos  pMenu-GetItemCount(); ++nPos )
+{
+sal_uInt16 nId = pMenu-GetItemId( nPos );
+OUString cmdUrl = pMenu-GetItemCommand( nId );
+it = commandToImage.find( cmdUrl );
+if (it != commandToImage.end()) {
+pMenu-SetItemImage( nId, it-second );
+}
+}
 }
 else
 {
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 4aa4269..1f9ac12 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1828,6 +1828,7 @@ void ToolBox::UpdateCustomMenu()
 {
 sal_uInt16 id = it-mnId + TOOLBOX_MENUITEM_START;
 pMenu-InsertItem( id, it-maText, it-maImageOriginal, 
MenuItemBits::NONE, OString());
+pMenu-SetItemCommand( id, it-maCommandStr );
 pMenu-EnableItem( id, it-mbEnabled );
 pMenu-CheckItem ( id, it-meState == TRISTATE_TRUE );
 }
@@ -1844,6 +1845,7 @@ void ToolBox::UpdateCustomMenu()
 {
 sal_uInt16 id = it-mnId + TOOLBOX_MENUITEM_START;
 pMenu-InsertItem( id, it-maText, it-maImageOriginal, 
MenuItemBits::NONE, OString() );
+pMenu-SetItemCommand( id, it-maCommandStr );
 pMenu-EnableItem( id, it-mbEnabled );
 pMenu-CheckItem( id, it-meState == TRISTATE_TRUE );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 framework/source/uielement/toolbarmanager.cxx |   18 ++
 vcl/source/window/toolbox2.cxx|2 ++
 2 files changed, 20 insertions(+)

New commits:
commit 3090550b5297c86b63ba09ed1aa13bce4c0e5b70
Author: Philippe Jung phil.j...@free.fr
Date:   Thu Jun 18 15:19:14 2015 +0200

tdf#91953 Mixture of icon sizes

Now, whatever the size of toolbar icons, the toolbar
context menu always shows small icons.

Change-Id: Id17df15278d74ae75a3e82d54ecf7af310e0ceb4
Reviewed-on: https://gerrit.libreoffice.org/16361
Reviewed-by: Philippe Jung phil.j...@free.fr
Tested-by: Philippe Jung phil.j...@free.fr

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index ac34a54..fbb1301 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1713,6 +1713,11 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 if( !(pToolBar-GetFloatStyle()  WB_CLOSEABLE) )
 aQuickCustomizationMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
 
+// Temporary stores a Command -- Url map to update contextual menu 
with the
+// correct icons. The popup icons are by default the same as those in 
the
+// toolbar. They are not correct for contextual popup menu.
+std::map OUString, Image  commandToImage;
+
 // Go through all toolbar items and add them to the context menu
 for ( nPos = 0; nPos  m_pToolBar-GetItemCount(); ++nPos )
 {
@@ -1724,6 +1729,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 pVisibleItemsPopupMenu-CheckItem( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar-IsItemVisible( nId ) );
 pVisibleItemsPopupMenu-SetItemCommand( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
 Image aImage( GetImageFromURL( m_xFrame, aCommandURL, false ) 
);
+commandToImage[aCommandURL] = aImage;
 pVisibleItemsPopupMenu-SetItemImage( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, aImage );
 }
 else
@@ -1731,6 +1737,18 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 pVisibleItemsPopupMenu-InsertSeparator();
 }
 }
+
+// Now we go through all the contextual menu to update the icons
+std::map OUString, Image ::iterator it;
+for ( nPos = 0; nPos  pMenu-GetItemCount(); ++nPos )
+{
+sal_uInt16 nId = pMenu-GetItemId( nPos );
+OUString cmdUrl = pMenu-GetItemCommand( nId );
+it = commandToImage.find( cmdUrl );
+if (it != commandToImage.end()) {
+pMenu-SetItemImage( nId, it-second );
+}
+}
 }
 else
 {
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 3e04d1b..585cdb7 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1827,6 +1827,7 @@ void ToolBox::UpdateCustomMenu()
 {
 sal_uInt16 id = it-mnId + TOOLBOX_MENUITEM_START;
 pMenu-InsertItem( id, it-maText, it-maImageOriginal, 
MenuItemBits::NONE, OString());
+pMenu-SetItemCommand( id, it-maCommandStr );
 pMenu-EnableItem( id, it-mbEnabled );
 pMenu-CheckItem ( id, it-meState == TRISTATE_TRUE );
 }
@@ -1843,6 +1844,7 @@ void ToolBox::UpdateCustomMenu()
 {
 sal_uInt16 id = it-mnId + TOOLBOX_MENUITEM_START;
 pMenu-InsertItem( id, it-maText, it-maImageOriginal, 
MenuItemBits::NONE, OString() );
+pMenu-SetItemCommand( id, it-maCommandStr );
 pMenu-EnableItem( id, it-mbEnabled );
 pMenu-CheckItem( id, it-meState == TRISTATE_TRUE );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 framework/source/uielement/toolbarmanager.cxx |   53 +-
 1 file changed, 27 insertions(+), 26 deletions(-)

New commits:
commit 79be3a5e3856593bb759b6e521f06dc99c69c0ae
Author: Philippe Jung phil.j...@free.fr
Date:   Thu Jun 18 15:16:00 2015 +0200

Rename some toolbarmanager related variables

Renames some variable to ease the understanding of what does what

Change-Id: Idd84eb89b7c1fb56dd43d66edfbbeafedc319095
Reviewed-on: https://gerrit.libreoffice.org/16360
Reviewed-by: Philippe Jung phil.j...@free.fr
Tested-by: Philippe Jung phil.j...@free.fr

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index ee1fe47..ac34a54 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1678,12 +1678,12 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 
 // popup menu for quick customization
 bool bHideDisabledEntries = !SvtMenuOptions().IsEntryHidingEnabled();
-::PopupMenu aPopupMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
+::PopupMenu aQuickCustomizationMenu( FwkResId( 
POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
 
 if ( m_pToolBar-IsCustomize() )
 {
 sal_uInt16nPos( 0 );
-::PopupMenu*  pItemMenu( aPopupMenu.GetPopupMenu( 1 ));
+::PopupMenu*  pVisibleItemsPopupMenu( 
aQuickCustomizationMenu.GetPopupMenu( 1 ));
 
 boolbIsFloating( false );
 
@@ -1693,72 +1693,73 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 
 if ( !bIsFloating )
 {
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, false );
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false );
+aQuickCustomizationMenu.EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, 
false );
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false );
 Reference XDockableWindow  xDockable( 
VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
 if( xDockable.is() )
-aPopupMenu.CheckItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, 
xDockable-isLocked() );
+aQuickCustomizationMenu.CheckItem( 
MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, xDockable-isLocked() );
 }
 else
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false 
);
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
 
 if ( SvtMiscOptions().DisableUICustomization() )
 {
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, false );
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false );
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false 
);
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_VISIBLEBUTTON, false );
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false );
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
 }
 
 // Disable menu item CLOSE if the toolbar has no closer
 if( !(pToolBar-GetFloatStyle()  WB_CLOSEABLE) )
-aPopupMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
+aQuickCustomizationMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
 
+// Go through all toolbar items and add them to the context menu
 for ( nPos = 0; nPos  m_pToolBar-GetItemCount(); ++nPos )
 {
 if ( m_pToolBar-GetItemType(nPos) == ToolBoxItemType::BUTTON )
 {
 sal_uInt16 nId = m_pToolBar-GetItemId(nPos);
 OUString aCommandURL = m_pToolBar-GetItemCommand( nId );
-pItemMenu-InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, 
m_pToolBar-GetItemText( nId ), MenuItemBits::CHECKABLE );
-pItemMenu-CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, 
m_pToolBar-IsItemVisible( nId ) );
-pItemMenu-SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, 
aCommandURL );
-pItemMenu-SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos,
- GetImageFromURL( m_xFrame, 
aCommandURL, false )
-   );
+pVisibleItemsPopupMenu-InsertItem( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar-GetItemText( nId ), 
MenuItemBits::CHECKABLE );
+pVisibleItemsPopupMenu-CheckItem( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar-IsItemVisible( nId ) );
+pVisibleItemsPopupMenu-SetItemCommand( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
+Image aImage( GetImageFromURL( m_xFrame, aCommandURL, false ) 
);
+pVisibleItemsPopupMenu-SetItemImage( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, aImage );
 }
 else
 {
-pItemMenu-InsertSeparator

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - framework/source

[Philippe Jung]

 framework/source/uielement/toolbarmanager.cxx |   53 +-
 1 file changed, 27 insertions(+), 26 deletions(-)

New commits:
commit 46d9cecf1e5e317a324ff1370ebb0548e34d7200
Author: Philippe Jung phil.j...@free.fr
Date:   Thu Jun 18 15:16:00 2015 +0200

Rename some toolbarmanager related variables

Renames some variable to ease the understanding of what does what

Change-Id: Idd84eb89b7c1fb56dd43d66edfbbeafedc319095
Reviewed-on: https://gerrit.libreoffice.org/16360
Reviewed-by: Philippe Jung phil.j...@free.fr
Tested-by: Philippe Jung phil.j...@free.fr
(cherry picked from commit 79be3a5e3856593bb759b6e521f06dc99c69c0ae)
Reviewed-on: https://gerrit.libreoffice.org/16363
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index a0492af..bf8fc49 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1680,12 +1680,12 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 
 // popup menu for quick customization
 bool bHideDisabledEntries = !SvtMenuOptions().IsEntryHidingEnabled();
-::PopupMenu aPopupMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
+::PopupMenu aQuickCustomizationMenu( FwkResId( 
POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
 
 if ( m_pToolBar-IsCustomize() )
 {
 sal_uInt16nPos( 0 );
-::PopupMenu*  pItemMenu( aPopupMenu.GetPopupMenu( 1 ));
+::PopupMenu*  pVisibleItemsPopupMenu( 
aQuickCustomizationMenu.GetPopupMenu( 1 ));
 
 boolbIsFloating( false );
 
@@ -1695,72 +1695,73 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 
 if ( !bIsFloating )
 {
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, false );
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false );
+aQuickCustomizationMenu.EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, 
false );
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false );
 Reference XDockableWindow  xDockable( 
VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
 if( xDockable.is() )
-aPopupMenu.CheckItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, 
xDockable-isLocked() );
+aQuickCustomizationMenu.CheckItem( 
MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, xDockable-isLocked() );
 }
 else
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false 
);
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
 
 if ( SvtMiscOptions().DisableUICustomization() )
 {
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, false );
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false );
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false 
);
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_VISIBLEBUTTON, false );
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false );
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
 }
 
 // Disable menu item CLOSE if the toolbar has no closer
 if( !(pToolBar-GetFloatStyle()  WB_CLOSEABLE) )
-aPopupMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
+aQuickCustomizationMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
 
+// Go through all toolbar items and add them to the context menu
 for ( nPos = 0; nPos  m_pToolBar-GetItemCount(); ++nPos )
 {
 if ( m_pToolBar-GetItemType(nPos) == ToolBoxItemType::BUTTON )
 {
 sal_uInt16 nId = m_pToolBar-GetItemId(nPos);
 OUString aCommandURL = m_pToolBar-GetItemCommand( nId );
-pItemMenu-InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, 
m_pToolBar-GetItemText( nId ), MenuItemBits::CHECKABLE );
-pItemMenu-CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, 
m_pToolBar-IsItemVisible( nId ) );
-pItemMenu-SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, 
aCommandURL );
-pItemMenu-SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos,
- GetImageFromURL( m_xFrame, 
aCommandURL, false )
-   );
+pVisibleItemsPopupMenu-InsertItem( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar-GetItemText( nId ), 
MenuItemBits::CHECKABLE );
+pVisibleItemsPopupMenu-CheckItem( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar-IsItemVisible( nId ) );
+pVisibleItemsPopupMenu-SetItemCommand( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
+Image aImage( GetImageFromURL( m_xFrame

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Philippe Jung]

 vcl/source/window/menu.cxx |   29 ++---
 1 file changed, 18 insertions(+), 11 deletions(-)

New commits:
commit fd5c9d91b1d3b1cb7c8a66487c1cb2b27b982199
Author: Philippe Jung phil.j...@free.fr
Date:   Thu Jun 18 11:04:10 2015 +0200

Better position for Toolbar name

The text is badly centered. Replaced GetTextHeight by GetTextBoundRect
and updated computation of text bounds.

Change-Id: I1e177a15787c6eddf2878a7d0254f71f3501ec34
Reviewed-on: https://gerrit.libreoffice.org/16355
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Jan Holesovsky ke...@collabora.com

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index d2b5716..7acd139 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -85,7 +85,7 @@ using namespace ::com::sun::star;
 using namespace vcl;
 
 #define EXTRAITEMHEIGHT 4
-#define SPACE_AROUND_TITLE  2
+#define SPACE_AROUND_TITLE  4
 
 static bool ImplAccelDisabled()
 {
@@ -1631,16 +1631,21 @@ Size Menu::ImplCalcSize( vcl::Window* pWin )
 // Additional space for title
 nTitleHeight = 0;
 if (!IsMenuBar()  aTitleText.getLength()  0) {
-// Vertically, one height of char + extra space for decoration
-nTitleHeight = nFontHeight + 4 * SPACE_AROUND_TITLE ;
-aSz.Height() += nTitleHeight;
-
-// Horizontally, compute text width with bold font
+// Set expected font
 pWin-Push(PushFlags::FONT);
 vcl::Font aFont = pWin-GetFont();
 aFont.SetWeight(WEIGHT_BOLD);
 pWin-SetFont(aFont);
-long nWidth = pWin-GetTextWidth( aTitleText ) + 4 * 
SPACE_AROUND_TITLE;
+
+// Compute text bounding box
+Rectangle aTextBoundRect;
+pWin-GetTextBoundRect(aTextBoundRect, aTitleText);
+
+// Vertically, one height of char + extra space for decoration
+nTitleHeight =  aTextBoundRect.GetSize().Height() + 4 * 
SPACE_AROUND_TITLE ;
+aSz.Height() += nTitleHeight;
+
+long nWidth = aTextBoundRect.GetSize().Width() + 4 * 
SPACE_AROUND_TITLE;
 pWin-Pop();
 if ( nWidth  nMaxWidth )
 nMaxWidth = nWidth;
@@ -1784,10 +1789,12 @@ void Menu::ImplPaintMenuTitle(vcl::RenderContext 
rRenderContext, const Rectangl
 rRenderContext.DrawRect(aBgRect);
 
 // Draw the text centered
-Point aTextTopLeft(rRect.TopLeft());
-long textWidth = rRenderContext.GetTextWidth(aTitleText);
-aTextTopLeft.X() += (aBgRect.getWidth() - textWidth) / 2;
-aTextTopLeft.Y() += SPACE_AROUND_TITLE;
+Point aTextTopLeft(aBgRect.TopLeft());
+Rectangle aTextBoundRect;
+rRenderContext.GetTextBoundRect( aTextBoundRect, aTitleText );
+aTextTopLeft.X() += (aBgRect.getWidth() - 
aTextBoundRect.GetSize().Width()) / 2;
+aTextTopLeft.Y() += (aBgRect.GetHeight() - 
aTextBoundRect.GetSize().Height()) / 2
+- aTextBoundRect.TopLeft().Y();
 rRenderContext.DrawText(aTextTopLeft, aTitleText, 0, 
aTitleText.getLength());
 
 // Restore
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 vcl/source/window/menu.cxx |   29 ++---
 1 file changed, 18 insertions(+), 11 deletions(-)

New commits:
commit a18c551725d7067c8bcf5b6a5ab71b2e78ba3bfa
Author: Philippe Jung phil.j...@free.fr
Date:   Thu Jun 18 11:04:10 2015 +0200

Better position for Toolbar name

The text is badly centered. Replaced GetTextHeight by GetTextBoundRect
and updated computation of text bounds.

Change-Id: I1e177a15787c6eddf2878a7d0254f71f3501ec34
Reviewed-on: https://gerrit.libreoffice.org/16354
Reviewed-by: Philippe Jung phil.j...@free.fr
Tested-by: Philippe Jung phil.j...@free.fr

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index d2b5716..7acd139 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -85,7 +85,7 @@ using namespace ::com::sun::star;
 using namespace vcl;
 
 #define EXTRAITEMHEIGHT 4
-#define SPACE_AROUND_TITLE  2
+#define SPACE_AROUND_TITLE  4
 
 static bool ImplAccelDisabled()
 {
@@ -1631,16 +1631,21 @@ Size Menu::ImplCalcSize( vcl::Window* pWin )
 // Additional space for title
 nTitleHeight = 0;
 if (!IsMenuBar()  aTitleText.getLength()  0) {
-// Vertically, one height of char + extra space for decoration
-nTitleHeight = nFontHeight + 4 * SPACE_AROUND_TITLE ;
-aSz.Height() += nTitleHeight;
-
-// Horizontally, compute text width with bold font
+// Set expected font
 pWin-Push(PushFlags::FONT);
 vcl::Font aFont = pWin-GetFont();
 aFont.SetWeight(WEIGHT_BOLD);
 pWin-SetFont(aFont);
-long nWidth = pWin-GetTextWidth( aTitleText ) + 4 * 
SPACE_AROUND_TITLE;
+
+// Compute text bounding box
+Rectangle aTextBoundRect;
+pWin-GetTextBoundRect(aTextBoundRect, aTitleText);
+
+// Vertically, one height of char + extra space for decoration
+nTitleHeight =  aTextBoundRect.GetSize().Height() + 4 * 
SPACE_AROUND_TITLE ;
+aSz.Height() += nTitleHeight;
+
+long nWidth = aTextBoundRect.GetSize().Width() + 4 * 
SPACE_AROUND_TITLE;
 pWin-Pop();
 if ( nWidth  nMaxWidth )
 nMaxWidth = nWidth;
@@ -1784,10 +1789,12 @@ void Menu::ImplPaintMenuTitle(vcl::RenderContext 
rRenderContext, const Rectangl
 rRenderContext.DrawRect(aBgRect);
 
 // Draw the text centered
-Point aTextTopLeft(rRect.TopLeft());
-long textWidth = rRenderContext.GetTextWidth(aTitleText);
-aTextTopLeft.X() += (aBgRect.getWidth() - textWidth) / 2;
-aTextTopLeft.Y() += SPACE_AROUND_TITLE;
+Point aTextTopLeft(aBgRect.TopLeft());
+Rectangle aTextBoundRect;
+rRenderContext.GetTextBoundRect( aTextBoundRect, aTitleText );
+aTextTopLeft.X() += (aBgRect.getWidth() - 
aTextBoundRect.GetSize().Width()) / 2;
+aTextTopLeft.Y() += (aBgRect.GetHeight() - 
aTextBoundRect.GetSize().Height()) / 2
+- aTextBoundRect.TopLeft().Y();
 rRenderContext.DrawText(aTextTopLeft, aTitleText, 0, 
aTitleText.getLength());
 
 // Restore
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry sd/inc sd/Library_sd.mk sd/sdi sd/source sd/uiconfig

[Philippe Jung]

 icon-themes/galaxy/cmd/lc_movepagedown.png   
|binary
 icon-themes/galaxy/cmd/lc_movepagefirst.png  
|binary
 icon-themes/galaxy/cmd/lc_movepagelast.png   
|binary
 icon-themes/galaxy/cmd/lc_movepageup.png 
|binary
 icon-themes/galaxy/cmd/sc_movepagedown.png   
|binary
 icon-themes/galaxy/cmd/sc_movepagefirst.png  
|binary
 icon-themes/galaxy/cmd/sc_movepagelast.png   
|binary
 icon-themes/galaxy/cmd/sc_movepageup.png 
|binary
 icon-themes/tango/cmd/lc_movepagedown.png
|binary
 icon-themes/tango/cmd/lc_movepagefirst.png   
|binary
 icon-themes/tango/cmd/lc_movepagelast.png
|binary
 icon-themes/tango/cmd/lc_movepageup.png  
|binary
 icon-themes/tango/cmd/sc_movepagedown.png
|binary
 icon-themes/tango/cmd/sc_movepagefirst.png   
|binary
 icon-themes/tango/cmd/sc_movepagelast.png
|binary
 icon-themes/tango/cmd/sc_movepageup.png  
|binary
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
88 
 sd/Library_sd.mk |
1 
 sd/inc/app.hrc   |   
10 
 sd/sdi/SlideSorterController.sdi |   
20 +
 sd/sdi/_drvwsh.sdi   |   
21 +
 sd/sdi/sdraw.sdi |  
193 +
 sd/source/core/drawdoc2.cxx  |
4 
 sd/source/ui/func/funavig.cxx|  
156 +++
 sd/source/ui/inc/DrawViewShell.hxx   |   
14 
 sd/source/ui/inc/SlideSorterViewShell.hxx|   
16 
 sd/source/ui/inc/funavig.hxx |   
50 ++
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx  |  
200 ++
 sd/source/ui/view/drviewsa.cxx   |   
61 +++
 sd/uiconfig/sdraw/toolbar/standardbar.xml|   
10 
 sd/uiconfig/simpress/toolbar/standardbar.xml |   
10 
 31 files changed, 852 insertions(+), 2 deletions(-)

New commits:
commit d18afcc9125f427c0e6693900d24f894068d7e56
Author: Philippe Jung phil.j...@free.fr
Date:   Wed Jun 10 16:09:23 2015 +0200

tdf#91909 Uno commands for slide navigation and sorting

The following change adds the following uno commands to
draw and impress. Commands are in standard toolbar and
not visible by default.

NextPage: go to the next page
PreviousPage: go to the previous page
FirstPage: go to the first page
LastPage: go the the last page

MovePageUp: Moves the current selection above the page
preceding the selection.
MovePageDown: Moves the current selection below the page
following the selection.
MovePageTop: Moves the selection to the top.
MovePageBottom: Moves the current selection to the bottom.

Change-Id: I2dbd923f14fd9901fb513c58b51bc7ab91ad0a83
Reviewed-on: https://gerrit.libreoffice.org/16211
Reviewed-by: Philippe Jung phil.j...@free.fr
Tested-by: Philippe Jung phil.j...@free.fr

diff --git a/icon-themes/galaxy/cmd/lc_movepagedown.png 
b/icon-themes/galaxy/cmd/lc_movepagedown.png
new file mode 100644
index 000..e7b6799
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_movepagedown.png differ
diff --git a/icon-themes/galaxy/cmd/lc_movepagefirst.png 
b/icon-themes/galaxy/cmd/lc_movepagefirst.png
new file mode 100644
index 000..8fbb73b
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_movepagefirst.png differ
diff --git a/icon-themes/galaxy/cmd/lc_movepagelast.png 
b/icon-themes/galaxy/cmd/lc_movepagelast.png
new file mode 100644
index 000..28559a9
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_movepagelast.png differ
diff --git a/icon-themes/galaxy/cmd/lc_movepageup.png 
b/icon-themes/galaxy/cmd/lc_movepageup.png
new file mode 100644
index 000..c241105
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_movepageup.png differ
diff --git a/icon-themes/galaxy/cmd/sc_movepagedown.png 
b/icon-themes/galaxy/cmd/sc_movepagedown.png
new file mode 100644
index 000..b8b13e3
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_movepagedown.png differ
diff --git a/icon-themes/galaxy/cmd/sc_movepagefirst.png 
b/icon-themes/galaxy/cmd/sc_movepagefirst.png
new file mode 100644
index 000..13e5a53
Binary files /dev/null and b/icon-themes/galaxy/cmd

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

[Philippe Jung]

 sd/inc/app.hrc |  204 ++---
 sd/source/ui/func/fusnapln.cxx |1 
 2 files changed, 112 insertions(+), 93 deletions(-)

New commits:
commit 35fe915b7cf508356a88897d520b89fc986407fb
Author: Philippe Jung phil.j...@free.fr
Date:   Wed Jun 10 15:47:52 2015 +0200

Fix sd ID conflicts and duplicates

Fix the following cases:
- two names for same ID in sd/inc/app.hrc. Two ID defined.
- ID defined in include/sfx2/sfxsids.hrc and redefined in
  sd/inc/app.hrc. Only the sfx2 ID is kept
- ID defined in include/svx/svxids.hrc and redefined in
  sd/inc/app.hrc. Only the svx ID is kept

Change-Id: I21c7c25cb6db3c43ea2f9aac5aac75fabe61eaf0
Reviewed-on: https://gerrit.libreoffice.org/16209
Reviewed-by: Philippe Jung phil.j...@free.fr
Tested-by: Philippe Jung phil.j...@free.fr

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 4f3d82e..747a95d 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -63,66 +63,74 @@
 #define HID_SD_CELL_STYLE_LAST_COLUMN   (HID_SD_START + 
199)
 
 #define SID_PAGESETUP   (SID_SD_START+2)
+// FREE
 #define SID_COPYOBJECTS (SID_SD_START+4)
 #define SID_MANAGE_LINKS(SID_SD_START+5)
+// FREE
 #define SID_CONVERT_TO_3D_LATHE (SID_SD_START+8)
 #define SID_DRAWINGMODE (SID_SD_START+9)
 #define SID_OUTLINEMODE (SID_SD_START+10)
 #define SID_DIAMODE (SID_SD_START+11)
+// FREE
 #define SID_INSERTPAGE  (SID_SD_START+14)
 #define SID_INSERTFILE  (SID_SD_START+15)
 #define SID_INSERTSYMBOL(SID_SD_START+16)
 #define SID_ZOOM_PANNING(SID_SD_START+17)
 #define SID_PRESENTATION_END(SID_SD_START+18)
+// FREE
 #define SID_POSITION(SID_SD_START+22)
 #define SID_MIRROR  (SID_SD_START+23)
 #define SID_CONVERT (SID_SD_START+24)
+// FREE
 #define SID_COMBINE (SID_SD_START+26)
 #define SID_NAME_GROUP  (SID_SD_START+27)
 #define SID_DRAWTBX_CONNECTORS  (SID_SD_START+28)
 #define SID_TEXTALIGNMENT   (SID_SD_START+29)
-#define SID_BEZIER_ELIMINATE_POINTS (SID_SD_START+30)
+// In svxids.hrc: SID_BEZIER_ELIMINATE_POINTS   (SID_SD_START+30)
 #define SID_MOREFRONT   (SID_SD_START+31)
 #define SID_MOREBACK(SID_SD_START+32)
-
 // #i68101#
 #define SID_OBJECT_TITLE_DESCRIPTION(SID_SD_START+33)
-
 #define SID_VERTICAL(SID_SD_START+34)
 #define SID_HORIZONTAL  (SID_SD_START+35)
 #define SID_CHANGEBEZIER(SID_SD_START+36)
 #define SID_CHANGEPOLYGON   (SID_SD_START+37)
 #define SID_CAPTUREPOINT(SID_SD_START+38)
-#define SID_RULER   (SID_SD_START+40)
-#define SID_INSERTLAYER (SID_SD_START+43)
-#define SID_EDIT_OUTLINER   (SID_SD_START+44)
-#define SID_SWITCHPAGE  (SID_SD_START+45)
-#define SID_MODIFYPAGE  (SID_SD_START+46)
-#define SID_SWITCHLAYER (SID_SD_START+47)
-#define SID_MODIFYLAYER (SID_SD_START+48)
-#define SID_PAGEMODE(SID_SD_START+49)
-#define SID_LAYERMODE   (SID_SD_START+50)
-#define SID_DRAW_MEASURELINE(SID_SD_START+51)
-#define SID_STARTAPP(SID_SD_START+52)
-#define SID_MASTERPAGE  (SID_SD_START+53)
-#define SID_TOOL_CONNECTOR  (SID_SD_START+58)
+#define SID_INSERTLAYER (SID_SD_START+39)
+// In svxids.hrc: SID_RULER (SID_SD_START+40)
+#define SID_EDIT_OUTLINER   (SID_SD_START+41)
+#define SID_SWITCHPAGE  (SID_SD_START+42)
+#define SID_MODIFYPAGE  (SID_SD_START+43)
+#define SID_SWITCHLAYER (SID_SD_START+44)
+#define SID_MODIFYLAYER (SID_SD_START+45)
+#define SID_PAGEMODE(SID_SD_START+46)
+#define SID_LAYERMODE   (SID_SD_START+47)
+#define SID_DRAW_MEASURELINE(SID_SD_START+48)
+#define SID_STARTAPP(SID_SD_START+49)
+#define SID_MASTERPAGE  (SID_SD_START+50)
+// FREE
+#define SID_TOOL_CONNECTOR  (SID_SD_START+61)
 #define SID_ANIMATION_OBJECTS   (SID_SD_START+62)
 #define SID_ANIMATION_EFFECTS   (SID_SD_START+63)
 #define SID_PRESENTATION_LAYOUT (SID_SD_START+64)
-#define SID_BEZIER_CONVERT  (SID_SD_START+65)
-#define SID_BEZIER_EDGE (SID_SD_START+66)
-#define

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

[Philippe Jung]

 sw/source/core/txtnode/thints.cxx |   40 +-
 1 file changed, 35 insertions(+), 5 deletions(-)

New commits:
commit 677b373427d3db8d751600b8c540a6afe07f142e
Author: Philippe Jung phil.j...@free.fr
Date:   Tue Jun 2 17:43:19 2015 +0200

tdf#91228 Fix Writer crash

Start Writer, Insert Image, Anchor as character, Go after
image, press enter, writer crash

This is because m_pAnchoredFly is not updated.

JoinPrev, JoinNext and SplitContentNode all rely on CutText with calls
InsertHint. InsertHint calls SetAnchor. SetAnchor calls Modify callback
except if LockModifyed. This patch ensures that, whatever the value of
LockModify, the references are kept correct.

Reviewed-on: https://gerrit.libreoffice.org/16041
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 9f01951b858453684f2622541af0eb85d4544fc6)
Signed-off-by: Michael Stahl mst...@redhat.com

Conflicts:
sw/source/core/txtnode/thints.cxx

Change-Id: Id7254784c6954db4b542b2c4228b388fb924bbc2
(cherry picked from commit 7ea3a2b5747f148cbdc9a065728cefff1a660bd7)
Reviewed-on: https://gerrit.libreoffice.org/16050
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index a03b391a7..37b0c26 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1277,19 +1277,44 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, 
const SetAttrMode nMode )
 {
 SwTxtFlyCnt *pFly = (SwTxtFlyCnt *)pAttr;
 SwFrmFmt* pFmt = pAttr-GetFlyCnt().GetFrmFmt();
+
+// In order to maintain data coherency, if the hint is a fly
+// moved from a text node to another, we have to remove it from
+// the first textnode then to add it to the new (this) textnode
+const SwFmtAnchor* pAnchor = 0;
+pFmt-GetItemState( RES_ANCHOR, false,
+reinterpret_castconst SfxPoolItem**(pAnchor) );
+
+SwIndex aIdx( this, pAttr-GetStart() );
+
+bool bChangeFlyParentNode( false );
+if (pAnchor 
+pAnchor-GetAnchorId() == FLY_AS_CHAR 
+pAnchor-GetCntntAnchor() 
+pAnchor-GetCntntAnchor()-nNode != *this)
+{
+
assert(pAnchor-GetCntntAnchor()-nNode.GetNode().IsTxtNode());
+SwTxtNode* textNode = 
pAnchor-GetCntntAnchor()-nNode.GetNode().GetTxtNode();
+
+if ( textNode-IsModifyLocked() )
+{
+//  Fly parent has changed but the FlyFormat is 
locked, so it will
+//  not be updated by SetAnchor (that calls Modify 
that updates
+//  relationships)
+textNode-RemoveAnchoredFly( pFmt );
+bChangeFlyParentNode = true;
+}
+}
+
 if( !(nsSetAttrMode::SETATTR_NOTXTATRCHR  nInsMode) )
 {
+
 // Wir muessen zuerst einfuegen, da in SetAnchor()
 // dem FlyFrm GetStart() uebermittelt wird.
 //JP 11.05.98: falls das Anker-Attribut schon richtig
 // gesetzt ist, dann korrigiere dieses nach dem Einfuegen
 // des Zeichens. Sonst muesste das immer  ausserhalb
 // erfolgen (Fehleranfaellig !)
-const SwFmtAnchor* pAnchor = 0;
-pFmt-GetItemState( RES_ANCHOR, false,
-(const SfxPoolItem**)pAnchor );
-
-SwIndex aIdx( this, pAttr-GetStart() );
 const OUString c(GetCharOfTxtAttr(*pAttr));
 OUString const ins( InsertText(c, aIdx, nInsertFlags) );
 if (ins.isEmpty())
@@ -1353,6 +1378,11 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, 
const SetAttrMode nMode )
 return false;
 }
 }
+
+// Finish relationships update now that SetAnchor has fixed 
part of it.
+if (bChangeFlyParentNode)
+AddAnchoredFly( pFmt );
+
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 vcl/source/window/menufloatingwindow.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8ced97caa409d6dc8f69230145e9c9f281fb84fe
Author: Philippe Jung phil.j...@free.fr
Date:   Tue Jun 9 16:01:54 2015 +0200

Last item of menu with title cannot be hilighted

Seing the fix, it probably also impacts scrolled floating menus.

Change-Id: Ia740573c3ed54cf01a57575a2ca00d49165be28d
Reviewed-on: https://gerrit.libreoffice.org/16187
Reviewed-by: Philippe Jung phil.j...@free.fr
Tested-by: Philippe Jung phil.j...@free.fr

diff --git a/vcl/source/window/menufloatingwindow.cxx 
b/vcl/source/window/menufloatingwindow.cxx
index cd92d11..8af281b 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -190,7 +190,7 @@ void MenuFloatingWindow::ImplHighlightItem( const 
MouseEvent rMEvt, bool bMBDow
 long nY = GetInitialItemY();
 long nMouseY = rMEvt.GetPosPixel().Y();
 Size aOutSz = GetOutputSizePixel();
-if ( ( nMouseY = nY )  ( nMouseY  ( aOutSz.Height() - nY ) ) )
+if ( ( nMouseY = nY )  ( nMouseY  ( aOutSz.Height() + nY ) ) )
 {
 bool bHighlighted = false;
 size_t nCount = pMenu-pItemList-size();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Philippe Jung]

 vcl/source/window/menufloatingwindow.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab78b52b249bfd32892786c51d93bfd61a4db371
Author: Philippe Jung phil.j...@free.fr
Date:   Tue Jun 9 16:01:54 2015 +0200

Last item of menu with title cannot be hilighted

Seing the fix, it probably also impacts scrolled floating menus.

Change-Id: Ia740573c3ed54cf01a57575a2ca00d49165be28d
Reviewed-on: https://gerrit.libreoffice.org/16188
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com

diff --git a/vcl/source/window/menufloatingwindow.cxx 
b/vcl/source/window/menufloatingwindow.cxx
index abebd19..8127536 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -190,7 +190,7 @@ void MenuFloatingWindow::ImplHighlightItem( const 
MouseEvent rMEvt, bool bMBDow
 long nY = GetInitialItemY();
 long nMouseY = rMEvt.GetPosPixel().Y();
 Size aOutSz = GetOutputSizePixel();
-if ( ( nMouseY = nY )  ( nMouseY  ( aOutSz.Height() - nY ) ) )
+if ( ( nMouseY = nY )  ( nMouseY  ( aOutSz.Height() + nY ) ) )
 {
 bool bHighlighted = false;
 size_t nCount = pMenu-pItemList-size();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - officecfg/registry sw/inc sw/sdi sw/source

[Philippe Jung]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   18 +++
 sw/inc/cmdid.h  |6 -
 sw/sdi/_tabsh.sdi   |   16 +++
 sw/sdi/swriter.sdi  |   50 
++
 sw/source/uibase/shells/tabsh.cxx   |   14 ++
 5 files changed, 100 insertions(+), 4 deletions(-)

New commits:
commit 396f1f145ab502a2dba269c986f1f8d172f824e7
Author: Philippe Jung phil.j...@free.fr
Date:   Fri Jun 5 11:46:34 2015 +0200

WRITER: readd InsertRows/InsertCols

Following ESC decision, uno commands InsertRows / InsertColumns
must be added to the current one InsertRowsBefore / InsertColumnsBefore
and InsertRowsAfter / InsertColumnsAfter.
This will guarantee ascending compatibility while making more explicit
the behaviour thanks to the new commands.

Change-Id: I31964e3bdfa63b9447edb794fe233e2665651142
Reviewed-on: https://gerrit.libreoffice.org/16098
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Jan Holesovsky ke...@collabora.com

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 736e956..728f2d3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1132,6 +1132,15 @@
   value1/value
 /prop
   /node
+  !-- 2015/06 The next one is to be deprecated one day or another --
+  node oor:name=.uno:InsertRows oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USInsert Row Below/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
   node oor:name=.uno:InsertRowsAfter oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USInsert Rows Below/value
@@ -1162,6 +1171,15 @@
   value1/value
 /prop
   /node
+  !-- 2015/06 The next one is to be deprecated one day or another --
+  node oor:name=.uno:InsertColumns oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USInsert Column Right/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
   node oor:name=.uno:InsertColumnsAfter oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USInsert Columns Right/value
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 7c15b3a..4f77923 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -334,20 +334,22 @@
 
 #define FN_TABLE_REP(FN_FORMAT + 99)  /* TableRepresentation */
 #define FN_CONVERT_TEXT_TABLE   (FN_FORMAT + 100)  /* convert text - 
table */
-#define FN_TABLE_INSERT_ROW_AFTER   (FN_FORMAT + 101)  /* */
-#define FN_TABLE_INSERT_COL_AFTER   (FN_FORMAT + 102)  /* */
+#define FN_TABLE_INSERT_ROW (FN_FORMAT + 101)  /* */
+#define FN_TABLE_INSERT_COL (FN_FORMAT + 102)  /* */
 #define FN_TABLE_DELETE_ROW (FN_FORMAT + 103)  /* */
 #define FN_TABLE_DELETE_COL (FN_FORMAT + 104)  /* */
 #define FN_TABLE_SPLIT_CELLS(FN_FORMAT + 105)  /* */
 #define FN_TABLE_MERGE_CELLS(FN_FORMAT + 106)  /* */
 #define FN_TABLE_SET_ROW_HEIGHT (FN_FORMAT + 107)  /* */
 #define FN_TABLE_SET_COL_WIDTH  (FN_FORMAT + 108)  /* */
+#define FN_TABLE_INSERT_ROW_AFTER   (FN_FORMAT + 109)  /* */
 #define FN_OPTIMIZE_TABLE   (FN_FORMAT + 110)  /* ToolBoxItem for 
optimizing tables */
 #define FN_TABLE_INSERT_ROW_BEFORE  (FN_FORMAT + 111)  /* */
 #define FN_TABLE_INSERT_COL_BEFORE  (FN_FORMAT + 112)  /* */
 #define FN_TABLE_SELECT_ROW (FN_FORMAT + 113)  /* */
 #define FN_TABLE_SELECT_COL (FN_FORMAT + 114)  /* */
 #define FN_TABLE_SELECT_ALL (FN_FORMAT + 115)  /* */
+#define FN_TABLE_INSERT_COL_AFTER   (FN_FORMAT + 116)  /* */
 #define FN_TABLE_SET_READ_ONLY_CELLS (FN_FORMAT + 117)  /* protect table cells 
*/
 #define FN_TABLE_UNSET_READ_ONLY_CELLS  (FN_FORMAT + 119)  /* undo table cell 
protection */
 #define FN_TABLE_HEADLINE_REPEAT(FN_FORMAT + 120)   /* also used in 
SwXTextTable*/
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index 63792fe..b8be301 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -148,6 +148,14 @@ interface BaseTextTable
 DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
 ]
 
+// 2015/06 Deprecated, replaced by INSERT_COL_AFTER
+FN_TABLE_INSERT_COL // status(final|play)
+[
+ExecMethod = Execute ;
+StateMethod = NoState ;
+DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
+]
+
 FN_TABLE_INSERT_COL_AFTER // status(final|play)
 [
 ExecMethod = Execute ;
@@ -176,6 +184,14 @@ interface

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

[Philippe Jung]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   18 +++
 sw/inc/cmdid.h  |6 -
 sw/sdi/_tabsh.sdi   |   16 +++
 sw/sdi/swriter.sdi  |   50 
++
 sw/source/uibase/shells/tabsh.cxx   |   14 ++
 5 files changed, 100 insertions(+), 4 deletions(-)

New commits:
commit 55bcba1e0aba237a873ee1f788761045a8eff846
Author: Philippe Jung phil.j...@free.fr
Date:   Fri Jun 5 11:46:34 2015 +0200

WRITER: readd InsertRows/InsertCols

Following ESC decision, uno commands InsertRows / InsertColumns
must be added to the current one InsertRowsBefore / InsertColumnsBefore
and InsertRowsAfter / InsertColumnsAfter.
This will guarantee ascending compatibility while making more explicit
the behaviour thanks to the new commands.

Change-Id: I31964e3bdfa63b9447edb794fe233e2665651142
Reviewed-on: https://gerrit.libreoffice.org/16097
Reviewed-by: Philippe Jung phil.j...@free.fr
Tested-by: Jenkins c...@libreoffice.org

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 43e97fa..b72659c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1144,6 +1144,15 @@
   value1/value
 /prop
   /node
+  !-- 2015/06 The next one is to be deprecated one day or another --
+  node oor:name=.uno:InsertRows oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USInsert Row Below/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
   node oor:name=.uno:InsertRowsAfter oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USInsert Rows Below/value
@@ -1174,6 +1183,15 @@
   value1/value
 /prop
   /node
+  !-- 2015/06 The next one is to be deprecated one day or another --
+  node oor:name=.uno:InsertColumns oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USInsert Column Right/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
   node oor:name=.uno:InsertColumnsAfter oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USInsert Columns Right/value
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 7c15b3a..4f77923 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -334,20 +334,22 @@
 
 #define FN_TABLE_REP(FN_FORMAT + 99)  /* TableRepresentation */
 #define FN_CONVERT_TEXT_TABLE   (FN_FORMAT + 100)  /* convert text - 
table */
-#define FN_TABLE_INSERT_ROW_AFTER   (FN_FORMAT + 101)  /* */
-#define FN_TABLE_INSERT_COL_AFTER   (FN_FORMAT + 102)  /* */
+#define FN_TABLE_INSERT_ROW (FN_FORMAT + 101)  /* */
+#define FN_TABLE_INSERT_COL (FN_FORMAT + 102)  /* */
 #define FN_TABLE_DELETE_ROW (FN_FORMAT + 103)  /* */
 #define FN_TABLE_DELETE_COL (FN_FORMAT + 104)  /* */
 #define FN_TABLE_SPLIT_CELLS(FN_FORMAT + 105)  /* */
 #define FN_TABLE_MERGE_CELLS(FN_FORMAT + 106)  /* */
 #define FN_TABLE_SET_ROW_HEIGHT (FN_FORMAT + 107)  /* */
 #define FN_TABLE_SET_COL_WIDTH  (FN_FORMAT + 108)  /* */
+#define FN_TABLE_INSERT_ROW_AFTER   (FN_FORMAT + 109)  /* */
 #define FN_OPTIMIZE_TABLE   (FN_FORMAT + 110)  /* ToolBoxItem for 
optimizing tables */
 #define FN_TABLE_INSERT_ROW_BEFORE  (FN_FORMAT + 111)  /* */
 #define FN_TABLE_INSERT_COL_BEFORE  (FN_FORMAT + 112)  /* */
 #define FN_TABLE_SELECT_ROW (FN_FORMAT + 113)  /* */
 #define FN_TABLE_SELECT_COL (FN_FORMAT + 114)  /* */
 #define FN_TABLE_SELECT_ALL (FN_FORMAT + 115)  /* */
+#define FN_TABLE_INSERT_COL_AFTER   (FN_FORMAT + 116)  /* */
 #define FN_TABLE_SET_READ_ONLY_CELLS (FN_FORMAT + 117)  /* protect table cells 
*/
 #define FN_TABLE_UNSET_READ_ONLY_CELLS  (FN_FORMAT + 119)  /* undo table cell 
protection */
 #define FN_TABLE_HEADLINE_REPEAT(FN_FORMAT + 120)   /* also used in 
SwXTextTable*/
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index 63792fe..b8be301 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -148,6 +148,14 @@ interface BaseTextTable
 DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
 ]
 
+// 2015/06 Deprecated, replaced by INSERT_COL_AFTER
+FN_TABLE_INSERT_COL // status(final|play)
+[
+ExecMethod = Execute ;
+StateMethod = NoState ;
+DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
+]
+
 FN_TABLE_INSERT_COL_AFTER // status(final|play)
 [
 ExecMethod = Execute ;
@@ -176,6 +184,14 @@ interface

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

[Philippe Jung]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   24 
 sc/inc/sc.hrc |8 -
 sc/inc/sccommands.h   |2 
 sc/sdi/cellsh.sdi |2 
 sc/sdi/scalc.sdi  |   52 
++
 sc/source/ui/view/cellsh.cxx  |2 
 sc/source/ui/view/cellsh1.cxx |2 
 sc/source/ui/view/tabview3.cxx|2 
 8 files changed, 91 insertions(+), 3 deletions(-)

New commits:
commit 1fb3ec2aa48f625388773beab5ca4b2c3e10e930
Author: Philippe Jung phil.j...@free.fr
Date:   Fri Jun 5 13:35:12 2015 +0200

CALC: readd InsertRows/InsertCols

Following ESC decision, uno commands InsertRows / InsertColumns
must be added to the current one InsertRowsBefore /
InsertColumnsBefore and InsertRowsAfter / InsertColumnsAfter.
This will guarantee ascending compatibility while making more
explicit the behaviour thanks to the new commands.
For Calc, these commands are equivalent to InsertxxxBefore

Change-Id: I3aada5c9b03c504e6728c33cad2b2d569df1d60a
Reviewed-on: https://gerrit.libreoffice.org/16099
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Philippe Jung phil.j...@free.fr

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 1d8490f..61b3b5b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1075,6 +1075,18 @@
   value1/value
 /prop
   /node
+  !-- 2015/06 Deprecated, use InsertRowsBefore instead --
+  node oor:name=.uno:InsertRows oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USInsert ~Rows Above/value
+/prop
+prop oor:name=ContextLabel oor:type=xs:string
+  value xml:lang=en-USRows ~Above/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
   node oor:name=.uno:InsertRowsBefore oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USInsert ~Rows Above/value
@@ -1086,6 +1098,18 @@
   value1/value
 /prop
   /node
+  !-- 2015/06 Deprecated, use InsertColumnsBefore instead --
+  node oor:name=.uno:InsertColumns oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USInsert Co~lumns Left/value
+/prop
+prop oor:name=ContextLabel oor:type=xs:string
+  value xml:lang=en-USColumns ~Left/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
   node oor:name=.uno:InsertColumnsBefore oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USInsert Co~lumns Left/value
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 2cbd8d14..da4678d 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -322,8 +322,8 @@
 #define FID_DEL_COLBRK  (INSERT_MENU_START + 4)
 #define FID_INS_CELL_CONTENTS   (INSERT_MENU_START + 5)
 #define FID_INS_CELL(INSERT_MENU_START + 6)
-#define FID_INS_ROWS_BEFORE (INSERT_MENU_START + 7)
-#define FID_INS_COLUMNS_BEFORE  (INSERT_MENU_START + 8)
+#define FID_INS_ROW (INSERT_MENU_START + 7)
+#define FID_INS_COLUMN  (INSERT_MENU_START + 8)
 #define FID_INS_TABLE   (INSERT_MENU_START + 9)
 #define SID_INS_FUNCTION(INSERT_MENU_START + 10)
 #define FID_DEFINE_NAME (INSERT_MENU_START + 11)
@@ -336,7 +336,9 @@
 #define FID_INS_CELLSRIGHT  (INSERT_MENU_START + 19)
 #define FID_INS_ROWS_AFTER  (INSERT_MENU_START + 20)
 #define FID_INS_COLUMNS_AFTER   (INSERT_MENU_START + 21)
-#define INSERT_MENU_END (INSERT_MENU_START + 22)
+#define FID_INS_ROWS_BEFORE (INSERT_MENU_START + 22)
+#define FID_INS_COLUMNS_BEFORE  (INSERT_MENU_START + 23)
+#define INSERT_MENU_END (INSERT_MENU_START + 24)
 
 #define FORMAT_MENU_START   (INSERT_MENU_END)
 #define FID_CELL_FORMAT (FORMAT_MENU_START)
diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h
index e931c19..95c5b7f 100644
--- a/sc/inc/sccommands.h
+++ b/sc/inc/sccommands.h
@@ -45,9 +45,11 @@
 #define CMD_FID_INS_CELL.uno:InsertCell
 #define CMD_FID_INS_COLBRK  .uno:InsertColumnBreak
 #define CMD_FID_INS_COLUMNS_AFTER   .uno:InsertColumnsAfter
+#define CMD_FID_INS_COLUMN  .uno:InsertColumns
 #define CMD_FID_INS_COLUMNS_BEFORE  .uno:InsertColumnsBefore
 #define CMD_FID_INS_ROWBRK  .uno:InsertRowBreak

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/source

[Philippe Jung]

 sd/source/ui/inc/ToolBarManager.hxx  |1 +
 sd/source/ui/view/ToolBarManager.cxx |9 ++---
 sd/source/ui/view/drviews1.cxx   |   24 
 3 files changed, 23 insertions(+), 11 deletions(-)

New commits:
commit db79d2710e78c712763aaba0dc74165da5ad01cc
Author: Philippe Jung phil.j...@free.fr
Date:   Wed Jun 3 16:28:02 2015 +0200

tdf#87822 Impress: hide common task toolbar in master view

When Master Slide or Master Notes are active,
hides the Common task toolbar as it it not usefull.

Change-Id: Ice07661bf203c029d733614e1eceb5ef3d0661f9
Reviewed-on: https://gerrit.libreoffice.org/16060
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com
(cherry picked from commit 1191ed8584f9fd63c39514dd2e3e71682913d4bc)
Reviewed-on: https://gerrit.libreoffice.org/16061
Reviewed-by: Jan Holesovsky ke...@collabora.com

diff --git a/sd/source/ui/inc/ToolBarManager.hxx 
b/sd/source/ui/inc/ToolBarManager.hxx
index b5b9f80..5263dd0 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -126,6 +126,7 @@ public:
 
 TBG_PERMANENT = TBG__FIRST,
 TBG_FUNCTION,
+TBG_COMMON_TASK,
 TBG_MASTER_MODE,
 
 TBG__LAST = TBG_MASTER_MODE
diff --git a/sd/source/ui/view/ToolBarManager.cxx 
b/sd/source/ui/view/ToolBarManager.cxx
index 403230c..9e59223 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -1001,9 +1001,6 @@ void ToolBarRules::MainViewShellChanged 
(ViewShell::ShellType nShellType)
 ToolBarManager::msOptionsToolBar);
 mpToolBarManager-AddToolBar(
 ToolBarManager::TBG_PERMANENT,
-ToolBarManager::msCommonTaskToolBar);
-mpToolBarManager-AddToolBar(
-ToolBarManager::TBG_PERMANENT,
 ToolBarManager::msViewerToolBar);
 break;
 
@@ -1065,10 +1062,16 @@ void ToolBarRules::MainViewShellChanged (const 
ViewShell rMainViewShell)
 const DrawViewShell* pDrawViewShell
 = dynamic_castconst DrawViewShell*(rMainViewShell);
 if (pDrawViewShell != NULL)
+{
 if (pDrawViewShell-GetEditMode() == EM_MASTERPAGE)
 mpToolBarManager-AddToolBar(
 ToolBarManager::TBG_MASTER_MODE,
 ToolBarManager::msMasterViewToolBar);
+else
+mpToolBarManager-AddToolBar(
+ToolBarManager::TBG_COMMON_TASK,
+ToolBarManager::msCommonTaskToolBar);
+}
 break;
 }
 
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 9aa19da..109d82c 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -363,14 +363,18 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool 
bIsLayerModeActive)
 // view.
 bool bShowMasterViewToolbar (meEditMode == EM_MASTERPAGE
   GetShellType() != ViewShell::ST_HANDOUT);
+bool bShowPresentationToolbar (meEditMode != EM_MASTERPAGE
+  GetShellType() != ViewShell::ST_HANDOUT);
 
 // If the master view toolbar is not shown we hide it before
 // switching the edit mode.
 if (::sd::ViewShell::mpImpl-mbIsInitialized
- IsMainViewShell()
- ! bShowMasterViewToolbar)
+ IsMainViewShell())
 {
-
GetViewShellBase().GetToolBarManager()-ResetToolBars(ToolBarManager::TBG_MASTER_MODE);
+if ( !bShowMasterViewToolbar )
+
GetViewShellBase().GetToolBarManager()-ResetToolBars(ToolBarManager::TBG_MASTER_MODE);
+if ( !bShowPresentationToolbar )
+
GetViewShellBase().GetToolBarManager()-ResetToolBars(ToolBarManager::TBG_COMMON_TASK);
 }
 
 if (meEditMode == EM_PAGE)
@@ -441,12 +445,16 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool 
bIsLayerModeActive)
 // If the master view toolbar is to be shown we turn it on after the
 // edit mode has been changed.
 if (::sd::ViewShell::mpImpl-mbIsInitialized
- IsMainViewShell()
- bShowMasterViewToolbar)
+ IsMainViewShell())
 {
-GetViewShellBase().GetToolBarManager()-SetToolBar(
-ToolBarManager::TBG_MASTER_MODE,
-ToolBarManager::msMasterViewToolBar);
+if (bShowMasterViewToolbar)
+GetViewShellBase().GetToolBarManager()-SetToolBar(
+ToolBarManager::TBG_MASTER_MODE,
+ToolBarManager::msMasterViewToolBar);
+if (bShowPresentationToolbar)
+GetViewShellBase().GetToolBarManager()-SetToolBar(
+ToolBarManager::TBG_COMMON_TASK,
+ToolBarManager

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

[Philippe Jung]

 sd/source/ui/inc/ToolBarManager.hxx  |1 +
 sd/source/ui/view/ToolBarManager.cxx |9 ++---
 sd/source/ui/view/drviews1.cxx   |   24 
 3 files changed, 23 insertions(+), 11 deletions(-)

New commits:
commit 1191ed8584f9fd63c39514dd2e3e71682913d4bc
Author: Philippe Jung phil.j...@free.fr
Date:   Wed Jun 3 16:28:02 2015 +0200

tdf#87822 Impress: hide common task toolbar in master view

When Master Slide or Master Notes are active,
hides the Common task toolbar as it it not usefull.

Change-Id: Ice07661bf203c029d733614e1eceb5ef3d0661f9
Reviewed-on: https://gerrit.libreoffice.org/16060
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com

diff --git a/sd/source/ui/inc/ToolBarManager.hxx 
b/sd/source/ui/inc/ToolBarManager.hxx
index b5b9f80..5263dd0 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -126,6 +126,7 @@ public:
 
 TBG_PERMANENT = TBG__FIRST,
 TBG_FUNCTION,
+TBG_COMMON_TASK,
 TBG_MASTER_MODE,
 
 TBG__LAST = TBG_MASTER_MODE
diff --git a/sd/source/ui/view/ToolBarManager.cxx 
b/sd/source/ui/view/ToolBarManager.cxx
index 403230c..9e59223 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -1001,9 +1001,6 @@ void ToolBarRules::MainViewShellChanged 
(ViewShell::ShellType nShellType)
 ToolBarManager::msOptionsToolBar);
 mpToolBarManager-AddToolBar(
 ToolBarManager::TBG_PERMANENT,
-ToolBarManager::msCommonTaskToolBar);
-mpToolBarManager-AddToolBar(
-ToolBarManager::TBG_PERMANENT,
 ToolBarManager::msViewerToolBar);
 break;
 
@@ -1065,10 +1062,16 @@ void ToolBarRules::MainViewShellChanged (const 
ViewShell rMainViewShell)
 const DrawViewShell* pDrawViewShell
 = dynamic_castconst DrawViewShell*(rMainViewShell);
 if (pDrawViewShell != NULL)
+{
 if (pDrawViewShell-GetEditMode() == EM_MASTERPAGE)
 mpToolBarManager-AddToolBar(
 ToolBarManager::TBG_MASTER_MODE,
 ToolBarManager::msMasterViewToolBar);
+else
+mpToolBarManager-AddToolBar(
+ToolBarManager::TBG_COMMON_TASK,
+ToolBarManager::msCommonTaskToolBar);
+}
 break;
 }
 
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 9aa19da..109d82c 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -363,14 +363,18 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool 
bIsLayerModeActive)
 // view.
 bool bShowMasterViewToolbar (meEditMode == EM_MASTERPAGE
   GetShellType() != ViewShell::ST_HANDOUT);
+bool bShowPresentationToolbar (meEditMode != EM_MASTERPAGE
+  GetShellType() != ViewShell::ST_HANDOUT);
 
 // If the master view toolbar is not shown we hide it before
 // switching the edit mode.
 if (::sd::ViewShell::mpImpl-mbIsInitialized
- IsMainViewShell()
- ! bShowMasterViewToolbar)
+ IsMainViewShell())
 {
-
GetViewShellBase().GetToolBarManager()-ResetToolBars(ToolBarManager::TBG_MASTER_MODE);
+if ( !bShowMasterViewToolbar )
+
GetViewShellBase().GetToolBarManager()-ResetToolBars(ToolBarManager::TBG_MASTER_MODE);
+if ( !bShowPresentationToolbar )
+
GetViewShellBase().GetToolBarManager()-ResetToolBars(ToolBarManager::TBG_COMMON_TASK);
 }
 
 if (meEditMode == EM_PAGE)
@@ -441,12 +445,16 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool 
bIsLayerModeActive)
 // If the master view toolbar is to be shown we turn it on after the
 // edit mode has been changed.
 if (::sd::ViewShell::mpImpl-mbIsInitialized
- IsMainViewShell()
- bShowMasterViewToolbar)
+ IsMainViewShell())
 {
-GetViewShellBase().GetToolBarManager()-SetToolBar(
-ToolBarManager::TBG_MASTER_MODE,
-ToolBarManager::msMasterViewToolBar);
+if (bShowMasterViewToolbar)
+GetViewShellBase().GetToolBarManager()-SetToolBar(
+ToolBarManager::TBG_MASTER_MODE,
+ToolBarManager::msMasterViewToolBar);
+if (bShowPresentationToolbar)
+GetViewShellBase().GetToolBarManager()-SetToolBar(
+ToolBarManager::TBG_COMMON_TASK,
+ToolBarManager::msCommonTaskToolBar);
 }
 
 if ( ! mbIsLayerModeActive)
___
Libreoffice-commits mailing list
libreoffice-comm

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

[Philippe Jung]

 sw/source/uibase/uiview/viewmdi.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4826007f0e09160ffdb592d10b65eb262ada18c8
Author: Philippe Jung phil.j...@free.fr
Date:   Thu May 28 17:44:03 2015 +0200

tdf#91592 WRITER crashes when navigating through comments

without rSh.EnterStdMode, the image is selected and it has no GetTextNode.

Change-Id: I91ed5a1ed002a04919042f4df22c49d3189daccd
Reviewed-on: https://gerrit.libreoffice.org/15952
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/source/uibase/uiview/viewmdi.cxx 
b/sw/source/uibase/uiview/viewmdi.cxx
index e875d56..03925bb 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -423,6 +423,7 @@ IMPL_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
 
 case NID_POSTIT:
 {
+rSh.EnterStdMode();
 sw::sidebarwindows::SwSidebarWin* pPostIt = 
GetPostItMgr()-GetActiveSidebarWin();
 if (pPostIt)
 GetPostItMgr()-SetActiveSidebarWin(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - icon-themes/breeze icon-themes/galaxy icon-themes/tango officecfg/registry scaddins/source sc/source sdext/source sd/source starmath/source svl/source sw/sd

[Philippe Jung]

 icon-themes/breeze/links.txt|3 +
 icon-themes/galaxy/links.txt|3 +
 icon-themes/tango/links.txt |6 +-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |4 -
 sc/source/core/opencl/op_statistical.cxx|   24 
+-
 sc/source/filter/excel/excform.cxx  |2 
 sc/source/filter/excel/xetable.cxx  |2 
 sc/source/filter/excel/xihelper.cxx |2 
 sc/source/filter/html/htmlpars.cxx  |2 
 sc/source/filter/rtf/eeimpars.cxx   |4 -
 scaddins/source/analysis/analysishelper.cxx |2 
 scaddins/source/datefunc/datefunc.cxx   |2 
 scaddins/source/pricing/pricing.cxx |2 
 sd/source/core/EffectMigration.cxx  |2 
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx   |2 
 sd/source/ui/framework/configuration/Configuration.cxx  |2 
 sd/source/ui/sidebar/LayoutMenu.cxx |2 
 sd/source/ui/sidebar/MasterPagesSelector.cxx|6 +-
 sd/source/ui/slideshow/slideshowimpl.cxx|2 
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx|2 
 sd/source/ui/slidesorter/view/SlideSorterView.cxx   |4 -
 sd/source/ui/slidesorter/view/SlsFramePainter.cxx   |4 -
 sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx  |4 -
 sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx  |4 -
 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx  |4 -
 sd/source/ui/tools/ConfigurationAccess.cxx  |2 
 sd/source/ui/unoidl/DrawController.cxx  |2 
 sd/source/ui/view/ViewTabBar.cxx|4 -
 sd/source/ui/view/drviews5.cxx  |2 
 sd/source/ui/view/frmview.cxx   |2 
 sd/source/ui/view/outlview.cxx  |2 
 sd/source/ui/view/sdview3.cxx   |2 
 sdext/source/minimizer/pppoptimizer.cxx |2 
 sdext/source/minimizer/pppoptimizerdialog.cxx   |2 
 sdext/source/presenter/PresenterConfigurationAccess.cxx |2 
 starmath/source/ElementsDockingWindow.cxx   |6 +-
 starmath/source/dialog.cxx  |2 
 starmath/source/mathtype.cxx|4 -
 starmath/source/ooxmlexport.cxx |2 
 starmath/source/parse.cxx   |2 
 starmath/source/rtfexport.cxx   |2 
 starmath/source/utility.cxx |6 +-
 svl/source/passwordcontainer/passwordcontainer.cxx  |4 -
 sw/sdi/swriter.sdi  |2 
 sw/source/core/access/accselectionhelper.cxx|4 -
 sw/source/uibase/uiview/view0.cxx   |2 
 sw/uiconfig/sglobal/toolbar/toolbar.xml |2 
 sw/uiconfig/sweb/toolbar/toolbar.xml|2 
 sw/uiconfig/swform/toolbar/toolbar.xml  |2 
 sw/uiconfig/swreport/toolbar/toolbar.xml|2 
 sw/uiconfig/swriter/menubar/menubar.xml |2 
 sw/uiconfig/swriter/toolbar/toolbar.xml |2 
 sw/uiconfig/swxform/toolbar/toolbar.xml |2 
 ucb/source/ucp/ftp/ftpcontentprovider.cxx   |4 -
 ucb/source/ucp/ftp/ftpresultsetI.cxx|4 -
 ucb/source/ucp/ftp/ftpurl.cxx   |8 +--
 ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx   |2 
 xmlhelp/source/cxxhelp/provider/databases.cxx   |4 -
 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx   |2 
 xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx|2 
 60 files changed, 101 insertions(+), 93 deletions(-)

New commits:
commit c7309a4822633423b0969757c494077fdc27b724
Author: Philippe Jung phil.j...@free.fr
Date:   Mon Jun 1 01:11:37 2015 +0200

tdf#91783 - Reverse the toggle behaviour of .uno:Graphic Change

Rename:
- .uno:Graphic to .uno:ShowGraphics
- View-Hide

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

[Philippe Jung]

 sw/source/core/txtnode/thints.cxx |   39 ++
 1 file changed, 35 insertions(+), 4 deletions(-)

New commits:
commit 9f01951b858453684f2622541af0eb85d4544fc6
Author: Philippe Jung phil.j...@free.fr
Date:   Tue Jun 2 17:43:19 2015 +0200

tdf#91228 Fix Writer crash

Start Writer, Insert Image, Anchor as character, Go after
image, press enter, writer crash

This is because m_pAnchoredFly is not updated.

JoinPrev, JoinNext and SplitContentNode all rely on CutText with calls
InsertHint. InsertHint calls SetAnchor. SetAnchor calls Modify callback
except if LockModifyed. This patch ensures that, whatever the value of
LockModify, the references are kept correct.

Change-Id: Id7254784c6954db4b542b2c4228b388fb924bbc2
Reviewed-on: https://gerrit.libreoffice.org/16041
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index 40b71a1..277a4d5 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1276,19 +1276,45 @@ bool SwTextNode::InsertHint( SwTextAttr * const pAttr, 
const SetAttrMode nMode )
 {
 SwTextFlyCnt *pFly = static_castSwTextFlyCnt *(pAttr);
 SwFrameFormat* pFormat = pAttr-GetFlyCnt().GetFrameFormat();
+
+// In order to maintain data coherency, if the hint is a fly
+// moved from a text node to another, we have to remove it from
+// the first textnode then to add it to the new (this) textnode
+const SwFormatAnchor* pAnchor = 0;
+pFormat-GetItemState( RES_ANCHOR, false,
+reinterpret_castconst SfxPoolItem**(pAnchor) );
+
+SwIndex aIdx( this, pAttr-GetStart() );
+
+bool bChangeFlyParentNode( false );
+if (pAnchor 
+pAnchor-GetAnchorId() == FLY_AS_CHAR 
+pAnchor-GetContentAnchor() 
+pAnchor-GetContentAnchor()-nNode != *this)
+{
+
assert(pAnchor-GetContentAnchor()-nNode.GetNode().IsTextNode());
+SwTextNode* textNode = 
pAnchor-GetContentAnchor()-nNode.GetNode().GetTextNode();
+
+if ( textNode-IsModifyLocked() )
+{
+//  Fly parent has changed but the FlyFormat is 
locked, so it will
+//  not be updated by SetAnchor (that calls Modify 
that updates
+//  relationships)
+textNode-RemoveAnchoredFly( pFormat );
+bChangeFlyParentNode = true;
+}
+}
+
 if( !(SetAttrMode::NOTXTATRCHR  nInsMode) )
 {
+
 // Wir muessen zuerst einfuegen, da in SetAnchor()
 // dem FlyFrm GetStart() uebermittelt wird.
 //JP 11.05.98: falls das Anker-Attribut schon richtig
 // gesetzt ist, dann korrigiere dieses nach dem Einfuegen
 // des Zeichens. Sonst muesste das immer  ausserhalb
 // erfolgen (Fehleranfaellig !)
-const SwFormatAnchor* pAnchor = 0;
-pFormat-GetItemState( RES_ANCHOR, false,
-reinterpret_castconst SfxPoolItem**(pAnchor) );
 
-SwIndex aIdx( this, pAttr-GetStart() );
 const OUString c(GetCharOfTextAttr(*pAttr));
 OUString const ins( InsertText(c, aIdx, nInsertFlags) );
 if (ins.isEmpty())
@@ -1352,6 +1378,11 @@ bool SwTextNode::InsertHint( SwTextAttr * const pAttr, 
const SetAttrMode nMode )
 return false;
 }
 }
+
+// Finish relationships update now that SetAnchor has fixed 
part of it.
+if (bChangeFlyParentNode)
+AddAnchoredFly( pFormat );
+
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 sw/source/core/txtnode/thints.cxx |   39 ++
 1 file changed, 35 insertions(+), 4 deletions(-)

New commits:
commit f25e4aff17aa88b0620b9067f3f4f490f36ca9f6
Author: Philippe Jung phil.j...@free.fr
Date:   Tue Jun 2 17:43:19 2015 +0200

tdf#91228 Fix Writer crash

Start Writer, Insert Image, Anchor as character, Go after
image, press enter, writer crash

This is because m_pAnchoredFly is not updated.

JoinPrev, JoinNext and SplitContentNode all rely on CutText with calls
InsertHint. InsertHint calls SetAnchor. SetAnchor calls Modify callback
except if LockModifyed. This patch ensures that, whatever the value of
LockModify, the references are kept correct.

Change-Id: Id7254784c6954db4b542b2c4228b388fb924bbc2
Reviewed-on: https://gerrit.libreoffice.org/16041
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 9f01951b858453684f2622541af0eb85d4544fc6)
Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index 452ae53..2fb71d2 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1276,19 +1276,45 @@ bool SwTextNode::InsertHint( SwTextAttr * const pAttr, 
const SetAttrMode nMode )
 {
 SwTextFlyCnt *pFly = static_castSwTextFlyCnt *(pAttr);
 SwFrameFormat* pFormat = pAttr-GetFlyCnt().GetFrameFormat();
+
+// In order to maintain data coherency, if the hint is a fly
+// moved from a text node to another, we have to remove it from
+// the first textnode then to add it to the new (this) textnode
+const SwFormatAnchor* pAnchor = 0;
+pFormat-GetItemState( RES_ANCHOR, false,
+reinterpret_castconst SfxPoolItem**(pAnchor) );
+
+SwIndex aIdx( this, pAttr-GetStart() );
+
+bool bChangeFlyParentNode( false );
+if (pAnchor 
+pAnchor-GetAnchorId() == FLY_AS_CHAR 
+pAnchor-GetContentAnchor() 
+pAnchor-GetContentAnchor()-nNode != *this)
+{
+
assert(pAnchor-GetContentAnchor()-nNode.GetNode().IsTextNode());
+SwTextNode* textNode = 
pAnchor-GetContentAnchor()-nNode.GetNode().GetTextNode();
+
+if ( textNode-IsModifyLocked() )
+{
+//  Fly parent has changed but the FlyFormat is 
locked, so it will
+//  not be updated by SetAnchor (that calls Modify 
that updates
+//  relationships)
+textNode-RemoveAnchoredFly( pFormat );
+bChangeFlyParentNode = true;
+}
+}
+
 if( !(SetAttrMode::NOTXTATRCHR  nInsMode) )
 {
+
 // Wir muessen zuerst einfuegen, da in SetAnchor()
 // dem FlyFrm GetStart() uebermittelt wird.
 //JP 11.05.98: falls das Anker-Attribut schon richtig
 // gesetzt ist, dann korrigiere dieses nach dem Einfuegen
 // des Zeichens. Sonst muesste das immer  ausserhalb
 // erfolgen (Fehleranfaellig !)
-const SwFormatAnchor* pAnchor = 0;
-pFormat-GetItemState( RES_ANCHOR, false,
-reinterpret_castconst SfxPoolItem**(pAnchor) );
 
-SwIndex aIdx( this, pAttr-GetStart() );
 const OUString c(GetCharOfTextAttr(*pAttr));
 OUString const ins( InsertText(c, aIdx, nInsertFlags) );
 if (ins.isEmpty())
@@ -1352,6 +1378,11 @@ bool SwTextNode::InsertHint( SwTextAttr * const pAttr, 
const SetAttrMode nMode )
 return false;
 }
 }
+
+// Finish relationships update now that SetAnchor has fixed 
part of it.
+if (bChangeFlyParentNode)
+AddAnchoredFly( pFormat );
+
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 sw/source/core/txtnode/thints.cxx |   40 +-
 1 file changed, 35 insertions(+), 5 deletions(-)

New commits:
commit 7ea3a2b5747f148cbdc9a065728cefff1a660bd7
Author: Philippe Jung phil.j...@free.fr
Date:   Tue Jun 2 17:43:19 2015 +0200

tdf#91228 Fix Writer crash

Start Writer, Insert Image, Anchor as character, Go after
image, press enter, writer crash

This is because m_pAnchoredFly is not updated.

JoinPrev, JoinNext and SplitContentNode all rely on CutText with calls
InsertHint. InsertHint calls SetAnchor. SetAnchor calls Modify callback
except if LockModifyed. This patch ensures that, whatever the value of
LockModify, the references are kept correct.

Reviewed-on: https://gerrit.libreoffice.org/16041
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 9f01951b858453684f2622541af0eb85d4544fc6)
Signed-off-by: Michael Stahl mst...@redhat.com

Conflicts:
sw/source/core/txtnode/thints.cxx

Change-Id: Id7254784c6954db4b542b2c4228b388fb924bbc2

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index a03b391a7..37b0c26 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1277,19 +1277,44 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, 
const SetAttrMode nMode )
 {
 SwTxtFlyCnt *pFly = (SwTxtFlyCnt *)pAttr;
 SwFrmFmt* pFmt = pAttr-GetFlyCnt().GetFrmFmt();
+
+// In order to maintain data coherency, if the hint is a fly
+// moved from a text node to another, we have to remove it from
+// the first textnode then to add it to the new (this) textnode
+const SwFmtAnchor* pAnchor = 0;
+pFmt-GetItemState( RES_ANCHOR, false,
+reinterpret_castconst SfxPoolItem**(pAnchor) );
+
+SwIndex aIdx( this, pAttr-GetStart() );
+
+bool bChangeFlyParentNode( false );
+if (pAnchor 
+pAnchor-GetAnchorId() == FLY_AS_CHAR 
+pAnchor-GetCntntAnchor() 
+pAnchor-GetCntntAnchor()-nNode != *this)
+{
+
assert(pAnchor-GetCntntAnchor()-nNode.GetNode().IsTxtNode());
+SwTxtNode* textNode = 
pAnchor-GetCntntAnchor()-nNode.GetNode().GetTxtNode();
+
+if ( textNode-IsModifyLocked() )
+{
+//  Fly parent has changed but the FlyFormat is 
locked, so it will
+//  not be updated by SetAnchor (that calls Modify 
that updates
+//  relationships)
+textNode-RemoveAnchoredFly( pFmt );
+bChangeFlyParentNode = true;
+}
+}
+
 if( !(nsSetAttrMode::SETATTR_NOTXTATRCHR  nInsMode) )
 {
+
 // Wir muessen zuerst einfuegen, da in SetAnchor()
 // dem FlyFrm GetStart() uebermittelt wird.
 //JP 11.05.98: falls das Anker-Attribut schon richtig
 // gesetzt ist, dann korrigiere dieses nach dem Einfuegen
 // des Zeichens. Sonst muesste das immer  ausserhalb
 // erfolgen (Fehleranfaellig !)
-const SwFmtAnchor* pAnchor = 0;
-pFmt-GetItemState( RES_ANCHOR, false,
-(const SfxPoolItem**)pAnchor );
-
-SwIndex aIdx( this, pAttr-GetStart() );
 const OUString c(GetCharOfTxtAttr(*pAttr));
 OUString const ins( InsertText(c, aIdx, nInsertFlags) );
 if (ins.isEmpty())
@@ -1353,6 +1378,11 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, 
const SetAttrMode nMode )
 return false;
 }
 }
+
+// Finish relationships update now that SetAnchor has fixed 
part of it.
+if (bChangeFlyParentNode)
+AddAnchoredFly( pFmt );
+
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 sw/source/uibase/uiview/viewmdi.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 260a4a63d16a01842b50a15e51e08590dbbb75a4
Author: Philippe Jung phil.j...@free.fr
Date:   Thu May 28 17:44:03 2015 +0200

tdf#91592 WRITER crashes when navigating through comments

without rSh.EnterStdMode, the image is selected and it has no GetTextNode.

Change-Id: I91ed5a1ed002a04919042f4df22c49d3189daccd
Reviewed-on: https://gerrit.libreoffice.org/15952
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 4826007f0e09160ffdb592d10b65eb262ada18c8)
Reviewed-on: https://gerrit.libreoffice.org/16031

diff --git a/sw/source/uibase/uiview/viewmdi.cxx 
b/sw/source/uibase/uiview/viewmdi.cxx
index e875d56..03925bb 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -423,6 +423,7 @@ IMPL_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
 
 case NID_POSTIT:
 {
+rSh.EnterStdMode();
 sw::sidebarwindows::SwSidebarWin* pPostIt = 
GetPostItMgr()-GetActiveSidebarWin();
 if (pPostIt)
 GetPostItMgr()-SetActiveSidebarWin(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Philippe Jung]

 sc/source/ui/condformat/condformatdlgentry.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 75ceb04d81f68bbe8e3fecc24ad4977d9b2499f6
Author: Philippe Jung phil.j...@free.fr
Date:   Wed May 27 15:33:23 2015 +0200

tdf#91489 - CONDITIONAL FORMATTING: Crash on select Icon Set from dialog

Removed the recalcAll line in IMPL_LINK_NOARG( ScIconSetFrmtEntry, 
IconSetTypeHdl )

1) ScCondFormatList already calls RecalcAll on selection new/changed
2) Without this line, it does not crash

Change-Id: I8aa45f691d33d8ad046a88e7695913e2ccff3caf
Reviewed-on: https://gerrit.libreoffice.org/15928
Reviewed-by: Katarina Behrens katarina.behr...@cib.de
Tested-by: Katarina Behrens katarina.behr...@cib.de
(cherry picked from commit 0b52089c1d88a5223981d8c177b3044d53eff700)
Reviewed-on: https://gerrit.libreoffice.org/15944
Tested-by: Jenkins c...@libreoffice.org

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 069aed3..018e7e8 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1601,7 +1601,6 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl )
 maEntries[0]-SetFirstEntry();
 
 SetHeight();
-static_castScCondFormatList*(GetParent())-RecalcAll();
 
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry sc/inc sc/qa sc/sdi sc/source sc/uiconfig

[Philippe Jung]

 icon-themes/galaxy/links.txt  |4 +
 icon-themes/tango/links.txt   |4 +
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   24 
+--
 sc/inc/global.hxx |6 +
 sc/inc/sc.hrc |4 -
 sc/inc/sccommands.h   |4 -
 sc/qa/unit/ucalc.cxx  |6 -
 sc/qa/unit/ucalc_formula.cxx  |   16 ++--
 sc/qa/unit/ucalc_sharedformula.cxx|2 
 sc/sdi/cellsh.sdi |4 -
 sc/sdi/scalc.sdi  |4 -
 sc/source/ui/docshell/docfunc.cxx |   34 
+-
 sc/source/ui/docshell/docsh3.cxx  |4 -
 sc/source/ui/miscdlgs/inscldlg.cxx|4 -
 sc/source/ui/src/hdrcont.src  |8 +-
 sc/source/ui/undo/undoblk.cxx |   12 +--
 sc/source/ui/unoobj/cellsuno.cxx  |   10 +-
 sc/source/ui/unoobj/docuno.cxx|4 -
 sc/source/ui/view/cellsh.cxx  |4 -
 sc/source/ui/view/cellsh1.cxx |   20 ++---
 sc/source/ui/view/tabview3.cxx|4 -
 sc/source/ui/view/viewfunc.cxx|4 -
 sc/uiconfig/scalc/menubar/menubar.xml |   12 ++-
 sc/uiconfig/scalc/toolbar/insertcellsbar.xml  |6 -
 sc/uiconfig/scalc/toolbar/standardbar.xml |4 -
 25 files changed, 121 insertions(+), 87 deletions(-)

New commits:
commit f97beeef352fdd9fd4f157a7a4c4f6af8341cbe6
Author: Philippe Jung phil.j...@free.fr
Date:   Wed May 20 16:54:27 2015 +0200

Calc: Insert row/col before/after [1/2]

This part renames all INSROW / INSCOL to
INSROWS_BEFORE / INSCOLS_BEFORE which is
the current (default) behaviour.

Change-Id: Ia084f17a3be8bf09908e5d227ef4e6d09b8420a4
Reviewed-on: https://gerrit.libreoffice.org/15830
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Yousuf Philips philip...@hotmail.com

diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 0a257a3..dcdf49c 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -19,6 +19,10 @@ cmd/sc_objectforwardone.png cmd/sc_forward.png
 cmd/lc_objectbackone.png cmd/lc_backward.png
 cmd/sc_objectbackone.png cmd/sc_backward.png
 
+cmd/lc_insertrowsbefore.png cmd/lc_insertrows.png
+cmd/sc_insertrowsbefore.png cmd/sc_insertrows.png
+cmd/lc_insertcolumnsbefore.png cmd/lc_insertcolumns.png
+cmd/sc_insertcolumnsbefore.png cmd/sc_insertcolumns.png
 cmd/lc_insertrowsafter.png cmd/lc_insertrows.png
 cmd/sc_insertrowsafter.png cmd/sc_insertrows.png
 cmd/lc_insertcolumnsafter.png cmd/lc_insertcolumns.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 628df29..aa1b9c0 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -397,6 +397,10 @@ sc/res/sf02.png sw/imglst/sf04.png
 svx/res/symphony/spacing3.png cmd/sc_spacepara2.png
 cmd/sc_graphicdialog.png cmd/sc_insertgraphic.png
 
+cmd/lc_insertrowsbefore.png cmd/lc_insertrows.png
+cmd/sc_insertrowsbefore.png cmd/sc_insertrows.png
+cmd/lc_insertcolumnsbefore.png cmd/lc_insertcolumns.png
+cmd/sc_insertcolumnsbefore.png cmd/sc_insertcolumns.png
 cmd/lc_insertrowsafter.png cmd/lc_insertrows.png
 cmd/sc_insertrowsafter.png cmd/sc_insertrows.png
 cmd/lc_insertcolumnsafter.png cmd/lc_insertcolumns.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index c380155..f3db21f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1059,23 +1059,39 @@
   value xml:lang=en-US~Cells.../value
 /prop
   /node
-  node oor:name=.uno:InsertRows oor:op=replace
+  node oor:name=.uno:InsertRowsMenu oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-US~Rows/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
+  node oor:name=.uno:InsertColumnsMenu oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USCo~lumns/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
+  node oor:name=.uno:InsertRowsBefore oor:op=replace

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

[Philippe Jung]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   22 
 sc/inc/sc.hrc |4 
 sc/inc/sccommands.h   |2 
 sc/sdi/cellsh.sdi |2 
 sc/sdi/scalc.sdi  |   50 
+
 sc/source/ui/docshell/docfunc.cxx |   51 
++
 sc/source/ui/src/hdrcont.src  |   12 ++
 sc/source/ui/undo/undoblk.cxx |8 +
 sc/source/ui/view/cellsh.cxx  |2 
 sc/source/ui/view/cellsh1.cxx |   10 +
 sc/source/ui/view/tabview3.cxx|2 
 sc/source/ui/view/viewfunc.cxx|4 
 sc/uiconfig/scalc/menubar/menubar.xml |2 
 sc/uiconfig/scalc/toolbar/insertcellsbar.xml  |2 
 sc/uiconfig/scalc/toolbar/standardbar.xml |2 
 15 files changed, 152 insertions(+), 23 deletions(-)

New commits:
commit 285b5ef45817fe20d3bf9613e0247d395b7c880d
Author: Philippe Jung phil.j...@free.fr
Date:   Wed May 20 17:27:08 2015 +0200

Calc: Insert row/col before/after [2/2]

This part adds features to add rows/cols
after the selection which is a new behaviour.

Change-Id: Iec1201ae56970cd3dd0622c2ffa1eb6e46ad7446
Reviewed-on: https://gerrit.libreoffice.org/15831
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Yousuf Philips philip...@hotmail.com

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index f3db21f..1d8490f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1097,6 +1097,28 @@
   value1/value
 /prop
   /node
+  node oor:name=.uno:InsertRowsAfter oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USInsert ~Rows Below/value
+/prop
+prop oor:name=ContextLabel oor:type=xs:string
+  value xml:lang=en-USRows ~Below/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
+  node oor:name=.uno:InsertColumnsAfter oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USInsert Co~lumns Right/value
+/prop
+prop oor:name=ContextLabel oor:type=xs:string
+  value xml:lang=en-USColumns ~Right/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
   node oor:name=.uno:Insert oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USInsert ~Sheet.../value
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 6def9ba..2cbd8d14 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -334,7 +334,9 @@
 #define FID_ADD_NAME(INSERT_MENU_START + 16)
 #define FID_INS_CELLSDOWN   (INSERT_MENU_START + 18)
 #define FID_INS_CELLSRIGHT  (INSERT_MENU_START + 19)
-#define INSERT_MENU_END (INSERT_MENU_START + 20)
+#define FID_INS_ROWS_AFTER  (INSERT_MENU_START + 20)
+#define FID_INS_COLUMNS_AFTER   (INSERT_MENU_START + 21)
+#define INSERT_MENU_END (INSERT_MENU_START + 22)
 
 #define FORMAT_MENU_START   (INSERT_MENU_END)
 #define FID_CELL_FORMAT (FORMAT_MENU_START)
diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h
index ba8f94c..e931c19 100644
--- a/sc/inc/sccommands.h
+++ b/sc/inc/sccommands.h
@@ -44,8 +44,10 @@
 #define CMD_FID_INS_TABLE   .uno:Insert
 #define CMD_FID_INS_CELL.uno:InsertCell
 #define CMD_FID_INS_COLBRK  .uno:InsertColumnBreak
+#define CMD_FID_INS_COLUMNS_AFTER   .uno:InsertColumnsAfter
 #define CMD_FID_INS_COLUMNS_BEFORE  .uno:InsertColumnsBefore
 #define CMD_FID_INS_ROWBRK  .uno:InsertRowBreak
+#define CMD_FID_INS_ROWS_AFTER  .uno:InsertRowsAfter
 #define CMD_FID_INS_ROWS_BEFORE .uno:InsertRowsBefore
 #define CMD_FID_MERGE_ON.uno:MergeCells
 #define CMD_FID_MERGE_OFF   .uno:SplitCell
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 3e6fc6e..d780e98 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -118,6 +118,8 @@ interface CellSelection
 SID_INSERT_CURRENT_TIME [ ExecMethod = ExecuteEdit; StateMethod = 
GetState; ]
 FID_INS_ROWS_BEFORE [ ExecMethod = ExecuteEdit; StateMethod = 
GetBlockState; ]
 FID_INS_COLUMNS_BEFORE  [ ExecMethod = ExecuteEdit

[Libreoffice-commits] core.git: basctl/source basic/source cui/source dbaccess/source desktop/source extensions/source scripting/source sc/source sd/source sfx2/source starmath/source svtools/source s

[Philippe Jung]

/source/uibase/docvw/edtwin.cxx  |   12 ++---
 sw/source/uibase/uiview/srcview.cxx|   14 +++---
 sw/source/uibase/uiview/uivwimp.cxx|2 
 sw/source/uibase/uiview/view2.cxx  |2 
 vcl/source/app/dbggui.cxx  |2 
 77 files changed, 181 insertions(+), 181 deletions(-)

New commits:
commit 1379e2feaad6344999358bbfb271edbaea66ce2a
Author: Philippe Jung phil.j...@free.fr
Date:   Tue May 26 16:26:35 2015 +0200

Rewrite all calls like Dialog(params).Execute()

Replace all calls looking like
  ADialog(some params).Execute()
by
  ScopedVclPtrInstanceADialog::Create(some parms)-Execute()

Change-Id: I0b6f0a9ea5ef0a749ffa30ce131e9dc989604639
Reviewed-on: https://gerrit.libreoffice.org/15915
Tested-by: Jenkins c...@libreoffice.org
Tested-by: Michael Meeks michael.me...@collabora.com
Reviewed-by: Michael Meeks michael.me...@collabora.com

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 6079ed4..d602a74 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -305,7 +305,7 @@ bool ModulWindow::BasicExecute()
 {
 if ( !aDocument.allowMacros() )
 {
-MessageDialog(this, IDE_RESSTR(RID_STR_CANNOTRUNMACRO), 
VCL_MESSAGE_WARNING).Execute();
+ScopedVclPtrInstanceMessageDialog::Create(this, 
IDE_RESSTR(RID_STR_CANNOTRUNMACRO), VCL_MESSAGE_WARNING)-Execute();
 return false;
 }
 }
@@ -443,7 +443,7 @@ bool ModulWindow::LoadBasic()
 bDone = true;
 }
 else
-MessageDialog(this, IDE_RESSTR(RID_STR_COULDNTREAD)).Execute();
+ScopedVclPtrInstanceMessageDialog::Create(this, 
IDE_RESSTR(RID_STR_COULDNTREAD))-Execute();
 }
 return bDone;
 }
@@ -489,7 +489,7 @@ bool ModulWindow::SaveBasicSource()
 bDone = true;
 }
 else
-MessageDialog(this, IDEResId(RID_STR_COULDNTWRITE)).Execute();
+ScopedVclPtrInstanceMessageDialog::Create(this, 
IDEResId(RID_STR_COULDNTWRITE))-Execute();
 }
 
 return bDone;
diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index a37b00d..19c052d 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -834,7 +834,7 @@ bool DialogWindow::SaveDialog()
 }
 }
 else
-MessageDialog(this, IDE_RESSTR(RID_STR_COULDNTWRITE)).Execute();
+ScopedVclPtrInstanceMessageDialog::Create(this, 
IDE_RESSTR(RID_STR_COULDNTWRITE))-Execute();
 }
 
 return bDone;
diff --git a/basctl/source/basicide/basobj2.cxx 
b/basctl/source/basicide/basobj2.cxx
index 530d0fc..987c1aa 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -67,7 +67,7 @@ void Organize( sal_Int16 tabId )
 aDesc = pCurWin-CreateEntryDescriptor();
 
 vcl::Window* pParent = Application::GetDefDialogParent();
-OrganizeDialog(pParent, tabId, aDesc).Execute();
+ScopedVclPtrInstanceOrganizeDialog::Create(pParent, tabId, 
aDesc)-Execute();
 }
 
 bool IsValidSbxName( const OUString rName )
@@ -331,7 +331,7 @@ OUString ChooseMacro( const uno::Reference frame::XModel 
 rxLimitToDocument,
 {
 // error
 bError = true;
-MessageDialog(NULL, 
IDEResId(RID_STR_ERRORCHOOSEMACRO)).Execute();
+ScopedVclPtrInstanceMessageDialog::Create(nullptr, 
IDEResId(RID_STR_ERRORCHOOSEMACRO))-Execute();
 }
 }
 }
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 5fc8268..77febec 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -558,7 +558,7 @@ TabBarAllowRenamingReturnCode TabBar::AllowRenaming()
 bool const bValid = IsValidSbxName(GetEditText());
 
 if ( !bValid )
-MessageDialog(this, IDEResId(RID_STR_BADSBXNAME)).Execute();
+ScopedVclPtrInstanceMessageDialog::Create(this, 
IDEResId(RID_STR_BADSBXNAME))-Execute();
 
 return bValid ? TABBAR_RENAMING_YES : TABBAR_RENAMING_NO;
 }
diff --git a/basctl/source/basicide/macrodlg.cxx 
b/basctl/source/basicide/macrodlg.cxx
index 7dbd983..23e2597 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -632,7 +632,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
 ScriptDocument aDocument( 
ScriptDocument::getDocumentForBasicManager( pBasMgr ) );
 if ( aDocument.isDocument()  !aDocument.allowMacros() )
 {
-MessageDialog(this, IDEResId(RID_STR_CANNOTRUNMACRO), 
VCL_MESSAGE_WARNING).Execute();
+ScopedVclPtrInstanceMessageDialog

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

[Philippe Jung]

 sc/source/ui/condformat/condformatdlgentry.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0b52089c1d88a5223981d8c177b3044d53eff700
Author: Philippe Jung phil.j...@free.fr
Date:   Wed May 27 15:33:23 2015 +0200

Bug 91489 - CONDITIONAL FORMATTING: Crash on select Icon Set from dialog

Removed the recalcAll line in IMPL_LINK_NOARG( ScIconSetFrmtEntry, 
IconSetTypeHdl )

1) ScCondFormatList already calls RecalcAll on selection new/changed
2) Without this line, it does not crash

Change-Id: I8aa45f691d33d8ad046a88e7695913e2ccff3caf
Reviewed-on: https://gerrit.libreoffice.org/15928
Reviewed-by: Katarina Behrens katarina.behr...@cib.de
Tested-by: Katarina Behrens katarina.behr...@cib.de

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 8c4ddb1..b48a82b 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1598,7 +1598,6 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl )
 maEntries[0]-SetFirstEntry();
 
 SetHeight();
-static_castScCondFormatList*(GetParent())-RecalcAll();
 
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 sw/source/uibase/wrtsh/wrtsh1.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 8790303b4c220d0c5dcf78a4c438a385ffe3f030
Author: Philippe Jung phil.j...@free.fr
Date:   Tue May 26 13:48:18 2015 +0200

tdf#91389 EDITING: Crash when deleting header

Replaced MyDlg(pParent).Execute by VclPtr equivalent

Change-Id: I7e03913665f770d694f53949e08425ba60adc6ad
Reviewed-on: https://gerrit.libreoffice.org/15908
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 99da1d4..5c04c7f 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1771,12 +1771,13 @@ void SwWrtShell::ChangeHeaderOrFooter(
 
 vcl::Window* pParent = GetView().GetViewFrame()-GetWindow();
 short nResult;
-if (bHeader)
-nResult = DeleteHeaderDialog(pParent).Execute();
-else
-nResult = DeleteFooterDialog(pParent).Execute();
-bExecute = nResult == RET_YES;
+if (bHeader) {
+nResult = 
ScopedVclPtrInstanceDeleteHeaderDialog::Create(pParent)-Execute();
+} else {
+nResult = 
ScopedVclPtrInstanceDeleteFooterDialog::Create(pParent)-Execute();
+}
 
+bExecute = nResult == RET_YES;
 StartAllAction();
 }
 if( bExecute )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 sw/source/uibase/wrtsh/wrtsh1.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 6e4922b0def9d3bebe04b48bc9055a16bb4965bf
Author: Philippe Jung phil.j...@free.fr
Date:   Tue May 26 13:48:18 2015 +0200

tdf#91389 EDITING: Crash when deleting header

Replaced MyDlg(pParent).Execute by VclPtr equivalent

Change-Id: I7e03913665f770d694f53949e08425ba60adc6ad
Reviewed-on: https://gerrit.libreoffice.org/15908
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 08422c7..37f0553 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1771,12 +1771,13 @@ void SwWrtShell::ChangeHeaderOrFooter(
 
 vcl::Window* pParent = GetView().GetViewFrame()-GetWindow();
 short nResult;
-if (bHeader)
-nResult = DeleteHeaderDialog(pParent).Execute();
-else
-nResult = DeleteFooterDialog(pParent).Execute();
-bExecute = nResult == RET_YES;
+if (bHeader) {
+nResult = 
ScopedVclPtrInstanceDeleteHeaderDialog::Create(pParent)-Execute();
+} else {
+nResult = 
ScopedVclPtrInstanceDeleteFooterDialog::Create(pParent)-Execute();
+}
 
+bExecute = nResult == RET_YES;
 StartAllAction();
 }
 if( bExecute )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Help on Building Libreoffice

[Philippe Jung]

Hi, 
Usually I receive this kind of message when behind a company proxy that does 
not allow git protocol.
You should try
export http_proxy=http://addr_of_proxy:port_of_proxy
Idem for https_proxy
Then clone through http 
git clone http://anongit.freedesktop.org/git/libreoffice/core.git

Philippe

Le 25 mai 2015 13:51:09 CEST, Kismabo adwa kinfegu...@gmail.com a écrit :
Hi everybody,  i want u to help me how to  build libreoffice. I have
being directed by  this
https://wiki.documentfoundation.org/Development/BuildingOnLinux  on
how to build libreoffice I have installed git. then when i try to
clone with git clone git://anongit.freedesktop.org/libreoffice/core
libreoffice , i  get the following error.
'
'
Cloning into 'libreoffice'...
fatal: unable to connect to anongit.freedesktop.org:
anongit.freedesktop.org: Name or service not known
'
'

how should i solve this?

is it possible to download the source code and copy to /.git directory
instead of running git clone
git://anongit.freedesktop.org/libreoffice/core libreoffice  command?
i tried it  as following,
i downloaded source code of libreoffice and i copied to
home/.git/libreoffice, when i run
 it told me that there is no autogen.sh file.

$ cd libreoffice
$ ./autogen.sh

this generates bash: /autogen.sh: No such file or directory error.

i couldn't even find the autogen.sh file by searching in the whole
source
code.

...pls help me in this how to solve...

Thanx,




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

-- 
Envoyé de mon téléphone Android avec K-9 Mail. Excusez la brièveté.___
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

[Philippe Jung]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   24 +++-
 sw/inc/cmdid.h  |6 -
 sw/sdi/_tabsh.sdi   |   18 +++
 sw/sdi/swriter.sdi  |   52 
+-
 sw/source/ui/app/mn.src |   18 ++-
 sw/source/uibase/shells/tabsh.cxx   |   17 ++-
 6 files changed, 115 insertions(+), 20 deletions(-)

New commits:
commit 447783a9b2053acd74d265af3ed2a6c5c93a
Author: Philippe Jung phil.j...@free.fr
Date:   Sun May 17 17:42:54 2015 +0200

tdf#90882 Writer: insert row/col before/after

From the contextual menu, it is now possible to insert rows or cols
before the current position.

Number of rows/cols inserted is based on current selection.

Change-Id: Ie1a718fbb1b8caf67716f9c8fad21f90d182ca79
Reviewed-on: https://gerrit.libreoffice.org/15773
Reviewed-by: Yousuf Philips philip...@hotmail.com
Tested-by: Yousuf Philips philip...@hotmail.com

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 40ddf82..87e9234 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1118,9 +1118,17 @@
   value1/value
 /prop
   /node
-  node oor:name=.uno:InsertRows oor:op=replace
+  node oor:name=.uno:InsertRowsBelow oor:op=replace
 prop oor:name=Label oor:type=xs:string
-  value xml:lang=en-USInsert Row Below/value
+  value xml:lang=en-USInsert Rows Below/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
+  node oor:name=.uno:InsertRowsAfter oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USInsert Rows After/value
 /prop
 prop oor:name=Properties oor:type=xs:int
   value1/value
@@ -1134,9 +1142,17 @@
   value1/value
 /prop
   /node
-  node oor:name=.uno:InsertColumns oor:op=replace
+  node oor:name=.uno:InsertColumnsBefore oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USInsert Columns Left/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
+  node oor:name=.uno:InsertColumnsAfter oor:op=replace
 prop oor:name=Label oor:type=xs:string
-  value xml:lang=en-USInsert Column Right/value
+  value xml:lang=en-USInsert Columns Right/value
 /prop
 prop oor:name=Properties oor:type=xs:int
   value1/value
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index dda4a38..e07ca6f 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -334,8 +334,8 @@
 
 #define FN_TABLE_REP(FN_FORMAT + 99)  /* TableRepresentation */
 #define FN_CONVERT_TEXT_TABLE   (FN_FORMAT + 100)  /* convert text - 
table */
-#define FN_TABLE_INSERT_ROW (FN_FORMAT + 101)  /* */
-#define FN_TABLE_INSERT_COL (FN_FORMAT + 102)  /* */
+#define FN_TABLE_INSERT_ROW_AFTER   (FN_FORMAT + 101)  /* */
+#define FN_TABLE_INSERT_COL_AFTER   (FN_FORMAT + 102)  /* */
 #define FN_TABLE_DELETE_ROW (FN_FORMAT + 103)  /* */
 #define FN_TABLE_DELETE_COL (FN_FORMAT + 104)  /* */
 #define FN_TABLE_SPLIT_CELLS(FN_FORMAT + 105)  /* */
@@ -343,6 +343,8 @@
 #define FN_TABLE_SET_ROW_HEIGHT (FN_FORMAT + 107)  /* */
 #define FN_TABLE_SET_COL_WIDTH  (FN_FORMAT + 108)  /* */
 #define FN_OPTIMIZE_TABLE   (FN_FORMAT + 110)  /* ToolBoxItem for 
optimizing tables */
+#define FN_TABLE_INSERT_ROW_BEFORE  (FN_FORMAT + 111)  /* */
+#define FN_TABLE_INSERT_COL_BEFORE  (FN_FORMAT + 112)  /* */
 #define FN_TABLE_SELECT_ROW (FN_FORMAT + 113)  /* */
 #define FN_TABLE_SELECT_COL (FN_FORMAT + 114)  /* */
 #define FN_TABLE_SELECT_ALL (FN_FORMAT + 115)  /* */
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index c740572..63792fe 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -141,7 +141,14 @@ interface BaseTextTable
 StateMethod = NoState ;
 ]
 
-FN_TABLE_INSERT_COL // status(final|play)
+FN_TABLE_INSERT_COL_BEFORE // status(final|play)
+[
+ExecMethod = Execute ;
+StateMethod = NoState ;
+DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
+]
+
+FN_TABLE_INSERT_COL_AFTER // status(final|play)
 [
 ExecMethod = Execute ;
 StateMethod = NoState ;
@@ -155,7 +162,14 @@ interface BaseTextTable
 DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
 ]
 
-FN_TABLE_INSERT_ROW // status(final|play)
+FN_TABLE_INSERT_ROW_BEFORE // status(final|play)
+[
+ExecMethod

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

[Philippe Jung]

 include/vcl/splitwin.hxx   |   12 
 vcl/source/window/splitwin.cxx |  795 -
 2 files changed, 409 insertions(+), 398 deletions(-)

New commits:
commit 9451097a9d20f8a522d587271d57efee1fc5566d
Author: Philippe Jung phil.j...@free.fr
Date:   Mon May 18 16:58:39 2015 +0200

tdf#91259 Crash when closing Help

Rewrite of splitwin.

The previous implementation used struct and memset/memcpy/memmove.
Struct have been replaced by classes with destructors. Array of pointers
are handled in vectors.
This enables clean call to clear of VclPtr.

Change-Id: Iab77303fb1d802f208dfdf476140557e42af949a
Reviewed-on: https://gerrit.libreoffice.org/15788
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index ea38e5b..867a343 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -24,7 +24,7 @@
 #include vcl/dockwin.hxx
 
 class Wallpaper;
-struct ImplSplitSet;
+class ImplSplitSet;
 
 typedef sal_uInt16 SplitWindowItemBits;
 
@@ -57,9 +57,9 @@ private:
 longmnMSplitPos;
 WinBits mnWinStyle;
 WindowAlign meAlign;
-sal_uInt16  mnSplitTest;
-sal_uInt16  mnSplitPos;
-sal_uInt16  mnMouseModifier;
+sal_uInt16  mnSplitTest;
+sal_uInt16  mnSplitPos;
+sal_uInt16  mnMouseModifier;
 boolmbDragFull:1,
 mbHorz:1,
 mbBottomRight:1,
@@ -145,10 +145,10 @@ public:
 virtual boolPreNotify( NotifyEvent rNEvt ) SAL_OVERRIDE;
 
 voidInsertItem( sal_uInt16 nId, vcl::Window* pWindow, long 
nSize,
-sal_uInt16 nPos = SPLITWINDOW_APPEND, 
sal_uInt16 nSetId = 0,
+sal_uInt16 nPos = SPLITWINDOW_APPEND, 
sal_uInt16 nIntoSetId = 0,
 SplitWindowItemBits nBits = 0 );
 voidInsertItem( sal_uInt16 nId, long nSize,
-sal_uInt16 nPos = SPLITWINDOW_APPEND, 
sal_uInt16 nSetId = 0,
+sal_uInt16 nPos = SPLITWINDOW_APPEND, 
sal_uInt16 nIntoSetId = 0,
 SplitWindowItemBits nBits = 0 );
 voidRemoveItem( sal_uInt16 nId, bool bHide = true );
 voidClear();
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 160e204..34f8e09 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -36,10 +36,25 @@
 #include svdata.hxx
 #include svids.hrc
 
-// Attention: Must not contain non-PODs because array is enlarged/copied
-// with the use of memmove/memcpy.
-struct ImplSplitItem
+
+#define SPLITWIN_SPLITSIZE  4
+#define SPLITWIN_SPLITSIZEEX4
+#define SPLITWIN_SPLITSIZEEXLN  7
+#define SPLITWIN_SPLITSIZEAUTOHIDE  72
+#define SPLITWIN_SPLITSIZEFADE  72
+
+#define SPLIT_HORZ  ((sal_uInt16)0x0001)
+#define SPLIT_VERT  ((sal_uInt16)0x0002)
+#define SPLIT_WINDOW((sal_uInt16)0x0004)
+#define SPLIT_NOSPLIT   ((sal_uInt16)0x8000)
+
+class ImplSplitItem
 {
+public:
+ImplSplitItem();
+~ImplSplitItem();
+void dispose();
+
 longmnSize;
 longmnPixSize;
 longmnLeft;
@@ -65,18 +80,78 @@ struct ImplSplitItem
 longmnMaxSize;
 };
 
-struct ImplSplitSet
+typedef std::vector ImplSplitItem*  ImplSplitItems;
+
+class ImplSplitSet
 {
-ImplSplitItem*  mpItems;
+public:
+ImplSplitSet();
+~ImplSplitSet();
+void dispose();
+
+ImplSplitItems  mpItems;
 Wallpaper*  mpWallpaper;
 Bitmap* mpBitmap;
 longmnLastSize;
 longmnSplitSize;
-sal_uInt16  mnItems;
-sal_uInt16  mnId;
+sal_uInt16  mnId;
 boolmbCalcPix;
 };
 
+ImplSplitItem::ImplSplitItem() :
+mpSet( NULL )
+{
+}
+
+ImplSplitItem::~ImplSplitItem()
+{
+dispose();
+}
+
+void ImplSplitItem::dispose()
+{
+if (mpSet) {
+delete mpSet ;
+mpSet = NULL;
+}
+mpWindow.clear();
+mpOrgParent.clear();
+}
+
+ImplSplitSet::ImplSplitSet() :
+mpWallpaper( NULL ),
+mpBitmap( NULL ),
+mnLastSize( 0 ),
+mnSplitSize( SPLITWIN_SPLITSIZE ),
+mnId( 0 ),
+mbCalcPix( true )
+{
+}
+
+ImplSplitSet::~ImplSplitSet()
+{
+dispose();
+}
+
+void ImplSplitSet::dispose()
+{
+size_t nItems = mpItems.size();
+
+for ( size_t i = 0; i  nItems; i++ )
+delete mpItems[i];
+mpItems.clear();
+
+if ( mpWallpaper ) {
+delete mpWallpaper

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

[Philippe Jung]

 svx/source/sidebar/tools/Popup.cxx |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 3430d2c2b2c4e24b2757015addada9256e399012
Author: Philippe Jung phil.j...@free.fr
Date:   Tue May 19 18:32:21 2015 +0200

tdf#91382 UI: Crash after visiting Sidebar Properties Page

When a popup is displayed, no cleaning / disposing is performed.

Change-Id: Ibae0f977360f8862f2d7ff4c753356975dec3771
Reviewed-on: https://gerrit.libreoffice.org/15817
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/svx/source/sidebar/tools/Popup.cxx 
b/svx/source/sidebar/tools/Popup.cxx
index 193bf85..71911a5 100644
--- a/svx/source/sidebar/tools/Popup.cxx
+++ b/svx/source/sidebar/tools/Popup.cxx
@@ -42,8 +42,8 @@ Popup::Popup (
 
 Popup::~Popup()
 {
-mxControl.reset();
-mxContainer.reset();
+mxControl.disposeAndClear();
+mxContainer.disposeAndClear();
 }
 
 void Popup::Show (ToolBox rToolBox)
@@ -103,12 +103,16 @@ void Popup::ProvideContainerAndControl()
 
 void Popup::CreateContainerAndControl()
 {
-mxContainer.reset(VclPtrPopupContainer::Create(mpParent));
+// Clean previous components, if any
+mxControl.disposeAndClear();
+mxContainer.disposeAndClear();
+
+mxContainer.set(VclPtrPopupContainer::Create(mpParent));
 mxContainer-SetAccessibleName(msAccessibleName);
 mxContainer-SetPopupModeEndHdl(LINK(this, Popup, PopupModeEndHandler));
 mxContainer-SetBorderStyle(mxContainer-GetBorderStyle() | 
WindowBorderStyle::MENU);
 
-mxControl.reset(maControlCreator(mxContainer.get()));
+mxControl.set(maControlCreator(mxContainer.get()));
 }
 
 IMPL_LINK_NOARG(Popup, PopupModeEndHandler)
@@ -117,8 +121,8 @@ IMPL_LINK_NOARG(Popup, PopupModeEndHandler)
 maPopupModeEndCallback();
 
 // Popup control is no longer needed and can be destroyed.
-mxControl.reset();
-mxContainer.reset();
+mxControl.disposeAndClear();
+mxContainer.disposeAndClear();
 
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 sw/inc/swtable.hxx  |4 
 sw/qa/extras/uiwriter/data/tdf90883.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx  |   18 ++
 sw/source/core/table/swtable.cxx|   25 +
 sw/source/uibase/shells/tabsh.cxx   |   25 -
 5 files changed, 71 insertions(+), 1 deletion(-)

New commits:
commit d49242026ed9e342871b437998a40a253e4f26c8
Author: Philippe Jung phil.j...@free.fr
Date:   Sat May 16 00:04:43 2015 +0200

tdf#90883 WRITER: Insert button with multiple rows/columns selected

Compute the number of rows/columns to insert based on selected cells.

Change-Id: I489bca715dcf31d191f9a875ac5d59a6140a14d7
Reviewed-on: https://gerrit.libreoffice.org/15741
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index ac000d8..088c01b 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -433,6 +433,10 @@ public:
 // Return value of box (for calculating in table).
 double GetValue( SwTblCalcPara rPara ) const;
 
+// Computes coordinates of a box, used to computed selection
+// width or height when inserting cols or rows
+Point GetCoordinates() const;
+
 bool IsInHeadline( const SwTable* pTbl = 0 ) const;
 
 // Contains box contents, that can be formatted as a number?
diff --git a/sw/qa/extras/uiwriter/data/tdf90883.odt 
b/sw/qa/extras/uiwriter/data/tdf90883.odt
new file mode 100644
index 000..ea9df27
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf90883.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 3a47b8d..e8ffdd7 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -92,6 +92,7 @@ public:
 void testTdf90362();
 void testUndoCharAttribute();
 void testTdf86639();
+void testTdf90883TableBoxGetCoordinates();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -128,6 +129,7 @@ public:
 CPPUNIT_TEST(testTdf90362);
 CPPUNIT_TEST(testUndoCharAttribute);
 CPPUNIT_TEST(testTdf86639);
+CPPUNIT_TEST(testTdf90883TableBoxGetCoordinates);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -962,6 +964,22 @@ void SwUiWriterTest::testTdf86639()
 CPPUNIT_ASSERT_EQUAL(aExpected, 
getPropertyOUString(getRun(getParagraph(1), 1), CharFontName));
 }
 
+void SwUiWriterTest::testTdf90883TableBoxGetCoordinates()
+{
+SwDoc* pDoc = createDoc(tdf90883.odt);
+SwWrtShell* pWrtShell = pDoc-GetDocShell()-GetWrtShell();
+pWrtShell-Down(true);
+SwSelBoxes aBoxes;
+::GetTblSel( *pWrtShell, aBoxes );
+CPPUNIT_ASSERT_EQUAL( 2, (int)aBoxes.size() );
+Point pos ( aBoxes[0]-GetCoordinates() );
+CPPUNIT_ASSERT_EQUAL( 1, (int)pos.X() );
+CPPUNIT_ASSERT_EQUAL( 1, (int)pos.Y() );
+pos = aBoxes[1]-GetCoordinates();
+CPPUNIT_ASSERT_EQUAL( 1, (int)pos.X() );
+CPPUNIT_ASSERT_EQUAL( 2, (int)pos.Y() );
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index fa0ffd8..6fcab86 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1841,6 +1841,31 @@ void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString rNm )
 } while( true );
 }
 
+Point SwTableBox::GetCoordinates() const
+{
+if( !pSttNd )   // box without content?
+{
+// search for the next first box?
+return Point( 0, 0 );
+}
+
+const SwTable rTbl = pSttNd-FindTableNode()-GetTable();
+sal_uInt16 nX, nY;
+const SwTableBox* pBox = this;
+do {
+const SwTableBoxes* pBoxes = pBox-GetUpper()-GetTabBoxes();
+const SwTableLine* pLine = pBox-GetUpper();
+// at the first level?
+const SwTableLines* pLines = pLine-GetUpper()
+? pLine-GetUpper()-GetTabLines() : rTbl.GetTabLines();
+
+nY = pLines-GetPos( pLine ) + 1 ;
+nX = pBoxes-GetPos( pBox ) + 1 ;
+pBox = pLine-GetUpper();
+} while( pBox );
+return Point( nX, nY );
+}
+
 OUString SwTableBox::GetName() const
 {
 if( !pSttNd )   // box without content?
diff --git a/sw/source/uibase/shells/tabsh.cxx 
b/sw/source/uibase/shells/tabsh.cxx
index ead7b16..5862618 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -833,7 +833,30 @@ void SwTableShell::Execute(SfxRequest rReq)
 bAfter = static_castconst SfxBoolItem* 
(pItem)-GetValue();
 }
 else if( !rReq.IsAPI() )
-++nCount;
+{
+SwSelBoxes aBoxes;
+::GetTblSel( rSh, aBoxes );
+if ( !aBoxes.empty() )
+{
+long maxX = 0;
+long maxY = 0;
+long minX = std

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

[Philippe Jung]

 include/vcl/splitwin.hxx   |   10 
 vcl/source/window/splitwin.cxx |  725 -
 2 files changed, 369 insertions(+), 366 deletions(-)

New commits:
commit 91b181467f8fe5f7bf325e3bb82aead7eadc6ad9
Author: Philippe Jung phil.j...@free.fr
Date:   Sat May 16 15:11:36 2015 +0200

tdf#91259 Crash when closing Help

Rewrite of splitwin.

The previous implementation used struct and memset/memcpy/memmove.
Struct have been replaced by classes with destructors. Array of pointers
are handled in vectors.
This enables clean call to clear of VclPtr.

Change-Id: Idfbe698348f7bfb46aae7f97f6edbe7127df58cf
Reviewed-on: https://gerrit.libreoffice.org/15756
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index ea38e5b..e8b442d 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -57,9 +57,9 @@ private:
 longmnMSplitPos;
 WinBits mnWinStyle;
 WindowAlign meAlign;
-sal_uInt16  mnSplitTest;
-sal_uInt16  mnSplitPos;
-sal_uInt16  mnMouseModifier;
+sal_uInt16  mnSplitTest;
+sal_uInt16  mnSplitPos;
+sal_uInt16  mnMouseModifier;
 boolmbDragFull:1,
 mbHorz:1,
 mbBottomRight:1,
@@ -145,10 +145,10 @@ public:
 virtual boolPreNotify( NotifyEvent rNEvt ) SAL_OVERRIDE;
 
 voidInsertItem( sal_uInt16 nId, vcl::Window* pWindow, long 
nSize,
-sal_uInt16 nPos = SPLITWINDOW_APPEND, 
sal_uInt16 nSetId = 0,
+sal_uInt16 nPos = SPLITWINDOW_APPEND, 
sal_uInt16 nIntoSetId = 0,
 SplitWindowItemBits nBits = 0 );
 voidInsertItem( sal_uInt16 nId, long nSize,
-sal_uInt16 nPos = SPLITWINDOW_APPEND, 
sal_uInt16 nSetId = 0,
+sal_uInt16 nPos = SPLITWINDOW_APPEND, 
sal_uInt16 nIntoSetId = 0,
 SplitWindowItemBits nBits = 0 );
 voidRemoveItem( sal_uInt16 nId, bool bHide = true );
 voidClear();
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index f88aec7..7e1a472 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -36,10 +36,13 @@
 #include svdata.hxx
 #include svids.hrc
 
-// Attention: Must not contain non-PODs because array is enlarged/copied
-// with the use of memmove/memcpy.
-struct ImplSplitItem
+
+class ImplSplitItem
 {
+public:
+~ImplSplitItem();
+void dispose();
+
 longmnSize;
 longmnPixSize;
 longmnLeft;
@@ -65,18 +68,56 @@ struct ImplSplitItem
 longmnMaxSize;
 };
 
-struct ImplSplitSet
+typedef std::vector ImplSplitItem*  ImplSplitItems;
+
+class ImplSplitSet
 {
-ImplSplitItem*  mpItems;
+public:
+~ImplSplitSet();
+void dispose();
+
+ImplSplitItems  mpItems;
 Wallpaper*  mpWallpaper;
 Bitmap* mpBitmap;
 longmnLastSize;
 longmnSplitSize;
-sal_uInt16  mnItems;
-sal_uInt16  mnId;
+sal_uInt16  mnId;
 boolmbCalcPix;
 };
 
+ImplSplitItem::~ImplSplitItem()
+{
+dispose();
+}
+
+void ImplSplitItem::dispose()
+{
+if (mpSet)
+delete mpSet ;
+mpWindow.clear();
+mpOrgParent.clear();
+}
+
+ImplSplitSet::~ImplSplitSet()
+{
+dispose();
+}
+
+void ImplSplitSet::dispose()
+{
+size_t nItems = mpItems.size();
+
+for ( size_t i = 0; i  nItems; i++ )
+delete mpItems[i];
+mpItems.clear();
+
+if ( mpWallpaper )
+delete mpWallpaper;
+
+if ( mpBitmap )
+delete mpBitmap;
+}
+
 /** Check whether the given size is inside the valid range defined by
 [rItem.mnMinSize,rItem.mnMaxSize].  When it is not inside it then return
 the upper or lower bound, respectively. Otherwise return the given size
@@ -85,12 +126,12 @@ struct ImplSplitSet
 size has not lower or upper bound.
 */
 namespace {
-long ValidateSize (const long nSize, const ImplSplitItem rItem)
+long ValidateSize (const long nSize, const ImplSplitItem* pItem)
 {
-if (rItem.mnMinSize=0  nSizerItem.mnMinSize)
-return rItem.mnMinSize;
-else if (rItem.mnMaxSize0  nSizerItem.mnMaxSize)
-return rItem.mnMaxSize;
+if (pItem-mnMinSize=0  nSizepItem-mnMinSize)
+return pItem-mnMinSize;
+else if (pItem-mnMaxSize0  nSizepItem-mnMaxSize)
+return pItem-mnMaxSize;
 else
 return nSize;
 }
@@ -258,20 +299,20 @@ static

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

[Philippe Jung]

 framework/source/uielement/toolbarmanager.cxx |3 +
 include/vcl/menu.hxx  |6 ++
 vcl/source/window/menu.cxx|   61 +-
 vcl/source/window/menufloatingwindow.cxx  |1 
 4 files changed, 68 insertions(+), 3 deletions(-)

New commits:
commit 415454cfbc6add8534e1dcff1ff16cc8dcc9296c
Author: Philippe Jung phil.j...@free.fr
Date:   Wed May 13 15:59:40 2015 +0200

tdf#86138 Context menu should state the name of the toolbar

When Menu::SetText is called, it defines the title of the menu (reuse of
an already defined  not used aTitleText)
Popup-menu with a title defined paint it on top of the popup. Text is bold
with a background slightly darker than the rest of the popup.

Change-Id: Ifca1be60541400f76f562b03f6e3c40dc5fecb29
Reviewed-on: https://gerrit.libreoffice.org/15716
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index 3e12b5e..7f55ed1 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1765,6 +1765,9 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 pMenu-SetPopupMenu( 1, pItemMenu );
 }
 
+// Set the title of the menu
+pMenu-SetText( pToolBar-GetText() );
+
 if ( bHideDisabledEntries )
 pMenu-RemoveDisabledEntries();
 
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 24c716d..4899455 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -136,6 +136,7 @@ private:
 VclEventListeners   maChildEventListeners;
 
 OUStringaTitleText; // PopupMenu text
+sal_uInt16  nTitleHeight;
 
 ImplSVEvent *   nEventId;
 sal_uInt16  mnHighlightedItemPos; // for native menus: keeps track 
of the highlighted item
@@ -159,7 +160,7 @@ protected:
 SAL_DLLPRIVATE Menu*ImplGetStartMenu();
 SAL_DLLPRIVATE Menu*ImplFindSelectMenu();
 SAL_DLLPRIVATE Menu*ImplFindMenu( sal_uInt16 nId );
-SAL_DLLPRIVATE Size ImplCalcSize( const vcl::Window* pWin );
+SAL_DLLPRIVATE Size ImplCalcSize( vcl::Window* pWin );
 SAL_DLLPRIVATE bool ImplIsVisible( sal_uInt16 nPos ) const;
 SAL_DLLPRIVATE bool ImplIsSelectable( sal_uInt16 nPos ) const;
 SAL_DLLPRIVATE sal_uInt16   ImplGetVisibleItemCount() const;
@@ -167,6 +168,7 @@ protected:
 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 ImplPaintMenuTitle( vcl::Window* pWin, 
const Rectangle rRect ) const;
 SAL_DLLPRIVATE void ImplSelect();
 SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 
nHighlightItem );
 SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, 
sal_uInt16 nPos );
@@ -332,6 +334,8 @@ public:
 
 boolHasLogo() const { return pLogo != nullptr; }
 
+sal_uInt16  GetTitleHeight() { return nTitleHeight; }
+
 voidAddEventListener( const Link rEventListener );
 voidRemoveEventListener( const Link rEventListener );
 voidAddChildEventListener( const Link rEventListener );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 98f9531..f3defdd 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -85,6 +85,7 @@ using namespace ::com::sun::star;
 using namespace vcl;
 
 #define EXTRAITEMHEIGHT 4
+#define SPACE_AROUND_TITLE  2
 
 static bool ImplAccelDisabled()
 {
@@ -118,6 +119,7 @@ Menu::Menu()
   pLogo(NULL),
   pStartedFrom(NULL),
   pWindow(NULL),
+  nTitleHeight(0),
   nEventId(0),
   mnHighlightedItemPos(ITEMPOS_INVALID),
   nMenuFlags(0),
@@ -1263,6 +1265,7 @@ Menu Menu::operator=( const Menu rMenu )
 aHighlightHdl = rMenu.aHighlightHdl;
 aSelectHdl = rMenu.aSelectHdl;
 aTitleText = rMenu.aTitleText;
+nTitleHeight = rMenu.nTitleHeight;
 
 return *this;
 }
@@ -1508,7 +1511,7 @@ void Menu::ImplRemoveDel( ImplMenuDelData rDel )
 }
 }
 
-Size Menu::ImplCalcSize( const vcl::Window* pWin )
+Size Menu::ImplCalcSize( vcl::Window* pWin )
 {
 // | Check/Radio/Image| Text| Accel/Popup|
 
@@ -1566,7 +1569,7 @@ Size Menu::ImplCalcSize( const vcl::Window* pWin )
 // Separator
 if (!IsMenuBar() (pData-eType == MenuItemType::SEPARATOR))
 {
-DBG_ASSERT

Re: Renaming in sw/

[Philippe Jung]

Kendy, it seems you don't apply renaming to modules other than sw.
I mean there are references to sw at least in comments in other modules (svx 
for example). Maybe replacement should be done here too.

Philippe

Le 12 mai 2015 19:04:28 CEST, Jan Holesovsky ke...@collabora.com a écrit :
Hi Bjoern, all,

Bjoern Michaelsen píše v Čt 07. 05. 2015 v 14:56 +0200:

 IMHO lets leave Frm - Frame out of the change in this round. In the
end, we
 should have the SwFrm/sw::Frame situation sorted out in a consistent
way,
 ideally with most of the Writer stuff actually namespaced in sw.

OK; still I did a small change there - s/FrmFmt/FrameFormat/ - as
SwFrmFormat was really annoying after the change :-) - hope that's
fine.

 As such I'd propose to do this round with all the nonconflicting
stuff (Fmt,
 Cntnt, Txt, Fld, Ftn, Updt, Fml, Hnt) and leave Frm as is. Lets also
see how
 painful those others are on their own.

http://cgit.freedesktop.org/libreoffice/core/tree/bin/rename-sw-abbreviations.sh

I'm now running a test build in

https://gerrit.libreoffice.org/15718

The build seems to be clean, without 'shadow' warnings and similar
errors - I have renamed the variables that were doing problems in
separate commits directly (using m_ prefixes or better names).  I might
have overlooked something though, so review / feedback appreciated.

All the best,
Kendy

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

-- 
Envoyé de mon téléphone Android avec K-9 Mail. Excusez la brièveté.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Philippe Jung]

 basic/source/runtime/methods.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2bb4d6cad41765db299db45511d2554984666085
Author: Philippe Jung phil.j...@free.fr
Date:   Tue May 12 15:50:29 2015 +0200

Missing disposeAndClear in MsgBox basic function

Change-Id: Ida3d792a6f3797a6173b31b86a49b72ad7353340
Reviewed-on: https://gerrit.libreoffice.org/15717
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index d05c3fa..377b66c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4649,6 +4649,7 @@ RTLFUNC(MsgBox)
 nMappedRet = nButtonMap[ nRet ];
 }
 rPar.Get(0)-PutInteger( nMappedRet );
+pBox.disposeAndClear();
 }
 
 RTLFUNC(SetAttr)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 cui/source/customize/macropg.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f4f211619c4006ae99ec365f47d199c43fa21874
Author: Philippe Jung phil.j...@free.fr
Date:   Mon May 11 12:18:30 2015 +0200

LO crash when Tools - Customize - Event - ESC

Change-Id: Iae2687d980b126912ed1e9c7045605a90aeb7ffe
Reviewed-on: https://gerrit.libreoffice.org/15700
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index b0b964c..c50b487 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -123,7 +123,8 @@ bool MacroEventListBox::Notify( NotifyEvent rNEvt )
 if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
 {
 if ( rNEvt.GetWindow() != maListBox.get() )
-maListBox-GrabFocus();
+if (maListBox)
+maListBox-GrabFocus();
 }
 
 return nRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 cui/source/options/optaboutconfig.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0b4e3f5ebd2511c7ba39cbcc83d5faddb842404d
Author: Philippe Jung phil.j...@free.fr
Date:   Sun May 10 15:02:21 2015 +0200

Crash Options-Advanced-Advanced, missing disposeAndClear

Change-Id: Ibf0c2893f0ccd784430fbed3c9fdc5985f5bb708
Reviewed-on: https://gerrit.libreoffice.org/15696
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index b246966..8c3d633 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -168,6 +168,7 @@ CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
 
 void CuiAboutConfigTabPage::dispose()
 {
+m_pPrefBox.disposeAndClear();
 m_pPrefCtrl.clear();
 m_pResetBtn.clear();
 m_pEditBtn.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New Defects reported by Coverity Scan for LibreOffice

[Philippe Jung]

 /sw/source/core/draw/dflyobj.cxx: 775 in SwVirtFlyDrawObj::NbcCrop(const 
 Point , const Fraction , const Fraction )()
 CID 1297232:  Incorrect expression  (DIVIDE_BY_ZERO)
 In expression (aGraphicSize.Width() - aCropRectangle.Left() - 
 aCropRectangle.Right()) / (double)aOldRect.GetWidth(), division by 
 expression aOldRect.GetWidth() which may be zero has undefined behavior.
 775 double fScaleX = ( aGraphicSize.Width() - aCropRectangle.Left() - 
 aCropRectangle.Right() ) / (double)aOldRect.GetWidth();
 CID 1297231:  Incorrect expression  (DIVIDE_BY_ZERO)
 In expression (aGraphicSize.Height() - aCropRectangle.Top() - 
 aCropRectangle.Bottom()) / (double)aOldRect.GetHeight(), division by 
 expression aOldRect.GetHeight() which may be zero has undefined behavior.
 776 double fScaleY = ( aGraphicSize.Height() - aCropRectangle.Top() - 
 aCropRectangle.Bottom() ) / (double)aOldRect.GetHeight();

Fixed by https://gerrit.libreoffice.org/#/c/15685/
If someone can merge this into master.

Philippe

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

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

[Philippe Jung]

 sfx2/source/dialog/infobar.cxx |8 ++--
 vcl/source/window/winproc.cxx  |5 -
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 3faf9c4a2a5d2f761dc83b942199f55cdbd5f054
Author: Philippe Jung phil.j...@free.fr
Date:   Thu May 7 10:15:46 2015 +0200

Fix a crash in SfxInfoBarWindow

Fix a crash that occurs when a locked doc is opened. Ask to open it
read-only, then click on Edit the document in the info bar. Used to
crash.

Change-Id: Ic6e53853345e9e8431cae0eb2408ab0624d92cce

diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index ff91cc6..3c2c197 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -283,17 +283,21 @@ SfxInfoBarWindow* 
SfxInfoBarContainerWindow::getInfoBar(const OUString sId)
 
 void SfxInfoBarContainerWindow::removeInfoBar(SfxInfoBarWindow* pInfoBar)
 {
+// Store a VclPtr to the pInfoBar while we remove it from m_pInfoBars
+ScopedVclPtrSfxInfoBarWindow pTmp(pInfoBar);
+
+// Remove
 for (auto it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
 {
 if (pInfoBar == it-get())
 {
+it-disposeAndClear();
 m_pInfoBars.erase(it);
 break;
 }
 }
-if (pInfoBar)
-pInfoBar-disposeOnce();
 
+// Resize
 long nY = 0;
 for (auto it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
 {
commit cc444e083c59ffcd73520faf55a28f55cfcb0068
Author: Michael Meeks michael.me...@collabora.com
Date:   Thu May 7 11:08:24 2015 +0100

Hold a reference on the Window while emitting events from vcl backends.

Change-Id: I4673dc03c214ca8f5c227a444e182a45f6199b9b

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 6cccd18..30db414 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2377,11 +2377,14 @@ static void ImplHandleSalQueryCharPosition( vcl::Window 
*pWindow,
 }
 }
 
-bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/,
+bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
   sal_uInt16 nEvent, const void* pEvent )
 {
 DBG_TESTSOLARMUTEX();
 
+// Ensure the window survives during this method.
+VclPtrvcl::Window pWindow( _pWindow );
+
 bool nRet = false;
 
 // #119709# for some unknown reason it is possible to receive events (in 
this case key events)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Renaming in sw/

[Philippe Jung]

Hi,
Grf for Graphic (SwGrfShell, SwGrfNode, SwGrfExtPage, SwWebGrfShell...)
May I also propose to replace Sw by LOw :-)
Philippe

Le 7 mai 2015 10:46:51 CEST, Jan Holesovsky ke...@collabora.com a écrit :
Hi,

I mentioned at the ESC that I'd like to do some larger renaming in sw/,
and got an action item to send the list first; so here it is.

I did not mean to change namespace (eg. do not want to change SwFrm to
sw::Frame) as that would make it harder to grep (and could potentially
cause larger problems), but mostly meant to insert vowels into the
names
to make the reading easier [and writing too, actually - try to type
Cntnt :-)].

I mention only the class names in the examples, but I'd like to do it
wholesale - so even in the variable or function names:

Frm - Frame (to handle things like SwFrm, SwCellFrm, SwRowFrm,
SwColumnFrm, ..., SwFrmFmt, FrmMap, SwFlyFrm, etc.)

Fmt - Format (to handle those SwFrmFmt, SvxSwAutoFmtFlags,
SwTxtCharFmt, SwFmtFillOrder, SwFmtFrmSize, SwFmtCntnt, ...)

Cntnt - Content (to handle SwCntntNode, SwCntntFrm, SwCntntNode, etc.)

Txt - Text (to handle SwTxtNode, SwTxtFrm, SwTxtAttr, SwTxtFld,
SwNoTxtNode, etc.)

Fld - Field (to handle SwFldTypes, SwDocUpdtFld, SwTxtFld, SwFmtFld,
etc.)

Ftn - Footnote (to handle SwFtnContFrm, SwFtnFrm, SwFtnPortion,
SwFtnContFrm, etc.)

Updt - Update (SwDocUpdtFld, TableFmlUpdtFlags, SwDocUpdtFld, 

Fml - Formula (SwTableFmlUpdate, TableFmlUpdtFlags)

Hnt - Hint (mostly in variable names)

That's it for now - comments appreciated!

I deliberately leave out eg. Cnt (usually Count, but could be Content
by
mistake), or PaM (as PointAndMark would be too long - but I think it
would deserve some better name too).

Thank you,
Kendy

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

-- 
Envoyé de mon téléphone Android avec K-9 Mail. Excusez la brièveté.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Philippe Jung]

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

New commits:
commit aa87af58b195af94ea5b9dcb01faf09e01e76e1b
Author: Philippe Jung phil.j...@free.fr
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: officecfg/registry sw/inc sw/sdi sw/source sw/uiconfig

[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 phil.j...@free.fr
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 c...@libreoffice.org
Reviewed-by: Jan Holesovsky ke...@collabora.com

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 @@
   value1/value
 /prop
   /node
+  node oor:name=.uno:ChangePicture oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-US~Change Image.../value
+/prop
+prop oor:name=Properties oor:type=xs:int
+value1/value
+/prop
+  /node
+  node oor:name=.uno:CompressGraphic oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USCo~mpress Image.../value
+/prop
+prop oor:name=Properties oor:type=xs:int
+value1/value
+/prop
+  /node
   node oor:name=.uno:NewHtmlDoc oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USCreate ~HTML Document/value
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

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

[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 phil.j...@free.fr
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 c...@libreoffice.org
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com

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

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

[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 phil.j...@free.fr
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 c...@libreoffice.org
Reviewed-by: Jan Holesovsky ke...@collabora.com

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 @@
   value xml:lang=en-USPri~nt Ranges/value
 /prop
   /node
-  node oor:name=.uno:DrawGraphicMenu oor:op=replace
+  node oor:name=.uno:FormatObjectMenu oor:op=replace
 prop oor:name=Label oor:type=xs:string
-  value xml:lang=en-USGraph~ic/value
+  value xml:lang=en-USO~bject/value
 /prop
   /node
   node oor:name=.uno:ToggleFormula oor:op=replace
@@ -1994,6 +1994,30 @@
   value xml:lang=en-USPaste Only Value/value
 /prop
   /node
+  node oor:name=.uno:CompressGraphic oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USCo~mpress Image.../value
+/prop
+prop oor:name=Properties oor:type=xs:int
+value1/value
+/prop
+  /node
+  node oor:name=.uno:SaveGraphic oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USSave Image.../value
+/prop
+prop oor:name=Properties oor:type=xs:int
+value1/value
+/prop
+  /node
+  node oor:name=.uno:ChangePicture oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-US~Change Image.../value
+/prop
+prop oor:name=Properties oor:type=xs:int
+value1/value
+/prop
+  /node
 /node
   /node
 /oor:component-data
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 sfx2/objface.hxx
 #include sfx2/request.hxx
 #include sfx2/sidebar/EnumContext.hxx
+#include sfx2/opengrf.hxx
 #include svl/whiter.hxx
 #include svx/svdograf.hxx
 #include svx/grfflt.hxx
 #include svx/grafctrl.hxx
 #include svx/compressgraphicdialog.hxx
+#include svx/graphichelper.hxx
 #include vcl/msgbox.hxx
 
 #include graphsh.hxx
@@ -34,6 +36,7 @@
 #include drawview.hxx

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

[Philippe Jung]

 include/svx/svxids.hrc |4 +++-
 sd/inc/app.hrc |1 -
 sd/sdi/sdraw.sdi   |   27 ---
 svx/sdi/svx.sdi|   27 +++
 4 files changed, 30 insertions(+), 29 deletions(-)

New commits:
commit 7db7698881f2691b7532a621c469b49830c27c4c
Author: Philippe Jung phil.j...@free.fr
Date:   Fri May 1 22:20:22 2015 +0200

tdf#34555 Moving SID_OBJECT_CROP out of sd

The crop action in impress is defined in impress but uses code shared in
svx. This patch move the declaration of the Crop action in svx so that
it can be shared with sc  writer.

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: Idb6907aa09c0efd456c2ad51232cf37edb28d977
Reviewed-on: https://gerrit.libreoffice.org/15587
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index c784c67..274cf9a 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -1006,8 +1006,10 @@
 #define SID_PARASPACE_INCREASE  ( SID_SVX_START + 1145 
)
 #define SID_PARASPACE_DECREASE  ( SID_SVX_START + 1146 
)
 
+#define SID_OBJECT_CROP ( SID_SVX_START + 1147 
)
+
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE   
(SID_PARASPACE_DECREASE + 1)
+#define SID_SVX_FIRSTFREE   ( SID_OBJECT_CROP + 1 )
 
 // Overflow check for slot IDs
 
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index a39734f..4f3d82e 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -421,7 +421,6 @@
 #define SID_SLIDE_SORTER_MULTI_PANE_GUI (SID_SD_START+421)
 
 #define SID_SELECT_BACKGROUND   (SID_SD_START+422)
-#define SID_OBJECT_CROP (SID_SD_START+423)
 
 // Slots for the tool pane popup
 #define SID_TP_APPLY_TO_ALL_SLIDES  (SID_SD_START+425)
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 1de1319..7297c1f 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -6174,33 +6174,6 @@ SfxVoidItem Mirror SID_OBJECT_MIRROR
 GroupId = GID_DOCUMENT ;
 ]
 
-SfxVoidItem Crop SID_OBJECT_CROP
-()
-[
-/* flags: */
-AutoUpdate = TRUE,
-Cachable = Cachable,
-FastCall = FALSE,
-HasCoreId = FALSE,
-HasDialog = FALSE,
-ReadOnlyDoc = TRUE,
-Toggle = FALSE,
-Container = FALSE,
-RecordAbsolute = FALSE,
-RecordPerSet;
-Synchron;
-
-/* status: */
-SlotType = SfxBoolItem
-
-/* config: */
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-StatusBarConfig = FALSE,
-ToolBoxConfig = TRUE,
-GroupId = GID_DOCUMENT ;
-]
-
 SfxVoidItem HeaderAndFooter SID_HEADER_AND_FOOTER
 ()
 [
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index c312f1f..6c45438 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -6038,6 +6038,33 @@ SfxVoidItem RotateRight SID_ROTATE_GRAPHIC_RIGHT
 GroupId = GID_GRAPHIC;
 ]
 
+SfxVoidItem Crop SID_OBJECT_CROP
+()
+[
+/* flags: */
+AutoUpdate = TRUE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* status: */
+SlotType = SfxBoolItem
+
+/* config: */
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = TRUE,
+GroupId = GID_DOCUMENT ;
+]
+
 SfxVoidItem ChangePicture SID_CHANGE_PICTURE
 ()
 [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-qa] Question regarding bug workflow

[Philippe Jung]

Hi,

I have questions regarding bug/fix workflow. From my understanding,
developers and QA wiki pages provide only partial answers.

To make it simple, I have a bug. Its status is NEW. I produced a patch
to fix the problem.



I updated it by setting Assigned to: with my email and changing status
to ASSIGNED. (And I guess I should have done it as soon as working on
the bug).

It is not clear that I have to make these two changes, one page dealing
of easyhack (Development/Easy_Hacks) mentions changing Assigned to
email but not changing status



I push the patch to gerrit.
Who changes the status to resolved and when?
A scheme on wiki QA/BSA/BugReport_Details suggests that ASSIGNED becomes
RESOLVED when Development is finished. Does development finished
includes code review, merged into master... ?



Maybe not (only) QA related:
Who commits from Gerrit into master ?
In which release ?
How QA team knows the bug has to be verified ?



Regards
Philippe
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Philippe Jung license statement

[Philippe Jung]

Hi *,

All of my past  future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual license.

Regards. And many thanks to all past  future contributors :-)
Philippe
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Set RES_GRFATR_CROPGRF atrtibute from SwVirtFlyDrawObj

[Philippe Jung]

Hi,

I am working on implementing the Crop Image feature in Writer.

Cropping ends in svx/source/svdraw/svddrgmt.cxx SdrDragCrop::EndSdrDrag. 
When cropping from Impress, marked object is SdrGrafObj. I rewrote part 
of the code so that Cropping is now part of SdrGrafObj (Similar to 
NbcMove, NbcResize and so on).


When cropping from Writer, the marked Object (and so the object to crop) 
is SwVirtFlyDrawObj (dflyobj.cxx). I have added SwVirtDrawObj::NbcCrop 
as Resize or Move. At this point, I would like to save the new values 
for crop attributes. That's where help is needed : how SwVirtFlyDrawObj 
relates to the embedded image and what is the expected way of applying 
an attribute to the image in a SwVirtFlyDrawObj?


Got various ways to read the current value of the image, but I did not 
succeed in writing new values. I am a bit lost betwwen GetFrm, 
GetFrm-Lower, FrameFmt, and all the possible attribute pools.


Any recommandation would be appreciated :-).

Regards
Philippe


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

Re: Set RES_GRFATR_CROPGRF atrtibute from SwVirtFlyDrawObj

[Philippe Jung]

I confirm I am implementing visual crop in writer with drag and drop. This 
already exists in impress.
Today I have crop handles. I have updated svx so that I can get endsdrdrag in 
writer without breaking crop in impress. I can resize the picture but I have 
difficulties in setting crop values.
Will have a look at the extension you pointed.
Philippe


Tommy ba...@quipo.it a écrit :

On Wed, 01 May 2013 12:13:55 +0200, Regina Henschel  
rb.hensc...@t-online.de wrote:

 Hi Philippe,

 Philippe Jung schrieb:
 Hi,

 I am working on implementing the Crop Image feature in Writer.

 Which one? In Impress/Draw we have .uno:Crop (That is used for
cropping  
 with the mouse) and .uno:GrafAttrCrop (That opens the crop dialog)?


You can already crop images with Writer but not in a visual mode
I think he's working on a visual crop tool such as the extension
CropOOo.
http://aoo-extensions.sourceforge.net/en/project/cropooo

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

-- 
Envoyé de mon téléphone Android avec K-9 Mail. Excusez la brièveté.
-- 
Envoyé de mon téléphone Android avec K-9 Mail. Excusez la brièveté.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Set RES_GRFATR_CROPGRF atrtibute from SwVirtFlyDrawObj

[Philippe Jung]

I confirm I am implementing visual crop in writer with drag and drop. This 
already exists in impress.
Today I have crop handles. I have updated svx so that I can get endsdrdrag in 
writer without breaking crop in impress. I can resize the picture but I have 
difficulties in setting crop values.
Will have a look at the extension you pointed.
Philippe


Tommy ba...@quipo.it a écrit :

On Wed, 01 May 2013 12:13:55 +0200, Regina Henschel  
rb.hensc...@t-online.de wrote:

 Hi Philippe,

 Philippe Jung schrieb:
 Hi,

 I am working on implementing the Crop Image feature in Writer.

 Which one? In Impress/Draw we have .uno:Crop (That is used for
cropping  
 with the mouse) and .uno:GrafAttrCrop (That opens the crop dialog)?


You can already crop images with Writer but not in a visual mode
I think he's working on a visual crop tool such as the extension
CropOOo.
http://aoo-extensions.sourceforge.net/en/project/cropooo

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

-- 
Envoyé de mon téléphone Android avec K-9 Mail. Excusez la brièveté.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Question on call to IsCrookAllowed in SdrDragView::BegDragObj

[Philippe Jung]

Hello,

Trying to implement crop Image in writer, I reached the case
SDRDRAG_CROP code in  SdrDragView::BegDragObj.

This part of code calls new SdrDragCrop if and only if
IsCrookAllowed(true) or IsCrookAllowed(false)

This basically means that the cropped object must be RotateFreeAllowed
or ContortionPossible.

If I create a IsCropAllowed for the SDRDRAG_CROP case (not changing
anything for SDRDRAG_CROOK case) and in IsCropAllowed I put only

ForcePossibilities();
return (!bMoveProtect  bMoveAllowed)
   || (!bResizeProtect  bContortionPossible);

this works and I can continue implementing the feature.

However, does it makes sense? Is there a risk of side effect in another
module?

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